March 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Use a separate device for unbound_sampler_test ().
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: c0fdad52c2d75cee2f161282245542bd741891c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fdad52c2d75cee2f1612822… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:28 2014 +0100 d3d9/tests: Use a separate device for unbound_sampler_test(). --- dlls/d3d9/tests/visual.c | 48 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 98c6252..b142286 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13506,13 +13506,17 @@ static void ds_size_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(old_ds); } -static void unbound_sampler_test(IDirect3DDevice9 *device) +static void unbound_sampler_test(void) { - HRESULT hr; IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; - DWORD color; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; static const DWORD ps_code[] = { @@ -13555,12 +13559,29 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No ps_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) || !(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { - skip("No cube / volume textures support, skipping the unbound sampler test.\n"); - return; + skip("No cube / volume texture support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetTexture(device, 0, NULL); @@ -13585,7 +13606,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 ); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x56ffffff, 0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x56ffffff, 1.0f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, ps); @@ -13641,17 +13662,16 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) color = getPixelColorFromSurface(rt, 32, 32); ok(color == 0xff000000, "Unbound sampler color is %#x.\n", color); - hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetPixelShader failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(rt); IDirect3DSurface9_Release(old_rt); IDirect3DPixelShader9_Release(ps); IDirect3DPixelShader9_Release(ps_cube); IDirect3DPixelShader9_Release(ps_volume); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void update_surface_test(void) @@ -15896,7 +15916,6 @@ START_TEST(visual) cnd_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { dp2add_ps_test(device_ptr); - unbound_sampler_test(device_ptr); } else { skip("No ps_2_0 support\n"); } @@ -15907,6 +15926,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + unbound_sampler_test(); nested_loop_test(); pretransformed_varying_test(); vface_register_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for dp2add_ps_test().
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: cd93070bfd725cedf2dc0fc1182f3f8c6a0971b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd93070bfd725cedf2dc0fc11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 20 09:19:29 2014 +0100 d3d9/tests: Use a separate device for dp2add_ps_test(). --- dlls/d3d9/tests/visual.c | 134 +++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 68 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b142286..bee4b8e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5584,12 +5584,17 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } -static void dp2add_ps_test(IDirect3DDevice9 *device) +static void dp2add_ps_test(void) { - IDirect3DPixelShader9 *shader_dp2add = NULL; - IDirect3DPixelShader9 *shader_dp2add_sat = NULL; - HRESULT hr; + IDirect3DPixelShader9 *shader_dp2add_sat; + IDirect3DPixelShader9 *shader_dp2add; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; /* DP2ADD is defined as: (src0.r * src1.r) + (src0.g * src1.g) + src2. * One D3D restriction of all shader instructions except SINCOS is that no more than 2 @@ -5626,16 +5631,34 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff /* end */ }; - - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) + { + skip("No ps_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_dp2add, &shader_dp2add); @@ -5647,64 +5670,43 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); - if (shader_dp2add) { - - hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - color = getPixelColor(device, 360, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), - "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); - - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - - IDirect3DPixelShader9_Release(shader_dp2add); - } else { - skip("dp2add shader creation failed\n"); - } - - if (shader_dp2add_sat) { - - hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add_sat); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw primitive, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + color = getPixelColor(device, 360, 240); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), "Got unexpected color 0x%08x.\n", color); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present frame, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader_dp2add); - color = getPixelColor(device, 360, 240); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), - "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + hr = IDirect3DDevice9_SetPixelShader(device, shader_dp2add_sat); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw primitive, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + color = getPixelColor(device, 360, 240); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), "Got unexpected color 0x%08x.\n", color); - IDirect3DPixelShader9_Release(shader_dp2add_sat); - } else { - skip("dp2add shader creation failed\n"); - } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present frame, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader_dp2add_sat); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void cnd_test(IDirect3DDevice9 *device) @@ -15914,11 +15916,6 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(2, 0)) { - dp2add_ps_test(device_ptr); - } else { - skip("No ps_2_0 support\n"); - } } } else skip("No ps_1_1 support\n"); @@ -15926,6 +15923,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + dp2add_ps_test(); unbound_sampler_test(); nested_loop_test(); pretransformed_varying_test();

1 0

Frédéric Delanoy : urlmon/tests: Use BOOL type where appropriate.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: ed9607876c19ebd64e40b08f3367fde9de812ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9607876c19ebd64e40b08f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 20 09:29:36 2014 +0100 urlmon/tests: Use BOOL type where appropriate. --- dlls/urlmon/tests/misc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 78d3448..7071aa9 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1740,7 +1740,8 @@ static void test_internet_features_registry(void) { char *name; HKEY feature_control; HKEY feature; - DWORD value, skip_zone; + DWORD value; + BOOL skip_zone; BOOL delete_feature_key = TRUE; static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; @@ -1805,11 +1806,11 @@ static void test_internet_features_registry(void) { if (res == ERROR_ACCESS_DENIED) { skip("Not allowed to modify zone elevation\n"); - skip_zone = 1; + skip_zone = TRUE; } else { - skip_zone = 0; + skip_zone = FALSE; ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS);

1 0

Dmitry Timoshkov : widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: e6d585a6b26c362369a9727896fc547f59e4dfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d585a6b26c362369a972789… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 20 18:32:39 2014 +0900 widl: Move is_void(), is_declptr() and is_conformant_array() to header.h and make them inline. --- tools/widl/header.c | 10 ---------- tools/widl/header.h | 18 +++++++++++++++--- tools/widl/typegen.c | 5 ----- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4ca6ed5..4f2222a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -109,16 +109,6 @@ unsigned int get_attrv(const attr_list_t *list, enum attr_type t) return 0; } -int is_void(const type_t *t) -{ - return type_get_type(t) == TYPE_VOID; -} - -int is_conformant_array(const type_t *t) -{ - return is_array(t) && type_array_has_conformance(t); -} - static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; diff --git a/tools/widl/header.h b/tools/widl/header.h index 8ca1cf1..10601ff 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -28,9 +28,6 @@ extern int is_aliaschain_attr(const type_t *var, enum attr_type t); extern int is_attr(const attr_list_t *list, enum attr_type t); extern void *get_attrp(const attr_list_t *list, enum attr_type t); extern unsigned int get_attrv(const attr_list_t *list, enum attr_type t); -extern int is_void(const type_t *t); -extern int is_conformant_array(const type_t *t); -extern int is_declptr(const type_t *t); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); @@ -68,6 +65,21 @@ static inline int is_array(const type_t *t) return type_get_type(t) == TYPE_ARRAY; } +static inline int is_void(const type_t *t) +{ + return type_get_type(t) == TYPE_VOID; +} + +static inline int is_declptr(const type_t *t) +{ + return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); +} + +static inline int is_conformant_array(const type_t *t) +{ + return is_array(t) && type_array_has_conformance(t); +} + static inline int last_ptr(const type_t *type) { return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d017521..37d18f5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2774,11 +2774,6 @@ static void write_pointer_description(FILE *file, type_t *type, &offset_in_memory, &offset_in_buffer, typestring_offset); } -int is_declptr(const type_t *t) -{ - return is_ptr(t) || (type_get_type(t) == TYPE_ARRAY && type_array_is_decl_as_ptr(t)); -} - static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, enum type_context context, const char *name, unsigned int *typestring_offset)

1 0

Alexandre Julliard : user32/tests: Make a few more messages optional.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: e445303ab45b218585357220c9c2d37d6418ba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e445303ab45b218585357220c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 11:37:39 2014 +0100 user32/tests: Make a few more messages optional. --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e445303ab45b218585357…

1 0

Nikolay Sivov : msi: MsiInstaller coclass is not included in a typelib.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 117ae2576496df1b03b7d8283093d608e94b3d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=117ae2576496df1b03b7d8283… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:14 2014 +0400 msi: MsiInstaller coclass is not included in a typelib. --- dlls/msi/msiserver.idl | 17 ++++++++--------- dlls/msi/msiserver.rgs | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f351ab1..5052602 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -153,6 +153,14 @@ coclass MsiServerMessage { interface IMsiMessage; } coclass PSFactoryBuffer { interface IPSFactoryBuffer; } [ + helpstring("Microsoft Windows Installer"), + threading(apartment), + progid("WindowsInstaller.Installer"), + uuid(000c1090-0000-0000-c000-000000000046) +] +coclass MsiInstaller { interface Installer; } + +[ uuid(000c1082-0000-0000-c000-000000000046) ] coclass MsiTransform { } @@ -184,7 +192,6 @@ coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } ] coclass WineMsiRemotePackage { interface WineMsiRemotePackage; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller { @@ -551,12 +558,4 @@ library WindowsInstaller properties: methods: } - - [ - helpstring("Microsoft Windows Installer"), - threading(apartment), - progid("WindowsInstaller.Installer"), - uuid(000c1090-0000-0000-c000-000000000046) - ] - coclass MsiInstaller { interface Installer; } } diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index 9f408db..c77ad2b 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -3,6 +3,11 @@ HKCR NoRemove CLSID { '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } - '{000C1090-0000-0000-C000-000000000046}' { InProcHandler32 = s 'ole32.dll' } + '{000C1090-0000-0000-C000-000000000046}' + { + TypeLib = s '{000C1092-0000-0000-C000-000000000046}' + Version = s '1.0' + InProcHandler32 = s 'ole32.dll' + } } }

1 0

Nikolay Sivov : msi: Update MsiServerMessage registration version to match module version.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 20e4705192dda4d7d127b20d9989052bb31611d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e4705192dda4d7d127b20d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 14:09:35 2014 +0400 msi: Update MsiServerMessage registration version to match module version. --- dlls/msi/msiserver.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msiserver.rgs b/dlls/msi/msiserver.rgs index c77ad2b..1313bd9 100644 --- a/dlls/msi/msiserver.rgs +++ b/dlls/msi/msiserver.rgs @@ -2,7 +2,7 @@ HKCR { NoRemove CLSID { - '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '3.1.4000' } + '{000C101D-0000-0000-C000-000000000046}' { DllVersion = s '4.5.6001' } '{000C1090-0000-0000-C000-000000000046}' { TypeLib = s '{000C1092-0000-0000-C000-000000000046}'

1 0

Jacek Caban : oleaut32: Fixed vartest.c tests on Windows 8.1.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: b6db22da3bfbe4ab93c953406e76c4674af7051c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6db22da3bfbe4ab93c953406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 20 12:28:12 2014 +0100 oleaut32: Fixed vartest.c tests on Windows 8.1. --- dlls/oleaut32/tests/vartest.c | 11 ++++------- dlls/oleaut32/variant.c | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2f82d9b..d28b5c1 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -542,14 +542,11 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) static void test_VariantInit(void) { - VARIANTARG v1, v2; + VARIANT v; - /* Test that VariantInit() only sets the type */ - memset(&v1, -1, sizeof(v1)); - v2 = v1; - V_VT(&v2) = VT_EMPTY; - VariantInit(&v1); - ok(!memcmp(&v1, &v2, sizeof(v1)), "VariantInit() set extra fields\n"); + memset(&v, -1, sizeof(v)); + VariantInit(&v); + ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 92cf01b..053903e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -575,7 +575,8 @@ void WINAPI VariantInit(VARIANTARG* pVarg) { TRACE("(%p)\n", pVarg); - V_VT(pVarg) = VT_EMPTY; /* Native doesn't set any other fields */ + /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ + V_VT(pVarg) = VT_EMPTY; } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)

1 0

Piotr Caban : msvcrt: Don't add 0x prefix while printing 0 with printf.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: 2693ce1a253e5fe2f684d5805b7b7c12e6294b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2693ce1a253e5fe2f684d5805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 20 16:20:26 2014 +0100 msvcrt: Don't add 0x prefix while printing 0 with printf. --- dlls/msvcrt/printf.h | 8 +++++--- dlls/msvcrt/tests/printf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 96e7845..a462f3a 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -265,9 +265,11 @@ static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, int buf_len, } i = 0; - if(x==0 && flags->Precision) - buf[i++] = '0'; - else { + if(x == 0) { + flags->Alternate = 0; + if(flags->Precision) + buf[i++] = '0'; + } else { while(x != 0) { j = (ULONGLONG)x%base; x = (ULONGLONG)x/base; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 24bc401..829b2e0 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -329,18 +329,52 @@ static void test_sprintf( void ) format = "%#012x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x0000000001"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"000000000000"),"Hexadecimal zero-padded \"%s\"\n",buffer); + ok( r==12, "return count wrong\n"); format = "%#04.8x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x00000001"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==10, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00000000"), "Hexadecimal zero-padded precision \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); format = "%#-08.2x"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"0x01 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"00 "), "Hexadecimal zero-padded not left-adjusted \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#.0x"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"0x1"), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==3, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,""), "Hexadecimal zero-padded zero-precision \"%s\"\n",buffer); + ok( r==0, "return count wrong\n"); format = "%#08o"; r = sprintf(buffer,format,1); ok(!strcmp(buffer,"00000001"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + + format = "%#o"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"01"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==2, "return count wrong\n"); + + r = sprintf(buffer,format,0); + ok(!strcmp(buffer,"0"), "Octal zero-padded \"%s\"\n",buffer); + ok( r==1, "return count wrong\n"); if (sizeof(void *) == 8) {

1 0

Nikolay Sivov : user32: Added ChangeWindowMessageFilterEx() stub.
by Alexandre Julliard 20 Mar '14

20 Mar '14

Module: wine Branch: master Commit: d3c9e8a7e65c121c2f36641dd67711526c5896d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c9e8a7e65c121c2f36641dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 20 20:24:58 2014 +0400 user32: Added ChangeWindowMessageFilterEx() stub. --- dlls/user32/message.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1aee670..e5dfa3e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4578,3 +4578,12 @@ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) FIXME( "%x %08x\n", message, flag ); return TRUE; } + +/****************************************************************** + * ChangeWindowMessageFilterEx (USER32.@) + */ +BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) +{ + FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 052f7ff..fe3906f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -39,6 +39,7 @@ @ stdcall ChangeMenuA(long long ptr long long) @ stdcall ChangeMenuW(long long ptr long long) @ stdcall ChangeWindowMessageFilter(long long) +@ stdcall ChangeWindowMessageFilterEx(long long long ptr) @ stdcall CharLowerA(str) @ stdcall CharLowerBuffA(str long) @ stdcall CharLowerBuffW(wstr long) diff --git a/include/winuser.h b/include/winuser.h index e28bb13..0f3d0b1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3219,6 +3219,27 @@ typedef struct #define AnsiToOemBuffW CharToOemBuffW #define AnsiToOemBuff WINELIB_NAME_AW(AnsiToOemBuff) +/* ChangeWindowMessageFilter flags */ +#define MSGFLT_ADD 1 +#define MSGFLT_REMOVE 2 + +/* ChangeWindowMessageFilterEx defines */ +#define MSGFLTINFO_NONE 0 +#define MSGFLTINFO_ALREADYALLOWED_FORWND 1 +#define MSGFLTINFO_ALREADYDISALLOWED_FORWND 2 +#define MSGFLTINFO_ALLOWED_HIGHER 3 + +typedef struct tagCHANGEFILTERSTRUCT +{ + DWORD cbSize; + DWORD ExtStatus; +} CHANGEFILTERSTRUCT, *PCHANGEFILTERSTRUCT; + +/* Actions for ChangeWindowMessageFilterEx */ +#define MSGFLT_RESET 0 +#define MSGFLT_ALLOW 1 +#define MSGFLT_DISALLOW 2 + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3293,6 +3314,8 @@ WINUSERAPI BOOL WINAPI ChangeClipboardChain(HWND,HWND); WINUSERAPI BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT); WINUSERAPI BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT); #define ChangeMenu WINELIB_NAME_AW(ChangeMenu) +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilter(UINT,DWORD); +WINUSERAPI BOOL WINAPI ChangeWindowMessageFilterEx(HWND,UINT,DWORD,CHANGEFILTERSTRUCT*); WINUSERAPI LPSTR WINAPI CharLowerA(LPSTR); WINUSERAPI LPWSTR WINAPI CharLowerW(LPWSTR); #define CharLower WINELIB_NAME_AW(CharLower)

1 0