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

Juan Lang : wininet: De-Hungarian session member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 8e05039102dd45e6cb1b49e3aa83482bc7dd8a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05039102dd45e6cb1b49e3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:02:14 2011 -0800 wininet: De-Hungarian session member names. --- dlls/wininet/dialogs.c | 14 ++-- dlls/wininet/http.c | 158 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 14 ++-- 3 files changed, 93 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e05039102dd45e6cb1b4…

1 0

Juan Lang : wininet: De-Hungarian HTTP request member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 2098006d68c8acd79be47a9ebbba200f6db13906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2098006d68c8acd79be47a9eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:18:22 2011 -0800 wininet: De-Hungarian HTTP request member names. --- dlls/wininet/dialogs.c | 6 +- dlls/wininet/http.c | 392 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 28 ++-- 3 files changed, 213 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2098006d68c8acd79be47…

1 0

Juan Lang : wininet/tests: Test retrieving http requests from cache.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: eeb3e86f38ab659ddc68a3e97e893eb1b07c5e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb3e86f38ab659ddc68a3e97… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 10:56:00 2011 -0800 wininet/tests: Test retrieving http requests from cache. --- dlls/wininet/tests/http.c | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a8c843a..95a5779 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1202,6 +1202,19 @@ static void test_http_cache(void) ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); + /* Send the same request, requiring it to be retrieved from the cache */ + request = HttpOpenRequest(connect, "GET", "/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + size = sizeof(buf); + ret = InternetReadFile(request, buf, sizeof(buf), &size); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + ok(size == 100, "size = %u\n", size); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); @@ -1602,6 +1615,7 @@ static const char page1[] = struct server_info { HANDLE hEvent; int port; + int num_testH_retrievals; }; static DWORD CALLBACK server_thread(LPVOID param) @@ -1792,6 +1806,17 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1-1, 0); } + if (strstr(buffer, "GET /testH")) + { + si->num_testH_retrievals++; + if (!strstr(buffer, "Content-Length: 0")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2575,6 +2600,70 @@ static void test_options(int port) InternetCloseHandle(ses); } +static void test_url_caching(int port, int *num_retrievals) +{ + HINTERNET hi, hc, hr; + DWORD r, count; + char buffer[0x100]; + + ok(*num_retrievals == 0, "expected 0 retrievals prior to test\n"); + + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + /* Pre-load the cache: */ + hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + + ok(*num_retrievals == 1, "expected 1 retrievals\n"); + + count = 0; + memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed %u\n", GetLastError()); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + + InternetCloseHandle(hr); + + /* Send the same request, requiring it to be retrieved from the cache */ + hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + /* Older Windows versions succeed with this request, newer ones fail with + * ERROR_FILE_NOT_FOUND. Accept either, as the older version allows us + * to verify that the server isn't contacted. + */ + if (!r) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + else + { + /* The server shouldn't be contacted for this request. */ + todo_wine + ok(*num_retrievals == 1, "expected 1 retrievals\n"); + + count = 0; + memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed %u\n", GetLastError()); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + } + + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + static void test_http_connection(void) { struct server_info si; @@ -2583,6 +2672,7 @@ static void test_http_connection(void) si.hEvent = CreateEvent(NULL, 0, 0, NULL); si.port = 7531; + si.num_testH_retrievals = 0; hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); @@ -2611,6 +2701,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_last_error(si.port); test_options(si.port); + test_url_caching(si.port, &si.num_testH_retrievals); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Charles Davis : ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: f082eac97c3ec71de58eea85bb4de5a12b19f13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f082eac97c3ec71de58eea85b… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Mar 1 12:59:44 2011 -0700 ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS. --- dlls/ntdll/cdrom.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index c51ef6b..2722998 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -103,7 +103,16 @@ typedef struct uint64_t senseLen; } dk_scsi_command_t; +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + #define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) #endif @@ -630,6 +639,17 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi } } return 0; +#elif defined(__APPLE__) + dk_scsi_identify_t addr; + if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) + { + *port = addr.bus; + *iface = addr.port; + *device = addr.target; + *lun = addr.lun; + return 1; + } + return 0; #else FIXME("not implemented on this O/S\n"); return 0;

1 0

André Hentschel : kernel32/tests: Add SetLastError() before a test (Valgrind).
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 4c6e57654f59a625c58726019093db5aa7b9e494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e57654f59a625c58726019… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 1 17:08:06 2011 +0100 kernel32/tests: Add SetLastError() before a test (Valgrind). --- dlls/kernel32/tests/fiber.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9811439..0e68535 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -138,6 +138,7 @@ static void test_FiberHandling(void) return; } + SetLastError(0xdeadbeef); fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); ok(fibers[1] != 0, "CreateFiberEx failed with error %d\n", GetLastError());

1 0

Marcus Meissner : shdocvw: Rewrite code to make more understandable ( Coverity).
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: f90b5bfe731ee73bc3c2e2d1974831187676edb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b5bfe731ee73bc3c2e2d19… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Mar 2 12:30:04 2011 +0100 shdocvw: Rewrite code to make more understandable (Coverity). --- dlls/shdocvw/shlinstobj.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index d272c91..63bf0e6 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -375,16 +375,15 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, ppvClassObj); /* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */ - if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID) || - !(wszInstanceKey[5+CHARS_IN_GUID]='\\') || /* Repair the null-termination. */ - ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) - { + if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID)) + return CLASS_E_CLASSNOTAVAILABLE; + wszInstanceKey[5+CHARS_IN_GUID] = '\\'; /* Repair the null-termination. */ + if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) /* If there is no 'Instance' subkey, then it's not a Shell Instance Object. */ return CLASS_E_CLASSNOTAVAILABLE; - } - if (RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) - != ERROR_SUCCESS || FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) + if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) || + FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) { /* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */ FIXME("Failed to infer instance CLSID! %s\n", debugstr_w(wszCLSIDInstance));

1 0

Rico Schüller : d3dcompiler/tests: Add GetMemberType* tests.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 66b286470e478eddfaade6e8c258196d23e34891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b286470e478eddfaade6e8c… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Mar 1 22:36:13 2011 +0100 d3dcompiler/tests: Add GetMemberType* tests. --- dlls/d3dcompiler_43/tests/reflection.c | 52 +++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 7d53f7a..fb27e0d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1219,7 +1219,7 @@ static void test_reflection_constant_buffer(void) ID3D11ShaderReflection *ref11; ID3D11ShaderReflectionConstantBuffer *cb11, *cb11_dummy = NULL, *cb11_valid = NULL; ID3D11ShaderReflectionVariable *v11, *v11_dummy = NULL, *v11_valid = NULL; - ID3D11ShaderReflectionType *t11, *t11_dummy = NULL, *t11_valid = NULL; + ID3D11ShaderReflectionType *t11, *t, *t2, *t11_dummy = NULL, *t11_valid = NULL; D3D11_SHADER_BUFFER_DESC cbdesc = {0}; D3D11_SHADER_VARIABLE_DESC vdesc = {0}; D3D11_SHADER_TYPE_DESC tdesc = {0}; @@ -1228,6 +1228,7 @@ static void test_reflection_constant_buffer(void) const D3D11_SHADER_VARIABLE_DESC *pvdesc; const D3D11_SHADER_TYPE_DESC *ptdesc; unsigned int i; + LPCSTR string; hr = D3DReflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed %x\n", hr); @@ -1355,6 +1356,30 @@ static void test_reflection_constant_buffer(void) hr = t11_valid->lpVtbl->GetDesc(t11_valid, NULL); ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + string = t11_dummy->lpVtbl->GetMemberTypeName(t11_dummy, 0xffffffff); + ok(!strcmp(string, "$Invalid"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "$Invalid"); + + string = t11_valid->lpVtbl->GetMemberTypeName(t11_valid, 0xffffffff); + ok(!string, "GetMemberTypeName failed, got \"%s\", expected NULL\n", string); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByIndex(t11_dummy, 0xffffffff); + ok(t11_dummy == t11, "GetMemberTypeByIndex failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByIndex(t11_valid, 0xffffffff); + ok(t11_dummy == t11, "GetMemberTypeByIndex failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByName(t11_dummy, NULL); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByName(t11_dummy, "invalid"); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, NULL); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, "invalid"); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + /* constant buffers */ for (i = 0; i < sizeof(test_reflection_constant_buffer_cb_result)/sizeof(*test_reflection_constant_buffer_cb_result); ++i) { @@ -1422,6 +1447,31 @@ static void test_reflection_constant_buffer(void) i, tdesc.Offset, ptdesc->Offset); } + /* types */ + v11 = ref11->lpVtbl->GetVariableByName(ref11, "t"); + ok(v11_dummy != v11, "GetVariableByName failed\n"); + + t11 = v11->lpVtbl->GetType(v11); + ok(t11 != t11_dummy, "GetType failed\n"); + + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByName(t11, "a"); + ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + + string = t11->lpVtbl->GetMemberTypeName(t11, 0); + ok(!strcmp(string, "a"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "a"); + + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByName(t11, "b"); + ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + + string = t11->lpVtbl->GetMemberTypeName(t11, 1); + ok(!strcmp(string, "b"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "b"); + count = ref11->lpVtbl->Release(ref11); ok(count == 0, "Release failed %u\n", count); }

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::IsEqual().
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 4080242d7f1d5316a2c998f6e7edf609bc12666c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4080242d7f1d5316a2c998f6e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Mar 1 22:36:19 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::IsEqual(). --- dlls/d3dcompiler_43/reflection.c | 15 +++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e97512f..96c2920 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -872,9 +872,20 @@ static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberType static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p\n", iface, type); + + if (This == &null_type) + { + WARN("Null type specified\n"); + return E_FAIL; + } + + if (iface == type) + return S_OK; + + return S_FALSE; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType( diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fb27e0d..70c062e 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1380,6 +1380,18 @@ static void test_reflection_constant_buffer(void) t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, "invalid"); ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_dummy); + ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_dummy); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_valid); + ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_valid); + ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + /* constant buffers */ for (i = 0; i < sizeof(test_reflection_constant_buffer_cb_result)/sizeof(*test_reflection_constant_buffer_cb_result); ++i) { @@ -1472,6 +1484,23 @@ static void test_reflection_constant_buffer(void) string = t11->lpVtbl->GetMemberTypeName(t11, 1); ok(!strcmp(string, "b"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "b"); + /* float vs float (in struct) */ + hr = t11->lpVtbl->IsEqual(t11, t11_valid); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + /* float vs float */ + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); + ok(t2 != t11_dummy, "GetMemberTypeByIndex failed\n"); + + hr = t->lpVtbl->IsEqual(t, t2); + ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + count = ref11->lpVtbl->Release(ref11); ok(count == 0, "Release failed %u\n", count); }

1 0

Alexandre Julliard : server: Pass the original hardware input data to the server and set the message parameters on the server side .
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 02e30f5f77e0aea121137be19c8e5d5a36cd5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e30f5f77e0aea121137be19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 20:33:15 2011 +0100 server: Pass the original hardware input data to the server and set the message parameters on the server side. --- dlls/winex11.drv/keyboard.c | 36 +++------ dlls/winex11.drv/mouse.c | 18 +++-- include/wine/server_protocol.h | 41 ++++++++-- server/protocol.def | 39 ++++++++-- server/queue.c | 165 ++++++++++++++++++++++++++++++++++------ server/request.h | 11 +-- server/trace.c | 37 ++++++++-- tools/make_requests | 1 + 8 files changed, 267 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02e30f5f77e0aea121137…

1 0

Alexandre Julliard : server: Set the message code for keyboard input on the server side.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 9731d44921b71923f5eacee6be3b9308d12c3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9731d44921b71923f5eacee6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 11:34:59 2011 +0100 server: Set the message code for keyboard input on the server side. --- server/queue.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1353b00..19532e2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1361,8 +1361,7 @@ static void queue_mouse_message( struct desktop *desktop, user_handle_t win, uns } /* queue a hardware message for a keyboard event */ -static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, unsigned int message, - const hw_input_t *input ) +static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input ) { struct hardware_msg_data *msg_data; struct message *msg; @@ -1378,7 +1377,6 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); - msg->msg = message; msg->lparam = (input->kbd.scan << 16) | 1; /* repeat count */ msg->time = input->kbd.time; msg->result = NULL; @@ -1419,6 +1417,49 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->wparam = vkey; } + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_KEYUP : WM_KEYDOWN; + + switch (vkey) + { + case VK_LMENU: + case VK_RMENU: + if (input->kbd.flags & KEYEVENTF_KEYUP) + { + /* send WM_SYSKEYUP if Alt still pressed and no other key in between */ + /* we use 0x02 as a flag to track if some other SYSKEYUP was sent already */ + if ((desktop->keystate[VK_MENU] & 0x82) != 0x82) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + } + else + { + /* send WM_SYSKEYDOWN for Alt except with Ctrl */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + msg->msg = WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] |= 0x02; + } + break; + + case VK_LCONTROL: + case VK_RCONTROL: + /* send WM_SYSKEYUP on release if Alt still pressed */ + if (!(input->kbd.flags & KEYEVENTF_KEYUP)) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + break; + + default: + /* send WM_SYSKEY for Alt-anykey and for F10 */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + /* fall through */ + case VK_F10: + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_SYSKEYUP : WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] &= ~0x02; + break; + } + queue_hardware_message( desktop, msg ); } @@ -1879,7 +1920,7 @@ DECL_HANDLER(send_hardware_message) queue_mouse_message( desktop, req->win, req->msg, &req->input ); break; case INPUT_KEYBOARD: - queue_keyboard_message( desktop, req->win, req->msg, &req->input ); + queue_keyboard_message( desktop, req->win, &req->input ); break; case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, &req->input );

1 0