February 2017 - Wine-Commits

Józef Kucia : wined3d: Fix return type for surface_load_texture().
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 80b17bef3b75543d4ab6805e2a42dd51c46dca43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b17bef3b75543d4ab6805e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 23 15:00:52 2017 +0100 wined3d: Fix return type for surface_load_texture(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 449c1fa..399f436 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2540,7 +2540,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return TRUE; } -static HRESULT surface_load_texture(struct wined3d_surface *surface, +static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;

1 0

André Hentschel : advpack: Fix some spec file entries.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 31c1895ee8b6573d7ac77a9e6d16935e52321343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c1895ee8b6573d7ac77a9e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:22:58 2017 +0100 advpack: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 665d1e1..6e02f4f 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -16,9 +16,9 @@ @ stdcall ExecuteCabA(ptr ptr ptr) @ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA -@ stdcall ExtractFilesA(str str long ptr ptr long) -@ stdcall ExtractFilesW(wstr wstr long ptr ptr long) -@ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA +@ stdcall ExtractFilesA(str str long str ptr long) +@ stdcall ExtractFilesW(wstr wstr long wstr ptr long) +@ stdcall ExtractFiles(str str long str ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) @ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA

1 0

André Hentschel : advapi32: Fix even more spec file entries.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 9c3982e49bb7a165fbf488c4f1b429692dc6b09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3982e49bb7a165fbf488c4f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:03 2017 +0100 advapi32: Fix even more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 12 ++++++------ .../api-ms-win-eventlog-legacy-l1-1-0.spec | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 88d8634..3000973 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -211,10 +211,10 @@ @ stdcall CryptSetProviderExA(str long ptr long) @ stdcall CryptSetProviderExW(wstr long ptr long) @ stdcall CryptSetProviderW(wstr long) -@ stdcall CryptSignHashA(long long ptr long ptr ptr) -@ stdcall CryptSignHashW(long long ptr long ptr ptr) -@ stdcall CryptVerifySignatureA(long ptr long long ptr long) -@ stdcall CryptVerifySignatureW(long ptr long long ptr long) +@ stdcall CryptSignHashA(long long str long ptr ptr) +@ stdcall CryptSignHashW(long long wstr long ptr ptr) +@ stdcall CryptVerifySignatureA(long ptr long long str long) +@ stdcall CryptVerifySignatureW(long ptr long long wstr long) @ stdcall DecryptFileA(str long) @ stdcall DecryptFileW(wstr long) @ stdcall DeleteAce(ptr long) @@ -654,8 +654,8 @@ @ stdcall RegSetValueW(long wstr long ptr long) @ stdcall RegUnLoadKeyA(long str) @ stdcall RegUnLoadKeyW(long wstr) -@ stdcall RegisterEventSourceA(ptr ptr) -@ stdcall RegisterEventSourceW(ptr ptr) +@ stdcall RegisterEventSourceA(str str) +@ stdcall RegisterEventSourceW(wstr wstr) # @ stub RegisterIdleTask @ stdcall RegisterServiceCtrlHandlerA(str ptr) @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) diff --git a/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec index 6a12a60..b611860 100644 --- a/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec +++ b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall DeregisterEventSource(long) advapi32.DeregisterEventSource @ stdcall GetEventLogInformation(long long ptr long ptr) advapi32.GetEventLogInformation -@ stdcall RegisterEventSourceA(ptr ptr) advapi32.RegisterEventSourceA -@ stdcall RegisterEventSourceW(ptr ptr) advapi32.RegisterEventSourceW +@ stdcall RegisterEventSourceA(str str) advapi32.RegisterEventSourceA +@ stdcall RegisterEventSourceW(wstr wstr) advapi32.RegisterEventSourceW @ stdcall ReportEventA(long long long long ptr long long ptr ptr) advapi32.ReportEventA @ stdcall ReportEventW(long long long long ptr long long ptr ptr) advapi32.ReportEventW

1 0

Francois Gouget : urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: c1ae3db312ddebc9ec430b9340d3f2874d630ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ae3db312ddebc9ec430b934… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:25:49 2017 +0100 urlmon: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon_main.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index fd13279..5de1afe 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -232,24 +232,24 @@ void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Jacek Caban : shlobj.h: Added SHGetPathFromIDListEx declaration.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: dd99871cecfe312ca7c4620bb080c3223a868dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd99871cecfe312ca7c4620bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 23 15:42:33 2017 +0100 shlobj.h: Added SHGetPathFromIDListEx declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/shlobj.h b/include/shlobj.h index c40be95..0f754d0 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -57,6 +57,15 @@ typedef enum KF_FLAG_ALIAS_ONLY = 0x80000000 } KNOWN_FOLDER_FLAG; +enum +{ + GPFIDL_DEFAULT = 0x00, + GPFIDL_ALTNAME = 0x01, + GPFIDL_UNCPRINTER = 0x02 +}; + +typedef int GPFIDL_FLAGS; + UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); @@ -83,6 +92,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) +BOOL WINAPI SHGetPathFromIDListEx(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM);

1 0

André Hentschel : d3dx9_36: Fix some spec file entries.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 4c2062c2148d02d0fd45084897e96482b830962b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2062c2148d02d0fd4508489… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:18 2017 +0100 d3dx9_36: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 58f456a..a5caf3a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -55,11 +55,11 @@ @ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileA(ptr str ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileExA(ptr str ptr ptr str long ptr ptr ptr) -@ stdcall D3DXCreateEffectFromFileExW(ptr str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromFileExW(ptr wstr ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromFileW(ptr wstr ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceA(ptr long str ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceExA(ptr long str ptr ptr str long ptr ptr ptr) -@ stdcall D3DXCreateEffectFromResourceExW(ptr long str ptr ptr str long ptr ptr ptr) +@ stdcall D3DXCreateEffectFromResourceExW(ptr long wstr ptr ptr str long ptr ptr ptr) @ stdcall D3DXCreateEffectFromResourceW(ptr long wstr ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectPool(ptr) @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr)

1 0

André Hentschel : wininet: Fix some more spec file entries.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: e9be49067fe37183de21832ea9a1be2c01653a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9be49067fe37183de21832ea… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:14 2017 +0100 wininet: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/wininet.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index ef27009..e4337a2 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -53,8 +53,8 @@ @ stub ForceNexusLookupExW @ stdcall FreeUrlCacheSpaceA(str long long) @ stdcall FreeUrlCacheSpaceW(wstr long long) -@ stdcall FtpCommandA(long long long str ptr ptr) -@ stdcall FtpCommandW(long long long wstr ptr ptr) +@ stdcall FtpCommandA(long long long str long ptr) +@ stdcall FtpCommandW(long long long wstr long ptr) @ stdcall FtpCreateDirectoryA(ptr str) @ stdcall FtpCreateDirectoryW(ptr wstr) @ stdcall FtpDeleteFileA(ptr str) @@ -119,8 +119,8 @@ @ stdcall InternetAutodialHangup(long) @ stdcall InternetCanonicalizeUrlA(str ptr ptr long) @ stdcall InternetCanonicalizeUrlW(wstr ptr ptr long) -@ stdcall InternetCheckConnectionA(ptr long long) -@ stdcall InternetCheckConnectionW(ptr long long) +@ stdcall InternetCheckConnectionA(str long long) +@ stdcall InternetCheckConnectionW(wstr long long) @ stdcall InternetClearAllPerSiteCookieDecisions() @ stdcall InternetCloseHandle(long) @ stdcall InternetCombineUrlA(str str str ptr long) @@ -150,10 +150,10 @@ @ stdcall InternetGetConnectedStateEx(ptr ptr long long) InternetGetConnectedStateExA @ stdcall InternetGetConnectedStateExA(ptr ptr long long) @ stdcall InternetGetConnectedStateExW(ptr ptr long long) -@ stdcall InternetGetCookieA(str str ptr long) +@ stdcall InternetGetCookieA(str str ptr ptr) @ stdcall InternetGetCookieExA(str str ptr ptr long ptr) @ stdcall InternetGetCookieExW(wstr wstr ptr ptr long ptr) -@ stdcall InternetGetCookieW(wstr wstr ptr long) +@ stdcall InternetGetCookieW(wstr wstr ptr ptr) @ stdcall InternetGetLastResponseInfoA(ptr ptr ptr) @ stdcall InternetGetLastResponseInfoW(ptr ptr ptr) @ stdcall InternetGetPerSiteCookieDecisionA(str ptr) @@ -183,8 +183,8 @@ @ stub InternetSecurityProtocolToStringW @ stub InternetServerPushParse @ stdcall InternetSetCookieA(str str str) -@ stdcall InternetSetCookieExA(str str str long ptr) -@ stdcall InternetSetCookieExW(wstr wstr wstr long ptr) +@ stdcall InternetSetCookieExA(str str str long long) +@ stdcall InternetSetCookieExW(wstr wstr wstr long long) @ stdcall InternetSetCookieW(wstr wstr wstr) @ stub InternetSetDialState @ stub InternetSetDialStateA

1 0

André Hentschel : dbgeng: Fix DebugConnect spec file entry.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: facd88fe3940796d26404d034e20323d6f124516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=facd88fe3940796d26404d034… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:01 2017 +0100 dbgeng: Fix DebugConnect spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index b2ba6f3..1ad1099 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -1,3 +1,3 @@ @ stdcall DebugExtensionInitialize(ptr ptr) @ stdcall DebugCreate(ptr ptr) -@ stdcall DebugConnect(ptr ptr ptr) +@ stdcall DebugConnect(str ptr ptr)

1 0

André Hentschel : msi: Fix some more spec file entries.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: 5aa2d487967c4778411ad388e0da3610a9f4aa67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa2d487967c4778411ad388e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:21 2017 +0100 msi: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 6f7266a..e0142c2 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -20,8 +20,8 @@ 24 stdcall MsiDatabaseGenerateTransformW(long long wstr long long) 25 stdcall MsiDatabaseGetPrimaryKeysA(long str ptr) 26 stdcall MsiDatabaseGetPrimaryKeysW(long wstr ptr) -27 stdcall MsiDatabaseImportA(str str long) -28 stdcall MsiDatabaseImportW(wstr wstr long) +27 stdcall MsiDatabaseImportA(str str str) +28 stdcall MsiDatabaseImportW(wstr wstr wstr) 29 stdcall MsiDatabaseMergeA(long long str) 30 stdcall MsiDatabaseMergeW(long long wstr) 31 stdcall MsiDatabaseOpenViewA(long str ptr) @@ -189,10 +189,10 @@ 193 stdcall MsiUseFeatureExW(wstr wstr long long) 194 stdcall MsiGetFileVersionA(str ptr ptr ptr ptr) 195 stdcall MsiGetFileVersionW(wstr ptr ptr ptr ptr) -196 stdcall MsiLoadStringA(long long long long long) -197 stdcall MsiLoadStringW(long long long long long) -198 stdcall MsiMessageBoxA(long long long long long long) -199 stdcall MsiMessageBoxW(long long long long long long) +196 stdcall MsiLoadStringA(long long ptr long long) +197 stdcall MsiLoadStringW(long long ptr long long) +198 stdcall MsiMessageBoxA(long str str long long long) +199 stdcall MsiMessageBoxW(long wstr wstr long long long) 200 stdcall MsiDecomposeDescriptorA(str ptr ptr ptr ptr) 201 stdcall MsiDecomposeDescriptorW(wstr ptr ptr ptr ptr) 202 stdcall MsiProvideQualifiedComponentExA(str str long str long long ptr ptr)

1 0

Jacek Caban : ole32: Added GlobalOptions object stub implementation.
by Alexandre Julliard Feb. 23, 2017

Feb. 23, 2017

Module: wine Branch: master Commit: c7e6fe6cdfacd64407d2c01f7edee5f396f7ea47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e6fe6cdfacd64407d2c01f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 12:28:57 2017 +0100 ole32: Added GlobalOptions object stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj_private.h | 4 ++ dlls/ole32/oleproxy.c | 11 +++++ dlls/ole32/tests/compobj.c | 23 +++++++++++ dlls/uuid/uuid.c | 1 + include/cguid.h | 1 + 6 files changed, 138 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9050f0a..7dd10a7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2996,6 +2996,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (release_apt) apartment_release(apt); return FTMarshalCF_Create(iid, ppv); } + if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&GlobalOptionsCF, iid, ppv); } if (CLSCTX_INPROC & dwClsContext) @@ -5072,6 +5074,102 @@ HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier) return info->apt ? S_OK : CO_E_NOTINITIALIZED; } +typedef struct { + IGlobalOptions IGlobalOptions_iface; + LONG ref; +} GlobalOptions; + +static inline GlobalOptions *impl_from_IGlobalOptions(IGlobalOptions *iface) +{ + return CONTAINING_RECORD(iface, GlobalOptions, IGlobalOptions_iface); +} + +static HRESULT WINAPI GlobalOptions_QueryInterface(IGlobalOptions *iface, REFIID riid, void **ppv) +{ + GlobalOptions *This = impl_from_IGlobalOptions(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(&IID_IGlobalOptions, riid) || IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI GlobalOptions_AddRef(IGlobalOptions *iface) +{ + GlobalOptions *This = impl_from_IGlobalOptions(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI GlobalOptions_Release(IGlobalOptions *iface) +{ + GlobalOptions *This = impl_from_IGlobalOptions(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI GlobalOptions_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) +{ + GlobalOptions *This = impl_from_IGlobalOptions(iface); + FIXME("(%p)->(%u %lx)\n", This, property, value); + return S_OK; +} + +static HRESULT WINAPI GlobalOptions_Query(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR *value) +{ + GlobalOptions *This = impl_from_IGlobalOptions(iface); + FIXME("(%p)->(%u %p)\n", This, property, value); + return E_NOTIMPL; +} + +static const IGlobalOptionsVtbl GlobalOptionsVtbl = { + GlobalOptions_QueryInterface, + GlobalOptions_AddRef, + GlobalOptions_Release, + GlobalOptions_Set, + GlobalOptions_Query +}; + +HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + GlobalOptions *global_options; + HRESULT hres; + + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return E_INVALIDARG; + + global_options = heap_alloc(sizeof(*global_options)); + if (!global_options) + return E_OUTOFMEMORY; + global_options->IGlobalOptions_iface.lpVtbl = &GlobalOptionsVtbl; + global_options->ref = 1; + + hres = IGlobalOptions_QueryInterface(&global_options->IGlobalOptions_iface, riid, ppv); + IGlobalOptions_Release(&global_options->IGlobalOptions_iface); + return hres; +} + /*********************************************************************** * DllMain (OLE32.@) */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index b9d1e85..6488287 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -297,6 +297,10 @@ extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +extern HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *pUnk, + REFIID riid, void **ppv) DECLSPEC_HIDDEN; +extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; + /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index bc8e1ea..a7b8e39 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -150,6 +150,17 @@ static const IClassFactoryVtbl ComCatCFVtbl = static IClassFactory ComCatCF = { &ComCatCFVtbl }; +static const IClassFactoryVtbl GlobalOptionsCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + GlobalOptions_CreateInstance, + ClassFactory_LockServer +}; + +IClassFactory GlobalOptionsCF = { &GlobalOptionsCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4468ad9..8f6ff71 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -32,6 +32,7 @@ #include "shlguid.h" #include "urlmon.h" /* for CLSID_FileProtocol */ #include "dde.h" +#include "cguid.h" #include "ctxtcall.h" @@ -96,6 +97,7 @@ static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); +DEFINE_GUID(CLSID_GlobalOptions, 0x0000034b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); static const WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; @@ -3558,6 +3560,26 @@ todo_wine { CoUninitialize(); } +static void test_GlobalOptions(void) +{ + IGlobalOptions *global_options; + HRESULT hres; + + CoInitialize(NULL); + + hres = CoCreateInstance(&CLSID_GlobalOptions, NULL, CLSCTX_INPROC_SERVER, + &IID_IGlobalOptions, (void**)&global_options); + ok(hres == S_OK, "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres); + + IGlobalOptions_Release(global_options); + + hres = CoCreateInstance(&CLSID_GlobalOptions, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, + &IID_IGlobalOptions, (void**)&global_options); + ok(hres == E_INVALIDARG, "CoCreateInstance(CLSID_GlobalOptions) failed: %08x\n", hres); + + CoUninitialize(); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3629,4 +3651,5 @@ START_TEST(compobj) test_CoGetCurrentLogicalThreadId(); test_IInitializeSpy(); test_CoGetInstanceFromFile(); + test_GlobalOptions(); } diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 92ec9d0..913e99c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -124,6 +124,7 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_GlobalOptions, 0x0000034b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); diff --git a/include/cguid.h b/include/cguid.h index fa9593d..bacf64c 100644 --- a/include/cguid.h +++ b/include/cguid.h @@ -99,6 +99,7 @@ extern const CLSID CLSID_InProcFreeMarshaler; extern const CLSID CLSID_Picture_Metafile; extern const CLSID CLSID_Picture_EnhMetafile; extern const CLSID CLSID_Picture_Dib; +extern const CLSID CLSID_GlobalOptions; extern const GUID GUID_TRISTATE;

1 0