December 2007 - Wine-commits

Andrew Talbot : cabinet: Remove unneeded casts.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: b3e56e9d0b495c057867a99e4fb5776045affcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e56e9d0b495c057867a99e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 1 16:14:37 2007 +0000 cabinet: Remove unneeded casts. --- dlls/cabinet/fdi.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 1056d5f..a522b86 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1138,7 +1138,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph for(;;) { ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) + if((e = (t = tl + (b & ml))->e) > 16) do { if (e == 99) @@ -1146,7 +1146,7 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) if (e == 16) /* then it's a literal */ CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; @@ -1158,22 +1158,22 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph /* get length of block to copy */ ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); + n = t->v.n + (b & Zipmask[e]); ZIPDUMPBITS(e); /* decode distance of block to copy */ ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) + if ((e = (t = td + (b & md))->e) > 16) do { if (e == 99) return 1; ZIPDUMPBITS(t->b) e -= 16; ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); + } while ((e = (t = t->v.t + (b & Zipmask[e]))->e) > 16); ZIPDUMPBITS(t->b) ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); + d = w - t->v.n - (b & Zipmask[e]); ZIPDUMPBITS(e) do { @@ -1217,10 +1217,10 @@ static cab_LONG fdi_Zipinflate_stored(fdi_decomp_state *decomp_state) /* get the length and its complement */ ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); + n = (b & 0xffff); ZIPDUMPBITS(16) ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) + if (n != ((~b) & 0xffff)) return 1; /* error in compressed data */ ZIPDUMPBITS(16) @@ -1312,13 +1312,13 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) /* read in table lengths */ ZIPNEEDBITS(5) - nl = 257 + ((cab_ULONG)b & 0x1f); /* number of literal/length codes */ + nl = 257 + (b & 0x1f); /* number of literal/length codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(5) - nd = 1 + ((cab_ULONG)b & 0x1f); /* number of distance codes */ + nd = 1 + (b & 0x1f); /* number of distance codes */ ZIPDUMPBITS(5) ZIPNEEDBITS(4) - nb = 4 + ((cab_ULONG)b & 0xf); /* number of bit length codes */ + nb = 4 + (b & 0xf); /* number of bit length codes */ ZIPDUMPBITS(4) if(nl > 288 || nd > 32) return 1; /* bad lengths */ @@ -1327,7 +1327,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) for(j = 0; j < nb; j++) { ZIPNEEDBITS(3) - ll[Zipborder[j]] = (cab_ULONG)b & 7; + ll[Zipborder[j]] = b & 7; ZIPDUMPBITS(3) } for(; j < 19; j++) @@ -1349,7 +1349,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) while((cab_ULONG)i < n) { ZIPNEEDBITS((cab_ULONG)bl) - j = (td = tl + ((cab_ULONG)b & m))->b; + j = (td = tl + (b & m))->b; ZIPDUMPBITS(j) j = td->v.n; if (j < 16) /* length of code in bits (0..15) */ @@ -1357,7 +1357,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else if (j == 16) /* repeat last length 3 to 6 times */ { ZIPNEEDBITS(2) - j = 3 + ((cab_ULONG)b & 3); + j = 3 + (b & 3); ZIPDUMPBITS(2) if((cab_ULONG)i + j > n) return 1; @@ -1367,7 +1367,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else if (j == 17) /* 3 to 10 zero length codes */ { ZIPNEEDBITS(3) - j = 3 + ((cab_ULONG)b & 7); + j = 3 + (b & 7); ZIPDUMPBITS(3) if ((cab_ULONG)i + j > n) return 1; @@ -1378,7 +1378,7 @@ static cab_LONG fdi_Zipinflate_dynamic(fdi_decomp_state *decomp_state) else /* j == 18: 11 to 138 zero length codes */ { ZIPNEEDBITS(7) - j = 11 + ((cab_ULONG)b & 0x7f); + j = 11 + (b & 0x7f); ZIPDUMPBITS(7) if ((cab_ULONG)i + j > n) return 1; @@ -1436,7 +1436,7 @@ static cab_LONG fdi_Zipinflate_block(cab_LONG *e, fdi_decomp_state *decomp_state /* read in block type */ ZIPNEEDBITS(2) - t = (cab_ULONG)b & 3; + t = b & 3; ZIPDUMPBITS(2) /* restore the global bit buffer */

1 0

Rob Shearman : rpcrt4: Initialise the memory in test_simple_struct_marshal before passing it to NdrSimpleStructUnmarshall .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: eef207e3f11a0e9c0eddde21ce3737d85bf0a2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef207e3f11a0e9c0eddde21c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 22:03:39 2007 +0000 rpcrt4: Initialise the memory in test_simple_struct_marshal before passing it to NdrSimpleStructUnmarshall. Otherwise, the unmarshalling code will read from unintialised memory when trying to reuse the embedded pointers in the memory block. Also fix a couple of memory leaks. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 06b7b51..c935d08 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -514,7 +514,7 @@ todo_wine { StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; - mem_orig = mem = HeapAlloc(GetProcessHeap(), 0, srcsize); + mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, srcsize); ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); @@ -600,6 +600,8 @@ todo_wine { my_alloc_called = 0; ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n"); + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); } typedef struct

1 0

Rob Shearman : rpcrt4: Reverse the conditions for which *pPointer is assigned base_ptr_val in PointerUnmarshall .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: d8e467b0fd66ef6032580727b41979668e8aa4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e467b0fd66ef6032580727b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 21:31:47 2007 +0000 rpcrt4: Reverse the conditions for which *pPointer is assigned base_ptr_val in PointerUnmarshall. In one condition (fMustAlloc == TRUE), base_ptr_val may be uninitialised and so cause a valgrind warning. Reversing the check is harmless and doesn't result in a performance decrease. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8300b64..84a1990 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1061,7 +1061,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* this must be done after the call to the unmarshaller, since when we are * unmarshalling reference pointers on the server side *pPointer will be * pointing to valid data */ - if (base_ptr_val && (!fMustAlloc || attr & RPC_FC_P_DEREF)) + if ((!fMustAlloc || attr & RPC_FC_P_DEREF) && base_ptr_val) *pPointer = base_ptr_val; }

1 0

Rob Shearman : rpcrt4: Test that the string retrieved from get_name was actually unmarshalled correctly .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 620fca405d0cb7c21cfee6d2b1871b1915fd590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=620fca405d0cb7c21cfee6d2b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 22:02:38 2007 +0000 rpcrt4: Test that the string retrieved from get_name was actually unmarshalled correctly. --- dlls/rpcrt4/tests/server.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 20e6033..538f5a4 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -877,6 +877,8 @@ pointer_tests(void) name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); + todo_wine + ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); HeapFree(GetProcessHeap(), 0, name.name); pa2 = a;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::get_dir implementation.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 29d66b48ef1f3ed3519fb020260086c8d3aba1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d66b48ef1f3ed3519fb0202… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:32:56 2007 +0100 mshtml: Added IHTMLElement2::get_dir implementation. --- dlls/mshtml/htmlelem2.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 1d1fcfa..ca2c8c1 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -598,8 +598,32 @@ static HRESULT WINAPI HTMLElement2_put_dir(IHTMLElement2 *iface, BSTR v) static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(This->nselem) { + nsAString dir_str; + nsresult nsres; + + nsAString_Init(&dir_str, NULL); + + nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *dir; + nsAString_GetData(&dir_str, &dir, NULL); + if(*dir) + *p = SysAllocString(dir); + }else { + ERR("GetDir failed: %08x\n", nsres); + } + + nsAString_Finish(&dir_str); + } + + TRACE("ret %s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDispatch **range)

1 0

Paul Vriens : kernel32: Add some simple tests for GetVersionExA.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: b3a85a3fc40bf8d36a6f5b57a095cd1faa6359d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a85a3fc40bf8d36a6f5b57a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Nov 30 17:52:44 2007 +0100 kernel32: Add some simple tests for GetVersionExA. --- dlls/kernel32/tests/version.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/version.c | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 84d081b..ac4d814 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -43,12 +43,64 @@ static void init_function_pointers(void) KERNEL32_GET_PROC(VerSetConditionMask); } +static void test_GetVersionEx(void) +{ + OSVERSIONINFOA infoA; + OSVERSIONINFOEXA infoExA; + BOOL ret; + + if (0) + { + /* Silently crashes on XP */ + ret = GetVersionExA(NULL); + } + + SetLastError(0xdeadbeef); + memset(&infoA,0,sizeof infoA); + ret = GetVersionExA(&infoA); + ok(!ret, "Expected GetVersionExA to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA) / 2; + ret = GetVersionExA(&infoA); + ok(!ret, "Expected GetVersionExA to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA) * 2; + ret = GetVersionExA(&infoA); + ok(!ret, "Expected GetVersionExA to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); + ret = GetVersionExA(&infoA); + ok(ret, "Expected GetVersionExA to succeed\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + infoExA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + ret = GetVersionExA((OSVERSIONINFOA *)&infoExA); + ok(ret, "Expected GetVersionExA to succeed\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got %d\n", GetLastError()); + +} + START_TEST(version) { OSVERSIONINFOEX info = { sizeof(info) }; BOOL ret; init_function_pointers(); + + test_GetVersionEx(); + if(!pVerifyVersionInfoA || !pVerSetConditionMask) { skip("Needed functions not available\n"); diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 3160983..48f9bb2 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -154,6 +154,7 @@ BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) { WARN("wrong OSVERSIONINFO size from app (got: %d)\n", v->dwOSVersionInfoSize ); + SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Rob Shearman : oleaut32: Implement OLEPictureImpl_GetIDsOfNames.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 656618310b56b98d996fbc00b004ee50db261b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656618310b56b98d996fbc00b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:02:47 2007 +0000 oleaut32: Implement OLEPictureImpl_GetIDsOfNames. --- dlls/oleaut32/olepicture.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 30ecd1a..8a1c99b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2367,9 +2367,33 @@ static HRESULT WINAPI OLEPictureImpl_GetIDsOfNames( LCID lcid, DISPID* rgDispId) { - FIXME("():Stub\n"); + ITypeInfo * pTInfo; + HRESULT hres; - return E_NOTIMPL; + TRACE("(%p,%s,%p,cNames=%d,lcid=%04x,%p)\n", iface, debugstr_guid(riid), + rgszNames, cNames, (int)lcid, rgDispId); + + if (cNames == 0) + { + return E_INVALIDARG; + } + else + { + /* retrieve type information */ + hres = OLEPictureImpl_GetTypeInfo(iface, 0, lcid, &pTInfo); + + if (FAILED(hres)) + { + ERR("GetTypeInfo failed.\n"); + return hres; + } + + /* convert names to DISPIDs */ + hres = DispGetIDsOfNames (pTInfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(pTInfo); + + return hres; + } } /************************************************************************

1 0

Rob Shearman : include: Move Wine-specific EH_* defines from winnt. h to include/wine/exception.h.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 9f8d379fb3606d13e84005ebfa994c0f2e033aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d379fb3606d13e84005ebf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:04:08 2007 +0000 include: Move Wine-specific EH_* defines from winnt.h to include/wine/exception.h. --- dlls/winecrt0/stub.c | 2 +- include/wine/exception.h | 8 ++++++++ include/winnt.h | 13 +------------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index ebeb908..c6ddb91 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -32,5 +32,5 @@ void DECLSPEC_HIDDEN __wine_spec_unimplemented_stub( const char *module, const c args[0] = (ULONG_PTR)module; args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); + RaiseException( EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE, 2, args ); } diff --git a/include/wine/exception.h b/include/wine/exception.h index eebfdfb..ceb4c12 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -187,6 +187,14 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR #endif } +/* Exception handling flags - from OS/2 2.0 exception handling */ + +/* Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD */ +#define EH_NONCONTINUABLE 0x01 +#define EH_UNWINDING 0x02 +#define EH_EXIT_UNWIND 0x04 +#define EH_STACK_INVALID 0x08 +#define EH_NESTED_CALL 0x10 /* Wine-specific exceptions codes */ diff --git a/include/winnt.h b/include/winnt.h index 78fa1f7..f103c0d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1906,19 +1906,8 @@ typedef CONTEXT *PCONTEXT; #define WT_EXECUTEDELETEWAIT 0x08 -/* - * From OS/2 2.0 exception handling - * Win32 seems to use the same flags as ExceptionFlags in an EXCEPTION_RECORD - */ - -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 - #define EXCEPTION_CONTINUABLE 0 -#define EXCEPTION_NONCONTINUABLE EH_NONCONTINUABLE +#define EXCEPTION_NONCONTINUABLE 0x01 /* * The exception record used by Win32 to give additional information

1 0

Rob Shearman : ole32: Always create a window for the main apartment.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: f65e04770dc5748521a0de73814cea0b085bf3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65e04770dc5748521a0de738… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:06:07 2007 +0000 ole32: Always create a window for the main apartment. --- dlls/ole32/compobj.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bb10e9f..6cee5b9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -305,6 +305,9 @@ static APARTMENT *apartment_get_or_create(DWORD model) } LeaveCriticalSection(&csApartment); + + if (apt->main) + apartment_createwindowifneeded(apt); } else {

1 0

Rob Shearman : ole32: Ignore the threading model of the PSFactoryBuffer object created during standard marshaling .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 31b2d81ea078ec03b240ae0b14fb7830da8b078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b2d81ea078ec03b240ae0b1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:08:08 2007 +0000 ole32: Ignore the threading model of the PSFactoryBuffer object created during standard marshaling. This is so that we don't try to host it. --- dlls/ole32/compobj.c | 76 +++++++++++++++++++++++++----------------- dlls/ole32/compobj_private.h | 2 + dlls/ole32/marshal.c | 4 +- 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6cee5b9..7ef613e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -79,7 +79,7 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static void COM_RevokeAllClasses(const struct apartment *apt); -static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); +static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, REFCLSID rclsid, REFIID riid, BOOL hostifnecessary, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ static APARTMENT *MainApartment; /* the first STA apartment */ @@ -2087,38 +2087,51 @@ static void get_threading_model(HKEY key, LPWSTR value, DWORD len) } static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, - REFCLSID rclsid, REFIID riid, void **ppv) + REFCLSID rclsid, REFIID riid, + BOOL hostifnecessary, void **ppv) { - static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; - static const WCHAR wszFree[] = {'F','r','e','e',0}; - static const WCHAR wszBoth[] = {'B','o','t','h',0}; WCHAR dllpath[MAX_PATH+1]; - WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; + BOOL apartment_threaded; - get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); - /* "Apartment" */ - if (!strcmpiW(threading_model, wszApartment)) + if (hostifnecessary) { - if (apt->multi_threaded) - return apartment_hostobject_in_hostapt(apt, FALSE, FALSE, hkeydll, rclsid, riid, ppv); - } - /* "Free" */ - else if (!strcmpiW(threading_model, wszFree)) - { - if (!apt->multi_threaded) - return apartment_hostobject_in_hostapt(apt, TRUE, FALSE, hkeydll, rclsid, riid, ppv); - } - /* everything except "Apartment", "Free" and "Both" */ - else if (strcmpiW(threading_model, wszBoth)) - { - /* everything else is main-threaded */ - if (threading_model[0]) - FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", - debugstr_w(threading_model), debugstr_guid(rclsid)); + static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; + static const WCHAR wszFree[] = {'F','r','e','e',0}; + static const WCHAR wszBoth[] = {'B','o','t','h',0}; + WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; - if (apt->multi_threaded || !apt->main) - return apartment_hostobject_in_hostapt(apt, FALSE, TRUE, hkeydll, rclsid, riid, ppv); + get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); + /* "Apartment" */ + if (!strcmpiW(threading_model, wszApartment)) + { + apartment_threaded = TRUE; + if (apt->multi_threaded) + return apartment_hostobject_in_hostapt(apt, FALSE, FALSE, hkeydll, rclsid, riid, ppv); + } + /* "Free" */ + else if (!strcmpiW(threading_model, wszFree)) + { + apartment_threaded = FALSE; + if (!apt->multi_threaded) + return apartment_hostobject_in_hostapt(apt, TRUE, FALSE, hkeydll, rclsid, riid, ppv); + } + /* everything except "Apartment", "Free" and "Both" */ + else if (strcmpiW(threading_model, wszBoth)) + { + apartment_threaded = TRUE; + /* everything else is main-threaded */ + if (threading_model[0]) + FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", + debugstr_w(threading_model), debugstr_guid(rclsid)); + + if (apt->multi_threaded || !apt->main) + return apartment_hostobject_in_hostapt(apt, FALSE, TRUE, hkeydll, rclsid, riid, ppv); + } + else + apartment_threaded = FALSE; } + else + apartment_threaded = !apt->multi_threaded; if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { @@ -2127,8 +2140,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, return REGDB_E_CLASSNOTREG; } - return apartment_getclassobject(apt, dllpath, - !strcmpiW(threading_model, wszApartment), + return apartment_getclassobject(apt, dllpath, apartment_threaded, rclsid, riid, ppv); } @@ -2228,7 +2240,8 @@ HRESULT WINAPI CoGetClassObject( if (SUCCEEDED(hres)) { - hres = get_inproc_class_object(apt, hkey, rclsid, iid, ppv); + hres = get_inproc_class_object(apt, hkey, rclsid, iid, + !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); } @@ -2258,7 +2271,8 @@ HRESULT WINAPI CoGetClassObject( if (SUCCEEDED(hres)) { - hres = get_inproc_class_object(apt, hkey, rclsid, iid, ppv); + hres = get_inproc_class_object(apt, hkey, rclsid, iid, + !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); RegCloseKey(hkey); } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f99a89f..1c49956 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -307,6 +307,8 @@ extern HINSTANCE OLE32_hInstance; /* FIXME: make static */ #define CHARS_IN_GUID 39 /* including NULL */ +#define WINE_CLSCTX_DONT_HOST 0x80000000 + /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index fde189a..32dadb1 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -76,8 +76,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) if ((hr = CoGetPSClsid(riid, &clsid))) return hr; - return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, - &IID_IPSFactoryBuffer, (LPVOID*)facbuf); + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, + NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf); } /* marshals an object into a STDOBJREF structure */

1 0