January 2022 - Wine-devel - list.winehq.org

[PATCH 1/2] uxtheme: Search TMT_IMAGEFILE1~7 first when drawing background for parts without glyph images.
by Zhiyi Zhang 25 Jan '22

25 Jan '22

Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. This behavior can be verified by drawing scroll bar arrow buttons, where TMT_IMAGEFILE is used for background despite TMT_IMAGEFILE1 being present and TMT_IMAGEFILE1 is used for glyphs despite TMT_IMAGEFILE is present. For parts without glyph images, TMT_IMAGEFILE1~7 are always searched first, then try TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. Fix the size grip on status control not being painted when using builtin Light theme. The status gripper part uses TMT_IMAGEFILE1~7 and doesn't have TMT_IMAGEFILE. So when UXTHEME_SelectImage() tries to query TMT_IMAGEFILE for status gripper, it falls back to using status class TMT_IMAGEFILE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4aac46f3fed..709cf522d00 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -185,20 +185,23 @@ static int imagefile_index_to_property(int index) static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { - PTHEME_PROPERTY tp; - int imageselecttype = IST_NONE; + int imageselecttype = IST_NONE, glyphtype = GT_NONE; + PTHEME_PROPERTY tp = NULL; int i; - int image; - if(glyph) - image = TMT_GLYPHIMAGEFILE; - else - image = TMT_IMAGEFILE; if (imageDpi) *imageDpi = 96; - if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) - return tp; + /* Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. + * Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE */ + if (!glyph) + { + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_GLYPHTYPE, &glyphtype); + if (glyphtype == GT_IMAGEGLYPH && + (tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE))) + return tp; + } + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); if(imageselecttype == IST_DPI) { @@ -223,7 +226,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the first one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } else if(imageselecttype == IST_SIZE) { POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; @@ -270,9 +273,13 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the smallest one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } - return NULL; + + if (!tp) + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + glyph ? TMT_GLYPHIMAGEFILE : TMT_IMAGEFILE); + return tp; } /*********************************************************************** -- 2.32.0

1 0

[PATCH 1/3] user32: Avoid recalculating the non-client hit-test value for NC_HandleNCMouseMove().
by Zhiyi Zhang 25 Jan '22

25 Jan '22

The wParam in WM_NCMOUSEMOVE messages already contains the non-client hit-test value. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 7 +------ dlls/user32/nonclient.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b3d405ae69..ce14d13171f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,7 +171,7 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 44675c7b8e7..abb73e73ca8 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -246,12 +246,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return NC_HandleNCPaint( hwnd, (HRGN)wParam ); case WM_NCMOUSEMOVE: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - return NC_HandleNCMouseMove( hwnd, pt ); - } + return NC_HandleNCMouseMove( hwnd, wParam, lParam ); case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index b47616bb639..639cca707fb 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,22 +635,24 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } -LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +LRESULT NC_HandleNCMouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) { - LONG hittest; RECT rect; + POINT pt; - TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + TRACE("hwnd=%p wparam=%#lx lparam=%#lx\n", hwnd, wParam, lParam); - hittest = NC_HandleNCHitTest(hwnd, pt); - if (hittest != HTHSCROLL && hittest != HTVSCROLL) + if (wParam != HTHSCROLL && wParam != HTVSCROLL) return 0; WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); ScreenToClient(hwnd, &pt); pt.x -= rect.left; pt.y -= rect.top; - SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + SCROLL_HandleScrollEvent(hwnd, wParam == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); return 0; } -- 2.32.0

1 0

[PATCH] widl: Remove the uuid_t typedef which causes conflicts on macOS.
by Huw Davies 25 Jan '22

25 Jan '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/widl/client.c | 2 +- tools/widl/header.c | 14 +++++++------- tools/widl/parser.l | 4 ++-- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 4 ++-- tools/widl/register.c | 18 +++++++++--------- tools/widl/server.c | 2 +- tools/widl/typegen.c | 2 +- tools/widl/typelib.c | 2 +- tools/widl/typelib_struct.h | 8 ++++---- tools/widl/typetree.c | 8 ++++---- tools/widl/utils.h | 2 +- tools/widl/widl.c | 8 ++++---- tools/widl/widltypes.h | 10 +++++----- tools/widl/write_msft.c | 20 ++++++++++---------- 15 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 05ce8e732aa..704be91cb78 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -437,7 +437,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) static void write_clientinterfacedecl(type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); if (endpoints) write_endpoints( client, iface->name, endpoints ); diff --git a/tools/widl/header.c b/tools/widl/header.c index f8dcab91e6a..ce2f9064c38 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -141,7 +141,7 @@ static char *format_parameterized_type_args(const type_t *type, const char *pref return buf; } -static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid_t *uuid) +static void write_guid(FILE *f, const char *guid_prefix, const char *name, const struct uuid *uuid) { if (!uuid) return; fprintf(f, "DEFINE_GUID(%s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -151,7 +151,7 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid->Data4[6], uuid->Data4[7]); } -static void write_uuid_decl(FILE *f, type_t *type, const uuid_t *uuid) +static void write_uuid_decl(FILE *f, type_t *type, const struct uuid *uuid) { fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -162,7 +162,7 @@ static void write_uuid_decl(FILE *f, type_t *type, const uuid_t *uuid) fprintf(f, "#endif\n"); } -static const char *uuid_string(const uuid_t *uuid) +static const char *uuid_string(const struct uuid *uuid) { static char buf[37]; @@ -937,7 +937,7 @@ static void write_declaration(FILE *header, const var_t *v) static void write_library(FILE *header, const typelib_t *typelib) { - const uuid_t *uuid = get_attrp(typelib->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(typelib->attrs, ATTR_UUID); fprintf(header, "\n"); write_guid(header, "LIBID", typelib->name, uuid); fprintf(header, "\n"); @@ -1680,7 +1680,7 @@ static void write_widl_using_method_macros(FILE *header, const type_t *iface, co static void write_widl_using_macros(FILE *header, type_t *iface) { - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const char *name = iface->short_name ? iface->short_name : iface->name; char *macro; @@ -1702,7 +1702,7 @@ static void write_widl_using_macros(FILE *header, type_t *iface) static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); type_t *type; @@ -1836,7 +1836,7 @@ static void write_rpc_interface_end(FILE *header, const type_t *iface) static void write_coclass(FILE *header, type_t *cocl) { - const uuid_t *uuid = get_attrp(cocl->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(cocl->attrs, ATTR_UUID); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s coclass\n", cocl->name); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8fb5c91e6dc..823d6f0acca 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -96,9 +96,9 @@ static unsigned int xstrtoul(const char *nptr, char **endptr, int base) return val; } -uuid_t *parse_uuid(const char *u) +struct uuid *parse_uuid(const char *u) { - uuid_t* uuid = xmalloc(sizeof(*uuid)); + struct uuid* uuid = xmalloc(sizeof(*uuid)); char b[3]; /* it would be nice to use UuidFromStringA */ uuid->Data1 = strtoul(u, NULL, 16); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d7fc009c5c2..82cf946e8fb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -50,7 +50,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t enum storage_class stgclass, enum type_qualifier qual, enum function_specifier func_specifier); static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); -static attr_t *make_custom_attr(uuid_t *id, expr_t *pval); +static attr_t *make_custom_attr(struct uuid *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); @@ -141,7 +141,7 @@ static typelib_t *current_typelib; typeref_t *typeref; typeref_list_t *typeref_list; char *str; - uuid_t *uuid; + struct uuid *uuid; unsigned int num; double dbl; typelib_t *typelib; @@ -1523,7 +1523,7 @@ attr_t *make_attrp(enum attr_type type, void *val) return a; } -static attr_t *make_custom_attr(uuid_t *id, expr_t *pval) +static attr_t *make_custom_attr(struct uuid *id, expr_t *pval) { attr_t *a = xmalloc(sizeof(attr_t)); attr_custdata_t *cstdata = xmalloc(sizeof(attr_custdata_t)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 53ae9433463..a80aa5d77fe 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -847,8 +847,8 @@ static int cmp_iid( const void *ptr1, const void *ptr2 ) { const type_t * const *iface1 = ptr1; const type_t * const *iface2 = ptr2; - const uuid_t *uuid1 = get_attrp( (*iface1)->attrs, ATTR_UUID ); - const uuid_t *uuid2 = get_attrp( (*iface2)->attrs, ATTR_UUID ); + const struct uuid *uuid1 = get_attrp( (*iface1)->attrs, ATTR_UUID ); + const struct uuid *uuid2 = get_attrp( (*iface2)->attrs, ATTR_UUID ); return memcmp( uuid1, uuid2, sizeof(*uuid1) ); } diff --git a/tools/widl/register.c b/tools/widl/register.c index 24381353952..6c00dfaf5a2 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -34,7 +34,7 @@ static int indent; -static const char *format_uuid( const uuid_t *uuid ) +static const char *format_uuid( const struct uuid *uuid ) { static char buffer[40]; sprintf( buffer, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", @@ -76,8 +76,8 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) static void write_interface( const type_t *iface, const type_t *ps_factory ) { - const uuid_t *uuid = get_attrp( iface->attrs, ATTR_UUID ); - const uuid_t *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( iface->attrs, ATTR_UUID ); + const struct uuid *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); if (!uuid) return; if (!is_object( iface )) return; @@ -109,8 +109,8 @@ static void write_interfaces( const statement_list_t *stmts, const type_t *ps_fa static void write_typelib_interface( const type_t *iface, const typelib_t *typelib ) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); - const uuid_t *uuid = get_attrp( iface->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( iface->attrs, ATTR_UUID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); if (!uuid) return; @@ -139,7 +139,7 @@ static void write_typelib_interfaces( const typelib_t *typelib ) static int write_coclass( const type_t *class, const typelib_t *typelib ) { - const uuid_t *uuid = get_attrp( class->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); const char *progid = get_attrp( class->attrs, ATTR_PROGID ); const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); @@ -157,7 +157,7 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) if (progid) put_str( indent, "ProgId = s '%s'\n", progid ); if (typelib) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); if (!version) version = get_attrv( typelib->attrs, ATTR_VERSION ); } @@ -200,7 +200,7 @@ static void write_runtimeclasses_registry( const statement_list_t *stmts ) static int write_progid( const type_t *class ) { - const uuid_t *uuid = get_attrp( class->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); const char *progid = get_attrp( class->attrs, ATTR_PROGID ); const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); @@ -324,7 +324,7 @@ void write_typelib_regscript( const statement_list_t *stmts ) void output_typelib_regscript( const typelib_t *typelib ) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); const char *descr = get_attrp( typelib->attrs, ATTR_HELPSTRING ); const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); diff --git a/tools/widl/server.c b/tools/widl/server.c index e3ff5afc11c..1d8ab41185d 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -399,7 +399,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) static void write_serverinterfacedecl(type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); - uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); if (endpoints) write_endpoints( server, iface->name, endpoints ); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a195c5b3730..b2d9ab5d100 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3506,7 +3506,7 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t else { const type_t *base = is_ptr(type) ? type_pointer_get_ref_type(type) : type; - const uuid_t *uuid = get_attrp(base->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(base->attrs, ATTR_UUID); if (! uuid) error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 5c679d5513e..202702c54dd 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -239,7 +239,7 @@ unsigned short get_type_vt(type_t *t) return 0; } -static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, uuid_t *guid) +static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, struct uuid *guid) { memcpy( guid, (char *)data + segdir->pGuidTab.offset + offset, sizeof(*guid) ); } diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 745f37b76ee..ec1e317bf23 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -242,7 +242,7 @@ typedef struct { /* this is how a guid is stored */ typedef struct { - uuid_t guid; + struct uuid guid; int hreftype; /* -2 for the typelib guid, typeinfo offset for typeinfo guid, low two bits are 01 if this is an imported typeinfo, low two bits @@ -357,10 +357,10 @@ typedef struct { unsigned short syskind; /* == 1 for win32, 0 for win16 */ unsigned short lcid; /* == 0x409, 0x809 etc */ unsigned int res12; /* == 0 */ - unsigned short libflags; /* LIBFLAG_* */ + unsigned short libflags; /* LIBFLAG_* */ unsigned short maj_vers; unsigned short min_vers; - uuid_t uuid; + struct uuid uuid; } SLTG_LibBlk; #define SLTG_LIBBLK_MAGIC 0x51cc @@ -379,7 +379,7 @@ typedef struct { unsigned short res20; /* 0xffff */ unsigned int helpcontext; unsigned short res26; /* 0xffff */ - uuid_t uuid; + struct uuid uuid; } SLTG_OtherTypeInfo; /* Next we get WORD 0x0003 followed by a DWORD which if we add to diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 33735d26f58..065bed28b04 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -160,7 +160,7 @@ static size_t append_var_list_signature(char **buf, size_t *len, size_t pos, var static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t *type) { - const uuid_t *uuid; + const struct uuid *uuid; size_t n = 0; if (!type) return 0; @@ -329,7 +329,7 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p size_t len = 0, pos = 0; char *buf = NULL; typeref_t *ref; - const uuid_t *uuid; + const struct uuid *uuid; if (!(uuid = get_attrp(type->attrs, ATTR_UUID))) error_loc_info(&type->loc_info, "cannot compute type signature, no uuid found for type %s.\n", type->name); @@ -1237,7 +1237,7 @@ static void compute_interface_signature_uuid(type_t *iface) static const int version = 5; struct sha1_context ctx; unsigned char hash[20]; - uuid_t *uuid; + struct uuid *uuid; if (!(uuid = get_attrp(iface->attrs, ATTR_UUID))) { @@ -1266,7 +1266,7 @@ static void compute_interface_signature_uuid(type_t *iface) uuid->Data1 = ((unsigned int)hash[0] << 24) | ((unsigned int)hash[1] << 16) | ((unsigned int)hash[2] << 8) | hash[3]; uuid->Data2 = ((unsigned short)hash[4] << 8) | hash[5]; uuid->Data3 = ((unsigned short)hash[6] << 8) | hash[7]; - memcpy(&uuid->Data4, hash + 8, sizeof(*uuid) - offsetof(uuid_t, Data4)); + memcpy(&uuid->Data4, hash + 8, sizeof(*uuid) - offsetof(struct uuid, Data4)); } type_t *type_parameterized_type_specialize_define(type_t *type) diff --git a/tools/widl/utils.h b/tools/widl/utils.h index eeb1d068c96..f042f0e064c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,7 +35,7 @@ size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) __at size_t widl_getline(char **linep, size_t *lenp, FILE *fp); -uuid_t *parse_uuid(const char *u); +struct uuid *parse_uuid(const char *u); int is_valid_uuid(const char *s); /* buffer management */ diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 980e57b1782..7686594b7d3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -382,7 +382,7 @@ void write_dlldata(const statement_list_t *stmts) write_dlldata_list(filenames, define_proxy_delegation); } -static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const uuid_t *uuid) +static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const struct uuid *uuid) { if (!uuid) return; fprintf(f, "MIDL_DEFINE_GUID(%s, %s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -402,7 +402,7 @@ static void write_id_data_stmts(const statement_list_t *stmts) const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_INTERFACE) { - const uuid_t *uuid; + const struct uuid *uuid; if (!is_object(type) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) continue; uuid = get_attrp(type->attrs, ATTR_UUID); @@ -416,13 +416,13 @@ static void write_id_data_stmts(const statement_list_t *stmts) } else if (type_get_type(type) == TYPE_COCLASS) { - const uuid_t *uuid = get_attrp(type->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(type->attrs, ATTR_UUID); write_id_guid(idfile, "CLSID", "CLSID", type->name, uuid); } } else if (stmt->type == STMT_LIBRARY) { - const uuid_t *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); write_id_guid(idfile, "IID", "LIBID", stmt->u.lib->name, uuid); write_id_data_stmts(stmt->u.lib->stmts); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 622c4708a87..8df927fea4c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -26,13 +26,13 @@ #include "ndrtypes.h" #include "wine/list.h" -typedef struct +struct uuid { unsigned int Data1; unsigned short Data2; unsigned short Data3; unsigned char Data4[8]; -} uuid_t; +}; #define TRUE 1 #define FALSE 0 @@ -359,7 +359,7 @@ struct _expr_t { }; struct _attr_custdata_t { - uuid_t id; + struct uuid id; expr_t *pval; }; @@ -564,7 +564,7 @@ struct _typelib_entry_t { struct _importinfo_t { int offset; - uuid_t guid; + struct uuid guid; int flags; int id; @@ -578,7 +578,7 @@ struct _importlib_t { char *name; int version; - uuid_t guid; + struct uuid guid; importinfo_t *importinfos; int ntypeinfos; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7c00a7d59af..610f781ba76 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -186,7 +186,7 @@ static void ctl2_init_segdir( * * The hash key for the GUID. */ -static int ctl2_hash_guid(const uuid_t *guid) +static int ctl2_hash_guid(const struct uuid *guid) { int hash; int i; @@ -211,7 +211,7 @@ static int ctl2_hash_guid(const uuid_t *guid) static int ctl2_find_guid( msft_typelib_t *typelib, /* [I] The typelib to operate against. */ int hash_key, /* [I] The hash key for the guid. */ - const uuid_t *guid) /* [I] The guid to find. */ + const struct uuid *guid) /* [I] The guid to find. */ { int offset; MSFT_GuidEntry *guidentry; @@ -1255,7 +1255,7 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e write_int_value(typelib, out, vt, expr->cval); } -static void set_custdata(msft_typelib_t *typelib, const uuid_t *guid, +static void set_custdata(msft_typelib_t *typelib, const struct uuid *guid, int vt, const void *value, int *offset) { int guidoffset; @@ -1992,7 +1992,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ break; case ATTR_UUID: - guidentry.guid = *(uuid_t *)attr->u.pval; + guidentry.guid = *(struct uuid *)attr->u.pval; guidentry.hreftype = typelib->typelib_typeinfo_offsets[typeinfo->typekind >> 16]; guidentry.next_hash = -1; typeinfo->posguid = ctl2_alloc_guid(typelib, &guidentry); @@ -2025,8 +2025,8 @@ static void add_dispatch(msft_typelib_t *typelib) int guid_offset, impfile_offset, hash_key; MSFT_GuidEntry guidentry; MSFT_ImpInfo impinfo; - static const uuid_t stdole = {0x00020430,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; - static const uuid_t iid_idispatch = {0x00020400,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; + static const struct uuid stdole = {0x00020430,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; + static const struct uuid iid_idispatch = {0x00020400,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; if(typelib->typelib_header.dispatchpos != -1) return; @@ -2509,7 +2509,7 @@ static void set_guid(msft_typelib_t *typelib) { MSFT_GuidEntry guidentry = { {0}, -2, -1 }; int offset; - uuid_t *ptr = get_attrp( typelib->typelib->attrs, ATTR_UUID ); + struct uuid *ptr = get_attrp( typelib->typelib->attrs, ATTR_UUID ); if (ptr) guidentry.guid = *ptr; @@ -2753,9 +2753,9 @@ int create_msft_typelib(typelib_t *typelib) time_t cur_time; char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ - static const uuid_t midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - static const uuid_t midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - static const uuid_t midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; char info_string[128]; msft = xmalloc(sizeof(*msft)); -- 2.23.0

1 0

[PATCH] programs/start: wrap child inside a job so child get's killed when start.exe terminates
by Eric Pouech 25 Jan '22

25 Jan '22

fixes: #50869 https://bugs.winehq.org/show_bug.cgi?id=50869 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/start/start.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/start/start.c b/programs/start/start.c index dcd0a113f59..b5bf8187603 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -676,7 +676,24 @@ done: if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; + HANDLE hJob; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION info; + SetConsoleCtrlHandler(NULL, TRUE); + hJob = CreateJobObjectA(NULL, NULL); + /* Create a job where the child is associated... if the start.exe terminates + * before the child, the job will be terminated, and the child will be terminated as well. + * (The idea is to allow to kill (from a Unix standpoint) a created Windows + * process (here start.exe), and that the unix-kill of start.exe will be also terminate + * start.exe's child process). + */ + memset(&info, 0, sizeof(info)); + info.BasicLimitInformation.LimitFlags = + JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | + JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &info, sizeof(info)); + AssignProcessToJobObject(hJob, sei.hProcess); + WaitForSingleObject(sei.hProcess, INFINITE); GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode);

1 0

[PATCH 0/2] Long path in cmd
by Eric Pouech 25 Jan '22

25 Jan '22

Protect and test programs/cmd against path which length exceeds MAX_PATH patch to programs/cmd is applied before adding the tests as the tests make cmd crash with a stack overflow A+ --- Eric Pouech (2): programs/cmd: don't overflow internal buffers programs/cmd/tests: test paths which length exceeds MAX_PATH programs/cmd/builtins.c | 39 +++++++++++++++++------- programs/cmd/tests/test_builtins.cmd | 19 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 +++ programs/cmd/wcmdmain.c | 10 ++++-- 4 files changed, 58 insertions(+), 14 deletions(-)

2 4

[PATCH] programs/cmd/test: don't output more data than available
by Eric Pouech 25 Jan '22

25 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 162e9cfa151..0b48d7fa039 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -344,8 +344,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da } } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %.*s\n", line, exp_data + exp_size - exp_ptr, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %.*s\n", out_data + out_size - out_ptr, out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size)

2 1

[PATCH 2/2] msdasql: Implement ICommandPrepare Prepare
by Alistair Leslie-Hughes 25 Jan '22

25 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 4 ++-- dlls/msdasql/msdasql_private.h | 3 ++- dlls/msdasql/session.c | 31 ++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0d0a60ab7a2..d6c833c4c14 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -43,7 +43,7 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) { SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; SQLINTEGER native; @@ -611,7 +611,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, provider->hdbc, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 7d7f67c2c78..42bb8697030 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..f0e915ca710 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -30,6 +30,7 @@ #include "msdasql.h" #include "oledberr.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -45,6 +46,8 @@ struct msdasql_session LONG refs; IUnknown *datasource; + + HDBC hdbc; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -305,6 +308,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + HDBC hdbc; + SQLHSTMT hstmt; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -424,6 +429,10 @@ static ULONG WINAPI command_Release(ICommandText *iface) TRACE( "destroying %p\n", command ); if (command->session) IUnknown_Release(command->session); + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + heap_free( command->query ); heap_free( command ); } @@ -1051,7 +1060,24 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); + RETCODE ret; + TRACE("%p, %u\n", command, runs); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &command->hstmt); + + ret = SQLPrepareW(command->hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, command->hstmt); + return E_FAIL; + } return S_OK; } @@ -1147,6 +1173,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; + command->hdbc = session->hdbc; + command->hstmt = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1163,7 +1191,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1179,6 +1207,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; + session->hdbc = hdbc; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); IUnknown_Release(&session->session_iface); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ce3573fbfd7..eefddbf6dcb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -354,6 +354,7 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; + ICommandPrepare *commandprepare; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; @@ -362,9 +363,22 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); + affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.34.1

1 0

[PATCH 1/2] msdasql: Fix logic when dumping diagnostics records.
by Alistair Leslie-Hughes 25 Jan '22

25 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index cf69195baf7..0d0a60ab7a2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -52,7 +52,7 @@ static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) if (!TRACE_ON(msdasql)) return; - while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) == SQL_SUCCESS) { WARN("%d: %s: %s\n", i, state, msg); i++; -- 2.34.1

1 0

[PATCH v4 1/2] winmm: Test that a callback passed to `waveOutOpen` can call `waveOutWrite` without getting called reentrantly.
by Liam Murphy 25 Jan '22

25 Jan '22

This behaviour is relied upon by Teardown, see https://github.com/ValveSoftware/Proton/issues/4332. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- v2: Add `todo_wine` to avoid test failure --- v3: Use block comments instead of line comments --- v4: Simplify test --- dlls/winmm/tests/wave.c | 160 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..83e83a0150e 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -865,6 +865,164 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } +struct reentrancy_callback_data { + HANDLE hevent; + /* Which thread is currently running the callback, or 0 if it isn't running. */ + DWORD running_thread; + /* How many times the callback's been called. */ + BOOL call_num; +}; + +static void CALLBACK reentrancy_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + struct reentrancy_callback_data *data = (struct reentrancy_callback_data *)dwInstance; + + data->call_num += 1; + + todo_wine_if(data->call_num == 3) + ok(data->running_thread != GetCurrentThreadId(), "winmm callback called reentrantly, with message %u\n", uMsg); + if (data->running_thread) { + if (data->running_thread != GetCurrentThreadId()) trace("Callback running on two threads simultaneously\n"); + + /* Don't mess with what the original call was doing. */ + return; + } + data->running_thread = GetCurrentThreadId(); + + /* We have to wait for a `WOM_DONE` event rather than just using the `WOM_OPEN` event + * so that we're running on the winmm audio thread, so that we can block it + * to prevent the next `WOM_DONE` event just getting fired in the background + * (and then presumably calling the callback on another thread?) */ + if (uMsg == WOM_DONE) { + if (data->call_num == 2) { + MMRESULT rc; + /* Reuse the header which just finished. */ + WAVEHDR *hdr = (WAVEHDR *)dwParam1; + + /* Each frame is supposed to last 100ms, so 150ms should be enough to guarantee that the last one has finished. */ + Sleep(150); + + /* This is needed to trigger the bug in wine, + * since winmm checks for `WOM_DONE` within `WINMM_PushData`, which this calls. */ + rc = waveOutWrite(hwo, hdr, sizeof(*hdr)); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + } + } + + data->running_thread = 0; + /* Only do this at the end of the function so that it isn't possible for the main thread + * to mistakenly call `waveOutClose` while the test is running. */ + SetEvent(data->hevent); +} + +/* Test whether the callback gets called reentrantly when `waveOutWrite` is called + * from within the callback passed to `waveOutOpen`. */ +static void wave_out_test_no_reentrancy(int device) +{ + HWAVEOUT wout; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + WAVEHDR *frags = 0; + MMRESULT rc; + int headers = 2; + int loops = 0; + WAVEFORMATEX format; + WAVEFORMATEX* pwfx = &format; + DWORD flags = CALLBACK_FUNCTION; + double duration = 0.2; + DWORD_PTR callback = 0; + struct reentrancy_callback_data callback_data; + DWORD_PTR callback_instance = 0; + char * buffer; + DWORD length; + DWORD frag_length; + int i; + BOOL done; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=22050; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + callback = (DWORD_PTR)reentrancy_callback_func; + callback_data.hevent = hevent; + callback_data.running_thread = 0; + callback_data.call_num = 0; + callback_instance = (DWORD_PTR)(&callback_data); + + wout=NULL; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); + if (rc!=MMSYSERR_NOERROR) { + trace("`waveOutOpen` failed with rc %s, skipping", mmsys_error(rc)); + goto EXIT; + } + + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); + + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); + + buffer=wave_generate_silence(pwfx,duration / (loops + 1),&length); + + /* make sure fragment length is a multiple of block size */ + frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; + + for (i = 0; i < headers; i++) { + frags[i].lpData=buffer + (i * frag_length); + if (i != (headers-1)) + frags[i].dwBufferLength=frag_length; + else { + /* use remainder of buffer for last fragment */ + frags[i].dwBufferLength=length - (i * frag_length); + } + frags[i].dwFlags=0; + frags[i].dwLoops=0; + rc=waveOutPrepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutPrepareHeader(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + } + + if (rc==MMSYSERR_NOERROR) { + /* Queue up the initial fragments. */ + rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + + rc=waveOutWrite(wout, &frags[1], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + + done = FALSE; + while (!done) { + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); + + done = TRUE; + for (i = 0; i < headers; i++) { + if (!(frags[i].dwFlags & WHDR_DONE)) { + done = FALSE; + } + } + } + + /* Calling `waveOutClose` from within the callback hangs on Windows, so we have to make sure to do it here instead. */ + rc = waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(): rc=%s\n", wave_out_error(rc)); + + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); +EXIT: + CloseHandle(hevent); + HeapFree(GetProcessHeap(), 0, frags); +} + static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; @@ -984,6 +1142,8 @@ static void wave_out_test_device(UINT_PTR device) trace(" %s\n",wave_out_caps(capsA.dwSupport)); HeapFree(GetProcessHeap(), 0, nameA); + wave_out_test_no_reentrancy(device); + if (winetest_interactive && (device != WAVE_MAPPER)) { trace("Playing a 5 seconds reference tone.\n"); -- 2.35.0

1 1

[PATCH] dmsynth: Implement the sink Init method
by Michael Stefaniuc 24 Jan '22

24 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 1 + dlls/dmsynth/synthsink.c | 6 +++++- dlls/dmsynth/tests/dmsynth.c | 2 ++ dlls/dmusic/port.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 2a2e88c8e88..aabf1f56904 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -77,6 +77,7 @@ struct IDirectMusicSynthSinkImpl { LONG ref; IReferenceClock *latency_clock; IReferenceClock *master_clock; + IDirectMusicSynth *synth; /* No reference hold! */ BOOL active; }; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 72fd671a415..9d7096a032b 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -96,7 +96,11 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *ifac { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, synth); + TRACE("(%p)->(%p)\n", This, synth); + + /* Not holding a reference to avoid circular dependencies. + The synth will release the sink during the synth's destruction. */ + This->synth = synth; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 1e3e20829b7..e27d8abdb26 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -131,6 +131,8 @@ static void test_dmsynth(void) ref_clock_sink = get_refcount(clock_sink); /* This will Init() the SynthSink and finish initializing the Synth */ + hr = IDirectMusicSynthSink_Init(dmsynth_sink2, NULL); + ok(hr == S_OK, "IDirectMusicSynthSink_Init returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink2); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 31b3b764e02..7fe72563bb0 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -195,10 +195,10 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) if (!ref) { dmusic_remove_port(This->parent, iface); + IDirectMusicSynthSink_Release(This->synth_sink); IDirectMusicSynth_Activate(This->synth, FALSE); IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); - IDirectMusicSynthSink_Release(This->synth_sink); if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); if (This->dsound) -- 2.34.1

1 0