[vlc-devel] [vlc-commits] modules: use TEXT() for strings calling wide char Win32 APIs
Jean-Baptiste Kempf
jb at videolan.org
Wed Apr 3 13:26:01 CEST 2019
No, it is not.
On Wed, 3 Apr 2019, at 09:56, Steve Lhomme wrote:
> vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Apr 3
> 08:52:35 2019 +0200| [238807626113d398df07bbf11caa6efff99fcb09] |
> committer: Steve Lhomme
>
> modules: use TEXT() for strings calling wide char Win32 APIs
>
> _T() is for TCHAR
>
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=238807626113d398df07bbf11caa6efff99fcb09
> ---
>
> modules/control/globalhotkeys/win32.c | 4 ++--
> modules/video_output/win32/window.c | 16 ++++++++--------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/modules/control/globalhotkeys/win32.c
> b/modules/control/globalhotkeys/win32.c
> index 6cc3d0264d..2a0e3a2954 100644
> --- a/modules/control/globalhotkeys/win32.c
> +++ b/modules/control/globalhotkeys/win32.c
> @@ -139,8 +139,8 @@ static void *Thread( void *p_data )
> /* Window which receives Hotkeys */
> vlc_mutex_lock( &p_sys->lock );
> p_sys->hotkeyWindow =
> - (void*)CreateWindow( _T("STATIC"), /* name of window
> class */
> - _T("VLC ghk ") _T(VERSION), /* window title
> bar text */
> + (void*)CreateWindow( TEXT("STATIC"), /* name of window
> class */
> + TEXT("VLC ghk ") TEXT(VERSION), /* window title
> bar text */
> 0, /* window
> style */
> 0, /* default X
> coordinate */
> 0, /* default Y
> coordinate */
> diff --git a/modules/video_output/win32/window.c
> b/modules/video_output/win32/window.c
> index 04e83727d5..d096a47d2a 100644
> --- a/modules/video_output/win32/window.c
> +++ b/modules/video_output/win32/window.c
> @@ -340,8 +340,8 @@ static int CALLBACK enumWindowsProc(HWND hwnd,
> LPARAM lParam)
>
> if( !strcasecmp( name, "WorkerW" ) )
> {
> - hwnd = FindWindowEx( hwnd, NULL, _T("SHELLDLL_DefView"), NULL
> );
> - if( hwnd ) hwnd = FindWindowEx( hwnd, NULL,
> _T("SysListView32"), NULL );
> + hwnd = FindWindowEx( hwnd, NULL, TEXT("SHELLDLL_DefView"),
> NULL );
> + if( hwnd ) hwnd = FindWindowEx( hwnd, NULL,
> TEXT("SysListView32"), NULL );
> if( hwnd )
> {
> *wnd = hwnd;
> @@ -354,9 +354,9 @@ static int CALLBACK enumWindowsProc(HWND hwnd,
> LPARAM lParam)
> static HWND GetDesktopHandle(vlc_object_t *obj)
> {
> /* Find Program Manager */
> - HWND hwnd = FindWindow( _T("Progman"), NULL );
> - if( hwnd ) hwnd = FindWindowEx( hwnd, NULL,
> _T("SHELLDLL_DefView"), NULL );
> - if( hwnd ) hwnd = FindWindowEx( hwnd, NULL, _T("SysListView32"),
> NULL );
> + HWND hwnd = FindWindow( TEXT("Progman"), NULL );
> + if( hwnd ) hwnd = FindWindowEx( hwnd, NULL,
> TEXT("SHELLDLL_DefView"), NULL );
> + if( hwnd ) hwnd = FindWindowEx( hwnd, NULL, TEXT("SysListView32"),
> NULL );
> if( hwnd )
> return hwnd;
>
> @@ -401,7 +401,7 @@ static void *EventThread( void *p_this )
> sys->hwnd =
> CreateWindowEx( WS_EX_NOPARENTNOTIFY,
> sys->class_main, /* name of window
> class */
> - _T(VOUT_TITLE) _T(" (VLC Video Output)"),/* window
> title */
> + TEXT(VOUT_TITLE) TEXT(" (VLC Video Output)"),/*
> window title */
> i_window_style, /* window
> style */
> CW_USEDEFAULT, /* default X
> coordinate */
> CW_USEDEFAULT, /* default Y
> coordinate */
> @@ -425,9 +425,9 @@ static void *EventThread( void *p_this )
>
> /* Append a "Always On Top" entry in the system menu */
> HMENU hMenu = GetSystemMenu( sys->hwnd, FALSE );
> - AppendMenu( hMenu, MF_SEPARATOR, 0, _T("") );
> + AppendMenu( hMenu, MF_SEPARATOR, 0, TEXT("") );
> AppendMenu( hMenu, MF_STRING | MF_UNCHECKED,
> - IDM_TOGGLE_ON_TOP, _T("Always on &Top") );
> + IDM_TOGGLE_ON_TOP, TEXT("Always on &Top") );
>
> for( ;; )
> {
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits
>
--
Jean-Baptiste Kempf - President
+33 672 704 734
More information about the vlc-devel
mailing list