January 2012 - Wine-commits

Nikolay Sivov : msxml3: Debug output support for VT_ERROR.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 9575b906a4e09499799543620f4ebfe6ff8e0d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9575b906a4e09499799543620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 15:33:34 2012 +0300 msxml3: Debug output support for VT_ERROR. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index c4e4303..464ef90 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -289,6 +289,8 @@ const char *debugstr_variant(const VARIANT *v) case VT_BSTR|VT_BYREF: return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Jacek Caban : jscript: Fixed continue inside for..in statement.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: dc5a75a7ace93c159290e193d01f1aa88feb2224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5a75a7ace93c159290e193d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 10 16:10:29 2012 +0100 jscript: Fixed continue inside for..in statement. --- dlls/jscript/compile.c | 9 +++------ dlls/jscript/tests/lang.js | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4cdd2ed..19fd0c2 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1237,18 +1237,15 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) { - statement_ctx_t *iter = ctx->stat_ctx; unsigned stack_pop = 0; + statement_ctx_t *iter; - while(iter) { + for(iter = ctx->stat_ctx; iter != stat_ctx; iter = iter->next) { if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) return E_OUTOFMEMORY; if(iter->using_except && !push_instr(ctx, OP_pop_except)) return E_OUTOFMEMORY; stack_pop += iter->stack_use; - if(iter == stat_ctx) - break; - iter = iter->next; } /* FIXME: optimize */ @@ -1308,7 +1305,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * if(stat->identifier) return push_instr(ctx, OP_label) ? S_OK : E_OUTOFMEMORY; /* FIXME */ - hres = pop_to_stat(ctx, pop_ctx); + hres = pop_to_stat(ctx, pop_ctx->next); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d7182c6..58d4599 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -839,8 +839,8 @@ for(tmp in obj1.nonexistent) ok(false, "for(tmp in obj1.nonexistent) called with tmp = " + tmp); ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); -var i, j; +var i, j; tmp = ""; i = 0; @@ -896,6 +896,26 @@ for(j in [1,2,3]) { } ok(tmp === "1234", "tmp = " + tmp); +tmp = 0; +for(var iter in [1,2,3]) { + tmp += +iter; + continue; +} +ok(tmp === 3, "tmp = " + tmp); + +tmp = false; +for(var iter in [1,2,3]) { + switch(+iter) { + case 1: + tmp = true; + try { + continue; + }finally {} + default: + continue; + } +} +ok(tmp, "tmp = " + tmp); ok((void 1) === undefined, "(void 1) !== undefined");

1 0

Jacek Caban : mshtml: Open document in a new window in IHlinkTarget:: Navigate if the document is not embedded.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 7bbe0d5ca6a9005d0c781d671c06a74fe9f2b0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bbe0d5ca6a9005d0c781d671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 10 17:07:36 2012 +0100 mshtml: Open document in a new window in IHlinkTarget::Navigate if the document is not embedded. --- dlls/mshtml/hlink.c | 4 ++++ dlls/mshtml/navigate.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index fd836de..4e63498 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -83,6 +84,9 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); + if(!This->doc_obj->client) + return navigate_new_window(This->window, This->window->uri, NULL, NULL); + return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1f532..9b650f4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2030,7 +2030,10 @@ HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IH IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); IWebBrowser2_Release(web_browser); - *ret = new_window; + if(ret) + *ret = new_window; + else + IHTMLWindow2_Release(new_window); return S_OK; }

1 0

Jörg Höhle : mmdevapi/tests: Fix some test failures on native.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 260c8ce9b4b5f3b1422c0c8d456d535286972e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=260c8ce9b4b5f3b1422c0c8d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 7 23:11:46 2012 +0100 mmdevapi/tests: Fix some test failures on native. --- dlls/mmdevapi/tests/render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8590abd..f918460 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -267,7 +267,8 @@ static void test_audioclient(void) fmtex->dwChannelMask = 0; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); - ok(hr == S_OK, "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE /* w7 Realtek HDA */), + "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); CoTaskMemFree(fmt2); @@ -304,7 +305,8 @@ static void test_audioclient(void) ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1, "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), + "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -415,10 +417,10 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. - * 5:1 cards Initialize 44100|48000x16x1 yet claim no support. */ + * Some cards Initialize 44100|48000x16x1 yet claim no support. */ ok(hrs == S_OK ? hr == S_OK || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED) : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || broken(hr == S_OK && - pwfx->nChannels > 2 && fmt.nChannels == 1), + fmt.nChannels == 1 && pwfx->wBitsPerSample == fmt.wBitsPerSample), "Initialize(exclus., %ux%2ux%u) returns %08x\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr);

1 0

Nikolay Sivov : shell32: Remove menu insertion helper.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 48eba8033dbb6b7394b2be7aba1a34246b3030db URL: http://source.winehq.org/git/wine.git/?a=commit;h=48eba8033dbb6b7394b2be7ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 15:53:55 2012 +0300 shell32: Remove menu insertion helper. --- dlls/shell32/shv_item_cmenu.c | 36 ++++++++---------------------------- 1 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 4c05460..ac91f37 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -158,33 +158,6 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) return refCount; } -static void _InsertMenuItemW ( - HMENU hmenu, - UINT indexMenu, - BOOL fByPosition, - UINT wID, - UINT fType, - LPWSTR dwTypeData, - UINT fState) -{ - MENUITEMINFOW mii; - - mii.cbSize = sizeof(mii); - if (fType == MFT_SEPARATOR) - { - mii.fMask = MIIM_ID | MIIM_TYPE; - } - else - { - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - mii.dwTypeData = dwTypeData; - mii.fState = fState; - } - mii.wID = wID; - mii.fType = fType; - InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); -} - /************************************************************************** * ISvItemCm_fnQueryContextMenu() */ @@ -224,7 +197,14 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( mi.cch = 255; GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND); - _InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, FCIDM_SHVIEW_EXPLORE, MFT_STRING, str, MFS_ENABLED); + + mi.cbSize = sizeof(mi); + mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mi.dwTypeData = str; + mi.fState = MFS_ENABLED; + mi.wID = FCIDM_SHVIEW_EXPLORE; + mi.fType = MFT_STRING; + InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);

1 0

Andrew Eikum : mshtml: Fix WARN typo.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: abd9f382733ebd64e5bd6d000a08f17849822f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd9f382733ebd64e5bd6d000… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:28:21 2012 -0600 mshtml: Fix WARN typo. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f5375e4..ea1f532 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1045,7 +1045,7 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, request_result); if(NS_FAILED(nsres)) - WARN("OnStopRequet failed: %08x\n", nsres); + WARN("OnStopRequest failed: %08x\n", nsres); } if(This->nschannel->load_group) {

1 0

Andrew Eikum : itss: Use case-insensitive strcmp.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: f71efc297bb50e55e2c2793d0320db18e9e373a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71efc297bb50e55e2c2793d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:28:31 2012 -0600 itss: Use case-insensitive strcmp. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 72d356b..02edd49 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -443,7 +443,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( TRACE("%p %s %p %p\n", This, debugstr_w( pszDisplayName ), pchEaten, ppmkOut ); - if( strncmpW( pszDisplayName, szPrefix, prefix_len ) ) + if( strncmpiW( pszDisplayName, szPrefix, prefix_len ) ) return MK_E_SYNTAX; /* search backwards for a double colon */

1 0

Lucas Fialho Zawacki : dinput: Added DI_SETTINGSNOTSAVED flag.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 20930b01fddfa6edb54466fc8f6973de2014da3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=20930b01fddfa6edb54466fc8… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jan 9 22:04:15 2012 -0200 dinput: Added DI_SETTINGSNOTSAVED flag. --- include/dinput.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 353ec55..a6cf7e2 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -134,6 +134,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI_DOWNLOADSKIPPED ((HRESULT)0x00000003) #define DI_EFFECTRESTARTED ((HRESULT)0x00000004) #define DI_TRUNCATED ((HRESULT)0x00000008) +#define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000B) #define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000C) #define DIERR_OLDDIRECTINPUTVERSION \

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 71d5e48a0c769edd52531e1884cb0b767034906a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d5e48a0c769edd52531e188… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jan 9 17:24:41 2012 +0900 po: Update Japanese translation. --- po/ja.po | 251 +++++++++++++++++++++++++------------------------------------- 1 files changed, 101 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71d5e48a0c769edd52531…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 2dda47fe6fbccc25264fbaa14b5fc2d75efe84ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dda47fe6fbccc25264fbaa14… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 9 21:58:07 2012 +0900 po: Updated Korean translation. --- po/ko.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index 173148d..516e3f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8361,9 +8361,8 @@ msgid "The specified device handle is invalid." msgstr "지정된 장치 핸들은 적합하지 않습니다." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "당신의 시스템에는 어떤 드라이버도 설치되어 있지 않습니다 !\n" +msgstr "당신의 시스템에는 어떤 드라이버도 설치되어 있지 않습니다 !" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -12961,7 +12960,7 @@ msgstr "다시 부르는 명령의 갯수(&N):" #: wineconsole.rc:76 msgid "&Remove doubles" -msgstr "두번 제거(&R)" +msgstr "두번 제거(&R)" #: wineconsole.rc:84 msgid "&Font" @@ -12972,9 +12971,8 @@ msgid "&Color" msgstr "색상(&C)" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " 설정 " +msgstr "설정 " #: wineconsole.rc:100 msgid "Buffer zone"

1 0