August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : d3drm: Avoid LPDIRECTXFILEDATA.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 19b8ba0cb94c6f2ceb917822e9e4701372eb0ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b8ba0cb94c6f2ceb917822e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:12 2013 +0200 d3drm: Avoid LPDIRECTXFILEDATA. --- dlls/d3drm/d3drm.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 097d141..1e3547a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1355,7 +1355,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v DXFILELOADOPTIONS load_options; IDirectXFile *file = NULL; IDirectXFileEnumObject *enum_object = NULL; - LPDIRECTXFILEDATA pData = NULL; + IDirectXFileData *data = NULL; HRESULT hr; const GUID* pGuid; DWORD size; @@ -1399,11 +1399,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v if (hr != DXFILE_OK) goto end; - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK) goto end; - hr = IDirectXFileData_GetType(pData, &pGuid); + hr = IDirectXFileData_GetType(data, &pGuid); if (hr != DXFILE_OK) goto end; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&pHeader); + hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader); if ((hr != DXFILE_OK) || (size != sizeof(Header))) goto end; @@ -1428,12 +1428,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; while (1) { - hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &pData); + hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr == DXFILEERR_NOMOREOBJECTS) { TRACE("No more object\n"); @@ -1445,19 +1445,19 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - ret = load_data(iface, pData, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); + ret = load_data(iface, data, iids, iid_count, load_cb, load_ctx, load_tex_cb, load_tex_ctx, parent_frame); if (ret != D3DRM_OK) goto end; - IDirectXFileData_Release(pData); - pData = NULL; + IDirectXFileData_Release(data); + data = NULL; } ret = D3DRM_OK; end: - if (pData) - IDirectXFileData_Release(pData); + if (data) + IDirectXFileData_Release(data); if (enum_object) IDirectXFileEnumObject_Release(enum_object); if (file)

1 0

Henri Verbeet : d3drm: Avoid LPUNKNOWN.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: be6b54f52f87340e3a1ba39fb54fe52828168baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6b54f52f87340e3a1ba39fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 20 10:20:13 2013 +0200 d3drm: Avoid LPUNKNOWN. --- dlls/d3drm/d3drm.c | 29 ++++++--------- dlls/d3drm/device.c | 27 +++++---------- dlls/d3drm/face.c | 17 +++------ dlls/d3drm/frame.c | 48 +++++++++++--------------- dlls/d3drm/light.c | 9 ++--- dlls/d3drm/material.c | 7 ++-- dlls/d3drm/meshbuilder.c | 57 ++++++++++--------------------- dlls/d3drm/texture.c | 14 +++---- dlls/d3drm/viewport.c | 18 +++------ include/d3drm.h | 6 ++-- include/d3drmdef.h | 2 +- include/d3drmobj.h | 84 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 2 +- 13 files changed, 131 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6b54f52f87340e3a1ba…

1 0

Alistair Leslie-Hughes : oledberr: Add more defines.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 399bd421e53cc2da169af888a11858abfe4e518f URL: http://source.winehq.org/git/wine.git/?a=commit;h=399bd421e53cc2da169af888a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 20 09:15:24 2013 +1000 oledberr: Add more defines. --- include/oledberr.h | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index d1306e4..c739d23 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -32,7 +32,21 @@ #define DB_E_BADSTORAGEFLAG 0x80040e26 #define DB_E_BADCOMPAREOP 0x80040e27 #define DB_E_BADSTATUSVALUE 0x80040e28 - +#define DB_E_CANTSCROLLBACKWARDS 0x80040e29 +#define DB_E_BADREGIONHANDLE 0x80040e2a +#define DB_E_NONCONTIGUOUSRANGE 0x80040e2b +#define DB_E_INVALIDTRANSITION 0x80040e2c +#define DB_E_NOTASUBREGION 0x80040e2d +#define DB_E_MULTIPLESTATEMENTS 0x80040e2e +#define DB_E_INTEGRITYVIOLATION 0x80040e2f +#define DB_E_BADTYPENAME 0x80040e30 +#define DB_E_ABORTLIMITREACHED 0x80040e31 +#define DB_E_ROWSETINCOMMAND 0x80040e32 +#define DB_E_CANTTRANSLATE 0x80040e33 +#define DB_E_DUPLICATEINDEXID 0x80040e34 +#define DB_E_NOINDEX 0x80040e35 +#define DB_E_INDEXINUSE 0x80040e36 +#define DB_E_NOTABLE 0x80040e37 #define DB_E_CONCURRENCYVIOLATION 0x80040e38 #define DB_E_TABLEINUSE 0x80040e40 @@ -41,6 +55,14 @@ #define DB_E_BOOKMARKSKIPPED 0x80040e43 #define DB_E_BADPROPERTYVALUE 0x80040e44 #define DB_E_INVALID 0x80040e45 +#define DB_E_BADACCESSORFLAGS 0x80040e46 +#define DB_E_BADSTORAGEFLAGS 0x80040e47 +#define DB_E_BYREFACCESSORNOTSUPPORTED 0x80040e48 +#define DB_E_NULLACCESSORNOTSUPPORTED 0x80040e49 +#define DB_E_NOTPREPARED 0x80040e4a +#define DB_E_BADACCESSORTYPE 0x80040e4b +#define DB_E_WRITEONLYACCESSOR 0x80040e4c +#define DB_SEC_E_AUTH_FAILED 0x80040e4d #define DB_E_ALREADYINITIALIZED 0x80040e52 #define DB_E_DATAOVERFLOW 0x80040e57

1 0

Alistair Leslie-Hughes : oledb32: Implement IErrorRecord::AddErrorRecord.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: e1c34221b33dbde0d3e8c97eff70783377ecead4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c34221b33dbde0d3e8c97ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 11:13:34 2013 +1000 oledb32: Implement IErrorRecord::AddErrorRecord. --- dlls/oledb32/errorinfo.c | 31 ++++++++++++++++++++++++++++--- dlls/oledb32/tests/database.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index eef2b37..4a2a1e2 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); struct ErrorEntry { struct list entry; - ERRORINFO* info; + ERRORINFO info; DISPPARAMS dispparams; IUnknown *unknown; DWORD lookupID; @@ -109,6 +109,7 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); + struct ErrorEntry *cursor, *cursor2; TRACE("(%p)->%u\n",This,ref+1); @@ -117,6 +118,15 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) SysFreeString(This->source); SysFreeString(This->description); SysFreeString(This->help_file); + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->errors, struct ErrorEntry, entry) + { + list_remove(&cursor->entry); + if(cursor->unknown) + IUnknown_Release(cursor->unknown); + + heap_free(cursor); + } heap_free(This); } return ref; @@ -226,12 +236,27 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + struct ErrorEntry *entry; - FIXME("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); + TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); - if(pErrorInfo) + if(!pErrorInfo) return E_INVALIDARG; + entry = heap_alloc(sizeof(*entry)); + if(!entry) + return E_OUTOFMEMORY; + + entry->info = *pErrorInfo; + if(pdispparams) + entry->dispparams = *pdispparams; + entry->unknown = punkCustomError; + if(entry->unknown) + IUnknown_AddRef(entry->unknown); + entry->lookupID = dwDynamicErrorID; + + list_add_head(&This->errors, &entry->entry); + return S_OK; } diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 7b129b8..f41fd6c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -31,6 +31,7 @@ #include "shlobj.h" #include "msdaguid.h" #include "initguid.h" +#include "oledberr.h" #include "wine/test.h" @@ -159,6 +160,45 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); if(hr == S_OK) { + ERRORINFO info, info2, info3; + ULONG cnt = 0; + + memset(&info, 0, sizeof(ERRORINFO)); + info.dwMinor = 1; + memset(&info2, 0, sizeof(ERRORINFO)); + info2.dwMinor = 2; + memset(&info3, 0, sizeof(ERRORINFO)); + + hr = IErrorRecords_AddErrorRecord(errrecs, NULL, 268435456, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info, 1, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 1, "expected 1 got %d\n", cnt); + + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 2, NULL, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IErrorRecords_GetRecordCount(errrecs, &cnt); + ok(hr == S_OK, "got %08x\n", hr); + ok(cnt == 2, "expected 2 got %d\n", cnt); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 100, &info3); + ok(hr == DB_E_BADRECORDNUM, "got %08x\n", hr); + + hr = IErrorRecords_GetBasicErrorInfo(errrecs, 0, &info3); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); + } + IErrorRecords_Release(errrecs); }

1 0

Nikolay Sivov : ole32: Fix standard GIT initialization.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: 2f21130f2e922614382425b702b90bc581d526e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f21130f2e922614382425b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 18 09:10:18 2013 +0400 ole32: Fix standard GIT initialization. --- dlls/ole32/compobj.c | 8 +----- dlls/ole32/compobj_private.h | 4 +-- dlls/ole32/git.c | 43 ++++++++++++++++++++++++----------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 92ace8a..710f21e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2905,15 +2905,11 @@ HRESULT WINAPI CoCreateInstance( /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. - * Rather than create a class factory, we can just check for it here */ if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) - StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); - hres = IGlobalInterfaceTable_QueryInterface((IGlobalInterfaceTable*)StdGlobalInterfaceTableInstance, - iid, - ppv); + IGlobalInterfaceTable *git = get_std_git(); + hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); if (hres) return hres; TRACE("Retrieved GIT (%p)\n", *ppv); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c4379cb..6352553 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -173,10 +173,8 @@ struct oletls /* Global Interface Table Functions */ - -extern void* StdGlobalInterfaceTable_Construct(void) DECLSPEC_HIDDEN; +extern IGlobalInterfaceTable *get_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; -extern void* StdGlobalInterfaceTableInstance DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key) DECLSPEC_HIDDEN; HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index dd65c2e..ad921ed 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -72,7 +72,7 @@ typedef struct StdGlobalInterfaceTableImpl } StdGlobalInterfaceTableImpl; -void* StdGlobalInterfaceTableInstance; +static IGlobalInterfaceTable *std_git; static CRITICAL_SECTION git_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -96,7 +96,7 @@ static void StdGlobalInterfaceTable_Destroy(void* This) FIXME("Revoke held interfaces here\n"); HeapFree(GetProcessHeap(), 0, This); - StdGlobalInterfaceTableInstance = NULL; + std_git = NULL; } /*** @@ -335,9 +335,8 @@ GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - if (StdGlobalInterfaceTableInstance == NULL) - StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); - return IGlobalInterfaceTable_QueryInterface( (IGlobalInterfaceTable*) StdGlobalInterfaceTableInstance, riid, ppv); + IGlobalInterfaceTable *git = get_std_git(); + return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); } FIXME("(%s), not supported.\n",debugstr_guid(riid)); @@ -378,19 +377,27 @@ static const IGlobalInterfaceTableVtbl StdGlobalInterfaceTableImpl_Vtbl = StdGlobalInterfaceTable_GetInterfaceFromGlobal }; -/** This function constructs the GIT. It should only be called once **/ -void* StdGlobalInterfaceTable_Construct(void) +IGlobalInterfaceTable* get_std_git(void) { - StdGlobalInterfaceTableImpl* newGIT; - - newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); - if (newGIT == 0) return newGIT; - - newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; - newGIT->ref = 1; /* Initialise the reference count */ - list_init(&newGIT->list); - newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ - TRACE("Created the GIT at %p\n", newGIT); + if (!std_git) + { + StdGlobalInterfaceTableImpl* newGIT; + + newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); + if (!newGIT) return NULL; + + newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; + newGIT->ref = 1; + list_init(&newGIT->list); + newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ + + if (InterlockedCompareExchangePointer((void**)&std_git, &newGIT->IGlobalInterfaceTable_iface, NULL)) + { + StdGlobalInterfaceTable_Destroy(newGIT); + } + else + TRACE("Created the GIT at %p\n", newGIT); + } - return (void*)newGIT; + return std_git; }

1 0

Nikolay Sivov : ole32: Test HRESULT values using proper success code.
by Alexandre Julliard 20 Aug '13

20 Aug '13

Module: wine Branch: master Commit: ba999f05e11f1e09e43dea1032076576693dd4f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba999f05e11f1e09e43dea103… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 18 09:14:20 2013 +0400 ole32: Test HRESULT values using proper success code. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/git.c | 2 +- dlls/ole32/rpc.c | 17 +++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 710f21e..45376d1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2910,7 +2910,7 @@ HRESULT WINAPI CoCreateInstance( { IGlobalInterfaceTable *git = get_std_git(); hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); - if (hres) return hres; + if (hres != S_OK) return hres; TRACE("Retrieved GIT (%p)\n", *ppv); return S_OK; @@ -2992,7 +2992,7 @@ HRESULT WINAPI CoCreateInstanceEx( &IID_IUnknown, (VOID**)&pUnk); - if (hr) + if (hr != S_OK) return hr; /* diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index ad921ed..f5dd00b 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -296,7 +296,7 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( hres = CoUnmarshalInterface(stream, riid, ppv); IStream_Release(stream); - if (hres) { + if (hres != S_OK) { WARN("Failed to unmarshal stream\n"); return hres; } diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5bade5c..dd67546 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1519,7 +1519,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell * the RPC runtime that the call failed */ - if (hr) RpcRaiseException(hr); + if (hr != S_OK) RpcRaiseException(hr); } /* stub registration */ @@ -1656,6 +1656,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; + LONG ret; hres = COM_OpenKeyForCLSID(rclsid, wszLocalServer32, KEY_READ, &key); if (FAILED(hres)) { @@ -1663,9 +1664,9 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) return hres; } - hres = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size); + ret = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size); RegCloseKey(key); - if (hres) { + if (ret) { WARN("No default value for LocalServer32 key\n"); return REGDB_E_CLASSNOTREG; /* FIXME: check retval */ } @@ -1861,9 +1862,9 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) return E_NOINTERFACE; hres = CreateStreamOnHGlobal(0,TRUE,&pStm); - if (hres) return hres; + if (hres != S_OK) return hres; hres = IStream_Write(pStm,marshalbuffer,bufferlen,&res); - if (hres) goto out; + if (hres != S_OK) goto out; seekto.u.LowPart = 0;seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); @@ -1935,13 +1936,13 @@ static DWORD WINAPI local_server_thread(LPVOID param) TRACE("marshalling LocalServer to client\n"); hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); - if (hres) + if (hres != S_OK) break; seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); - if (hres) { + if (hres != S_OK) { FIXME("IStream_Seek failed, %x\n",hres); break; } @@ -1950,7 +1951,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) buffer = HeapAlloc(GetProcessHeap(),0,buflen); hres = IStream_Read(pStm,buffer,buflen,&res); - if (hres) { + if (hres != S_OK) { FIXME("Stream Read failed, %x\n",hres); HeapFree(GetProcessHeap(),0,buffer); break;

1 0

Michael Stefaniuc : gdi32/tests: Use the standard way of allocating a struct with VLA on the stack.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: da425748bb441bb471de728af090b10550917eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=da425748bb441bb471de728af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 19 11:44:18 2013 +0200 gdi32/tests: Use the standard way of allocating a struct with VLA on the stack. --- dlls/gdi32/tests/pen.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index ed7927a..bbbb439 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -511,12 +511,8 @@ static void test_ps_userstyle(void) LOGBRUSH lb; HPEN pen; INT size, i; - - struct - { - EXTLOGPEN elp; - DWORD style_data[15]; - } ext_pen; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; + EXTLOGPEN *ext_pen = (EXTLOGPEN *)buffer; lb.lbColor = 0x00ff0000; lb.lbStyle = BS_SOLID; @@ -561,11 +557,11 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 16, style); ok(pen != 0, "ExtCreatePen should not fail\n"); - size = GetObject(pen, sizeof(ext_pen), &ext_pen); + size = GetObject(pen, sizeof(buffer), ext_pen); expect(FIELD_OFFSET(EXTLOGPEN,elpStyleEntry[16]), size); for(i = 0; i < 16; i++) - expect(style[i], ext_pen.elp.elpStyleEntry[i]); + expect(style[i], ext_pen->elpStyleEntry[i]); DeleteObject(pen); }

1 0

Michael Stefaniuc : gdi32/tests: Use offsetof instead of sizeof on structs with VLA.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 14e20162f9448a648f3973a86e03aea17387c040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e20162f9448a648f3973a86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 19 11:46:37 2013 +0200 gdi32/tests: Use offsetof instead of sizeof on structs with VLA. --- dlls/gdi32/tests/pen.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index bbbb439..a4d544c 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -153,7 +153,8 @@ static void test_logpen(void) if (pen[i].style == PS_NULL) { ok(hpen == GetStockObject(NULL_PEN), "hpen should be a stock NULL_PEN\n"); - ok(size == sizeof(EXTLOGPEN), "GetObject returned %d, error %d\n", size, GetLastError()); + ok(size == offsetof(EXTLOGPEN, elpStyleEntry[1]), "GetObject returned %d, error %d\n", + size, GetLastError()); ok(elp.elpPenStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, elp.elpPenStyle); ok(elp.elpWidth == 0, "expected 0, got %u\n", elp.elpWidth); ok(elp.elpColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, elp.elpColor); @@ -275,7 +276,7 @@ static void test_logpen(void) memset(&unset_hatch, 0xb0, sizeof(unset_hatch)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(elp), &elp); - ok(size == sizeof(EXTLOGPEN), + ok(size == offsetof(EXTLOGPEN, elpStyleEntry[1]), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == unset_hatch, "expected 0xb0b0b0b0, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0xb0b0b0b0, "expected 0xb0b0b0b0, got %x\n", ext_pen->elpNumEntries); @@ -385,11 +386,11 @@ test_geometric_pens: memset(elp_buffer, 0xb0, sizeof(elp_buffer)); SetLastError(0xdeadbeef); /* buffer is too small for user styles */ - size = GetObject(hpen, sizeof(EXTLOGPEN), elp_buffer); + size = GetObject(hpen, offsetof(EXTLOGPEN, elpStyleEntry[1]), elp_buffer); switch (pen[i].style) { case PS_NULL: - ok(size == sizeof(EXTLOGPEN), + ok(size == offsetof(EXTLOGPEN, elpStyleEntry[1]), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == 0, "expected 0, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -568,7 +569,7 @@ static void test_ps_userstyle(void) static void test_brush_pens(void) { - char buffer[sizeof(EXTLOGPEN) + 15 * sizeof(DWORD)]; + char buffer[offsetof(EXTLOGPEN, elpStyleEntry[16])]; EXTLOGPEN *elp = (EXTLOGPEN *)buffer; LOGBRUSH lb; HPEN pen = 0;

1 0

Michael Stefaniuc : gdi32/tests: Replace FIELD_OFFSET with offsetof for the sake of consistency.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 4f94913e0474d6e1d5a32da9b94e0792d86d6104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f94913e0474d6e1d5a32da9b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 19 11:52:37 2013 +0200 gdi32/tests: Replace FIELD_OFFSET with offsetof for the sake of consistency. --- dlls/gdi32/tests/pen.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index a4d544c..f7e0f1d 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -240,12 +240,12 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -283,7 +283,7 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -292,7 +292,7 @@ static void test_logpen(void) break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -350,12 +350,12 @@ test_geometric_pens: break; case PS_USERSTYLE: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -410,7 +410,7 @@ test_geometric_pens: ok(!size /*&& GetLastError() == ERROR_INVALID_PARAMETER*/, "GetObject should fail: size %d, error %d\n", size, GetLastError()); size = GetObject(hpen, sizeof(elp_buffer), elp_buffer); - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -419,7 +419,7 @@ test_geometric_pens: break; default: - ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), + ok(size == offsetof( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -559,7 +559,7 @@ static void test_ps_userstyle(void) ok(pen != 0, "ExtCreatePen should not fail\n"); size = GetObject(pen, sizeof(buffer), ext_pen); - expect(FIELD_OFFSET(EXTLOGPEN,elpStyleEntry[16]), size); + ok(size == offsetof(EXTLOGPEN, elpStyleEntry[16]), "wrong size %d\n", size); for(i = 0; i < 16; i++) expect(style[i], ext_pen->elpStyleEntry[i]); @@ -602,7 +602,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == lb.lbStyle, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == RGB(12,34,56), "wrong color %x\n", elp->elpColor ); @@ -627,7 +627,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_PATTERN, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == 0, "wrong color %x\n", elp->elpColor ); @@ -642,7 +642,7 @@ static void test_brush_pens(void) pen = ExtCreatePen( PS_DOT | PS_GEOMETRIC, 3, &lb, 0, NULL ); ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == (PS_DOT | PS_GEOMETRIC), "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_DIBPATTERNPT, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == 0, "wrong color %x\n", elp->elpColor ); @@ -668,7 +668,7 @@ static void test_brush_pens(void) { ok( pen != 0, "ExtCreatePen failed err %u\n", GetLastError() ); size = GetObject( pen, sizeof(buffer), elp ); - ok( size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); + ok( size == offsetof( EXTLOGPEN, elpStyleEntry ), "wrong size %u\n", size ); ok( elp->elpPenStyle == PS_DOT, "wrong pen style %x\n", elp->elpPenStyle ); ok( elp->elpBrushStyle == BS_SOLID, "wrong brush style %x\n", elp->elpBrushStyle ); ok( elp->elpColor == RGB(12,34,56), "wrong color %x\n", elp->elpColor );

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLStyleSheet object.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 3172d351884de55175336e426ba798ca251aca98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3172d351884de55175336e426… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 12:12:11 2013 +0200 mshtml: Added IDispatchEx support to HTMLStyleSheet object. --- dlls/mshtml/htmlstylesheet.c | 34 +++++++++++++++++++++++++--------- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index e0c74bc..4b43082 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLStyleSheet { + DispatchEx dispex; IHTMLStyleSheet IHTMLStyleSheet_iface; LONG ref; @@ -412,6 +413,8 @@ static HRESULT WINAPI HTMLStyleSheet_QueryInterface(IHTMLStyleSheet *iface, REFI }else if(IsEqualGUID(&IID_IHTMLStyleSheet, riid)) { TRACE("(%p)->(IID_IHTMLStyleSheet %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -449,16 +452,16 @@ static ULONG WINAPI HTMLStyleSheet_Release(IHTMLStyleSheet *iface) static HRESULT WINAPI HTMLStyleSheet_GetTypeInfoCount(IHTMLStyleSheet *iface, UINT *pctinfo) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pctinfo); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyleSheet_GetTypeInfo(IHTMLStyleSheet *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLStyleSheet_GetIDsOfNames(IHTMLStyleSheet *iface, REFIID riid, @@ -466,9 +469,8 @@ static HRESULT WINAPI HTMLStyleSheet_GetIDsOfNames(IHTMLStyleSheet *iface, REFII LCID lcid, DISPID *rgDispId) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLStyleSheet_Invoke(IHTMLStyleSheet *iface, DISPID dispIdMember, @@ -476,9 +478,10 @@ static HRESULT WINAPI HTMLStyleSheet_Invoke(IHTMLStyleSheet *iface, DISPID dispI VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyleSheet_put_title(IHTMLStyleSheet *iface, BSTR v) @@ -676,6 +679,17 @@ static const IHTMLStyleSheetVtbl HTMLStyleSheetVtbl = { HTMLStyleSheet_get_rules }; +static const tid_t HTMLStyleSheet_iface_tids[] = { + IHTMLStyleSheet_tid, + 0 +}; +static dispex_static_data_t HTMLStyleSheet_dispex = { + NULL, + DispHTMLStyleSheet_tid, + NULL, + HTMLStyleSheet_iface_tids +}; + IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet *nsstylesheet) { HTMLStyleSheet *ret = heap_alloc(sizeof(HTMLStyleSheet)); @@ -685,6 +699,8 @@ IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet *nsstylesheet) ret->ref = 1; ret->nsstylesheet = NULL; + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLStyleSheet_iface, &HTMLStyleSheet_dispex); + if(nsstylesheet) { nsres = nsIDOMStyleSheet_QueryInterface(nsstylesheet, &IID_nsIDOMCSSStyleSheet, (void**)&ret->nsstylesheet); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bbdb9d..8063ac5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -106,6 +106,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLSelectElement) \ XDIID(DispHTMLStyle) \ XDIID(DispHTMLStyleElement) \ + XDIID(DispHTMLStyleSheet) \ XDIID(DispHTMLStyleSheetsCollection) \ XDIID(DispHTMLTable) \ XDIID(DispHTMLTableCell) \ @@ -178,6 +179,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLStyle5) \ XIID(IHTMLStyle6) \ XIID(IHTMLStyleElement) \ + XIID(IHTMLStyleSheet) \ XIID(IHTMLStyleSheetsCollection) \ XIID(IHTMLTable) \ XIID(IHTMLTable2) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8d3b951..7abd19b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5839,6 +5839,8 @@ static void test_stylesheet(IDispatch *disp) IHTMLStyleSheet *stylesheet; HRESULT hres; + test_disp2((IUnknown*)disp, &DIID_DispHTMLStyleSheet, &IID_IHTMLStyleSheet, "[object]"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLStyleSheet, (void**)&stylesheet); ok(hres == S_OK, "Could not get IHTMLStyleSheet: %08x\n", hres);

1 0