November 2009 - Wine-Commits

Paul Vriens : shell32/tests: Cope with systems lacking SHGetSpecialFolderPath.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: f8134cee102f33b585f30011f02674cc4280e660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8134cee102f33b585f30011f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 26 20:20:08 2009 +0100 shell32/tests: Cope with systems lacking SHGetSpecialFolderPath. --- dlls/shell32/tests/progman_dde.c | 53 +++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 6ba22ed..8902d90 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -89,23 +89,47 @@ static void init_strings(void) { HKEY key; DWORD fullpath = 0; - DWORD size = sizeof(DWORD); + DWORD size; char startup[MAX_PATH]; - if (!pSHGetSpecialFolderPathA) - return; - - /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ - pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); - if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) + if (pSHGetSpecialFolderPathA) { - /* Win9x */ - lstrcpyA(CommonPrograms, Programs); + /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ + pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); + if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) + { + /* Win9x */ + lstrcpyA(CommonPrograms, Programs); + } + pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + } + else + { + LONG res; + + /* Older Win9x and NT4 */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); + size = sizeof(CommonPrograms); + res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size); + RegCloseKey(key); + if (res != ERROR_SUCCESS) + { + /* Win9x */ + lstrcpyA(CommonPrograms, Programs); + } + + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); + size = sizeof(Programs); + RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size); + size = sizeof(startup); + RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + RegCloseKey(key); } - pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); - lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); + size = sizeof(DWORD); RegQueryValueExA(key, "FullPath", NULL, NULL, (LPBYTE)&fullpath, &size); RegCloseKey(key); if (fullpath == 1) @@ -291,9 +315,6 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx DWORD attributes; int len; - if (!pSHGetSpecialFolderPathA) - return; - path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (path != NULL) { @@ -580,10 +601,6 @@ START_TEST(progman_dde) init_function_pointers(); init_strings(); - /* Only report this once */ - if (!pSHGetSpecialFolderPathA) - win_skip("SHGetSpecialFolderPathA is not available\n"); - /* Initialize DDE Instance */ err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));

1 0

Jacek Caban : mshtml: Fixed ref count leak and code clean up.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 5dd4248ff36bd88d75359dc45e79add7ffb47d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd4248ff36bd88d75359dc45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 24 21:12:40 2009 +0100 mshtml: Fixed ref count leak and code clean up. --- dlls/mshtml/tests/dom.c | 25 ++++--------------------- 1 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bd55c9f..1387b13 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5606,8 +5606,6 @@ static void test_frame(IDispatch *disp, const char *exp_id) IHTMLDocument2 *parent_doc, *top_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; - IHTMLElement *html_elem; - BSTR bstr; HRESULT hres; hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); @@ -5621,17 +5619,8 @@ static void test_frame(IDispatch *disp, const char *exp_id) if(FAILED(hres)) return; - hres = IHTMLFrameBase_QueryInterface(frame_elem, &IID_IHTMLElement, (void**)&html_elem); - ok(hres == S_OK, "Could not get IHTMLElement interface: 0x%08x\n", hres); - IHTMLFrameBase_Release(frame_elem); - if(FAILED(hres)) - return; - - hres = IHTMLElement_get_id(html_elem, &bstr); - ok(hres == S_OK, "IHTMLElement_get_id failed: 0x%08x\n", hres); - ok(!strcmp_wa(bstr, exp_id), "Expected ID: \"%s\", found ID: %s\n", exp_id, wine_dbgstr_w(bstr)); - IHTMLElement_Release(html_elem); - SysFreeString(bstr); + test_elem_id((IUnknown*)frame_elem, exp_id); + IHTMLElement_Release(frame_elem); hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow2, (void**)&frame2); ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08x\n", hres); @@ -5653,11 +5642,8 @@ static void test_frame(IDispatch *disp, const char *exp_id) return; } - hres = IHTMLDocument2_get_title(parent_doc, &bstr); - ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); - ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); + test_doc_title(parent_doc, "frameset test"); IHTMLDocument2_Release(parent_doc); - SysFreeString(bstr); /* test get_top */ hres = IHTMLWindow2_get_top(frame2, &top); @@ -5672,11 +5658,8 @@ static void test_frame(IDispatch *disp, const char *exp_id) if(FAILED(hres)) return; - hres = IHTMLDocument2_get_title(top_doc, &bstr); - ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); - ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); + test_doc_title(top_doc, "frameset test"); IHTMLDocument2_Release(top_doc); - SysFreeString(bstr); } static void test_frameset(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Moved IHTMLFrameBase2 implementation to HTMLFrameBase object.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 7c64ab1e83ebd9dbd2c0c9152ec5327140cb06a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c64ab1e83ebd9dbd2c0c9152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 24 21:13:12 2009 +0100 mshtml: Moved IHTMLFrameBase2 implementation to HTMLFrameBase object. --- dlls/mshtml/htmlframebase.c | 144 ++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmliframe.c | 156 +----------------------------------------- dlls/mshtml/mshtml_private.h | 4 +- 3 files changed, 148 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c64ab1e83ebd9dbd2c0c…

1 0

Maarten Lankhorst : openal32: Add alBufferDataStatic.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 49b39a88155117a6bf73a5531d3da4402b45bad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b39a88155117a6bf73a5531… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 12:39:39 2009 +0100 openal32: Add alBufferDataStatic. --- dlls/openal32/openal.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 3d2bb00..04d0d35 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -44,6 +44,7 @@ typedef struct wine_ALCcontext { ALboolean been_current; + ALvoid (AL_APIENTRY*alBufferDataStatic)(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq); ALvoid (AL_APIENTRY*alGenFilters)(ALsizei n, ALuint* filters); ALvoid (AL_APIENTRY*alDeleteFilters)(ALsizei n, const ALuint* filters); ALboolean (AL_APIENTRY*alIsFilter)(ALuint fid); @@ -190,6 +191,7 @@ ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context) CurrentCtx->been_current = AL_TRUE; #define LOADFUNC(x) CurrentCtx->x = alGetProcAddress(#x) + LOADFUNC(alBufferDataStatic); LOADFUNC(alGenFilters); LOADFUNC(alDeleteFilters); LOADFUNC(alIsFilter); @@ -620,6 +622,11 @@ ALvoid CDECL wine_alBufferData(ALuint bid, ALenum format, const ALvoid* data, AL alBufferData(bid, format, data, size, freq); } +ALvoid CDECL wine_alBufferDataStatic(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq) +{ + CurrentCtx->alBufferDataStatic(bid, format, data, size, freq); +} + ALvoid CDECL wine_alGetBufferf(ALuint bid, ALenum param, ALfloat* value) { alGetBufferf(bid, param, value); @@ -1008,6 +1015,7 @@ static const struct FuncList ALFuncs[] = { { "alDeleteBuffers", wine_alDeleteBuffers }, { "alIsBuffer", wine_alIsBuffer }, { "alBufferData", wine_alBufferData }, + { "alBufferDataStatic", wine_alBufferDataStatic }, { "alBufferf", wine_alBufferf }, { "alBuffer3f", wine_alBuffer3f }, { "alBufferfv", wine_alBufferfv },

1 0

Jacek Caban : mshtml: Return content document in get_document for frame elements.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 999371724a1da36629a38caded1f011877417593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999371724a1da36629a38cade… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 24 21:13:38 2009 +0100 mshtml: Return content document in get_document for frame elements. --- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/htmlframebase.c | 21 ++++++++++++++++++++- dlls/mshtml/htmliframe.c | 21 ++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 0864e49..45338fe 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -569,9 +569,11 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch ** if(!p) return E_POINTER; + if(This->node.vtbl->get_document) + return This->node.vtbl->get_document(&This->node, p); + *p = (IDispatch*)HTMLDOC(&This->node.doc->basedoc); IDispatch_AddRef(*p); - return S_OK; } diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index b474a34..2526593 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -443,11 +443,30 @@ static void HTMLFrameElement_destructor(HTMLDOMNode *iface) HTMLFrameBase_destructor(&This->framebase); } +static HRESULT HTMLFrameElement_get_document(HTMLDOMNode *iface, IDispatch **p) +{ + HTMLFrameElement *This = HTMLFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window || !This->framebase.content_window->doc) { + *p = NULL; + return S_OK; + } + + *p = (IDispatch*)HTMLDOC(&This->framebase.content_window->doc->basedoc); + IDispatch_AddRef(*p); + return S_OK; +} + #undef HTMLFRAME_NODE_THIS static const NodeImplVtbl HTMLFrameElementImplVtbl = { HTMLFrameElement_QI, - HTMLFrameElement_destructor + HTMLFrameElement_destructor, + NULL, + NULL, + NULL, + NULL, + HTMLFrameElement_get_document }; HTMLElement *HTMLFrameElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLWindow *content_window) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 218638b..8c3c520 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -58,11 +58,30 @@ static void HTMLIFrame_destructor(HTMLDOMNode *iface) HTMLFrameBase_destructor(&This->framebase); } +static HRESULT HTMLIFrame_get_document(HTMLDOMNode *iface, IDispatch **p) +{ + HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); + + if(!This->framebase.content_window || !This->framebase.content_window->doc) { + *p = NULL; + return S_OK; + } + + *p = (IDispatch*)HTMLDOC(&This->framebase.content_window->doc->basedoc); + IDispatch_AddRef(*p); + return S_OK; +} + #undef HTMLIFRAME_NODE_THIS static const NodeImplVtbl HTMLIFrameImplVtbl = { HTMLIFrame_QI, - HTMLIFrame_destructor + HTMLIFrame_destructor, + NULL, + NULL, + NULL, + NULL, + HTMLIFrame_get_document }; static const tid_t HTMLIFrame_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d1fe9f8..ef4642b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -445,6 +445,7 @@ typedef struct { HRESULT (*call_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); + HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); } NodeImplVtbl; struct HTMLDOMNode {

1 0

Marcus Meissner : msxml3: Move element usage into element!=NULL check ( Coverity).
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: ed26bb09c5c155e4dafded9a6fe3343012ab8bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed26bb09c5c155e4dafded9a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 25 10:14:47 2009 +0100 msxml3: Move element usage into element!=NULL check (Coverity). --- dlls/msxml3/tests/domdoc.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 43a90d7..a5b207a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1316,7 +1316,6 @@ todo_wine /* now traverse the tree from the root element */ if (element) { - IXMLDOMNode *node; r = IXMLDOMNode_get_childNodes( element, &list ); ok( r == S_OK, "get_childNodes returned wrong code\n"); @@ -1332,19 +1331,19 @@ todo_wine IXMLDOMNodeList_AddRef(list); expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1"); ole_check(IXMLDOMNodeList_reset(list)); + + node = (void*)0xdeadbeef; + r = IXMLDOMNode_selectSingleNode( element, szdl, &node ); + ok( r == S_FALSE, "ret %08x\n", r ); + ok( node == NULL, "node %p\n", node ); + r = IXMLDOMNode_selectSingleNode( element, szbs, &node ); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNode_Release( node ); + ok( r == 0, "ret %08x\n", r ); } else ok( FALSE, "no element\n"); - node = (void*)0xdeadbeef; - r = IXMLDOMNode_selectSingleNode( element, szdl, &node ); - ok( r == S_FALSE, "ret %08x\n", r ); - ok( node == NULL, "node %p\n", node ); - r = IXMLDOMNode_selectSingleNode( element, szbs, &node ); - ok( r == S_OK, "ret %08x\n", r ); - r = IXMLDOMNode_Release( node ); - ok( r == 0, "ret %08x\n", r ); - if (list) { r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL);

1 0

Paul Vriens : kernel32/tests: Fix some intermittent crashes/ failures on Vista+.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 868d492cf7bb8263cc3d32f2114e4adf489fbb54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868d492cf7bb8263cc3d32f21… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 26 09:40:26 2009 +0100 kernel32/tests: Fix some intermittent crashes/failures on Vista+. --- dlls/kernel32/tests/actctx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8a8d03e..4b84c58 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -960,15 +960,15 @@ static void test_actctx(void) pReleaseActCtx(handle); } - if(!create_manifest_file("test3.manifest", manifest2, -1, "testdep.manifest", testdep_manifest2)) { + if(!create_manifest_file("test2-2.manifest", manifest2, -1, "testdep.manifest", testdep_manifest2)) { skip("Could not create manifest file\n"); return; } trace("manifest2 depmanifest2\n"); - handle = test_create("test3.manifest", manifest2); - DeleteFileA("test3.manifest"); + handle = test_create("test2-2.manifest", manifest2); + DeleteFileA("test2-2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle);

1 0

Rob Shearman : oleaut32: Fix size of memory allocated for byrefs in VARIANT_UserMarshal.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 489b73dd9e76aa4fc4c8aa6e4fdbf137d437a318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489b73dd9e76aa4fc4c8aa6e4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 25 09:54:27 2009 +0000 oleaut32: Fix size of memory allocated for byrefs in VARIANT_UserMarshal. --- dlls/oleaut32/usrmarshal.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 6ad9bd6..7409fce 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -552,14 +552,29 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe if(header->vt & VT_BYREF) { + ULONG mem_size; Pos += 4; + + switch (header->vt & ~VT_BYREF) + { + /* these types have a different memory size compared to wire size */ + case VT_UNKNOWN: + case VT_DISPATCH: + case VT_BSTR: + mem_size = sizeof(void *); + break; + default: + mem_size = type_size; + break; + } + if (V_VT(pvar) != header->vt) { VariantClear(pvar); - V_BYREF(pvar) = CoTaskMemAlloc(type_size); + V_BYREF(pvar) = CoTaskMemAlloc(mem_size); } else if (!V_BYREF(pvar)) - V_BYREF(pvar) = CoTaskMemAlloc(type_size); + V_BYREF(pvar) = CoTaskMemAlloc(mem_size); memcpy(V_BYREF(pvar), Pos, type_size); if((header->vt & VT_TYPEMASK) != VT_VARIANT) Pos += type_size;

1 0

Paul Vriens : shell32/tests: Fix some test failures on Windows 7.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 1da30597e41b7b05c98c4648e99ca723aa951926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da30597e41b7b05c98c4648e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 25 11:15:48 2009 +0100 shell32/tests: Fix some test failures on Windows 7. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ed3a8b5..831205a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -472,7 +472,8 @@ static void test_GetDisplayName(void) /* WinXP and up store the filenames as both ANSI and UNICODE in the pidls */ if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || - (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)), /* Vista */ + (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */ + (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */ "Filename should be stored as wchar-string at this position!\n"); } @@ -1529,7 +1530,8 @@ static void test_ITEMIDLIST_format(void) { "Last write time should match last access time!\n"); ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)), /* Vista */ + !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */ + !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 26)), /* Win7 */ "The filename should be stored in unicode at this position!\n"); } }

1 0

Rob Shearman : widl: Detect interfaces that inherit from another interface as objects.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 6ed98b16a11de26145fbc24bc35b6309cc4e67b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed98b16a11de26145fbc24bc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Nov 25 09:53:49 2009 +0000 widl: Detect interfaces that inherit from another interface as objects. --- tools/widl/header.c | 12 +++++++----- tools/widl/header.h | 2 +- tools/widl/parser.y | 4 ++-- tools/widl/proxy.c | 4 ++-- tools/widl/widl.c | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c8b9613..5602b6d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -691,10 +691,12 @@ int has_out_arg_or_return(const var_t *func) /********** INTERFACES **********/ -int is_object(const attr_list_t *list) +int is_object(const type_t *iface) { const attr_t *attr; - if (list) LIST_FOR_EACH_ENTRY( attr, list, const attr_t, entry ) + if (type_is_defined(iface) && type_iface_get_inherit(iface)) + return 1; + if (iface->attrs) LIST_FOR_EACH_ENTRY( attr, iface->attrs, const attr_t, entry ) if (attr->type == ATTR_OBJECT || attr->type == ATTR_ODL) return 1; return 0; } @@ -866,7 +868,7 @@ static void write_locals(FILE *fp, const type_t *iface, int body) = "/* WIDL-generated stub. You must provide an implementation for this. */"; const statement_t *stmt; - if (!is_object(iface->attrs)) + if (!is_object(iface)) return; STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -1180,7 +1182,7 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) case STMT_TYPE: if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { - if (is_object(stmt->u.type->attrs) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE)) + if (is_object(stmt->u.type) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE)) write_forward(header, stmt->u.type); } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) @@ -1215,7 +1217,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons if (type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; - if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type->attrs)) + if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type)) { write_com_interface_start(header, iface); write_header_stmts(header, type_iface_get_stmts(iface), stmt->u.type, TRUE); diff --git a/tools/widl/header.h b/tools/widl/header.h index d4b3b88..7d6c543 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -38,7 +38,7 @@ extern void write_type_def_or_decl(FILE *h, type_t *t, int is_field, const char extern void write_type_decl(FILE *f, type_t *t, const char *name); extern void write_type_decl_left(FILE *f, type_t *t); extern int needs_space_after(type_t *t); -extern int is_object(const attr_list_t *list); +extern int is_object(const type_t *iface); extern int is_local(const attr_list_t *list); extern int need_stub(const type_t *iface); extern int need_proxy(const type_t *iface); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 73b48a2..dda4a37 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -841,7 +841,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } + | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); is_object_interface = 1; } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, 0); } @@ -852,9 +852,9 @@ interfacehdr: attributes interface { $$.interface = $2; $$.old_pointer_default = pointer_default; if (is_attr($1, ATTR_POINTERDEFAULT)) pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); - is_object_interface = is_object($1); check_def($2); $2->attrs = check_iface_attrs($2->name, $1); + is_object_interface = is_object($2); $2->defined = TRUE; } ; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index cc753bb..de8e466 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -698,12 +698,12 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred) int need_proxy(const type_t *iface) { - return is_object(iface->attrs) && !is_local(iface->attrs); + return is_object(iface) && !is_local(iface->attrs); } int need_stub(const type_t *iface) { - return !is_object(iface->attrs) && !is_local(iface->attrs); + return !is_object(iface) && !is_local(iface->attrs); } int need_proxy_file(const statement_list_t *stmts) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c1c3832..a481c56 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -431,7 +431,7 @@ static void write_id_data_stmts(const statement_list_t *stmts) if (type_get_type(type) == TYPE_INTERFACE) { const UUID *uuid; - if (!is_object(type->attrs) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) + if (!is_object(type) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) continue; uuid = get_attrp(type->attrs, ATTR_UUID); write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID",

1 0