November 2015 - Wine-commits

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 78888687d59a3b16355bf4a851f648c56a043649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78888687d59a3b16355bf4a85… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 24 20:22:17 2015 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 84fe32a..fba8b42 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8566,58 +8566,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Piilota" +msgstr "Piilota %@" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Muu" +msgstr "Piilota muut" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Näytä" +msgstr "Näytä kaikki" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Lopeta %@" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Lopeta" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Ikkuna" +msgstr "Ikkuna" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "P&ienennä" +msgstr "Pienennä" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Lähennä" +msgstr "Zoomaa" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Siirry kokoruututilaan" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Tuo &eteen" +msgstr "Tuo kaikki eteen" #: wineps.rc:31 msgid "Paper Si&ze:"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 468fa3e1252858d1afa729376aff1622c95feeb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468fa3e1252858d1afa729376… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Nov 24 19:32:52 2015 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/po/de.po b/po/de.po index c9de142..86d59d4 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-06 12:55+0100\n" +"PO-Revision-Date: 2015-11-24 19:33+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3191,7 +3191,7 @@ msgstr "Anzeigen" #: hhctrl.rc:43 winemac.rc:34 msgid "Hide" -msgstr "Verstecken" +msgstr "Ausblenden" #: hhctrl.rc:44 ieframe.rc:68 shdoclc.rc:167 shdoclc.rc:191 msgid "Stop" @@ -8592,58 +8592,44 @@ msgid "Wine" msgstr "Wine" #: winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Verstecken" +msgstr "%@ ausblenden" #: winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Andere" +msgstr "Andere ausblenden" #: winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Anzeigen" +msgstr "Alle anzeigen" #: winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "%@ beenden" #: winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Beenden" #: winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Fenster" +msgstr "Fenster" #: winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Minimieren" +msgstr "Minimieren" #: winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Ver&größern" +msgstr "Zoom" #: winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Vollbildmodus" #: winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "&In den Vordergrund holen" +msgstr "Alle in den Vordergrund holen" #: wineps.rc:31 msgid "Paper Si&ze:" @@ -11300,11 +11286,11 @@ msgstr "" #: oleview.rc:122 msgid "Show or hide the toolbar" -msgstr "Symbolleiste zeigen oder verstecken" +msgstr "Symbolleiste anzeigen oder ausblenden" #: oleview.rc:123 msgid "Show or hide the status bar" -msgstr "Statusleiste zeigen oder verstecken" +msgstr "Statusleiste anzeigen oder ausblenden" #: oleview.rc:124 msgid "Refresh all lists" @@ -11909,7 +11895,7 @@ msgstr "Entfernt Schlüssel aus den Favoriten" #: regedit.rc:166 msgid "Shows or hides the status bar" -msgstr "Zeigt oder versteckt die Statusleiste" +msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:167 msgid "Change position of split between two panes" @@ -12199,7 +12185,7 @@ msgstr "Nach Programmstart &minimieren" #: taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "&Verstecken, wenn minimiert" +msgstr "&Ausblenden, wenn minimiert" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -12678,7 +12664,7 @@ msgstr "" #: taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "Versteckt den Task-Manager, wenn er minimiert ist" +msgstr "Blendet den Task-Manager aus, wenn er minimiert ist" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting"

1 0

Nikolay Sivov : wineoss: Initialized wReserved1 field returned to auxGetDevCapsW().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 074d909235ed6f0081a2a921b84c27e7c1075e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=074d909235ed6f0081a2a921b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:35 2015 +0300 wineoss: Initialized wReserved1 field returned to auxGetDevCapsW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmaux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 216d2e2..9554ee7 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -97,6 +97,7 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) strcpyW(lpCaps->szPname, ini); lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; + lpCaps->wReserved1 = 0; lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; return MMSYSERR_NOERROR;

1 0

Nikolay Sivov : winmm: For consistency forward wReserved1 values from -W to -A calls too.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: a360cc47d5cd33fe78ab6d67147392bff431ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a360cc47d5cd33fe78ab6d671… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:36 2015 +0300 winmm: For consistency forward wReserved1 values from -W to -A calls too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++-- dlls/winmm/winmm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 55f48a8..93a5004 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2629,7 +2629,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, wocA.dwFormats = wocW.dwFormats; wocA.wChannels = wocW.wChannels; wocA.dwSupport = wocW.dwSupport; - wocA.wReserved1 = 0; + wocA.wReserved1 = wocW.wReserved1; memcpy(lpCaps, &wocA, min(uSize, sizeof(wocA))); } return ret; @@ -3355,7 +3355,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi sizeof(wicA.szPname), NULL, NULL ); wicA.dwFormats = wicW.dwFormats; wicA.wChannels = wicW.wChannels; - wicA.wReserved1 = 0; + wicA.wReserved1 = wicW.wReserved1; memcpy(lpCaps, &wicA, min(uSize, sizeof(wicA))); } return ret; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index a626a79..f2d0858 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -229,7 +229,7 @@ UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) WideCharToMultiByte( CP_ACP, 0, acW.szPname, -1, acA.szPname, sizeof(acA.szPname), NULL, NULL ); acA.wTechnology = acW.wTechnology; - acA.wReserved1 = 0; + acA.wReserved1 = acW.wReserved1; acA.dwSupport = acW.dwSupport; memcpy(lpCaps, &acA, min(uSize, sizeof(acA))); }

1 0

Nikolay Sivov : winmm/tests: Remove unreliable tests.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: b22fa89dac0bdfab99aeec9bd4ca7cb72d8de082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22fa89dac0bdfab99aeec9bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 22:02:37 2015 +0300 winmm/tests: Remove unreliable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 4 ---- dlls/winmm/tests/wave.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index bc17ce3..54c3793 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -316,7 +316,6 @@ static void wave_in_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; - memset(&capsA, 0xff, sizeof(capsA)); rc=waveInGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -324,14 +323,11 @@ static void wave_in_test_device(UINT_PTR device) dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; - ok(capsA.wReserved1 != 0xffff, "got %u\n", capsA.wReserved1); - memset(&capsW, 0xcc, sizeof(capsW)); rc=waveInGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); - ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveInGetDevCapsA(device,NULL,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 896f332..a2fe8bb 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -893,7 +893,6 @@ static void wave_out_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; - memset(&capsA, 0xcc, sizeof(capsA)); rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -901,14 +900,11 @@ static void wave_out_test_device(UINT_PTR device) dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; - ok(capsA.wReserved1 == 0, "got %u\n", capsA.wReserved1); - memset(&capsW, 0xcc, sizeof(capsW)); rc=waveOutGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_out_error(rc)); - ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveOutGetDevCapsA(device,0,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM,

1 0

Bernhard Übelacker : dinput: Fail in SetCooperativeLevel on invalid hwnd.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: dd08ef4063bdf97a80441b88e41b3d5eb25cf158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd08ef4063bdf97a80441b88e… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Nov 24 21:25:58 2015 +0100 dinput: Fail in SetCooperativeLevel on invalid hwnd. MotoGP 3 demo fails to accept key presses to control the driver. The game calls SetCooperativeLevel twice. First with an invalid hwnd (but not NULL) and later with the real hwnd. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 4 ++-- dlls/dinput/tests/keyboard.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1ba6ffc..e525f01 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1028,10 +1028,10 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; - if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) + if (!hwnd && dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); - if (!hwnd) return E_HANDLE; + if (!IsWindow(hwnd)) return E_HANDLE; /* For security reasons native does not allow exclusive background level for mouse and keyboard only */ diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 520740d..e51e332 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -121,6 +121,12 @@ static const HRESULT SetCoop_null_window[16] = { E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_invalid_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, @@ -151,6 +157,11 @@ static void test_set_coop(IDirectInputA *pDI, HWND hwnd) } for (i=0; i<16; i++) { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, (HWND)0x400000, i); + ok(hr == SetCoop_invalid_window[i], "SetCooperativeLevel(invalid, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, hwnd, i); ok(hr == SetCoop_real_window[i], "SetCooperativeLevel(hwnd, %d): %08x\n", i, hr); }

1 0

Bruno Jesus : ws2_32/tests: Add more tests related to WSACleanup.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 7f06cd4ca27cc99787929438d413d0ed1f290489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f06cd4ca27cc99787929438d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 25 11:12:11 2015 +0800 ws2_32/tests: Add more tests related to WSACleanup. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 73 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8676b07..045b991 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -213,11 +213,11 @@ static int tcp_socketpair(SOCKET *src, SOCKET *dst) *src = INVALID_SOCKET; *dst = INVALID_SOCKET; - *src = socket(AF_INET, SOCK_STREAM, 0); + *src = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (*src == INVALID_SOCKET) goto end; - server = socket(AF_INET, SOCK_STREAM, 0); + server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (server == INVALID_SOCKET) goto end; @@ -1101,9 +1101,13 @@ static void test_WithWSAStartup(void) { WSADATA data; WORD version = MAKEWORD( 2, 2 ); - INT res; + INT res, socks, i, j; + SOCKET sock; LPVOID ptr; - SOCKET src, dst; + struct + { + SOCKET src, dst, dup_src, dup_dst; + } pairs[128]; DWORD error; res = WSAStartup( version, &data ); @@ -1112,9 +1116,26 @@ static void test_WithWSAStartup(void) ptr = gethostbyname("localhost"); ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); - ok(!tcp_socketpair(&src, &dst), "creating socket pair failed\n"); + /* Alloc some sockets to check if they are destroyed on WSACleanup */ + for (socks = 0; socks < sizeof(pairs) / sizeof(pairs[0]); socks++) + { + WSAPROTOCOL_INFOA info; + if (tcp_socketpair(&pairs[socks].src, &pairs[socks].dst)) break; + + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(pairs[socks].src, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + pairs[socks].dup_src = WSASocketA(0, 0, 0, &info, 0, 0); + ok(pairs[socks].dup_src != SOCKET_ERROR, "expected != -1\n"); - res = send(src, "TEST", 4, 0); + memset(&info, 0, sizeof(info)); + ok(!WSADuplicateSocketA(pairs[socks].dst, GetCurrentProcessId(), &info), + "WSADuplicateSocketA should have worked\n"); + pairs[socks].dup_dst = WSASocketA(0, 0, 0, &info, 0, 0); + ok(pairs[socks].dup_dst != SOCKET_ERROR, "expected != -1\n"); + } + + res = send(pairs[0].src, "TEST", 4, 0); ok(res == 4, "send failed with error %d\n", WSAGetLastError()); WSACleanup(); @@ -1125,20 +1146,50 @@ static void test_WithWSAStartup(void) /* show that sockets are destroyed automatically after WSACleanup */ todo_wine { SetLastError(0xdeadbeef); - res = send(src, "TEST", 4, 0); + res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "send should have failed\n"); ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); SetLastError(0xdeadbeef); - res = closesocket(dst); + res = send(pairs[0].dst, "TEST", 4, 0); error = WSAGetLastError(); - ok(res == SOCKET_ERROR, "closesocket should have failed\n"); + ok(res == SOCKET_ERROR, "send should have failed\n"); ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + + /* Check that all sockets were destroyed */ + for (i = 0; i < socks; i++) + { + for (j = 0; j < 4; j++) + { + struct sockaddr_in saddr; + int size = sizeof(saddr); + switch(j) + { + case 0: sock = pairs[i].src; break; + case 1: sock = pairs[i].dup_src; break; + case 2: sock = pairs[i].dst; break; + case 3: sock = pairs[i].dup_dst; break; + } + + SetLastError(0xdeadbeef); + res = getsockname(sock, (struct sockaddr *)&saddr, &size); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); + ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); + } } - closesocket(src); - closesocket(dst); + } + + /* While wine is not fixed, close all sockets manually */ + for (i = 0; i < socks; i++) + { + closesocket(pairs[i].src); + closesocket(pairs[i].dst); + closesocket(pairs[i].dup_src); + closesocket(pairs[i].dup_dst); + } res = WSACleanup(); ok(res == 0, "expected 0, got %d\n", res);

1 0

Alexandre Julliard : Revert "oleaut32: Implement a better stub for IPicture::SaveAsFile."
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 28598cca7a50a3885cb8147861263153458a6fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=28598cca7a50a3885cb814786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 14:09:13 2015 +0900 Revert "oleaut32: Implement a better stub for IPicture::SaveAsFile." This reverts commit 212dd9c226c7f20c28697592468b3e631c250809. It's causing test failures in gdiplus. This will need to be redone properly after 1.8. --- dlls/oleaut32/olepicture.c | 92 ++++++---------------------------------- dlls/oleaut32/tests/olepicture.c | 9 ++++ 2 files changed, 22 insertions(+), 79 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 47430e3..5ce83e0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -834,6 +834,19 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) } /************************************************************************ + * OLEPictureImpl_SaveAsFile + */ +static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, + IStream *pstream, + BOOL SaveMemCopy, + LONG *pcbSize) +{ + OLEPictureImpl *This = impl_from_IPicture(iface); + FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize); + return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); +} + +/************************************************************************ * OLEPictureImpl_get_Attributes */ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, @@ -1846,85 +1859,6 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } -/************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, - IStream *stream, BOOL mem_copy, LONG *size) -{ - OLEPictureImpl *This = impl_from_IPicture(iface); - void *data; - unsigned data_size; - ULONG written; - HRESULT hr; - - FIXME("(%p)->(%p,%d,%p): semi-stub\n", This, stream, mem_copy, size); - - switch (This->desc.picType) - { - case PICTYPE_NONE: - return S_OK; - - case PICTYPE_ICON: - if (!mem_copy) return E_FAIL; - - if (This->bIsDirty || !This->data) - { - if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size)) - return E_FAIL; - HeapFree(GetProcessHeap(), 0, This->data); - This->data = data; - This->datalen = data_size; - } - hr = IStream_Write(stream, This->data, This->datalen, &written); - if (hr == S_OK && size) *size = written; - return hr; - - case PICTYPE_BITMAP: - if (!mem_copy) return E_FAIL; - - if (This->bIsDirty || !This->data) - { - switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) - { - case BITMAP_FORMAT_BMP: - if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size)) - return E_FAIL; - break; - case BITMAP_FORMAT_JPEG: - FIXME("BITMAP_FORMAT_JPEG is not implemented\n"); - return E_NOTIMPL; - case BITMAP_FORMAT_GIF: - FIXME("BITMAP_FORMAT_GIF is not implemented\n"); - return E_NOTIMPL; - case BITMAP_FORMAT_PNG: - FIXME("BITMAP_FORMAT_PNG is not implemented\n"); - return E_NOTIMPL; - default: - FIXME("PICTYPE_BITMAP/%#x is not implemented\n", This->loadtime_format); - return E_NOTIMPL; - } - - HeapFree(GetProcessHeap(), 0, This->data); - This->data = data; - This->datalen = data_size; - } - hr = IStream_Write(stream, This->data, This->datalen, &written); - if (hr == S_OK && size) *size = written; - return hr; - - case PICTYPE_METAFILE: - FIXME("PICTYPE_METAFILE is not implemented\n"); - return E_NOTIMPL; - case PICTYPE_ENHMETAFILE: - FIXME("ENHMETAFILE is not implemented\n"); - return E_NOTIMPL; - default: - FIXME("%#x is not implemented\n", This->desc.picType); - break; - } - return E_NOTIMPL; -} /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 0c69cbd..0903298 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1079,14 +1079,18 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); +todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1153,12 +1157,15 @@ static void test_load_save_icon(void) todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); +todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); +todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; @@ -1224,11 +1231,13 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); +todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);

1 0

Alexandre Julliard : user32/tests: Fix a few more menu test failures on Windows.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 5e38c8743dca8a8cd70b6b993cdcdc7c64fc3e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e38c8743dca8a8cd70b6b993… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 17:35:20 2015 +0900 user32/tests: Fix a few more menu test failures on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index f469212..33d8eb8 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1041,7 +1041,7 @@ static void test_menu_bmp_and_string(void) mii.dwItemData = 0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_RESTORE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); - ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); + ok((mii.fType & ~(MFT_RIGHTJUSTIFY|MFT_RIGHTORDER)) == MFT_STRING, "expected MFT_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); @@ -1055,7 +1055,7 @@ static void test_menu_bmp_and_string(void) mii.hbmpItem = (HBITMAP)0x81818181; got = GetMenuItemInfoA(hsysmenu, SC_CLOSE, FALSE, &mii); ok(got, "GetMenuItemInfo failed\n"); - ok(mii.fType == MF_STRING, "expected MF_STRING, got %#x\n", mii.fType); + ok((mii.fType & ~(MFT_RIGHTJUSTIFY|MFT_RIGHTORDER)) == MFT_STRING, "expected MFT_STRING, got %#x\n", mii.fType); ok(mii.fState == MF_ENABLED, "expected MF_ENABLED, got %#x\n", mii.fState); ok(mii.wID == SC_RESTORE, "expected SC_RESTORE, got %#x\n", mii.wID); ok(mii.hSubMenu == 0, "expected 0, got %p\n", mii.hSubMenu); @@ -2731,7 +2731,8 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, if (mii.hSubMenu) { - ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID %x should be equal to hSubMenu %p\n", + checked_cmd, mii.wID, mii.hSubMenu); if (!GetMenuItemCount(mii.hSubMenu)) { ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); @@ -3872,6 +3873,12 @@ static void test_emptypopup(void) ok(ret, "DestroyMenu failed with error %d\n", GetLastError()); } +static HMENU get_bad_hmenu( UINT_PTR id ) +{ + while (IsMenu( (HMENU)id )) id++; + return (HMENU)id; +} + static void test_AppendMenu(void) { static char string[] = "string"; @@ -3890,16 +3897,18 @@ static void test_AppendMenu(void) hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); - ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); + hsubmenu = get_bad_hmenu( 202 ); + ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); ok(ret, "AppendMenu failed\n"); - check_menu_items(hmenu, 202, MF_STRING, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); - ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); + hsubmenu = get_bad_hmenu( 203 ); + ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1"); ok(ret, "AppendMenu failed\n"); - check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); @@ -3967,15 +3976,14 @@ static void test_AppendMenu(void) ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1"); ok(ret, "AppendMenu failed\n"); check_menu_items(hmenu, 204, MF_STRING, 0); - ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); + hsubmenu = get_bad_hmenu( 205 ); + ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, (UINT_PTR)hsubmenu, "item 2"); ok(ret, "ModifyMenu failed\n"); - check_menu_items(hmenu, 205, MF_STRING, 0); + check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU; - mii.hSubMenu = (HMENU)204; - /* make sure the menu handle is truly invalid */ - while (IsMenu( mii.hSubMenu )) mii.hSubMenu = (HMENU)((ULONG_PTR)mii.hSubMenu + 1); + mii.hSubMenu = get_bad_hmenu( 204 ); ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); ok(!ret, "InsertMenuItem should fail\n"); ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);

1 0

Alexandre Julliard : user32/tests: Fix a few msg test failures on Windows 7.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 023af7c3cbf404ecc06a273150ac5562f2f16f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=023af7c3cbf404ecc06a27315… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 22:33:05 2015 +0900 user32/tests: Fix a few msg test failures on Windows 7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d92fbc7..b90f8d0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7300,7 +7300,7 @@ static const struct message WmAltPressRelease[] = { { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x30000001 }, /* XP */ @@ -7367,7 +7367,7 @@ static const struct message WmVkF10Seq[] = { { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam, OBJID_SYSMENU, 0 }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_SYSMENU, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0x10000001 }, /* XP */ @@ -7399,7 +7399,7 @@ static const struct message WmShiftF10Seq[] = { { HCBT_SYSCOMMAND, hook }, { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, { WM_INITMENU, sent|defwinproc }, - { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, @@ -9239,7 +9239,7 @@ static void test_recursive_hook(void) hook_depth = 0; GetMessageW(&msg, hook_hwnd, 0, 0); - ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + ok(15 <= max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); trace("max_hook_depth = %d\n", max_hook_depth); b = UnhookWindowsHookEx(recursive_hook);

1 0