December 2015 - Wine-Commits

Austin English : iexplore: Add ' HKCR\Applications\iexplore.exe\shell\open\command' key.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 0e40a9bed7f502361d554280cece4cc94a1e8a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e40a9bed7f502361d554280c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 2 12:38:19 2015 -0600 iexplore: Add 'HKCR\Applications\iexplore.exe\shell\open\command' key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 41622b1..a8538d8 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -27,6 +27,7 @@ HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" +HKCR,"Applications\iexplore.exe\shell\open\command",,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

1 0

Boyuan Yang : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 454168ace66527241538d57ad8932660ce17910f URL: http://source.winehq.org/git/wine.git/?a=commit;h=454168ace66527241538d57ad… Author: Boyuan Yang <073plan(a)gmail.com> Date: Thu Nov 26 17:38:54 2015 +0800 po: Update Simplified Chinese translation. Signed-off-by: Boyuan Yang <073plan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 957 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 464 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454168ace66527241538d…

1 0

Alexandre Julliard : user32/tests: Maximized windows can be full-screen in recent Windows.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: 80193a6c68c4e5a3983a20f5c925bf33b58b7509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80193a6c68c4e5a3983a20f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:26:53 2015 +0900 user32/tests: Maximized windows can be full-screen in recent Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fc6505f..251f9ee 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6841,11 +6841,11 @@ static void test_fullscreen(void) /* Windows makes a maximized window slightly larger (to hide the borders?) */ fixup = min(abs(rc.left), abs(rc.top)); InflateRect(&rc, -fixup, -fixup); - ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && - rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, + ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top && + rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d must be in %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom, - mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); + mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); DestroyWindow(hwnd); style = t_style[i] | WS_MAXIMIZE | WS_MAXIMIZEBOX; @@ -6863,8 +6863,8 @@ static void test_fullscreen(void) rc.right >= mi.rcMonitor.right && rc.bottom >= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); else - ok(rc.left >= mi.rcWork.left && rc.top <= mi.rcWork.top && - rc.right <= mi.rcWork.right && rc.bottom <= mi.rcWork.bottom, + ok(rc.left >= mi.rcMonitor.left && rc.top >= mi.rcMonitor.top && + rc.right <= mi.rcMonitor.right && rc.bottom <= mi.rcMonitor.bottom, "%#x/%#x: window rect %d,%d-%d,%d\n", ex_style, style, rc.left, rc.top, rc.right, rc.bottom); DestroyWindow(hwnd); }

1 0

Michael Stefaniuc : dsound: A version 1 3d secondary buffer allows SetPan( ).
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: e69d9ec3c4e8829c5c18cea7d8348171d51dcd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69d9ec3c4e8829c5c18cea7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:49:04 2015 +0100 dsound: A version 1 3d secondary buffer allows SetPan(). For version 8 DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN are mutually exclusive and a sound buffer cannot be created when both flags are set. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 4 +--- dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d735dc3..5aa2834 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -586,9 +586,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetPan(IDirectSoundBuffer8 *iface, return DSERR_INVALIDPARAM; } - /* You cannot use both pan and 3D controls */ - if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN) || - (This->dsbd.dwFlags & DSBCAPS_CTRL3D)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 1a019dd..6c12f71 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -892,7 +892,6 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSoundBuffer_GetPan(secondary,&pan); ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - todo_wine ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); }

1 0

Michael Stefaniuc : dsound/tests: Test Pan for 3D secondary buffers too.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: 25d23d44327163b09448cfaaf8def01507cb8508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d23d44327163b09448cfaaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:48:43 2015 +0100 dsound/tests: Test Pan for 3D secondary buffers too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/ds3d.c | 9 +++++++++ dlls/dsound/tests/ds3d8.c | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 0e0d26f..1a019dd 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -886,7 +886,16 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + } else if (has_3dbuffer) { + LONG pan; + + rc=IDirectSoundBuffer_GetPan(secondary,&pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); + rc=IDirectSoundBuffer_SetPan(secondary,0); + todo_wine + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); } + if (has_duplicate) { LPDIRECTSOUNDBUFFER duplicated=NULL; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index b18a91f..330f590 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -730,7 +730,17 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + } else { + LONG pan; + + rc=IDirectSoundBuffer_GetPan(secondary,&pan); + ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " + "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + rc=IDirectSoundBuffer_SetPan(secondary,0); + ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_SetPan() " + "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); } + if (has_duplicate) { LPDIRECTSOUNDBUFFER duplicated=NULL;

1 0

Michael Stefaniuc : dsound/tests: Version differences in flag handling for 3d buffers.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: 72d67a2d4eebbd88bd4c23fa4c053a7c7d0ec3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d67a2d4eebbd88bd4c23fa4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 1 14:47:42 2015 +0100 dsound/tests: Version differences in flag handling for 3d buffers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/ds3d.c | 4 +--- dlls/dsound/tests/ds3d8.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index dffd409..0e0d26f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -805,9 +805,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, bufdesc.dwFlags=DSBCAPS_GETCURRENTPOSITION2; if (has_3dbuffer) bufdesc.dwFlags|=DSBCAPS_CTRL3D; - else - bufdesc.dwFlags|= - (DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); + bufdesc.dwFlags|= DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index f0d7d77..b18a91f 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -649,12 +649,16 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); - if (secondary) - { - ref=IDirectSoundBuffer_Release(secondary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, should have 0\n",ref); - } init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); + + /* Invalid flag combination */ + bufdesc.dwFlags|=DSBCAPS_CTRLPAN; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + todo_wine + ok(rc==DSERR_INVALIDPARAM, + "IDirectSound8_CreateSoundBuffer(secondary) should have " + "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + bufdesc.dwFlags&=~DSBCAPS_CTRLPAN; } if (winetest_interactive) {

1 0

Alexandre Julliard : user32/tests: Also ignore WM_SYSTIMER messages in input tests.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: c92ba78899d7c57804823b0971da7a3bc825550f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92ba78899d7c57804823b097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 22:14:39 2015 +0900 user32/tests: Also ignore WM_SYSTIMER messages in input tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 251f9ee..30b3da9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -39,6 +39,10 @@ #define SPI_GETDESKWALLPAPER 0x0073 #endif +#ifndef WM_SYSTIMER +#define WM_SYSTIMER 0x0118 +#endif + #define LONG_PTR INT_PTR #define ULONG_PTR UINT_PTR @@ -183,6 +187,8 @@ static BOOL ignore_message( UINT message ) return (message >= 0xc000 || message == WM_GETICON || message == WM_GETOBJECT || + message == WM_TIMER || + message == WM_SYSTIMER || message == WM_TIMECHANGE || message == WM_DEVICECHANGE); } @@ -3435,7 +3441,7 @@ static BOOL peek_message( MSG *msg ) do { ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); - } while (ret && (msg->message == WM_TIMER || ignore_message(msg->message))); + } while (ret && ignore_message(msg->message)); return ret; } @@ -3599,7 +3605,7 @@ static void test_mouse_input(HWND hwnd) /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; + if (ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); DispatchMessageA(&msg);

1 0

Jacek Caban : ieframe: Fixed tests on some VMs.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: a4fb95d7b5e005184d0b1d82fd010d41069023f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fb95d7b5e005184d0b1d82f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 1 18:24:28 2015 +0100 ieframe: Fixed tests on some VMs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3584647..1cd8f75 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1024,6 +1024,9 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe case DISPID_BEFORESCRIPTEXECUTE: /* FIXME: IE10 */ break; + case DISPID_PRIVACYIMPACTEDSTATECHANGE: + break; + default: ok(0, "unexpected dispIdMember %d\n", dispIdMember); }

1 0

Nikolay Sivov : advapi32: Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable (Clang).
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: f611fcafd8610155b5fe1d97a779ed5bdc94bb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f611fcafd8610155b5fe1d97a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 19:27:06 2015 +0300 advapi32: Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 09dfdec..c64981e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -871,7 +871,7 @@ BOOL WINAPI CreateRestrictedToken( PHANDLE newToken) { TOKEN_TYPE type; - SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous; DWORD size; FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",

1 0

Bruno Jesus : krnl386.exe16: Skip invalid entries in GetPrivateProfileString16.
by Alexandre Julliard Dec. 2, 2015

Dec. 2, 2015

Module: wine Branch: master Commit: 90eb14a6c4d4d2549894a04655a6f38ceb6998d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90eb14a6c4d4d2549894a0465… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 28 22:47:38 2015 +0100 krnl386.exe16: Skip invalid entries in GetPrivateProfileString16. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/file.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 77908c2..b66b753 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -539,6 +539,9 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT16 len, LPCSTR filename ) { + TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_a(section), debugstr_a(entry), + debugstr_a(def_val), buffer, len, debugstr_a(filename)); + if (!section) { if (buffer && len) buffer[0] = 0; @@ -572,7 +575,12 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, { char *p = strchr( src, '=' ); - if (!p) p = src + strlen(src); + /* A valid entry is formed by name = value */ + if (!p) + { + src += strlen(src) + 1; + continue; + } if (p - src < len) { memcpy( buffer, src, p - src );

1 0