August 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : rsaenh: Constify some variables.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: c94f113f4f64f408fb6d62c5400a8358e9a83f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94f113f4f64f408fb6d62c54… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Aug 23 21:32:19 2007 +0100 rsaenh: Constify some variables. --- dlls/rsaenh/implglue.c | 4 ++-- dlls/rsaenh/implglue.h | 4 ++-- dlls/rsaenh/rsaenh.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 32268a1..6953161 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -328,7 +328,7 @@ BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) return SystemFunction036(pbBuffer, dwLen); } -BOOL export_public_key_impl(BYTE *pbDest, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen,DWORD *pdwPubExp) +BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen,DWORD *pdwPubExp) { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); reverse_bytes(pbDest, dwKeyLen); @@ -362,7 +362,7 @@ BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD d return TRUE; } -BOOL export_private_key_impl(BYTE *pbDest, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp) { mp_to_unsigned_bin(&pKeyContext->rsa.N, pbDest); diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 5c82956..597ca1e 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -86,11 +86,11 @@ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContex DWORD enc); BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen); -BOOL export_public_key_impl(BYTE *pbDest, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp); BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwPubExp); -BOOL export_private_key_impl(BYTE *pbDest, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, +BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD *pdwPubExp); BOOL import_private_key_impl(CONST BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, DWORD dwPubExp); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 1ff1370..8a27e2c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -521,7 +521,7 @@ static inline void free_hmac_info(PHMAC_INFO hmac_info) { * NOTES * See Internet RFC 2104 for details on the HMAC algorithm. */ -static BOOL copy_hmac_info(PHMAC_INFO *dst, PHMAC_INFO src) { +static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) { if (!src) return FALSE; *dst = HeapAlloc(GetProcessHeap(), 0, sizeof(HMAC_INFO)); if (!*dst) return FALSE; @@ -974,7 +974,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr) * Success: Handle to the new key container. * Failure: INVALID_HANDLE_VALUE */ -static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, PVTableProvStruc pVTable) +static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const VTableProvStruc *pVTable) { KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; @@ -1039,7 +1039,7 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, PVTabl * Success: Handle to the key container read from the registry * Failure: INVALID_HANDLE_VALUE */ -static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTableProvStruc pVTable) +static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, const VTableProvStruc *pVTable) { CHAR szRSABase[MAX_PATH]; BYTE *pbKey;

1 0

Lei Zhang : gphoto2: Import photos in the right order.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: ffbca82668fcf16d1ebb82669b244f2a6c64a0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbca82668fcf16d1ebb82669… Author: Lei Zhang <thestig(a)google.com> Date: Thu Aug 23 11:40:43 2007 -0700 gphoto2: Import photos in the right order. --- dlls/gphoto2.ds/ds_ctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ds_ctrl.c b/dlls/gphoto2.ds/ds_ctrl.c index 1b439b3..9644f8a 100644 --- a/dlls/gphoto2.ds/ds_ctrl.c +++ b/dlls/gphoto2.ds/ds_ctrl.c @@ -63,7 +63,7 @@ load_filesystem(const char *folder) { gpfile->folder = strdup(folder); gpfile->filename = strdup(name); gpfile->download = FALSE; - list_add_head( &activeDS.files, &gpfile->entry ); + list_add_tail( &activeDS.files, &gpfile->entry ); } gp_list_reset (list);

1 0

Alexandre Julliard : user32: IsChild must not consider the desktop window.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 8bbeadf56509317bba6f496030ecef2bb5d2bd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbeadf56509317bba6f49603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 10:56:51 2007 +0200 user32: IsChild must not consider the desktop window. --- dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 2 -- dlls/user32/tests/win.c | 6 ------ dlls/user32/win.c | 2 +- dlls/winex11.drv/dce.c | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c89a7ff..e87c428 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -303,7 +303,7 @@ static inline BOOL is_mouse_message( UINT message ) /* check whether message matches the specified hwnd filter */ static inline BOOL check_hwnd_filter( const MSG *msg, HWND hwnd_filter ) { - if (!hwnd_filter) return TRUE; + if (!hwnd_filter || hwnd_filter == GetDesktopWindow()) return TRUE; return (msg->hwnd == hwnd_filter || IsChild( hwnd_filter, msg->hwnd )); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index af05f7b..502cefc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7476,9 +7476,7 @@ static void test_DestroyWindow(void) /* test owner/parent of the parent */ test = GetParent(parent); ok(!test, "wrong parent %p\n", test); -todo_wine { ok(!IsChild(GetDesktopWindow(), parent), "wrong parent/child %p/%p\n", GetDesktopWindow(), parent); -} if(pGetAncestor) { test = pGetAncestor(parent, GA_PARENT); ok(test == GetDesktopWindow(), "wrong parent %p\n", test); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3688bea..34aadb1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2758,27 +2758,21 @@ static void test_SetParent(void) check_parents(child3, child2, child2, child2, 0, child2, parent); check_parents(child4, desktop, child2, child2, child2, child4, parent); -todo_wine { ok(!IsChild(desktop, parent), "wrong parent/child %p/%p\n", desktop, parent); ok(!IsChild(desktop, child1), "wrong parent/child %p/%p\n", desktop, child1); ok(!IsChild(desktop, child2), "wrong parent/child %p/%p\n", desktop, child2); ok(!IsChild(desktop, child3), "wrong parent/child %p/%p\n", desktop, child3); ok(!IsChild(desktop, child4), "wrong parent/child %p/%p\n", desktop, child4); -} ok(IsChild(parent, child1), "wrong parent/child %p/%p\n", parent, child1); -todo_wine { ok(!IsChild(desktop, child2), "wrong parent/child %p/%p\n", desktop, child2); -} ok(!IsChild(parent, child2), "wrong parent/child %p/%p\n", parent, child2); ok(!IsChild(child1, child2), "wrong parent/child %p/%p\n", child1, child2); ok(!IsChild(parent, child3), "wrong parent/child %p/%p\n", parent, child3); ok(IsChild(child2, child3), "wrong parent/child %p/%p\n", child2, child3); ok(!IsChild(parent, child4), "wrong parent/child %p/%p\n", parent, child4); ok(!IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4); -todo_wine { ok(!IsChild(desktop, child4), "wrong parent/child %p/%p\n", desktop, child4); -} if (!is_win9x) /* Win9x doesn't survive this test */ { diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0ef021a..41eb108 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2609,7 +2609,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child ) if (!list) return FALSE; parent = WIN_GetFullHandle( parent ); for (i = 0; list[i]; i++) if (list[i] == parent) break; - ret = (list[i] != 0); + ret = list[i] && list[i+1]; HeapFree( GetProcessHeap(), 0, list ); return ret; } diff --git a/dlls/winex11.drv/dce.c b/dlls/winex11.drv/dce.c index 3b80308..72c5429 100644 --- a/dlls/winex11.drv/dce.c +++ b/dlls/winex11.drv/dce.c @@ -391,7 +391,7 @@ void invalidate_dce( HWND hwnd, const RECT *rect ) /* check if DCE window is within the z-order scope */ - if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) + if (hwndScope == dce->hwnd || hwndScope == GetDesktopWindow() || IsChild( hwndScope, dce->hwnd )) { if (hwnd != dce->hwnd) {

1 0

Tijl Coosemans : server: Use thr_kill2 syscall to signal threads on FreeBSD .
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 0c4f152ec7aeaaab7e3221000c80c1f90437842c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4f152ec7aeaaab7e3221000… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Thu Aug 23 14:12:37 2007 +0200 server: Use thr_kill2 syscall to signal threads on FreeBSD. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ server/ptrace.c | 15 +++++++++++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 101511d..8c3db36 100755 --- a/configure +++ b/configure @@ -15689,6 +15689,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -15746,6 +15747,7 @@ for ac_func in \ strncasecmp \ strtold \ tcgetattr \ + thr_kill2 \ timegm \ usleep \ vsnprintf \ diff --git a/configure.ac b/configure.ac index 6b90cd2..64be416 100644 --- a/configure.ac +++ b/configure.ac @@ -1287,6 +1287,7 @@ AC_CHECK_FUNCS(\ strncasecmp \ strtold \ tcgetattr \ + thr_kill2 \ timegm \ usleep \ vsnprintf \ diff --git a/include/config.h.in b/include/config.h.in index 0c4935c..df65adb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -849,6 +849,9 @@ /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H +/* Define to 1 if you have the `thr_kill2' function. */ +#undef HAVE_THR_KILL2 + /* Define to 1 if you have the `timegm' function. */ #undef HAVE_TIMEGM diff --git a/server/ptrace.c b/server/ptrace.c index f1a9afb..343e38e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -35,6 +35,10 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif +#ifdef HAVE_SYS_THR_H +# include <sys/ucontext.h> +# include <sys/thr.h> +#endif #include <unistd.h> #include "ntstatus.h" @@ -206,9 +210,8 @@ static int wait4_thread( struct thread *thread, int signal ) /* send a signal to a specific thread */ static inline int tkill( int tgid, int pid, int sig ) { - int ret = -ENOSYS; - #ifdef __linux__ + int ret = -ENOSYS; # ifdef __i386__ __asm__( "pushl %%ebx\n\t" "movl %2,%%ebx\n\t" @@ -227,11 +230,15 @@ static inline int tkill( int tgid, int pid, int sig ) __asm__( "syscall" : "=a" (ret) : "0" (200) /*SYS_tkill*/, "D" (pid), "S" (sig) ); # endif -#endif /* __linux__ */ - if (ret >= 0) return ret; errno = -ret; return -1; +#elif defined(__FreeBSD__) && defined(HAVE_THR_KILL2) + return thr_kill2( tgid, pid, sig ); +#else + errno = ENOSYS; + return -1; +#endif } /* initialize the process tracing mechanism */

1 0

Alexandre Julliard : server: Validate the parents every time we paint a window instead of only on RDW_UPDATENOW .
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 149cbb1b60fbb125cfcbb621db06f77bc14a138e URL: http://source.winehq.org/git/wine.git/?a=commit;h=149cbb1b60fbb125cfcbb621d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 20:22:30 2007 +0200 server: Validate the parents every time we paint a window instead of only on RDW_UPDATENOW. --- dlls/user32/painting.c | 3 +++ server/window.c | 9 ++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 862c75f..22dd6c2 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -160,6 +160,9 @@ static BOOL redraw_window_rects( HWND hwnd, UINT flags, const RECT *rects, UINT { BOOL ret; + if (!(flags & (RDW_INVALIDATE|RDW_VALIDATE|RDW_INTERNALPAINT|RDW_NOINTERNALPAINT))) + return TRUE; /* nothing to do */ + SERVER_START_REQ( redraw_window ) { req->window = hwnd; diff --git a/server/window.c b/server/window.c index 182213e..c930992 100644 --- a/server/window.c +++ b/server/window.c @@ -1051,7 +1051,7 @@ static void validate_children( struct window *win ) } -/* validate the update region of a window on all parents; helper for redraw_window */ +/* validate the update region of a window on all parents; helper for get_update_region */ static void validate_parents( struct window *child ) { int offset_x = 0, offset_y = 0; @@ -1137,12 +1137,6 @@ static void redraw_window( struct window *win, struct region *region, int frame, inc_window_paint_count( win, -1 ); } - if (flags & RDW_UPDATENOW) - { - validate_parents( win ); - flags &= ~RDW_UPDATENOW; - } - /* now process children recursively */ if (flags & RDW_NOCHILDREN) return; @@ -1982,6 +1976,7 @@ DECL_HANDLER(get_update_region) if (reply->flags & (UPDATE_PAINT|UPDATE_INTERNALPAINT)) /* validate everything */ { + validate_parents( win ); validate_whole_window( win ); } else

1 0

Rob Shearman : shlwapi: Fix UrlCombineW for absolute URLs without slashes.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: acfc1175a2204422e7ff089f47486b3f153124c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfc1175a2204422e7ff089f4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 16:42:29 2007 +0100 shlwapi: Fix UrlCombineW for absolute URLs without slashes. --- dlls/shlwapi/tests/path.c | 4 ++++ dlls/shlwapi/url.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index d4ed84d..7eb02b2 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -205,6 +205,10 @@ const TEST_URL_COMBINE TEST_COMBINE[] = { {"xxx:@MSITStore:file.chm/file.html", "dir/file", 0, S_OK, "xxx:dir/file"}, {"mk:@MSITStore:file.chm::/file.html", "/dir/file", 0, S_OK, "mk:@MSITStore:file.chm::/dir/file"}, {"mk:@MSITStore:file.chm::/file.html", "mk:@MSITStore:file.chm::/dir/file", 0, S_OK, "mk:@MSITStore:file.chm::/dir/file"}, + {"foo:today", "foo:calendar", 0, S_OK, "foo:calendar"}, + {"foo:today", "bar:calendar", 0, S_OK, "bar:calendar"}, + {"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"}, + {"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"}, }; struct { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index e1c0aa6..e7701da 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -736,8 +736,9 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, process_case = 4; break; } - /* case where scheme is followed by document path */ - process_case = 5; + /* replace either just location if base's location starts with a + * slash or otherwise everything */ + process_case = (*base.pszSuffix == '/') ? 5 : 1; break; } if ((*relative.pszSuffix == '/') && (*(relative.pszSuffix+1) == '/')) {

1 0

Paul Vriens : winetest: Put dll version information in the report.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: d0ce7ec59902abab0d4c88407b0e6dda92f6dfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ce7ec59902abab0d4c88407… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 23 18:28:23 2007 +0200 winetest: Put dll version information in the report. --- programs/winetest/Makefile.in | 2 +- programs/winetest/main.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 01111f4..30d29ff 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winetest.exe APPMODE = -mconsole -IMPORTS = comctl32 user32 gdi32 wsock32 kernel32 +IMPORTS = comctl32 version user32 gdi32 wsock32 kernel32 C_SRCS = \ gui.c \ diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 5d5462b..54574b1 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -62,6 +62,39 @@ static struct rev_info *rev_infos = NULL; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; +static char * get_file_version(char * file_name) +{ + static char version[32]; + DWORD size; + DWORD handle; + + size = GetFileVersionInfoSizeA(file_name, &handle); + if (size) { + char * data = xmalloc(size); + if (data) { + if (GetFileVersionInfoA(file_name, handle, size, data)) { + static char backslash[] = "\\"; + VS_FIXEDFILEINFO *pFixedVersionInfo; + UINT len; + if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { + sprintf(version, "%d.%d.%d.%d", + pFixedVersionInfo->dwFileVersionMS >> 16, + pFixedVersionInfo->dwFileVersionMS & 0xffff, + pFixedVersionInfo->dwFileVersionLS >> 16, + pFixedVersionInfo->dwFileVersionLS & 0xffff); + } else + sprintf(version, "version not available"); + } else + sprintf(version, "unknown"); + free(data); + } else + sprintf(version, "failed"); + } else + sprintf(version, "version not available"); + + return version; +} + static int running_under_wine (void) { HMODULE module = GetModuleHandleA("ntdll.dll"); @@ -448,6 +481,8 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, } FreeLibrary(dll); + xprintf (" %s=%s\n", dllname, get_file_version(dllname)); + get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++;

1 0

Rob Shearman : include: Add a define for SID_SOleUndoManager.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 38b1c7918f2eb5097ccb67deea5b1482e0e842dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b1c7918f2eb5097ccb67dee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 15:44:12 2007 +0100 include: Add a define for SID_SOleUndoManager. --- include/ocidl.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/ocidl.idl b/include/ocidl.idl index 6c33240..c40d155 100644 --- a/include/ocidl.idl +++ b/include/ocidl.idl @@ -1244,6 +1244,7 @@ interface IEnumOleUndoUnits : IUnknown ] interface IOleUndoManager : IUnknown { +cpp_quote("#define SID_SOleUndoManager IID_IOleUndoManager") typedef IOleUndoManager *LPOLEUNDOMANAGER; HRESULT Open( [in] IOleParentUndoUnit *pPUU );

1 0

Stefan Leichter : objsel: Remove 'recursive registry key delete' function.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: 519b4ef4a240a524b7082f08d2f8e73ba2ef1b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=519b4ef4a240a524b7082f08d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 23 18:30:56 2007 +0200 objsel: Remove 'recursive registry key delete' function. --- dlls/objsel/regsvr.c | 76 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/objsel/regsvr.c b/dlls/objsel/regsvr.c index 17c9fd3..bfb4dd1 100644 --- a/dlls/objsel/regsvr.c +++ b/dlls/objsel/regsvr.c @@ -127,9 +127,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 @@ -216,7 +213,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); @@ -336,16 +334,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; } } @@ -454,67 +455,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

Stefan Leichter : ole32: Remove 'recursive registry key delete' function.
by Alexandre Julliard Aug. 24, 2007

Aug. 24, 2007

Module: wine Branch: master Commit: fee1e38e5618a9d3592943bdbbfd5b552d00897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee1e38e5618a9d3592943bdb… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 23 18:03:39 2007 +0200 ole32: Remove 'recursive registry key delete' function. --- dlls/ole32/regsvr.c | 80 ++++----------------------------------------------- 1 files changed, 6 insertions(+), 74 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index fdb45c8..51b4f06 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -112,9 +112,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); static LONG register_progid(WCHAR const *clsid, char const *progid, char const *name); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); - /*********************************************************************** * register_interfaces @@ -201,22 +198,12 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) for (; res == ERROR_SUCCESS && list->iid; ++list) { WCHAR buf[39]; - HKEY iid_key; StringFromGUID2(list->iid, buf, 39); - res = RegOpenKeyExW(interface_key, buf, 0, - KEY_READ | KEY_WRITE, &iid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_interface_key; - res = recursive_delete_key(iid_key); - RegCloseKey(iid_key); - if (res != ERROR_SUCCESS) goto error_close_interface_key; + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } -error_close_interface_key: RegCloseKey(interface_key); error_return: return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; @@ -308,22 +295,15 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) for (; res == ERROR_SUCCESS && list->clsid; ++list) { WCHAR buf[39]; - HKEY clsid_key; StringFromGUID2(list->clsid, buf, 39); - res = RegOpenKeyExW(coclass_key, buf, 0, - KEY_READ | KEY_WRITE, &clsid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = recursive_delete_key(clsid_key); - RegCloseKey(clsid_key); + 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; } } @@ -418,54 +398,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; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_StdOleLink = {

1 0