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

Andrew Talbot : rsaenh: Constify some variables.
by Alexandre Julliard 24 Aug '07

24 Aug '07

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 24 Aug '07

24 Aug '07

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

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

24 Aug '07

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 24 Aug '07

24 Aug '07

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

Alexandre Julliard : user32: IsChild must not consider the desktop window.
by Alexandre Julliard 24 Aug '07

24 Aug '07

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

Rob Shearman : include: Add a define for SID_SHlinkFrame.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: 82fa36059d721a2a01074469ea7808a69ecae169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fa36059d721a2a01074469e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 15:44:07 2007 +0100 include: Add a define for SID_SHlinkFrame. --- include/hlink.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 9642956..3e33891 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -36,6 +36,8 @@ cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DW cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") +cpp_quote("#define SID_SHlinkFrame IID_IHlinkFrame") + /***************************************************************************** * IHlink interface */

1 0

Rob Shearman : include: Add a define for SID_SOleUndoManager.
by Alexandre Julliard 24 Aug '07

24 Aug '07

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

Rob Shearman : include: Add some defines for mshtml service IDs.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: 68efb47ca3efcea0fdd340898ed7931fd4e7f7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68efb47ca3efcea0fdd340898… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 15:44:16 2007 +0100 include: Add some defines for mshtml service IDs. --- include/mshtml.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 18b92bc..c6420d6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -25,6 +25,12 @@ import "ocidl.idl"; cpp_quote("#include <olectl.h>") +cpp_quote("DEFINE_GUID(SID_SEditCommandTarget, 0x3050f4b5,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") +cpp_quote("DEFINE_GUID(SID_SHTMLEditHost, 0x3050f6a0,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") +cpp_quote("DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") +cpp_quote("#define SID_SHTMLWindow IID_IHTMLWindow2") +cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory") + interface IHTMLDocument2; interface IHTMLStyleSheetsCollection;

1 0

Rob Shearman : winex11.drv: Don' t activate the systray window when repositioning it.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: fba87b110f818a02d286e15762bfcf26389e64f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba87b110f818a02d286e1576… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 15:44:24 2007 +0100 winex11.drv: Don't activate the systray window when repositioning it. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 030989b..f7a0909 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -341,7 +341,7 @@ static void systray_dock_window( Display *display, struct x11drv_win_data *data * http://standards.freedesktop.org/xembed-spec/latest/ar01s04.html */ SetWindowPos( data->hwnd, NULL, virtual_screen_rect.right + 1, virtual_screen_rect.bottom + 1, - 0, 0, SWP_NOZORDER | SWP_NOSIZE ); + 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE ); /* set XEMBED protocol data on the window */ info[0] = 0; /* protocol version */

1 0

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

24 Aug '07

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