September 2007 - Wine-Commits

Peter Oberndorfer : winhttp: Add WinHttpGetIEProxyConfigForCurrentUser stub .
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 715edc163329758000a37cfc7cc4fb7a7b294efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=715edc163329758000a37cfc7… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 26 21:22:01 2007 +0200 winhttp: Add WinHttpGetIEProxyConfigForCurrentUser stub. --- dlls/winhttp/main.c | 25 +++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- include/winhttp.h | 9 +++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 163f57e..b8739d2 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -82,9 +82,34 @@ HRESULT WINAPI DllUnregisterServer(void) return S_OK; } +/*********************************************************************** + * WinHttpCheckPlatform (winhttp.@) + */ BOOL WINAPI WinHttpCheckPlatform(void) { FIXME("stub\n"); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) + */ +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config) +{ + if(!config) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* TODO: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ + FIXME("returning no proxy used\n"); + config->fAutoDetect = FALSE; + config->lpszAutoConfigUrl = NULL; + config->lpszProxy = NULL; + config->lpszProxyBypass = NULL; + + SetLastError(ERROR_SUCCESS); + return TRUE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index ac3f7dc..d148cfc 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -10,7 +10,7 @@ @ stub WinHttpCreateUrl @ stub WinHttpDetectAutoProxyConfigUrl @ stub WinHttpGetDefaultProxyConfiguration -@ stub WinHttpGetIEProxyConfigForCurrentUser +@ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl @ stub WinHttpOpen @ stub WinHttpOpenRequest diff --git a/include/winhttp.h b/include/winhttp.h index d0e1cf9..f971d76 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -84,12 +84,21 @@ typedef struct typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW; +typedef struct +{ + BOOL fAutoDetect; + LPWSTR lpszAutoConfigUrl; + LPWSTR lpszProxy; + LPWSTR lpszProxyBypass; +} WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; + #ifdef __cplusplus extern "C" { #endif BOOL WINAPI WinHttpCheckPlatform(void); +BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config); #ifdef __cplusplus }

1 0

Peter Oberndorfer : ntdll: NtAreMappedFilesTheSame semi stub.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 073dd7dde23608bb436db2d2ee71fa6c45c82d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073dd7dde23608bb436db2d2e… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 26 20:50:28 2007 +0200 ntdll: NtAreMappedFilesTheSame semi stub. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/virtual.c | 12 ++++++++++++ include/winternl.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1c4a39d..30c6ab3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -104,7 +104,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall NtAllocateUuids(ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr ptr ptr long long) -@ stub NtAreMappedFilesTheSame +@ stdcall NtAreMappedFilesTheSame(ptr ptr) # @ stub NtAssignProcessToJobObject @ stub NtCallbackReturn # @ stub NtCancelDeviceWakeupRequest @@ -948,7 +948,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids @ stdcall ZwAllocateVirtualMemory(long ptr ptr ptr long long) NtAllocateVirtualMemory -@ stub ZwAreMappedFilesTheSame +@ stdcall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame # @ stub ZwAssignProcessToJobObject @ stub ZwCallbackReturn # @ stub ZwCancelDeviceWakeupRequest diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7f42f59..14ff665 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2213,3 +2213,15 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu if (bytes_written) *bytes_written = size; return status; } + + +/*********************************************************************** + * NtAreMappedFilesTheSame (NTDLL.@) + * ZwAreMappedFilesTheSame (NTDLL.@) + */ +NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) +{ + TRACE("%p %p\n", addr1, addr2); + + return STATUS_NOT_SAME_DEVICE; +} diff --git a/include/winternl.h b/include/winternl.h index 88c36b1..df3a489 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1775,6 +1775,7 @@ NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); +NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS); NTSTATUS WINAPI NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); NTSTATUS WINAPI NtCancelTimer(HANDLE, BOOLEAN*);

1 0

Hans Leidekker : kernel32: Check for NULL output buffer in FormatMessage{A, W}.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 2c061dbae6706d0a4d4f67919603d3c88839c84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c061dbae6706d0a4d4f67919… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Sep 26 14:09:46 2007 +0200 kernel32: Check for NULL output buffer in FormatMessage{A, W}. --- dlls/kernel32/format_msg.c | 12 ++++++++++++ dlls/kernel32/tests/format_msg.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index b91dbaf..62def9c 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -154,6 +154,12 @@ DWORD WINAPI FormatMessageA( &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; + if (!lpBuffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) FIXME("line wrapping (%u) not supported.\n", width); from = NULL; @@ -368,6 +374,12 @@ DWORD WINAPI FormatMessageW( &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; + if (!lpBuffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) FIXME("line wrapping not supported.\n"); from = NULL; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 9396d45..e7b012c 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -220,7 +220,25 @@ static void test_message_from_string(void) ok(r==2,"failed: r=%d\n",r); } +static void test_message_null_buffer(void) +{ + DWORD ret, error; + + SetLastError(0xdeadbeef); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageA returned %u\n", ret); + ok(error == ERROR_NOT_ENOUGH_MEMORY, "last error %u\n", error); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + ok(!ret, "FormatMessageW returned %u\n", ret); + ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); +} + START_TEST(format_msg) { test_message_from_string(); + test_message_null_buffer(); }

1 0

Konstantin Kondratyuk : include/npapi.h: Add some constants.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: ca77cb108c45b82810984fffd23f4a7249a7b2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca77cb108c45b82810984fffd… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Sep 26 16:39:17 2007 +0400 include/npapi.h: Add some constants. --- include/npapi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/npapi.h b/include/npapi.h index cbe23f5..e84bfe4 100644 --- a/include/npapi.h +++ b/include/npapi.h @@ -34,12 +34,17 @@ #define WNNC_CON_CANCELCONNECTION 0x00000002 #define WNNC_CON_GETCONNECTIONS 0x00000004 #define WNNC_CON_ADDCONNECTION3 0x00000008 +#define WNNC_CON_GETPERFORMANCE 0x00000040 +#define WNNC_CON_DEFER 0x00000080 #define WNNC_DIALOG 0x00000008 #define WNNC_DLG_DEVICEMODE 0x00000001 #define WNNC_DLG_PROPERTYDIALOG 0x00000020 #define WNNC_DLG_SEARCHDIALOG 0x00000040 #define WNNC_DLG_FORMATNETWORKNAME 0x00000080 +#define WNNC_DLG_PERMISSIONEDITOR 0x00000100 +#define WNNC_DLG_GETRESOURCEPARENT 0x00000200 +#define WNNC_DLG_GETRESOURCEINFORMATION 0x00000800 #define WNNC_ADMIN 0x00000009 #define WNNC_ADM_GETDIRECTORYTYPE 0x00000001

1 0

Konstantin Kondratyuk : mpr: Correct usage of dwScope and dwEnumScopes.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 227966402b599a6ba41ee159ac6a8499eb067dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227966402b599a6ba41ee159a… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Sep 26 13:15:36 2007 +0400 mpr: Correct usage of dwScope and dwEnumScopes. --- dlls/mpr/wnet.c | 14 ++++++++++---- include/npapi.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 9a6a9ef..6d08692 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -731,7 +731,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, if (index != BAD_PROVIDER_INDEX) { if (providerTable->table[index].openEnum && - providerTable->table[index].dwEnumScopes & dwScope) + providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; @@ -964,6 +964,7 @@ static DWORD _globalEnumeratorAdvance(PWNetEnumerator enumerator) if (enumerator->providerDone) { + DWORD dwEnum = 0; enumerator->providerDone = FALSE; if (enumerator->handle) { @@ -972,10 +973,15 @@ static DWORD _globalEnumeratorAdvance(PWNetEnumerator enumerator) enumerator->handle = NULL; enumerator->providerIndex++; } + if (enumerator->dwScope == RESOURCE_CONNECTED) + dwEnum = WNNC_ENUM_LOCAL; + else if (enumerator->dwScope == RESOURCE_GLOBALNET) + dwEnum = WNNC_ENUM_GLOBAL; + else if (enumerator->dwScope == RESOURCE_CONTEXT) + dwEnum = WNNC_ENUM_CONTEXT; for (; enumerator->providerIndex < providerTable->numProviders && - !(enumerator->dwScope & providerTable->table - [enumerator->providerIndex].dwEnumScopes); - enumerator->providerIndex++) + !(providerTable->table[enumerator->providerIndex].dwEnumScopes + & dwEnum); enumerator->providerIndex++) ; } return enumerator->providerIndex < providerTable->numProviders ? diff --git a/include/npapi.h b/include/npapi.h index 39244da..cbe23f5 100644 --- a/include/npapi.h +++ b/include/npapi.h @@ -48,6 +48,7 @@ #define WNNC_ENUMERATION 0x0000000b #define WNNC_ENUM_GLOBAL 0x00000001 #define WNNC_ENUM_LOCAL 0x00000002 +#define WNNC_ENUM_CONTEXT 0x00000004 #define WNNC_START 0x0000000c #define WNNC_WAIT_FOR_START 0x00000001

1 0

Lionel_Debroux : mlang: Fix memory leaks in error path (found by Smatch).
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 8ae0d17d592c347a3ddd38bf4d97391716243e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae0d17d592c347a3ddd38bf4… Author: Lionel_Debroux <Lionel_Debroux(a)pc-debroux> Date: Wed Sep 26 14:27:32 2007 +0200 mlang: Fix memory leaks in error path (found by Smatch). --- dlls/mlang/mlang.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index b5b8e0d..7a77df5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -634,10 +634,9 @@ HRESULT WINAPI ConvertINetString( pDstStrW = HeapAlloc(GetProcessHeap(), 0, cDstSizeW * sizeof(WCHAR)); hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, pDstStrW, &cDstSizeW); - if (hr != S_OK) - return hr; + if (hr == S_OK) + hr = ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, pDstStrW, &cDstSizeW, pDstStr, pcDstSize); - hr = ConvertINetUnicodeToMultiByte(pdwMode, dwDstEncoding, pDstStrW, &cDstSizeW, pDstStr, pcDstSize); HeapFree(GetProcessHeap(), 0, pDstStrW); return hr; }

1 0

Lionel_Debroux : mlang: Fix memory leaks in error paths (found by Smatch).
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 333451411bd475aadf85daf821942f34460d6ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333451411bd475aadf85daf82… Author: Lionel_Debroux <Lionel_Debroux(a)pc-debroux> Date: Wed Sep 26 14:25:26 2007 +0200 mlang: Fix memory leaks in error paths (found by Smatch). --- dlls/mlang/mlang.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 7a77df5..b6bd57e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1884,7 +1884,11 @@ static HRESULT EnumRfc1766_create(MLang_impl* mlang, LANGID LangId, data.total = 0; data.allocated = 32; data.info = HeapAlloc(GetProcessHeap(), 0, data.allocated * sizeof(RFC1766INFO)); - if (!data.info) return S_FALSE; + if (!data.info) + { + HeapFree(GetProcessHeap(), 0, rfc); + return S_FALSE; + } TlsSetValue(MLANG_tls_index, &data); EnumSystemLocalesW(enum_locales_proc, 0/*LOCALE_SUPPORTED*/); @@ -1892,7 +1896,12 @@ static HRESULT EnumRfc1766_create(MLang_impl* mlang, LANGID LangId, TRACE("enumerated %d rfc1766 structures\n", data.total); - if (!data.total) return FALSE; + if (!data.total) + { + HeapFree(GetProcessHeap(), 0, data.info); + HeapFree(GetProcessHeap(), 0, rfc); + return FALSE; + } rfc->info = data.info; rfc->total = data.total;

1 0

Alex Villacís Lasso : riched20: EM_SETCHARFORMAT must fail and return 0 with TM_PLAINTEXT and SF_SELECTION .
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 03f3a40a03dedb9f2162cf64fe96f3464fcace34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f3a40a03dedb9f2162cf64f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Sep 26 15:50:45 2007 -0500 riched20: EM_SETCHARFORMAT must fail and return 0 with TM_PLAINTEXT and SF_SELECTION. --- dlls/riched20/editor.c | 16 +++++++++++----- dlls/riched20/tests/editor.c | 10 +++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4efaa90..fcfe03a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1733,13 +1733,19 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, BOOL bRepaint = TRUE; p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); if (p == NULL) return 0; - if (!wParam || (editor->mode & TM_PLAINTEXT)) + if (!wParam) ME_SetDefaultCharFormat(editor, p); - else if (wParam == (SCF_WORD | SCF_SELECTION)) + else if (wParam == (SCF_WORD | SCF_SELECTION)) { FIXME("EM_SETCHARFORMAT: word selection not supported\n"); - else if (wParam == SCF_ALL) - ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), p); - else { + return 0; + } else if (wParam == SCF_ALL) { + if (editor->mode & TM_PLAINTEXT) + ME_SetDefaultCharFormat(editor, p); + else + ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), p); + } else if (editor->mode & TM_PLAINTEXT) { + return 0; + } else { int from, to; ME_GetSelection(editor, &from, &to); bRepaint = (from != to); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 416c803..0ec7da4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -572,9 +572,13 @@ static void test_TM_PLAINTEXT(void) cf2.dwEffects = CFE_BOLD ^ cf2.dwEffects; rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); - todo_wine { - ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); - } + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD | SCF_SELECTION, (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM)&cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); /*Get the formatting of those characters*/

1 0

Michael Stefaniuc : server: Include stdarg.h in completion.c. Needed for older gcc versions.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 238043784ac1e67db0c03e5498cf9d02a55f0dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=238043784ac1e67db0c03e549… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 26 21:16:23 2007 +0200 server: Include stdarg.h in completion.c. Needed for older gcc versions. --- server/completion.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/completion.c b/server/completion.c index f024b44..1282bb4 100644 --- a/server/completion.c +++ b/server/completion.c @@ -29,6 +29,7 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> #include <stdio.h> #include "ntstatus.h"

1 0

Stefan Leichter : amstream: Remove 'recursive registry key delete' function .
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: c14bf9223cbe9e1194aecc9650d26083a46009eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14bf9223cbe9e1194aecc965… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 26 20:54:56 2007 +0200 amstream: Remove 'recursive registry key delete' function. --- dlls/amstream/regsvr.c | 79 +++++------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/amstream/regsvr.c b/dlls/amstream/regsvr.c index d2869d3..054de6a 100644 --- a/dlls/amstream/regsvr.c +++ b/dlls/amstream/regsvr.c @@ -117,9 +117,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -208,7 +205,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -315,16 +313,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -437,70 +438,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0