January 2015 - Wine-Commits

Jacek Caban : jscript: Added more SCRIPTSTATE_STARTED tests.
by Alexandre Julliard Jan. 14, 2015

Jan. 14, 2015

Module: wine Branch: master Commit: a2a57791cd72bb8fd4a7df7c53a5c4799cab78f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a57791cd72bb8fd4a7df7c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 13 21:46:02 2015 +0100 jscript: Added more SCRIPTSTATE_STARTED tests. --- dlls/jscript/tests/run.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fb313d5..1b895bb 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTNORES 0x1019 #define DISPID_GLOBAL_DISPEXFUNC 0x101a #define DISPID_GLOBAL_TESTPROPPUTREF 0x101b +#define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -161,6 +162,7 @@ static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +static IActiveScript *script_engine; static const CLSID *engine_clsid = &CLSID_JScript; /* Returns true if the user interface is in English. Note that this does not @@ -756,6 +758,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "getScriptState")) { + *pid = DISPID_GLOBAL_GETSCRIPTSTATE; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1108,6 +1115,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_GETSCRIPTSTATE: { + SCRIPTSTATE state; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script_engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = state; + return S_OK; + } + case DISPID_GLOBAL_PROPARGPUT: CHECK_EXPECT(global_propargput_i); ok(wFlags == INVOKE_PROPERTYPUT, "wFlags = %x\n", wFlags); @@ -1908,6 +1927,47 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static void test_start(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + script_engine = engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + str = a2bstr("ok(getScriptState() === 5, \"getScriptState = \" + getScriptState());\n" + "reportSuccess();"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + script_engine = NULL; +} + static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript **engine_ret) { IActiveScriptParse *parser; @@ -2380,6 +2440,7 @@ static BOOL run_tests(void) test_isvisible(FALSE); test_isvisible(TRUE); + test_start(); parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();");

1 0

Julian Rüger : German translation for release 1.7.34
by Jeremy Newman Jan. 14, 2015

Jan. 14, 2015

Module: website Branch: master Commit: 62aead9881527aa482c4df0f3483f015d4c704d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=62aead9881527aa482c4df… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 14 06:47:27 2015 +0100 German translation for release 1.7.34 --- news/de/2015010901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015010901.xml b/news/de/2015010901.xml new file mode 100644 index 0000000..05c3b3e --- /dev/null +++ b/news/de/2015010901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Januar 2015</date> +<title>Wine 1.7.34 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.34 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.34">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Surround-Sound in DirectSound.</li> + <li>Bessere Unterstützung von gleichförmigen Textabschnitten ("text runs") in DirectWrite.</li> + <li>Viele Fehlerkorrekturen an der HTML-Engine.</li> + <li>Mehr Unterstützung von WBEM-Objekten.</li> + <li>Einige zusätzliche C/C++ Laufzeitfunktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.34.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Michael Stefaniuc : comctl32: Remove an unused variable assigment ( PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 39045b13d0f992550d52481a5f050c75a8d5e0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=39045b13d0f992550d52481a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 12:23:59 2015 +0100 comctl32: Remove an unused variable assigment (PVS-Studio). --- dlls/comctl32/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index e8dc107..ac924fd 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -413,7 +413,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU BITMAP bmp; HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE); - cw = tw = iw = bw = 0; + cw = iw = bw = 0; rw = r.right - r.left; rh = r.bottom - r.top;

1 0

Michael Stefaniuc : wintab32: Remove an always TRUE conditional expression (PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 0e4c00a7065e854320d90b150ede2062a97c9979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4c00a7065e854320d90b150… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 11:28:30 2015 +0100 wintab32: Remove an always TRUE conditional expression (PVS-Studio). --- dlls/wintab32/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9bc29a4..8db6217 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -410,7 +410,7 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) pWTInfoW(wCategory, nIndex, &buf); /* Handle system extents here, as we can use user32.dll code to set them */ - if(wCategory == WTI_DEFSYSCTX && nIndex == 0) + if(wCategory == WTI_DEFSYSCTX) { buf.lcSysExtX = GetSystemMetrics(SM_CXSCREEN); buf.lcSysExtY = GetSystemMetrics(SM_CYSCREEN);

1 0

Michael Stefaniuc : strmbase: Remove an unused variable (PVS-Studio).
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 762eb676989e8af5bb7198c14d040d55e9e2ef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=762eb676989e8af5bb7198c14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 10:59:51 2015 +0100 strmbase: Remove an unused variable (PVS-Studio). --- dlls/strmbase/enumpins.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 6993bae..55fa7ec 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -125,7 +125,6 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - HRESULT hr = S_OK; ULONG i = 0; TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); @@ -142,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; - while (i < cPins && hr == S_OK) + while (i < cPins) { IPin *pin; pin = This->receive_pin(This->base, This->uIndex + i);

1 0

Nikolay Sivov : user32: Handle NULL argument in GetKeyboardLayoutNameW().
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 151694a0bce3160387f6d8c54ebaa2b726dbd4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151694a0bce3160387f6d8c54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 01:24:20 2015 +0300 user32: Handle NULL argument in GetKeyboardLayoutNameW(). --- dlls/user32/input.c | 5 +++++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ec81e60..1f05f34 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -966,6 +966,11 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) { + if (!pwszKLID) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } return USER_Driver->pGetKeyboardLayoutName(pwszKLID); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 39afeb7..76d0821 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1595,6 +1595,14 @@ static void test_keyboard_layout_name(void) BOOL ret; char klid[KL_NAMELENGTH]; +if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); + + SetLastError(0xdeadbeef); + ret = GetKeyboardLayoutNameW(NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; klid[0] = 0;

1 0

Bruno Jesus : ws2_32: Ensure recv functions set last error to zero when they succeed.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: ab1eee505bebe93a7d35254a967d2831d1ff4761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1eee505bebe93a7d35254a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 11 20:20:28 2015 -0200 ws2_32: Ensure recv functions set last error to zero when they succeed. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1b2a05..b4dcd76 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6776,6 +6776,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + SetLastError(ERROR_SUCCESS); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ce47712..78ae609 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5136,14 +5136,12 @@ static void test_events(int useMessages) SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, MSG_PEEK); ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); SetLastError(0xdeadbeef); ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); @@ -5171,7 +5169,6 @@ todo_wine SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, 0); ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, empty_seq, NULL, 0); @@ -5603,7 +5600,6 @@ static void test_WSASendMsg(void) ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); /* A successful call to WSASendMsg must have bound the socket */ @@ -5634,7 +5630,6 @@ todo_wine ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); closesocket(sock); @@ -5770,14 +5765,12 @@ static void test_WSARecv(void) iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = 4; @@ -5790,7 +5783,6 @@ todo_wine iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = sizeof(buf);

1 0

Mark Harmstone : dsound: Degrade speaker config if too many channels.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: b5aec2e40ffb3a49134a424e936f38adfa27470e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aec2e40ffb3a49134a424e9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 17:40:52 2015 +0000 dsound: Degrade speaker config if too many channels. --- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index af2034a..52b2847 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,6 +219,7 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index d3c2689..7d05efd 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -93,7 +93,10 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client if (FAILED(hr)) return hr; - if (mixwfe->Format.nChannels > device->num_speakers) { + if (mixwfe->Format.nChannels < device->num_speakers) { + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, mixwfe->Format.nChannels); + DSOUND_ParseSpeakerConfig(device); + } else if (mixwfe->Format.nChannels > device->num_speakers) { mixwfe->Format.nChannels = device->num_speakers; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; @@ -163,7 +166,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) +DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) { IPropertyStore *store; HRESULT hr; @@ -198,13 +201,13 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice) PropVariantClear(&pv); IPropertyStore_Release(store); - if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) return DSSPEAKER_5POINT1_BACK; - else if ((phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) return DSSPEAKER_5POINT1_SURROUND; - else if ((phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) return DSSPEAKER_QUAD; - else if ((phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) return DSSPEAKER_MONO; @@ -247,7 +250,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice); + device->speaker_config = DSOUND_FindSpeakerConfig(device->mmdevice, 0); DSOUND_ParseSpeakerConfig(device);

1 0

Bruno Jesus : rsaenh: Don' t reset the salt length after setting a salt for Base and Strong providers.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: 6bad16363b4fd0587c5f49dc64b95966643ba576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bad16363b4fd0587c5f49dc6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 10 08:05:14 2015 -0200 rsaenh: Don't reset the salt length after setting a salt for Base and Strong providers. --- dlls/rsaenh/rsaenh.c | 12 ++++++++---- dlls/rsaenh/tests/rsaenh.c | 25 ++++++++++++++----------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 7123ffb..ebafa0e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3462,6 +3462,8 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam switch (pCryptKey->aiAlgid) { case CALG_RC2: case CALG_RC4: + { + KEYCONTAINER *pKeyContainer = get_key_container(pCryptKey->hProv); if (!pbData) { SetLastError(ERROR_INVALID_PARAMETER); @@ -3474,11 +3476,13 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam pbData, 11); pCryptKey->dwSaltLen = 11; setup_key(pCryptKey); - /* Strange but true: salt length reset to 0 after setting - * it via KP_SALT. - */ - pCryptKey->dwSaltLen = 0; + /* After setting the salt value if the provider is not base or + * strong the salt length will be reset. */ + if (pKeyContainer->dwPersonality != RSAENH_PERSONALITY_BASE && + pKeyContainer->dwPersonality != RSAENH_PERSONALITY_STRONG) + pCryptKey->dwSaltLen = 0; break; + } default: SetLastError(NTE_BAD_KEY); return FALSE; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 00be8a7..072f08a 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -62,7 +62,7 @@ static const cryptdata cTestData[4] = { 12,12,16} }; -static int win2k; +static int win2k, nt4; /* * 1. Take the MD5 Hash of the container name (with an extra null byte) @@ -249,7 +249,10 @@ static void test_prov(void) SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_SIG_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); if (!result && GetLastError() == NTE_BAD_TYPE) + { skip("PP_SIG_KEYSIZE_INC is not supported (win9x or NT)\n"); + nt4++; + } else ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); @@ -1472,16 +1475,16 @@ static void test_rc2(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); - /* Setting the salt also succeeds... */ + /* Setting the salt value will not reset the salt length in base or strong providers */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); ok(result, "setting salt failed: %08x\n", GetLastError()); - /* but the resulting salt length is now zero? */ dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0 || - broken(dwLen == 11), /* Win9x/WinMe/NT4 */ - "unexpected salt length %d\n", dwLen); + if (BASE_PROV || STRONG_PROV) + ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); + else + ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++) @@ -1719,16 +1722,16 @@ static void test_rc4(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); - /* Setting the salt also succeeds... */ + /* Setting the salt value will not reset the salt length in base or strong providers */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); ok(result, "setting salt failed: %08x\n", GetLastError()); - /* but the resulting salt length is now zero? */ dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - ok(dwLen == 0 || - broken(dwLen == 11), /* Win9x/WinMe/NT4 */ - "unexpected salt length %d\n", dwLen); + if (BASE_PROV || STRONG_PROV || nt4) + ok(dwLen == 11, "expected salt length 11, got %d\n", dwLen); + else + ok(dwLen == 0 || broken(nt4 && dwLen == 11), "expected salt length 0, got %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++)

1 0

Bruno Jesus : ws2_32: Prefer SetLastError over WSASetLastError.
by Alexandre Julliard Jan. 13, 2015

Jan. 13, 2015

Module: wine Branch: master Commit: c0e4759d8d7566c6a6367394419b8a8085619ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e4759d8d7566c6a63673944… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 9 23:49:46 2015 -0200 ws2_32: Prefer SetLastError over WSASetLastError. --- dlls/ws2_32/socket.c | 100 +++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e4759d8d7566c6a6367…

1 0