October 2013 - Wine-commits

Alexandre Julliard : mmdevapi/tests: Mark a failing test as broken.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 7eebd74cb2e68ed3e8bbf33d7db869ca8814cc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eebd74cb2e68ed3e8bbf33d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 14:00:17 2013 +0200 mmdevapi/tests: Mark a failing test as broken. --- dlls/mmdevapi/tests/propstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 2b5f391..bcb5044 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -105,7 +105,7 @@ static void test_getat(IPropertyStore *store) if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) found_desc = TRUE; } - ok(found_name == TRUE, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_name || broken(!found_name), "DEVPKEY_Device_FriendlyName not found\n"); ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); }

1 0

Alexandre Julliard : ole32: Delay registering the apartment class until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: d67b99aef278e9b632a451ebf6a3c2cf2b85ebe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67b99aef278e9b632a451ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 17:55:03 2013 +0200 ole32: Delay registering the apartment class until needed. --- dlls/ole32/compobj.c | 60 +++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4d708c4..dbe1b06 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1478,18 +1478,44 @@ static HRESULT apartment_hostobject_in_hostapt( return hr; } +static BOOL WINAPI register_class( INIT_ONCE *once, void *param, void **context ) +{ + WNDCLASSW wclass; + + /* Dispatching to the correct thread in an apartment is done through + * window messages rather than RPC transports. When an interface is + * marshalled into another apartment in the same process, a window of the + * following class is created. The *caller* of CoMarshalInterface (i.e., the + * application) is responsible for pumping the message loop in that thread. + * The WM_USER messages which point to the RPCs are then dispatched to + * apartment_wndproc by the user's code from the apartment in which the + * interface was unmarshalled. + */ + memset(&wclass, 0, sizeof(wclass)); + wclass.lpfnWndProc = apartment_wndproc; + wclass.hInstance = hProxyDll; + wclass.lpszClassName = wszAptWinClass; + RegisterClassW(&wclass); + return TRUE; +} + /* create a window for the apartment or return the current one if one has * already been created */ HRESULT apartment_createwindowifneeded(struct apartment *apt) { + static INIT_ONCE class_init_once = INIT_ONCE_STATIC_INIT; + if (apt->multi_threaded) return S_OK; if (!apt->win) { - HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, - 0, 0, 0, 0, - HWND_MESSAGE, 0, hProxyDll, NULL); + HWND hwnd; + + InitOnceExecuteOnce( &class_init_once, register_class, NULL, NULL ); + + hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, + HWND_MESSAGE, 0, hProxyDll, NULL); if (!hwnd) { ERR("CreateWindow failed with error %d\n", GetLastError()); @@ -1516,31 +1542,6 @@ void apartment_joinmta(void) COM_CurrentInfo()->apt = MTA; } -static void COMPOBJ_InitProcess( void ) -{ - WNDCLASSW wclass; - - /* Dispatching to the correct thread in an apartment is done through - * window messages rather than RPC transports. When an interface is - * marshalled into another apartment in the same process, a window of the - * following class is created. The *caller* of CoMarshalInterface (i.e., the - * application) is responsible for pumping the message loop in that thread. - * The WM_USER messages which point to the RPCs are then dispatched to - * apartment_wndproc by the user's code from the apartment in which the - * interface was unmarshalled. - */ - memset(&wclass, 0, sizeof(wclass)); - wclass.lpfnWndProc = apartment_wndproc; - wclass.hInstance = hProxyDll; - wclass.lpszClassName = wszAptWinClass; - RegisterClassW(&wclass); -} - -static void COMPOBJ_UninitProcess( void ) -{ - UnregisterClassW(wszAptWinClass, hProxyDll); -} - static void COM_TlsDestroy(void) { struct oletls *info = NtCurrentTeb()->ReservedForOle; @@ -4585,13 +4586,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) switch(fdwReason) { case DLL_PROCESS_ATTACH: hProxyDll = hinstDLL; - COMPOBJ_InitProcess(); break; case DLL_PROCESS_DETACH: if (reserved) break; release_std_git(); - COMPOBJ_UninitProcess(); + UnregisterClassW( wszAptWinClass, hProxyDll ); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free(); DeleteCriticalSection(&csRegisteredClassList);

1 0

Alexandre Julliard : explorerframe: Correctly initialize common controls.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 4c6e039aa153aaf3576d52a4106e97bd4d0b1159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e039aa153aaf3576d52a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 19:21:49 2013 +0200 explorerframe: Correctly initialize common controls. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index dc523a1..03f4a23 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -1,5 +1,5 @@ MODULE = explorerframe.dll -IMPORTS = uuid ole32 shell32 user32 +IMPORTS = uuid ole32 comctl32 shell32 user32 C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index a881cc4..4d977ec 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -869,6 +869,7 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); WNDCLASSW wc; DWORD window_style, window_ex_style; + INITCOMMONCONTROLSEX icex; RECT rc; static const WCHAR NSTC2_CLASS_NAME[] = {'N','a','m','e','s','p','a','c','e','T','r','e','e', @@ -882,6 +883,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, This->style = nstcsFlags; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx( &icex ); + if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc)) { wc.style = CS_HREDRAW | CS_VREDRAW;

1 0

Alexandre Julliard : shell32: Delay initialization of the icon cache until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 116e33d50a3435a539bcf7e9b93ab4adbfbecef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116e33d50a3435a539bcf7e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:01:04 2013 +0200 shell32: Delay initialization of the icon cache until needed. --- dlls/shell32/iconcache.c | 123 +++++++++++++++++++++---------------------- dlls/shell32/shell32_main.c | 2 - dlls/shell32/shell32_main.h | 1 - 3 files changed, 61 insertions(+), 65 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index e2300f1..a2373fa 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -59,7 +59,8 @@ typedef struct DWORD dwAccessTime; } SIC_ENTRY, * LPSIC_ENTRY; -static HDPA sic_hdpa = 0; +static HDPA sic_hdpa; +static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -337,54 +338,9 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags); } /***************************************************************************** - * SIC_GetIconIndex [internal] - * - * Parameters - * sSourceFile [IN] filename of file containing the icon - * index [IN] index/resID (negated) in this file - * - * NOTES - * look in the cache for a proper icon. if not available the icon is taken - * from the file and cached - */ -INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) -{ - SIC_ENTRY sice; - INT ret, index = INVALID_INDEX; - WCHAR path[MAX_PATH]; - - TRACE("%s %i\n", debugstr_w(sSourceFile), dwSourceIndex); - - GetFullPathNameW(sSourceFile, MAX_PATH, path, NULL); - sice.sSourceFile = path; - sice.dwSourceIndex = dwSourceIndex; - sice.dwFlags = dwFlags; - - EnterCriticalSection(&SHELL32_SicCS); - - if (NULL != DPA_GetPtr (sic_hdpa, 0)) - { - /* search linear from position 0*/ - index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); - } - - if ( INVALID_INDEX == index ) - { - ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); - } - else - { - TRACE("-- found\n"); - ret = ((LPSIC_ENTRY)DPA_GetPtr(sic_hdpa, index))->dwListIndex; - } - - LeaveCriticalSection(&SHELL32_SicCS); - return ret; -} -/***************************************************************************** * SIC_Initialize [internal] */ -BOOL SIC_Initialize(void) +static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context ) { HICON hSm, hLg; int cx_small, cy_small; @@ -397,9 +353,6 @@ BOOL SIC_Initialize(void) TRACE("\n"); - if (sic_hdpa) /* already initialized?*/ - return TRUE; - sic_hdpa = DPA_Create(16); if (!sic_hdpa) @@ -452,17 +405,62 @@ void SIC_Destroy(void) if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - sic_hdpa = NULL; ImageList_Destroy(ShellSmallIconList); - ShellSmallIconList = 0; ImageList_Destroy(ShellBigIconList); - ShellBigIconList = 0; LeaveCriticalSection(&SHELL32_SicCS); DeleteCriticalSection(&SHELL32_SicCS); } /***************************************************************************** + * SIC_GetIconIndex [internal] + * + * Parameters + * sSourceFile [IN] filename of file containing the icon + * index [IN] index/resID (negated) in this file + * + * NOTES + * look in the cache for a proper icon. if not available the icon is taken + * from the file and cached + */ +INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) +{ + SIC_ENTRY sice; + INT ret, index = INVALID_INDEX; + WCHAR path[MAX_PATH]; + + TRACE("%s %i\n", debugstr_w(sSourceFile), dwSourceIndex); + + GetFullPathNameW(sSourceFile, MAX_PATH, path, NULL); + sice.sSourceFile = path; + sice.dwSourceIndex = dwSourceIndex; + sice.dwFlags = dwFlags; + + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + + EnterCriticalSection(&SHELL32_SicCS); + + if (NULL != DPA_GetPtr (sic_hdpa, 0)) + { + /* search linear from position 0*/ + index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); + } + + if ( INVALID_INDEX == index ) + { + ret = SIC_LoadIcon (sSourceFile, dwSourceIndex, dwFlags); + } + else + { + TRACE("-- found\n"); + ret = ((LPSIC_ENTRY)DPA_GetPtr(sic_hdpa, index))->dwListIndex; + } + + LeaveCriticalSection(&SHELL32_SicCS); + return ret; +} + +/***************************************************************************** * SIC_LoadOverlayIcon [internal] * * Load a shell overlay icon and return its icon cache index. @@ -509,6 +507,8 @@ static int SIC_LoadOverlayIcon(int icon_idx) RegCloseKey(hKeyShellIcons); } + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -520,15 +520,12 @@ static int SIC_LoadOverlayIcon(int icon_idx) * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); - if (lpBigList) - { *lpBigList = ShellBigIconList; - } - if (lpSmallList) - { *lpSmallList = ShellSmallIconList; - } - - return TRUE; +{ + TRACE("(%p,%p)\n",lpBigList,lpSmallList); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + if (lpBigList) *lpBigList = ShellBigIconList; + if (lpSmallList) *lpSmallList = ShellSmallIconList; + return TRUE; } /************************************************************************* * PidlToSicIndex [INTERNAL] @@ -557,6 +554,8 @@ BOOL PidlToSicIndex ( TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); + if (SUCCEEDED (IShellFolder_GetUIObjectOf(sh, 0, 1, &pidl, &IID_IExtractIconW, 0, (void **)&ei))) { if (SUCCEEDED(IExtractIconW_GetIconLocation(ei, uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 4c124bd..0bc88b0 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1273,8 +1273,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) swShell32Name[MAX_PATH - 1] = '\0'; InitCommonControlsEx(NULL); - - SIC_Initialize(); InitChangeNotifications(); break; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index c50330b..ee10756 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -47,7 +47,6 @@ extern HIMAGELIST ShellBigIconList DECLSPEC_HIDDEN; /* Iconcache */ #define INVALID_INDEX -1 -BOOL SIC_Initialize(void) DECLSPEC_HIDDEN; void SIC_Destroy(void) DECLSPEC_HIDDEN; BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT uFlags, int * pIndex) DECLSPEC_HIDDEN; INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : shell32: Delay common controls initialization until needed.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: d80ca173af68add8ef37a92acaa6eac6f7589546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d80ca173af68add8ef37a92ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:05:28 2013 +0200 shell32: Delay common controls initialization until needed. --- dlls/shell32/Makefile.in | 4 ++-- dlls/shell32/brsfolder.c | 5 +++++ dlls/shell32/shell32_main.c | 1 - dlls/shell32/shlview.c | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index dd3f8f4..fb9b2c7 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,8 +1,8 @@ EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 -IMPORTS = uuid shlwapi comctl32 user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version +IMPORTS = uuid shlwapi user32 gdi32 advapi32 +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 EXTRALIBS = @CORESERVICESLIB@ C_SRCS = \ diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index a14c172..9d95293 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1110,12 +1110,17 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) DWORD r; HRESULT hr; const WCHAR * templateName; + INITCOMMONCONTROLSEX icex; info.hWnd = 0; info.pidlRet = NULL; info.lpBrowseInfo = lpbi; info.hwndTreeView = NULL; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_TREEVIEW_CLASSES; + InitCommonControlsEx( &icex ); + hr = OleInitialize(NULL); if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0bc88b0..1e37b47 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1272,7 +1272,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) GetModuleFileNameW(hinstDLL, swShell32Name, MAX_PATH); swShell32Name[MAX_PATH - 1] = '\0'; - InitCommonControlsEx(NULL); InitChangeNotifications(); break; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 29593f8..c937cce 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2075,10 +2075,15 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2 *iface, LPSV2CVW2_PARAMS view_params) { IShellViewImpl *This = impl_from_IShellView2(iface); + INITCOMMONCONTROLSEX icex; WNDCLASSW wc; HRESULT hr; HWND wnd; + icex.dwSize = sizeof( icex ); + icex.dwICC = ICC_LISTVIEW_CLASSES; + InitCommonControlsEx( &icex ); + TRACE("(%p)->(view_params %p)\n", iface, view_params); if (view_params->cbSize != sizeof(*view_params))

1 0

Michael Stefaniuc : msctf/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: a50d081cd89fe7da828558da7f0e36465f5cacf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50d081cd89fe7da828558da7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 22:57:41 2013 +0200 msctf/tests: Compile with -D__WINESRC__. --- dlls/msctf/tests/Makefile.in | 1 - dlls/msctf/tests/inputprocessor.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 57afff2..0a589f6 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msctf.dll IMPORTS = ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ inputprocessor.c diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 027795d..eb293bc 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2000,10 +2000,10 @@ static void processPendingMessages(void) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } diff = time - GetTickCount(); } @@ -2032,11 +2032,11 @@ static void test_AssociateFocus(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); - wnd1 = CreateWindow("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); + wnd1 = CreateWindowA("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); ok(wnd1!=NULL,"Unable to create window 1\n"); - wnd2 = CreateWindow("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); + wnd2 = CreateWindowA("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); ok(wnd2!=NULL,"Unable to create window 2\n"); - wnd3 = CreateWindow("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); + wnd3 = CreateWindowA("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); ok(wnd3!=NULL,"Unable to create window 3\n"); processPendingMessages();

1 0

Michael Stefaniuc : d3dcompiler_43/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 2f673f2965f5118cd3ac1ffe8744878e9ac74507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f673f2965f5118cd3ac1ffe8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 22:59:10 2013 +0200 d3dcompiler_43/tests: Compile with -D__WINESRC__. --- dlls/d3dcompiler_43/tests/Makefile.in | 1 - dlls/d3dcompiler_43/tests/hlsl.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index cd2a8ea..5c2bed8 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = d3dcompiler_43.dll IMPORTS = d3dcompiler d3d9 d3dx9 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asm.c \ diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index c29d075..c3778ca 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -42,13 +42,12 @@ struct hlsl_probe_info static HWND create_window(void) { - WNDCLASS wc = {0}; - wc.lpfnWndProc = DefWindowProc; + WNDCLASSA wc = {0}; + wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "d3d9_test_wc"; - RegisterClass(&wc); + RegisterClassA(&wc); - return CreateWindow("d3d9_test_wc", "d3d9_test", - 0, 0, 0, 0, 0, 0, 0, 0, 0); + return CreateWindowA("d3d9_test_wc", "d3d9_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); } static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration,

1 0

Michael Stefaniuc : oledb32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: cb194006e9c9f414374a7488edc10f2cff86f4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb194006e9c9f414374a7488e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 23:00:44 2013 +0200 oledb32/tests: Compile with -D__WINESRC__. --- dlls/oledb32/tests/Makefile.in | 1 - dlls/oledb32/tests/marshal.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index 019f1ed..bb1f0b3 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = oledb32.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index f9a2150..b1540b4 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -66,11 +66,11 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ - PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); SetEvent(data->marshal_event); - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessageW(&msg, NULL, 0, 0)) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { @@ -78,7 +78,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) SetEvent((HANDLE)msg.lParam); } else - DispatchMessage(&msg); + DispatchMessageW(&msg); } HeapFree(GetProcessHeap(), 0, data); @@ -91,7 +91,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) { DWORD tid = 0; - HANDLE marshal_event = CreateEvent(NULL, FALSE, FALSE, NULL); + HANDLE marshal_event = CreateEventW(NULL, FALSE, FALSE, NULL); struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); data->stream = stream; @@ -117,8 +117,8 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M static void end_host_object(DWORD tid, HANDLE thread) { - BOOL ret = PostThreadMessage(tid, WM_QUIT, 0, 0); - ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); + BOOL ret = PostThreadMessageW(tid, WM_QUIT, 0, 0); + ok(ret, "PostThreadMessageW failed with error %d\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); CloseHandle(thread);

1 0

Michael Stefaniuc : opengl32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 443f62d2f7914a634814a52d6de726bd0c98af8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=443f62d2f7914a634814a52d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 23:01:49 2013 +0200 opengl32/tests: Compile with -D__WINESRC__. --- dlls/opengl32/tests/Makefile.in | 1 - dlls/opengl32/tests/opengl.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/tests/Makefile.in b/dlls/opengl32/tests/Makefile.in index 7bcb283..98e474c 100644 --- a/dlls/opengl32/tests/Makefile.in +++ b/dlls/opengl32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = opengl32.dll IMPORTS = opengl32 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ opengl.c diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3aa2c40..83c5256 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -303,8 +303,8 @@ static void test_setpixelformat(HDC winhdc) else ok(!res, "Unexpectedly set an alternate pixel format\n"); } - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -323,8 +323,8 @@ static void test_setpixelformat(HDC winhdc) DestroyWindow( hwnd ); } - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -755,7 +755,7 @@ static void test_deletecontext(HWND hwnd, HDC hdc) */ thread_params.hglrc = hglrc; thread_params.hwnd = hwnd; - thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_params.test_finished = CreateEventW(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) @@ -1620,8 +1620,8 @@ START_TEST(opengl) 0, 0, 0 /* layer masks */ }; - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) {

1 0

Frédéric Delanoy : cmd: Use BOOL type where appropriate.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: e459131677bdf2e4dc07e9465427e9569ffd87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e459131677bdf2e4dc07e9465… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:31 2013 +0200 cmd: Use BOOL type where appropriate. --- programs/cmd/builtins.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 64e12a0..11af74b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -280,7 +280,7 @@ void WCMD_choice (const WCHAR * args) { DWORD opt_timeout = 0; DWORD count; DWORD oldmode; - DWORD have_console; + BOOL have_console; BOOL opt_n = FALSE; BOOL opt_s = FALSE; @@ -2820,7 +2820,7 @@ syntax_err: void WCMD_move (void) { - int status; + BOOL status; WIN32_FIND_DATAW fd; HANDLE hff; WCHAR input[MAX_PATH]; @@ -2923,7 +2923,7 @@ void WCMD_move (void) if (ok) { status = MoveFileW(src, dest); } else { - status = 1; /* Anything other than 0 to prevent error msg below */ + status = TRUE; } if (!status) { @@ -3036,7 +3036,7 @@ void WCMD_remove_dir (WCHAR *args) { void WCMD_rename (void) { - int status; + BOOL status; HANDLE hff; WIN32_FIND_DATAW fd; WCHAR input[MAX_PATH]; @@ -4024,7 +4024,7 @@ void WCMD_setshow_env (WCHAR *s) { LPVOID env; WCHAR *p; - int status; + BOOL status; static const WCHAR parmP[] = {'/','P','\0'}; static const WCHAR parmA[] = {'/','A','\0'}; WCHAR string[MAXSTRING]; @@ -4140,7 +4140,7 @@ void WCMD_setshow_env (WCHAR *s) { gle = GetLastError(); if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; - } else if ((!status)) WCMD_print_error(); + } else if (!status) WCMD_print_error(); else errorlevel = 0; } }

1 0