February 2019 - Wine-commits

Aric Stewart : hidclass.sys: Prevent buffer overrun.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 5040b8d534a4fa32a5b1e2653dd937553e94a61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5040b8d534a4fa32a5b1e265… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 6 10:23:07 2019 -0600 hidclass.sys: Prevent buffer overrun. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 6b84997..09f9401 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -838,8 +838,7 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData( if (features[0]->caps.ReportID != 0) { unsigned int *report_ids; - unsigned int cnt = max(i_count, o_count); - cnt = max(cnt, f_count); + unsigned int cnt = i_count + o_count + f_count; report_ids = HeapAlloc(GetProcessHeap(), 0 , sizeof(*report_ids) * cnt); if (i_count)

1 0

Jacek Caban : ntoskrnl.exe: Add PsRevertToSelf stub.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 7149ae1111cc90f7e847c4651582aee7d280e382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7149ae1111cc90f7e847c465… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 17:51:43 2019 +0100 ntoskrnl.exe: Add PsRevertToSelf stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c52736f..9d820bf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2685,6 +2685,15 @@ NTSTATUS WINAPI PsImpersonateClient(PETHREAD Thread, PACCESS_TOKEN Token, BOOLEA /*********************************************************************** + * PsRevertToSelf (NTOSKRNL.EXE.@) + */ +void WINAPI PsRevertToSelf(void) +{ + FIXME("\n"); +} + + +/*********************************************************************** * PsSetCreateProcessNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE callback, BOOLEAN remove ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0fe0da3..19cde8c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -925,7 +925,7 @@ @ stub PsReturnProcessNonPagedPoolQuota @ stub PsReturnProcessPagedPoolQuota @ stub PsRevertThreadToSelf -@ stub PsRevertToSelf +@ stdcall PsRevertToSelf() @ stub PsSetContextThread @ stdcall PsSetCreateProcessNotifyRoutine(ptr long) @ stdcall PsSetCreateProcessNotifyRoutineEx(ptr long) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index a1ed847..abe357f 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,5 +131,6 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +void WINAPI PsRevertToSelf(void); #endif

1 0

Michael Müller : ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 7529e74516d2ab272af60f2b4480ff07cb3670d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7529e74516d2ab272af60f2b… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 6 17:52:02 2019 +0100 ntoskrnl.exe: Implement ExInitializeNPagedLookasideList. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 35 ++++++++++++---- dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++ include/ddk/wdm.h | 89 ++++++++++++++++++++++++++++++++++++++-- include/winnt.h | 2 + 4 files changed, 144 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7529e74516d2ab272af6…

1 0

Jacek Caban : ntoskrnl.exe: Implement ExDeleteNPagedLookasideList.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 7bacd8530f92c38deb39404556ec175e6d0bfa8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bacd8530f92c38deb394045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 17:52:14 2019 +0100 ntoskrnl.exe: Implement ExDeleteNPagedLookasideList. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b0f9e62..c3276c9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2032,7 +2032,12 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, */ void WINAPI ExDeleteNPagedLookasideList( PNPAGED_LOOKASIDE_LIST lookaside ) { - FIXME("(%p) stub\n", lookaside); + void *entry; + + TRACE("(%p)\n", lookaside); + + while ((entry = RtlInterlockedPopEntrySList(&lookaside->L.u.ListHead))) + lookaside->L.u5.FreeEx(entry, (LOOKASIDE_LIST_EX*)lookaside); }

1 0

Sven Baars : ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc ( Valgrind).
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 651c446217ce41e3dfccec3d20c03986c1d2c708 URL: https://source.winehq.org/git/wine.git/?a=commit;h=651c446217ce41e3dfccec3d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Feb 6 19:44:06 2019 +0100 ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 640726d..542dc9a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -158,6 +158,7 @@ #include "wine/debug.h" #include "wine/exception.h" #include "wine/unicode.h" +#include "wine/heap.h" #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 @@ -6272,8 +6273,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) return NULL; adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); routes = HeapAlloc(GetProcessHeap(), 0, route_size); - route_addrs = HeapAlloc(GetProcessHeap(), 0, 0); /* HeapReAlloc doesn't work on NULL */ - if (adapters == NULL || routes == NULL || route_addrs == NULL) + if (adapters == NULL || routes == NULL) goto cleanup; /* Obtain the adapter list and the full routing table */ if (GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) @@ -6306,7 +6306,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = HeapReAlloc(GetProcessHeap(), 0, route_addrs, (numroutes+1)*sizeof(struct route)); + route_addrs = heap_realloc(route_addrs, (numroutes+1)*sizeof(struct route)); if (route_addrs == NULL) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex;

1 0

Alexandre Julliard : setupapi/tests: Avoid sizeof in traces.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: d70d6b8486fc880e8fd72f6d409464deb518a639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d70d6b8486fc880e8fd72f6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 20:26:25 2019 +0100 setupapi/tests: Avoid sizeof in traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 5eb0c6b..804d15b 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -568,7 +568,7 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); - ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(size == sizeof(valueW), "Got size %d\n", size); /* #7 Zero buffer size */ SetLastError(0xdeadbeef); @@ -579,7 +579,7 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); - ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(size == sizeof(valueW), "Got size %d\n", size); /* #8 Null required size */ SetLastError(0xdeadbeef); @@ -621,7 +621,7 @@ static void test_device_property(void) ok(ret, "Expect success\n"); ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); - ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(size == sizeof(valueW), "Got size %d\n", size); ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); /* #12 Get null property value */ @@ -649,7 +649,7 @@ static void test_device_property(void) ok(!ret, "Expect failure\n"); ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#x\n", ERROR_INSUFFICIENT_BUFFER, err); ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); - ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(size == sizeof(valueW), "Got size %d\n", size); /* #14 Normal */ ret = pSetupDiSetDevicePropertyW(set, &device_data, &DEVPKEY_Device_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)valueW, sizeof(valueW), 0); @@ -663,7 +663,7 @@ static void test_device_property(void) ok(ret, "Expect success\n"); ok(err == NO_ERROR, "Expect last error %#x, got %#x\n", NO_ERROR, err); ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#x\n", DEVPROP_TYPE_STRING, type); - ok(size == sizeof(valueW), "Expect size %d, got %d\n", sizeof(valueW), size); + ok(size == sizeof(valueW), "Got size %d\n", size); ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer)); ret = SetupDiRemoveDevice(set, &device_data);

1 0

Zebediah Figura : wined3d: Store transforms in the wined3d_stateblock_state structure.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: b041cecfa11bb309bb2843b1027aff0db1f42108 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b041cecfa11bb309bb2843b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 23:01:04 2019 -0600 wined3d: Store transforms in the wined3d_stateblock_state structure. 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/device.c | 2 +- dlls/wined3d/stateblock.c | 19 ++++++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59d0848..46de003 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1495,11 +1495,11 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); /* Handle recording of state blocks. */ + device->update_stateblock_state->transforms[d3dts] = *matrix; if (device->recording) { TRACE("Recording... not performing anything.\n"); device->recording->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); - device->update_state->transforms[d3dts] = *matrix; return; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4c43bec..01b6dca 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -787,7 +787,7 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) TRACE("Updating transform %#x.\n", transform); - stateblock->state.transforms[transform] = src_state->transforms[transform]; + stateblock->stateblock_state.transforms[transform] = state->transforms[transform]; } if (stateblock->changed.indices @@ -1110,8 +1110,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) /* Transform states. */ for (i = 0; i < stateblock->num_contained_transform_states; ++i) { - wined3d_device_set_transform(device, stateblock->contained_transform_states[i], - &stateblock->state.transforms[stateblock->contained_transform_states[i]]); + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + + state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; + wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); } if (stateblock->changed.indices) @@ -1424,12 +1426,23 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, static void stateblock_state_init_default(struct wined3d_stateblock_state *state, const struct wined3d_d3d_info *d3d_info) { + struct wined3d_matrix identity; unsigned int i; + get_identity_matrix(&identity); + + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; + for (i = 0; i < 256; ++i) + { + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; + } + init_default_render_states(state->rs, d3d_info); for (i = 0; i < MAX_TEXTURES; ++i) { + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; init_default_texture_state(i, state->texture_states[i]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e0bc4d8..a3c9ef8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2985,6 +2985,8 @@ struct wined3d_stateblock_state struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + + struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store clip planes in the wined3d_stateblock_state structure.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: e78bb5529e01747220440e0a21f2ef2a657dba87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78bb5529e01747220440e0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 23:01:05 2019 -0600 wined3d: Store clip planes in the wined3d_stateblock_state structure. 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/device.c | 12 ++++++++---- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 46de003..e912154 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1768,19 +1768,23 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + device->update_stateblock_state->clip_planes[plane_idx] = *plane; + if (device->recording) + { device->recording->changed.clipplane |= 1u << plane_idx; + return WINED3D_OK; + } - if (!memcmp(&device->update_state->clip_planes[plane_idx], plane, sizeof(*plane))) + if (!memcmp(&device->state.clip_planes[plane_idx], plane, sizeof(*plane))) { TRACE("Application is setting old values over, nothing to do.\n"); return WINED3D_OK; } - device->update_state->clip_planes[plane_idx] = *plane; + device->state.clip_planes[plane_idx] = *plane; - if (!device->recording) - wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); + wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 01b6dca..d330821 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -915,10 +915,10 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { if (!(map & 1)) continue; - if (memcmp(&stateblock->state.clip_planes[i], &src_state->clip_planes[i], sizeof(src_state->clip_planes[i]))) + if (memcmp(&stateblock->stateblock_state.clip_planes[i], &state->clip_planes[i], sizeof(state->clip_planes[i]))) { TRACE("Updating clipplane %u.\n", i); - stateblock->state.clip_planes[i] = src_state->clip_planes[i]; + stateblock->stateblock_state.clip_planes[i] = state->clip_planes[i]; } } @@ -1177,7 +1177,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { if (!(map & 1)) continue; - wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]); + state->clip_planes[i] = stateblock->stateblock_state.clip_planes[i]; + wined3d_device_set_clip_plane(device, i, &stateblock->stateblock_state.clip_planes[i]); } TRACE("Applied stateblock %p.\n", stateblock); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a3c9ef8..d9237e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2987,6 +2987,7 @@ struct wined3d_stateblock_state DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; + struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store the material in the wined3d_stateblock_state structure.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 88d017aa7df3b175ca30af607328a0acdab897e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d017aa7df3b175ca30af60… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 23:01:06 2019 -0600 wined3d: Store the material in the wined3d_stateblock_state structure. 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/device.c | 11 +++++++---- dlls/wined3d/stateblock.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e912154..d06ac9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1831,12 +1831,15 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru { TRACE("device %p, material %p.\n", device, material); - device->update_state->material = *material; - + device->update_stateblock_state->material = *material; if (device->recording) + { device->recording->changed.material = TRUE; - else - wined3d_cs_emit_set_material(device->cs, material); + return; + } + + device->state.material = *material; + wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d330821..cf4f7d1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -822,11 +822,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.material - && memcmp(&src_state->material, &stateblock->state.material, sizeof(stateblock->state.material))) + && memcmp(&state->material, &stateblock->stateblock_state.material, + sizeof(stateblock->stateblock_state.material))) { TRACE("Updating material.\n"); - stateblock->state.material = src_state->material; + stateblock->stateblock_state.material = state->material; } assert(src_state->viewport_count <= 1); @@ -1127,7 +1128,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_vertex_declaration(device, stateblock->state.vertex_declaration); if (stateblock->changed.material) - wined3d_device_set_material(device, &stateblock->state.material); + { + state->material = stateblock->stateblock_state.material; + wined3d_device_set_material(device, &stateblock->stateblock_state.material); + } if (stateblock->changed.viewport) wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9237e6..6091d21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2988,6 +2988,7 @@ struct wined3d_stateblock_state struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_material material; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store the viewport in the wined3d_stateblock_state structure.
by Alexandre Julliard 06 Feb '19

06 Feb '19

Module: wine Branch: master Commit: 032bac171b8b1113bc1dd8033e1745a1fff60938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=032bac171b8b1113bc1dd803… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 7 00:49:49 2019 +0330 wined3d: Store the viewport in the wined3d_stateblock_state structure. 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/device.c | 12 ++++++++---- dlls/wined3d/stateblock.c | 19 ++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d06ac9c..63398e5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,10 +1926,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned } if (viewport_count) - memcpy(device->update_state->viewports, viewports, viewport_count * sizeof(*viewports)); - else - memset(device->update_state->viewports, 0, sizeof(device->update_state->viewports)); - device->update_state->viewport_count = viewport_count; + device->update_stateblock_state->viewport = viewports[0]; /* Handle recording of state blocks */ if (device->recording) @@ -1939,6 +1936,12 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned return; } + if (viewport_count) + memcpy(device->state.viewports, viewports, viewport_count * sizeof(*viewports)); + else + memset(device->state.viewports, 0, sizeof(device->state.viewports)); + device->state.viewport_count = viewport_count; + wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } @@ -4523,6 +4526,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].max_z = 1.0f; state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + device->stateblock_state.viewport = state->viewports[0]; SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cf4f7d1..84f56c9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -830,19 +830,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->stateblock_state.material = state->material; } - assert(src_state->viewport_count <= 1); - if (stateblock->changed.viewport - && (src_state->viewport_count != stateblock->state.viewport_count - || memcmp(src_state->viewports, stateblock->state.viewports, - src_state->viewport_count * sizeof(*stateblock->state.viewports)))) + && memcmp(&state->viewport, &stateblock->stateblock_state.viewport, sizeof(state->viewport))) { - TRACE("Updating viewports.\n"); + TRACE("Updating viewport.\n"); - if ((stateblock->state.viewport_count = src_state->viewport_count)) - memcpy(stateblock->state.viewports, src_state->viewports, sizeof(src_state->viewports)); - else - memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); + stateblock->stateblock_state.viewport = state->viewport; } if (stateblock->changed.scissorRect @@ -1134,7 +1127,11 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } if (stateblock->changed.viewport) - wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); + { + state->viewport = stateblock->stateblock_state.viewport; + + wined3d_device_set_viewports(device, 1, &stateblock->stateblock_state.viewport); + } if (stateblock->changed.scissorRect) wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6091d21..9dd880c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2989,6 +2989,7 @@ struct wined3d_stateblock_state struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; + struct wined3d_viewport viewport; }; struct wined3d_device

1 0