September 2019 - Wine-Commits

Alexandre Julliard : kernel32: Move NUMA-related functions to kernelbase.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: ea43b87c004e7ecea2945f141a91112de3f5bcbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea43b87c004e7ecea2945f14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 13:56:45 2019 +0200 kernel32: Move NUMA-related functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- .../api-ms-win-core-memory-l1-1-2.spec | 4 +- dlls/kernel32/heap.c | 37 ---- dlls/kernel32/kernel32.spec | 24 +-- dlls/kernel32/process.c | 89 --------- dlls/kernelbase/kernelbase.spec | 25 ++- dlls/kernelbase/memory.c | 209 ++++++++++++++++++--- 7 files changed, 213 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea43b87c004e7ecea294…

1 0

Alexandre Julliard : kernel32: Move delay-load functions to kernelbase.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 0f5538b9e349fe7b5924b8c0b84ca8a917962701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5538b9e349fe7b5924b8c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 10:33:54 2019 +0200 kernel32: Move delay-load functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/module.c | 17 ----------------- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/loader.c | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4196582739..24a33e7600 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -356,7 +356,7 @@ @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) -@ stdcall DelayLoadFailureHook(str str) +@ stdcall -import DelayLoadFailureHook(str str) @ stdcall DeleteAtom(long) # @ stub DeleteBoundaryDescriptor @ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 24fb9e33f5..ad6956d1ce 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1018,23 +1018,6 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return get_proc_address_wrapper( hModule, function ); } -/*********************************************************************** - * DelayLoadFailureHook (KERNEL32.@) - */ -FARPROC WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ) -{ - ULONG_PTR args[2]; - - if ((ULONG_PTR)function >> 16) - ERR( "failed to delay load %s.%s\n", name, function ); - else - ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); - args[0] = (ULONG_PTR)name; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); - return NULL; -} - typedef struct _PEB32 { BOOLEAN InheritedAddressSpace; diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ac2bfe55da..c4fd8511b3 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -244,7 +244,7 @@ # @ stub DecodeRemotePointer @ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW -@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook +@ stdcall DelayLoadFailureHook(str str) # @ stub DelayLoadFailureHookLookup @ stdcall DeleteAce(ptr long) # @ stub DeleteBoundaryDescriptor @@ -1344,7 +1344,7 @@ @ stdcall ResetEvent(long) # @ stub ResetState @ stdcall ResetWriteWatch(ptr long) -@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI +@ stdcall -import ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) LdrResolveDelayLoadedAPI # @ stub ResolveDelayLoadsFromDll @ stdcall ResolveLocaleName(wstr ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 34c8add910..9d0486d8a6 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -42,6 +42,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); ***********************************************************************/ +/*********************************************************************** + * DelayLoadFailureHook (kernelbase.@) + */ +FARPROC WINAPI DECLSPEC_HOTPATCH DelayLoadFailureHook( LPCSTR name, LPCSTR function ) +{ + ULONG_PTR args[2]; + + if ((ULONG_PTR)function >> 16) + ERR( "failed to delay load %s.%s\n", name, function ); + else + ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); + args[0] = (ULONG_PTR)name; + args[1] = (ULONG_PTR)function; + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); + return NULL; +} + + /**************************************************************************** * DisableThreadLibraryCalls (kernelbase.@) */

1 0

Zebediah Figura : d3d8: Track the primary stateblock state locally.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 3a61f3cf17286304dc98c8310da3cbda0adf2699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a61f3cf17286304dc98c831… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:41 2019 -0500 d3d8: Track the primary stateblock state locally. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 0d4d4faf89..f262d12fc7 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -132,7 +132,7 @@ struct d3d8_device * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; - struct wined3d_stateblock *recording; + struct wined3d_stateblock *recording, *state, *update_state; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 741218c951..aac6c9e2f6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -595,6 +595,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) if (device->recording) wined3d_stateblock_decref(device->recording); + wined3d_stateblock_decref(device->state); wined3d_swapchain_decref(device->implicit_swapchain); wined3d_device_release_focus_window(device->wined3d_device); @@ -914,6 +915,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (device->recording) wined3d_stateblock_decref(device->recording); device->recording = NULL; + device->update_state = device->state; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval @@ -1871,7 +1873,7 @@ static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) - device->recording = stateblock; + device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -1898,6 +1900,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * } stateblock = device->recording; device->recording = NULL; + device->update_state = device->state; *token = d3d8_allocate_handle(&device->handle_table, stateblock, D3D8_HANDLE_SB); wined3d_mutex_unlock(); @@ -3607,6 +3610,15 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_PRIMARY, &device->state))) + { + ERR("Failed to create primary stateblock, hr %#x.\n", hr); + wined3d_device_decref(device->wined3d_device); + wined3d_mutex_unlock(); + return hr; + } + device->update_state = device->state; + if (!parameters->Windowed) { if (!focus_window)

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetVertexShaderConstant().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 79cf8dfcfd156003c8d03c485ca27ebfef86ea73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79cf8dfcfd156003c8d03c48… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:44 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetVertexShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aac6c9e2f6..be43314d3c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2910,7 +2910,9 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac } wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); + hr = wined3d_stateblock_set_vs_consts_f(device->update_state, start_register, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : make_specfiles: Don't add forwards to the api-ms-* dlls.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: d8bb3030d8f7832fa6c8ed7ef83062b6d2a11252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8bb3030d8f7832fa6c8ed7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 19:39:08 2019 +0200 make_specfiles: Don't add forwards to the api-ms-* dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec | 2 +- dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec | 2 +- tools/make_specfiles | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec index b835f4e7c7..fe546fff4c 100644 --- a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec +++ b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap +@ stdcall GetProcessHeap() kernel32.GetProcessHeap @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc @ stdcall HeapCompact(long long) kernel32.HeapCompact diff --git a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec index fc4d357b39..88bb720301 100644 --- a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec +++ b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap +@ stdcall GetProcessHeap() kernel32.GetProcessHeap @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc @ stdcall HeapCompact(long long) kernel32.HeapCompact diff --git a/tools/make_specfiles b/tools/make_specfiles index 5c30ce5003..7fef3a6821 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -575,7 +575,7 @@ sub update_spec_file($) my $func = $descr{name}; if (!defined $funcs{$func}) { - $funcs{$func} = \%descr unless $commented_out; + $funcs{$func} = \%descr unless $commented_out || $name =~ /-/; goto done; }

1 0

Nikolay Sivov : wined3d: Fail SRV creation for resources without corresponding bind flag.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 76d3f0431af819d322dfe93dd3809eed6523dc6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76d3f0431af819d322dfe93d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 26 10:02:35 2019 +0300 wined3d: Fail SRV creation for resources without corresponding bind flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 3 --- dlls/d3d10core/tests/d3d10core.c | 3 --- dlls/d3d11/tests/d3d11.c | 3 --- dlls/wined3d/view.c | 2 ++ 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 9c468c13a2..51da614d9d 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -410,10 +410,7 @@ static void test_create_shader_resource_view(void) ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index cc6b39ccd1..d291c881e3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3582,10 +3582,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 97ab9b4487..d58319df58 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4260,10 +4260,7 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, 0, 1024, NULL); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); -todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f7bb18934f..f1c99a3b6a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -767,6 +767,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; + if (!(resource->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) + return E_INVALIDARG; if (!(view->format = validate_resource_view(desc, resource, FALSE, FALSE))) return E_INVALIDARG; view->desc = *desc;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vs_consts_f().
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: c1eafc9931d0d8944e09f6b08cb6da905d05d0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1eafc9931d0d8944e09f6b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:42 2019 -0500 wined3d: Introduce wined3d_stateblock_set_vs_consts_f(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1a20e86d3f..97ef422f5a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1274,6 +1274,20 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } +HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) +{ + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_VS_CONSTS_F || count > WINED3D_MAX_VS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; + + memcpy(&stateblock->stateblock_state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); + memset(&stateblock->changed.vs_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.vs_consts_f)); + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 947bff7cb0..a0d9864018 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dcf622ea4f..4543b882ac 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);

1 0

Zebediah Figura : d3d9: Track the primary stateblock state locally.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 40dad5a0ec34aad8dab759200c96a95d200bcd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40dad5a0ec34aad8dab75920… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 25 23:05:40 2019 -0500 d3d9: Track the primary stateblock state locally. In preparation for moving the primary stateblock to the client D3D device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 14 +++++++++++++- dlls/wined3d/stateblock.c | 5 +++-- include/wine/wined3d.h | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7c3d77c8a2..03e2aa7f8a 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -116,7 +116,7 @@ struct d3d9_device UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; - struct wined3d_stateblock *recording; + struct wined3d_stateblock *recording, *state, *update_state; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 953bf4c541..3e3d5c7050 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -605,6 +605,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH d3d9_device_Release(IDirect3DDevice9Ex *if if (device->recording) wined3d_stateblock_decref(device->recording); + wined3d_stateblock_decref(device->state); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); @@ -999,6 +1000,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (device->recording) wined3d_stateblock_decref(device->recording); device->recording = NULL; + device->update_state = device->state; device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -2360,7 +2362,7 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) - device->recording = stateblock; + device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -2385,6 +2387,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire } wined3d_stateblock = device->recording; device->recording = NULL; + device->update_state = device->state; wined3d_mutex_unlock(); if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -4497,6 +4500,15 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) count = caps.NumberOfAdaptersInGroup; + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_PRIMARY, &device->state))) + { + ERR("Failed to create the primary stateblock, hr %#x.\n", hr); + wined3d_device_decref(device->wined3d_device); + wined3d_mutex_unlock(); + return hr; + } + device->update_state = device->state; + if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 80e58114c1..1a20e86d3f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1573,11 +1573,12 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); + wined3d_stateblock_state_init(&stateblock->stateblock_state, device, + type == WINED3D_SBT_PRIMARY ? WINED3D_STATE_INIT_DEFAULT : 0); stateblock->changed.store_stream_offset = 1; - if (type == WINED3D_SBT_RECORDED) + if (type == WINED3D_SBT_RECORDED || type == WINED3D_SBT_PRIMARY) return WINED3D_OK; TRACE("Updating changed flags appropriate for type %#x.\n", type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee28ab1bb9..dcf622ea4f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -774,6 +774,7 @@ enum wined3d_stateblock_type WINED3D_SBT_PIXEL_STATE = 2, WINED3D_SBT_VERTEX_STATE = 3, WINED3D_SBT_RECORDED = 4, /* WineD3D private */ + WINED3D_SBT_PRIMARY = 5, /* WineD3D private */ }; enum wined3d_decl_method

1 0

Alex Henrie : ntdll/tests: Add tests for NtPowerInformation(SystemBatteryState).
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 34e15e5a1d8d7101423a35d27aa1de68e5570aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34e15e5a1d8d7101423a35d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 25 00:45:56 2019 -0600 ntdll/tests: Add tests for NtPowerInformation(SystemBatteryState). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 25c379929b..93920714f2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -888,6 +888,48 @@ static void test_query_firmware(void) HeapFree(GetProcessHeap(), 0, sfti); } +static void test_query_battery(void) +{ + SYSTEM_BATTERY_STATE bs; + NTSTATUS status; + DWORD time_left; + + memset(&bs, 0x23, sizeof(bs)); + status = NtPowerInformation(SystemBatteryState, NULL, 0, &bs, sizeof(bs)); + if (status == STATUS_NOT_IMPLEMENTED) + { + skip("SystemBatteryState not implemented\n"); + return; + } + ok(status == STATUS_SUCCESS, "expected success\n"); + + trace("Battery state:\n"); + trace("AcOnLine : %u\n", bs.AcOnLine); + trace("BatteryPresent : %u\n", bs.BatteryPresent); + trace("Charging : %u\n", bs.Charging); + trace("Discharging : %u\n", bs.Discharging); + trace("Tag : %u\n", bs.Tag); + trace("MaxCapacity : %u\n", bs.MaxCapacity); + trace("RemainingCapacity : %u\n", bs.RemainingCapacity); + trace("Rate : %d\n", (LONG)bs.Rate); + trace("EstimatedTime : %u\n", bs.EstimatedTime); + trace("DefaultAlert1 : %u\n", bs.DefaultAlert1); + trace("DefaultAlert2 : %u\n", bs.DefaultAlert2); + + ok(bs.MaxCapacity >= bs.RemainingCapacity, + "expected MaxCapacity %u to be greater than or equal to RemainingCapacity %u\n", + bs.MaxCapacity, bs.RemainingCapacity); + + if (!bs.BatteryPresent) + time_left = 0; + else if (!bs.Charging && (LONG)bs.Rate < 0) + time_left = 3600 * bs.RemainingCapacity / -(LONG)bs.Rate; + else + time_left = ~0u; + ok(bs.EstimatedTime == time_left, + "expected %u minutes remaining got %u minutes\n", time_left, bs.EstimatedTime); +} + static void test_query_processor_power_info(void) { NTSTATUS status; @@ -2374,6 +2416,10 @@ START_TEST(info) /* NtPowerInformation */ + /* 0x5 SystemBatteryState */ + trace("Starting test_query_battery()\n"); + test_query_battery(); + /* 0xb ProcessorInformation */ trace("Starting test_query_processor_power_info()\n"); test_query_processor_power_info();

1 0

Alexandre Julliard : kernel32: Move file time functions to kernelbase.
by Alexandre Julliard Sept. 26, 2019

Sept. 26, 2019

Module: wine Branch: master Commit: 2c68c530afbe704698f5a38674e7c72806c7c07a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c68c530afbe704698f5a386… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 26 11:39:53 2019 +0200 kernel32: Move file time functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 24 ++-- dlls/kernel32/time.c | 253 ---------------------------------------- dlls/kernelbase/file.c | 150 ++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 24 ++-- 4 files changed, 174 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c68c530afbe704698f5…

1 0