- Wine-Devel - list.winehq.org

[PATCH 1/6] dinput: Canonicalize code style of IDirectInputWImpl_EnumDevices.
by Rémi Bernon Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 95 +++++++++------------------------------ 1 file changed, 20 insertions(+), 75 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 985dae1ab36..da790bae36c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -270,58 +270,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) -{ - if (dwVersion < 0x0800) { - switch (dwDevType) { - case 0: return "All devices"; - case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; - case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; - case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unknown"; - } - } else { - switch (dwDevType) { - case DI8DEVCLASS_ALL: return "All devices"; - case DI8DEVCLASS_POINTER: return "DI8DEVCLASS_POINTER"; - case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; - case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; - case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL"; - default: return "Unknown"; - } - } -} - -static void _dump_EnumDevices_dwFlags(DWORD dwFlags) -{ - if (TRACE_ON(dinput)) { - unsigned int i; - static const struct { - DWORD mask; - const char *name; - } flags[] = { -#define FE(x) { x, #x} - FE(DIEDFL_ALLDEVICES), - FE(DIEDFL_ATTACHEDONLY), - FE(DIEDFL_FORCEFEEDBACK), - FE(DIEDFL_INCLUDEALIASES), - FE(DIEDFL_INCLUDEPHANTOMS), - FE(DIEDFL_INCLUDEHIDDEN) -#undef FE - }; - TRACE(" flags: "); - if (dwFlags == 0) { - TRACE("DIEDFL_ALLDEVICES\n"); - return; - } - for (i = 0; i < ARRAY_SIZE(flags); i++) - if (flags[i].mask & dwFlags) - TRACE("%s ",flags[i].name); - } - TRACE("\n"); -} - static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) { int i; @@ -371,38 +319,35 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, /****************************************************************************** * IDirectInputW_EnumDevices */ -static HRESULT WINAPI IDirectInputWImpl_EnumDevices( - LPDIRECTINPUT7W iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKW lpCallback, - LPVOID pvRef, DWORD dwFlags) +static HRESULT WINAPI IDirectInputWImpl_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, + void *context, DWORD flags ) { - IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - DIDEVICEINSTANCEW devInstance; - unsigned int i; - int j; - HRESULT r; + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + unsigned int i, j; + HRESULT hr; - TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), - lpCallback, pvRef, dwFlags); - _dump_EnumDevices_dwFlags(dwFlags); + TRACE( "iface %p, type %#x, callback %p, context %p, flags %#x\n", iface, type, callback, context, flags ); - if (!lpCallback || - dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) + if (!callback) return DIERR_INVALIDPARAM; + + if ((type > DI8DEVCLASS_GAMECTRL && type < DI8DEVTYPE_DEVICE) || type > DI8DEVTYPE_SUPPLEMENTAL) + return DIERR_INVALIDPARAM; + if (flags & ~(DIEDFL_ATTACHEDONLY|DIEDFL_FORCEFEEDBACK|DIEDFL_INCLUDEALIASES|DIEDFL_INCLUDEPHANTOMS|DIEDFL_INCLUDEHIDDEN)) return DIERR_INVALIDPARAM; - if (!This->initialized) + if (!impl->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) + { if (!dinput_devices[i]->enum_device) continue; - for (j = 0, r = S_OK; SUCCEEDED(r); j++) { - devInstance.dwSize = sizeof(devInstance); + for (j = 0, hr = S_OK; SUCCEEDED(hr); j++) + { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - r = dinput_devices[i]->enum_device(dwDevType, dwFlags, &devInstance, This->dwVersion, j); - if (r == S_OK) - if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) - return S_OK; + hr = dinput_devices[i]->enum_device( type, flags, &instance, impl->dwVersion, j ); + if (hr != S_OK) continue; + if (enum_callback_wrapper( callback, &instance, context ) == DIENUM_STOP) return S_OK; } } -- 2.33.0

1 5

[PATCH v2] wmc: Remove struct and enum typedefs.
by Huw Davies Oct. 26, 2021

Oct. 26, 2021

This has the side effect of fixing the build on macOS after commit 2c1b8153630. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/wmc/lang.c | 8 ++-- tools/wmc/lang.h | 6 +-- tools/wmc/mcl.c | 16 +++---- tools/wmc/mcy.y | 103 +++++++++++++++++++++---------------------- tools/wmc/po.c | 14 +++--- tools/wmc/wmc.h | 10 ++--- tools/wmc/wmctypes.h | 52 +++++++++++----------- tools/wmc/write.c | 24 +++++----- 8 files changed, 116 insertions(+), 117 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b5ab3be7225..7dd80d840e6 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -31,7 +31,7 @@ * * MUST be sorting ascending on language ID */ -static const language_t languages[] = { +static const struct language languages[] = { {0x0000, 437, "Neutral", NULL}, {0x0002, 866, "Bulgarian", NULL}, @@ -177,11 +177,11 @@ void show_languages(void) static int langcmp(const void *p1, const void *p2) { - return *(const unsigned *)p1 - ((const language_t *)p2)->id; + return *(const unsigned *)p1 - ((const struct language *)p2)->id; } -const language_t *find_language(unsigned id) +const struct language *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + return (const struct language *)bsearch(&id, languages, ARRAY_SIZE(languages), sizeof(languages[0]), langcmp); } diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 365aacdd766..f8798f142eb 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -23,14 +23,14 @@ #include "winnls.h" -typedef struct language { +struct language { unsigned id; unsigned doscp; const char *name; const char *country; -} language_t; +}; void show_languages(void); -const language_t *find_language(unsigned id); +const struct language *find_language(unsigned id); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index c0ca4eeba5c..0d7b50027c5 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -486,21 +486,21 @@ static void newline(void) static int unisort(const void *p1, const void *p2) { - return unistricmp(((const token_t *)p1)->name, ((const token_t *)p2)->name); + return unistricmp(((const struct token *)p1)->name, ((const struct token *)p2)->name); } -static token_t *tokentable = NULL; +static struct token *tokentable = NULL; static int ntokentable = 0; -token_t *lookup_token(const WCHAR *s) +struct token *lookup_token(const WCHAR *s) { - token_t tok; + struct token tok; tok.name = s; - return (token_t *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); + return (struct token *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); } -void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) +void add_token(enum tok_enum type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) { ntokentable++; tokentable = xrealloc(tokentable, ntokentable * sizeof(*tokentable)); @@ -513,7 +513,7 @@ void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alia qsort(tokentable, ntokentable, sizeof(*tokentable), unisort); } -void get_tokentable(token_t **tab, int *len) +void get_tokentable(struct token **tab, int *len) { assert(tab != NULL); assert(len != NULL); @@ -624,7 +624,7 @@ int mcy_lex(void) if(char_table[ch] & CH_IDENT) { - token_t *tok; + struct token *tok; while(isisochar(ch) && (char_table[ch] & (CH_IDENT|CH_NUMBER))) { push_unichar(ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 879c46ffc77..79d3679afdf 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -62,9 +62,9 @@ int want_nl = 0; /* Request next newlinw */ int want_line = 0; /* Request next complete line */ int want_file = 0; /* Request next ident as filename */ -node_t *nodehead = NULL; /* The list of all parsed elements */ -static node_t *nodetail = NULL; -lan_blk_t *lanblockhead; /* List of parsed elements transposed */ +struct node *nodehead = NULL; /* The list of all parsed elements */ +static struct node *nodetail; +struct lan_blk *lanblockhead; /* List of parsed elements transposed */ static int base = 16; /* Current printout base to use (8, 10 or 16) */ static WCHAR *cast = NULL; /* Current typecast to use */ @@ -77,31 +77,31 @@ static int have_sev; /* Set if severity parsed for current message */ static int have_fac; /* Set if facility parsed for current message */ static int have_sym; /* Set is symbol parsed for current message */ -static cp_xlat_t *cpxlattab = NULL; /* Codepage translation table */ +static struct cp_xlat *cpxlattab = NULL; /* Codepage translation table */ static int ncpxlattab = 0; /* Prototypes */ static WCHAR *merge(WCHAR *s1, WCHAR *s2); -static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg); -static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg); -static msg_t *complete_msg(msg_t *msg, int id); -static void add_node(node_e type, void *p); -static void do_add_token(tok_e type, token_t *tok, const char *code); +static struct lanmsg *new_lanmsg(struct lan_cp *lcp, WCHAR *msg); +static struct msg *add_lanmsg(struct msg *msg, struct lanmsg *lanmsg); +static struct msg *complete_msg(struct msg *msg, int id); +static void add_node(enum node_type type, void *p); +static void do_add_token(enum tok_enum type, struct token *tok, const char *code); static void test_id(int id); -static int check_languages(node_t *head); -static lan_blk_t *block_messages(node_t *head); +static int check_languages(struct node *head); +static struct lan_blk *block_messages(struct node *head); static void add_cpxlat(int lan, int cpin, int cpout); -static cp_xlat_t *find_cpxlat(int lan); +static struct cp_xlat *find_cpxlat(int lan); %} %union { WCHAR *str; unsigned num; - token_t *tok; - lanmsg_t *lmp; - msg_t *msg; - lan_cp_t lcp; + struct token *tok; + struct lanmsg *lmp; + struct msg *msg; + struct lan_cp lcp; } @@ -306,7 +306,7 @@ sym : tSYMNAME '=' tIDENT { last_sym = $3; } ; sev : tSEVERITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) @@ -318,7 +318,7 @@ sev : tSEVERITY '=' token { ; fac : tFACILITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) @@ -346,8 +346,8 @@ body : lang setline lines tMSGEND { $$ = new_lanmsg(&$1, $3); } * message to be parsed. */ lang : tLANGUAGE setnl '=' token tNL { - token_t *tok = lookup_token($4->name); - cp_xlat_t *cpx; + struct token *tok = lookup_token($4->name); + struct cp_xlat *cpx; if(!tok) xyyerror("Undefined language\n"); if(tok->type != tok_language) @@ -358,7 +358,7 @@ lang : tLANGUAGE setnl '=' token tNL { } else if(!tok->codepage) { - const language_t *lan = find_language(tok->token); + const struct language *lan = find_language(tok->token); if(!lan) { /* Just set default; warning was given while parsing languagenames */ @@ -388,7 +388,7 @@ lines : tLINE { $$ = $1; } /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(struct token)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -413,9 +413,9 @@ static WCHAR *merge(WCHAR *s1, WCHAR *s2) return s1; } -static void do_add_token(tok_e type, token_t *tok, const char *code) +static void do_add_token(enum tok_enum type, struct token *tok, const char *code) { - token_t *tp = lookup_token(tok->name); + struct token *tp = lookup_token(tok->name); if(tp) { if(tok->type != type) @@ -434,9 +434,9 @@ static void do_add_token(tok_e type, token_t *tok, const char *code) } } -static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) +static struct lanmsg *new_lanmsg(struct lan_cp *lcp, WCHAR *msg) { - lanmsg_t *lmp = xmalloc(sizeof(lanmsg_t)); + struct lanmsg *lmp = xmalloc(sizeof(*lmp)); lmp->lan = lcp->language; lmp->cp = lcp->codepage; lmp->msg = msg; @@ -448,12 +448,12 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg) return lmp; } -static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg) +static struct msg *add_lanmsg(struct msg *msg, struct lanmsg *lanmsg) { int i; if(!msg) { - msg = xmalloc(sizeof(msg_t)); + msg = xmalloc(sizeof(*msg)); memset( msg, 0, sizeof(*msg) ); } msg->msgs = xrealloc(msg->msgs, (msg->nmsgs+1) * sizeof(*(msg->msgs))); @@ -469,10 +469,10 @@ static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg) static int sort_lanmsg(const void *p1, const void *p2) { - return (*(const lanmsg_t * const *)p1)->lan - (*(const lanmsg_t * const*)p2)->lan; + return (*(const struct lanmsg * const *)p1)->lan - (*(const struct lanmsg * const*)p2)->lan; } -static msg_t *complete_msg(msg_t *mp, int id) +static struct msg *complete_msg(struct msg *mp, int id) { assert(mp != NULL); mp->id = id; @@ -491,9 +491,9 @@ static msg_t *complete_msg(msg_t *mp, int id) return mp; } -static void add_node(node_e type, void *p) +static void add_node(enum node_type type, void *p) { - node_t *ndp = xmalloc(sizeof(node_t)); + struct node *ndp = xmalloc(sizeof(*ndp)); memset( ndp, 0, sizeof(*ndp) ); ndp->type = type; ndp->u.all = p; @@ -512,7 +512,7 @@ static void add_node(node_e type, void *p) static void test_id(int id) { - node_t *ndp; + struct node *ndp; for(ndp = nodehead; ndp; ndp = ndp->next) { if(ndp->type != nd_msg) @@ -522,12 +522,12 @@ static void test_id(int id) } } -static int check_languages(node_t *head) +static int check_languages(struct node *head) { static const char err_missing[] = "Missing definition for language 0x%x; MessageID %d, facility 0x%x, severity 0x%x\n"; - node_t *ndp; + struct node *ndp; int nm = 0; - msg_t *msg = NULL; + struct msg *msg = NULL; for(ndp = head; ndp; ndp = ndp->next) { @@ -540,8 +540,8 @@ static int check_languages(node_t *head) else { int i; - msg_t *m1; - msg_t *m2; + struct msg *m1; + struct msg *m2; if(ndp->u.msg->nmsgs > msg->nmsgs) { m1 = ndp->u.msg; @@ -568,11 +568,10 @@ static int check_languages(node_t *head) return nm; } -#define MSGRID(x) ((*(const msg_t * const*)(x))->realid) +#define MSGRID(x) ((*(const struct msg * const*)(x))->realid) static int sort_msg(const void *p1, const void *p2) { return MSGRID(p1) > MSGRID(p2) ? 1 : (MSGRID(p1) == MSGRID(p2) ? 0 : -1); - /* return (*(msg_t **)p1)->realid - (*(msg_t **)p1)->realid; */ } /* @@ -580,13 +579,13 @@ static int sort_msg(const void *p1, const void *p2) * from ID/language based list to a language/ID * based list. */ -static lan_blk_t *block_messages(node_t *head) +static struct lan_blk *block_messages(struct node *head) { - lan_blk_t *lbp; - lan_blk_t *lblktail = NULL; - lan_blk_t *lblkhead = NULL; - msg_t **msgtab = NULL; - node_t *ndp; + struct lan_blk *lbp; + struct lan_blk *lblktail = NULL; + struct lan_blk *lblkhead = NULL; + struct msg **msgtab = NULL; + struct node *ndp; int nmsg = 0; int i; int nl; @@ -605,7 +604,7 @@ static lan_blk_t *block_messages(node_t *head) for(nl = 0; nl < msgtab[0]->nmsgs; nl++) /* This should be equal for all after check_languages() */ { - lbp = xmalloc(sizeof(lan_blk_t)); + lbp = xmalloc(sizeof(*lbp)); memset( lbp, 0, sizeof(*lbp) ); if(!lblktail) { @@ -630,7 +629,7 @@ static lan_blk_t *block_messages(node_t *head) for(i = 1; i < nmsg; i++) { - block_t *blk = &(lbp->blks[lbp->nblk-1]); + struct block *blk = &(lbp->blks[lbp->nblk-1]); if(msgtab[i]->realid == blk->idhi+1) { blk->size += ((factor * msgtab[i]->msgs[nl]->len + 3) & ~3) + 4; @@ -658,7 +657,7 @@ static lan_blk_t *block_messages(node_t *head) static int sc_xlat(const void *p1, const void *p2) { - return ((const cp_xlat_t *)p1)->lan - ((const cp_xlat_t *)p2)->lan; + return ((const struct cp_xlat *)p1)->lan - ((const struct cp_xlat *)p2)->lan; } static void add_cpxlat(int lan, int cpin, int cpout) @@ -671,12 +670,12 @@ static void add_cpxlat(int lan, int cpin, int cpout) qsort(cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); } -static cp_xlat_t *find_cpxlat(int lan) +static struct cp_xlat *find_cpxlat(int lan) { - cp_xlat_t t; + struct cp_xlat t; if(!cpxlattab) return NULL; t.lan = lan; - return (cp_xlat_t *)bsearch(&t, cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); + return (struct cp_xlat *)bsearch(&t, cpxlattab, ncpxlattab, sizeof(*cpxlattab), sc_xlat); } diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 28bcea91f59..87ebc072df1 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -46,7 +46,7 @@ struct mo_file /* ... rest of file data here */ }; -static lan_blk_t *new_top, *new_tail; +static struct lan_blk *new_top, *new_tail; static const struct { @@ -365,7 +365,7 @@ static BOOL is_english( int lan ) return lan == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); } -static char *convert_msgid_ascii( const lanmsg_t *msg, int error_on_invalid_char ) +static char *convert_msgid_ascii( const struct lanmsg *msg, int error_on_invalid_char ) { int i; char *buffer = xmalloc( msg->len * 4 + 1 ); @@ -632,9 +632,9 @@ static const char *get_msgstr( const char *msgid, const char *context, int *foun return ret; } -static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) +static struct lanmsg *translate_string( struct lanmsg *str, int lang, int *found ) { - lanmsg_t *new; + struct lanmsg *new; const char *transl; char *buffer, *msgid, *context; @@ -654,7 +654,7 @@ static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) return new; } -static void translate_block( block_t *blk, block_t *new, int lang, int *found ) +static void translate_block( struct block *blk, struct block *new, int lang, int *found ) { int i; @@ -673,7 +673,7 @@ static void translate_block( block_t *blk, block_t *new, int lang, int *found ) static void translate_messages( int lang ) { int i, found; - lan_blk_t *lbp, *new; + struct lan_blk *lbp, *new; for (lbp = lanblockhead; lbp; lbp = lbp->next) { @@ -705,7 +705,7 @@ static void translate_messages( int lang ) void add_translations( const char *po_dir ) { - lan_blk_t *lbp; + struct lan_blk *lbp; char buffer[256]; char *p, *tok, *name; unsigned int i; diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 913c2a9443e..e9736103fe3 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -60,15 +60,15 @@ extern int mcy_debug; extern int want_nl; extern int want_line; extern int want_file; -extern node_t *nodehead; -extern lan_blk_t *lanblockhead; +extern struct node *nodehead; +extern struct lan_blk *lanblockhead; int mcy_lex(void); extern FILE *yyin; void set_codepage(int cp); -void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); -token_t *lookup_token(const WCHAR *s); -void get_tokentable(token_t **tab, int *len); +void add_token(enum tok_enum type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); +struct token *lookup_token(const WCHAR *s); +void get_tokentable(struct token **tab, int *len); #endif diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 6c9a97c5e68..116ace20545 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -40,86 +40,86 @@ /* * Tokenizer types */ -typedef enum tok_enum { +enum tok_enum { tok_null = 0, tok_keyword, tok_severity, tok_facility, tok_language -} tok_e; +}; -typedef struct token { - tok_e type; +struct token { + enum tok_enum type; const WCHAR *name; /* Parsed name of token */ int token; /* Tokenvalue or language code */ int codepage; const WCHAR *alias; /* Alias or filename */ int fixed; /* Cleared if token may change */ -} token_t; +}; -typedef struct lan_cp { +struct lan_cp { int language; int codepage; -} lan_cp_t; +}; -typedef struct cp_xlat { +struct cp_xlat { int lan; int cpin; int cpout; -} cp_xlat_t; +}; -typedef struct lanmsg { +struct lanmsg { int lan; /* Language code of message */ int cp; /* Codepage of message */ WCHAR *msg; /* Message text */ int len; /* Message length including trailing '\0' */ const char *file; /* File location for definition */ int line; -} lanmsg_t; +}; -typedef struct msg { +struct msg { int id; /* Message ID */ unsigned realid; /* Combined message ID */ WCHAR *sym; /* Symbolic name */ int sev; /* Severity code */ int fac; /* Facility code */ - lanmsg_t **msgs; /* Array message texts */ + struct lanmsg **msgs; /* Array message texts */ int nmsgs; /* Number of message texts in array */ int base; /* Base of number to print */ WCHAR *cast; /* Typecase to use */ -} msg_t; +}; -typedef enum { +enum node_type { nd_msg, nd_comment -} node_e; +}; -typedef struct node { +struct node { struct node *next; struct node *prev; - node_e type; + enum node_type type; union { void *all; WCHAR *comment; - msg_t *msg; + struct msg *msg; } u; -} node_t; +}; -typedef struct block { +struct block { unsigned idlo; /* Lowest ID in this set */ unsigned idhi; /* Highest ID in this set */ int size; /* Size of this set */ - lanmsg_t **msgs; /* Array of messages in this set */ + struct lanmsg **msgs; /* Array of messages in this set */ int nmsg; /* Number of array entries */ -} block_t; +}; -typedef struct lan_blk { +struct lan_blk { struct lan_blk *next; /* Linkage for languages */ struct lan_blk *prev; int lan; /* The language of this block */ int version; /* The resource version for auto-translated resources */ - block_t *blks; /* Array of blocks for this language */ + struct block *blks; /* Array of blocks for this language */ int nblk; /* Nr of blocks in array */ -} lan_blk_t; +}; #endif diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 69ebf24b6b9..353a503f674 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -150,11 +150,11 @@ static int killcomment(char *s) void write_h_file(const char *fname) { - node_t *ndp; + struct node *ndp; char *cptr; char *cast; FILE *fp; - token_t *ttab; + struct token *ttab; int ntab; int i; int once = 0; @@ -278,8 +278,8 @@ void write_h_file(const char *fname) static void write_rcbin(FILE *fp) { - lan_blk_t *lbp; - token_t *ttab; + struct lan_blk *lbp; + struct token *ttab; int ntab; int i; @@ -370,7 +370,7 @@ static char *make_string(WCHAR *uc, int len) static void write_rcinline(FILE *fp) { - lan_blk_t *lbp; + struct lan_blk *lbp; int i; int j; @@ -391,7 +391,7 @@ static void write_rcinline(FILE *fp) } for(i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for(j = 0; j < blk->nmsg; j++) { char *cptr; @@ -426,7 +426,7 @@ void write_rc_file(const char *fname) fclose(fp); } -static void output_bin_data( lan_blk_t *lbp ) +static void output_bin_data( struct lan_blk *lbp ) { unsigned int offs = 4 * (lbp->nblk * 3 + 1); int i, j, k; @@ -441,7 +441,7 @@ static void output_bin_data( lan_blk_t *lbp ) } for (i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for (j = 0; j < blk->nmsg; j++) { int len = (2 * blk->msgs[j]->len + 3) & ~3; @@ -455,8 +455,8 @@ static void output_bin_data( lan_blk_t *lbp ) void write_bin_files(void) { - lan_blk_t *lbp; - token_t *ttab; + struct lan_blk *lbp; + struct token *ttab; int ntab; int i; @@ -487,7 +487,7 @@ void write_bin_files(void) void write_res_file( const char *name ) { - lan_blk_t *lbp; + struct lan_blk *lbp; int i, j; init_output_buffer(); @@ -511,7 +511,7 @@ void write_res_file( const char *name ) for (i = 0; i < lbp->nblk; i++) { - block_t *blk = &lbp->blks[i]; + struct block *blk = &lbp->blks[i]; for (j = 0; j < blk->nmsg; j++) data_size += 4 + ((blk->msgs[j]->len * 2 + 3) & ~3); } -- 2.23.0

1 0

[PATCH] dinput8/tests: Relax test results for 3 buttons mouse.
by Rémi Bernon Oct. 26, 2021

Oct. 26, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51913 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 4492170673e..3cad4ce256c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1278,7 +1278,7 @@ static void test_mouse_info(void) todo_wine check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); - check_member( caps, expect_caps, "%d", dwButtons ); + ok( caps.dwButtons == 3 || caps.dwButtons == 5, "got dwButtons %d, expected 3 or 5\n", caps.dwButtons ); check_member( caps, expect_caps, "%d", dwPOVs ); check_member( caps, expect_caps, "%d", dwFFSamplePeriod ); check_member( caps, expect_caps, "%d", dwFFMinTimeResolution ); @@ -1384,7 +1384,8 @@ static void test_mouse_info(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 8, "got %u expected %u\n", res, 8 ); + ok( res == 3 + caps.dwButtons, "got %u expected %u\n", res, 3 + caps.dwButtons ); + check_objects_params.expect_count = 3 + caps.dwButtons; hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", -- 2.33.0

1 0

[PATCH] wmc: Remove the token_t typedef.
by Huw Davies Oct. 26, 2021

Oct. 26, 2021

This conflicts with a system typedef on macOS brought in by including sys/sysctl.h in commit 2c1b8153630. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/wmc/mcl.c | 14 +++++++------- tools/wmc/mcy.y | 16 ++++++++-------- tools/wmc/wmc.h | 4 ++-- tools/wmc/wmctypes.h | 4 ++-- tools/wmc/write.c | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index c0ca4eeba5c..c524871d267 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -486,18 +486,18 @@ static void newline(void) static int unisort(const void *p1, const void *p2) { - return unistricmp(((const token_t *)p1)->name, ((const token_t *)p2)->name); + return unistricmp(((const struct token *)p1)->name, ((const struct token *)p2)->name); } -static token_t *tokentable = NULL; +static struct token *tokentable = NULL; static int ntokentable = 0; -token_t *lookup_token(const WCHAR *s) +struct token *lookup_token(const WCHAR *s) { - token_t tok; + struct token tok; tok.name = s; - return (token_t *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); + return (struct token *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); } void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) @@ -513,7 +513,7 @@ void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alia qsort(tokentable, ntokentable, sizeof(*tokentable), unisort); } -void get_tokentable(token_t **tab, int *len) +void get_tokentable(struct token **tab, int *len) { assert(tab != NULL); assert(len != NULL); @@ -624,7 +624,7 @@ int mcy_lex(void) if(char_table[ch] & CH_IDENT) { - token_t *tok; + struct token *tok; while(isisochar(ch) && (char_table[ch] & (CH_IDENT|CH_NUMBER))) { push_unichar(ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 879c46ffc77..2c68438c2c1 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -86,7 +86,7 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lcp, WCHAR *msg); static msg_t *add_lanmsg(msg_t *msg, lanmsg_t *lanmsg); static msg_t *complete_msg(msg_t *msg, int id); static void add_node(node_e type, void *p); -static void do_add_token(tok_e type, token_t *tok, const char *code); +static void do_add_token(tok_e type, struct token *tok, const char *code); static void test_id(int id); static int check_languages(node_t *head); static lan_blk_t *block_messages(node_t *head); @@ -98,7 +98,7 @@ static cp_xlat_t *find_cpxlat(int lan); %union { WCHAR *str; unsigned num; - token_t *tok; + struct token *tok; lanmsg_t *lmp; msg_t *msg; lan_cp_t lcp; @@ -306,7 +306,7 @@ sym : tSYMNAME '=' tIDENT { last_sym = $3; } ; sev : tSEVERITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined severityname\n"); if(tok->type != tok_severity) @@ -318,7 +318,7 @@ sev : tSEVERITY '=' token { ; fac : tFACILITY '=' token { - token_t *tok = lookup_token($3->name); + struct token *tok = lookup_token($3->name); if(!tok) xyyerror("Undefined facilityname\n"); if(tok->type != tok_facility) @@ -346,7 +346,7 @@ body : lang setline lines tMSGEND { $$ = new_lanmsg(&$1, $3); } * message to be parsed. */ lang : tLANGUAGE setnl '=' token tNL { - token_t *tok = lookup_token($4->name); + struct token *tok = lookup_token($4->name); cp_xlat_t *cpx; if(!tok) xyyerror("Undefined language\n"); @@ -388,7 +388,7 @@ lines : tLINE { $$ = $1; } /*---------------------------------------------------------------------- * Helper rules */ -token : tIDENT { $$ = xmalloc(sizeof(token_t)); memset($$,0,sizeof(*$$)); $$->name = $1; } +token : tIDENT { $$ = xmalloc(sizeof(struct token)); memset($$,0,sizeof(*$$)); $$->name = $1; } | tTOKEN { $$ = $1; } ; @@ -413,9 +413,9 @@ static WCHAR *merge(WCHAR *s1, WCHAR *s2) return s1; } -static void do_add_token(tok_e type, token_t *tok, const char *code) +static void do_add_token(tok_e type, struct token *tok, const char *code) { - token_t *tp = lookup_token(tok->name); + struct token *tp = lookup_token(tok->name); if(tp) { if(tok->type != type) diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 913c2a9443e..891348ad92d 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -68,7 +68,7 @@ extern FILE *yyin; void set_codepage(int cp); void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix); -token_t *lookup_token(const WCHAR *s); -void get_tokentable(token_t **tab, int *len); +struct token *lookup_token(const WCHAR *s); +void get_tokentable(struct token **tab, int *len); #endif diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h index 6c9a97c5e68..b0ae24f6029 100644 --- a/tools/wmc/wmctypes.h +++ b/tools/wmc/wmctypes.h @@ -48,14 +48,14 @@ typedef enum tok_enum { tok_language } tok_e; -typedef struct token { +struct token { tok_e type; const WCHAR *name; /* Parsed name of token */ int token; /* Tokenvalue or language code */ int codepage; const WCHAR *alias; /* Alias or filename */ int fixed; /* Cleared if token may change */ -} token_t; +}; typedef struct lan_cp { int language; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 69ebf24b6b9..469c55722cb 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -154,7 +154,7 @@ void write_h_file(const char *fname) char *cptr; char *cast; FILE *fp; - token_t *ttab; + struct token *ttab; int ntab; int i; int once = 0; @@ -279,7 +279,7 @@ void write_h_file(const char *fname) static void write_rcbin(FILE *fp) { lan_blk_t *lbp; - token_t *ttab; + struct token *ttab; int ntab; int i; @@ -456,7 +456,7 @@ static void output_bin_data( lan_blk_t *lbp ) void write_bin_files(void) { lan_blk_t *lbp; - token_t *ttab; + struct token *ttab; int ntab; int i; -- 2.23.0

1 1

[PATCH] include: Add async_uuid for IBackgroundCopyCallback in bits.idl
by Biswapriyo Nath Oct. 26, 2021

Oct. 26, 2021

2 1

[PATCH] include: Add BackgroundCopyManager1_5 library in bits1_5.idl
by Biswapriyo Nath Oct. 26, 2021

Oct. 26, 2021

1 0

[PATCH] dwrite: Implement IDWriteCollection1::GetFontSet.
by Daniel Lehman Oct. 26, 2021

Oct. 26, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- the factory refcount is incremented by both: - create_fontset_builder - IDWriteFontSetBuilder2_CreateFontSet there is no leak as the factory is released at end it's just the intermediate counts that mismatch with windows --- dlls/dwrite/font.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b7071314bb2..a6394ec58bb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3117,9 +3117,42 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec static HRESULT WINAPI dwritefontcollection1_GetFontSet(IDWriteFontCollection3 *iface, IDWriteFontSet **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontcollection *collection = impl_from_IDWriteFontCollection3(iface); + IDWriteFontSetBuilder2 *builder; + IDWriteFontFaceReference *ref; + IDWriteFontFamily2 *family; + UINT32 i, nfamilies; + UINT32 j, nfonts; + HRESULT hr; - return E_NOTIMPL; + *fontset = NULL; + if (FAILED(hr = create_fontset_builder(collection->factory, &builder))) + return hr; + + nfamilies = IDWriteFontCollection3_GetFontFamilyCount(iface); + for (i = 0; i < nfamilies; i++) + { + if (FAILED(hr = IDWriteFontCollection3_GetFontFamily(iface, i, &family))) + break; + + nfonts = IDWriteFontFamily2_GetFontCount(family); + for (j = 0; j < nfonts; j++) + { + if (FAILED(hr = IDWriteFontFamily2_GetFontFaceReference(family, j, &ref))) + break; + if (IDWriteFontFaceReference_GetSimulations(ref) == DWRITE_FONT_SIMULATIONS_NONE) + hr = IDWriteFontSetBuilder2_AddFontFaceReference(builder, ref); + IDWriteFontFaceReference_Release(ref); + if (FAILED(hr)) + break; + } + IDWriteFontFamily2_Release(family); + } + + if (SUCCEEDED(hr)) + hr = IDWriteFontSetBuilder2_CreateFontSet(builder, fontset); + IDWriteFontSetBuilder2_Release(builder); + return hr; } static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection3 *iface, UINT32 index, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba4a2793372..8adb91108d5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,15 +2460,20 @@ static void test_system_fontcollection(void) IDWriteFontCollection2 *collection2; IDWriteFontCollection3 *collection3; IDWriteFactory *factory, *factory2; + IDWriteFontFaceReference *fontref; IDWriteFontFileLoader *loader; IDWriteFontFamily *family; IDWriteFontFace *fontface; IDWriteFactory6 *factory6; IDWriteFontFile *file; IDWriteFont *font; + UINT32 nfamilies; + UINT32 nfonts; + UINT32 count2; + UINT32 count; + UINT32 i, j; HRESULT hr; ULONG ref; - UINT32 i; BOOL ret; factory = create_factory(); @@ -2597,11 +2602,8 @@ static void test_system_fontcollection(void) EXPECT_REF(collection1, 2); EXPECT_REF(factory, 2); hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset); - todo_wine ok(hr == S_OK, "Failed to get fontset, hr %#x.\n", hr); - if (hr == S_OK) { EXPECT_REF(collection1, 2); - EXPECT_REF(factory, 2); EXPECT_REF(fontset, 1); hr = IDWriteFontCollection1_GetFontSet(collection1, &fontset2); @@ -2613,18 +2615,37 @@ static void test_system_fontcollection(void) hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory3, (void **)&factory3); ok(hr == S_OK, "Failed to get IDWriteFactory3 interface, hr %#x.\n", hr); - EXPECT_REF(factory, 3); hr = IDWriteFactory3_GetSystemFontSet(factory3, &fontset2); ok(hr == S_OK, "Failed to get system font set, hr %#x.\n", hr); ok(fontset != fontset2, "Expected new fontset instance.\n"); EXPECT_REF(fontset2, 1); - EXPECT_REF(factory, 4); + + count = IDWriteFontSet_GetFontCount(fontset); + count2 = 0; + nfamilies = IDWriteFontCollection1_GetFontFamilyCount(collection1); + for (i = 0; i < nfamilies; i++) + { + hr = IDWriteFontCollection1_GetFontFamily(collection1, i, &family1); + ok(hr == S_OK, "Failed to get font family, hr %#x.\n", hr); + + nfonts = IDWriteFontFamily1_GetFontCount(family1); + for (j = 0; j < nfonts; j++) + { + hr = IDWriteFontFamily1_GetFontFaceReference(family1, j, &fontref); + ok(hr == S_OK, "Failed to get font reference, hr %#x.\n", hr); + + if (!IDWriteFontFaceReference_GetSimulations(fontref)) + count2++; + IDWriteFontFaceReference_Release(fontref); + } + IDWriteFontFamily1_Release(family1); + } + ok(count == count2, "Expected %#x, got %#x\n", count, count2); IDWriteFontSet_Release(fontset2); IDWriteFontSet_Release(fontset); IDWriteFactory3_Release(factory3); - } IDWriteFontCollection1_Release(collection1); } else -- 2.25.1

2 2

[PATCH v2 1/4] wmvcore/tests: Add tests for synchronous reader media types.
by Zebediah Figura Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wmvcore/tests/wmvcore.c | 265 +++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index dd1e3027d57..df55c2d3198 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -24,11 +24,20 @@ #include "initguid.h" #include "wmsdk.h" #include "wmsecure.h" +#include "amvideo.h" +#include "uuids.h" +#include "wmcodecdsp.h" #include "wine/test.h" HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); +static BOOL compare_media_types(const WM_MEDIA_TYPE *a, const WM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(WM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -616,6 +625,261 @@ static void test_sync_reader_streaming(void) ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } +static void check_video_type(const WM_MEDIA_TYPE *mt) +{ + const VIDEOINFOHEADER *video_info = (const VIDEOINFOHEADER *)mt->pbFormat; + static const RECT rect = {.right = 64, .bottom = 48}; + + ok(IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo), "Got format %s.\n", debugstr_guid(&mt->formattype)); + todo_wine ok(mt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", mt->bFixedSizeSamples); + todo_wine ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); + ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); + + todo_wine ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); + todo_wine ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); + ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); + ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); + ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), + "Got size %u.\n", video_info->bmiHeader.biSize); + ok(video_info->bmiHeader.biWidth == 64, "Got width %d.\n", video_info->bmiHeader.biWidth); + ok(video_info->bmiHeader.biHeight == 48, "Got height %d.\n", video_info->bmiHeader.biHeight); + ok(video_info->bmiHeader.biPlanes == 1, "Got planes %d.\n", video_info->bmiHeader.biPlanes); +} + +static void check_audio_type(const WM_MEDIA_TYPE *mt) +{ + const WAVEFORMATEX *wave_format = (const WAVEFORMATEX *)mt->pbFormat; + + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); + ok(IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx), "Got format %s.\n", debugstr_guid(&mt->formattype)); + ok(mt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", mt->bFixedSizeSamples); + ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); + ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); + + ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag); +} + +static void test_sync_reader_types(void) +{ + char mt_buffer[2000], mt2_buffer[2000]; + const WCHAR *filename = load_resource(L"test.wmv"); + IWMOutputMediaProps *output_props, *output_props2; + WM_MEDIA_TYPE *mt2 = (WM_MEDIA_TYPE *)mt2_buffer; + WM_MEDIA_TYPE *mt = (WM_MEDIA_TYPE *)mt_buffer; + bool got_video = false, got_audio = false; + DWORD size, ret_size, output_number; + WORD stream_number, stream_number2; + struct teststream stream = {0}; + IWMStreamConfig *config; + ULONG count, ref, i, j; + IWMSyncReader *reader; + IWMProfile *profile; + GUID majortype; + HANDLE file; + HRESULT hr; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + + stream.IStream_iface.lpVtbl = &stream_vtbl; + stream.refcount = 1; + stream.file = file; + + hr = WMCreateSyncReader(NULL, 0, &reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + + hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + + for (i = 0; i < 2; ++i) + { + winetest_push_context("Stream %u", i); + + hr = IWMProfile_GetStream(profile, i, &config); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + { + winetest_pop_context(); + continue; + } + + stream_number = 0xdead; + hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); + + hr = IWMStreamConfig_GetStreamType(config, &majortype); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (!i) + todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + else + todo_wine ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype)); + + ref = IWMStreamConfig_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + output_number = 0xdeadbeef; + hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &output_number); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(output_number == 1 - i, "Got output number %u.\n", output_number); + + stream_number2 = 0xdead; + hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret_size = sizeof(mt_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) + { + got_audio = true; + check_audio_type(mt); + } + else + { + ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + got_video = true; + check_video_type(mt); + } + + count = 0; + hr = IWMSyncReader_GetOutputFormatCount(reader, output_number, &count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(count > 0, "Got count %u.\n", count); + + for (j = 0; j < count; ++j) + { + winetest_push_context("Format %u", j); + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + size = 0xdeadbeef; + hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + + ret_size = size - 1; + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + + ret_size = sizeof(mt_buffer); + memset(mt_buffer, 0xcc, sizeof(mt_buffer)); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); + + ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + check_audio_type(mt); + else + check_video_type(mt); + + hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + { + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + winetest_pop_context(); + continue; + } + hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); + if (!i) + todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#x.\n", hr); + else + ok(hr == NS_E_INCOMPATIBLE_FORMAT + || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetOutputProps(reader, 2, output_props); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + + ret_size = sizeof(mt2_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + winetest_pop_context(); + } + + hr = IWMSyncReader_GetOutputFormat(reader, output_number, count, &output_props); + todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); + + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + winetest_pop_context(); + } + + todo_wine ok(got_audio, "No audio stream was enumerated.\n"); + todo_wine ok(got_video, "No video stream was enumerated.\n"); + + count = 0xdeadbeef; + hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(count == 0xdeadbeef, "Got count %#x.\n", count); + + output_props = (void *)0xdeadbeef; + hr = IWMSyncReader_GetOutputProps(reader, 2, &output_props); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); + + output_props = (void *)0xdeadbeef; + hr = IWMSyncReader_GetOutputFormat(reader, 2, 0, &output_props); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); + + IWMProfile_Release(profile); + ref = IWMSyncReader_Release(reader); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + CloseHandle(stream.file); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); +} + START_TEST(wmvcore) { HRESULT hr; @@ -633,6 +897,7 @@ START_TEST(wmvcore) test_urlextension(); test_iscontentprotected(); test_sync_reader_streaming(); + test_sync_reader_types(); CoUninitialize(); } -- 2.33.0

1 3

[PATCH v4 1/2] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick Fox Oct. 25, 2021

Oct. 25, 2021

Add tests for various paths and undefined behavior with regards to LdrGetDllPath with LOAD_ALTERED_SEARCH_PATH and relative module names. Signed-off-by: Nick Fox <nick(a)foxsec.net> --- v4: add another test case and fix todo_wine usage --- dlls/kernel32/tests/path.c | 101 +++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f49af6d5bfe..b2a6d5acbda 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2654,6 +2654,107 @@ static void test_LdrGetDllPath(void) ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); pRtlReleasePath( path ); + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '/'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + build_search_path( buffer, ARRAY_SIZE(buffer), NULL, TRUE ); + todo_wine + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L".\\foo\\foooo" ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L".\\foo" ); + p = buffer + lstrlenW( buffer ); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L"temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, L"c:\\temp" ); + p = buffer + lstrlenW(buffer); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + lstrcpyW( buffer, L"c:\\temp" ); + p = buffer + lstrlenW( buffer ); + *p++ = '\\'; + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + GetSystemDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer) - 2; /* remove "32" */ + *p++ = ';'; + GetWindowsDirectoryW( p, buffer + ARRAY_SIZE(buffer) - p ); + p = buffer + lstrlenW(buffer); + *p++ = ';'; + *p++ = '.'; + *p++ = ';'; + GetEnvironmentVariableW( pathW, p, buffer + ARRAY_SIZE(buffer) - p ); + ok( path_equal( path, buffer ), "got %s expected %s\n", wine_dbgstr_w(path), wine_dbgstr_w(buffer)); + pRtlReleasePath( path ); + + lstrcpyW( buffer, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( ret == STATUS_INVALID_PARAMETER, "got %x expected %x\n", ret, STATUS_INVALID_PARAMETER ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; -- 2.33.0

4 4

[PATCH 0/2] Introduce FIXME_ONCE macro
by David Kahurani Oct. 25, 2021

Oct. 25, 2021

The following patches introduce the FIXME_ONCE macro which suppresses repeated FIXMEs into WARNings. The current FIXME macro tends to be insufficient in cases where a developer wishes to suppresses fixmes other than the first. The first patch is the implementation while the second demonstrates how this could be useful. It is based on the vkd3d version. v2: Fix programming mistakes, fixed a test and some formating v3: Fixed a programming error(s), dropped all patches except two David Kahurani (2): include/wine: suppress subsequent FIXMEs into WARNINGs dlls/ntdll: Use FIXME_ONCE dlls/ntdll/unix/system.c | 8 +++----- include/wine/debug.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) -- 2.33.0

2 3