September 2016 - Wine-Commits

Alexandre Julliard : Release 1.9.18.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 7baaab5b53011c3a593e1ff32538c9ca706db212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baaab5b53011c3a593e1ff32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 3 01:39:28 2016 +0900 Release 1.9.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 824 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 406 insertions(+), 439 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7baaab5b53011c3a593e1…

1 0

Akihiro Sagawa : imm32/tests: Add more default IME window tests with message-only window.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 716e9c93e4a2a0574e0028d428eb087574d8d843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716e9c93e4a2a0574e0028d42… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 2 21:55:37 2016 +0900 imm32/tests: Add more default IME window tests with message-only window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bed42a0..8e45efb 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1024,6 +1024,41 @@ static DWORD WINAPI test_default_ime_disabled_cb(void *arg) return 1; } +static DWORD WINAPI test_default_ime_with_message_only_window_cb(void *arg) +{ + HWND hwnd1, hwnd2, default_ime_wnd; + + test_phase = PHASE_UNKNOWN; + hwnd1 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, HWND_MESSAGE, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(!IsWindow(default_ime_wnd), "Expected no IME windows, got %p\n", default_ime_wnd); + + hwnd2 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, hwnd1, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); + ok(IsWindow(default_ime_wnd), "Expected IME window existance\n"); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd1); + + hwnd1 = CreateWindowA(wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); + SetParent(hwnd1, HWND_MESSAGE); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); + DestroyWindow(hwnd1); + return 1; +} + static void test_default_ime_window_creation(void) { HANDLE thread; @@ -1064,6 +1099,10 @@ static void test_default_ime_window_creation(void) WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + thread = CreateThread(NULL, 0, test_default_ime_with_message_only_window_cb, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + test_phase = PHASE_UNKNOWN; }

1 0

Sebastian Lackner : ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: be74d3a5d52c713af061ea9030889345c887bcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be74d3a5d52c713af061ea903… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 23:52:27 2016 +0200 ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 0d03300..6dc5d61 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -911,42 +911,33 @@ NTSTATUS WINAPI NtUnloadKey(IN POBJECT_ATTRIBUTES attr) NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath) { static const WCHAR pathW[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\'}; - HANDLE token; + char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD len = sizeof(buffer); NTSTATUS status; - status = NtOpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token); - if (status == STATUS_NO_TOKEN) - status = NtOpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token); + status = NtQueryInformationToken(GetCurrentThreadEffectiveToken(), TokenUser, buffer, len, &len); if (status == STATUS_SUCCESS) { - char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; - DWORD len = sizeof(buffer); - - status = NtQueryInformationToken(token, TokenUser, buffer, len, &len); - if (status == STATUS_SUCCESS) + KeyPath->MaximumLength = 0; + status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); + if (status == STATUS_BUFFER_OVERFLOW) { - KeyPath->MaximumLength = 0; - status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); - if (status == STATUS_BUFFER_OVERFLOW) + PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, + sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); + if (buf) { - PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); - if (buf) - { - memcpy(buf, pathW, sizeof(pathW)); - KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); - KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); - status = RtlConvertSidToUnicodeString(KeyPath, - ((TOKEN_USER *)buffer)->User.Sid, FALSE); - KeyPath->Buffer = buf; - KeyPath->Length += sizeof(pathW); - KeyPath->MaximumLength += sizeof(pathW); - } - else - status = STATUS_NO_MEMORY; + memcpy(buf, pathW, sizeof(pathW)); + KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); + KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); + status = RtlConvertSidToUnicodeString(KeyPath, + ((TOKEN_USER *)buffer)->User.Sid, FALSE); + KeyPath->Buffer = buf; + KeyPath->Length += sizeof(pathW); + KeyPath->MaximumLength += sizeof(pathW); } + else + status = STATUS_NO_MEMORY; } - NtClose(token); } return status; }

1 0

Sebastian Lackner : wintrust/tests: Fix test for pfnAddSgnr2Chain.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: f9e5c96e5e9d8a25f7fc131a9bcb214c750f47c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e5c96e5e9d8a25f7fc131a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 15:53:52 2016 +0200 wintrust/tests: Fix test for pfnAddSgnr2Chain. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 436de47..624371d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -176,16 +176,15 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners); ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)), "Unexpected data in signer\n"); - /* This also adds, but the data aren't copied */ + /* This also adds, but the index is ignored */ sgnr.cbStruct = sizeof(DWORD); ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners); - ok(data.pasSigners[0].cbStruct == 0, "Unexpected data size %d\n", - data.pasSigners[0].cbStruct); - ok(data.pasSigners[0].sftVerifyAsOf.dwLowDateTime == 0, - "Unexpected verify time %d\n", - data.pasSigners[0].sftVerifyAsOf.dwLowDateTime); + sgnr.sftVerifyAsOf.dwLowDateTime = 0; + todo_wine + ok(!memcmp(&data.pasSigners[2], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); /* But too large a thing isn't added */ sgnr.cbStruct = sizeof(sgnr) + sizeof(DWORD); SetLastError(0xdeadbeef);

1 0

Andrew Eikum : quartz: Implement IClassFactory::LockServer.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: b0534c12c0a8b7a526aef04f23f67a33abd3a455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0534c12c0a8b7a526aef04f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 1 15:11:43 2016 -0500 quartz: Implement IClassFactory::LockServer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 32865f3..7c2accb 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,6 +29,8 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +static LONG server_locks = 0; + /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -142,6 +144,10 @@ static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); + if(dolock) + InterlockedIncrement(&server_locks); + else + InterlockedDecrement(&server_locks); return S_OK; } @@ -204,7 +210,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return QUARTZ_DllCanUnloadNow(); + if(server_locks == 0 && QUARTZ_DllCanUnloadNow() == S_OK) + return S_OK; + return S_FALSE; }

1 0

Bruno Jesus : xinput1_3/tests: Cope with XInputGetStateEx not being present by name.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: e3cda2c45d22f76d309675ffa33c525c4e13ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3cda2c45d22f76d309675ffa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 1 16:26:12 2016 -0300 xinput1_3/tests: Cope with XInputGetStateEx not being present by name. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 5261425..fadacae 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -238,10 +238,10 @@ START_TEST(xinput) pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); - if (pXInputGetStateEx_Ordinal) - ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n"); - else - ok (broken(1), "XInputGetStateEx not found in this dll version\n"); + /* XInputGetStateEx may not be present by name, use ordinal in this case */ + if (!pXInputGetStateEx) + pXInputGetStateEx = pXInputGetStateEx_Ordinal; + ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n"); test_set_state(); test_get_state();

1 0

Sebastian Lackner : ntoskrnl.exe: Use the same timeout for service startup like in other wine modules.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: b1c36e7583f790569234a16226da51fd81843ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c36e7583f790569234a1622… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:46:13 2016 +0200 ntoskrnl.exe: Use the same timeout for service startup like in other wine modules. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 507ffdd..b671e81 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2701,9 +2701,9 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS_PROCESS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; DWORD bytes; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2712,21 +2712,24 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) TRACE( "trying to start %s\n", debugstr_us(service_name) ); - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (StartServiceW( service_handle, 0, NULL )) break; if (GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) break; if (GetLastError() != ERROR_SERVICE_DATABASE_LOCKED) goto error; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } - if (i == 100) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatusEx( service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&service_status, sizeof(service_status), &bytes )) goto error; if (service_status.dwCurrentState != SERVICE_START_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_RUNNING) @@ -2756,8 +2759,8 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2767,11 +2770,13 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) if (!ControlService( service_handle, SERVICE_CONTROL_STOP, &service_status )) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatus( service_handle, &service_status )) goto error; if (service_status.dwCurrentState != SERVICE_STOP_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_STOPPED)

1 0

Sebastian Lackner : schedsvc: Avoid deadlock when scheduler service starts rpcss.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: bd31e320ddbeddd7d6948839fb5db786b0659b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd31e320ddbeddd7d6948839f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:44:24 2016 +0200 schedsvc: Avoid deadlock when scheduler service starts rpcss. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index b559311..45496c9 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -175,8 +175,6 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { TRACE("starting Task Scheduler Service\n"); - if (RPC_init() != RPC_S_OK) return; - schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { @@ -186,11 +184,15 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) done_event = CreateEventW(NULL, TRUE, FALSE, NULL); - schedsvc_update_status(SERVICE_RUNNING); + schedsvc_update_status(SERVICE_START_PENDING); - WaitForSingleObject(done_event, INFINITE); + if (RPC_init() == RPC_S_OK) + { + schedsvc_update_status(SERVICE_RUNNING); + WaitForSingleObject(done_event, INFINITE); + RPC_finish(); + } - RPC_finish(); schedsvc_update_status(SERVICE_STOPPED); TRACE("exiting Task Scheduler Service\n");

1 0

Henri Verbeet : wined3d: Send resource maps through the command stream.
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 9f85b5f867ed5ba6fe04be54774de1dc10ff2619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f85b5f867ed5ba6fe04be547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:46 2016 +0200 wined3d: Send resource maps through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 05487e4..d86213b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -57,6 +57,7 @@ enum wined3d_cs_op WINED3D_CS_OP_QUERY_ISSUE, WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, + WINED3D_CS_OP_MAP, }; struct wined3d_cs_present @@ -289,6 +290,17 @@ struct wined3d_cs_unload_resource struct wined3d_resource *resource; }; +struct wined3d_cs_map +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; + unsigned int sub_resource_idx; + struct wined3d_map_desc *map_desc; + const struct wined3d_box *box; + DWORD flags; + HRESULT *hr; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1301,6 +1313,35 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou cs->ops->submit(cs); } +static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_map *op = data; + struct wined3d_resource *resource = op->resource; + + *op->hr = resource->resource_ops->resource_sub_resource_map(resource, + op->sub_resource_idx, op->map_desc, op->box, op->flags); +} + +HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +{ + struct wined3d_cs_map *op; + HRESULT hr; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_MAP; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->map_desc = map_desc; + op->box = box; + op->flags = flags; + op->hr = &hr; + + cs->ops->submit(cs); + + return hr; +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1334,6 +1375,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, + /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 70474c6..2285c3c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -317,7 +317,7 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); - return resource->resource_ops->resource_sub_resource_map(resource, sub_resource_idx, map_desc, box, flags); + return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e329962..48f613f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3096,6 +3096,8 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; +HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

Henri Verbeet : d3d9: Use resource mapping functions in d3d9_device_DrawPrimitiveUP().
by Alexandre Julliard Sept. 2, 2016

Sept. 2, 2016

Module: wine Branch: master Commit: 5505e1ae762f9a26eab0b64d8519b85a57a6cf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5505e1ae762f9a26eab0b64d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:44 2016 +0200 d3d9: Use resource mapping functions in d3d9_device_DrawPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5d1d292..cb67fe6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2362,9 +2362,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2396,12 +2398,14 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, data, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, data, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0