November 2016 - Wine-commits

Józef Kucia : d3d10core/tests: Add test for shader input register limits.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 0e415b5d7dcbbcd04bab4023de1d25eec4f29393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e415b5d7dcbbcd04bab4023d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:25 2016 +0100 d3d10core/tests: Add test for shader input register limits. 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/d3d10core/tests/device.c | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 18e6753..3db875c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9767,6 +9767,103 @@ float4 main(struct ps_data ps_input) : SV_Target release_test_context(&test_context); } +static void test_shader_input_registers_limits(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10ShaderResourceView *srv; + ID3D10SamplerState *sampler; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_last_register_code[] = + { +#if 0 + Texture2D t : register(t127); + SamplerState s : register(s15); + + void main(out float4 target : SV_Target) + { + target = t.Sample(s, float2(0, 0)); + } +#endif + 0x43425844, 0xd81ff2f8, 0x8c704b9c, 0x8c6f4857, 0xd02949ac, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x0000000f, 0x04001858, 0x00107000, 0x0000007f, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x0000007f, 0x00106000, 0x0000000f, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_last_register_code, sizeof(ps_last_register_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_PSSetShaderResources(device, + D3D10_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT - 1, 1, &srv); + ID3D10Device_PSSetSamplers(device, D3D10_COMMONSHADER_SAMPLER_REGISTER_COUNT - 1, 1, &sampler); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9821,4 +9918,5 @@ START_TEST(device) test_line_antialiasing_blending(); test_required_format_support(); test_ddy(); + test_shader_input_registers_limits(); }

1 0

Józef Kucia : d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 3f9fb98ab33a82cd66209dcc116aa8d4dddf8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9fb98ab33a82cd66209dcc1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:26 2016 +0100 d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews(). 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1765591..16230c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -671,7 +671,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } for (; unordered_access_view_start_slot + i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { - wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + wined3d_device_set_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i, NULL); } wined3d_mutex_unlock(); }

1 0

Huw Davies : msi: Correctly size packagecode as it's an unsquashed guid.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 5ac02423b0e748e22a9db9683da4e3a114829cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac02423b0e748e22a9db9683… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 28 16:29:58 2016 +0000 msi: Correctly size packagecode as it's an unsquashed guid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 518281d..892c756 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1108,7 +1108,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; - WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[SQUASHED_GUID_SIZE]; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[GUID_SIZE]; BOOL badconfig = FALSE; LONG res; DWORD type = REG_NONE;

1 0

Daniel Lehman : msvcrt: Add _lfind_s.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: cada88a64b8484d1af906caff69e383c944e114a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cada88a64b8484d1af906caff… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 28 19:37:18 2016 -0800 msvcrt: Add _lfind_s. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 26 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/misc.c | 72 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 107 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index b335cf8..12586d8 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl _byteswap_ulong(long) ucrtbase._byteswap_ulong @ cdecl _byteswap_ushort(long) ucrtbase._byteswap_ushort @ cdecl _lfind(ptr ptr ptr long ptr) ucrtbase._lfind -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) ucrtbase._lfind_s @ cdecl _lrotl(long long) ucrtbase._lrotl @ cdecl _lrotr(long long) ucrtbase._lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) ucrtbase._lsearch diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 15d5339..a33d00a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1040,7 +1040,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e4ca89d..97f39a5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1386,7 +1386,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl -arch=i386 _libm_sse2_acos_precise() MSVCRT___libm_sse2_acos @ cdecl -arch=i386 _libm_sse2_asin_precise() MSVCRT___libm_sse2_asin @ cdecl -arch=i386 _libm_sse2_atan_precise() MSVCRT___libm_sse2_atan diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f305062..aeb42ee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1396,7 +1396,7 @@ @ cdecl _ldsign(double) MSVCR120__dsign @ cdecl _ldtest(ptr) MSVCR120__ldtest @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl -arch=i386 _libm_sse2_acos_precise() MSVCRT___libm_sse2_acos @ cdecl -arch=i386 _libm_sse2_asin_precise() MSVCRT___libm_sse2_asin @ cdecl -arch=i386 _libm_sse2_atan_precise() MSVCRT___libm_sse2_atan diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 449e8e1..cae7585 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1260,7 +1260,7 @@ @ cdecl _ldsign(double) msvcr120._ldsign @ cdecl _ldtest(ptr) msvcr120._ldtest @ cdecl _lfind(ptr ptr ptr long ptr) msvcr120._lfind -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) msvcr120._lfind_s @ cdecl -arch=i386 _libm_sse2_acos_precise() msvcr120._libm_sse2_acos_precise @ cdecl -arch=i386 _libm_sse2_asin_precise() msvcr120._libm_sse2_asin_precise @ cdecl -arch=i386 _libm_sse2_atan_precise() msvcr120._libm_sse2_atan_precise diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4bcef50..ab81251 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -712,7 +712,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5c34e77..5f7d98f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -690,7 +690,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c1510ef..23a089a 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -103,6 +103,32 @@ void* CDECL _lfind(const void* match, const void* start, } /********************************************************************* + * _lfind_s (MSVCRT.@) + */ +void* CDECL _lfind_s(const void* match, const void* start, + unsigned int* array_size, unsigned int elem_size, + int (CDECL *cf)(void*,const void*,const void*), + void* context) +{ + unsigned int size; + if (!MSVCRT_CHECK_PMT(match != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(array_size != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(start != NULL || *array_size == 0)) return NULL; + if (!MSVCRT_CHECK_PMT(cf != NULL)) return NULL; + if (!MSVCRT_CHECK_PMT(elem_size != 0)) return NULL; + + size = *array_size; + if (size) + do + { + if (cf(context, match, start) == 0) + return (void *)start; /* found */ + start = (const char *)start + elem_size; + } while (--size); + return NULL; +} + +/********************************************************************* * _lsearch (MSVCRT.@) */ void* CDECL _lsearch(const void* match, void* start, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0c1d4ad..d38b0fa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -655,7 +655,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _lfind(ptr ptr ptr long ptr) -# stub _lfind_s(ptr ptr ptr long ptr ptr) +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 77f2873..a6d2833 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -59,6 +59,8 @@ static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, static double (__cdecl *p_atan)(double); static double (__cdecl *p_exp)(double); static double (__cdecl *p_tanh)(double); +static void *(__cdecl *p_lfind_s)(const void*, const void*, unsigned int*, + size_t, int (__cdecl *)(void*, const void*, const void*), void*); static void init(void) { @@ -76,6 +78,7 @@ static void init(void) p_atan = (void *)GetProcAddress(hmod, "atan"); p_exp = (void *)GetProcAddress(hmod, "exp"); p_tanh = (void *)GetProcAddress(hmod, "tanh"); + p_lfind_s = (void *)GetProcAddress(hmod, "_lfind_s"); } static void test_rand_s(void) @@ -597,6 +600,74 @@ static void test_thread_handle_close(void) ok(ret, "ret = %d\n", ret); } +static int __cdecl _lfind_s_comp(void *ctx, const void *l, const void *r) +{ + *(int *)ctx = 0xdeadc0de; + return *(int *)l - *(int *)r; +} + +static void test__lfind_s(void) +{ + static const int tests[] = {9000, 8001, 7002, 6003, 1003, 5004, 4005, 3006, 2007}; + unsigned int num; + void *found; + int ctx; + int key; + + if (!p_lfind_s) + { + win_skip("_lfind_s is not available\n"); + return; + } + + key = 1234; + num = sizeof(tests)/sizeof(tests[0]); + + errno = 0xdeadbeef; + found = p_lfind_s(NULL, tests, &num, sizeof(int), _lfind_s_comp, NULL); + ok(errno == EINVAL, "errno = %d\n", errno); + ok(!found, "Expected NULL, got %p\n", found); + + errno = 0xdeadbeef; + found = p_lfind_s(&key, NULL, &num, sizeof(int), _lfind_s_comp, NULL); + ok(errno == EINVAL, "errno = %d\n", errno); + ok(!found, "Expected NULL, got %p\n", found); + + errno = 0xdeadbeef; + found = p_lfind_s(&key, tests, &num, 0, _lfind_s_comp, NULL); + ok(errno == EINVAL, "errno = %d\n", errno); + ok(!found, "Expected NULL, got %p\n", found); + + errno = 0xdeadbeef; + found = p_lfind_s(&key, tests, &num, sizeof(int), NULL, NULL); + ok(errno == EINVAL, "errno = %d\n", errno); + ok(!found, "Expected NULL, got %p\n", found); + + ctx = -1; + key = 9000; + errno = 0xdeadbeef; + found = p_lfind_s(&key, tests, &num, sizeof(int), _lfind_s_comp, &ctx); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(found == tests, "Expected %p, got %p\n", tests, found); + ok(ctx == 0xdeadc0de, "Expected 0xdeadc0de, got %x\n", ctx); + + ctx = -1; + key = 2007; + errno = 0xdeadbeef; + found = p_lfind_s(&key, tests, &num, sizeof(int), _lfind_s_comp, &ctx); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(found == tests+8, "Expected %p, got %p\n", tests+8, found); + ok(ctx == 0xdeadc0de, "Expected 0xdeadc0de, got %x\n", ctx); + + ctx = -1; + key = 1234; + errno = 0xdeadbeef; + found = p_lfind_s(&key, tests, &num, sizeof(int), _lfind_s_comp, &ctx); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(!found, "Expected NULL, got %p\n", found); + ok(ctx == 0xdeadc0de, "Expected 0xdeadc0de, got %x\n", ctx); +} + START_TEST(misc) { int arg_c; @@ -626,4 +697,5 @@ START_TEST(misc) test_qsort_s(); test_math_functions(); test_thread_handle_close(); + test__lfind_s(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0005850..6253065 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -542,7 +542,7 @@ @ cdecl _ldtest(ptr) MSVCR120__ldtest @ stub _ldunscale @ cdecl _lfind(ptr ptr ptr long ptr) -@ stub _lfind_s +@ cdecl _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl -arch=i386 _libm_sse2_acos_precise() MSVCRT___libm_sse2_acos @ cdecl -arch=i386 _libm_sse2_asin_precise() MSVCRT___libm_sse2_asin @ cdecl -arch=i386 _libm_sse2_atan_precise() MSVCRT___libm_sse2_atan

1 0

Detlef Riekenberg : winspool: Use all Fields from DRIVER_INFO_8A when we add a Printer Driver.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 7cba560ab22158ceb4792fde7b658e4cfa857878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cba560ab22158ceb4792fde7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 27 00:59:50 2016 +0100 winspool: Use all Fields from DRIVER_INFO_8A when we add a Printer Driver. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2b2e0fc..39ae4eb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6948,6 +6948,12 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); } + if ((Level > 2) && diA->pHelpFile) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pHelpFile, -1, NULL, 0); + diW.pHelpFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pHelpFile, -1, diW.pHelpFile, len); + } + if ((Level > 2) && diA->pDependentFiles) { lenA = multi_sz_lenA(diA->pDependentFiles); len = MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, NULL, 0); @@ -6961,7 +6967,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, diW.pMonitorName, len); } - if ((Level > 3) && diA->pDefaultDataType) { + if ((Level > 2) && diA->pDefaultDataType) { len = MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, NULL, 0); diW.pDefaultDataType = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, diW.pDefaultDataType, len); @@ -6974,6 +6980,11 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, diW.pszzPreviousNames, len); } + if (Level > 5) { + diW.ftDriverDate = diA->ftDriverDate; + diW.dwlDriverVersion = diA->dwlDriverVersion; + } + if ((Level > 5) && diA->pszMfgName) { len = MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, NULL, 0); diW.pszMfgName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -6998,8 +7009,42 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, diW.pszProvider, len); } + if ((Level > 7) && diA->pszPrintProcessor) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszPrintProcessor, -1, NULL, 0); + diW.pszPrintProcessor = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszPrintProcessor, -1, diW.pszPrintProcessor, len); + } + + if ((Level > 7) && diA->pszVendorSetup) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszVendorSetup, -1, NULL, 0); + diW.pszVendorSetup = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszVendorSetup, -1, diW.pszVendorSetup, len); + } + + if ((Level > 7) && diA->pszzColorProfiles) { + lenA = multi_sz_lenA(diA->pszzColorProfiles); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzColorProfiles, lenA, NULL, 0); + diW.pszzColorProfiles = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzColorProfiles, lenA, diW.pszzColorProfiles, len); + } + + if ((Level > 7) && diA->pszInfPath) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszInfPath, -1, NULL, 0); + diW.pszInfPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszInfPath, -1, diW.pszInfPath, len); + } + + if ((Level > 7) && diA->pszzCoreDriverDependencies) { + lenA = multi_sz_lenA(diA->pszzCoreDriverDependencies); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzCoreDriverDependencies, lenA, NULL, 0); + diW.pszzCoreDriverDependencies = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzCoreDriverDependencies, lenA, diW.pszzCoreDriverDependencies, len); + } + if (Level > 7) { - FIXME("level %u is incomplete\n", Level); + diW.dwPrinterDriverAttributes = diA->dwPrinterDriverAttributes; + diW.ftMinInboxDriverVerDate = diA->ftMinInboxDriverVerDate; + diW.dwlMinInboxDriverVerVersion = diA->dwlMinInboxDriverVerVersion; } res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags); @@ -7010,6 +7055,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW HeapFree(GetProcessHeap(), 0, diW.pDriverPath); HeapFree(GetProcessHeap(), 0, diW.pDataFile); HeapFree(GetProcessHeap(), 0, diW.pConfigFile); + HeapFree(GetProcessHeap(), 0, diW.pHelpFile); HeapFree(GetProcessHeap(), 0, diW.pDependentFiles); HeapFree(GetProcessHeap(), 0, diW.pMonitorName); HeapFree(GetProcessHeap(), 0, diW.pDefaultDataType); @@ -7018,6 +7064,11 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW HeapFree(GetProcessHeap(), 0, diW.pszOEMUrl); HeapFree(GetProcessHeap(), 0, diW.pszHardwareID); HeapFree(GetProcessHeap(), 0, diW.pszProvider); + HeapFree(GetProcessHeap(), 0, diW.pszPrintProcessor); + HeapFree(GetProcessHeap(), 0, diW.pszVendorSetup); + HeapFree(GetProcessHeap(), 0, diW.pszzColorProfiles); + HeapFree(GetProcessHeap(), 0, diW.pszInfPath); + HeapFree(GetProcessHeap(), 0, diW.pszzCoreDriverDependencies); TRACE("=> %u with %u\n", res, GetLastError()); return res;

1 0

Nikolay Sivov : winecfg: Keep pending settings in static list.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 7179b7d0e95f88642a42a235846322e548c15161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7179b7d0e95f88642a42a2358… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 00:51:42 2016 +0300 winecfg: Keep pending settings in static list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 3ed406b..dbac929 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -221,7 +221,7 @@ struct setting DWORD type; /* type of registry value. REG_SZ or REG_DWORD for now */ }; -struct list *settings; +static struct list settings = LIST_INIT(settings); static void free_setting(struct setting *setting) { @@ -258,7 +258,7 @@ WCHAR *get_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR wine_dbgstr_w(name), wine_dbgstr_w(def)); /* check if it's in the list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { s = LIST_ENTRY(cursor, struct setting, entry); @@ -344,7 +344,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons wine_dbgstr_w(name), wine_dbgstr_w(value)); /* firstly, see if we already set this setting */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *s = LIST_ENTRY(cursor, struct setting, entry); @@ -402,7 +402,7 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons break; } - list_add_tail(settings, &s->entry); + list_add_tail(&settings, &s->entry); } void set_reg_key(HKEY root, const char *path, const char *name, const char *value) @@ -487,7 +487,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) WINE_TRACE("name=%s\n", wine_dbgstr_w(name)); /* check if this value name has been removed in the settings list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *s = LIST_ENTRY(cursor, struct setting, entry); if (lstrcmpiW(s->path, path) != 0) continue; @@ -525,7 +525,7 @@ static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) WINE_TRACE("adding settings in list but not registry\n"); /* now we have to add the values that aren't in the registry but are in the settings list */ - LIST_FOR_EACH( cursor, settings ) + LIST_FOR_EACH( cursor, &settings ) { struct setting *setting = LIST_ENTRY(cursor, struct setting, entry); BOOL found = FALSE; @@ -670,13 +670,13 @@ static void process_setting(struct setting *s) void apply(void) { - if (list_empty(settings)) return; /* we will be called for each page when the user clicks OK */ + if (list_empty(&settings)) return; /* we will be called for each page when the user clicks OK */ WINE_TRACE("()\n"); - while (!list_empty(settings)) + while (!list_empty(&settings)) { - struct setting *s = (struct setting *) list_head(settings); + struct setting *s = (struct setting *) list_head(&settings); process_setting(s); free_setting(s); } @@ -758,9 +758,5 @@ BOOL initialize(HINSTANCE hInstance) return TRUE; } - /* we could probably just have the list as static data */ - settings = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); - list_init(settings); - return FALSE; }

1 0

Nikolay Sivov : msctf: Use interface pointer instead of object pointer.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 137166ff0a3afa7ab3b00a59ff076275e6b31d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=137166ff0a3afa7ab3b00a59f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 00:58:06 2016 +0300 msctf: Use interface pointer instead of object pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index aa838da..e1f56f1 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1336,7 +1336,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); - CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + CompartmentMgr_Constructor((IUnknown*)&This->ITfThreadMgrEx_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); list_init(&This->CurrentPreservedKeys); list_init(&This->CreatedDocumentMgrs);

1 0

Donat Enikeev : crypt32/tests: Certificates update to fix chain failures on Fedora 25.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 8068462bffac436b786348f5091e0ba00eb4445d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8068462bffac436b786348f50… Author: Donat Enikeev <donat(a)enikeev.net> Date: Sat Nov 26 13:07:02 2016 +0300 crypt32/tests: Certificates update to fix chain failures on Fedora 25. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 463 ++++++++++++++++++++++++++++----------------- 1 file changed, 287 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8068462bffac436b78634…

1 0

Nikolay Sivov : shell32: Remove a couple more casts of object pointers.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: e49878289b364f6795dbd8ae10251f70be57ecb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49878289b364f6795dbd8ae1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 17:01:47 2016 +0300 shell32: Remove a couple more casts of object pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3bdd205..4560162 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1218,7 +1218,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This) should always be done before merging menus (OnActivate merges the menus) if one of our windows has the focus.*/ - IShellBrowser_OnViewWindowActive(This->pShellBrowser,(IShellView*) This); + IShellBrowser_OnViewWindowActive(This->pShellBrowser, (IShellView *)&This->IShellView3_iface); ShellView_OnActivate(This, SVUIA_ACTIVATE_FOCUS); /* Set the focus to the listview */ @@ -1594,7 +1594,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn case VK_F5: /* Initiate a refresh */ - IShellView_Refresh((IShellView*)This); + IShellView3_Refresh(&This->IShellView3_iface); break; case VK_BACK:

1 0

Nikolay Sivov : shell32: Get rid of some casts by using IShellFolder2 internally.
by Alexandre Julliard 28 Nov '16

28 Nov '16

Module: wine Branch: master Commit: 1c86f97985d96ae499a57bd682c25992dbfa2352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c86f97985d96ae499a57bd68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 17:01:48 2016 +0300 shell32: Get rid of some casts by using IShellFolder2 internally. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_desktop.c | 6 ++---- dlls/shell32/shfldr_fs.c | 16 +++++++--------- dlls/shell32/shfldr_mycomp.c | 13 ++++++------- dlls/shell32/shfldr_netplaces.c | 13 ++++++------- dlls/shell32/shlfolder.c | 5 ++--- 7 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 1a3b379..206ce13 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -561,7 +561,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U while(cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index b6ebfb2..1f4194e 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -39,7 +39,7 @@ BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) DECLSPEC_HIDDEN; HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) DECLSPEC_HIDDEN; -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) DECLSPEC_HIDDEN; +HRESULT SHELL32_GetItemAttributes (IShellFolder2 *folder, LPCITEMIDLIST pidl, DWORD *attributes) DECLSPEC_HIDDEN; HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 40cd752..8721a9a 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -155,7 +155,6 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; @@ -268,7 +267,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, else { if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes(shell_folder, pidlTemp, pdwAttributes); + hr = SHELL32_GetItemAttributes(iface, pidlTemp, pdwAttributes); } } @@ -454,7 +453,6 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - IShellFolder *shell_folder = (IShellFolder*)iface; static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | @@ -484,7 +482,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, } else if (_ILIsMyComputer(*apidl)) { *rgfInOut &= dwMyComputerAttributes; } else { - SHELL32_GetItemAttributes ( shell_folder, *apidl, rgfInOut); + SHELL32_GetItemAttributes(iface, *apidl, rgfInOut); } apidl++; cidl--; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 2f49eb2..c725927 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -342,10 +342,8 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } else { /* it's the last element */ - if (pdwAttributes && *pdwAttributes) { - hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, - pidlTemp, pdwAttributes); - } + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); } } } @@ -511,19 +509,19 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, *rgfInOut = ~0; if(cidl == 0){ - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 767509b..4022c8d 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -232,8 +232,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, else { if (pdwAttributes && *pdwAttributes) - SHELL32_GetItemAttributes ((IShellFolder*)&This->IShellFolder2_iface, pidlTemp, - pdwAttributes); + SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); hr = S_OK; } @@ -477,18 +476,18 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, *rgfInOut = ~0; if(cidl == 0){ - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else { while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes ((IShellFolder*)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 16e7cd5..b9513a9 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -220,8 +220,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * ifac else { if (pdwAttributes && *pdwAttributes) - hr = SHELL32_GetItemAttributes((IShellFolder *)&This->IShellFolder2_iface, pidlTemp, - pdwAttributes); + hr = SHELL32_GetItemAttributes(&This->IShellFolder2_iface, pidlTemp, pdwAttributes); } } @@ -364,14 +363,14 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface if (cidl == 0) { - IShellFolder *psfParent = NULL; + IShellFolder2 *parent = NULL; LPCITEMIDLIST rpidl = NULL; - hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (void**)&psfParent, &rpidl); + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder2, (void **)&parent, &rpidl); if(SUCCEEDED(hr)) { - SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); - IShellFolder_Release(psfParent); + SHELL32_GetItemAttributes(parent, rpidl, rgfInOut); + IShellFolder2_Release(parent); } } else @@ -379,7 +378,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface while (cidl > 0 && *apidl) { pdump (*apidl); - SHELL32_GetItemAttributes ((IShellFolder *)&This->IShellFolder2_iface, *apidl, rgfInOut); + SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); apidl++; cidl--; } diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index c39d968..8688c5d 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -389,7 +389,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ -HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) +HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) { DWORD dwAttributes; BOOL has_guid; @@ -435,8 +435,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ - HRESULT hr = IShellFolder_GetDisplayNameOf(psf, pidl, SHGDN_FORPARSING, &strret); - + HRESULT hr = IShellFolder2_GetDisplayNameOf(psf, pidl, SHGDN_FORPARSING, &strret); if (SUCCEEDED(hr)) { hr = StrRetToBufW(&strret, pidl, path, MAX_PATH);

1 0