wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Jacek Caban : jscript: Added jsstr_extract helper and use it in String. charCodeAt implementation.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 618b88ef30b0d5b955e1f3c65f6da0896aafac6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=618b88ef30b0d5b955e1f3c65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 11:01:52 2013 +0100 jscript: Added jsstr_extract helper and use it in String.charCodeAt implementation. --- dlls/jscript/jsstr.h | 13 ++++++++++++- dlls/jscript/string.c | 7 +++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 09893fa..28742ac 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -65,6 +65,11 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); } +static inline void jsstr_extract(jsstr_t *str, unsigned off, unsigned len, WCHAR *buf) +{ + memcpy(buf, str->str+off, len*sizeof(WCHAR)); +} + static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) { unsigned len = jsstr_length(str); @@ -74,7 +79,13 @@ static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) { - return jsstr_alloc_len(str->str+off, len); + jsstr_t *ret; + WCHAR *ptr; + + ptr = jsstr_alloc_buf(len, &ret); + if(ptr) + jsstr_extract(str, off, len, ptr); + return ret; } int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 7672fb7..64d0f1e 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -347,8 +347,11 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, idx = d; } - if(r) - *r = jsval_number(str->str[idx]); + if(r) { + WCHAR c; + jsstr_extract(str, idx, 1, &c); + *r = jsval_number(c); + } jsstr_release(str); return S_OK;

1 0

Dmitry Timoshkov : ole32: Fix an apartment reference count leak on error path.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 41d3085522f795d8e7c78d1463ce79790b4f36f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d3085522f795d8e7c78d146… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 28 18:46:22 2013 +0900 ole32: Fix an apartment reference count leak on error path. --- dlls/ole32/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a8df28c..ddaaa53 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1437,6 +1437,7 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) if (!(stubmgr = get_stub_manager(apt, stdobjref.oid))) { + apartment_release(apt); ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid)); return RPC_E_INVALID_OBJREF;

1 0

Ken Thomases : winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 4fba2995b633559c9baf4ad881c2d09e8028c964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fba2995b633559c9baf4ad88… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 12:05:41 2013 -0500 winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method. --- dlls/winemac.drv/cocoa_opengl.m | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 1368c73..b678cae 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -45,7 +45,7 @@ context attached). So, we finesse things by first setting the context's view to a different view (the content view of an off-screen window) and then letting the original implementation proceed. */ - - (void) clearDrawable + - (void) clearDrawableLeavingSurfaceOnScreen { static NSWindow* dummyWindow; static dispatch_once_t once; @@ -60,7 +60,7 @@ }); [self setView:[dummyWindow contentView]]; - [super clearDrawable]; + [self clearDrawable]; } @end @@ -99,7 +99,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) macdrv_remove_view_opengl_context((macdrv_view)[context view], c); if ([context latentView]) macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; [context release]; [pool release]; @@ -143,7 +143,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; } } else

1 0

Ken Thomases : winemac: Synthesize 8- and 16-bpp display modes if the system doesn't provide any.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 5c8d6a0b93d44366500710355f1455a61a578cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8d6a0b93d44366500710355… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 12:05:35 2013 -0500 winemac: Synthesize 8- and 16-bpp display modes if the system doesn't provide any. macdrv_ChangeDisplaySettingsEx() ignores the requested bpp, anyway, so we can report any values we think programs will want. --- dlls/winemac.drv/display.c | 87 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 85c903d..9ed02f8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -33,6 +33,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW static CFArrayRef modes; +static BOOL modes_has_8bpp, modes_has_16bpp; static int default_mode_bpp; static CRITICAL_SECTION modes_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -469,6 +470,8 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, struct macdrv_display *displays = NULL; int num_displays; CGDisplayModeRef display_mode; + int display_mode_bpp; + BOOL synthesized = FALSE; double rotation; uint32_t io_flags; @@ -494,42 +497,84 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, { TRACE("mode %d (current) -- getting current mode\n", mode); display_mode = CGDisplayCopyDisplayMode(displays[0].displayID); + display_mode_bpp = display_mode_bits_per_pixel(display_mode); } else { + DWORD count, i; + EnterCriticalSection(&modes_section); if (mode == 0 || !modes) { if (modes) CFRelease(modes); modes = CGDisplayCopyAllDisplayModes(displays[0].displayID, NULL); + modes_has_8bpp = modes_has_16bpp = FALSE; + + if (modes) + { + count = CFArrayGetCount(modes); + for (i = 0; i < count && !(modes_has_8bpp && modes_has_16bpp); i++) + { + CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + int bpp = display_mode_bits_per_pixel(mode); + if (bpp == 8) + modes_has_8bpp = TRUE; + else if (bpp == 16) + modes_has_16bpp = TRUE; + } + } } display_mode = NULL; if (modes) { - if (flags & EDS_RAWMODE) - { - if (mode < CFArrayGetCount(modes)) - display_mode = (CGDisplayModeRef)CFRetain(CFArrayGetValueAtIndex(modes, mode)); - } - else + int default_bpp = get_default_bpp(); + DWORD seen_modes = 0; + + count = CFArrayGetCount(modes); + for (i = 0; i < count; i++) { - DWORD count, i, safe_modes = 0; - count = CFArrayGetCount(modes); - for (i = 0; i < count; i++) + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + + io_flags = CGDisplayModeGetIOFlags(candidate); + if (!(flags & EDS_RAWMODE) && + (!(io_flags & kDisplayModeValidFlag) || !(io_flags & kDisplayModeSafeFlag))) + continue; + + seen_modes++; + if (seen_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = display_mode_bits_per_pixel(display_mode); + break; + } + + /* We only synthesize modes from those having the default bpp. */ + if (display_mode_bits_per_pixel(candidate) != default_bpp) + continue; + + if (!modes_has_8bpp) + { + seen_modes++; + if (seen_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = 8; + synthesized = TRUE; + break; + } + } + + if (!modes_has_16bpp) { - CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - io_flags = CGDisplayModeGetIOFlags(candidate); - if ((io_flags & kDisplayModeValidFlag) && - (io_flags & kDisplayModeSafeFlag)) + seen_modes++; + if (seen_modes > mode) { - safe_modes++; - if (safe_modes > mode) - { - display_mode = (CGDisplayModeRef)CFRetain(candidate); - break; - } + display_mode = (CGDisplayModeRef)CFRetain(candidate); + display_mode_bpp = 16; + synthesized = TRUE; + break; } } } @@ -557,7 +602,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, devmode->dmDisplayFixedOutput = DMDFO_CENTER; devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; - devmode->dmBitsPerPel = display_mode_bits_per_pixel(display_mode); + devmode->dmBitsPerPel = display_mode_bpp; if (devmode->dmBitsPerPel) devmode->dmFields |= DM_BITSPERPEL; @@ -587,6 +632,8 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, TRACE(" stretched"); if (devmode->dmDisplayFlags & DM_INTERLACED) TRACE(" interlaced"); + if (synthesized) + TRACE(" (synthesized)"); TRACE("\n"); return TRUE;

1 0

Jacek Caban : libwine: Added tid debug channel support on native Windows builds.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: e422a22ed92937da4e0f37311877da8d626bfa02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e422a22ed92937da4e0f37311… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 17:08:16 2013 +0100 libwine: Added tid debug channel support on native Windows builds. --- libs/wine/debug.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index a38abf4..548ef22 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -33,6 +33,10 @@ #include "wine/debug.h" #include "wine/library.h" +#if defined(__MINGW32__) || defined(_MSC_VER) +WINE_DECLARE_DEBUG_CHANNEL(tid); +#endif + static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; #define MAX_DEBUG_OPTIONS 256 @@ -402,6 +406,10 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch { int ret = 0; +#if defined(__MINGW32__) || defined(_MSC_VER) + if (TRACE_ON(tid)) + ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); +#endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format)

1 0

Jacek Caban : urlmon: Delay processing notifications from Read during MIME verification.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 506b369c73da984e3da0974665c8a58041784353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=506b369c73da984e3da097466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 14:12:44 2013 +0100 urlmon: Delay processing notifications from Read during MIME verification. --- dlls/urlmon/bindprot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 8deccda..33d6a64 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -897,8 +897,12 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportData(IInternetProtocolSink *ifac do { read = 0; + if(is_apartment_thread(This)) + This->continue_call++; hres = IInternetProtocol_Read(This->protocol, buf, sizeof(buf)-This->buf_size, &read); + if(is_apartment_thread(This)) + This->continue_call--; if(FAILED(hres) && hres != E_PENDING) return hres;

1 0

Hans Leidekker : mshtml: Don' t append slashes to opaque protocol identifiers.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: e15a923a0aff0bddcb31828400ad7ee7b601ee14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15a923a0aff0bddcb3182840… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 27 17:13:46 2013 +0100 mshtml: Don't append slashes to opaque protocol identifiers. --- dlls/mshtml/editor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index dbb2d93..0a58d1f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1016,17 +1016,17 @@ static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static const WCHAR wszOther[] = {'(','o','t','h','e','r',')',0}; + static const WCHAR wszFile[] = {'f','i','l','e',':',0}; + static const WCHAR wszFtp[] = {'f','t','p',':',0}; + static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; + static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; + static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; + static const WCHAR wszNews[] = {'n','e','w','s',':',0}; switch (msg) { case WM_INITDIALOG: { - static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFtp[] = {'f','t','p',':',0}; - static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; - static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR wszNews[] = {'n','e','w','s',':',0}; INT def_idx; HWND hwndCB = GetDlgItem(hwnd, IDC_TYPE); HWND hwndURL = GetDlgItem(hwnd, IDC_URL); @@ -1102,8 +1102,9 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP /* add new protocol */ if (*type != '\0') { - memcpy(url, type, strlenW(type) * sizeof(WCHAR)); - memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); + memcpy(url, type, (strlenW(type) + 1) * sizeof(WCHAR)); + if (strcmpW(type, wszMailto) && strcmpW(type, wszNews)) + memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); } SetWindowTextW(hwndURL, url);

1 0

Hans Leidekker : urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 9eb140db70b83e1ce5e1b2b701ce299d657f72d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb140db70b83e1ce5e1b2b70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 27 13:37:06 2013 +0100 urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 115 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/urlmon/uri.c | 13 ++++- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index e5faa81..ba31583 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4521,7 +4521,57 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } - } + }, + { "mailto://", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mailto://a@b.com", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + } }; typedef struct _invalid_uri { @@ -7005,8 +7055,61 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://winehq.org",0, + "mailto://",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:",S_OK}, + {"",S_FALSE}, + {"mailto:",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"mailto://",S_OK,FALSE,"mailto:"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org",0, + "mailto://a@b.com",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a@b.com",S_OK}, + {"",S_FALSE}, + {".com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"a(a)b.com",S_OK}, + {"a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"}, + {"mailto",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MAILTO,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } - }; typedef struct _uri_parse_test { @@ -10317,7 +10420,7 @@ static void test_CoInternetCombineIUri(void) { todo_wine { ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } } else { @@ -10326,7 +10429,7 @@ static void test_CoInternetCombineIUri(void) { hr, prop.expected, i, j); ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } SysFreeString(received); @@ -10634,7 +10737,7 @@ static void test_CoInternetCombineUrlEx(void) { todo_wine { ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } } else { @@ -10643,7 +10746,7 @@ static void test_CoInternetCombineUrlEx(void) { hr, prop.expected, i, j); ok(!strcmp_aw(value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), - "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", + "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n", value, wine_dbgstr_w(received), i, j); } SysFreeString(received); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0f6ee31..724d60f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { *ptr += 2; return TRUE; - } else if(check_hierarchical(ptr)) + } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr)) return TRUE; *ptr = start; @@ -1917,8 +1917,15 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO; - data->path = *ptr; + if (is_mailto && (*ptr)[0] == '/' && (*ptr)[1] == '/') + { + if ((*ptr)[2]) data->path = *ptr + 2; + else data->path = NULL; + } + else + data->path = *ptr; while(!is_path_delim(**ptr)) { if(**ptr == '%' && known_scheme) { @@ -1938,7 +1945,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) ++(*ptr); } - data->path_len = *ptr - data->path; + if (data->path) data->path_len = *ptr - data->path; TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return TRUE;

1 0

Francois Gouget : testbot/web: Refresh the JobDetails page normally after canceling or restarting a job.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: tools Branch: master Commit: 938ba099ac2a888271cfab4d60dd4df3244723fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=938ba099ac2a888271cfab4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:28 2013 +0100 testbot/web: Refresh the JobDetails page normally after canceling or restarting a job. This is possible now that Job::Cancel() updates the job status synchronously. --- testbot/web/JobDetails.pl | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 429a87c..944d178 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -167,7 +167,8 @@ sub OnCancel return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnRestart @@ -188,7 +189,8 @@ sub OnRestart return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnAction @@ -238,27 +240,6 @@ sub GenerateBody { my $self = shift; - if ($self->{ActionPerformed}) - { - print "<h1>" . $self->GetTitle() . "</h1>\n"; - print "<div class='Content'>\n"; - my $Action = $self->GetParam("Action"); - if ($Action eq "Cancel job") - { - print "<p>Job will be canceled.</p>\n"; - } - elsif ($Action eq "Restart job") - { - print "<p>Job will be restarted.</p>\n"; - } - else - { - print "<p>Unknown action $Action.</p>\n"; - } - print "</div>\n"; - return; - } - $self->SUPER::GenerateBody(@_); print "<div class='Content'>\n";

1 0

Francois Gouget : testbot: When canceling a job, update its status and reschedule immediately.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: tools Branch: master Commit: 2d5f4a1df2739b7386bf0fafed7cac3559b139f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2d5f4a1df2739b7386bf0faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:23 2013 +0100 testbot: When canceling a job, update its status and reschedule immediately. This is possible now that Job::Cancel() updates the task and VM status when it kills a child process. Also note that Job::Restart() was synchronous already. --- testbot/bin/Engine.pl | 15 +++++---------- testbot/lib/WineTestBot/Jobs.pm | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 5fcce05..670945a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -344,16 +344,11 @@ sub HandleJobCancel return "0$ErrMessage"; } - # Wait a couple of seconds before rescheduling so the child processes have - # the time to die. - AddEvent("JobCancel$JobKey", 2, 0, sub { - $Job->UpdateStatus(); - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; - } - }); + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; + } return "1OK"; } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ab82c07..8176015 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,7 +218,8 @@ sub Cancel } } } - # Let the higher layers handle updating the overall job status + # Let UpdateStatus() handle updating the overall job status + $self->UpdateStatus(); return undef; }

1 0

← Newer
1
2
3
4
5
6
7
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013