March 2013 - Wine-Commits - list.winehq.org

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

March 28, 2013

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

Hans Leidekker : urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx.
by Alexandre Julliard March 28, 2013

March 28, 2013

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(a)b.com", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + { + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a(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(a)b.com",S_OK,FALSE,"mailto:a(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(a)b.com",Uri_CREATE_NO_CANONICALIZE, + 0,S_OK,FALSE, + { + {"mailto:a(a)b.com",S_OK}, + {"",S_FALSE}, + {"mailto:a(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(a)b.com",S_OK,FALSE,"mailto:a(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

Aric Stewart : user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed .
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 6e4cbd5787c6241a406b6ae1ddacf1527ad1efc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4cbd5787c6241a406b6ae1d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 27 14:42:43 2013 -0500 user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed. --- dlls/user32/message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b0bf176..09a4cb3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2453,8 +2453,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, } accept_hardware_message( hw_id, remove, 0 ); - if ( msg->message == WM_KEYDOWN || msg->message == WM_KEYUP ) - if ( ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) + if ( remove && msg->message == WM_KEYDOWN ) + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) msg->wParam = VK_PROCESSKEY; return TRUE;

1 0

Huw Davies : user32: Keep the combo listbox within the monitor's work area.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: b4b99697f99cebec0f92042075d62f27b235d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b99697f99cebec0f9204207… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 28 16:03:30 2013 +0000 user32: Keep the combo listbox within the monitor's work area. --- dlls/user32/combo.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 346b346..2aa4424 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1043,18 +1043,24 @@ static void CBDropDown( LPHEADCOMBO lphc ) } } + r.left = rect.left; + r.top = rect.bottom; + r.right = r.left + lphc->droppedRect.right - lphc->droppedRect.left; + r.bottom = r.top + nDroppedHeight; + /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/ monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) - rect.bottom = rect.top - nDroppedHeight; + if (r.bottom > mon_info.rcWork.bottom) + { + r.top = max( rect.top - nDroppedHeight, mon_info.rcWork.top ); + r.bottom = min( r.top + nDroppedHeight, mon_info.rcWork.bottom ); + } - SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, - lphc->droppedRect.right - lphc->droppedRect.left, - nDroppedHeight, - SWP_NOACTIVATE | SWP_SHOWWINDOW); + SetWindowPos( lphc->hWndLBox, HWND_TOP, r.left, r.top, r.right - r.left, r.bottom - r.top, + SWP_NOACTIVATE | SWP_SHOWWINDOW ); if( !(lphc->wState & CBF_NOREDRAW) )

1 0

Piotr Caban : kernel32: Fixed copy-paste error in IdnToUnicode.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 46919f21544fce02e3a90ecfcc0f2f3e79972932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46919f21544fce02e3a90ecfc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 16:10:44 2013 +0100 kernel32: Fixed copy-paste error in IdnToUnicode. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 57daab1..04fb6e8 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4480,8 +4480,8 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, return 0; } - if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpUnicodeCharStr[label_start]=='-' || - lpUnicodeCharStr[label_end-1]=='-')) { + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpASCIICharStr[label_start]=='-' || + lpASCIICharStr[label_end-1]=='-')) { SetLastError(ERROR_INVALID_NAME); return 0; } @@ -4494,7 +4494,7 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, tolowerW(lpASCIICharStr[label_start])!='x' || tolowerW(lpASCIICharStr[label_start+1])!='n' || lpASCIICharStr[label_start+2]!='-' || lpASCIICharStr[label_start+3]!='-') { - if(label_end < cchUnicodeChar) + if(label_end < cchASCIIChar) label_end++; if(!lpUnicodeCharStr) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e9c83b8..f1c66e2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3386,6 +3386,10 @@ static void test_IdnToUnicode(void) for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) { + ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, NULL, 0); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + SetLastError(0xdeadbeef); ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, test_data[i].in_len, buf, sizeof(buf));

1 0

Jacek Caban : jscript: Use helpers to access string buffer in some String functions.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 03395f2d2e916b2a27e098982aa9e6df926f4699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03395f2d2e916b2a27e098982… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 11:02:25 2013 +0100 jscript: Use helpers to access string buffer in some String functions. --- dlls/jscript/string.c | 62 +++++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 64d0f1e..39e6788 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -90,6 +90,22 @@ static HRESULT get_string_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **val) return to_string(ctx, jsval_disp(jsthis->u.disp), val); } +static HRESULT get_string_flat_val(script_ctx_t *ctx, vdisp_t *jsthis, jsstr_t **jsval, const WCHAR **val) +{ + HRESULT hres; + + hres = get_string_val(ctx, jsthis, jsval); + if(FAILED(hres)) + return hres; + + *val = jsstr_flatten(*jsval); + if(*val) + return S_OK; + + jsstr_release(*jsval); + return E_OUTOFMEMORY; +} + static HRESULT String_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -442,28 +458,29 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsstr_t *search_str, *str; + jsstr_t *search_jsstr, *jsstr; + const WCHAR *search_str, *str; int length, pos = 0; INT ret = -1; HRESULT hres; TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; - length = jsstr_length(str); + length = jsstr_length(jsstr); if(!argc) { if(r) *r = jsval_number(-1); - jsstr_release(str); + jsstr_release(jsstr); return S_OK; } - hres = to_string(ctx, argv[0], &search_str); + hres = to_flat_string(ctx, argv[0], &search_jsstr, &search_str); if(FAILED(hres)) { - jsstr_release(str); + jsstr_release(jsstr); return hres; } @@ -478,15 +495,15 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(SUCCEEDED(hres)) { const WCHAR *ptr; - ptr = strstrW(str->str+pos, search_str->str); + ptr = strstrW(str+pos, search_str); if(ptr) - ret = ptr - str->str; + ret = ptr - str; else ret = -1; } - jsstr_release(search_str); - jsstr_release(str); + jsstr_release(search_jsstr); + jsstr_release(jsstr); if(FAILED(hres)) return hres; @@ -507,31 +524,32 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags jsval_t *r) { unsigned pos = 0, search_len, length; - jsstr_t *search_str, *str; + jsstr_t *search_jsstr, *jsstr; + const WCHAR *search_str, *str; INT ret = -1; HRESULT hres; TRACE("\n"); - hres = get_string_val(ctx, jsthis, &str); + hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; if(!argc) { if(r) *r = jsval_number(-1); - jsstr_release(str); + jsstr_release(jsstr); return S_OK; } - hres = to_string(ctx, argv[0], &search_str); + hres = to_flat_string(ctx, argv[0], &search_jsstr, &search_str); if(FAILED(hres)) { - jsstr_release(str); + jsstr_release(jsstr); return hres; } - search_len = jsstr_length(search_str); - length = jsstr_length(str); + search_len = jsstr_length(search_jsstr); + length = jsstr_length(jsstr); if(argc >= 2) { double d; @@ -546,16 +564,16 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(SUCCEEDED(hres) && length >= search_len) { const WCHAR *ptr; - for(ptr = str->str+min(pos, length-search_len); ptr >= str->str; ptr--) { - if(!memcmp(ptr, search_str->str, search_len*sizeof(WCHAR))) { - ret = ptr-str->str; + for(ptr = str+min(pos, length-search_len); ptr >= str; ptr--) { + if(!memcmp(ptr, search_str, search_len*sizeof(WCHAR))) { + ret = ptr-str; break; } } } - jsstr_release(search_str); - jsstr_release(str); + jsstr_release(search_jsstr); + jsstr_release(jsstr); if(FAILED(hres)) return hres;

1 0

Jacek Caban : urlmon: Delay processing notifications from Read during MIME verification.
by Alexandre Julliard March 28, 2013

March 28, 2013

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

Jacek Caban : secur32: Take schannel backend capabilities into account when configuring enabled protocols .
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: fe474e3b6a05dddae2c69fbe35100895dd38ae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe474e3b6a05dddae2c69fbe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 12:05:59 2013 +0100 secur32: Take schannel backend capabilities into account when configuring enabled protocols. --- dlls/secur32/schannel.c | 2 +- dlls/secur32/schannel_gnutls.c | 6 ++++++ dlls/secur32/schannel_macosx.c | 5 +++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a83a76..df75b67 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -237,7 +237,7 @@ static void read_config(void) RegCloseKey(protocols_key); - config_enabled_protocols = enabled; + config_enabled_protocols = enabled & schan_imp_enabled_protocols(); config_default_disabled_protocols = default_disabled; config_read = TRUE; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8975b2d..b460505 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,6 +106,12 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for SSL 2.0 */ + return SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT; +} + BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2acb6ca..c562a98 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -630,6 +630,11 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, return ret; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for TLS 1.1 and TLS 1.2 */ + return SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; +} BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5b2ac89..dc08429 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -260,6 +260,7 @@ extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern DWORD schan_imp_enabled_protocols(void) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added jsstr_extract helper and use it in String. charCodeAt implementation.
by Alexandre Julliard March 28, 2013

March 28, 2013

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

Jacek Caban : libwine: Added tid debug channel support on native Windows builds.
by Alexandre Julliard March 28, 2013

March 28, 2013

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