February 2017 - Wine-commits

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 103f5781101e6b6c95dceb978aa3ccde8b0c7b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f5781101e6b6c95dceb978… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 20 16:19:19 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 136bc83..2a79729 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-11 02:32+0300\n" +"PO-Revision-Date: 2017-02-20 15:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12189,7 +12189,7 @@ msgstr "Значение слишком велико (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Подтверждение" +msgstr "Подтверждение удаления значения" #: regedit.rc:191 msgid "Search complete. The string '%1' was not found." @@ -12220,17 +12220,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Экспортирует выделенную ветку реестра в текстовый файл" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Подтверждение" +msgstr "Подтверждение удаления ключа" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Вы точно хотите удалить ключ реестра «%1»?" +msgstr "Вы точно хотите удалить ключ реестра «%1» и все вложенные ключи?" #: regsvr32.rc:32 msgid ""

1 0

Stefan Dösinger : d3d8/tests: Allow a higher slop for test_updatetexture.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: cec8021179ff899442b60f8b54ad0d89e6f543d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec8021179ff899442b60f8b5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 19 11:47:53 2017 +0000 d3d8/tests: Allow a higher slop for test_updatetexture. My Radeon X1600 returns 0x007c7c00. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b477ab7..a7177d3 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6740,7 +6740,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Stefan Dösinger : d3d9/tests: Allow a higher slop for test_updatetexture.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 28207ea49f64204882769d056256367c4d6d0403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28207ea49f64204882769d056… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 19 11:47:54 2017 +0000 d3d9/tests: Allow a higher slop for test_updatetexture. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 75c6020..4de3beb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19917,7 +19917,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Józef Kucia : d3d11/tests: Properly check if raw buffers are supported.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: ce0a60e1c793a334bdcc2c79a040c52832d47b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0a60e1c793a334bdcc2c79a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:10 2017 +0100 d3d11/tests: Properly check if raw buffers are supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 64 ++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a36a1f..47e7961 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11557,7 +11557,8 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, + D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) { static const D3D_FEATURE_LEVEL feature_levels[] = { @@ -11571,22 +11572,24 @@ static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL }; unsigned int i; + assert(begin <= end); for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) - test_func(feature_levels[i]); + { + if (begin <= feature_levels[i] && feature_levels[i] <= end) + test_func(feature_levels[i]); + } } -static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - static const D3D_FEATURE_LEVEL feature_levels[] = - { - D3D_FEATURE_LEVEL_9_3, - D3D_FEATURE_LEVEL_9_2, - D3D_FEATURE_LEVEL_9_1, - }; - unsigned int i; + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_11_1, test_func); +} - for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) - test_func(feature_levels[i]); +static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +{ + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_9_3, test_func); } static void test_ddy(void) @@ -14329,14 +14332,23 @@ static void test_buffer_srv(void) release_test_context(&test_context); } -static void test_unaligned_raw_buffer_access(void) +static BOOL check_compute_shaders_via_sm4_support(ID3D11Device *device) +{ + D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS options; + + if (FAILED(ID3D11Device_CheckFeatureSupport(device, + D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &options, sizeof(options)))) + return FALSE; + return options.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; +} + +static void test_unaligned_raw_buffer_access(const D3D_FEATURE_LEVEL feature_level) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; struct d3d11_test_context test_context; D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; - D3D_FEATURE_LEVEL feature_level; ID3D11UnorderedAccessView *uav; ID3D11ShaderResourceView *srv; D3D11_BUFFER_DESC buffer_desc; @@ -14399,12 +14411,22 @@ static void test_unaligned_raw_buffer_access(void) }; static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; - if (!init_test_context(&test_context, NULL)) + if (!init_test_context(&test_context, &feature_level)) return; device = test_context.device; context = test_context.immediate_context; - feature_level = ID3D11Device_GetFeatureLevel(device); + + if (feature_level < D3D_FEATURE_LEVEL_11_0 && !check_compute_shaders_via_sm4_support(device)) + { + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11PixelShader_Release(ps); + skip("Raw buffers are not supported.\n"); + release_test_context(&test_context); + return; + } if (is_intel_device(device)) { @@ -14417,13 +14439,6 @@ static void test_unaligned_raw_buffer_access(void) } hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - if (hr == E_INVALIDARG) - { - /* This skips the test on testbot Win Vista and Win 2008 VMs. */ - win_skip("Failed to create pixel shader.\n"); - release_test_context(&test_context); - return; - } ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); memset(&offset, 0, sizeof(offset)); @@ -14686,5 +14701,6 @@ START_TEST(d3d11) test_sm5_bufinfo_instruction(); test_render_target_device_mismatch(); test_buffer_srv(); - test_unaligned_raw_buffer_access(); + run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + test_unaligned_raw_buffer_access); }

1 0

Józef Kucia : d3d8: Allocate WINED3DCAPS on stack.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: f7ca55f63a7a6815a80541c48c976af7e4130a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ca55f63a7a6815a80541c48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:12 2017 +0100 d3d8: Allocate WINED3DCAPS on stack. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 106 +++++++++++++++++++++++------------------------ dlls/d3d8/device.c | 12 ++---- dlls/d3d8/directx.c | 12 ++---- 3 files changed, 61 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ca55f63a7a6815a8054…

1 0

Józef Kucia : d3d9: Allocate WINED3DCAPS on stack.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 9d0fb20228772e0e441de065714967b14f8296bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0fb20228772e0e441de0657… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:13 2017 +0100 d3d9: Allocate WINED3DCAPS on stack. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 150 +++++++++++++++++++++++------------------------ dlls/d3d9/device.c | 10 +--- dlls/d3d9/directx.c | 9 +-- 3 files changed, 81 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d0fb20228772e0e441de…

1 0

Józef Kucia : wined3d: Expose double precision shader capability in WINED3DCAPS.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: def13f3f810bf19018cba6f93b1fafaa7f72e1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def13f3f810bf19018cba6f93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:14 2017 +0100 wined3d: Expose double precision shader capability in WINED3DCAPS. None of shader backends supports double precision yet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0f44e09..0df4b58 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4029,6 +4029,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; adapter->d3d_info.limits.varying_count = shader_caps.varying_count; + adapter->d3d_info.shader_double_precision = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION; adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; @@ -5331,11 +5332,12 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte enum wined3d_device_type device_type, WINED3DCAPS *caps) { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct shader_caps shader_caps; - struct fragment_caps fragment_caps; struct wined3d_vertex_caps vertex_caps; DWORD ckey_caps, blit_caps, fx_caps; + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); @@ -5903,6 +5905,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->ddraw_caps.caps |= WINEDDCAPS_3D; } + caps->shader_double_precision = d3d_info->shader_double_precision; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3190d87..c518bda 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1097,6 +1097,7 @@ typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 #define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 +#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004 struct shader_caps { @@ -2299,6 +2300,7 @@ struct wined3d_d3d_info BOOL shader_color_key; DWORD valid_rt_mask; DWORD wined3d_creation_flags; + BOOL shader_double_precision; }; /* The adapter structure */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 17343f6..e216520 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1888,6 +1888,8 @@ typedef struct _WINED3DCAPS DWORD Reserved3; struct wined3d_ddraw_caps ddraw_caps; + + BOOL shader_double_precision; } WINED3DCAPS; struct wined3d_color_key

1 0

Józef Kucia : d3d11: Implement CheckFeatureSupport() for D3D11_FEATURE_DOUBLES.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 0cf4728d01038426231ef9daab408a7ec734755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf4728d01038426231ef9daa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:15 2017 +0100 d3d11: Implement CheckFeatureSupport() for D3D11_FEATURE_DOUBLES. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 27 +++++++++++++++++++++++++++ include/d3d11.idl | 5 +++++ 2 files changed, 32 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 731a0e1..95b11e6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2864,6 +2864,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckCounter(ID3D11Device *iface, static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device *iface, D3D11_FEATURE feature, void *feature_support_data, UINT feature_support_data_size) { + struct d3d_device *device = impl_from_ID3D11Device(iface); + WINED3DCAPS wined3d_caps; + HRESULT hr; + TRACE("iface %p, feature %u, feature_support_data %p, feature_support_data_size %u.\n", iface, feature, feature_support_data, feature_support_data_size); @@ -2885,6 +2889,29 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * threading_data->DriverCommandLists = TRUE; return S_OK; } + + case D3D11_FEATURE_DOUBLES: + { + D3D11_FEATURE_DATA_DOUBLES *doubles_data = feature_support_data; + if (feature_support_data_size != sizeof(*doubles_data)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + doubles_data->DoublePrecisionFloatShaderOps = wined3d_caps.shader_double_precision; + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; diff --git a/include/d3d11.idl b/include/d3d11.idl index ad676c7..371ff2f 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -497,6 +497,11 @@ typedef struct D3D11_FEATURE_DATA_THREADING BOOL DriverCommandLists; } D3D11_FEATURE_DATA_THREADING; +typedef struct D3D11_FEATURE_DATA_DOUBLES +{ + BOOL DoublePrecisionFloatShaderOps; +} D3D11_FEATURE_DATA_DOUBLES; + typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS { BOOL ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 176283b082e294a9618742087de07814c4859391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176283b082e294a9618742087… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Feb 18 08:34:25 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3bb677a..392eda3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-11 08:54+0300\n" +"PO-Revision-Date: 2017-02-18 08:33+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12226,17 +12226,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Reikšmės šalinimo patvirtinimas" +msgstr "Rakto šalinimo patvirtinimas" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" +msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakčius?" #: regsvr32.rc:32 msgid ""

1 0

Francois Gouget : odbccp32: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 65b6cf186d3ea221db936abf504796b38bcc3037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b6cf186d3ea221db936abf5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:10 2017 +0100 odbccp32: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index bc643d4..f68d98f 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -76,9 +76,9 @@ static void clear_errors(void) num_errors = 0; } -static inline void * heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0