February 2015 - Wine-commits

Jacek Caban : hhctrl.ocx: Added support for context menus.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 5aa19990da0c2e0e8617e4a143da149bc9618349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa19990da0c2e0e8617e4a14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 14:09:57 2015 +0100 hhctrl.ocx: Added support for context menus. --- dlls/hhctrl.ocx/hhctrl.rc | 26 +++++++++++++ dlls/hhctrl.ocx/resource.h | 8 ++++ dlls/hhctrl.ocx/webbrowser.c | 54 +++++++++++++++++++++++++++ po/ar.po | 69 +++++++++++++++++++--------------- po/bg.po | 89 ++++++++++++++++++++++++-------------------- po/ca.po | 69 +++++++++++++++++++--------------- po/cs.po | 69 +++++++++++++++++++--------------- po/da.po | 69 +++++++++++++++++++--------------- po/de.po | 69 +++++++++++++++++++--------------- po/el.po | 70 ++++++++++++++++++---------------- po/en.po | 67 ++++++++++++++++++--------------- po/en_US.po | 67 ++++++++++++++++++--------------- po/eo.po | 69 +++++++++++++++++++--------------- po/es.po | 69 +++++++++++++++++++--------------- po/fa.po | 70 ++++++++++++++++++---------------- po/fi.po | 69 +++++++++++++++++++--------------- po/fr.po | 69 +++++++++++++++++++--------------- po/he.po | 69 +++++++++++++++++++--------------- po/hi.po | 68 ++++++++++++++++++--------------- po/hr.po | 69 +++++++++++++++++++--------------- po/hu.po | 69 +++++++++++++++++++--------------- po/it.po | 69 +++++++++++++++++++--------------- po/ja.po | 69 +++++++++++++++++++--------------- po/ko.po | 69 +++++++++++++++++++--------------- po/lt.po | 69 +++++++++++++++++++--------------- po/ml.po | 68 ++++++++++++++++++--------------- po/nb_NO.po | 69 +++++++++++++++++++--------------- po/nl.po | 69 +++++++++++++++++++--------------- po/or.po | 68 ++++++++++++++++++--------------- po/pa.po | 68 ++++++++++++++++++--------------- po/pl.po | 69 +++++++++++++++++++--------------- po/pt_BR.po | 69 +++++++++++++++++++--------------- po/pt_PT.po | 69 +++++++++++++++++++--------------- po/rm.po | 69 ++++++++++++++++++---------------- po/ro.po | 69 +++++++++++++++++++--------------- po/ru.po | 69 +++++++++++++++++++--------------- po/sk.po | 82 ++++++++++++++++++++++------------------ po/sl.po | 69 +++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 69 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 69 +++++++++++++++++++--------------- po/sv.po | 69 +++++++++++++++++++--------------- po/te.po | 68 ++++++++++++++++++--------------- po/th.po | 68 ++++++++++++++++++--------------- po/tr.po | 69 +++++++++++++++++++--------------- po/uk.po | 69 +++++++++++++++++++--------------- po/wa.po | 78 ++++++++++++++++++++------------------ po/wine.pot | 67 ++++++++++++++++++--------------- po/zh_CN.po | 69 +++++++++++++++++++--------------- po/zh_TW.po | 69 +++++++++++++++++++--------------- 49 files changed, 1845 insertions(+), 1449 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5aa19990da0c2e0e8617e…

1 0

Amine Khaldi : dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: bd58a7ca454754b3cd9f406f858974974b125152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd58a7ca454754b3cd9f406f8… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Feb 23 21:40:25 2015 +0100 dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way. --- dlls/dinput/tests/dinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 0490642..5ac55cf 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -50,7 +50,7 @@ static const DWORD directinput_version_list[] = DIRECTINPUT_VERSION_700, }; -static HRESULT WINAPI (*pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); +static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN); static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context) {

1 0

Nikolay Sivov : dwrite/tests: Place test font file in temporary location, make sure it's deleted after the test.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 3cfbfeca2b005a64f47a467a0a89fd370c5f09e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfbfeca2b005a64f47a467a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 24 08:05:05 2015 +0300 dwrite/tests: Place test font file in temporary location, make sure it's deleted after the test. --- dlls/dwrite/tests/analyzer.c | 29 +++++++++--- dlls/dwrite/tests/font.c | 104 +++++++++++++++++++++++++++---------------- 2 files changed, 88 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cfbfeca2b005a64f47a4…

1 0

Alexandre Julliard : schedsvc/tests: Don' t depend on folder enumeration order.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 75a2e85a27a3b99022308b1aba168b1f57c5af43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a2e85a27a3b99022308b1ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:11:28 2015 +0900 schedsvc/tests: Don't depend on folder enumeration order. --- dlls/schedsvc/tests/rpcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index cb83ac5..0220641 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -295,7 +295,7 @@ START_TEST(rpcapi) ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(names[0])); + ok(!lstrcmpW(names[0], Folder1) || !lstrcmpW(names[0], Folder2), "got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names);

1 0

Alexandre Julliard : user32/tests: Ignore WM_PAINT messages in GetMessagePos test.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 4e87b952b3a9c1291829dc076e0b3639a1c048a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e87b952b3a9c1291829dc076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:19:26 2015 +0900 user32/tests: Ignore WM_PAINT messages in GetMessagePos test. --- dlls/user32/tests/win.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c6dee75..0b67eea 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8032,6 +8032,11 @@ static void test_GetMessagePos(void) SetTimer(button, 1, 250, NULL); SetCursorPos(330, 350); GetMessageA(&msg, button, 0, 0); + while (msg.message == WM_PAINT) + { + UpdateWindow( button ); + GetMessageA(&msg, button, 0, 0); + } ok(msg.message == WM_TIMER, "msg.message = %x\n", msg.message); pos = GetMessagePos(); todo_wine ok(pos == MAKELONG(330, 350), "pos = %08x\n", pos);

1 0

Alexandre Julliard : user32/tests: Avoid a race with the get/ set window text threads.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: a5ec8bf8b07dd21fc6c4123302771fd60da53c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ec8bf8b07dd21fc6c412330… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:19:46 2015 +0900 user32/tests: Avoid a race with the get/set window text threads. --- dlls/user32/tests/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0b67eea..d71e92a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5794,7 +5794,7 @@ static void test_gettext(void) num_msgs++; } CloseHandle( thread ); - ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); /* test interthread SetWindowText */ num_msgs = 0; @@ -5807,7 +5807,7 @@ static void test_gettext(void) num_msgs++; } CloseHandle( thread ); - ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + ok( num_msgs >= 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); num_gettext_msgs = 0; memset( buf, 0, sizeof(buf) );

1 0

Alexandre Julliard : kernel32/tests: Try harder to empty the pipe for completion notification.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 5a6cda458d07435ba7dbe3434df6bff0804b0982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6cda458d07435ba7dbe3434… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 21:55:09 2015 +0900 kernel32/tests: Try harder to empty the pipe for completion notification. --- dlls/kernel32/tests/pipe.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3570676..cf02e15 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2079,20 +2079,17 @@ static void test_readfileex_pending(void) ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); /* free up some space in the pipe */ - ret = ReadFile(client, read_buf, sizeof(read_buf), &num_bytes, NULL); - ok(ret == TRUE, "ReadFile failed\n"); - - ok(completion_called == 0, "completion routine called during ReadFile\n"); - - wait = WaitForSingleObjectEx(event, 0, TRUE); - ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); - if (wait == WAIT_TIMEOUT) + for (i=0; i<256; i++) { ret = ReadFile(client, read_buf, sizeof(read_buf), &num_bytes, NULL); ok(ret == TRUE, "ReadFile failed\n"); + ok(completion_called == 0, "completion routine called during ReadFile\n"); + wait = WaitForSingleObjectEx(event, 0, TRUE); - ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0 || wait == WAIT_TIMEOUT, + "WaitForSingleObject returned %x\n", wait); + if (wait != WAIT_TIMEOUT) break; } ok(completion_called == 1, "completion routine not called\n");

1 0

Alexandre Julliard : dinput: Implement GetDeviceInfo for Linux joystick.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 93f40b2ecc45d7a3bf03ab30ab30cfc69fa0e351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f40b2ecc45d7a3bf03ab30a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 16:56:40 2015 +0900 dinput: Implement GetDeviceInfo for Linux joystick. --- dlls/dinput/joystick_linux.c | 116 +++++++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 697dded..9921a28 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -223,6 +223,52 @@ static INT find_joystick_devices(void) return joystick_devices_count; } +static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +{ + DWORD dwSize = lpddi->dwSize; + + TRACE("%d %p\n", dwSize, lpddi); + memset(lpddi, 0, dwSize); + + /* Return joystick */ + lpddi->dwSize = dwSize; + lpddi->guidInstance = DInput_Wine_Joystick_GUID; + lpddi->guidInstance.Data3 = id; + lpddi->guidProduct = DInput_Wine_Joystick_GUID; + /* we only support traditional joysticks for now */ + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + strcpy(lpddi->tszInstanceName, joystick_devices[id].name); + strcpy(lpddi->tszProductName, joystick_devices[id].name); + + lpddi->guidFFDriver = GUID_NULL; +} + +static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +{ + DWORD dwSize = lpddi->dwSize; + + TRACE("%d %p\n", dwSize, lpddi); + memset(lpddi, 0, dwSize); + + /* Return joystick */ + lpddi->dwSize = dwSize; + lpddi->guidInstance = DInput_Wine_Joystick_GUID; + lpddi->guidInstance.Data3 = id; + lpddi->guidProduct = DInput_Wine_Joystick_GUID; + /* we only support traditional joysticks for now */ + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + + MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszProductName, MAX_PATH); + lpddi->guidFFDriver = GUID_NULL; +} + static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; @@ -243,21 +289,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].name, strerror(errno)); return S_FALSE; } - - /* Return joystick */ - lpddi->guidInstance = DInput_Wine_Joystick_GUID; - lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - - strcpy(lpddi->tszInstanceName, joystick_devices[id].name); - strcpy(lpddi->tszProductName, joystick_devices[id].name); - - lpddi->guidFFDriver = GUID_NULL; + fill_joystick_dideviceinstanceA( lpddi, version, id ); close(fd); TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, lpddi->tszProductName); return S_OK; @@ -286,20 +318,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS WARN("open(%s,O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; } - - /* Return joystick */ - lpddi->guidInstance = DInput_Wine_Joystick_GUID; - lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - - MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszProductName, MAX_PATH); - lpddi->guidFFDriver = GUID_NULL; + fill_joystick_dideviceinstanceW( lpddi, version, id ); close(fd); TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, joystick_devices[id].name); return S_OK; @@ -591,6 +610,41 @@ static HRESULT WINAPI JoystickLinuxAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface } /****************************************************************************** + * GetDeviceInfo : get information about a device's identity + */ +static HRESULT WINAPI JoystickLinuxAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA ddi) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("(%p) %p\n", This, ddi); + + if (ddi == NULL) return E_POINTER; + if ((ddi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && + (ddi->dwSize != sizeof(DIDEVICEINSTANCEA))) + return DIERR_INVALIDPARAM; + + fill_joystick_dideviceinstanceA( ddi, This->generic.base.dinput->dwVersion, + get_joystick_index(&This->generic.base.guid) ); + return DI_OK; +} + +static HRESULT WINAPI JoystickLinuxWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW ddi) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(%p) %p\n", This, ddi); + + if (ddi == NULL) return E_POINTER; + if ((ddi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && + (ddi->dwSize != sizeof(DIDEVICEINSTANCEW))) + return DIERR_INVALIDPARAM; + + fill_joystick_dideviceinstanceW( ddi, This->generic.base.dinput->dwVersion, + get_joystick_index(&This->generic.base.guid) ); + return DI_OK; +} + +/****************************************************************************** * Unacquire : frees the joystick */ static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) @@ -713,7 +767,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickAGenericImpl_GetObjectInfo, - JoystickAGenericImpl_GetDeviceInfo, + JoystickLinuxAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, IDirectInputDevice2AImpl_CreateEffect, @@ -749,7 +803,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, JoystickWGenericImpl_GetObjectInfo, - JoystickWGenericImpl_GetDeviceInfo, + JoystickLinuxWImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, IDirectInputDevice2WImpl_CreateEffect,

1 0

Michael Müller : wininet: Allow Accept-Encoding for HTTP/1.0 requests.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 7c8df7eb5e2eaf7db7bc71b0c1dfa455edb3200e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8df7eb5e2eaf7db7bc71b0c… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Dec 8 02:51:30 2014 +0100 wininet: Allow Accept-Encoding for HTTP/1.0 requests. --- dlls/wininet/http.c | 22 ++-------------------- dlls/wininet/tests/http.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d515d7d..c0785b9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -205,7 +205,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD); static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); -static BOOL HTTP_VerifyValidHeader(http_request_t *req, LPCWSTR field); static BOOL drain_content(http_request_t*,BOOL); static CRITICAL_SECTION connection_pool_cs; @@ -1312,10 +1311,8 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request, pFieldAndValue = HTTP_InterpretHttpHeader(lpszStart); if (pFieldAndValue) { - res = HTTP_VerifyValidHeader(request, pFieldAndValue[0]); - if (res == ERROR_SUCCESS) - res = HTTP_ProcessHeader(request, pFieldAndValue[0], - pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ); + res = HTTP_ProcessHeader(request, pFieldAndValue[0], + pFieldAndValue[1], dwModifier | HTTP_ADDHDR_FLAG_REQ); HTTP_FreeTokens(pFieldAndValue); } @@ -6309,21 +6306,6 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *request, DWORD index) /*********************************************************************** - * HTTP_VerifyValidHeader (internal) - * - * Verify the given header is not invalid for the given http request - * - */ -static BOOL HTTP_VerifyValidHeader(http_request_t *request, LPCWSTR field) -{ - /* Accept-Encoding is stripped from HTTP/1.0 requests. It is invalid */ - if (!strcmpW(request->version, g_szHttp1_0) && !strcmpiW(field, szAccept_Encoding)) - return ERROR_HTTP_INVALID_HEADER; - - return ERROR_SUCCESS; -} - -/*********************************************************************** * IsHostInProxyBypassList (@) * * Undocumented diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 92a6b8d..3e66a27 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2314,7 +2314,13 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); - + if (strstr(buffer, "/test_accept_encoding_http10")) + { + if (strstr(buffer, "Accept-Encoding: gzip")) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4169,6 +4175,43 @@ static void test_request_content_length(int port) CloseHandle(hCompleteEvent); } +static void test_accept_encoding(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpAddRequestHeadersA(req, "Accept-Encoding: gzip\r\n", ~0u, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequestA failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, "Accept-Encoding: gzip", ~0u, NULL, 0); + ok(ret, "HttpSendRequestA failed\n"); + + test_status_code(req, 200); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -4215,6 +4258,7 @@ static void test_http_connection(void) test_successive_HttpSendRequest(si.port); test_head_request(si.port); test_request_content_length(si.port); + test_accept_encoding(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Michael Müller : winedevice: Call DriverUnload function when unloading a driver.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: a8b000c54d57e21e80c30b0e8faf0196a2e09541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b000c54d57e21e80c30b0e8… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jan 26 04:31:10 2015 +0100 winedevice: Call DriverUnload function when unloading a driver. Based on a patch by Alexander Morozov. --- programs/winedevice/device.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 72bc124..9677a82 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -167,8 +167,26 @@ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) return status; } +/* call the driver unload function */ +static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) +{ + if (driver_obj->DriverUnload) + { + if (WINE_TRACE_ON(relay)) + WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), + driver_obj->DriverUnload, driver_obj ); + + driver_obj->DriverUnload( driver_obj ); + + if (WINE_TRACE_ON(relay)) + WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), + driver_obj->DriverUnload, driver_obj ); + } + FreeLibrary( module ); +} + /* load the .sys module for a device driver */ -static BOOL load_driver(void) +static HMODULE load_driver(void) { static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0}; @@ -249,10 +267,10 @@ static BOOL load_driver(void) module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); - if (!module) return FALSE; + if (!module) return NULL; init_driver( module, &keypath ); - return TRUE; + return module; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) @@ -287,6 +305,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; + HMODULE driver_module; WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); @@ -305,13 +324,15 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) status.dwWaitHint = 10000; SetServiceStatus( service_handle, &status ); - if (load_driver()) + driver_module = load_driver(); + if (driver_module) { status.dwCurrentState = SERVICE_RUNNING; status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; SetServiceStatus( service_handle, &status ); wine_ntoskrnl_main_loop( stop_event ); + unload_driver( driver_module, &driver_obj ); } else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) );

1 0