wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

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

22 Oct '13

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 22 Oct '13

22 Oct '13

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 22 Oct '13

22 Oct '13

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 22 Oct '13

22 Oct '13

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 22 Oct '13

22 Oct '13

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 in ProgIDFromCLSID().
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 03dbbe21039e6b4387ee5e37c06051af530c5006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dbbe21039e6b4387ee5e37c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 27 23:11:46 2013 +0400 ole32: Support activation context in ProgIDFromCLSID(). --- dlls/ole32/compobj.c | 22 ++++++++++++++++++++++ dlls/ole32/tests/compobj.c | 9 ++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d70bfc1..b8954fb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2227,6 +2227,7 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) { static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; + ACTCTX_SECTION_KEYED_DATA data; HKEY hkey; HRESULT ret; LONG progidlen = 0; @@ -2238,6 +2239,27 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) } *ppszProgID = NULL; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data)) + { + struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; + if (comclass->progid_len) + { + WCHAR *ptrW; + + *ppszProgID = CoTaskMemAlloc(comclass->progid_len + sizeof(WCHAR)); + if (!*ppszProgID) return E_OUTOFMEMORY; + + ptrW = (WCHAR*)((BYTE*)comclass + comclass->progid_offset); + memcpy(*ppszProgID, ptrW, comclass->progid_len + sizeof(WCHAR)); + return S_OK; + } + else + return REGDB_E_CLASSNOTREG; + } + ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); if (FAILED(ret)) return ret; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 8998251..3bc98fc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -309,19 +309,14 @@ static void test_ProgIDFromCLSID(void) static const WCHAR customfontW[] = {'C','u','s','t','o','m','F','o','n','t',0}; hr = ProgIDFromCLSID(&CLSID_non_existent, &progid); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - { - ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); - CoTaskMemFree(progid); - } + ok(!lstrcmpiW(progid, progidW), "got %s\n", wine_dbgstr_w(progid)); + CoTaskMemFree(progid); /* try something registered and redirected */ progid = NULL; hr = ProgIDFromCLSID(&CLSID_StdFont, &progid); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpiW(progid, customfontW), "got wrong progid %s\n", wine_dbgstr_w(progid)); CoTaskMemFree(progid);

1 0

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

22 Oct '13

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

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 1f6e66babe9f26d38a22bac70015c0eb8c9dab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6e66babe9f26d38a22bac70… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:11 2013 +0200 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/comboex.c | 6 +++--- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/msg.h | 2 +- dlls/comctl32/tests/subclass.c | 6 +++--- dlls/comctl32/tests/treeview.c | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index cc17327..9a5bee3 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -473,7 +473,7 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -485,7 +485,7 @@ static int init(void) if (!pInitCommonControlsEx) { win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); iccex.dwICC = ICC_USEREX_CLASSES; @@ -510,7 +510,7 @@ static int init(void) assert(hComboExParentWnd != NULL); hMainHinst = GetModuleHandleA(NULL); - return 1; + return TRUE; } static void cleanup(void) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 02fa61a..f6c6481 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1635,7 +1635,7 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP return 0L; } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1650,7 +1650,7 @@ static int init(void) if (!pInitCommonControlsEx) { skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); @@ -1686,7 +1686,7 @@ static int init(void) NULL, NULL, GetModuleHandleA(NULL), 0); assert(hHeaderParentWnd != NULL); ShowWindow(hHeaderParentWnd, SW_SHOW); - return 1; + return TRUE; } /* maximum 8 items allowed */ diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 1d78ffe..fbe8fe7 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -106,7 +106,7 @@ static inline void flush_sequences(struct msg_sequence **seq, int n) } static void ok_sequence_(struct msg_sequence **seq, int sequence_index, - const struct message *expected, const char *context, int todo, + const struct message *expected, const char *context, BOOL todo, const char *file, int line) { struct msg_sequence *msg_seq = seq[sequence_index]; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 8511275..e32919b 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -279,7 +279,7 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -static int init_function_pointers(void) +static BOOL init_function_pointers(void) { HMODULE hmod; void *ptr; @@ -299,7 +299,7 @@ static int init_function_pointers(void) if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); - return 0; + return FALSE; } /* test named exports */ @@ -316,7 +316,7 @@ static int init_function_pointers(void) #undef TESTNAMED } - return 1; + return TRUE; } START_TEST(subclass) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index b784140..d523c23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -957,8 +957,8 @@ static void test_get_set_tooltips(void) static void test_get_set_unicodeformat(void) { - BOOL bPreviousSetting = 0; - BOOL bNewSetting = 0; + BOOL bPreviousSetting = FALSE; + BOOL bNewSetting = FALSE; HWND hTree; hTree = create_treeview_control(0); @@ -966,19 +966,19 @@ static void test_get_set_unicodeformat(void) /* Check that an invalid format returned by NF_QUERY defaults to ANSI */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bPreviousSetting == 0, "Format should be ANSI.\n"); + ok(bPreviousSetting == FALSE, "Format should be ANSI.\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Set to Unicode */ bPreviousSetting = (BOOL)SendMessage( hTree, TVM_SETUNICODEFORMAT, 1, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 1, "Unicode setting did not work.\n"); + ok(bNewSetting == TRUE, "Unicode setting did not work.\n"); /* Set to ANSI */ SendMessage( hTree, TVM_SETUNICODEFORMAT, 0, 0 ); bNewSetting = (BOOL)SendMessage( hTree, TVM_GETUNICODEFORMAT, 0, 0 ); - ok(bNewSetting == 0, "ANSI setting did not work.\n"); + ok(bNewSetting == FALSE, "ANSI setting did not work.\n"); /* Revert to original setting */ SendMessage( hTree, TVM_SETUNICODEFORMAT, bPreviousSetting, 0 );

1 0

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

22 Oct '13

Module: wine Branch: master Commit: 6eadc8ca4efe2758a7de336f32e8832af6f0ca94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eadc8ca4efe2758a7de336f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:10 2013 +0200 winhlp32: Use BOOL type where appropriate. --- programs/winhlp32/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 3a421da..cb1ac55 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -70,7 +70,7 @@ static void WINHELP_InitFonts(HWND hWnd) #define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) static HFONT fonts[FONTS_LEN]; - static BOOL init = 0; + static BOOL init = FALSE; win->fonts_len = FONTS_LEN; win->fonts = fonts; @@ -84,7 +84,7 @@ static void WINHELP_InitFonts(HWND hWnd) fonts[i] = CreateFontIndirectW(&logfontlist[i]); } - init = 1; + init = TRUE; } }

1 0

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

22 Oct '13

Module: wine Branch: master Commit: 0666ac3ed8cb2f3cd692d239c8bd48145553d043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666ac3ed8cb2f3cd692d239c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 22 00:16:09 2013 +0200 shell32: Use BOOL type where appropriate. --- dlls/shell32/classes.c | 4 ++-- dlls/shell32/control.c | 4 ++-- dlls/shell32/shellstring.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 7 ++++--- dlls/shell32/shlview_cmenu.c | 3 ++- dlls/shell32/xdg.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 10ff970..70abfe6 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -58,7 +58,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; @@ -92,7 +92,7 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP /* added because we do not want to have double dots */ if (szExtension[0] == '.') - bPrependDot = 0; + bPrependDot = FALSE; if (bPrependDot) szTemp[0] = '.'; diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 659a871..fe392e3 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -711,7 +711,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) signed sp = -1; LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; - int quoted = 0; + BOOL quoted = FALSE; CPlApplet *applet; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); @@ -746,7 +746,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) if (extraPmtsBuf != NULL) { beg = end = extraPmtsBuf; - quoted = 0; + quoted = FALSE; for (;;) { ch = *end; diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 6a58879..6b511d2 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -209,7 +209,7 @@ static BOOL OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle) if (lstrcpynW ( lpwStr, lpOle, nwStr)) { return lstrlenW (lpwStr); } - return 0; + return FALSE; } BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 4bd964c..357e4ff 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1138,7 +1138,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, { IGenericSFImpl *This = impl_from_ISFHelper(iface); WCHAR wszNewDir[MAX_PATH]; - DWORD bRes; + BOOL bRes; HRESULT hres = E_FAIL; TRACE ("(%p)(%s %p)\n", This, debugstr_w(pwszName), ppidlOut); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 686edb0..ac7fd48 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -255,7 +255,8 @@ static DWORD get_drive_map(void) 'P','o','l','i','c','i','e','s','\\', 'E','x','p','l','o','r','e','r',0}; static const WCHAR nodrivesW[] = {'N','o','D','r','i','v','e','s',0}; - static DWORD drive_mask, init_done; + static DWORD drive_mask; + static BOOL init_done = FALSE; if (!init_done) { @@ -277,7 +278,7 @@ static DWORD get_drive_map(void) RegCloseKey( hkey ); } drive_mask = mask; - init_done = 1; + init_done = TRUE; } return GetLogicalDrives() & ~drive_mask; @@ -626,7 +627,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, static const WCHAR wantsForParsingW[] = { 'W','a','n','t','s','F','o','r','P','a','r','s','i','n', 'g',0 }; - int bWantsForParsing = FALSE; + BOOL bWantsForParsing = FALSE; WCHAR szRegPath[100]; LONG r; diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fb4ef4e..0705948 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -203,7 +203,8 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( static void DoOpenExplore(ContextMenu *This, HWND hwnd, LPCSTR verb) { - UINT i, bFolderFound = FALSE; + UINT i; + BOOL bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei; diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index d05539c..6eb4163 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -282,7 +282,7 @@ BOOL XDG_MakeDirs(const char *path) */ static int dskentry_encode(const char *value, char *output) { - int only_spc = TRUE; + BOOL only_spc = TRUE; int num_written = 0; const char *c; for (c = value; *c; c++)

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013