November 2023 - Wine-commits

Zhiyi Zhang : oledb32: Fix property count in datainit_GetInitializationString().
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 9c05824fd318dd678d34e791650d59b9317395a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c05824fd318dd678d34e791650d59… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 17 15:26:47 2023 +0800 oledb32: Fix property count in datainit_GetInitializationString(). count was assigned to the property set count, not the count of properties in each property set. Fix a Power Pivot for Excel 2010 connection error when opening a Power Pivot window. --- dlls/oledb32/datainit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 0d321932991..95ff7013e92 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -853,7 +853,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I DBPROPINFOSET *propinfoset; IDBProperties *props; DBPROPIDSET propidset; - ULONG count, infocount; + ULONG propset_count, infocount; WCHAR *progid, *desc; DBPROPSET *propset; IPersist *persist; @@ -889,8 +889,8 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I propidset.cPropertyIDs = 0; propidset.guidPropertySet = DBPROPSET_DBINIT; propset = NULL; - count = 0; - hr = IDBProperties_GetProperties(props, 1, &propidset, &count, &propset); + propset_count = 0; + hr = IDBProperties_GetProperties(props, 1, &propidset, &propset_count, &propset); if (FAILED(hr)) { WARN("failed to get data source properties, 0x%08lx\n", hr); @@ -904,7 +904,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I /* check if we need to skip password */ len = lstrlenW(progid) + lstrlenW(providerW) + 1; /* including '\0' */ - for (i = 0; i < count; i++) + for (i = 0; i < propset->cProperties; i++) { WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) @@ -928,7 +928,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I lstrcatW(*init_string, progid); CoTaskMemFree(progid); - for (i = 0; i < count; i++) + for (i = 0; i < propset->cProperties; i++) { WCHAR *descr; @@ -944,7 +944,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I } } - free_dbpropset(count, propset); + free_dbpropset(propset_count, propset); free_dbpropinfoset(infocount, propinfoset); CoTaskMemFree(desc);

1 0

Zhiyi Zhang : oledb32: Quote values containing semicolons.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 19957240e18de7c21b2a13483e04384edc17b6fe URL: https://gitlab.winehq.org/wine/wine/-/commit/19957240e18de7c21b2a13483e0438… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 17 16:18:07 2023 +0800 oledb32: Quote values containing semicolons. --- dlls/oledb32/datainit.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 95ff7013e92..801317f82a5 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -780,18 +780,30 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o /* returns character length of string representation */ static int get_propvalue_length(DBPROP *prop) { + VARIANT *v = &prop->vValue; VARIANT str; HRESULT hr; + int length; - if (V_VT(&prop->vValue) == VT_BSTR) return SysStringLen(V_BSTR(&prop->vValue)); + if (V_VT(v) == VT_BSTR) + { + length = SysStringLen(V_BSTR(v)); + /* Quotes values with '\"' if the value contains semicolons */ + if (wcsstr(V_BSTR(v), L";")) + length += 2; + return length; + } VariantInit(&str); - hr = VariantChangeType(&str, &prop->vValue, 0, VT_BSTR); + hr = VariantChangeType(&str, v, 0, VT_BSTR); if (hr == S_OK) { - int len = SysStringLen(V_BSTR(&str)); + length = SysStringLen(V_BSTR(&str)); + /* Quotes values with '\"' if the value contains semicolons */ + if (wcsstr(V_BSTR(&str), L";")) + length += 2; VariantClear(&str); - return len; + return length; } return 0; @@ -805,7 +817,16 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) if (V_VT(v) == VT_BSTR) { - lstrcatW(str, V_BSTR(v)); + if (wcsstr(V_BSTR(v), L";")) + { + lstrcatW(str, L"\""); + lstrcatW(str, V_BSTR(v)); + lstrcatW(str, L"\""); + } + else + { + lstrcatW(str, V_BSTR(v)); + } return; } @@ -813,7 +834,16 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) hr = VariantChangeType(&vstr, v, VARIANT_ALPHABOOL, VT_BSTR); if (hr == S_OK) { - lstrcatW(str, V_BSTR(&vstr)); + if (wcsstr(V_BSTR(&vstr), L";")) + { + lstrcatW(str, L"\""); + lstrcatW(str, V_BSTR(&vstr)); + lstrcatW(str, L"\""); + } + else + { + lstrcatW(str, V_BSTR(&vstr)); + } VariantClear(&vstr); } }

1 0

Zhiyi Zhang : oledb32: Remove unnecessary properties in datainit_GetInitializationString().
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: ef34d8139cbd3e11e8a0b773dcdf2604756f8233 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef34d8139cbd3e11e8a0b773dcdf26… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 20 15:36:22 2023 +0800 oledb32: Remove unnecessary properties in datainit_GetInitializationString(). The following properties are removed: 1. Duplicate properties. 2. Properties without value. 3. Properties that should be ignored according to MSDN. 4. DBPROP_AUTH_PASSWORD when include_pass is FALSE. --- dlls/oledb32/datainit.c | 51 ++++++++++++++++++++++++++++++++++++++----- dlls/oledb32/tests/database.c | 5 ++--- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 801317f82a5..b185ff4a128 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -875,6 +875,36 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) CoTaskMemFree(propinfoset); } +/* Whether a property should be skipped in datainit_GetInitializationString() */ +static BOOL skip_property(const DBPROPSET *propset, unsigned int prop_index, boolean include_pass) +{ + DWORD prop_id = propset->rgProperties[prop_index].dwPropertyID; + unsigned int i; + + /* Skip password if include_pass is FALSE */ + if (!include_pass && prop_id == DBPROP_AUTH_PASSWORD) + return TRUE; + + /* Skip these properties according to the function spec */ + if (prop_id == DBPROP_INIT_ASYNCH + || prop_id == DBPROP_INIT_HWND + || prop_id == DBPROP_INIT_PROMPT + || prop_id == DBPROP_INIT_TIMEOUT + || prop_id == DBPROP_INIT_GENERALTIMEOUT + || prop_id == DBPROP_INIT_OLEDBSERVICES + || prop_id == DBPROP_INIT_LCID) /* DBPROP_INIT_LCID should also be ignored according to tests */ + return TRUE; + + /* Skip duplicate properties */ + for (i = prop_index + 1; i < propset->cProperties; i++) + { + if (propset->rgProperties[i].dwPropertyID == prop_id) + return TRUE; + } + + return FALSE; +} + static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource, boolean include_pass, LPWSTR *init_string) { @@ -884,12 +914,12 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IDBProperties *props; DBPROPIDSET propidset; ULONG propset_count, infocount; + ULONG i, len, propvalue_length; WCHAR *progid, *desc; DBPROPSET *propset; IPersist *persist; HRESULT hr; CLSID clsid; - ULONG i, len; TRACE("(%p)->(%p %d %p)\n", This, datasource, include_pass, init_string); @@ -936,12 +966,17 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I len = lstrlenW(progid) + lstrlenW(providerW) + 1; /* including '\0' */ for (i = 0; i < propset->cProperties; i++) { - WCHAR *descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); + WCHAR *descr; + + if (skip_property(propset, i, TRUE)) + continue; + + descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { - /* include '=' and ';' */ - len += lstrlenW(descr) + 2; - len += get_propvalue_length(&propset->rgProperties[i]); + propvalue_length = get_propvalue_length(&propset->rgProperties[i]); + if (propvalue_length) + len += lstrlenW(descr) + propvalue_length + 2; /* include ';' and '=' */ } if ((propset->rgProperties[i].dwPropertyID == DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO) && @@ -962,11 +997,15 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I { WCHAR *descr; - if (!include_pass && propset->rgProperties[i].dwPropertyID == DBPROP_AUTH_PASSWORD) continue; + if (skip_property(propset, i, include_pass)) + continue; descr = get_propinfo_descr(&propset->rgProperties[i], propinfoset); if (descr) { + if (!get_propvalue_length(&propset->rgProperties[i])) + continue; + lstrcatW(*init_string, L";"); lstrcatW(*init_string, descr); lstrcatW(*init_string, L"="); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index bd940634847..6296ecfe1ef 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -542,7 +542,6 @@ static void _expect_initstring(int line, IDataInitialize *datainit, const WCHAR ok_(__FILE__, line)(hr == S_OK, "got %08lx\n", hr); hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &result); ok_(__FILE__, line)(hr == S_OK, "got %08lx\n", hr); - todo_wine ok_(__FILE__, line)(!lstrcmpW(expected, result), "expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(result)); CoTaskMemFree(result); @@ -596,8 +595,8 @@ static void test_initializationstring(void) if(hr == S_OK) { trace("Init String: %s\n", wine_dbgstr_w(initstring)); - todo_wine ok(!lstrcmpW(initstring_msdasql, initstring) || - !lstrcmpW(initstring_sqloledb, initstring), "got %s\n", wine_dbgstr_w(initstring)); + ok(!lstrcmpW(initstring_msdasql, initstring) || + !lstrcmpW(initstring_sqloledb, initstring), "got %s\n", wine_dbgstr_w(initstring)); CoTaskMemFree(initstring); }

1 0

Alex Henrie : d3d8: Allocate what Validate(Vertex|Pixel)Shader return with HeapAlloc.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: bdc6132658f321a126b860f1f9329029b7c581db URL: https://gitlab.winehq.org/wine/wine/-/commit/bdc6132658f321a126b860f1f93290… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 16 00:29:49 2023 -0700 d3d8: Allocate what Validate(Vertex|Pixel)Shader return with HeapAlloc. Fixes: a70e3059c66a375d6757af4ec60a4b2e11896be5 Fixes: 6db89702a3f7e7563c96f4ea3836b9cb261a8685 --- dlls/d3d8/d3d8_main.c | 4 ++-- dlls/d3d8/tests/device.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 45234c01add..12905ffbce4 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -95,7 +95,7 @@ done: if (!return_error) message = ""; message_size = strlen(message) + 1; - if (errors && (*errors = malloc(message_size))) + if (errors && (*errors = HeapAlloc(GetProcessHeap(), 0, message_size))) memcpy(*errors, message, message_size); return hr; @@ -140,7 +140,7 @@ done: if (!return_error) message = ""; message_size = strlen(message) + 1; - if (errors && (*errors = malloc(message_size))) + if (errors && (*errors = HeapAlloc(GetProcessHeap(), 0, message_size))) memcpy(*errors, message, message_size); return hr; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3f6174b98db..fd06e1bf79d 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5051,11 +5051,11 @@ static void test_validate_vs(void) hr = ValidateVertexShader(NULL, NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string \"%s\".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(NULL, NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -5064,7 +5064,7 @@ static void test_validate_vs(void) hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string \"%s\".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(vs_code, declaration_valid1, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -5101,11 +5101,11 @@ static void test_validate_vs(void) hr = ValidateVertexShader(vs_code, NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string \"%s\".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidateVertexShader(vs_code, NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); } static void test_validate_ps(void) @@ -5149,7 +5149,7 @@ static void test_validate_ps(void) hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string \"%s\".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); memset(&caps, 0, sizeof(caps)); caps.PixelShaderVersion = D3DPS_VERSION(1, 1); @@ -5179,11 +5179,11 @@ static void test_validate_ps(void) hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!*errors, "Got unexpected string \"%s\".\n", errors); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(!!*errors, "Got unexpected empty string.\n"); - free(errors); + HeapFree(GetProcessHeap(), 0, errors); } static void test_volume_get_container(void)

1 0

Zebediah Figura : wined3d: Revert uses of wined3d_state_get_ffp_texture() for non-FFP textures.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 02b3a8cb7b7bcb3b1d375c66aa65a7a7b1e7cc99 URL: https://gitlab.winehq.org/wine/wine/-/commit/02b3a8cb7b7bcb3b1d375c66aa65a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 21 12:51:41 2023 -0600 wined3d: Revert uses of wined3d_state_get_ffp_texture() for non-FFP textures. This fixes a crash when loading a world in Spore. Fixes: 831a41ee34b6ed5974db7a0864e7aeac34c936a9 --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4941fd40057..6169d0d0c02 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -490,7 +490,7 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info while (active) { i = wined3d_bit_scan(&active); - if (!(tex = wined3d_state_get_ffp_texture(state, i))) + if (!(tex = state->textures[i])) { ERR("Nonexistent texture is flagged for NP2 texcoord fixup.\n"); continue; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba84131b9d8..ed6f2bb8e83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1299,7 +1299,7 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps for (i = 0; fixup; fixup >>= 1, ++i) { - const struct wined3d_texture *tex = wined3d_state_get_ffp_texture(state, i); + const struct wined3d_texture *tex = state->textures[i]; unsigned char idx = ps->np2_fixup_info->idx[i]; if (!tex) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ee58559a96c..b58546db875 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2858,7 +2858,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 /* Treat unbound textures as 2D. The dummy texture will provide * the proper sample value. The tex_types bitmap defaults to * 2D because of the memset. */ - if (!(texture = wined3d_state_get_ffp_texture(state, i))) + if (!(texture = state->textures[i])) continue; switch (wined3d_texture_gl(texture)->target) @@ -2900,7 +2900,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 break; } - if ((texture = wined3d_state_get_ffp_texture(state, i))) + if ((texture = state->textures[i])) { /* Star Wars: The Old Republic uses mismatched samplers for rendering water. */ if (texture->resource.type == WINED3D_RTYPE_TEXTURE_2D @@ -2930,7 +2930,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (!shader->reg_maps.resource_info[i].type) continue; - if (!(texture = wined3d_state_get_ffp_texture(state, i))) + if (!(texture = state->textures[i])) { args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue;

1 0

Zebediah Figura : ddraw/tests: Add a test for drawing to a flippable surface.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 192c488a565adbb8c36739ee1a6836cadbd943b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/192c488a565adbb8c36739ee1a6836… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 22 16:56:00 2023 -0600 ddraw/tests: Add a test for drawing to a flippable surface. --- dlls/ddraw/tests/ddraw7.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ab43c1bbb2d..dc9568a1143 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -641,6 +641,29 @@ static bool init_3d_test_context_guid(struct ddraw_test_context *context, const return true; } +static bool init_3d_test_context(struct ddraw_test_context *context) +{ + HRESULT hr; + + memset(context, 0, sizeof(*context)); + + context->window = create_window(); + if (!(context->device = create_device(context->window, DDSCL_NORMAL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(context->window); + return false; + } + + hr = IDirect3DDevice7_GetDirect3D(context->device, &context->d3d); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3D7_QueryInterface(context->d3d, &IID_IDirectDraw7, (void **)&context->ddraw); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(context->device, &context->backbuffer); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + return true; +} + #define release_test_context(a) release_test_context_(__LINE__, a) static void release_test_context_(unsigned int line, struct ddraw_test_context *context) { @@ -665,6 +688,36 @@ static void clear_surface(IDirectDrawSurface7 *surface, unsigned int colour) ok(hr == S_OK, "Got hr %#lx.\n", hr); } +static void draw_color_quad(struct ddraw_test_context *context, unsigned int colour) +{ + IDirect3DDevice7 *device = context->device; + HRESULT hr; + + struct + { + struct vec3 position; + unsigned int colour; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, colour}, + {{-1.0f, 1.0f, 0.0f}, colour}, + {{ 1.0f, -1.0f, 0.0f}, colour}, + {{ 1.0f, 1.0f, 0.0f}, colour}, + }; + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + struct message { UINT message; @@ -19889,6 +19942,55 @@ static void test_user_memory(const GUID *device_guid) release_test_context(&context); } +/* Test that we handle flipping correctly when drawing to a flippable surface. */ +static void test_flip_3d(void) +{ + struct ddraw_test_context context; + IDirectDrawSurface7 *buffers[4]; + DDSURFACEDESC2 desc; + unsigned int color; + HRESULT hr; + + if (!init_3d_test_context(&context)) + return; + + reset_ddsd(&desc); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX; + desc.dwBackBufferCount = ARRAY_SIZE(buffers) - 1; + desc.dwWidth = 16; + desc.dwHeight = 16; + hr = IDirectDraw7_CreateSurface(context.ddraw, &desc, &buffers[0], NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (unsigned int i = 0; i < ARRAY_SIZE(buffers) - 1; ++i) + { + DDSCAPS2 backbuffer_caps = {DDSCAPS_FLIP}; + + hr = IDirectDrawSurface7_GetAttachedSurface(buffers[i], &backbuffer_caps, &buffers[i + 1]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + + hr = IDirect3DDevice7_SetRenderTarget(context.device, buffers[0], 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_color_quad(&context, 0x0000ff00); + + hr = IDirectDrawSurface7_Flip(buffers[0], NULL, DDFLIP_WAIT); + + draw_color_quad(&context, 0x000000ff); + + color = get_surface_color(buffers[0], 0, 0); + todo_wine ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); + + color = get_surface_color(buffers[3], 0, 0); + todo_wine ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); + + for (unsigned int i = 0; i < ARRAY_SIZE(buffers); ++i) + IDirectDrawSurface7_Release(buffers[ARRAY_SIZE(buffers) - 1 - i]); + release_test_context(&context); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { winetest_push_context("Hardware device"); @@ -20073,4 +20175,5 @@ START_TEST(ddraw7) test_filling_convention(); test_enum_devices(); run_for_each_device_type(test_user_memory); + test_flip_3d(); }

1 0

Zebediah Figura : ddraw: Read the current RTV before flipping any surfaces.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 3b5dca348e12f65f3a92313f207fc004ab5eb33c URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5dca348e12f65f3a92313f207fc0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 22 17:04:18 2023 -0600 ddraw: Read the current RTV before flipping any surfaces. Since we rename one at a time, we will swap the RTV twice otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54839 Fixes: f103da7c69cc18aaf63f08a752d870b7049d9d20 --- dlls/ddraw/surface.c | 14 +++++++------- dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ef82a5bfac5..5836a49f4fd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1330,15 +1330,14 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) } static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wined3d_texture *wined3d_texture, - struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory) + struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory, + struct wined3d_rendertarget_view *current_rtv) { struct ddraw_surface *dst_surface = dst_texture->root; - struct wined3d_rendertarget_view *current_rtv; /* We don't have to worry about potential texture bindings, since * flippable surfaces can never be textures. */ - current_rtv = wined3d_device_context_get_rendertarget_view(dst_surface->ddraw->immediate_context, 0); if (current_rtv == dst_surface->wined3d_rtv) wined3d_device_context_set_rendertarget_views(dst_surface->ddraw->immediate_context, 0, 1, &rtv, FALSE); wined3d_rendertarget_view_set_parent(rtv, dst_surface, &ddraw_view_wined3d_parent_ops); @@ -1377,8 +1376,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; + struct wined3d_rendertarget_view *tmp_rtv, *current_rtv; struct wined3d_texture *texture, *draw_texture; - struct wined3d_rendertarget_view *tmp_rtv; DDSCAPS caps = {DDSCAPS_FLIP}; IDirectDrawSurface *current; void *texture_memory; @@ -1407,6 +1406,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); texture_memory = dst_ddraw_texture->texture_memory; draw_texture = dst_impl->draw_texture; + current_rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0); if (src_impl) { @@ -1430,7 +1430,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, - ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv); dst_ddraw_texture = src_ddraw_texture; } @@ -1455,14 +1455,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface * src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture, - ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory); + ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv); dst_ddraw_texture = src_ddraw_texture; dst_impl = src_impl; } } - ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory); + ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory, current_rtv); if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index dc9568a1143..2771a4ed368 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19981,10 +19981,10 @@ static void test_flip_3d(void) draw_color_quad(&context, 0x000000ff); color = get_surface_color(buffers[0], 0, 0); - todo_wine ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color); color = get_surface_color(buffers[3], 0, 0); - todo_wine ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); + ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color); for (unsigned int i = 0; i < ARRAY_SIZE(buffers); ++i) IDirectDrawSurface7_Release(buffers[ARRAY_SIZE(buffers) - 1 - i]);

1 0

Alexandre Julliard : nls: Update locale data to CLDR version 44.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 6d046dd988be402203b4a14218ac6a11f8e3170e URL: https://gitlab.winehq.org/wine/wine/-/commit/6d046dd988be402203b4a14218ac6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 17:29:06 2023 +0100 nls: Update locale data to CLDR version 44. --- nls/locale.nls | Bin 745162 -> 758790 bytes tools/make_unicode | 34 ++++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 8ce597dfb6a..dfeca826416 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 5910716682d..2dfef084268 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,7 +26,7 @@ use Encode; use Time::Local qw(timegm_modern); my $UNIVERSION = "15.1.0"; -my $CLDRVERSION = "43"; +my $CLDRVERSION = "44"; my $ISO639VERSION = "20230123"; my $TZVERSION = "2023c"; @@ -39,7 +39,7 @@ my %data_files = idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", sha => "402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4" }, cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…", - sha => "132cdd24e479abb6e86db1429931cec3dada485fd41da39ece3c08e531c477df" }, + sha => "38d04cf28ccfee8b86d2feecebf99d5dc6d3317f53f87ba53b1e774f6395573c" }, cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… 10 Sorting Weight Table.txt", @@ -533,12 +533,16 @@ my @locales = { name => "be-BY", lcid => 0x00000423 }, { name => "bem" }, { name => "bem-ZM" }, + { name => "bew" }, + { name => "bew-ID" }, { name => "bez" }, { name => "bez-TZ" }, { name => "bg", lcid => 0x00000002, oemcp => 866, ebcdiccp => 21025, group => 5, sabbrevlangname => "BGR", sopentypelang => "BGR" }, { name => "bg-BG", lcid => 0x00000402 }, { name => "bin", lcid => 0x00000066, oemcp => 850, dir => "exemplars", sabbrevlangname => "ZZZ", sopentypelang => "EDO" }, { name => "bin-NG", lcid => 0x00000466, file => "bin", dir => "exemplars" }, + { name => "blo" }, + { name => "blo-BJ" }, { name => "bm", sopentypelang => "BMB" }, { name => "bm-Latn", file => "bm" }, { name => "bm-Latn-ML", file => "bm_ML" }, @@ -598,6 +602,8 @@ my @locales = { name => "co-Latn-FR", alias => "co-FR" }, { name => "cs", lcid => 0x00000005, oemcp => 852, group => 2, sabbrevlangname => "CSY", sopentypelang => "CSY" }, { name => "cs-CZ", lcid => 0x00000405 }, + { name => "csw" }, + { name => "csw-CA" }, { name => "cu", sopentypelang => "CSL" }, { name => "cu-RU" }, { name => "cy", lcid => 0x00000052, oemcp => 850, ebcdiccp => 20285, sabbrevlangname => "CYM", sopentypelang => "WEL" }, @@ -683,7 +689,7 @@ my @locales = { name => "en-GU", oemcp => 850 }, { name => "en-GY", oemcp => 850 }, { name => "en-HK", lcid => 0x00003c09, oemcp => 850, sabbrevlangname => "ENH" }, - { name => "en-ID", lcid => 0x00003809, file => "en", oemcp => 850, sabbrevlangname => "ZZZ" }, + { name => "en-ID", lcid => 0x00003809, oemcp => 850, sabbrevlangname => "ZZZ" }, { name => "en-IE", lcid => 0x00001809, oemcp => 850, sabbrevlangname => "ENI" }, { name => "en-IL", oemcp => 65001 }, { name => "en-IM", oemcp => 850 }, @@ -938,6 +944,8 @@ my @locales = ## name => "ibb-NG", lcid => 0x00000469 }, { name => "id", lcid => 0x00000021, oemcp => 850 }, { name => "id-ID", lcid => 0x00000421 }, + { name => "ie" }, + { name => "ie-EE" }, { name => "ig", lcid => 0x00000070, oemcp => 437 }, { name => "ig-Latn", alias => "ig" }, { name => "ig-Latn-NG", alias => "ig-NG" }, @@ -1084,6 +1092,8 @@ my @locales = { name => "mi-Latn", alias => "mi" }, { name => "mi-Latn-NZ", alias => "mi-NZ" }, { name => "mi-NZ", lcid => 0x00000481 }, + { name => "mic" }, + { name => "mic-CA" }, { name => "mk", lcid => 0x0000002f, oemcp => 866, ebcdiccp => 500, group => 5, sabbrevlangname => "MKI" }, { name => "mk-MK", lcid => 0x0000042f }, { name => "ml", lcid => 0x0000004c, group => 15, sabbrevlangname => "MYM", sopentypelang => "MLR" }, @@ -1188,7 +1198,8 @@ my @locales = { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, { name => "prg" }, - { name => "prg-001" }, + { name => "prg-001", file => "prg" }, + { name => "prg-PL" }, { name => "prs", lcid => 0x0000008c, file => "fa", inegnumber => 3, oemcp => 720, group => 13, sopentypelang => "DRI" }, { name => "prs-AF", lcid => 0x0000048c, file => "fa_AF" }, { name => "prs-Arab", alias => "prs" }, @@ -1296,6 +1307,8 @@ my @locales = { name => "si-LK", lcid => 0x0000045b }, { name => "sk", lcid => 0x0000001b, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "SKY", sopentypelang => "SKY" }, { name => "sk-SK", lcid => 0x0000041b }, + { name => "skr" }, + { name => "skr-PK" }, { name => "sl", lcid => 0x00000024, oemcp => 852, ebcdiccp => 20880, group => 2 }, { name => "sl-SI", lcid => 0x00000424 }, { name => "sma", lcid => 0x0000783b, sparent => "se", ebcdiccp => 20278, sabbrevlangname => "SMB", sopentypelang => "SSM" }, @@ -1411,6 +1424,8 @@ my @locales = { name => "tt-RU", lcid => 0x00000444 }, { name => "twq" }, { name => "twq-NE" }, + { name => "tyv" }, + { name => "tyv-RU" }, { name => "tzm", lcid => 0x0000005f, sortlocale => "tzm-Latn-DZ", oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "TZA" }, { name => "tzm-Latn", lcid => 0x00007c5f, territory => "DZ", file => "tzm" }, { name => "tzm-Latn-MA", file => "tzm_MA", oemcp => 65001 }, @@ -1446,6 +1461,8 @@ my @locales = { name => "ve-ZA", lcid => 0x00000433 }, { name => "vi", lcid => 0x0000002a, oemcp => 1258, slist => ",", group => 14, sabbrevlangname => "VIT", sopentypelang => "VIT" }, { name => "vi-VN", lcid => 0x0000042a }, + { name => "vmw" }, + { name => "vmw-MZ" }, { name => "vo" }, { name => "vo-001" }, { name => "vun" }, @@ -1463,12 +1480,15 @@ my @locales = { name => "x-IV_mathan", lcid => 0x0001007f, alias => "" }, { name => "xh", lcid => 0x00000034, oemcp => 850, sopentypelang => "XHS" }, { name => "xh-ZA", lcid => 0x00000434 }, + { name => "xnr" }, + { name => "xnr-IN" }, { name => "xog" }, { name => "xog-UG" }, { name => "yav" }, { name => "yav-CM" }, { name => "yi", lcid => 0x0000003d, sabbrevlangname => "ZZZ", sopentypelang => "JII" }, - { name => "yi-001", lcid => 0x0000043d }, + { name => "yi-001", lcid => 0x0000043d, file => "yi" }, + { name => "yi-UA" }, { name => "yo", lcid => 0x0000006a, oemcp => 437, sopentypelang => "YBA" }, { name => "yo-BJ", ebcdiccp => 500 }, { name => "yo-Latn", alias => "yo" }, @@ -1487,6 +1507,8 @@ my @locales = { name => "zgh-MA", alias => "zgh-Tfng-MA" }, { name => "zgh-Tfng", file => "zgh" }, { name => "zgh-Tfng-MA", file => "zgh_MA" }, + { name => "za" }, + { name => "za-CN" }, { name => "zh", lcid => 0x00007804, ireadinglayout => 2, oemcp => 936, slist => ",", sscripts => "Hani Hans", sabbrevlangname => "CHS", sopentypelang => "ZHS", nativedigits => "0123456789" }, { name => "zh-CN", lcid => 0x00000804, file => "zh_Hans_CN", sparent => "zh-Hans" }, { name => "zh-CN_phoneb", lcid => 0x00050804, alias => "zh-CN" }, @@ -4743,8 +4765,8 @@ sub build_locale_data() my $sintlsymbol = $geo->{sintlsymbol} || "XDR"; my $scurrency = $geo->{scurrency} || loc_query( $loc, "/ldml/numbers/currencies/currency[\@type='$sintlsymbol']/symbol[\@alt='narrow']" ); $scurrency ||= loc_query( $loc, "/ldml/numbers/currencies/currency[\@type='$sintlsymbol']/symbol[not(\@alt)]" ); + $scurrency ||= $geo->{sintlsymbol}; $geo->{scurrency} = $scurrency if $scurrency; - $scurrency ||= $sintlsymbol; my $sengcurrname = $loc->{sengcurrname} || loc_query( $lcnames{en}, "/ldml/numbers/currencies/currency[\@type='$sintlsymbol']/displayName[not(\@count)]" ); my $snativecurrname = $loc->{sengcurrname} || loc_query( $loc, "/ldml/numbers/currencies/currency[\@type='$sintlsymbol']/displayName[not(\@count)]" ) || $sengcurrname; my $icurrdigits = xml_query( $suppl, "/supplementalData/currencyData/fractions/info[\@iso4217='$sintlsymbol']/\@digits" );

1 0

Alexandre Julliard : fluidsynth: Make glib replacement functions inline to avoid unused function warnings.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: 13d2bb57fe9ce8408a51885a8e72736013b89bb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/13d2bb57fe9ce8408a51885a8e7273… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 18:41:21 2023 +0100 fluidsynth: Make glib replacement functions inline to avoid unused function warnings. --- libs/fluidsynth/glib.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libs/fluidsynth/glib.h b/libs/fluidsynth/glib.h index 722173d825a..6bbd5acc75e 100644 --- a/libs/fluidsynth/glib.h +++ b/libs/fluidsynth/glib.h @@ -78,30 +78,30 @@ extern void g_clear_error( GError **error ); extern int g_file_test( const char *path, int test ); #define g_new( type, count ) calloc( (count), sizeof(type) ) -static void g_free( void *ptr ) { free( ptr ); } +static inline void g_free( void *ptr ) { free( ptr ); } typedef SRWLOCK GMutex; -static void g_mutex_init( GMutex *mutex ) {} -static void g_mutex_clear( GMutex *mutex ) {} -static void g_mutex_lock( GMutex *mutex ) { AcquireSRWLockExclusive( mutex ); } -static void g_mutex_unlock( GMutex *mutex ) { ReleaseSRWLockExclusive( mutex ); } +static inline void g_mutex_init( GMutex *mutex ) {} +static inline void g_mutex_clear( GMutex *mutex ) {} +static inline void g_mutex_lock( GMutex *mutex ) { AcquireSRWLockExclusive( mutex ); } +static inline void g_mutex_unlock( GMutex *mutex ) { ReleaseSRWLockExclusive( mutex ); } typedef CRITICAL_SECTION GRecMutex; -static void g_rec_mutex_init( GRecMutex *mutex ) { InitializeCriticalSection( mutex ); } -static void g_rec_mutex_clear( GRecMutex *mutex ) { DeleteCriticalSection( mutex ); } -static void g_rec_mutex_lock( GRecMutex *mutex ) { EnterCriticalSection( mutex ); } -static void g_rec_mutex_unlock( GRecMutex *mutex ) { LeaveCriticalSection( mutex ); } +static inline void g_rec_mutex_init( GRecMutex *mutex ) { InitializeCriticalSection( mutex ); } +static inline void g_rec_mutex_clear( GRecMutex *mutex ) { DeleteCriticalSection( mutex ); } +static inline void g_rec_mutex_lock( GRecMutex *mutex ) { EnterCriticalSection( mutex ); } +static inline void g_rec_mutex_unlock( GRecMutex *mutex ) { LeaveCriticalSection( mutex ); } typedef CONDITION_VARIABLE GCond; -static void g_cond_init( GCond *cond ) {} -static void g_cond_clear( GCond *cond ) {} -static void g_cond_signal( GCond *cond ) { WakeConditionVariable( cond ); } -static void g_cond_broadcast( GCond *cond ) { WakeAllConditionVariable( cond ); } -static void g_cond_wait( GCond *cond, GMutex *mutex ) { SleepConditionVariableSRW( cond, mutex, INFINITE, 0 ); } - -static void g_atomic_int_inc( int *ptr ) { InterlockedIncrement( (LONG *)ptr ); } -static int g_atomic_int_add( int *ptr, int val ) { return InterlockedAdd( (LONG *)ptr, val ) - 1; } -static int g_atomic_int_get( int *ptr ) { return ReadAcquire( (LONG *)ptr ); } -static void g_atomic_int_set( int *ptr, int val ) { InterlockedExchange( (LONG *)ptr, val ); } -static int g_atomic_int_dec_and_test( int *ptr, int val ) { return !InterlockedAdd( (LONG *)ptr, -val ); } -static int g_atomic_int_compare_and_exchange( int *ptr, int cmp, int val ) { return InterlockedCompareExchange( (LONG *)ptr, val, cmp ) == cmp; } +static inline void g_cond_init( GCond *cond ) {} +static inline void g_cond_clear( GCond *cond ) {} +static inline void g_cond_signal( GCond *cond ) { WakeConditionVariable( cond ); } +static inline void g_cond_broadcast( GCond *cond ) { WakeAllConditionVariable( cond ); } +static inline void g_cond_wait( GCond *cond, GMutex *mutex ) { SleepConditionVariableSRW( cond, mutex, INFINITE, 0 ); } + +static inline void g_atomic_int_inc( int *ptr ) { InterlockedIncrement( (LONG *)ptr ); } +static inline int g_atomic_int_add( int *ptr, int val ) { return InterlockedAdd( (LONG *)ptr, val ) - 1; } +static inline int g_atomic_int_get( int *ptr ) { return ReadAcquire( (LONG *)ptr ); } +static inline void g_atomic_int_set( int *ptr, int val ) { InterlockedExchange( (LONG *)ptr, val ); } +static inline int g_atomic_int_dec_and_test( int *ptr, int val ) { return !InterlockedAdd( (LONG *)ptr, -val ); } +static inline int g_atomic_int_compare_and_exchange( int *ptr, int cmp, int val ) { return InterlockedCompareExchange( (LONG *)ptr, val, cmp ) == cmp; }

1 0

Alexandre Julliard : jxr: Fix some clang compiler warnings.
by Alexandre Julliard 23 Nov '23

23 Nov '23

Module: wine Branch: master Commit: f76c3c6ce801983ebab8ac1458b4f828096270ad URL: https://gitlab.winehq.org/wine/wine/-/commit/f76c3c6ce801983ebab8ac1458b4f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 23 18:41:58 2023 +0100 jxr: Fix some clang compiler warnings. --- libs/jxr/image/decode/strPredQuantDec.c | 4 ++-- libs/jxr/image/encode/strenc.c | 4 +--- libs/jxr/image/sys/adapthuff.c | 3 +-- libs/jxr/image/sys/strcodec.c | 11 ++++++----- libs/jxr/image/sys/windowsmediaphoto.h | 11 ++++++----- libs/jxr/image/x86/x86.h | 6 ++---- libs/jxr/jxrgluelib/JXRGluePFC.c | 5 ++--- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/libs/jxr/image/decode/strPredQuantDec.c b/libs/jxr/image/decode/strPredQuantDec.c index 74aca93f312..6f74eb32bb7 100644 --- a/libs/jxr/image/decode/strPredQuantDec.c +++ b/libs/jxr/image/decode/strPredQuantDec.c @@ -70,13 +70,14 @@ Int dequantizeMacroblock(CWMImageStrCodec * pSC) pSC->p1MBbuffer[i][0] = DEQUANT(pMBInfo->iBlockDC[i][0], pTile->pQuantizerDC[i]->iQP); // dequantize LP - if(pSC->WMISCP.sbSubband != SB_DC_ONLY) + if(pSC->WMISCP.sbSubband != SB_DC_ONLY) { if(i == 0 || (cf != YUV_422 && cf != YUV_420)) dequantizeBlock4x4(pSC->p1MBbuffer[i] , pMBInfo->iBlockDC[i], dctIndex[2], pTile->pQuantizerLP[i][pMBInfo->iQIndexLP].iQP); else if(cf == YUV_422) dequantizeBlock4x2(pSC->p1MBbuffer[i], pMBInfo->iBlockDC[i], pTile->pQuantizerLP[i][pMBInfo->iQIndexLP].iQP); else // 420 dequantizeBlock2x2(pSC->p1MBbuffer[i], pMBInfo->iBlockDC[i], pTile->pQuantizerLP[i][pMBInfo->iQIndexLP].iQP); + } } return ICERR_OK; @@ -536,4 +537,3 @@ Void predCBPDec(CWMImageStrCodec *pSC, CCodingContext *pContext) } //} } - diff --git a/libs/jxr/image/encode/strenc.c b/libs/jxr/image/encode/strenc.c index f0703e91f75..46e792fa4dc 100644 --- a/libs/jxr/image/encode/strenc.c +++ b/libs/jxr/image/encode/strenc.c @@ -1314,7 +1314,7 @@ static Void InitializeStrEnc(CWMImageStrCodec *pSC, // set nExpBias if (pSC->WMISCP.nExpBias == 0) - pSC->WMISCP.nExpBias = 4 + 128;//default + pSC->WMISCP.nExpBias = (I8)(4 + 128);//default pSC->WMISCP.nExpBias += 128; // rollover arithmetic pSC->cRow = 0; @@ -2366,5 +2366,3 @@ Int inputMBRow(CWMImageStrCodec* pSC) return ICERR_OK; } - - diff --git a/libs/jxr/image/sys/adapthuff.c b/libs/jxr/image/sys/adapthuff.c index 2fabc8ce9b9..9f369ec3252 100644 --- a/libs/jxr/image/sys/adapthuff.c +++ b/libs/jxr/image/sys/adapthuff.c @@ -459,7 +459,7 @@ Void AdaptDiscriminant (CAdaptiveHuffman *pAdHuff) assert (t < gMaxTables[iSym]); //pAdHuff->m_iDiscriminant >>= 1; - pAdHuff->m_iLowerBound = (t == 0) ? (-1 << 31) : -THRESHOLD; + pAdHuff->m_iLowerBound = (t == 0) ? (1u << 31) : -THRESHOLD; pAdHuff->m_iUpperBound = (t == gMaxTables[iSym] - 1) ? (1 << 30) : THRESHOLD; switch (iSym) { @@ -508,4 +508,3 @@ Void AdaptDiscriminant (CAdaptiveHuffman *pAdHuff) pAdHuff->m_pTable = pCodes; pAdHuff->m_pDelta = pDelta; } - diff --git a/libs/jxr/image/sys/strcodec.c b/libs/jxr/image/sys/strcodec.c index 0e7e8cbd8d1..bc12417d65b 100644 --- a/libs/jxr/image/sys/strcodec.c +++ b/libs/jxr/image/sys/strcodec.c @@ -818,20 +818,20 @@ Void freeTileInfo(CWMImageStrCodec * pSC) else freeQuantizer(pSC->pTile[0].pQuantizerDC); - if(pSC->WMISCP.sbSubband != SB_DC_ONLY) + if(pSC->WMISCP.sbSubband != SB_DC_ONLY) { if((pSC->m_param.uQPMode & 2) != 0) // not LP uniform for(iTile = 0; iTile <= pSC->WMISCP.cNumOfSliceMinus1V; iTile ++) freeQuantizer(pSC->pTile[iTile].pQuantizerLP); else freeQuantizer(pSC->pTile[0].pQuantizerLP); - - if(pSC->WMISCP.sbSubband != SB_DC_ONLY && pSC->WMISCP.sbSubband != SB_NO_HIGHPASS) + } + if(pSC->WMISCP.sbSubband != SB_DC_ONLY && pSC->WMISCP.sbSubband != SB_NO_HIGHPASS) { if((pSC->m_param.uQPMode & 4) != 0) // not HP uniform for(iTile = 0; iTile <= pSC->WMISCP.cNumOfSliceMinus1V; iTile ++) freeQuantizer(pSC->pTile[iTile].pQuantizerHP); else freeQuantizer(pSC->pTile[0].pQuantizerHP); - + } if(pSC->pTile != NULL) free(pSC->pTile); } @@ -864,11 +864,12 @@ Void formatQuantizer(CWMIQuantizer * pQuantizer[MAX_CHANNELS], U8 cChMode, size_ size_t iCh; for(iCh = 0; iCh < cCh; iCh ++){ - if(iCh > 0) + if(iCh > 0) { if(cChMode == 0) // uniform pQuantizer[iCh][iPos] = pQuantizer[0][iPos]; else if(cChMode == 1) // mixed pQuantizer[iCh][iPos] = pQuantizer[1][iPos]; + } remapQP(pQuantizer[iCh] + iPos, (iCh > 0 && bShiftedUV == TRUE) ? SHIFTZERO - 1 : SHIFTZERO, bScaledArith); } } diff --git a/libs/jxr/image/sys/windowsmediaphoto.h b/libs/jxr/image/sys/windowsmediaphoto.h index fb9768b558c..232c874c267 100644 --- a/libs/jxr/image/sys/windowsmediaphoto.h +++ b/libs/jxr/image/sys/windowsmediaphoto.h @@ -257,20 +257,22 @@ typedef long ERR; #define Report(err, szExp, szFile, lLine) err = err #endif -#define Call(exp) \ +#define Call(exp) do { \ if (Failed(err = (exp))) \ { \ Report(err, #exp, __FILE__, (long)__LINE__); \ goto Cleanup; \ } \ - else err = err + else err = err; \ + } while(0) -#define CallIgnoreError(errTmp, exp) \ +#define CallIgnoreError(errTmp, exp) do { \ if (Failed(errTmp = (exp))) \ { \ Report(errTmp, #exp, __FILE__, (long)__LINE__); \ } \ - else errTmp = errTmp + else errTmp = errTmp; \ + } while(0) #define Test(exp, err) Call((exp) ? WMP_errSuccess : (err)) @@ -512,4 +514,3 @@ EXTERN_C Int WMPhotoDetile( ); #endif // WMI_WINDOWSMEDIAPHOTO_H - diff --git a/libs/jxr/image/x86/x86.h b/libs/jxr/image/x86/x86.h index a519137a50b..3bedd55f496 100644 --- a/libs/jxr/image/x86/x86.h +++ b/libs/jxr/image/x86/x86.h @@ -36,10 +36,10 @@ #define PACKETLENGTH (1U<<12) // 4kB #define readIS_L1(pSC, pIO) readIS(pSC, pIO) -#define readIS_L2(pSC, pIO) (void)(pSC, pIO) +#define readIS_L2(pSC, pIO) ((void)(pSC), (void)(pIO)) #define writeIS_L1(pSC, pIO) writeIS(pSC, pIO) -#define writeIS_L2(pSC, pIO) (void)(pSC, pIO) +#define writeIS_L2(pSC, pIO) ((void)(pSC), (void)(pIO)) //================================ @@ -54,5 +54,3 @@ // quantization optimization //================================ #define RECIP_QUANT_OPT - - diff --git a/libs/jxr/jxrgluelib/JXRGluePFC.c b/libs/jxr/jxrgluelib/JXRGluePFC.c index e44b12c287a..f6f2e29c397 100644 --- a/libs/jxr/jxrgluelib/JXRGluePFC.c +++ b/libs/jxr/jxrgluelib/JXRGluePFC.c @@ -56,9 +56,9 @@ static U32 Convert_Half_To_Float(U16 u16) { return s << 31; } - else if (~(~0 << 5) == e) // inf, snan, qnan + else if (~(~0u << 5) == e) // inf, snan, qnan { - return (s << 31) | ~(~0 << 8) << 23| (m << 13); + return (s << 31) | ~(~0u << 8) << 23| (m << 13); } return (s << 31) | ((e - 15 + 127) << 23) | (m << 13); // norm @@ -2335,4 +2335,3 @@ ERR PKFormatConverter_Release(PKFormatConverter** ppFC) Cleanup: return err; } -

1 0