February 2011 - Wine-Commits

Dmitry Timoshkov : gdi32: EnumFontFamilies should also match against fully qualified face name.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 2aaf6c2c8cdde2e09ddfa745f1dab48cbf693769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaf6c2c8cdde2e09ddfa745f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 14 17:54:25 2011 +0800 gdi32: EnumFontFamilies should also match against fully qualified face name. --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 506c994..512e08b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4064,6 +4064,54 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static BOOL family_matches(Family *family, const LOGFONTW *lf) +{ + struct list *face_elem_ptr; + + if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; + + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (strlenW(family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); + continue; + } + + strcpyW(full_family_name, family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; + } + + return FALSE; +} + +static BOOL face_matches(Face *face, const LOGFONTW *lf) +{ + static const WCHAR spaceW[] = { ' ',0 }; + WCHAR full_family_name[LF_FULLFACESIZE]; + + if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + + if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + { + FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", + debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + return FALSE; + } + + strcpyW(full_family_name, face->family->FamilyName); + strcatW(full_family_name, spaceW); + strcatW(full_family_name, face->StyleName); + return !strcmpiW(lf->lfFaceName, full_family_name); +} + /************************************************************* * WineEngEnumFonts * @@ -4107,9 +4155,12 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(plf->lfFaceName, family->FamilyName)) { + if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); + + if (!face_matches(face, plf)) continue; + GetEnumStructs(face, &elf, &ntm, &type); for(i = 0; i < 32; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 291949cbc48fb8217734aa7837004a6a08c34f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291949cbc48fb8217734aa783… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 01:38:49 2011 -0800 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/path.c | 35 ++++++----------------------------- 1 files changed, 6 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 741f47f..ba47910 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1564,8 +1564,7 @@ static void test_SearchPathA(void) SetLastError(0xdeadbeef); ret = pSearchPathA(pathA, fileA, NULL, sizeof(buffA)/sizeof(CHAR), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER || - broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* win9x */, + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); } @@ -1581,16 +1580,6 @@ static void test_SearchPathW(void) return; } - /* SearchPathW is a stub on win9x and doesn't return sane error, - so quess if it's implemented indirectly */ - SetLastError(0xdeadbeef); - GetWindowsDirectoryW(pathW, sizeof(pathW)/sizeof(WCHAR)); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("SearchPathW not implemented\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ @@ -1609,7 +1598,7 @@ static void test_GetFullPathNameA(void) { char output[MAX_PATH], *filepart; DWORD ret; - int is_win9x, i; + int i; const struct { @@ -1617,31 +1606,20 @@ static void test_GetFullPathNameA(void) DWORD len; LPSTR buffer; LPSTR *lastpart; - int win9x_crash; } invalid_parameters[] = { - {NULL, 0, NULL, NULL, 1}, - {NULL, MAX_PATH, NULL, NULL, 1}, - {NULL, MAX_PATH, output, NULL, 1}, - {NULL, MAX_PATH, output, &filepart, 1}, + {NULL, 0, NULL, NULL}, + {NULL, MAX_PATH, NULL, NULL}, + {NULL, MAX_PATH, output, NULL}, + {NULL, MAX_PATH, output, &filepart}, {"", 0, NULL, NULL}, {"", MAX_PATH, NULL, NULL}, {"", MAX_PATH, output, NULL}, {"", MAX_PATH, output, &filepart}, }; - SetLastError(0xdeadbeef); - ret = GetFullPathNameW(NULL, 0, NULL, NULL); - is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; - - if (is_win9x) - win_skip("Skipping some tests that cause GetFullPathNameA to crash on Win9x\n"); - for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) { - if (is_win9x && invalid_parameters[i].win9x_crash) - continue; - SetLastError(0xdeadbeef); strcpy(output, "deadbeef"); filepart = (char *)0xdeadbeef; @@ -1653,7 +1631,6 @@ static void test_GetFullPathNameA(void) ok(!strcmp(output, "deadbeef"), "[%d] Expected the output buffer to be unchanged, got \"%s\"\n", i, output); ok(filepart == (char *)0xdeadbeef, "[%d] Expected output file part pointer to be untouched, got %p\n", i, filepart); ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_BAD_PATHNAME || /* Win9x */ GetLastError() == ERROR_INVALID_NAME, /* Win7 */ "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", i, GetLastError());

1 0

Austin English : version/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 35a39e3cf6afa2ded91b96369597ff4d974c16bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a39e3cf6afa2ded91b96369… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 19:12:33 2011 -0800 version/tests: Remove win9x hacks. --- dlls/version/tests/info.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e4badbe..e689017 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -178,7 +178,6 @@ static void test_info_size(void) ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || - GetLastError() == ERROR_BAD_FORMAT || /* win9x */ GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); @@ -501,12 +500,10 @@ static void test_VerQueryValue(void) ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 got %x\n", len); + ok(len == 0, "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -570,12 +567,10 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 or 0xbeef, got %x\n", len); + ok(len == 0, "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver);

1 0

Jacek Caban : mshtml.idl: Added DispHTMLDOMAttribute declaration.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 79971018ecb2e2c8261689846aaefa7753e9aacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=79971018ecb2e2c8261689846… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 24 13:03:57 2011 +0100 mshtml.idl: Added DispHTMLDOMAttribute declaration. --- include/mshtmdid.h | 6 +++ include/mshtml.idl | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index c6dc2e7..2dad6fb 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2078,6 +2078,12 @@ #define DISPID_IHTMLDOMATTRIBUTE2_HASCHILDNODES DISPID_DOMATTRIBUTE+19 #define DISPID_IHTMLDOMATTRIBUTE2_CLONENODE DISPID_DOMATTRIBUTE+20 +/* IHTMLDOMAttribute3 */ +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE DISPID_IE8_ATTR+3 +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE DISPID_IE8_ATTR+4 +#define DISPID_IHTMLDOMATTRIBUTE3_IE8_SPECIFIED DISPID_IE8_ATTR +#define DISPID_IHTMLDOMATTRIBUTE3_OWNERELEMENT DISPID_IE8_ATTR+1 + /* IHTMLDocumentCompatibleInfo */ #define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_USERAGENT DISPID_DOCUMENTCOMPATIBLEINFO #define DISPID_IHTMLDOCUMENTCOMPATIBLEINFO_VERSION DISPID_DOCUMENTCOMPATIBLEINFO+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index f7dde54..c2e0874 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -126,6 +126,7 @@ interface IHTMLDOMConstructor : IDispatch IDispatch *constructor() interface IHTMLDocument2; +interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -3686,6 +3687,111 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * DispHTMLDOMAttribute dispinterface + */ +[ + hidden, + uuid(3050f564-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMAttribute +{ + properties: + methods: + [propget, id(DISPID_IHTMLDOMATTRIBUTE_NODENAME)] + BSTR nodeName(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE_NODEVALUE)] + void nodeValue(VARIANT v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE_NODEVALUE)] + VARIANT nodeValue(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE_SPECIFIED)] + VARIANT_BOOL specified(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NAME)] + BSTR name(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE2_VALUE)] + void value(BSTR v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_VALUE)] + BSTR value(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_EXPANDO)] + VARIANT_BOOL expando(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NODETYPE)] + long nodeType(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_PARENTNODE)] + IHTMLDOMNode *parentNode(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_CHILDNODES)] + IDispatch *childNodes(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_FIRSTCHILD)] + IHTMLDOMNode *firstChild(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_LASTCHILD)] + IHTMLDOMNode *lastChild(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_PREVIOUSSIBLING)] + IHTMLDOMNode *previousSibling(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_NEXTSIBLING)] + IHTMLDOMNode *nextSibling(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_ATTRIBUTES)] + IDispatch *attributes(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE2_OWNERDOCUMENT)] + IDispatch *ownerDocument(); + + [id(DISPID_IHTMLDOMATTRIBUTE2_INSERTBEFORE)] + IHTMLDOMNode *insertBefore( + [in] IHTMLDOMNode *newChild, + [optional, in] VARIANT refChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_REPLACECHILD)] + IHTMLDOMNode *replaceChild( + [in] IHTMLDOMNode *newChild, + [in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_REMOVECHILD)] + IHTMLDOMNode *removeChild([in] IHTMLDOMNode *oldChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_APPENDCHILD)] + IHTMLDOMNode *appendChild([in] IHTMLDOMNode *newChild); + + [id(DISPID_IHTMLDOMATTRIBUTE2_HASCHILDNODES)] + VARIANT_BOOL hasChildNodes(); + + [id(DISPID_IHTMLDOMATTRIBUTE2_CLONENODE)] + IHTMLDOMAttribute *cloneNode([in] VARIANT_BOOL fDeep); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE)] + void ie8_nodeValue(VARIANT v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_NODEVALUE)] + VARIANT ie8_nodeValue(); + + [propput, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE)] + void ie8_value(BSTR v); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_VALUE)] + BSTR ie8_value(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_IE8_SPECIFIED)] + VARIANT_BOOL ie8_specified(); + + [propget, id(DISPID_IHTMLDOMATTRIBUTE3_OWNERELEMENT)] + IHTMLElement2 *ownerElement(); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; +} + +/***************************************************************************** * IHTMLDocumentCompatibleInfo interface */ [

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: c796ae653c4483949988119950ff1d60c4b68924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c796ae653c448394998811995… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 23 00:56:37 2011 -0800 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/bitmap.c | 300 +++++++++++++++----------------------------- 1 files changed, 102 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c796ae653c44839499881…

1 0

Vincent Povirk : mscoree: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: b92d834d36fe9f5df42def9e8c8ea589972e34e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92d834d36fe9f5df42def9e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 23 15:29:58 2011 -0600 mscoree: Always return S_FALSE from DllCanUnloadNow. We can't really unload after Mono is loaded unless we're exiting the process. We could before that, but it's probably not worth the effort. --- dlls/mscoree/corruntimehost.c | 7 ------- dlls/mscoree/metadata.c | 4 ---- dlls/mscoree/metahost.c | 8 -------- dlls/mscoree/mscoree_main.c | 7 +------ dlls/mscoree/mscoree_private.h | 4 ---- 5 files changed, 1 insertions(+), 29 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0254753..bcdd485 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -95,8 +95,6 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) list_add_tail(&This->domains, &entry->entry); - MSCOREE_LockModule(); - *result = entry->domain; end: @@ -137,7 +135,6 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) if (This->default_domain == domain) This->default_domain = NULL; HeapFree(GetProcessHeap(), 0, entry); - MSCOREE_UnlockModule(); break; } } @@ -183,8 +180,6 @@ static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) { RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); - MSCOREE_LockModule(); - return InterlockedIncrement( &This->ref ); } @@ -193,8 +188,6 @@ static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); ULONG ref; - MSCOREE_UnlockModule(); - ref = InterlockedDecrement( &This->ref ); return ref; diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index 7a5336d..a2db508 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -79,8 +79,6 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) TRACE("%p ref=%u\n", This, ref); - MSCOREE_LockModule(); - return ref; } @@ -96,8 +94,6 @@ static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) HeapFree(GetProcessHeap(), 0, This); } - MSCOREE_UnlockModule(); - return ref; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 72215f0..708f638 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -325,13 +325,11 @@ static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, static ULONG WINAPI CLRRuntimeInfo_AddRef(ICLRRuntimeInfo* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) { - MSCOREE_UnlockModule(); return 1; } @@ -788,8 +786,6 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedIncrement(&This->ref); - MSCOREE_LockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); return ref; @@ -800,8 +796,6 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; ULONG ref = InterlockedDecrement(&This->ref); - MSCOREE_UnlockModule(); - TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) @@ -942,13 +936,11 @@ static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, static ULONG WINAPI CLRMetaHost_AddRef(ICLRMetaHost* iface) { - MSCOREE_LockModule(); return 2; } static ULONG WINAPI CLRMetaHost_Release(ICLRMetaHost* iface) { - MSCOREE_UnlockModule(); return 1; } diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6901f7a..6f53c8f 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -47,8 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -LONG dll_refs = 0; - char *WtoA(LPCWSTR wstr) { int length; @@ -459,10 +457,7 @@ HRESULT WINAPI DllUnregisterServer(void) HRESULT WINAPI DllCanUnloadNow(VOID) { - if (dll_refs) - return S_FALSE; - else - return S_OK; + return S_FALSE; } INT WINAPI ND_RU1( const void *ptr, INT offset ) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 16ae5d3..aa0ee2e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,10 +20,6 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ -extern LONG dll_refs; -static inline void MSCOREE_LockModule(void) { InterlockedIncrement(&dll_refs); } -static inline void MSCOREE_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - extern char *WtoA(LPCWSTR wstr); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj);

1 0

Vincent Povirk : mscoree: Overhaul of mono runtime shutdown process.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: d6582ae8bd3e5ffe526407c2b2d6fe0b572c28f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6582ae8bd3e5ffe526407c2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 21 14:22:02 2011 -0600 mscoree: Overhaul of mono runtime shutdown process. It turns out that we can't free individual domains because that tears down important data structures. Instead we must shut down the entire runtime, but only if Mono doesn't shut itself down first. And we need to do it before DLL_PROCESS_DETACH because important libraries might be gone by then. --- dlls/mscoree/corruntimehost.c | 10 +++-- dlls/mscoree/metahost.c | 68 +++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 5 ++- dlls/mscoree/mscoree_private.h | 17 +++++++++- 4 files changed, 91 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6582ae8bd3e5ffe52640…

1 0

Marcus Meissner : ws2_32: name is never NULL as array (Coverity).
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: ae0797150e40f30dbb35a395e68a1a0195c47d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0797150e40f30dbb35a395e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 23 21:27:22 2011 +0100 ws2_32: name is never NULL as array (Coverity). --- dlls/ws2_32/tests/sock.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d2f011f..ca72e68 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2548,10 +2548,6 @@ static void test_gethostbyname_hack(void) he->h_addr_list[0][3]); } - /* No reason to test further with NULL hostname */ - if(name == NULL) - return; - if(strcmp(name, "localhost") == 0) { skip("hostname seems to be \"localhost\", skipping test.\n");

1 0

Nikolay Sivov : msxml3: Remove selectSingleNode() forward.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: aac690d4fc425ff91a3a02857420fdc35c51966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac690d4fc425ff91a3a02857… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:44:20 2011 +0300 msxml3: Remove selectSingleNode() forward. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 7 ++++--- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 22 ++++++++-------------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index a2775b3..332c256 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -498,7 +498,8 @@ static HRESULT WINAPI domattr_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domattr_get_parsed( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7dc72a4..0a5f631 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -508,7 +508,8 @@ static HRESULT WINAPI domcdata_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domcdata_get_parsed( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 378379d..4724ba3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -501,7 +501,8 @@ static HRESULT WINAPI domcomment_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domcomment_get_parsed( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index bf480d6..cf01296 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -505,7 +505,8 @@ static HRESULT WINAPI domfrag_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domfrag_get_parsed( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3463913..3c51e4f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1453,11 +1453,12 @@ static HRESULT WINAPI domdoc_selectNodes( static HRESULT WINAPI domdoc_selectSingleNode( IXMLDOMDocument3 *iface, - BSTR queryString, - IXMLDOMNode** resultNode ) + BSTR p, + IXMLDOMNode **outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, queryString, resultNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index bbcc302..e009176 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -957,7 +957,8 @@ static HRESULT WINAPI domelem_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domelem_get_parsed( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 2c23c66..2e250bb 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -499,7 +499,8 @@ static HRESULT WINAPI entityref_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI entityref_get_parsed( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index fdf4575..f8241e2 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -269,6 +269,7 @@ extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); extern HRESULT node_get_text(const xmlnode*,BSTR*); extern HRESULT node_select_nodes(const xmlnode*,BSTR,IXMLDOMNodeList**); +extern HRESULT node_select_singlenode(const xmlnode*,BSTR,IXMLDOMNode**); extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 6ea3250..e2f50b5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1046,24 +1046,18 @@ HRESULT node_select_nodes(const xmlnode *This, BSTR query, IXMLDOMNodeList **nod return hr; } -static HRESULT WINAPI xmlnode_selectSingleNode( - IXMLDOMNode *iface, - BSTR queryString, - IXMLDOMNode** resultNode) +HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **node) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); IXMLDOMNodeList *list; - HRESULT r; - - TRACE("(%p)->(%s %p)\n", This, debugstr_w(queryString), resultNode ); + HRESULT hr; - r = IXMLDOMNode_selectNodes(This->iface, queryString, &list); - if(r == S_OK) + hr = node_select_nodes(This, query, &list); + if (hr == S_OK) { - r = IXMLDOMNodeList_nextNode(list, resultNode); + hr = IXMLDOMNodeList_nextNode(list, node); IXMLDOMNodeList_Release(list); } - return r; + return hr; } HRESULT node_get_namespaceURI(xmlnode *This, BSTR *namespaceURI) @@ -1156,7 +1150,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_transformNode, NULL, - xmlnode_selectSingleNode + NULL }; void destroy_xmlnode(xmlnode *This) @@ -1634,7 +1628,7 @@ static HRESULT WINAPI unknode_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI unknode_get_parsed( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 27c41c1..72e0d81 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -516,7 +516,8 @@ static HRESULT WINAPI dom_pi_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI dom_pi_get_parsed( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index ca11387..cc0b829 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -586,7 +586,8 @@ static HRESULT WINAPI domtext_selectSingleNode( BSTR p, IXMLDOMNode** outNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_selectSingleNode( &This->node.IXMLDOMNode_iface, p, outNode ); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), outNode); + return node_select_singlenode(&This->node, p, outNode); } static HRESULT WINAPI domtext_get_parsed(

1 0

Michael Stefaniuc : storage.dll16: COM cleanup in storage.c.
by Alexandre Julliard Feb. 24, 2011

Feb. 24, 2011

Module: wine Branch: master Commit: 15f4248a638af8c028ad22f0ed8052ff1349f771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f4248a638af8c028ad22f0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 24 11:21:40 2011 +0100 storage.dll16: COM cleanup in storage.c. --- dlls/storage.dll16/storage.c | 141 ++++++++++++++++++++++-------------------- 1 files changed, 74 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15f4248a638af8c028ad2…

1 0