July 2011 - Wine-commits - list.winehq.org

Hans Leidekker : winhttp: Implement IWinHttpRequest::Send.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 2e33485c6f5c2169609cc0074252303b78a43ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e33485c6f5c2169609cc0074… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:03 2011 +0200 winhttp: Implement IWinHttpRequest::Send. --- dlls/winhttp/request.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2608119..dfe0cb1 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2156,6 +2156,10 @@ struct winhttp_request HINTERNET hrequest; HANDLE wait; HANDLE cancel; + LONG resolve_timeout; + LONG connect_timeout; + LONG send_timeout; + LONG receive_timeout; }; static inline struct winhttp_request *impl_from_IWinHttpRequest( IWinHttpRequest *iface ) @@ -2454,12 +2458,63 @@ static HRESULT WINAPI winhttp_request_GetAllResponseHeaders( return E_NOTIMPL; } +static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout ) +{ + DWORD err; + HANDLE handles[2]; + + if (!request->wait) return ERROR_SUCCESS; + + handles[0] = request->wait; + handles[1] = request->cancel; + err = WaitForMultipleObjects( 2, handles, FALSE, timeout ); + if (err) WARN("wait failed with error %u\n", err); + return err; +} + +static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD size ) +{ + struct winhttp_request *request = (struct winhttp_request *)context; + SetEvent( request->wait ); +} + +static void wait_set_status_callback( struct winhttp_request *request, DWORD status ) +{ + if (!request->wait) return; + WinHttpSetStatusCallback( request->hrequest, wait_status_callback, status, 0 ); +} + static HRESULT WINAPI winhttp_request_Send( IWinHttpRequest *iface, VARIANT body ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD err; + + TRACE("%p, %s\n", request, debugstr_variant(&body)); + + if (request->state < REQUEST_STATE_OPEN) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ); + } + if (request->state >= REQUEST_STATE_SENT) return ERROR_SUCCESS; + + if (!WinHttpSetTimeouts( request->hrequest, + request->resolve_timeout, + request->connect_timeout, + request->send_timeout, + request->receive_timeout )) + { + return HRESULT_FROM_WIN32( GetLastError() ); + } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); + if (!WinHttpSendRequest( request->hrequest, NULL, 0, NULL, 0, 0, 0 )) + { + return HRESULT_FROM_WIN32( GetLastError() ); + } + if ((err = wait_for_completion( request, INFINITE ))) return err; + request->state = REQUEST_STATE_SENT; + return S_OK; } static HRESULT WINAPI winhttp_request_get_Status( @@ -2602,6 +2657,10 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; + request->resolve_timeout = 0; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetTimeouts.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: d66a0b748b788469d288c97ab97b4024c926a3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66a0b748b788469d288c97ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:18 2011 +0200 winhttp: Implement IWinHttpRequest::SetTimeouts. --- dlls/winhttp/request.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dfe0cb1..4d8b489 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2598,8 +2598,15 @@ static HRESULT WINAPI winhttp_request_SetTimeouts( LONG send_timeout, LONG receive_timeout ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p, %d, %d, %d, %d\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout); + + request->resolve_timeout = resolve_timeout; + request->connect_timeout = connect_timeout; + request->send_timeout = send_timeout; + request->receive_timeout = receive_timeout; + return S_OK; } static HRESULT WINAPI winhttp_request_SetClientCertificate(

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::WaitForResponse.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: 5c79f82ae58e9ecbca833a83d484b467990e9737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c79f82ae58e9ecbca833a83d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 21 11:51:34 2011 +0200 winhttp: Implement IWinHttpRequest::WaitForResponse. --- dlls/winhttp/request.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4d8b489..69c004c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2517,6 +2517,36 @@ static HRESULT WINAPI winhttp_request_Send( return S_OK; } +static DWORD request_wait_for_response( struct winhttp_request *request, DWORD timeout, VARIANT_BOOL *succeeded ) +{ + DWORD err; + + if (request->state >= REQUEST_STATE_RESPONSE_RECEIVED) return ERROR_SUCCESS; + if (request->state < REQUEST_STATE_SENT) + { + if ((err = wait_for_completion( request, timeout ))) return err; + request->state = REQUEST_STATE_SENT; + } + wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ); + if (!WinHttpReceiveResponse( request->hrequest, NULL )) + { + return GetLastError(); + } + switch ((err = wait_for_completion( request, timeout ))) + { + case WAIT_OBJECT_0: + if (succeeded) *succeeded = VARIANT_TRUE; + break; + case WAIT_TIMEOUT: + if (succeeded) *succeeded = VARIANT_FALSE; + break; + default: + return err; + } + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + return ERROR_SUCCESS; +} + static HRESULT WINAPI winhttp_request_get_Status( IWinHttpRequest *iface, LONG *status ) @@ -2580,8 +2610,12 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( VARIANT timeout, VARIANT_BOOL *succeeded ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD msecs = (V_I4(&timeout) == -1) ? INFINITE : V_I4(&timeout) * 1000; + + TRACE("%p, %s, %p\n", request, debugstr_variant(&timeout), succeeded); + + return HRESULT_FROM_WIN32( request_wait_for_response( request, msecs, succeeded ) ); } static HRESULT WINAPI winhttp_request_Abort(

1 0

Alexandre Julliard : comdlg32/tests: Print the id of the GetSaveFileName test on failure.
by Alexandre Julliard 21 Jul '11

21 Jul '11

Module: wine Branch: master Commit: c1dafc514aa2432625289d4d19630549435a2ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dafc514aa2432625289d4d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 21 11:11:20 2011 +0200 comdlg32/tests: Print the id of the GetSaveFileName test on failure. --- dlls/comdlg32/tests/filedlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0704ce6..2a91dc5 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1059,7 +1059,7 @@ static void test_extension(void) char curdir[MAX_PATH]; char *filename_ptr; const char *test_file_name = "deadbeef"; - const char **cur_filter; + unsigned int i; DWORD ret; BOOL boolret; @@ -1077,13 +1077,13 @@ static void test_extension(void) ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - for (cur_filter = defext_filters; cur_filter < defext_filters + ARRAY_SIZE(defext_filters); cur_filter++) { - ofn.lpstrFilter = *cur_filter; + for (i = 0; i < ARRAY_SIZE(defext_filters); i++) { + ofn.lpstrFilter = defext_filters[i]; strcpy(filename, test_file_name); boolret = GetSaveFileNameA(&ofn); - ok(boolret, "expected true\n"); + ok(boolret, "%u: expected true\n", i); ret = CommDlgExtendedError(); - ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + ok(!ret, "%u: CommDlgExtendedError returned %#x\n", i, ret); filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); ok( strcmp(filename_ptr, test_file_name) == 0,

1 0

Francois Gouget : po: Remove English strings from the Czech translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f23f2dc3ac9bee8340be5b29109aae1d506578d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23f2dc3ac9bee8340be5b291… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:32 2011 +0200 po: Remove English strings from the Czech translation. --- po/cs.po | 147 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 63 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f23f2dc3ac9bee8340be5…

1 0

Alexander Morozov : cryptui/tests: Always use a function pointer for CryptUIWizImport.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 3d3d5595f15dc596b049d6f72316c15e0fc19598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3d5595f15dc596b049d6f72… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 20 20:30:55 2011 +0400 cryptui/tests: Always use a function pointer for CryptUIWizImport. --- dlls/cryptui/tests/cryptui.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 09b246c..bb1db92 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -528,17 +528,17 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE | CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); @@ -576,7 +576,7 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -599,7 +599,7 @@ static void test_crypt_ui_wiz_import(void) ok(count == 0, "expected 0 CRLs, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -616,7 +616,7 @@ static void test_crypt_ui_wiz_import(void) store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); if (ret) @@ -639,7 +639,7 @@ static void test_crypt_ui_wiz_import(void) ok(count == 1, "expected 1 CRL, got %d\n", count); } SetLastError(0xdeadbeef); - ret = CryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, + ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, store); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError());

1 0

Frédéric Delanoy : kernel32: Fix function description of CompareStringA and lstrcmpA.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 6471e862f63952eef559e041fa6d753c44e41bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6471e862f63952eef559e041f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 20 17:20:58 2011 +0200 kernel32: Fix function description of CompareStringA and lstrcmpA. --- dlls/kernel32/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a54ae37..56fd478 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2843,7 +2843,7 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, * * RETURNS * Success: CSTR_LESS_THAN, CSTR_EQUAL or CSTR_GREATER_THAN depending on whether - * str2 is less than, equal to or greater than str1 respectively. + * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ INT WINAPI CompareStringA(LCID lcid, DWORD style, @@ -2914,7 +2914,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD style, * * RETURNS * Success: A number less than, equal to or greater than 0 depending on whether - * str2 is less than, equal to or greater than str1 respectively. + * str1 is less than, equal to or greater than str2 respectively. * Failure: FALSE. Use GetLastError() to determine the cause. */ int WINAPI lstrcmpA(LPCSTR str1, LPCSTR str2)

1 0

Huw Davies : winex11: Use the appropriate color_shifts when the target is a bitmap.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 3cead4fe1b839d7116437c839a69ff0b0275e90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cead4fe1b839d7116437c839… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 20 16:45:22 2011 +0100 winex11: Use the appropriate color_shifts when the target is a bitmap. --- dlls/winex11.drv/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 6ee5909..c1dc6c4 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1973,7 +1973,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( dev, physdev->color_shifts, info ); + set_color_info( dev, color_shifts, info ); return ERROR_BAD_FORMAT; }

1 0

Francois Gouget : po: French translation tweaks and fixes.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 060799d28f319f9af2a358d1807e5419ee92045a URL: http://source.winehq.org/git/wine.git/?a=commit;h=060799d28f319f9af2a358d18… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:13:36 2011 +0200 po: French translation tweaks and fixes. --- po/fr.po | 116 +++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 63 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060799d28f319f9af2a35…

1 0

Francois Gouget : po: Remove English strings from the German translation.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: f8ed30b068b496711bc534bebfbbdcb6b7666fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ed30b068b496711bc534beb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 20 16:14:08 2011 +0200 po: Remove English strings from the German translation. --- po/de.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/de.po b/po/de.po index 87f1760..03532e0 100644 --- a/po/de.po +++ b/po/de.po @@ -1048,7 +1048,7 @@ msgstr "Private Schlüsselbenutzungsdauer" #: crypt32.rc:137 msgid "Client Information" -msgstr "Client Information" +msgstr "" #: crypt32.rc:138 msgid "Server Authentication" @@ -6211,7 +6211,7 @@ msgstr "Aus&schneiden" #: shdoclc.rc:139 msgid "Context Unknown" -msgstr "Context Unknown" +msgstr "" #: shdoclc.rc:144 msgid "DYNSRC Image" @@ -6239,15 +6239,15 @@ msgstr "Debug" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "Trace Tags" +msgstr "" #: shdoclc.rc:197 msgid "Resource Failures" -msgstr "Resource Failures" +msgstr "" #: shdoclc.rc:198 msgid "Dump Tracking Info" -msgstr "Dump Tracking Info" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -6279,23 +6279,23 @@ msgstr "Dump LayoutRects" #: shdoclc.rc:206 msgid "Memory Monitor" -msgstr "Memory Monitor" +msgstr "" #: shdoclc.rc:207 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "" #: shdoclc.rc:208 msgid "Save HTML" -msgstr "Save HTML" +msgstr "" #: shdoclc.rc:210 msgid "&Browse View" -msgstr "&Browse View" +msgstr "" #: shdoclc.rc:211 msgid "&Edit View" -msgstr "&Edit View" +msgstr "" #: shdoclc.rc:214 msgid "Vertical Scrollbar" @@ -10928,7 +10928,7 @@ msgstr "Inaktiver Titelleistentext" #: winecfg.rc:133 msgid "Message Box Text" -msgstr "Message Box Text" +msgstr "" #: winecfg.rc:134 msgid "Application Workspace" @@ -11333,19 +11333,19 @@ msgstr "&Definieren..." #: winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: winhlp32.rc:48 winhlp32.rc:69 msgid "Small" -msgstr "Small" +msgstr "" #: winhlp32.rc:49 winhlp32.rc:70 msgid "Normal" -msgstr "Normal" +msgstr "" #: winhlp32.rc:50 winhlp32.rc:71 msgid "Large" -msgstr "Large" +msgstr "" #: winhlp32.rc:54 #, fuzzy

1 0