wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Zhiyi Zhang : tasklist: Fix a possible buffer overrun (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 1a6deb1cc3a40757b14910f84d882c108d56909b URL: https://gitlab.winehq.org/wine/wine/-/commit/1a6deb1cc3a40757b14910f84d882c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:16:05 2023 +0800 tasklist: Fix a possible buffer overrun (Coverity). process_entry->szExeFile has length of MAX_PATH but info->image_name only has 32. --- programs/tasklist/tasklist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 4f866f6b727..6bbb9921d4f 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -176,7 +176,7 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru info->pid_value = process_entry->th32ProcessID; info->memory_usage_value = memory_counters.WorkingSetSize / 1024; info->session_id_value = session_id; - wcscpy(info->image_name, process_entry->szExeFile); + lstrcpynW(info->image_name, process_entry->szExeFile, ARRAY_SIZE(info->image_name)); swprintf(info->pid, ARRAY_SIZE(info->pid), L"%u", process_entry->th32ProcessID); wcscpy(info->session_name, session_id == 0 ? L"Services" : L"Console"); swprintf(info->session_number, ARRAY_SIZE(info->session_number), L"%u", session_id);

1 0

Zhiyi Zhang : mciwave: Use matching memory allocator (Coverity).
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: eeb1826c3f15f4d705789332790cd5be3f1b1b7a URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb1826c3f15f4d705789332790cd5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 22:42:52 2023 +0800 mciwave: Use matching memory allocator (Coverity). *pszTmpFileName will be freed with free() but it's allocated with HeapAlloc(). --- dlls/mciwave/mciwave.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index b17c347258f..f2af38b8762 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -432,9 +432,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) return MCIERR_FILE_NOT_FOUND; } - *pszTmpFileName = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - MAX_PATH * sizeof(WCHAR)); + *pszTmpFileName = calloc(1, MAX_PATH * sizeof(WCHAR)); if (!GetTempFileNameW(szTmpPath, szPrefix, 0, *pszTmpFileName)) { WARN("can't retrieve temp file name!\n"); free(*pszTmpFileName);

1 0

Zebediah Figura : d3d9: Upload mapped dynamic vertex and index buffers before every draw.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: c93440b700efa23069177db00909f12e95f90ecd URL: https://gitlab.winehq.org/wine/wine/-/commit/c93440b700efa23069177db00909f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 1 18:36:38 2023 -0600 d3d9: Upload mapped dynamic vertex and index buffers before every draw. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55591 --- dlls/d3d9/device.c | 14 ++++++++++++++ dlls/d3d9/tests/visual.c | 12 +++--------- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1eeefac6cc0..1267dc8fca1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3120,6 +3120,17 @@ static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device return S_OK; } +static void d3d9_device_flush_mapped_vertex_buffers(struct d3d9_device *device) +{ + for (unsigned int i = 0; i < WINED3D_MAX_STREAMS; ++i) + { + struct wined3d_buffer *buffer = device->stateblock_state->streams[i].buffer; + + if (buffer) + wined3d_device_context_flush_mapped_buffer(device->immediate_context, buffer); + } +} + static void d3d9_device_upload_managed_textures(struct d3d9_device *device) { const struct wined3d_stateblock_state *state = device->stateblock_state; @@ -3159,6 +3170,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_managed_textures(device); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); + d3d9_device_flush_mapped_vertex_buffers(device); d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); @@ -3200,11 +3212,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_managed_textures(device); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); + d3d9_device_flush_mapped_vertex_buffers(device); d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); + wined3d_device_context_flush_mapped_buffer(device->immediate_context, device->stateblock_state->index_buffer); wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, device->stateblock_state->streams[0].frequency); d3d9_rts_flag_auto_gen_mipmap(device); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1b990301cac..2d54920ddba 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26720,7 +26720,6 @@ static void test_draw_mapped_buffer(void) unsigned int color, i; IDirect3D9 *d3d; ULONG refcount; - BOOL test_pass; HWND window; HRESULT hr; void *data; @@ -26741,11 +26740,10 @@ static void test_draw_mapped_buffer(void) { D3DPOOL pool; DWORD usage; - BOOL ignore_wine_result; } tests[] = { - {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC}, {D3DPOOL_MANAGED, 0}, {D3DPOOL_SYSTEMMEM, 0}, }; @@ -26825,11 +26823,7 @@ static void test_draw_mapped_buffer(void) ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); color = getPixelColor(device, 160, 120); - - test_pass = color_match(color, 0x00ff0000, 1); - todo_wine_if(tests[i].ignore_wine_result && !test_pass) - ok(test_pass, "Got unexpected color 0x%08x, test %u.\n", color, i); - + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); color = getPixelColor(device, 480, 360); ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); @@ -27458,7 +27452,7 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); ok(hr == S_OK, "Failed to get render target, hr %#lx.\n", hr); - check_rt_color_todo(rt, 0x0000ff00); + check_rt_color(rt, 0x0000ff00); IDirect3DSurface9_Release(rt); IDirect3DVertexBuffer9_Release(buffer); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7c6e465844c..bf171326926 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3459,6 +3459,34 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) FreeLibraryAndExitThread(wined3d_module, 0); } +void CDECL wined3d_device_context_flush_mapped_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer) +{ + struct wined3d_client_resource *client = &buffer->resource.client; + + /* d3d9 applications can draw from a mapped dynamic buffer. + * Castlevania 2 depends on this behaviour. + * This means that we need to upload a pending discard bo, without actually + * unmapping it. */ + + assert(context == &context->device->cs->c); + + if (wined3d_bo_address_is_null(&client->mapped_upload.addr)) + return; + + if (client->mapped_upload.flags & UPLOAD_BO_UPLOAD_ON_UNMAP) + wined3d_device_context_upload_bo(context, &buffer->resource, 0, + &client->mapped_box, &client->mapped_upload, buffer->resource.size, buffer->resource.size); + + if (client->mapped_upload.flags & UPLOAD_BO_RENAME_ON_UNMAP) + { + client->mapped_upload.flags &= ~UPLOAD_BO_RENAME_ON_UNMAP; + /* This logic matches wined3d_cs_map_upload_bo(). */ + if (client->mapped_upload.addr.buffer_object->coherent && wined3d_map_persistent()) + client->mapped_upload.flags &= ~UPLOAD_BO_UPLOAD_ON_UNMAP; + } +} + struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, const enum wined3d_feature_level *levels, unsigned int level_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 72e0e3fd8fa..accb6f65658 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -103,6 +103,7 @@ @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) @ cdecl wined3d_device_context_execute_command_list(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) +@ cdecl wined3d_device_context_flush_mapped_buffer(ptr ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d7a3dd1e0fe..fcbe094e30b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2458,6 +2458,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_execute_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list, bool restore_state); void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); +void __cdecl wined3d_device_context_flush_mapped_buffer(struct wined3d_device_context *context, + struct wined3d_buffer *buffer); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); struct wined3d_blend_state * __cdecl wined3d_device_context_get_blend_state(

1 0

Zebediah Figura : d3d9/tests: Add another test for drawing from a mapped buffer.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 346f783ccccaa5bc128a316a134e8f34315937d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/346f783ccccaa5bc128a316a134e8f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 1 15:13:50 2023 -0600 d3d9/tests: Add another test for drawing from a mapped buffer. --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bb8381cde3d..1b990301cac 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27360,14 +27360,9 @@ static void test_dynamic_map_synchronization(void) } hr = IDirect3DDevice9_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), - D3DUSAGE_DYNAMIC, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(struct dynamic_vb_vertex)); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); @@ -27377,6 +27372,12 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + for (y = 0; y < 200; ++y) { hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); @@ -27414,6 +27415,52 @@ static void test_dynamic_map_synchronization(void) hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + IDirect3DVertexBuffer9_Release(buffer); + + /* Castlevania: Lords of Shadow 2 locks a vertex and index buffer and keeps + * both mapped for all of the draws in a frame. Test this by doing the same + * draws, but with the buffer mapped the whole time. */ + + hr = IDirect3DDevice9_CreateVertexBuffer(device, 200 * 4 * sizeof(struct dynamic_vb_vertex), + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_XYZ, D3DPOOL_DEFAULT, &buffer, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(struct dynamic_vb_vertex)); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + for (y = 0; y < 200; ++y) + { + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Failed to map buffer, hr %#lx.\n", hr); + + fill_dynamic_vb_quad(data, 0, y); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + for (x = 1; x < 200; ++x) + { + fill_dynamic_vb_quad((struct dynamic_vb_vertex *)data + 4 * x, x, y); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4 * x, 2); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + } + + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "Failed to map buffer, hr %#lx.\n", hr); + } + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#lx.\n", hr); + check_rt_color_todo(rt, 0x0000ff00); + IDirect3DSurface9_Release(rt); + IDirect3DVertexBuffer9_Release(buffer); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount);

1 0

Zebediah Figura : wined3d: Fix masking out the texcoord index in get_texture_matrix().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: e2c373d7f3faa3310b96918f7e468199ad521de6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2c373d7f3faa3310b96918f7e4681… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 12:00:01 2023 -0600 wined3d: Fix masking out the texcoord index in get_texture_matrix(). Fixes: 370b8299ab8d33664ffbb8bdbaafd04c8f566c23 --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b2b234c8e29..a46a4c7257d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5852,7 +5852,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine { BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; - unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], + unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0x0000ffff, WINED3D_MAX_FFP_TEXTURES - 1); struct wined3d_texture *texture = wined3d_state_get_ffp_texture(state, tex);

1 0

Zebediah Figura : wined3d: Retrieve the FFP projection control flag from the d3d info in get_texture_matrix().
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 084e6e21da62d38073618b0207d24cb67520181a URL: https://gitlab.winehq.org/wine/wine/-/commit/084e6e21da62d38073618b0207d24c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 22 16:10:15 2023 -0500 wined3d: Retrieve the FFP projection control flag from the d3d info in get_texture_matrix(). --- dlls/wined3d/arb_program_shader.c | 12 ------------ dlls/wined3d/glsl_shader.c | 12 ------------ dlls/wined3d/shader.c | 12 ------------ dlls/wined3d/shader_spirv.c | 12 ------------ dlls/wined3d/utils.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 1 insertion(+), 51 deletions(-)

1 0

Zebediah Figura : wined3d: Check WINED3D_TEXTURE_POW2_MAT_IDENT instead of context->lastWasPow2Texture.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 9a45a637d54e78dd1d60019f0f6296182091d521 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a45a637d54e78dd1d60019f0f6296… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 16 11:52:02 2023 -0600 wined3d: Check WINED3D_TEXTURE_POW2_MAT_IDENT instead of context->lastWasPow2Texture. As with the previous commit, this is clearer and avoids a state ordering assumption. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd83b2fcef7..ac53f477edd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5865,7 +5865,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine : WINED3DFMT_UNKNOWN, device->shader_backend->shader_has_ffp_proj_control(device->shader_priv), mat); - if ((context->lastWasPow2Texture & (1u << tex)) && texture) + if (texture && !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) { if (generated) FIXME("Non-power-of-two texture being used with generated texture coords.\n");

1 0

Zebediah Figura : wined3d: Use context->stream_info.position_transformed instead of context->last_was_rhw in state handlers.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 936b950112e0ca06ffc4600efcfa86e8526939ad URL: https://gitlab.winehq.org/wine/wine/-/commit/936b950112e0ca06ffc4600efcfa86… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 15 15:02:01 2023 -0600 wined3d: Use context->stream_info.position_transformed instead of context->last_was_rhw in state handlers. Use of last_was_rhw in these state handlers is, firstly, confusing to read. The variable is actually supposed to be set for *this* draw, not the last one, and state handlers indeed expect that, but that fact isn't obvious. Reading from context->stream_info instead is clearer. Secondly, since last_was_rhw is set by the STATE_VDECL handler, any other state depending on it (including some, though not all, of the sites changed here) thus has an implicit state handler ordering assumption. This is, needless to say, fragile. context->stream_info is computed before state handlers, so that dependency is a bit less fragile. --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/state.c | 12 ++++++------ dlls/wined3d/utils.c | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ae82383146..153786c25e7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6715,7 +6715,8 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 } else { - if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->last_was_rhw) + if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE + || context->stream_info.position_transformed) new_source = FOGSOURCE_COORD; else new_source = FOGSOURCE_FFP; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1dcef265b95..2fb75785daf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1230,7 +1230,7 @@ static void depth(struct wined3d_context *context, const struct wined3d_state *s } } - if (context->last_was_rhw && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) + if (context->stream_info.position_transformed && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } @@ -1303,7 +1303,7 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w /* Otherwise use per-vertex fog in any case */ gl_info->gl_ops.gl.p_glHint(GL_FOG_HINT, GL_FASTEST); - if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->last_was_rhw) + if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->stream_info.position_transformed) { /* No fog at all, or transformed vertices: Use fog coord */ if (!context->fog_coord) @@ -1436,7 +1436,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st { /* If processed vertices are used, fall through to the NONE case */ case WINED3D_FOG_EXP: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP)"); @@ -1446,7 +1446,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st /* drop through */ case WINED3D_FOG_EXP2: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2)"); @@ -1456,7 +1456,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st /* drop through */ case WINED3D_FOG_LINEAR: - if (!context->last_was_rhw) + if (!context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); @@ -3620,7 +3620,7 @@ static void transform_view(struct wined3d_context *context, const struct wined3d clipplane(context, state, STATE_CLIPPLANE(k)); } - if (context->last_was_rhw) + if (context->stream_info.position_transformed) { gl_info->gl_ops.gl.p_glLoadIdentity(); checkGLcall("glLoadIdentity()"); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e833bdc8d90..dd83b2fcef7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5644,7 +5644,7 @@ void get_identity_matrix(struct wined3d_matrix *mat) void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, unsigned int index, struct wined3d_matrix *mat) { - if (context->last_was_rhw) + if (context->stream_info.position_transformed) get_identity_matrix(mat); else multiply_matrix(mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(index)]); @@ -5687,7 +5687,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w else center_offset = 0.0f; - if (context->last_was_rhw) + if (context->stream_info.position_transformed) { /* Transform D3D RHW coordinates to OpenGL clip coordinates. */ float x = state->viewports[0].x; @@ -5859,7 +5859,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], - generated, context->last_was_rhw, + generated, context->stream_info.position_transformed, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)) ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->id : WINED3DFMT_UNKNOWN,

1 0

Zebediah Figura : wined3d: Remove an outdated comment.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 5d5adce343d2356a90a62692f4350d34d3ad3391 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d5adce343d2356a90a62692f4350d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:25:04 2023 -0600 wined3d: Remove an outdated comment. The comment was originally added in 4b831a5d3e15af9dccf7114bb4440133cb8fe721. At that point, it referred only to non-FFP shader constants. Subsequently 38934fe70d7ffd2353351a7986346f4a205adc1f moved bumpenv constant loading to the misc pipeline, apparently out of concerns that bumpenv constants might interact badly with shader constants. It's not clear whether those concerns were ever justified, and normal shader constants are now sufficiently untangled from each other anyway. However, bumpenv constants, like e.g. color keys, affect both FFP and non-FFP pipelines, so it makes the most sense for them to remain in the misc state table anyway. --- dlls/wined3d/state.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5333382ab81..1dcef265b95 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4379,10 +4379,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, state_nop }, ARB_CLIP_CONTROL }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin_w }, WINED3D_GL_EXT_NONE }, - - /* TODO: Move shader constant loading to vertex and fragment pipeline respectively, as soon as the pshader and - * vshader loadings are untied from each other - */ { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), shader_bumpenv }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT01), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT10), { STATE_TEXTURESTAGE(0, WINED3D_TSS_BUMPENV_MAT00), NULL }, WINED3D_GL_EXT_NONE },

1 0

Etaash Mathamsetty : cfgmgr32: Add CM_Register_Notification stub.
by Alexandre Julliard 04 Dec '23

04 Dec '23

Module: wine Branch: master Commit: 73a1c134ad0c28c9e447d8cfeff46f1271a89283 URL: https://gitlab.winehq.org/wine/wine/-/commit/73a1c134ad0c28c9e447d8cfeff46f… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Fri Nov 17 17:48:10 2023 -0500 cfgmgr32: Add CM_Register_Notification stub. --- dlls/cfgmgr32/cfgmgr32.spec | 1 + dlls/cfgmgr32/main.c | 11 +++++++ include/cfgmgr32.h | 75 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 5c9b8f613db..e4cd845e2a4 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -154,6 +154,7 @@ @ stub CM_Register_Device_InterfaceW @ stub CM_Register_Device_Interface_ExA @ stub CM_Register_Device_Interface_ExW +@ stdcall CM_Register_Notification(ptr ptr ptr ptr) @ stub CM_Remove_SubTree @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index fee3c42a5c4..f40068af0df 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -56,3 +56,14 @@ DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error ) return default_error; } + +/*********************************************************************** + * CM_Register_Notification (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *context, + PCM_NOTIFY_CALLBACK callback, HCMNOTIFICATION *notify_context ) +{ + FIXME("%p %p %p %p stub!\n", filter, context, callback, notify_context); + + return CR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 04f1f80b174..a0bb89a2a67 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -187,6 +187,7 @@ typedef DWORD CONFIGRET; typedef DWORD DEVINST, *PDEVINST; typedef DWORD DEVNODE, *PDEVNODE; typedef HANDLE HMACHINE, *PHMACHINE; +typedef HANDLE HCMNOTIFICATION, *PHCMNOTIFICATION; typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; @@ -208,6 +209,79 @@ typedef enum _PNP_VETO_TYPE PNP_VetoInsufficientRights } PNP_VETO_TYPE, *PPNP_VETO_TYPE; +typedef enum _CM_NOTIFY_FILTER_TYPE +{ + CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE, + CM_NOTIFY_FILTER_TYPE_DEVICEHANDLE, + CM_NOTIFY_FILTER_TYPE_DEVICEINSTANCE, + CM_NOTIFY_FILTER_TYPE_MAX +} CM_NOTIFY_FILTER_TYPE, *PCM_NOTIFY_FILTER_TYPE; + +typedef enum _CM_NOTIFY_ACTION +{ + CM_NOTIFY_ACTION_DEVICEINTERFACEARRIVAL, + CM_NOTIFY_ACTION_DEVICEINTERFACEREMOVAL, + CM_NOTIFY_ACTION_DEVICEQUERYREMOVE, + CM_NOTIFY_ACTION_DEVICEQUERYREMOVEFAILED, + CM_NOTIFY_ACTION_DEVICEREMOVEPENDING, + CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE, + CM_NOTIFY_ACTION_DEVICECUSTOMEVENT, + CM_NOTIFY_ACTION_DEVICEINSTANCEENUMERATED, + CM_NOTIFY_ACTION_DEVICEINSTANCESTARTED, + CM_NOTIFY_ACTION_DEVICEINSTANCEREMOVED, + CM_NOTIFY_ACTION_MAX +} CM_NOTIFY_ACTION, *PCM_NOTIFY_ACTION; + +typedef struct _CM_NOTIFY_FILTER +{ + DWORD cbSize; + DWORD Flags; + CM_NOTIFY_FILTER_TYPE FilterType; + DWORD Reserved; + union + { + struct + { + GUID ClassGuid; + } DeviceInterface; + struct + { + HANDLE hTarget; + } DeviceHandle; + struct + { + WCHAR InstanceId[MAX_DEVICE_ID_LEN]; + } DeviceInstance; + } u; +} CM_NOTIFY_FILTER, *PCM_NOTIFY_FILTER; + +typedef struct _CM_NOTIFY_EVENT_DATA +{ + CM_NOTIFY_FILTER_TYPE FilterType; + DWORD Reserved; + union + { + struct + { + GUID ClassGuid; + WCHAR SymbolicLink[ANYSIZE_ARRAY]; + } DeviceInterface; + struct + { + GUID EventGuid; + LONG NameOffset; + DWORD DataSize; + BYTE Data[ANYSIZE_ARRAY]; + } DeviceHandle; + struct + { + WCHAR InstanceId[ANYSIZE_ARRAY]; + } DeviceInstance; + } u; +} CM_NOTIFY_EVENT_DATA, *PCM_NOTIFY_EVENT_DATA; + +typedef DWORD (WINAPI *PCM_NOTIFY_CALLBACK)(HCMNOTIFICATION,void*,CM_NOTIFY_ACTION,CM_NOTIFY_EVENT_DATA*,DWORD); + DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -249,6 +323,7 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); CMAPI DWORD WINAPI CM_MapCrToWin32Err(CONFIGRET,DWORD); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Register_Notification(PCM_NOTIFY_FILTER,PVOID,PCM_NOTIFY_CALLBACK,PHCMNOTIFICATION); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags); #define CM_Request_Device_Eject WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex)

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2023