October 2008 - Wine-commits

Detlef Riekenberg : d3d9/tests: Fix test for old gfx-card.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 7cfaf4aca080e3db4992e26004f26492a07f5f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfaf4aca080e3db4992e2600… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 13 01:53:46 2008 +0200 d3d9/tests: Fix test for old gfx-card. --- dlls/d3d9/tests/stateblock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index ee5061f..e5d7ab2 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -62,7 +62,8 @@ static HRESULT init_d3d9( hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, device_pparams, device); - ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%x\n", hres); + ok(hres == D3D_OK || hres == D3DERR_NOTAVAILABLE, + "IDirect3D_CreateDevice returned: 0x%x\n", hres); return hres; }

1 0

Marcus Meissner : Fixed RegEnumKey(Ex)W buffer sizes.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 0ff2c06c1d26bf3b6f717140d5753ba3c82295a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff2c06c1d26bf3b6f717140d… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Oct 12 19:50:20 2008 +0200 Fixed RegEnumKey(Ex)W buffer sizes. --- dlls/msdmo/dmoreg.c | 4 ++-- dlls/shell32/classes.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/winmm/mci.c | 2 +- dlls/wnaspi32/aspi.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 22789d9..743f0bb 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -737,7 +737,7 @@ HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO while (rc == ERROR_SUCCESS) { - len = MAX_PATH * sizeof(WCHAR); + len = MAX_PATH; rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -749,7 +749,7 @@ HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); while (rcs == ERROR_SUCCESS) { - len = MAX_PATH * sizeof(WCHAR); + len = MAX_PATH; rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); if (rcs == ERROR_SUCCESS) { diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index d6e9864..73c8822 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -187,7 +187,7 @@ BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LP return FALSE; ret = FALSE; - if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, sizeof(sTempVerb))) + if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, sizeof(sTempVerb)/sizeof(sTempVerb[0]))) { WCHAR sTemp[MAX_PATH]; lstrcpyW(sTemp, swShell); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index bf820ca..5b5785b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -472,7 +472,7 @@ static UINT SHELL_FindExecutableByOperation(LPCWSTR lpOperation, LPWSTR key, LPW if (RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; - if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb))) + if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb)/sizeof(verb[0]))) return SE_ERR_NOASSOC; RegCloseKey(hkeyClass); diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 0053619..cb58896 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1899,7 +1899,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0) == ERROR_SUCCESS && lpParms->dwNumber <= cnt) { - DWORD bufLen = sizeof(buf); + DWORD bufLen = sizeof(buf)/sizeof(buf[0]); if (RegEnumKeyExW(hKey, lpParms->dwNumber - 1, buf, &bufLen, 0, 0, 0, 0) == ERROR_SUCCESS) s = buf; diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 11c3f3b..196b968 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -128,7 +128,7 @@ int ASPI_GetNumControllers(void) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE, &hkeyPort) == ERROR_SUCCESS) { @@ -190,7 +190,7 @@ DWORD ASPI_GetHCforController( int controller ) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0xFFFFFFFF; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkeyPort) == ERROR_SUCCESS) @@ -213,7 +213,7 @@ DWORD ASPI_GetHCforController( int controller ) return 0xFFFFFFFF; } - if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, sizeof(wBusName)) != ERROR_SUCCESS) + if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, sizeof(wBusName)/sizeof(wBusName[0])) != ERROR_SUCCESS) { ERR("Failed to enumerate keys\n"); RegCloseKey(hkeyPort);

1 0

Andrew Talbot : gdi32: Sign-compare warnings fix.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 3a02030d54affb80dff8922c6ac335d9d0c14ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a02030d54affb80dff8922c6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Oct 10 20:00:41 2008 +0100 gdi32: Sign-compare warnings fix. --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0ab4c7a..8b0d672 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1077,7 +1077,7 @@ static WCHAR *get_familyname(FT_Face ft_face) if(get_name_table_entry(ft_face, &name)) { - int i; + FT_UInt i; /* String is not nul terminated and string_len is a byte length. */ family = HeapAlloc(GetProcessHeap(), 0, name.string_len + 2); @@ -2883,7 +2883,7 @@ static GdiFont *alloc_font(void) static void free_font(GdiFont *font) { struct list *cursor, *cursor2; - int i; + DWORD i; LIST_FOR_EACH_SAFE(cursor, cursor2, &font->child_fonts) {

1 0

Detlef Riekenberg : crypt32/tests: Fix some tests on win9x.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 76ca951fabfe06e719678042851c17f8d6d48ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ca951fabfe06e7196780428… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 13 01:18:58 2008 +0200 crypt32/tests: Fix some tests on win9x. --- dlls/crypt32/tests/msg.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index e4a3849..f5dbec3 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2715,8 +2715,10 @@ static void test_msg_control(void) todo_wine ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == NTE_BAD_ALGID || /* Win9x */ GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ - "Expected NTE_BAD_HASH_STATE or CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, " + "got %08x\n", GetLastError()); CryptMsgClose(msg); /* Finally, verifying the hash of a detached message in the correct order: @@ -2859,8 +2861,10 @@ static void test_msg_control(void) todo_wine ok(!ret && (GetLastError() == NTE_BAD_HASH_STATE || + GetLastError() == NTE_BAD_ALGID || /* Win9x */ GetLastError() == CRYPT_E_MSG_ERROR), /* Vista */ - "expected NTE_BAD_HASH_STATE or CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + "expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, " + "got %08x\n", GetLastError()); CryptMsgClose(msg); /* Updating with the detached portion of the message and the data of the * the message allows the sig to be verified.

1 0

Detlef Riekenberg : crypt32/tests: Fix a test on win9x.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 846e613b873570ebf1ecfa45f5823549402fc5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=846e613b873570ebf1ecfa45f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 13 01:00:49 2008 +0200 crypt32/tests: Fix a test on win9x. --- dlls/crypt32/tests/cert.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 558aa11..2027c4a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1693,8 +1693,10 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, certBlob.pbData = (void *)0xdeadbeef; ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING, CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &certBlob, 0, NULL, 0, NULL); - ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, - "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == STATUS_ACCESS_VIOLATION || + GetLastError() == CRYPT_E_ASN1_EOD /* Win9x */), + "Expected STATUS_ACCESS_VIOLATION or CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + certBlob.cbData = size; certBlob.pbData = cert; ret = pCryptVerifyCertificateSignatureEx(csp, X509_ASN_ENCODING,

1 0

Eric Pouech : msvcrt: Implemented wcscat_s.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 07c80924ebfe9b416d93221609261d19c9252981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c80924ebfe9b416d9322160… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Oct 12 13:34:16 2008 +0200 msvcrt: Implemented wcscat_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0da6a25..b11af56 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -762,6 +762,7 @@ @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) ntdll.wcschr @ cdecl wcscmp(wstr wstr) ntdll.wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5c80092..81528be 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1077,3 +1077,29 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co return 0; } + +/****************************************************************** + * wcscat_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_wchar_t* src) +{ + MSVCRT_wchar_t* ptr = dst; + + if (!dst || elem == 0) return MSVCRT_EINVAL; + if (!src) + { + dst[0] = '\0'; + return MSVCRT_EINVAL; + } + + /* seek to end of dst string (or elem if no end of string is found */ + while (ptr < dst + elem && *ptr != '\0') ptr++; + while (ptr < dst + elem) + { + if ((*ptr++ = *src++) == '\0') return 0; + } + /* not enough space */ + dst[0] = '\0'; + return MSVCRT_ERANGE; +}

1 0

Andrey Turkin : wordpad: Do not leak a handle on error path.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: dfb64699bf8c8e643c85bb4b9e758437099d298c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb64699bf8c8e643c85bb4b9… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Oct 12 15:09:45 2008 +0400 wordpad: Do not leak a handle on error path. --- programs/wordpad/wordpad.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4186689..39a52bf 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -810,7 +810,10 @@ static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) WriteFile(hFile, &unicode, sizeof(unicode), &writeOut, 0); if(writeOut != sizeof(unicode)) + { + CloseHandle(hFile); return; + } } stream.dwCookie = (DWORD_PTR)hFile;

1 0

Andrey Turkin : wordpad: Use inches instead of cm in calculations.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: ef23ef93357689335749310957f68a3ad9179d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef23ef9335768933574931095… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Oct 12 15:13:08 2008 +0400 wordpad: Use inches instead of cm in calculations. --- programs/wordpad/print.c | 12 +++++------- programs/wordpad/wordpad.c | 6 +++--- programs/wordpad/wordpad.h | 3 ++- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index d3c13e6..3e181b0 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -132,24 +132,22 @@ static HDC make_dc(void) static LONG twips_to_centmm(int twips) { - return MulDiv(twips, 1000, TWIPS_PER_CM); + return MulDiv(twips, CENTMM_PER_INCH, TWIPS_PER_INCH); } static LONG centmm_to_twips(int mm) { - return MulDiv(mm, TWIPS_PER_CM, 1000); + return MulDiv(mm, TWIPS_PER_INCH, CENTMM_PER_INCH); } static LONG twips_to_pixels(int twips, int dpi) { - float ret = ((float)twips / ((float)TWIPS_PER_CM * 2.54)) * (float)dpi; - return (LONG)ret; + return MulDiv(twips, dpi, TWIPS_PER_INCH); } static LONG devunits_to_twips(int units, int dpi) { - float ret = ((float)units / (float)dpi) * (float)TWIPS_PER_CM * 2.54; - return (LONG)ret; + return MulDiv(units, TWIPS_PER_INCH, dpi); } @@ -502,7 +500,7 @@ static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long hdc = CreateCompatibleDC(0); - CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); + CmPixels = twips_to_pixels(centmm_to_twips(1000), GetDeviceCaps(hdc, LOGPIXELSX)); QuarterCmPixels = (int)((float)CmPixels / 4.0); hBitmap = CreateCompatibleBitmap(hdc, drawRect->right, drawRect->bottom); diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7c92fcf..4186689 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1271,7 +1271,7 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) static int current_units_to_twips(float number) { - int twips = (int)(number * TWIPS_PER_CM); + int twips = (int)(number * 1000.0 / (float)CENTMM_PER_INCH * (float)TWIPS_PER_INCH); return twips; } @@ -1284,10 +1284,10 @@ static void append_current_units(LPWSTR buffer) static void number_with_units(LPWSTR buffer, int number) { - float converted = (float)number / TWIPS_PER_CM; static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; + float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; - sprintfW(buffer, fmt, converted, units_cmW); + wsprintfW(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength) diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 8884e28..6a1bcfb 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -19,7 +19,8 @@ #define MAX_STRING_LEN 255 -#define TWIPS_PER_CM 567 +#define TWIPS_PER_INCH 1440 +#define CENTMM_PER_INCH 2540 #define ID_FILE_EXIT 1000 #define ID_FILE_OPEN 1001

1 0

Michael Karcher : msxml3: Use orphan node list.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: f229469de3beb3655da72b259377cc79f5e8389a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f229469de3beb3655da72b259… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:59:25 2008 +0200 msxml3: Use orphan node list. --- dlls/msxml3/domdoc.c | 11 +++++++++++ dlls/msxml3/node.c | 11 +++++++++++ dlls/msxml3/nodemap.c | 6 ++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 93795d3..d03d8c7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -953,6 +953,7 @@ static HRESULT WINAPI domdoc_createElement( xml_name = xmlChar_from_wchar((WCHAR*)tagname); xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); + xmldoc_add_orphan(xmlnode->doc, xmlnode); TRACE("created xmlptr %p\n", xmlnode); elem_unk = create_element(xmlnode, NULL); @@ -984,6 +985,7 @@ static HRESULT WINAPI domdoc_createDocumentFragment( if(!xmlnode) return E_FAIL; + xmldoc_add_orphan(xmlnode->doc, xmlnode); *docFrag = (IXMLDOMDocumentFragment*)create_doc_fragment(xmlnode); return S_OK; @@ -1014,6 +1016,7 @@ static HRESULT WINAPI domdoc_createTextNode( return E_FAIL; xmlnode->doc = get_doc( This ); + xmldoc_add_orphan(xmlnode->doc, xmlnode); *text = (IXMLDOMText*)create_text(xmlnode); @@ -1045,6 +1048,7 @@ static HRESULT WINAPI domdoc_createComment( return E_FAIL; xmlnode->doc = get_doc( This ); + xmldoc_add_orphan(xmlnode->doc, xmlnode); *comment = (IXMLDOMComment*)create_comment(xmlnode); @@ -1076,6 +1080,7 @@ static HRESULT WINAPI domdoc_createCDATASection( return E_FAIL; xmlnode->doc = get_doc( This ); + xmldoc_add_orphan(xmlnode->doc, xmlnode); *cdata = (IXMLDOMCDATASection*)create_cdata(xmlnode); @@ -1106,6 +1111,7 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( xml_content = xmlChar_from_wchar((WCHAR*)data); xmlnode = xmlNewDocPI(get_doc(This), xml_target, xml_content); + xmldoc_add_orphan(xmlnode->doc, xmlnode); TRACE("created xmlptr %p\n", xmlnode); *pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode); @@ -1144,6 +1150,7 @@ static HRESULT WINAPI domdoc_createAttribute( return E_FAIL; xmlnode->doc = get_doc( This ); + xmldoc_add_orphan(xmlnode->doc, xmlnode); *attribute = (IXMLDOMAttribute*)create_attribute(xmlnode); @@ -1175,6 +1182,7 @@ static HRESULT WINAPI domdoc_createEntityReference( return E_FAIL; xmlnode->doc = get_doc( This ); + xmldoc_add_orphan(xmlnode->doc, xmlnode); *entityRef = (IXMLDOMEntityReference*)create_doc_entity_ref(xmlnode); @@ -1267,7 +1275,10 @@ static HRESULT WINAPI domdoc_createNode( HeapFree(GetProcessHeap(), 0, xml_name); if(xmlnode && *node) + { + xmldoc_add_orphan(xmlnode->doc, xmlnode); return S_OK; + } return E_FAIL; } diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 94df283..63aa8df 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -596,6 +596,10 @@ static HRESULT WINAPI xmlnode_insertBefore( new_child_node = impl_from_IXMLDOMNode(new)->node; TRACE("new_child_node %p This->node %p\n", new_child_node, This->node); + if(!new_child_node->parent) + if(xmldoc_remove_orphan(new_child_node->doc, new_child_node) != S_OK) + WARN("%p is not an orphan of %p\n", new_child_node, new_child_node->doc); + if(before) { before_node = impl_from_IXMLDOMNode(before)->node; @@ -663,11 +667,17 @@ static HRESULT WINAPI xmlnode_replaceChild( my_ancestor = my_ancestor->parent; } + if(!new_child_ptr->parent) + if(xmldoc_remove_orphan(new_child_ptr->doc, new_child_ptr) != S_OK) + WARN("%p is not an orphan of %p\n", new_child_ptr, new_child_ptr->doc); + leaving_doc = new_child_ptr->doc; xmldoc_add_ref(old_child_ptr->doc); xmlReplaceNode(old_child_ptr, new_child_ptr); xmldoc_release(leaving_doc); + xmldoc_add_orphan(old_child_ptr->doc, old_child_ptr); + if(outOldChild) { IXMLDOMNode_AddRef(oldChild); @@ -790,6 +800,7 @@ static HRESULT WINAPI xmlnode_cloneNode( if(pClone) { pClone->doc = This->node->doc; + xmldoc_add_orphan(pClone->doc, pClone); pNode = create_node(pClone); if(!pNode) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index b2b1b33..e4150e5 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -265,6 +265,10 @@ static HRESULT WINAPI xmlnodemap_setNamedItem( return E_FAIL; } + if(!ThisNew->node->parent) + if(xmldoc_remove_orphan(ThisNew->node->doc, ThisNew->node) != S_OK) + WARN("%p is not an orphan of %p\n", ThisNew->node, ThisNew->node->doc); + nodeNew = xmlAddChild(node, ThisNew->node); if(namedItem) @@ -312,6 +316,8 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( { attr_copy = xmlCopyProp( NULL, attr ); attr_copy->doc = node->doc; + /* The cast here is OK, xmlFreeNode handles xmlAttrPtr pointers */ + xmldoc_add_orphan(attr_copy->doc, (xmlNodePtr) attr_copy); *namedItem = create_node( (xmlNodePtr) attr_copy ); } xmlRemoveProp( attr );

1 0

Michael Karcher : msxml3: Add an orphan node list to xmlDoc.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: e497ed823ef9f7e7da80afa6023e974dfa134037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e497ed823ef9f7e7da80afa60… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Oct 11 23:59:19 2008 +0200 msxml3: Add an orphan node list to xmlDoc. --- dlls/msxml3/domdoc.c | 71 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 2 + 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 77ad06f..93795d3 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -39,6 +39,7 @@ #include "dispex.h" #include "wine/debug.h" +#include "wine/list.h" #include "msxml_private.h" @@ -81,10 +82,38 @@ typedef struct _domdoc DispatchEx dispex; } domdoc; +/* + In native windows, the whole lifetime management of XMLDOMNodes is + managed automatically using reference counts. Wine emulates that by + maintaining a reference count to the document that is increased for + each IXMLDOMNode pointer passed out for this document. If all these + pointers are gone, the document is unreachable and gets freed, that + is, all nodes in the tree of the document get freed. + + You are able to create nodes that are associated to a document (in + fact, in msxml's XMLDOM model, all nodes are associated to a document), + but not in the tree of that document, for example using the createFoo + functions from IXMLDOMDocument. These nodes do not get cleaned up + by libxml, so we have to do it ourselves. + + To catch these nodes, a list of "orphan nodes" is introduced. + It contains pointers to all roots of node trees that are + associated with the document without being part of the document + tree. All nodes with parent==NULL (except for the document root nodes) + should be in the orphan node list of their document. All orphan nodes + get freed together with the document itself. + */ + typedef struct _xmldoc_priv { LONG refs; + struct list orphans; } xmldoc_priv; +typedef struct _orphan_entry { + struct list entry; + xmlNode * node; +} orphan_entry; + static inline xmldoc_priv * priv_from_xmlDocPtr(xmlDocPtr doc) { return doc->_private; @@ -96,7 +125,10 @@ static xmldoc_priv * create_priv(void) priv = HeapAlloc( GetProcessHeap(), 0, sizeof (*priv) ); if(priv) + { priv->refs = 0; + list_init( &priv->orphans ); + } return priv; } @@ -129,7 +161,14 @@ LONG xmldoc_release(xmlDocPtr doc) TRACE("%d\n", ref); if(ref == 0) { + orphan_entry *orphan, *orphan2; TRACE("freeing docptr %p\n", doc); + + LIST_FOR_EACH_ENTRY_SAFE( orphan, orphan2, &priv->orphans, orphan_entry, entry ) + { + xmlFreeNode( orphan->node ); + HeapFree( GetProcessHeap(), 0, orphan ); + } HeapFree(GetProcessHeap(), 0, doc->_private); xmlFreeDoc(doc); @@ -138,6 +177,38 @@ LONG xmldoc_release(xmlDocPtr doc) return ref; } +HRESULT xmldoc_add_orphan(xmlDocPtr doc, xmlNodePtr node) +{ + xmldoc_priv *priv = priv_from_xmlDocPtr(doc); + orphan_entry *entry; + + entry = HeapAlloc( GetProcessHeap(), 0, sizeof (*entry) ); + if(!entry) + return E_OUTOFMEMORY; + + entry->node = node; + list_add_head( &priv->orphans, &entry->entry ); + return S_OK; +} + +HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) +{ + xmldoc_priv *priv = priv_from_xmlDocPtr(doc); + orphan_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE( entry, entry2, &priv->orphans, orphan_entry, entry ) + { + if( entry->node == node ) + { + list_remove( &entry->entry ); + HeapFree( GetProcessHeap(), 0, entry ); + return S_OK; + } + } + + return S_FALSE; +} + static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) { return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpVtbl)); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index b342742..45d68cf 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -65,6 +65,8 @@ extern BSTR bstr_from_xmlChar( const xmlChar *buf ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); +extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); +extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); extern HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj );

1 0