March 2019 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to the get technique helpers.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 42839d15e3ec829f939fe1f99ac6b025f64b18de URL: https://source.winehq.org/git/wine.git/?a=commit;h=42839d15e3ec829f939fe1f9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 5 22:34:20 2019 +0100 d3dx9: Pass a struct d3dx_effect to the get technique helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6a0b262..bbbfb45 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -453,9 +453,10 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE)pass; } -static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *base, const char *name) +static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, const char *name) { - UINT i; + struct d3dx9_base_effect *base = &effect->base_effect; + unsigned int i; if (!name) return NULL; @@ -468,8 +469,9 @@ static struct d3dx_technique *get_technique_by_name(struct d3dx9_base_effect *ba return NULL; } -static struct d3dx_technique *get_valid_technique(struct d3dx9_base_effect *base, D3DXHANDLE technique) +static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3DXHANDLE technique) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; for (i = 0; i < base->technique_count; ++i) @@ -478,7 +480,7 @@ static struct d3dx_technique *get_valid_technique(struct d3dx9_base_effect *base return &base->techniques[i]; } - return get_technique_by_name(base, technique); + return get_technique_by_name(effect, technique); } static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass) @@ -1163,7 +1165,7 @@ static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXH struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); - struct d3dx_technique *technique = get_valid_technique(base, object); + struct d3dx_technique *technique = get_valid_technique(effect, object); if (pass) { @@ -3161,7 +3163,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = technique ? get_valid_technique(&effect->base_effect, technique) : &effect->base_effect.techniques[0]; + struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->base_effect.techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); @@ -3357,7 +3359,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_technique_by_name(&effect->base_effect, name); + struct d3dx_technique *tech = get_technique_by_name(effect, name); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -3376,7 +3378,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, cons static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); @@ -3394,7 +3396,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE tech static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); @@ -3860,15 +3862,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** static HRESULT WINAPI d3dx_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &This->base_effect; - struct d3dx_technique *tech = get_valid_technique(base, technique); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_technique *tech = get_valid_technique(effect, technique); - TRACE("iface %p, technique %p\n", This, technique); + TRACE("iface %p, technique %p\n", iface, technique); if (tech) { - This->active_technique = tech; + effect->active_technique = tech; TRACE("Technique %p\n", tech); return D3D_OK; } @@ -3891,7 +3892,7 @@ static HRESULT WINAPI d3dx_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHAND { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; - struct d3dx_technique *tech = get_valid_technique(base, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); HRESULT ret = D3D_OK; unsigned int i, j; @@ -3947,7 +3948,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D if (technique) { - if (!(prev_tech = get_valid_technique(base, technique))) + if (!(prev_tech = get_valid_technique(effect, technique))) return D3DERR_INVALIDCALL; for (i = 0; i < base->technique_count; ++i) @@ -4090,7 +4091,7 @@ static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE pa { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); - struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); + struct d3dx_technique *tech = get_valid_technique(effect, technique); BOOL ret; TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique);

1 0

Alistair Leslie-Hughes : setupapi: Added CM_Request_Device_EjectA/W stub.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 343e486e83fc9667bfeac22519f1b0c31e29c1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=343e486e83fc9667bfeac225… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 6 21:25:16 2019 +0100 setupapi: Added CM_Request_Device_EjectA/W stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45879 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 18 ++++++++++++++++++ include/cfgmgr32.h | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index cea6dac..d633211 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -168,8 +168,8 @@ @ stub CM_Remove_SubTree_Ex @ stub CM_Remove_Unmarked_Children @ stub CM_Remove_Unmarked_Children_Ex -@ stub CM_Request_Device_EjectA -@ stub CM_Request_Device_EjectW +@ stdcall CM_Request_Device_EjectA(ptr ptr ptr long long) +@ stdcall CM_Request_Device_EjectW(ptr ptr ptr long long) @ stub CM_Request_Eject_PC @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4994ca4..4db32dd 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -696,3 +696,21 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA Devi SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * CM_Request_Device_EjectA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Request_Device_EjectW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags) +{ + FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + return CR_SUCCESS; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index da09115..15340a6 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -175,6 +175,23 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; +typedef enum _PNP_VETO_TYPE +{ + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + DECL_WINELIB_CFGMGR32_TYPE_AW(DEVNODEID) DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) @@ -213,6 +230,9 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags); +CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags); +#define CM_Request_Device_Eject WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) #ifdef __cplusplus }

1 0

Louis Lenders : bthprops.cpl: Add BluetoothFindDeviceClose stub.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: f59e7f839185bd72830877711587f8694b2678c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59e7f839185bd7283087771… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Mar 6 04:03:27 2019 -0500 bthprops.cpl: Add BluetoothFindDeviceClose stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46706 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index ed80b0e..626b385 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -11,7 +11,7 @@ @ stub BluetoothEnumerateInstalledServicesEx @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId @ stdcall BluetoothFindFirstDevice(ptr ptr) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index d670f2e..60a781e 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -60,3 +60,13 @@ BOOL WINAPI BluetoothFindRadioClose(HBLUETOOTH_RADIO_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindDeviceClose + */ +BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) +{ + FIXME("(%p): stub!\n", find); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index d628315..ca24b49 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -8,7 +8,7 @@ @ stub BluetoothEnumerateInstalledServices @ stub BluetoothFindBrowseGroupClose @ stub BluetoothFindClassIdClose -@ stub BluetoothFindDeviceClose +@ stdcall BluetoothFindDeviceClose(ptr) bthprops.cpl.BluetoothFindDeviceClose @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId @ stdcall BluetoothFindFirstDevice(ptr ptr) bthprops.cpl.BluetoothFindFirstDevice

1 0

Jacek Caban : rpcrt4/tests: Avoid type redefinition.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 994976dcb3f42a370f0419fbd3c3fe7980d0e297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=994976dcb3f42a370f0419fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 7 14:00:51 2019 +0100 rpcrt4/tests: Avoid type redefinition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46680 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- dlls/rpcrt4/tests/server.idl | 50 ++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index d68918b..e6555fa 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -27,7 +27,7 @@ #include <netfw.h> #include "wine/test.h" #include "server.h" -#define SKIP_STRUCT_DECLS +#define SKIP_TYPE_DECLS #include "server_interp.h" #include "server_defines.h" diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 143d506..afda2ed 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -37,16 +37,16 @@ import "objidl.idl"; #define ISERVER_UUID 00000000-4114-0704-2301-000000000000 #endif -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct tag_vector { int x; int y; int z; } vector_t; -cpp_quote("#endif") typedef int fnprintf(const char *format, ...); +cpp_quote("#endif") [ uuid(ISERVER_UUID), @@ -58,7 +58,7 @@ cpp_quote("#if 0") typedef wchar_t WCHAR; cpp_quote("#endif") -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef [string] char *str_t; typedef [string] WCHAR *wstr_t; @@ -121,7 +121,7 @@ cpp_quote("#endif") double ptypes_sum(ptypes_t *ptypes); int dot_pvectors(pvectors_t *pvectors); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") /* don't use this anywhere except in sp_t */ typedef struct { @@ -138,7 +138,7 @@ cpp_quote("#endif") int sum_sp(sp_t *sp); double square_sun(sun_t *su); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct test_list { int t; @@ -162,7 +162,7 @@ cpp_quote("#endif") int dot_two_vectors(vector_t vs[2]); void get_number_array([out, length_is(*n)] int x[20], [out] int *n); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { int n; @@ -192,10 +192,12 @@ cpp_quote("#endif") int get_cpsc(int n, [out] cpsc_t *cpsc ); int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef [wire_marshal(int)] void *puint_t; +cpp_quote("#endif") int square_puint(puint_t p); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { [size_is(n)] puint_t *ps; @@ -214,7 +216,7 @@ cpp_quote("#endif") int sum_cpuints(cpuints_t *p); int dot_copy_vectors(vector_t u, vector_t v); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct wire_us *wire_us_t; typedef [wire_marshal(wire_us_t)] struct us us_t; struct us @@ -233,7 +235,7 @@ cpp_quote("#endif") int square_test_us(test_us_t *tus); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef union encu switch (int t) { case ENCU_I: int i; @@ -277,7 +279,7 @@ cpp_quote("#endif") int sum_toplev_conf_2n([size_is(n * 2)] int *x, int n); int sum_toplev_conf_cond([size_is(c ? a : b)] int *x, int a, int b, int c); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { char c; @@ -289,7 +291,7 @@ cpp_quote("#endif") double sum_aligns(aligns_t *a); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { int i; @@ -301,7 +303,7 @@ cpp_quote("#endif") int sum_padded2(padded_t ps[2]); int sum_padded_conf([size_is(n)] padded_t *ps, int n); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { int *p1; @@ -319,7 +321,7 @@ cpp_quote("#endif") int sum_bogus(bogus_t *b); void check_null([unique] int *null); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { str_t s; @@ -334,7 +336,7 @@ cpp_quote("#endif") int str_struct_len(str_struct_t *s); int wstr_struct_len(wstr_struct_t *s); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { unsigned int n; @@ -351,19 +353,19 @@ cpp_quote("#endif") int sum_doub_carr(doub_carr_t *dc); void make_pyramid_doub_carr(unsigned char n, [out] doub_carr_t **dc); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { short n; [size_is(n)] short data[]; } user_bstr_t; -cpp_quote("#endif") typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; +cpp_quote("#endif") unsigned hash_bstr(bstr_t s); void get_a_bstr([out]bstr_t *s); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { [string, size_is(size)] char *name; @@ -372,15 +374,17 @@ cpp_quote("#ifndef SKIP_STRUCT_DECLS") cpp_quote("#endif") void get_name([in,out] name_t *name); +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef char **str_array_t; - void get_names([out] int *n, [out, string, size_is(,*n)] str_array_t *names); typedef WCHAR **wstr_array_t; +cpp_quote("#endif") + void get_names([out] int *n, [out, string, size_is(,*n)] str_array_t *names); void get_namesw([out] int *n, [out, string, size_is(,*n)] wstr_array_t *names); int sum_pcarr2(int n, [size_is(, n)] int **pa); int sum_L1_norms(int n, [size_is(n)] vector_t *vs); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") /* Don't use this except in the get_s123 test. */ typedef struct { @@ -394,7 +398,7 @@ cpp_quote("#endif") type as a return value. */ s123_t *get_s123(void); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef struct { unsigned int length; @@ -408,7 +412,7 @@ cpp_quote("#endif") str_t get_filename(void); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") enum renum { RE0, @@ -435,7 +439,7 @@ cpp_quote("#endif") void stop(void); void stop_autolisten(void); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef union ipu switch(int t) { default: IStream *stream; @@ -447,7 +451,7 @@ cpp_quote("#endif") int sum_ptr_array([in] int *a[2]); int sum_array_ptr([in] int (*a)[2]); -cpp_quote("#ifndef SKIP_STRUCT_DECLS") +cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef [context_handle] void *ctx_handle_t; cpp_quote("#endif")

1 0

Jactry Zeng : propsys: Add VT_CLSID support for PropVariantToGUID().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 6d2c277a8b3243c7083d7ba8ba2a5f05b53a85e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2c277a8b3243c7083d7ba8… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Feb 16 00:15:39 2019 +0800 propsys: Add VT_CLSID support for PropVariantToGUID(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 3 +++ dlls/propsys/tests/propsys.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ef490be..988cf81 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -739,6 +739,9 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + case VT_CLSID: + memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); + return S_OK; default: FIXME("unsupported vt: %d\n", ppropvar->vt); diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 299675d..059b622 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -568,7 +568,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar); @@ -576,7 +576,7 @@ static void test_PropVariantToGUID(void) hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt); propvar.u.pwszVal[1] = 'd'; @@ -584,7 +584,7 @@ static void test_PropVariantToGUID(void) propvar.u.pwszVal[3] = 'a'; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); propvar.u.pwszVal[1] = 'z'; hres = PropVariantToGUID(&propvar, &guid); @@ -597,7 +597,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&IID_NULL, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); VariantClear(&var); hres = InitVariantFromGUIDAsString(&dummy_guid, &var); @@ -605,7 +605,7 @@ static void test_PropVariantToGUID(void) hres = VariantToGUID(&var, &guid); ok(hres == S_OK, "VariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var)); V_BSTR(&var)[1] = 'z'; @@ -618,7 +618,14 @@ static void test_PropVariantToGUID(void) V_VT(&var) = VT_EMPTY; hres = PropVariantToGUID(&propvar, &guid); ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); - ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); + PropVariantClear(&propvar); + + memset(&guid, 0, sizeof(guid)); + InitPropVariantFromCLSID(&dummy_guid, &propvar); + hres = PropVariantToGUID(&propvar, &guid); + ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres); + ok(IsEqualGUID(&dummy_guid, &guid), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid)); PropVariantClear(&propvar); }

1 0

Jactry Zeng : propsys: Add VT_EMPTY support for PropVariantToStringAlloc() .
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 8db8c94155557b07e8bcc54ab0cda2bed34ba28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db8c94155557b07e8bcc54a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Feb 16 00:14:54 2019 +0800 propsys: Add VT_EMPTY support for PropVariantToStringAlloc(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 1 + dlls/propsys/tests/propsys.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0edf462..396afbf 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -314,6 +314,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) switch(propvarIn->vt) { + case VT_EMPTY: case VT_NULL: res = CoTaskMemAlloc(1*sizeof(WCHAR)); res[0] = '\0'; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a9c0a77..926dc3d 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -641,6 +641,12 @@ static void test_PropVariantToStringAlloc(void) ok(!lstrcmpW(str, topicW), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); PropVariantClear(&prop); + + prop.vt = VT_EMPTY; + hres = PropVariantToStringAlloc(&prop, &str); + ok(hres == S_OK, "returned %x\n", hres); + ok(!lstrcmpW(str, emptyW), "got %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); } static void test_PropVariantCompare(void)

1 0

Nikolay Sivov : mf: Add support for clock sink notifications.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 338ba122f316a5234831ba8b66f36de8f021aaf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=338ba122f316a5234831ba8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 10:07:54 2019 +0300 mf: Add support for clock sink notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 3 + include/mfidl.idl | 2 + 3 files changed, 224 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=338ba122f316a5234831…

1 0

Nikolay Sivov : mf: Control time source state from presentation clock.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: c815f908f97c9f90ee08a82a1a5b2d7c052a5fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c815f908f97c9f90ee08a82a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 7 10:07:52 2019 +0300 mf: Control time source state from presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 67 +++++++++++++++++++++++++++++ include/mferror.h | 3 +- 3 files changed, 182 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2961abe..27b2c4c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -47,6 +47,7 @@ struct presentation_clock IMFShutdown IMFShutdown_iface; LONG refcount; IMFPresentationTimeSource *time_source; + IMFClockStateSink *time_source_sink; MFCLOCK_STATE state; CRITICAL_SECTION cs; }; @@ -341,6 +342,8 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) { if (clock->time_source) IMFPresentationTimeSource_Release(clock->time_source); + if (clock->time_source_sink) + IMFClockStateSink_Release(clock->time_source_sink); DeleteCriticalSection(&clock->cs); heap_free(clock); } @@ -395,9 +398,29 @@ static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, M static HRESULT WINAPI present_clock_SetTimeSource(IMFPresentationClock *iface, IMFPresentationTimeSource *time_source) { - FIXME("%p, %p.\n", iface, time_source); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, time_source); + + EnterCriticalSection(&clock->cs); + if (clock->time_source) + IMFPresentationTimeSource_Release(clock->time_source); + if (clock->time_source_sink) + IMFClockStateSink_Release(clock->time_source_sink); + clock->time_source = NULL; + clock->time_source_sink = NULL; + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&clock->time_source_sink); + if (SUCCEEDED(hr)) + { + clock->time_source = time_source; + IMFPresentationTimeSource_AddRef(clock->time_source); + } + + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_GetTimeSource(IMFPresentationClock *iface, @@ -443,25 +466,107 @@ static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *i return E_NOTIMPL; } +enum clock_command +{ + CLOCK_CMD_START = 0, + CLOCK_CMD_STOP, + CLOCK_CMD_PAUSE, + CLOCK_CMD_MAX, +}; + +static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_command command) +{ + static const BYTE state_change_is_allowed[MFCLOCK_STATE_PAUSED+1][CLOCK_CMD_MAX] = + { /* S S* P */ + /* INVALID */ { 1, 1, 1 }, + /* RUNNING */ { 1, 1, 1 }, + /* STOPPED */ { 1, 1, 0 }, + /* PAUSED */ { 1, 1, 0 }, + }; + static const MFCLOCK_STATE states[CLOCK_CMD_MAX] = + { + /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, + /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, + /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + }; + HRESULT hr; + + /* FIXME: use correct timestamps. */ + + if (clock->state == states[command] && clock->state != MFCLOCK_STATE_RUNNING) + return MF_E_CLOCK_STATE_ALREADY_SET; + + if (!state_change_is_allowed[clock->state][command]) + return MF_E_INVALIDREQUEST; + + switch (command) + { + case CLOCK_CMD_START: + if (clock->state == MFCLOCK_STATE_PAUSED) + hr = IMFClockStateSink_OnClockRestart(clock->time_source_sink, 0); + else + hr = IMFClockStateSink_OnClockStart(clock->time_source_sink, 0, 0); + break; + case CLOCK_CMD_STOP: + hr = IMFClockStateSink_OnClockStop(clock->time_source_sink, 0); + break; + case CLOCK_CMD_PAUSE: + hr = IMFClockStateSink_OnClockPause(clock->time_source_sink, 0); + break; + default: + ; + } + + if (FAILED(hr)) + return hr; + + clock->state = states[command]; + + /* FIXME: notify registered sinks. */ + + return S_OK; +} + static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG start_offset) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_START); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_STOP); + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_Pause(IMFPresentationClock *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + hr = clock_change_state(clock, CLOCK_CMD_PAUSE); + LeaveCriticalSection(&clock->cs); + + return hr; } static const IMFPresentationClockVtbl presentationclockvtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9fa0bda..bae674d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -735,8 +735,37 @@ static void test_MFShutdownObject(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +enum clock_action +{ + CLOCK_START, + CLOCK_STOP, + CLOCK_PAUSE, +}; + static void test_presentation_clock(void) { + static const struct clock_state_test + { + enum clock_action action; + MFCLOCK_STATE clock_state; + MFCLOCK_STATE source_state; + HRESULT hr; + } + clock_state_change[] = + { + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID, MF_E_INVALIDREQUEST }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_INVALID, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, MFCLOCK_STATE_PAUSED }, + { CLOCK_PAUSE, MFCLOCK_STATE_PAUSED, MFCLOCK_STATE_PAUSED, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED }, + { CLOCK_START, MFCLOCK_STATE_RUNNING, MFCLOCK_STATE_RUNNING }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED }, + { CLOCK_STOP, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED, MF_E_CLOCK_STATE_ALREADY_SET }, + { CLOCK_PAUSE, MFCLOCK_STATE_STOPPED, MFCLOCK_STATE_STOPPED, MF_E_INVALIDREQUEST }, + }; IMFPresentationTimeSource *time_source; IMFRateControl *rate_control; IMFPresentationClock *clock; @@ -746,6 +775,7 @@ static void test_presentation_clock(void) MFCLOCK_STATE state; IMFTimer *timer; MFTIME systime; + unsigned int i; DWORD value; HRESULT hr; @@ -779,6 +809,43 @@ todo_wine todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); + /* Set default time source. */ + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationClock_SetTimeSource(clock, time_source); + ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + + /* State changes. */ + for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) + { + switch (clock_state_change[i].action) + { + case CLOCK_STOP: + hr = IMFPresentationClock_Stop(clock); + break; + case CLOCK_PAUSE: + hr = IMFPresentationClock_Pause(clock); + break; + case CLOCK_START: + hr = IMFPresentationClock_Start(clock, 0); + break; + default: + ; + } + ok(hr == clock_state_change[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].source_state, "%u: unexpected state %d.\n", i, state); + + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "%u: failed to get state, hr %#x.\n", i, hr); + ok(state == clock_state_change[i].clock_state, "%u: unexpected state %d.\n", i, state); + } + + IMFPresentationTimeSource_Release(time_source); + hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); IMFRateControl_Release(rate_control); diff --git a/include/mferror.h b/include/mferror.h index be35e6e..f7f0934 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -82,6 +82,7 @@ #define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) #define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) -#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) +#define MF_E_CLOCK_NO_TIME_SOURCE _HRESULT_TYPEDEF_(0xc00d9c41) +#define MF_E_CLOCK_STATE_ALREADY_SET _HRESULT_TYPEDEF_(0xc00d9c42) #endif /* __WINE_MFERROR_H */

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for NM_CUSTOMDRAW buttons.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: e09003babc0332ae993a51ba902255980c868ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09003babc0332ae993a51ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 5 15:13:29 2019 +0200 comctl32/tests: Add tests for NM_CUSTOMDRAW buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 244 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 226 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e09003babc0332ae993a…

1 0

Gabriel Ivăncescu : comctl32/button: Don' t draw the button when losing focus before invalidating it.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: efacaf1b5a57f2005459497852e549811868d0d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efacaf1b5a57f20054594978… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 5 15:13:28 2019 +0200 comctl32/button: Don't draw the button when losing focus before invalidating it. It's already invalidated at the end so there's no reason to draw it before that. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 1 - dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 16b36d4..f7497a1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -770,7 +770,6 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_KILLFOCUS: TRACE("WM_KILLFOCUS %p\n",hWnd); infoPtr->state &= ~BST_FOCUS; - paint_button( infoPtr, btn_type, ODA_FOCUS ); if ((infoPtr->state & BUTTON_BTNPRESSED) && GetCapture() == hWnd) ReleaseCapture(); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index ce673af..753aa24 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -600,11 +600,10 @@ static void test_button_messages(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setfocus, "SetFocus(hwnd) on a button", todo); - todo = button[i].style == BS_OWNERDRAW; SetFocus(0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].killfocus, "SetFocus(0) on a button", todo); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].killfocus, "SetFocus(0) on a button", FALSE); ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SendMessageA(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE);

1 0