February 2019 - Wine-Commits

Józef Kucia : d3d8/tests: Use correct index variable in test_resource_access() (Coverity).
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

Module: wine Branch: master Commit: 61a5b6c64c63e2b8fdcfb8a937669f67d37b272e URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a5b6c64c63e2b8fdcfb8a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 5 00:59:45 2019 +0100 d3d8/tests: Use correct index variable in test_resource_access() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ac04a6a..b57be7a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -102,6 +102,11 @@ static void flush_events(void) } } +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -8753,6 +8758,7 @@ static void test_resource_access(void) IDirect3DSurface8 *backbuffer, *depth_stencil; D3DFORMAT colour_format, depth_format, format; BOOL depth_2d, depth_cube, depth_plain; + D3DADAPTER_IDENTIFIER8 identifier; struct device_desc device_desc; D3DSURFACE_DESC surface_desc; IDirect3DDevice8 *device; @@ -8761,6 +8767,7 @@ static void test_resource_access(void) ULONG refcount; HWND window; HRESULT hr; + BOOL warp; enum surface_type { @@ -8845,6 +8852,9 @@ static void test_resource_access(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); device_desc.device_window = window; device_desc.width = 16; @@ -8951,7 +8961,9 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 16, 16, format, D3DMULTISAMPLE_NONE, &surface); todo_wine_if(tests[j].format == FORMAT_ATI2) - ok(hr == (tests[j].format != FORMAT_COLOUR ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (tests[j].format == FORMAT_DEPTH ? D3D_OK + : tests[j].format == FORMAT_COLOUR ? D3DERR_INVALIDCALL : E_INVALIDARG) + || (tests[j].format == FORMAT_ATI2 && hr == D3D_OK), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (FAILED(hr)) continue; @@ -9047,17 +9059,20 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + ok((hr == ((!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].format != FORMAT_ATI2) + || (tests[i].pool == D3DPOOL_SCRATCH && !tests[i].usage) + ? D3D_OK : D3DERR_INVALIDCALL)) + || (tests[i].format == FORMAT_ATI2 && (hr == D3D_OK || warp)), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; @@ -9075,9 +9090,11 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DVolume8_UnlockBox(volume); - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);

1 0

Michael Müller : ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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

Alexandre Julliard : setupapi/tests: Avoid sizeof in traces.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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 : winebus.sys: Translate SDL controller axes to unsigned 32-bit values.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

Module: wine Branch: master Commit: bd9e130ee5b569433f2c847c5b2b562f0ae35ac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9e130ee5b569433f2c847c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 5 13:09:38 2019 -0600 winebus.sys: Translate SDL controller axes to unsigned 32-bit values. INSIDE parses the HID report directly and assumes that the logical minimum value is 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5cf5ddd..5589113 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -137,10 +137,10 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de } static const BYTE REPORT_AXIS_TAIL[] = { - 0x16, 0x00, 0x80, /* LOGICAL_MINIMUM (-32768) */ - 0x26, 0xff, 0x7f, /* LOGICAL_MAXIMUM (32767) */ - 0x36, 0x00, 0x80, /* PHYSICAL_MINIMUM (-32768) */ - 0x46, 0xff, 0x7f, /* PHYSICAL_MAXIMUM (32767) */ + 0x17, 0x00, 0x00, 0x00, 0x00, /* LOGICAL_MINIMUM (0) */ + 0x27, 0xff, 0xff, 0x00, 0x00, /* LOGICAL_MAXIMUM (65535) */ + 0x37, 0x00, 0x00, 0x00, 0x00, /* PHYSICAL_MINIMUM (0) */ + 0x47, 0xff, 0xff, 0x00, 0x00, /* PHYSICAL_MAXIMUM (65535) */ 0x75, 0x10, /* REPORT_SIZE (16) */ 0x95, 0x00, /* REPORT_COUNT (?) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ @@ -170,10 +170,10 @@ static const BYTE CONTROLLER_AXIS [] = { 0x09, 0x31, /* USAGE (Y) */ 0x09, 0x33, /* USAGE (RX) */ 0x09, 0x34, /* USAGE (RY) */ - 0x16, 0x00, 0x80, /* LOGICAL_MINIMUM (-32768) */ - 0x26, 0xff, 0x7f, /* LOGICAL_MAXIMUM (32767) */ - 0x36, 0x00, 0x80, /* PHYSICAL_MINIMUM (-32768) */ - 0x46, 0xff, 0x7f, /* PHYSICAL_MAXIMUM (32767) */ + 0x17, 0x00, 0x00, 0x00, 0x00, /* LOGICAL_MINIMUM (0) */ + 0x27, 0xff, 0xff, 0x00, 0x00, /* LOGICAL_MAXIMUM (65535) */ + 0x37, 0x00, 0x00, 0x00, 0x00, /* PHYSICAL_MINIMUM (0) */ + 0x47, 0xff, 0xff, 0x00, 0x00, /* PHYSICAL_MAXIMUM (65535) */ 0x75, 0x10, /* REPORT_SIZE (16) */ 0x95, 0x04, /* REPORT_COUNT (4) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ @@ -245,7 +245,20 @@ static void set_axis_value(struct platform_private *ext, int index, short value) { int offset; offset = ext->axis_start + index * 2; - *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value); + + switch (index) + { + case SDL_CONTROLLER_AXIS_LEFTX: + case SDL_CONTROLLER_AXIS_LEFTY: + case SDL_CONTROLLER_AXIS_RIGHTX: + case SDL_CONTROLLER_AXIS_RIGHTY: + *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value) + 32768; + break; + case SDL_CONTROLLER_AXIS_TRIGGERLEFT: + case SDL_CONTROLLER_AXIS_TRIGGERRIGHT: + *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value); + break; + } } static void set_ball_value(struct platform_private *ext, int index, int value1, int value2)

1 0

Zebediah Figura : wined3d: Store clip planes in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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 transforms in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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

Jacek Caban : ntoskrnl.exe: Implement ExDeleteNPagedLookasideList.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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

Aric Stewart : hidclass.sys: Prevent buffer overrun.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

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 Feb. 6, 2019

Feb. 6, 2019

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

Zebediah Figura : hid: Don't sign-extend 16-bit values.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

Module: wine Branch: master Commit: b16fb11890b59a80816d6906e7b7b4ce52f88555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b16fb11890b59a80816d6906… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 5 13:09:39 2019 -0600 hid: Don't sign-extend 16-bit values. Some controllers (including, with the previous patch, any reported through SDL) may report a logical range of [0,65535], which takes up 16 bits but should not be sign-extended. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index f997803..15d827e 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -277,8 +277,6 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag element->valueStartBit, element->bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - if (element->caps.value.BitSize == 16) - rawValue = (short)rawValue; *UsageValue = rawValue; } @@ -925,8 +923,6 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U element->valueStartBit, element->bitCount, &v); if (rc != HIDP_STATUS_SUCCESS) return rc; - if (element->caps.value.BitSize == 16) - v = (short)v; DataList[uCount].DataIndex = element->caps.value.u.NotRange.DataIndex; DataList[uCount].u.RawValue = v; }

1 0