October 2016 - Wine-Commits

Donat Enikeev : crypt32/tests: Add tests for Cert(Un)registerSystemStore.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: dc208e7216fe2871c5ff59598ade2c8df2091de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc208e7216fe2871c5ff59598… Author: Donat Enikeev <donat(a)enikeev.net> Date: Fri Oct 14 09:37:08 2016 +0300 crypt32/tests: Add tests for Cert(Un)registerSystemStore. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 92 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 4483936..e811fbe 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -123,6 +123,8 @@ static BOOL (WINAPI *pCertGetStoreProperty)(HCERTSTORE,DWORD,void*,DWORD*); static void (WINAPI *pCertRemoveStoreFromCollection)(HCERTSTORE,HCERTSTORE); static BOOL (WINAPI *pCertSetStoreProperty)(HCERTSTORE,DWORD,DWORD,const void*); static BOOL (WINAPI *pCertAddCertificateLinkToStore)(HCERTSTORE,PCCERT_CONTEXT,DWORD,PCCERT_CONTEXT*); +static BOOL (WINAPI *pCertRegisterSystemStore)(const void*,DWORD,void*,void*); +static BOOL (WINAPI *pCertUnregisterSystemStore)(const void*,DWORD); #define test_store_is_empty(store) _test_store_is_empty(__LINE__,store) static void _test_store_is_empty(unsigned line, HCERTSTORE store) @@ -1868,6 +1870,88 @@ static void testCertOpenSystemStore(void) RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } +static const struct +{ + DWORD cert_store; + BOOL expected; + BOOL todo; +} reg_system_store_test_data[] = { + { CERT_SYSTEM_STORE_CURRENT_USER, TRUE, 0}, + /* Following tests could require administrator privileges and thus could be skipped */ + { CERT_SYSTEM_STORE_CURRENT_SERVICE, TRUE, 1}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE, TRUE, 0}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY, TRUE, 0}, + { CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY, TRUE, 0}, + { CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, TRUE, 1} +}; + +static void testCertRegisterSystemStore(void) +{ + BOOL ret, cur_flag; + DWORD err = 0; + HCERTSTORE hstore; + static const WCHAR WineTestW[] = {'W','i','n','e','T','e','s','t',0}; + const CERT_CONTEXT *cert, *cert2; + unsigned int i; + + if (!pCertRegisterSystemStore || !pCertUnregisterSystemStore) + { + win_skip("CertRegisterSystemStore() or CertUnregisterSystemStore() is not available\n"); + return; + } + + for (i = 0; i < sizeof(reg_system_store_test_data) / sizeof(reg_system_store_test_data[0]); i++) { + cur_flag = reg_system_store_test_data[i].cert_store; + ret = pCertRegisterSystemStore(WineTestW, cur_flag, NULL, NULL); + if (!ret) + { + err = GetLastError(); + if (err == ERROR_ACCESS_DENIED) + { + win_skip("Insufficient privileges for the flag %08x test\n", cur_flag); + continue; + } + } + todo_wine_if (reg_system_store_test_data[i].todo) + ok (ret == reg_system_store_test_data[i].expected, + "Store registration (dwFlags=%08x) failed, last error %x\n", cur_flag, err); + if (!ret) + { + skip("Nothing to test without registered store at %08x\n", cur_flag); + continue; + } + + hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_STORE_OPEN_EXISTING_FLAG | cur_flag, WineTestW); + ok (hstore != NULL, "Opening just registered store at %08x failed, last error %x\n", cur_flag, GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok (cert != NULL, "Failed creating cert at %08x, last error: %x\n", cur_flag, GetLastError()); + if (cert) + { + ret = CertAddCertificateContextToStore(hstore, cert, CERT_STORE_ADD_NEW, NULL); + ok (ret, "Failed to add cert at %08x, last error: %x\n", cur_flag, GetLastError()); + + cert2 = CertEnumCertificatesInStore(hstore, NULL); + ok (cert2 != NULL && cert2->cbCertEncoded == cert->cbCertEncoded, + "Unexpected cert encoded size at %08x, last error: %x\n", cur_flag, GetLastError()); + + ret = CertDeleteCertificateFromStore(cert2); + ok (ret, "Failed to delete certificate from the new store at %08x, last error: %x\n", cur_flag, GetLastError()); + + CertFreeCertificateContext(cert); + } + + ret = CertCloseStore(hstore, 0); + ok (ret, "CertCloseStore failed at %08x, last error %x", cur_flag, GetLastError()); + + ret = pCertUnregisterSystemStore(WineTestW, cur_flag ); + todo_wine_if (reg_system_store_test_data[i].todo) + ok( ret == reg_system_store_test_data[i].expected, + "Unregistering failed at %08x, last error %d\n", cur_flag, GetLastError()); + } + +} + struct EnumSystemStoreInfo { BOOL goOn; @@ -2587,8 +2671,6 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == cert->hCertStore, "Unexpected hCertStore\n"); - CertFreeCertificateContext(cert3); - store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); ok(store != NULL, "CertOpenStore failed\n"); @@ -2601,8 +2683,6 @@ static void testEmptyStore(void) ok(res, "CertDeleteCertificateContextFromStore failed\n"); ok(cert3->hCertStore == store, "Unexpected hCertStore\n"); - CertFreeCertificateContext(cert3); - CertCloseStore(store, 0); res = CertCloseStore(cert->hCertStore, CERT_CLOSE_STORE_CHECK_FLAG); @@ -2808,6 +2888,8 @@ START_TEST(store) pCertRemoveStoreFromCollection = (void*)GetProcAddress(hdll, "CertRemoveStoreFromCollection"); pCertSetStoreProperty = (void*)GetProcAddress(hdll, "CertSetStoreProperty"); pCertAddCertificateLinkToStore = (void*)GetProcAddress(hdll, "CertAddCertificateLinkToStore"); + pCertRegisterSystemStore = (void*)GetProcAddress(hdll, "CertRegisterSystemStore"); + pCertUnregisterSystemStore = (void*)GetProcAddress(hdll, "CertUnregisterSystemStore"); /* various combinations of CertOpenStore */ testMemStore(); @@ -2821,6 +2903,8 @@ START_TEST(store) testSerializedStore(); testCloseStore(); + testCertRegisterSystemStore(); + testCertOpenSystemStore(); testCertEnumSystemStore(); testStoreProperty();

1 0

Christoph von Wittich : rpcrt4: Implement RpcBindingServerFromClient and populate NetworkAddr for each transport.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 01290cdc1f79e2ad53ef02acc109f132521e3f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01290cdc1f79e2ad53ef02acc… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Wed Oct 12 17:14:11 2016 +0200 rpcrt4: Implement RpcBindingServerFromClient and populate NetworkAddr for each transport. Add more thorough testing for this function. Signed-off-by: Colin Finck <mail(a)colinfinck.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.c | 22 ++++++++++++++++++---- dlls/rpcrt4/rpc_transport.c | 34 ++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/server.c | 33 ++++++++++++++++++++++----------- 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 7212a18..07eddbe 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1636,11 +1636,25 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * /*********************************************************************** * RpcBindingServerFromClient (RPCRT4.@) */ - -RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE *ServerBinding) +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding) { - FIXME("%p %p: stub\n", ClientBinding, ServerBinding); - return RPC_S_INVALID_BINDING; + RpcBinding* bind = ClientBinding; + RpcBinding* NewBinding; + + if (!bind) + bind = I_RpcGetCurrentCallHandle(); + + if (!bind->server) + return RPC_S_INVALID_BINDING; + + RPCRT4_AllocBinding(&NewBinding, TRUE); + NewBinding->Protseq = RPCRT4_strdupA(bind->Protseq); + NewBinding->NetworkAddr = RPCRT4_strdupA(bind->NetworkAddr); + + *ServerBinding = NewBinding; + + return RPC_S_OK; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b2fbf9b..4ba17a0 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -388,6 +388,7 @@ static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np * static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; LPSTR pname; @@ -397,6 +398,16 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); + /* Store the local computer name as the NetworkAddr for ncacn_np as long as + * we don't support named pipes over the network. */ + FIXME("Using local computer name as NetworkAddr\n"); + new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); + if (!GetComputerNameA(new_conn->NetworkAddr, &len)) + { + ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return status; } @@ -429,6 +440,7 @@ static RPC_STATUS rpcrt4_ncalrpc_np_is_server_listening(const char *endpoint) static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; RPC_STATUS status; LPSTR pname; @@ -439,7 +451,15 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection pname = ncalrpc_pipe_name(old_conn->Endpoint); status = rpcrt4_conn_create_pipe(old_conn, pname); I_RpcFree(pname); - + + /* Store the local computer name as the NetworkAddr for ncalrpc. */ + new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); + if (!GetComputerNameA(new_conn->NetworkAddr, &len)) + { + ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + return RPC_S_OUT_OF_RESOURCES; + } + return status; } @@ -1479,10 +1499,20 @@ static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection ERR("Failed to accept a TCP connection: error %d\n", ret); return RPC_S_OUT_OF_RESOURCES; } + nonblocking = 1; ioctlsocket(ret, FIONBIO, &nonblocking); client->sock = ret; - TRACE("Accepted a new TCP connection\n"); + + client->common.NetworkAddr = HeapAlloc(GetProcessHeap(), 0, INET6_ADDRSTRLEN); + ret = getnameinfo((struct sockaddr*)&address, addrsize, client->common.NetworkAddr, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST); + if (ret != 0) + { + ERR("Failed to retrieve the IP address, error %d\n", ret); + return RPC_S_OUT_OF_RESOURCES; + } + + TRACE("Accepted a new TCP connection from %s\n", client->common.NetworkAddr); return RPC_S_OK; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f9a5a96..ee28703 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -745,29 +745,40 @@ void __cdecl s_context_handle_test(void) binding = NULL; status = RpcBindingServerFromClient(NULL, &binding); - todo_wine - { - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - ok(binding != NULL, "binding is NULL\n"); - } + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + ok(binding != NULL, "binding is NULL\n"); if (status == RPC_S_OK && binding != NULL) { unsigned char* string_binding = NULL; - unsigned char* computer_name = NULL; + unsigned char* object_uuid = NULL; + unsigned char* protseq = NULL; + unsigned char* network_address = NULL; + unsigned char* endpoint = NULL; + unsigned char* network_options = NULL; status = RpcBindingToStringBindingA(binding, &string_binding); - ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); ok(string_binding != NULL, "string_binding is NULL\n"); - status = RpcStringBindingParseA(string_binding, NULL, NULL, &computer_name, NULL, NULL); - + status = RpcStringBindingParseA(string_binding, &object_uuid, &protseq, &network_address, &endpoint, &network_options); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); - ok(computer_name != NULL, "computer_name is NULL\n"); + ok(protseq != NULL && *protseq != '\0', "protseq is %s\n", protseq); + ok(network_address != NULL && *network_address != '\0', "network_address is %s\n", network_address); + + todo_wine + { + ok(object_uuid != NULL && *object_uuid == '\0', "object_uuid is %s\n", object_uuid); + ok(endpoint != NULL && *endpoint == '\0', "endpoint is %s\n", endpoint); + ok(network_options != NULL && *network_options == '\0', "network_options is %s\n", network_options); + } RpcStringFreeA(&string_binding); - RpcStringFreeA(&computer_name); + RpcStringFreeA(&object_uuid); + RpcStringFreeA(&protseq); + RpcStringFreeA(&network_address); + RpcStringFreeA(&endpoint); + RpcStringFreeA(&network_options); RpcBindingFree(&binding); } }

1 0

Marcus Meissner : explorer: Check icon for NULL (Coverity).
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: af5b414000570b9f99669d1db3236c725b893499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5b414000570b9f99669d1db… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 19 09:22:48 2016 +0200 explorer: Check icon for NULL (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index b3c192a..ddfd67d 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -588,8 +588,11 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) if (icon) ret = modify_icon( icon, &nid ); break; case NIM_SETVERSION: - icon->version = nid.u.uVersion; - ret = TRUE; + if (icon) + { + icon->version = nid.u.uVersion; + ret = TRUE; + } break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData);

1 0

Jacek Caban : kernel32: Improved GetUserPreferredUILanguages stub.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 26d0105cd8a8ce1131033f1871de0dd9a7b4c43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d0105cd8a8ce1131033f187… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 20:00:12 2016 +0200 kernel32: Improved GetUserPreferredUILanguages stub. Implementation and tests are based on GetSystemPreferredUILanguages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 35 ++++++++--- dlls/kernel32/tests/locale.c | 140 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8c5736b..9b3a957 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1269,6 +1269,32 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buf return get_dummy_preferred_ui_language( flags, count, buf, size ); } +/****************************************************************************** + * GetUserPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetUserPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buffer, ULONG *size ) +{ + TRACE( "%u %p %p %p\n", flags, count, buffer, size ); + + if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (*size && !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return get_dummy_preferred_ui_language( flags, count, buffer, size ); +} + /*********************************************************************** * GetUserDefaultUILanguage (KERNEL32.@) * @@ -5798,15 +5824,6 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, /****************************************************************************** - * GetUserPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR langbuffer, PULONG bufferlen) -{ - FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); - return FALSE; -} - -/****************************************************************************** * GetFileMUIPath (KERNEL32.@) */ diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index dd946a2..07d6f8c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -99,6 +99,7 @@ static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMTW *, LPWSTR, int); @@ -131,6 +132,7 @@ static void InitFunctionPointers(void) X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); + X(GetUserPreferredUILanguages); X(GetNumberFormatEx); mod = GetModuleHandleA("ntdll"); @@ -5117,6 +5119,143 @@ static void test_GetThreadPreferredUILanguages(void) HeapFree(GetProcessHeap(), 0, buf); } +static void test_GetUserPreferredUILanguages(void) +{ + BOOL ret; + ULONG count, size, size_id, size_name, size_buffer; + WCHAR *buffer; + + + if (!pGetUserPreferredUILanguages) + { + win_skip("GetUserPreferredUILanguages is not available.\n"); + return; + } + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_FULL_LANGUAGE, &count, NULL, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 0; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS, &count, NULL, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected error ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size_id = 0; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + ok(ret, "Expected GetUserPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size_id % 5 == 1, "Expected size (%d) %% 5 == 1\n", size_id); + + count = 0xdeadbeef; + size_name = 0; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, NULL, &size_name); + ok(ret, "Expected GetUserPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size_name % 6 == 1, "Expected size (%d) %% 6 == 1\n", size_name); + + size_buffer = max(size_id, size_name); + if(!size_buffer) + { + skip("No valid buffer size\n"); + return; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, size_buffer * sizeof(WCHAR)); + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(0, &count, buffer, &size); + ok(ret, "Expected GetUserPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 6 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(ret, "Expected GetUserPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 5 == 1, "Expected size (%d) %% 5 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = size_buffer; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_NAME, &count, buffer, &size); + ok(ret, "Expected GetUserPreferredUILanguages to succeed\n"); + ok(count, "Expected count > 0\n"); + ok(size % 6 == 1, "Expected size (%d) %% 6 == 1\n", size); + if (ret && size % 5 == 1) + ok(!buffer[size -2] && !buffer[size -1], + "Expected last two WCHARs being empty, got 0x%x 0x%x\n", + buffer[size -2], buffer[size -1]); + + count = 0xdeadbeef; + size = 1; + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -1; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + count = 0xdeadbeef; + size = size_id -2; + memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = pGetUserPreferredUILanguages(0, &count, buffer, &size); + ok(!ret, "Expected GetUserPreferredUILanguages to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); +} + START_TEST(locale) { InitFunctionPointers(); @@ -5162,6 +5301,7 @@ START_TEST(locale) test_invariant(); test_GetSystemPreferredUILanguages(); test_GetThreadPreferredUILanguages(); + test_GetUserPreferredUILanguages(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Huw Davies : comctl32: Add support for the sort arrows.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 841d41bdcf7ee047b8aceecd1e12b52ba4a3e712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841d41bdcf7ee047b8aceecd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 16:08:27 2016 +0100 comctl32: Add support for the sort arrows. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 98 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 224ff9e..705c6c4 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -326,6 +326,48 @@ HEADER_DrawItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM * } } +/* Create a region for the sort arrow with its bounding rect's top-left + co-ord x,y and its height h. */ +static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) +{ + char buffer[256]; + RGNDATA *data = (RGNDATA *)buffer; + DWORD size = FIELD_OFFSET(RGNDATA, Buffer[h * sizeof(RECT)]); + INT i, yinc = 1; + HRGN rgn; + + if (size > sizeof(buffer)) + { + data = HeapAlloc( GetProcessHeap(), 0, size ); + if (!data) return NULL; + } + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = 0; + data->rdh.nRgnSize = h * sizeof(RECT); + + if (!is_up) + { + y += h - 1; + yinc = -1; + } + + x += h - 1; /* set x to the centre */ + + for (i = 0; i < h; i++, y += yinc) + { + RECT *rect = (RECT *)data->Buffer + data->rdh.nCount; + rect->left = x - i; + rect->top = y; + rect->right = x + i + 1; + rect->bottom = y + 1; + data->rdh.nCount++; + } + rgn = ExtCreateRegion( NULL, size, data ); + if (data != (RGNDATA *)buffer) HeapFree( GetProcessHeap(), 0, data ); + return rgn; +} + static INT HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags) { @@ -413,10 +455,11 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU INT cx, tx, ix, bx; UINT cw, tw, iw, bw; INT img_cx, img_cy; + INT sort_w, sort_x, sort_h; BITMAP bmp; HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE); - cw = iw = bw = 0; + cw = iw = bw = sort_w = sort_h = 0; rw = r.right - r.left; rh = r.bottom - r.top; @@ -435,23 +478,28 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; } - if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) { - iw = img_cx + 2 * infoPtr->iMargin; - x = &ix; - w = &iw; - } - - if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { - GetObjectW (phdi->hbm, sizeof(BITMAP), &bmp); - bw = bmp.bmWidth + 2 * infoPtr->iMargin; - if (!iw) { - x = &bx; - w = &bw; - } - } + if (phdi->fmt & (HDF_SORTUP | HDF_SORTDOWN)) { + sort_h = MulDiv( infoPtr->nHeight - VERT_BORDER, 4, 13 ); + sort_w = 2 * sort_h - 1 + infoPtr->iMargin * 2; + cw += sort_w; + } else { /* sort arrows take precedent over images/bitmaps */ + if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) { + iw = img_cx + 2 * infoPtr->iMargin; + x = &ix; + w = &iw; + } - if (bw || iw) - cw += *w; + if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { + GetObjectW (phdi->hbm, sizeof(BITMAP), &bmp); + bw = bmp.bmWidth + 2 * infoPtr->iMargin; + if (!iw) { + x = &bx; + w = &bw; + } + } + if (bw || iw) + cw += *w; + } /* align cx using the unclipped cw */ if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_LEFT) @@ -470,7 +518,10 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU tx = cx + infoPtr->iMargin; /* since cw might have changed we have to recalculate tw */ tw = cw - infoPtr->iMargin * 2; - + + tw -= sort_w; + sort_x = cx + tw + infoPtr->iMargin * 3; + if (iw || bw) { tw -= *w; if (phdi->fmt & HDF_BITMAP_ON_RIGHT) { @@ -494,11 +545,20 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU bx = cx + cw + infoPtr->iMargin; } - if (iw || bw) { + if (sort_w || iw || bw) { HDC hClipDC = GetDC(infoPtr->hwndSelf); HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); SelectClipRgn(hClipDC, hClipRgn); + if (sort_w) { + HRGN arrow = create_sort_arrow( sort_x, r.top + (rh - sort_h) / 2, + sort_h, phdi->fmt & HDF_SORTUP ); + if (arrow) { + FillRgn( hClipDC, arrow, GetSysColorBrush( COLOR_GRAYTEXT ) ); + DeleteObject( arrow ); + } + } + if (bw) { HDC hdcBitmap = CreateCompatibleDC (hClipDC); SelectObject (hdcBitmap, phdi->hbm);

1 0

Huw Davies : comctl32: Make the position variables signed to avoid wrapping in the HDF_RIGHT case.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 23dbdab4fe6177cc9b006e1adf4b98635c09520d URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dbdab4fe6177cc9b006e1ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 16:08:26 2016 +0100 comctl32: Make the position variables signed to avoid wrapping in the HDF_RIGHT case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index edfe385..224ff9e 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -406,11 +406,12 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU /* Now text and image */ { - UINT rw, rh, /* width and height of r */ - *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ + INT rw, rh; /* width and height of r */ + INT *x = NULL; /* x and ... */ + UINT *w = NULL; /* ... width of the pic (bmp or img) which is part of cnt */ /* cnt,txt,img,bmp */ - UINT cx, tx, ix, bx, - cw, tw, iw, bw; + INT cx, tx, ix, bx; + UINT cw, tw, iw, bw; INT img_cx, img_cy; BITMAP bmp; @@ -501,14 +502,14 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (bw) { HDC hdcBitmap = CreateCompatibleDC (hClipDC); SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hClipDC, bx, r.top + ((INT)rh - bmp.bmHeight) / 2, + BitBlt (hClipDC, bx, r.top + (rh - bmp.bmHeight) / 2, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); DeleteDC (hdcBitmap); } if (iw) { ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, - ix, r.top + ((INT)rh - img_cy) / 2, + ix, r.top + (rh - img_cy) / 2, img_cx, img_cy, CLR_DEFAULT, CLR_DEFAULT, 0); }

1 0

Aric Stewart : hidclass.sys: Use IoSetCompletionRoutine.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: c5dde63b19a85510c5dfd2877c6e026e459f2323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dde63b19a85510c5dfd2877… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 18 17:07:59 2016 +0200 hidclass.sys: Use IoSetCompletionRoutine. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 20 +++++++------------- dlls/hidclass.sys/main.c | 13 +++++-------- dlls/hidclass.sys/pnp.c | 10 +++++----- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 189cd2e..45f88eb 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -242,9 +242,10 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, packet); } -static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context ) +static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) { - SetEvent(irp->UserEvent); + HANDLE event = context; + SetEvent(event); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -254,7 +255,6 @@ static DWORD CALLBACK hid_device_thread(void *args) IRP *irp; IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; DWORD rc; HANDLE events[2]; NTSTATUS ntrc; @@ -276,13 +276,10 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportId = 0; irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, - device, NULL, 0, packet, sizeof(*packet), TRUE, events[0], + device, NULL, 0, packet, sizeof(*packet), TRUE, NULL, &irp_status); - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->CompletionRoutine = read_Completion; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; - + IoSetCompletionRoutine(irp, read_Completion, events[0], TRUE, TRUE, TRUE); ntrc = IoCallDriver(device, irp); if (ntrc == STATUS_PENDING) @@ -324,13 +321,10 @@ static DWORD CALLBACK hid_device_thread(void *args) irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, device, NULL, 0, buffer, - ext->preparseData->caps.InputReportByteLength, TRUE, events[0], + ext->preparseData->caps.InputReportByteLength, TRUE, NULL, &irp_status); - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->CompletionRoutine = read_Completion; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; - + IoSetCompletionRoutine(irp, read_Completion, events[0], TRUE, TRUE, TRUE); ntrc = IoCallDriver(device, irp); if (ntrc == STATUS_PENDING) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 1ab25da..b9b5a3a 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -86,9 +86,10 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) } static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, - void *context ) + void *context) { - SetEvent(irp->UserEvent); + HANDLE event = context; + SetEvent(event); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -96,7 +97,6 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG { IRP *irp; IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; NTSTATUS status; void *buffer = NULL; @@ -109,12 +109,9 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG } irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - buffer, out_size, TRUE, event, &irp_status); - - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->CompletionRoutine = internalComplete; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + buffer, out_size, TRUE, NULL, &irp_status); + IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); IoCallDriver(device, irp); if (irp->IoStatus.u.Status == STATUS_PENDING) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 81514c0..1e607df 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -36,9 +36,10 @@ static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, - void *context ) + void *context) { - SetEvent(irp->UserEvent); + HANDLE event = context; + SetEvent(event); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -54,13 +55,12 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH if (irp == NULL) return STATUS_NO_MEMORY; - irp->UserEvent = event = CreateEventA(NULL, FALSE, FALSE, NULL); + event = CreateEventA(NULL, FALSE, FALSE, NULL); irpsp = IoGetNextIrpStackLocation(irp); irpsp->MinorFunction = IRP_MN_QUERY_ID; irpsp->Parameters.QueryId.IdType = type; - irpsp->CompletionRoutine = internalComplete; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); IoCallDriver(device, irp); if (irp->IoStatus.u.Status == STATUS_PENDING) WaitForSingleObject(event, INFINITE);

1 0

Józef Kucia : wined3d: Explicitly track locations for buffers.
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: 2a385e420a2bafd7ca868ae57428798bb941d0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a385e420a2bafd7ca868ae57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:48 2016 +0200 wined3d: Explicitly track locations for buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 79 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b6338d1..c7f0d81 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -93,6 +93,46 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) +{ + TRACE("buffer %p, location %s.\n", buffer, wined3d_debug_location(location)); + + if (location & WINED3D_LOCATION_BUFFER) + buffer_clear_dirty_areas(buffer); + + buffer->locations |= location; + + TRACE("New locations flags are %s.\n", wined3d_debug_location(buffer->locations)); +} + +static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD location, + unsigned int offset, unsigned int size) +{ + TRACE("buffer %p, location %s, offset %u, size %u.\n", + buffer, wined3d_debug_location(location), offset, size); + + if ((offset || size) && (location & ~WINED3D_LOCATION_BUFFER)) + { + ERR("Range can be invalidated only for WINED3D_LOCATION_BUFFER.\n"); + return; + } + + if (location & WINED3D_LOCATION_BUFFER) + buffer_invalidate_bo_range(buffer, offset, size); + + buffer->locations &= ~location; + + TRACE("New locations flags are %s.\n", wined3d_debug_location(buffer->locations)); + + if (!buffer->locations) + ERR("Buffer %p does not have any up to date location.\n", buffer); +} + +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) +{ + wined3d_buffer_invalidate_range(buffer, location, 0, 0); +} + /* Context activation is done by the caller. */ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) { @@ -192,15 +232,21 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine This->buffer_object_usage = gl_usage; if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + { buffer_invalidate_bo_range(This, 0, 0); + } else + { wined3d_resource_free_sysmem(&This->resource); + wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(This, WINED3D_LOCATION_SYSMEM); + } return; fail: /* Clean up all VBO init, but continue because we can work without a VBO :-) */ - ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); + ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur.\n"); This->flags &= ~WINED3D_BUFFER_USE_BO; delete_gl_buffer(This, gl_info); buffer_clear_dirty_areas(This); @@ -509,6 +555,8 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c checkGLcall("buffer download"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + return buffer->resource.heap_memory; } @@ -532,6 +580,7 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); delete_gl_buffer(buffer, context->gl_info); buffer_clear_dirty_areas(buffer); @@ -707,7 +756,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con } if (!map) { - ERR("Failed to map opengl buffer\n"); + ERR("Failed to map OpenGL buffer.\n"); return; } @@ -732,6 +781,8 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con } GL_EXTCALL(glUnmapBuffer(This->buffer_type_hint)); checkGLcall("glUnmapBuffer"); + + wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); } void buffer_mark_used(struct wined3d_buffer *buffer) @@ -924,6 +975,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } HeapFree(GetProcessHeap(), 0, data); + + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) @@ -952,17 +1005,28 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (buffer->buffer_object) { + unsigned int dirty_offset = offset, dirty_size = size; + /* DISCARD invalidates the entire buffer, regardless of the specified * offset and size. Some applications also depend on the entire buffer * being uploaded in that case. Two such applications are Port Royale * and Darkstar One. */ if (flags & WINED3D_MAP_DISCARD) - buffer_invalidate_bo_range(buffer, 0, 0); - else if (!(flags & WINED3D_MAP_READONLY)) - buffer_invalidate_bo_range(buffer, offset, size); + { + dirty_offset = 0; + dirty_size = 0; + } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { + if (!(flags & WINED3D_MAP_READONLY)) + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + } + else + { + if (!(flags & WINED3D_MAP_READONLY)) + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + if (count == 1) { struct wined3d_device *device = buffer->resource.device; @@ -1171,7 +1235,7 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } if (dst_buffer_mem) - buffer_invalidate_bo_range(dst_buffer, dst_offset, size); + wined3d_buffer_invalidate_range(dst_buffer, WINED3D_LOCATION_BUFFER, dst_offset, size); context_release(context); return WINED3D_OK; @@ -1300,6 +1364,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return hr; } buffer->buffer_type_hint = bind_hint; + buffer->locations = WINED3D_LOCATION_SYSMEM; TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89b781c..a611531 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3179,6 +3179,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, { GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); buffer->buffer_object = 0; + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); } if (e->data.addr) e->data.addr += e->stride * src_start_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3152a2..45a24f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3163,6 +3163,7 @@ struct wined3d_buffer struct wined3d_map_range *maps; ULONG maps_size, modified_areas; + DWORD locations; struct wined3d_event_query *query; /* conversion stuff */ @@ -3181,6 +3182,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -3188,6 +3190,7 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Józef Kucia : wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem().
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: fc866d88f381c55bd37c7209a024738547e51071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc866d88f381c55bd37c7209a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:47 2016 +0200 wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ae835be..b6338d1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -493,7 +493,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) +BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -528,7 +528,7 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } @@ -875,7 +875,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * ERR("Converting data in non-vertex buffer.\n"); if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); /* Now for each vertex in the buffer that needs conversion */ vertex_count = buffer->resource.size / buffer->stride; @@ -1010,7 +1010,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI else { TRACE("Falling back to doublebuffered operation.\n"); - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 38e081b..1ca12bc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3194,7 +3194,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); element->data.buffer_object = 0; - element->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context); + element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride) FIXME("System memory vertex data load offset is negative!\n"); } @@ -3432,7 +3432,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (context->stream_info.all_vbo) wined3d_buffer_load(state->index_buffer, context, state); else - buffer_get_sysmem(state->index_buffer, context); + wined3d_buffer_load_sysmem(state->index_buffer, context); } for (i = 0; i < context->numDirtyEntries; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf6042..89b781c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3174,7 +3174,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, e = &stream_info.elements[i]; buffer = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context); + e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); if (buffer->buffer_object) { GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e5b30db..4833845 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -135,7 +135,7 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct element = &si->elements[element_idx]; ptr = element->data.addr + element->stride * i; if (element->data.buffer_object) - ptr += (ULONG_PTR)buffer_get_sysmem(state->streams[element->stream_idx].buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, context); ops->generic[element->format->emit_idx](element_idx, ptr); } @@ -201,7 +201,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const * supported or other reason), or with user pointer drawing idx_data * will be non-NULL. */ if (idx_size && !idx_data) - idx_data = buffer_get_sysmem(state->index_buffer, context); + idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context); ops = &d3d_info->ffp_attrib_ops; @@ -402,7 +402,7 @@ static void remove_vbos(struct wined3d_context *context, { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context)); + e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context)); } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d462ea5..9e36bcd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4081,7 +4081,7 @@ static void load_numbered_arrays(struct wined3d_context *context, * figure out the system memory address. */ const BYTE *ptr = element->data.addr; if (element->data.buffer_object) - ptr += (ULONG_PTR)buffer_get_sysmem(stream->buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); if (context->numbered_array_mask & (1u << i)) unload_numbered_array(context, i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e4b072..c3152a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,10 +3180,10 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer,

1 0

Józef Kucia : wined3d: Clean up buffer_internal_preload().
by Alexandre Julliard Oct. 20, 2016

Oct. 20, 2016

Module: wine Branch: master Commit: e3a8cd20ced9f33db64a35f60bc8487ae8173e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a8cd20ced9f33db64a35f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:45 2016 +0200 wined3d: Clean up buffer_internal_preload(). The conversion should never be performed for buffers with buffer_type_hint other than GL_ARRAY_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8943144..49bed64 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -422,7 +422,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s return ret; } -static inline void fixup_d3dcolor(DWORD *dst_color) +static inline unsigned int fixup_d3dcolor(DWORD *dst_color) { DWORD src_color = *dst_color; @@ -439,9 +439,11 @@ static inline void fixup_d3dcolor(DWORD *dst_color) *dst_color |= (src_color & 0xff00ff00u); /* Alpha Green */ *dst_color |= (src_color & 0x00ff0000u) >> 16; /* Red */ *dst_color |= (src_color & 0x000000ffu) << 16; /* Blue */ + + return sizeof(*dst_color); } -static inline void fixup_transformed_pos(float *p) +static inline unsigned int fixup_transformed_pos(float *p) { /* rhw conversion like in position_float4(). */ if (p[3] != 1.0f && p[3] != 0.0f) @@ -452,6 +454,8 @@ static inline void fixup_transformed_pos(float *p) p[2] *= w; p[3] = w; } + + return 4 * sizeof(*p); } /* Context activation is done by the caller. */ @@ -741,10 +745,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = buffer->resource.device; - UINT start, end, len, vertices; + unsigned int i, j, start, end, len, vertex_count; BOOL decl_changed = FALSE; - unsigned int i, j; BYTE *data; TRACE("buffer %p.\n", buffer); @@ -851,9 +853,6 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from @@ -871,17 +870,23 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { + /* This would potentially invalidate the element array buffer binding. */ + if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) + ERR("Converting data in non-vertex buffer.\n"); + + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) buffer_get_sysmem(buffer, context); - } /* Now for each vertex in the buffer that needs conversion */ - vertices = buffer->resource.size / buffer->stride; + vertex_count = buffer->resource.size / buffer->stride; - data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size); + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } - while(buffer->modified_areas) + while (buffer->modified_areas) { buffer->modified_areas--; start = buffer->maps[buffer->modified_areas].offset; @@ -889,27 +894,25 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte end = start + len; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertices); ++i) + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) { - for (j = 0; j < buffer->stride; ++j) + for (j = 0; j < buffer->stride;) { switch (buffer->conversion_map[j]) { case CONV_NONE: /* Done already */ - j += 3; + j += sizeof(DWORD); break; case CONV_D3DCOLOR: - fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - j += 3; + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); break; - case CONV_POSITIONT: - fixup_transformed_pos((float *) (data + i * buffer->stride + j)); - j += 15; + j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); break; default: - FIXME("Unimplemented conversion %d in shifted conversion\n", buffer->conversion_map[j]); + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; } } }

1 0