October 2013 - Wine-Commits

Thomas Faber : shell32: Avoid leaks and add parameter checks in SHCreateShellFolderView[Ex].
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 947cce79d69b7cccc381f33a4aebd37f17f1f0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=947cce79d69b7cccc381f33a4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Oct 20 13:46:16 2013 +0200 shell32: Avoid leaks and add parameter checks in SHCreateShellFolderView[Ex]. --- dlls/shell32/shellord.c | 7 ++- dlls/shell32/tests/shlfolder.c | 123 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 8da849f..56c9fe9 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1104,12 +1104,12 @@ HRESULT WINAPI SHCreateShellFolderViewEx( psvcbi->pshf, psvcbi->pidl, psvcbi->pfnCallback, psvcbi->fvm, psvcbi->psvOuter); + *ppv = NULL; psf = IShellView_Constructor(psvcbi->pshf); if (!psf) return E_OUTOFMEMORY; - IShellView_AddRef(psf); hRes = IShellView_QueryInterface(psf, &IID_IShellView, (LPVOID *)ppv); IShellView_Release(psf); @@ -2224,6 +2224,10 @@ HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView * psf; HRESULT hRes; + *ppsv = NULL; + if (!pcsfv || pcsfv->cbSize != sizeof(*pcsfv)) + return E_INVALIDARG; + TRACE("sf=%p outer=%p callback=%p\n", pcsfv->pshf, pcsfv->psvOuter, pcsfv->psfvcb); @@ -2232,7 +2236,6 @@ HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, if (!psf) return E_OUTOFMEMORY; - IShellView_AddRef(psf); hRes = IShellView_QueryInterface(psf, &IID_IShellView, (LPVOID *)ppsv); IShellView_Release(psf); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c866800..b929abd 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -72,6 +72,8 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); +static HRESULT (WINAPI *pSHCreateShellFolderView)(const SFV_CREATE *pcsfv, IShellView **ppsv); +static HRESULT (WINAPI *pSHCreateShellFolderViewEx)(LPCSFV psvcbi, IShellView **ppv); static const char *debugstr_guid(REFIID riid) { @@ -140,6 +142,8 @@ static void init_function_pointers(void) MAKEFUNC(SHGetIDListFromObject); MAKEFUNC(SHGetItemFromObject); MAKEFUNC(SHCreateDefaultContextMenu); + MAKEFUNC(SHCreateShellFolderView); + MAKEFUNC(SHCreateShellFolderViewEx); #undef MAKEFUNC #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) @@ -4610,6 +4614,123 @@ static void test_SHCreateDefaultContextMenu(void) Cleanup(); } +static void test_SHCreateShellFolderView(void) +{ + HRESULT hr; + IShellView *psv; + SFV_CREATE sfvc; + IShellFolder *desktop; + ULONG refCount; + + if (!pSHCreateShellFolderView) + { + win_skip("SHCreateShellFolderView missing.\n"); + return; + } + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + if (0) + { + /* crash on win7 */ + pSHCreateShellFolderView(NULL, NULL); + } + + psv = (void *)0xdeadbeef; + hr = pSHCreateShellFolderView(NULL, &psv); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); + + memset(&sfvc, 0, sizeof(sfvc)); + psv = (void *)0xdeadbeef; + hr = pSHCreateShellFolderView(&sfvc, &psv); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); + + memset(&sfvc, 0, sizeof(sfvc)); + sfvc.cbSize = sizeof(sfvc) - 1; + psv = (void *)0xdeadbeef; + hr = pSHCreateShellFolderView(&sfvc, &psv); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); + + memset(&sfvc, 0, sizeof(sfvc)); + sfvc.cbSize = sizeof(sfvc) + 1; + psv = (void *)0xdeadbeef; + hr = pSHCreateShellFolderView(&sfvc, &psv); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); + + memset(&sfvc, 0, sizeof(sfvc)); + sfvc.cbSize = sizeof(sfvc); + sfvc.pshf = desktop; + psv = NULL; + hr = pSHCreateShellFolderView(&sfvc, &psv); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(psv != NULL, "psv = %p\n", psv); + if (psv) + { + refCount = IShellView_Release(psv); + ok(refCount == 0, "refCount = %u\n", refCount); + } + + IShellFolder_Release(desktop); +} + +static void test_SHCreateShellFolderViewEx(void) +{ + HRESULT hr; + IShellView *psv; + CSFV csfv; + IShellFolder *desktop; + ULONG refCount; + + if (!pSHCreateShellFolderViewEx) + { + win_skip("SHCreateShellFolderViewEx missing.\n"); + return; + } + + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + if (0) + { + /* crash on win7 */ + pSHCreateShellFolderViewEx(NULL, NULL); + pSHCreateShellFolderViewEx(NULL, &psv); + pSHCreateShellFolderViewEx(&csfv, NULL); + } + + memset(&csfv, 0, sizeof(csfv)); + csfv.pshf = desktop; + psv = NULL; + hr = pSHCreateShellFolderViewEx(&csfv, &psv); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(psv != NULL, "psv = %p\n", psv); + if (psv) + { + refCount = IShellView_Release(psv); + ok(refCount == 0, "refCount = %u\n", refCount); + } + + memset(&csfv, 0, sizeof(csfv)); + csfv.cbSize = sizeof(csfv); + csfv.pshf = desktop; + psv = NULL; + hr = pSHCreateShellFolderViewEx(&csfv, &psv); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(psv != NULL, "psv = %p\n", psv); + if (psv) + { + refCount = IShellView_Release(psv); + ok(refCount == 0, "refCount = %u\n", refCount); + } + + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -4646,6 +4767,8 @@ START_TEST(shlfolder) test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); test_SHCreateDefaultContextMenu(); + test_SHCreateShellFolderView(); + test_SHCreateShellFolderViewEx(); OleUninitialize(); }

1 0

Alexandre Julliard : wintab32: Retrieve the graphics driver name from the registry.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 6fe63e74d0147ed629aa6a0a997dab1fbd6770c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe63e74d0147ed629aa6a0a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 16:16:09 2013 +0200 wintab32: Retrieve the graphics driver name from the registry. --- dlls/wintab32/Makefile.in | 2 +- dlls/wintab32/wintab32.c | 40 +++++++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index ab71e45..7c265b4 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -1,6 +1,6 @@ MODULE = wintab32.dll IMPORTLIB = wintab32 -IMPORTS = user32 gdi32 +IMPORTS = user32 advapi32 C_SRCS = \ context.c \ diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 0633ea8..3037963 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -22,13 +22,14 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "wingdi.h" #include "winuser.h" #include "winerror.h" #define NOFIX32 #include "wintab.h" #include "wintab_internal.h" -#include "wine/gdi_driver.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wintab32); @@ -71,6 +72,38 @@ static VOID TABLET_Unregister(void) UnregisterClassW(WC_TABLETCLASSNAME, NULL); } +static HMODULE load_graphics_driver(void) +{ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR key_pathW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\','{',0}; + static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + + HMODULE ret = 0; + HKEY hkey; + DWORD size; + WCHAR path[MAX_PATH]; + WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + + if (!guid_atom) return 0; + memcpy( key, key_pathW, sizeof(key_pathW) ); + if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; + strcatW( key, displayW ); + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; + size = sizeof(path); + if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + RegCloseKey( hkey ); + TRACE( "%s %p\n", debugstr_w(path), ret ); + return ret; +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { static const WCHAR name[] = {'T','a','b','l','e','t',0}; @@ -86,14 +119,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) WS_POPUPWINDOW,0,0,0,0,0,0,hInstDLL,0); if (hwndDefault) { - HDC hdc = GetDC( hwndDefault ); - HMODULE module = __wine_get_driver_module( hdc ); - + HMODULE module = load_graphics_driver(); pLoadTabletInfo = (void *)GetProcAddress(module, "LoadTabletInfo"); pAttachEventQueueToTablet = (void *)GetProcAddress(module, "AttachEventQueueToTablet"); pGetCurrentPacket = (void *)GetProcAddress(module, "GetCurrentPacket"); pWTInfoW = (void *)GetProcAddress(module, "WTInfoW"); - ReleaseDC( hwndDefault, hdc ); } else return FALSE;

1 0

Alexandre Julliard : explorer: Store the graphics driver name for the desktop in the registry.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: a6c7f6a4bad1c4eed36c2f061265980186e8eea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c7f6a4bad1c4eed36c2f061… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 16:14:36 2013 +0200 explorer: Store the graphics driver name for the desktop in the registry. --- programs/explorer/desktop.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 3ea3e60..d85483c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -633,24 +633,49 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void initialize_display_settings( HWND desktop ) +static void set_desktop_guid( HWND desktop, HMODULE driver ) { static const WCHAR display_device_guid_propW[] = { '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR device_keyW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '{','%','s','}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + GUID guid; - RPC_CSTR guid_str; + RPC_WSTR guid_str; ATOM guid_atom; - DEVMODEW dmW; + HKEY hkey; + WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; UuidCreate( &guid ); - UuidToStringA( &guid, &guid_str ); - WINE_TRACE( "display guid %s\n", guid_str ); + UuidToStringW( &guid, &guid_str ); + TRACE( "display guid %s\n", debugstr_w(guid_str) ); - guid_atom = GlobalAddAtomA( (LPCSTR)guid_str ); + guid_atom = GlobalAddAtomW( guid_str ); SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + sprintfW( key, device_keyW, guid_str ); + RpcStringFreeW( &guid_str ); - RpcStringFreeA( &guid_str ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, + REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) + { + WCHAR path[MAX_PATH]; + + GetModuleFileNameW( driver, path, MAX_PATH ); + RegSetValueExW( hkey, driverW, 0, REG_SZ, (BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + RegCloseKey( hkey ); + } + else ERR( "failed to create %s\n", debugstr_w(key) ); +} + +static void initialize_display_settings(void) +{ + DEVMODEW dmW; /* Store current display mode in the registry */ if (EnumDisplaySettingsExW( NULL, ENUM_CURRENT_SETTINGS, &dmW, 0 )) @@ -760,6 +785,7 @@ void manage_desktop( WCHAR *arg ) ReleaseDC( hwnd, hdc ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + set_desktop_guid( hwnd, graphics_driver ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), @@ -767,7 +793,7 @@ void manage_desktop( WCHAR *arg ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); - initialize_display_settings( hwnd ); + initialize_display_settings(); initialize_appbar(); initialize_systray( graphics_driver, using_root ); if (!using_root) initialize_launchers( hwnd );

1 0

Alexandre Julliard : imm32: Retrieve the graphics driver name from the registry.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: d85b22cbca7f29ee6a80eb1a886e180ab57454cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85b22cbca7f29ee6a80eb1a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 16:15:01 2013 +0200 imm32: Retrieve the graphics driver name from the registry. --- dlls/imm32/imm.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4738103..35c16f0 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -32,8 +32,8 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" -#include "wine/gdi_driver.h" #include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -245,6 +245,38 @@ static void IMM_FreeThreadData(void) } } +static HMODULE load_graphics_driver(void) +{ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR key_pathW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\','{',0}; + static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + + HMODULE ret = 0; + HKEY hkey; + DWORD size; + WCHAR path[MAX_PATH]; + WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + + if (!guid_atom) return 0; + memcpy( key, key_pathW, sizeof(key_pathW) ); + if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; + strcatW( key, displayW ); + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; + size = sizeof(path); + if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + RegCloseKey( hkey ); + TRACE( "%s %p\n", debugstr_w(path), ret ); + return ret; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -265,13 +297,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); - if (!ptr->hIME) - { - HDC hdc = GetDC( 0 ); - GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCWSTR)__wine_get_driver_module( hdc ), &ptr->hIME ); - ReleaseDC( 0, hdc ); - } + if (!ptr->hIME) ptr->hIME = load_graphics_driver(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire);

1 0

Jacek Caban : crypt32: Don't access context after releaseContext call.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 9adff9d02639cf21f4740deb853c6e35dc33b1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adff9d02639cf21f4740deb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 12:29:34 2013 +0200 crypt32: Don't access context after releaseContext call. --- dlls/crypt32/context.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 9c26439..90d1afd 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -111,10 +111,12 @@ void Context_Release(context_t *context) assert(ref >= 0); if (!ref) { + WINECRYPT_CERTSTORE *store = context->store; + /* This is the last reference, but the context still may be in a store. * We release our store reference, but leave it up to store to free or keep the context. */ - context->store->vtbl->releaseContext(context->store, context); - context->store->vtbl->release(context->store, 0); + store->vtbl->releaseContext(store, context); + store->vtbl->release(store, 0); } }

1 0

Nikolay Sivov : ole32: Support activation context redirection in CoGetPSClsid().
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: e02b1687aadeff3e488f232049eb49c6516188dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02b1687aadeff3e488f23204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 22:59:03 2013 +0400 ole32: Support activation context redirection in CoGetPSClsid(). --- dlls/ole32/compobj.c | 22 ++++++++++++++++++++++ dlls/ole32/tests/compobj.c | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ddfc74b..d70bfc1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -123,6 +123,18 @@ struct comclassredirect_data DWORD miscstatusdocprint; }; +struct ifacepsredirect_data +{ + ULONG size; + DWORD mask; + GUID iid; + ULONG nummethods; + GUID tlbid; + GUID base; + ULONG name_len; + ULONG name_offset; +}; + struct class_reg_data { union @@ -2359,6 +2371,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) HKEY hkey; APARTMENT *apt = COM_CurrentApt(); struct registered_psclsid *registered_psclsid; + ACTCTX_SECTION_KEYED_DATA data; TRACE("() riid=%s, pclsid=%p\n", debugstr_guid(riid), pclsid); @@ -2386,6 +2399,15 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) LeaveCriticalSection(&apt->cs); + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + riid, &data)) + { + struct ifacepsredirect_data *ifaceps = (struct ifacepsredirect_data*)data.lpData; + *pclsid = ifaceps->iid; + return S_OK; + } + /* Interface\\{string form of riid}\\ProxyStubClsid32 */ strcpyW(path, wszInterface); StringFromGUID2(riid, path + ARRAYSIZE(wszInterface) - 1, CHARS_IN_GUID); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 9f94f3d..8998251 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,6 @@ static void test_CoGetPSClsid(void) if ((handle = activate_context(actctx_manifest, &cookie))) { -todo_wine { memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1051,7 +1050,15 @@ todo_wine { hr = CoGetPSClsid(&IID_Testiface4, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); -} + + /* register same interface and try to get CLSID back */ + hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); + ok(hr == S_OK, "got 0x%08x\n", hr); + memset(&clsid, 0, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", debugstr_guid(&clsid)); + pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); }

1 0

Ken Thomases : winemac: Disable software GL rendering unless it' s enabled via a new registry setting, AllowSoftwareRendering.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 742c48b3489a21dd373221aa10bb648dd02c86d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742c48b3489a21dd373221aa1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 21 16:37:05 2013 -0500 winemac: Disable software GL rendering unless it's enabled via a new registry setting, AllowSoftwareRendering. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 98ecb90..362d5ea 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index b86c8ae..df45bb5 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +BOOL allow_software_rendering = FALSE; HMODULE macdrv_module = 0; @@ -176,6 +177,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) + allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 1ae2744..16b79df 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -619,6 +619,11 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA attribs[n++] = kCGLPFAAccelerated; attribs[n++] = kCGLPFANoRecovery; } + else if (!allow_software_rendering) + { + TRACE("ignoring software renderer because AllowSoftwareRendering is off\n"); + return; + } n_stack[++n_stack_idx] = n; for (double_buffer = 0; double_buffer <= 1; double_buffer++)

1 0

Dmitry Timoshkov : kernel32/tests: Enable kernel32 tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 231a31223cb3f366e4ad374898a1b64584c0b729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=231a31223cb3f366e4ad37489… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:03:05 2013 +0900 kernel32/tests: Enable kernel32 tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2da2de1..dce27db 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = kernel32.dll IMPORTS = user32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ actctx.c \

1 0

Dmitry Timoshkov : kernel32/tests: Fix volume tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 3fa1b837cf8bef5fd82cb2f9c2b392800402c66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa1b837cf8bef5fd82cb2f9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:03:01 2013 +0900 kernel32/tests: Fix volume tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/volume.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 02446ea..0cd00e2 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -122,7 +122,7 @@ static void test_define_dos_deviceA(void) } /* Map it to point to the current directory */ - ret = GetCurrentDirectory(sizeof(buf), buf); + ret = GetCurrentDirectoryA(sizeof(buf), buf); ok(ret, "GetCurrentDir\n"); ret = DefineDosDeviceA(0, drivestr, buf); @@ -368,26 +368,26 @@ static void test_GetVolumeInformationA(void) } /* get windows drive letter and update strings for testing */ - result = GetWindowsDirectory(windowsdir, sizeof(windowsdir)); + result = GetWindowsDirectoryA(windowsdir, sizeof(windowsdir)); ok(result < sizeof(windowsdir), "windowsdir is abnormally long!\n"); ok(result != 0, "GetWindowsDirectory: error %d\n", GetLastError()); Root_Colon[0] = windowsdir[0]; Root_Slash[0] = windowsdir[0]; Root_UNC[4] = windowsdir[0]; - result = GetCurrentDirectory(MAX_PATH, currentdir); + result = GetCurrentDirectoryA(MAX_PATH, currentdir); ok(result, "GetCurrentDirectory: error %d\n", GetLastError()); /* Note that GetCurrentDir yields no trailing slash for subdirs */ /* check for NO error on no trailing \ when current dir is root dir */ - ret = SetCurrentDirectory(Root_Slash); + ret = SetCurrentDirectoryA(Root_Slash); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError()); /* check for error on no trailing \ when current dir is subdir (windows) of queried drive */ - ret = SetCurrentDirectory(windowsdir); + ret = SetCurrentDirectoryA(windowsdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, @@ -396,7 +396,7 @@ static void test_GetVolumeInformationA(void) "GetVolumeInformationA did%s fail, last error %u\n", ret ? " not":"", GetLastError()); /* reset current directory */ - ret = SetCurrentDirectory(currentdir); + ret = SetCurrentDirectoryA(currentdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); if (toupper(currentdir[0]) == toupper(windowsdir[0])) { @@ -408,12 +408,12 @@ static void test_GetVolumeInformationA(void) /* C:\windows becomes the current directory on drive C: */ /* Note that paths to subdirs are stored without trailing slash, like what GetCurrentDir yields. */ - ret = SetEnvironmentVariable(Root_Env, windowsdir); + ret = SetEnvironmentVariableA(Root_Env, windowsdir); ok(ret, "SetEnvironmentVariable %s failed\n", Root_Env); - ret = SetCurrentDirectory(windowsdir); + ret = SetCurrentDirectoryA(windowsdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); - ret = SetCurrentDirectory(currentdir); + ret = SetCurrentDirectoryA(currentdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); /* windows dir is current on the root drive, call fails */ @@ -428,9 +428,9 @@ static void test_GetVolumeInformationA(void) NULL, NULL, fs_name_buf, fs_name_len); ok(ret, "GetVolumeInformationA with \\ failed, last error %u\n", GetLastError()); - ret = SetCurrentDirectory(Root_Slash); + ret = SetCurrentDirectoryA(Root_Slash); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); - ret = SetCurrentDirectory(currentdir); + ret = SetCurrentDirectoryA(currentdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); /* windows dir is STILL CURRENT on root drive; the call fails as before, */ @@ -442,7 +442,7 @@ static void test_GetVolumeInformationA(void) "GetVolumeInformationA did%s fail, last error %u\n", ret ? " not":"", GetLastError()); /* Now C:\ becomes the current directory on drive C: */ - ret = SetEnvironmentVariable(Root_Env, Root_Slash); /* set =C:=C:\ */ + ret = SetEnvironmentVariableA(Root_Env, Root_Slash); /* set =C:=C:\ */ ok(ret, "SetEnvironmentVariable %s failed\n", Root_Env); /* \ is current on root drive, call succeeds */ @@ -451,9 +451,9 @@ static void test_GetVolumeInformationA(void) ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); /* again, SetCurrentDirectory on another drive does not matter */ - ret = SetCurrentDirectory(Root_Slash); + ret = SetCurrentDirectoryA(Root_Slash); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); - ret = SetCurrentDirectory(currentdir); + ret = SetCurrentDirectoryA(currentdir); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); /* \ is current on root drive, call succeeds */ @@ -533,7 +533,7 @@ static void test_enum_vols(void) } /*get windows drive letter and update strings for testing */ - ret = GetWindowsDirectory( windowsdir, sizeof(windowsdir) ); + ret = GetWindowsDirectoryA( windowsdir, sizeof(windowsdir) ); ok(ret < sizeof(windowsdir), "windowsdir is abnormally long!\n"); ok(ret != 0, "GetWindowsDirecory: error %d\n", GetLastError()); path[0] = windowsdir[0];

1 0

Dmitry Timoshkov : kernel32/tests: Fix toolhelp tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 965d903f33f7ae014cb238989c14d253c65d7193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d903f33f7ae014cb238989… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:53 2013 +0900 kernel32/tests: Fix toolhelp tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/toolhelp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index bfa3127..af67688 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -75,13 +75,13 @@ static int init(void) case 4: /* the sub-process */ ev1 = (HANDLE)(INT_PTR)atoi(argv[2]); ev2 = (HANDLE)(INT_PTR)atoi(argv[3]); - ev3 = CreateEvent(NULL, FALSE, FALSE, NULL); + ev3 = CreateEventW(NULL, FALSE, FALSE, NULL); if (ev3 == NULL) ExitProcess(WAIT_ABANDONED); hThread = CreateThread(NULL, 0, sub_thread, ev3, 0, &tid); if (hThread == NULL) ExitProcess(WAIT_ABANDONED); if (!LoadLibraryA("shell32.dll")) ExitProcess(WAIT_ABANDONED); - + /* signal init of sub-process is done */ SetEvent(ev1); /* wait for parent to have done all its queries */ @@ -242,7 +242,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); ok(me.th32ProcessID == pid, "wrong returned process id\n"); for (i = 0; i < num_expected; i++) - if (!lstrcmpi(expected[i], me.szModule)) found[i]++; + if (!lstrcmpiA(expected[i], me.szModule)) found[i]++; num++; } while (pModule32Next( hSnapshot, &me )); } @@ -260,7 +260,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected trace("PID=%x base=%p size=%x %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); for (i = 0; i < num_expected; i++) - if (!lstrcmpi(expected[i], me.szModule)) found[i]++; + if (!lstrcmpiA(expected[i], me.szModule)) found[i]++; num--; } while (pModule32Next( hSnapshot, &me )); } @@ -317,8 +317,8 @@ START_TEST(toolhelp) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - ev1 = CreateEvent(&sa, FALSE, FALSE, NULL); - ev2 = CreateEvent(&sa, FALSE, FALSE, NULL); + ev1 = CreateEventW(&sa, FALSE, FALSE, NULL); + ev2 = CreateEventW(&sa, FALSE, FALSE, NULL); ok (ev1 != NULL && ev2 != NULL, "Couldn't create events\n"); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup);

1 0