January 2021 - Wine-commits

Zebediah Figura : msi: Check for failure from do_msidbCustomActionTypeDll().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 5f21acdc9e9840b50a6991b8e8dc52758adb192d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f21acdc9e9840b50a6991b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 17:42:41 2021 -0600 msi: Check for failure from do_msidbCustomActionTypeDll(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b3ac7327d94..7ae7e45af29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -771,7 +771,8 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); - info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); } @@ -876,7 +877,8 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const return ERROR_FUNCTION_FAILED; } - info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); }

1 0

Zebediah Figura : msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 408662379281aa24f41b680f1aba9abf2b40c603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=408662379281aa24f41b680f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 17:42:42 2021 -0600 msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix. This matches native behaviour (manually tested). This allows the Research in Motion (Blackberry) USB and Modem driver to fail cleanly instead of hanging, if run in a 32-bit prefix. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7ae7e45af29..fb03958eb11 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -748,6 +748,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + if (info->arch == SCS_64BIT_BINARY && sizeof(void *) == 4 && !is_wow64) + { + ERR("Attempt to run a 64-bit custom action inside a 32-bit WINEPREFIX.\n"); + free_custom_action_data( info ); + return NULL; + } + custom_start_server(package, info->arch); info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);

1 0

Rémi Bernon : widl: Remove unnecessary WinRT type comments.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: d90dc11d1acc0221e02e92f0627530bee9078688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90dc11d1acc0221e02e92f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 12:35:28 2021 +0100 widl: Remove unnecessary WinRT type comments. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 223ab5c5ca9..d5e35aac92f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -45,8 +45,6 @@ generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name, enum name_type name_type); -static void write_winrt_type_comments(FILE *header, const type_t *type); - static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); @@ -1482,20 +1480,6 @@ static char *format_apicontract_macro(const type_t *type) return name; } -static void write_winrt_type_comments(FILE *header, const type_t *type) -{ - expr_t *contract = get_attrp(type->attrs, ATTR_CONTRACT); - fprintf(header, " *\n"); - if (contract) - { - const type_t *type = contract->u.tref.type; - char *name = format_namespace(type->namespace, "", ".", type->name, NULL); - int ver = contract->ref->u.lval; - fprintf(header, " * Introduced to %s in version %d.%d\n *\n", name, (ver >> 16) & 0xffff, ver & 0xffff); - free(name); - } -} - static void write_apicontract_guard_start(FILE *header, const expr_t *expr) { const type_t *type; @@ -1528,7 +1512,6 @@ static void write_com_interface_start(FILE *header, const type_t *iface) expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); @@ -1630,7 +1613,6 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name);

1 0

Rémi Bernon : widl: Support WinRT marshaling_behavior attribute parsing.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 2129e335f271b1d0123be85faaf86b685c8e734c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2129e335f271b1d0123be85f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 12:35:29 2021 +0100 widl: Support WinRT marshaling_behavior attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 4 ++++ tools/widl/parser.y | 18 ++++++++++++++++-- tools/widl/widltypes.h | 9 +++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 9dce03577c6..01c6f800a08 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -320,6 +320,7 @@ static const struct keyword keywords[] = { static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE, 0}, + {"agile", tAGILE, 1}, {"all_nodes", tALLNODES, 0}, {"allocate", tALLOCATE, 0}, {"annotation", tANNOTATION, 0}, @@ -381,12 +382,14 @@ static const struct keyword attr_keywords[] = {"length_is", tLENGTHIS, 0}, {"licensed", tLICENSED, 0}, {"local", tLOCAL, 0}, + {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, {"noncreatable", tNONCREATABLE, 0}, + {"none", tNONE, 1}, {"nonextensible", tNONEXTENSIBLE, 0}, {"notify", tNOTIFY, 0}, {"notify_flag", tNOTIFYFLAG, 0}, @@ -416,6 +419,7 @@ static const struct keyword attr_keywords[] = {"single_node", tSINGLENODE, 0}, {"size_is", tSIZEIS, 0}, {"source", tSOURCE, 0}, + {"standard", tSTANDARD, 1}, {"strict_context_handle", tSTRICTCONTEXTHANDLE, 0}, {"string", tSTRING, 0}, {"switch_is", tSWITCHIS, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b729d772fcd..48f180cdb49 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -174,7 +174,9 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION +%token tAGGREGATABLE +%token tAGILE +%token tALLNODES tALLOCATE tANNOTATION %token tAPICONTRACT %token tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT @@ -216,12 +218,14 @@ static typelib_t *current_typelib; %token tLENGTHIS tLIBRARY %token tLICENSED tLOCAL %token tLONG +%token tMARSHALINGBEHAVIOR %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE +%token tNONE %token tNONEXTENSIBLE %token tNOTIFY tNOTIFYFLAG %token tNULL @@ -247,6 +251,7 @@ static typelib_t *current_typelib; %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE +%token tSTANDARD %token tSTATIC %token tSTDCALL %token tSTRICTCONTEXTHANDLE @@ -299,7 +304,7 @@ static typelib_t *current_typelib; %type <type> coclass coclasshdr coclassdef %type <type> apicontract %type <num> contract_ver -%type <num> pointer_type threading_type version +%type <num> pointer_type threading_type marshaling_behavior version %type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string %type <import> import_start @@ -505,6 +510,12 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } | str_list ',' aSTRING { $$ = append_str( $1, $3 ); } ; +marshaling_behavior: + tAGILE { $$ = MARSHALING_AGILE; } + | tNONE { $$ = MARSHALING_NONE; } + | tSTANDARD { $$ = MARSHALING_STANDARD; } + ; + contract_ver: aNUM { $$ = MAKEVERSION(0, $1); } | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } @@ -572,6 +583,8 @@ attribute: { $$ = NULL; } | tLCID { $$ = make_attr(ATTR_PARAMLCID); } | tLICENSED { $$ = make_attr(ATTR_LICENSED); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } + | tMARSHALINGBEHAVIOR '(' marshaling_behavior ')' + { $$ = make_attrv(ATTR_MARSHALING_BEHAVIOR, $3); } | tMAYBE { $$ = make_attr(ATTR_MAYBE); } | tMESSAGE { $$ = make_attr(ATTR_MESSAGE); } | tNOCODE { $$ = make_attr(ATTR_NOCODE); } @@ -2230,6 +2243,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "lcid" }, /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "licensed" }, /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, + /* ATTR_MARSHALING_BEHAVIOR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "marshaling_behavior" }, /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d5862426ad4..6c130d4701e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -125,6 +125,7 @@ enum attr_type ATTR_LIBLCID, ATTR_LICENSED, ATTR_LOCAL, + ATTR_MARSHALING_BEHAVIOR, ATTR_MAYBE, ATTR_MESSAGE, ATTR_NOCODE, @@ -271,6 +272,14 @@ enum threading_type THREADING_BOTH }; +enum marshaling_type +{ + MARSHALING_INVALID = 0, + MARSHALING_NONE, + MARSHALING_AGILE, + MARSHALING_STANDARD, +}; + enum type_basic_type { TYPE_BASIC_INT8 = 1,

1 0

Piotr Caban : crypt32: Also import user/admin defined root certificates on macOS.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: c53d6a4a7cd2237afe293594d97e6906acb3cc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c53d6a4a7cd2237afe293594… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 14:52:20 2021 +0100 crypt32: Also import user/admin defined root certificates on macOS. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/unixlib.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 035f2d936bb..0c2370968e9 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -580,26 +580,35 @@ static void load_root_certs(void) DWORD i; #ifdef HAVE_SECURITY_SECURITY_H + const SecTrustSettingsDomain domains[] = { + kSecTrustSettingsDomainSystem, + kSecTrustSettingsDomainAdmin, + kSecTrustSettingsDomainUser + }; OSStatus status; - CFArrayRef rootCerts; + CFArrayRef certs; + DWORD domain; - status = SecTrustCopyAnchorCertificates(&rootCerts); - if (status == noErr) + for (domain = 0; domain < ARRAY_SIZE(domains); domain++) { - for (i = 0; i < CFArrayGetCount(rootCerts); i++) + status = SecTrustSettingsCopyCertificates(domains[domain], &certs); + if (status == noErr) { - SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(rootCerts, i); - CFDataRef certData; - if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + for (i = 0; i < CFArrayGetCount(certs); i++) { - BYTE *data = add_cert( CFDataGetLength(certData) ); - if (data) memcpy( data, CFDataGetBytePtr(certData), CFDataGetLength(certData) ); - CFRelease(certData); + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, i); + CFDataRef certData; + if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + { + BYTE *data = add_cert( CFDataGetLength(certData) ); + if (data) memcpy( data, CFDataGetBytePtr(certData), CFDataGetLength(certData) ); + CFRelease(certData); + } + else + WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); } - else - WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + CFRelease(certs); } - CFRelease(rootCerts); } #endif

1 0

Paul Gofman : msvcrt: Add -norelay flag to lldiv definition in spec files.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 9be8c5255bb2c02467373bf373b6eefcfb0337ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be8c5255bb2c02467373bf3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 22 01:48:35 2021 +0300 msvcrt: Add -norelay flag to lldiv definition in spec files. lldiv returns lldiv_t structure (which includes two int64). In such case the address of return structure is implicitly passed as the first parameter. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index c81c3d42127..584e61dd652 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ cdecl lldiv(int64 int64) ucrtbase.lldiv +@ cdecl -norelay lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b15a6219c52..6af92d7ea6f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c4782b5977b..45d8e2b3507 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b8ba61a2e8c..91be9c65d2d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b99bb2ee614..f5d6cde1cac 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ cdecl lldiv(int64 int64) msvcr120.lldiv +@ cdecl -norelay lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b1d6cf992b4..0a8d74521f5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint

1 0

Zebediah Figura : ntdll/tests: Add an alignment helper.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 6ebf5ed093015143a58f21db9f2ae07ac5987aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebf5ed093015143a58f21db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:51:58 2021 -0600 ntdll/tests: Add an alignment helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4865a0a8e51..d476bd65a81 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -325,6 +325,11 @@ static WCHAR *get_params_string( RTL_USER_PROCESS_PARAMETERS *params, UNICODE_ST return (WCHAR *)((char *)params + (UINT_PTR)str->Buffer); } +static UINT_PTR align(UINT_PTR size, unsigned int alignment) +{ + return (size + (alignment - 1)) & ~(alignment - 1); +} + static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UNICODE_STRING *str, const UNICODE_STRING *expect, UINT_PTR pos ) { @@ -341,9 +346,9 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN ok_(__FILE__,line)( str->Buffer == NULL, "buffer not null %p\n", str->Buffer ); return pos; } - ok_(__FILE__,line)( (UINT_PTR)str->Buffer == ((pos + sizeof(void*) - 1) & ~(sizeof(void *) - 1)) || + ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)) || (!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */ - broken( (UINT_PTR)str->Buffer == ((pos + 3) & ~3) ), "wrong buffer %lx/%lx\n", + broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %lx/%lx\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength) { @@ -424,7 +429,7 @@ static void test_process_params(void) pos = check_string( params, &params->Desktop, &empty_str, pos ); pos = check_string( params, &params->ShellInfo, &empty_str, pos ); pos = check_string( params, &params->RuntimeInfo, &null_str, pos ); - pos = (pos + 3) & ~3; + pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, "wrong pos %lx/%x\n", pos, params->Size ); pos = params->Size; @@ -437,8 +442,8 @@ static void test_process_params(void) while (*str) str += lstrlenW(str) + 1; str++; pos += (str - params->Environment) * sizeof(WCHAR); - ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || - broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + ok( align(pos, sizeof(void *)) == size || + broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); @@ -478,7 +483,7 @@ static void test_process_params(void) pos = check_string( params, &params->Desktop, &dummy, pos ); pos = check_string( params, &params->ShellInfo, &dummy, pos ); pos = check_string( params, &params->RuntimeInfo, &dummy, pos ); - pos = (pos + 3) & ~3; + pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, "wrong pos %lx/%x\n", pos, params->Size ); pos = params->Size; @@ -491,8 +496,8 @@ static void test_process_params(void) while (*str) str += lstrlenW(str) + 1; str++; pos += (str - params->Environment) * sizeof(WCHAR); - ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || - broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + ok( align(pos, sizeof(void *)) == size || + broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params );

1 0

Akihiro Sagawa : comdlg32/tests: Add a test for CF_NOSCRIPTSEL.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: ee3a315385bf7c38d77a2f48d3fc72d0d1f0a992 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee3a315385bf7c38d77a2f48… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 23 00:28:11 2021 +0900 comdlg32/tests: Add a test for CF_NOSCRIPTSEL. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/fontdlg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 090053522dd..e8f184c4ed8 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -110,8 +110,14 @@ static void test_ChooseFontA(void) ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); + ok(lfa.lfCharSet == SYMBOL_CHARSET, "Expected SYMBOL_CHARSET, got %i\n", lfa.lfCharSet); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); + cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS|CF_NOSCRIPTSEL; + ret = ChooseFontA(&cfa); + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); + todo_wine ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); + printer_ic = get_printer_ic(); if (!printer_ic) skip("can't get a DC for a local printer\n");

1 0

Akihiro Sagawa : comdlg32: Set DEFAULT_CHARSET if CF_NOSCRIPTSEL is set.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 89ded8c8e145d9d1010078c17c44a2f5e5df1010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ded8c8e145d9d1010078c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 23 00:28:14 2021 +0900 comdlg32: Set DEFAULT_CHARSET if CF_NOSCRIPTSEL is set. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 13 +++++++++---- dlls/comdlg32/tests/fontdlg.c | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index a518c78fb17..e2c8eb2b3ad 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1032,11 +1032,16 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO get_dialog_font_point_size(hDlg, lpcf); /* charset */ - i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); - if (i!=CB_ERR) - lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); - else + if (lpcf->Flags & CF_NOSCRIPTSEL) lpxx->lfCharSet = DEFAULT_CHARSET; + else + { + i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); + if (i!=CB_ERR) + lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); + else + lpxx->lfCharSet = DEFAULT_CHARSET; + } lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1); lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2); lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0; diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index e8f184c4ed8..2836ba1e9ef 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -116,7 +116,7 @@ static void test_ChooseFontA(void) cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS|CF_NOSCRIPTSEL; ret = ChooseFontA(&cfa); ok(ret == TRUE, "ChooseFontA returned FALSE\n"); - todo_wine ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); + ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); printer_ic = get_printer_ic(); if (!printer_ic)

1 0

Vijay Kiran Kamuju : uiautomationcore: Add stub UiaRegisterProviderCallback function.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 8f0349f25b9cd44631178eb46d52c1e12dd69bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f0349f25b9cd44631178eb4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jan 17 18:43:09 2021 +0100 uiautomationcore: Add stub UiaRegisterProviderCallback function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50508 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 5 +++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index f0d8247724d..77460aa174c 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -94,6 +94,11 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) +{ + FIXME("(%p): stub\n", callback); +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { FIXME("(%p, %p): stub\n", hwnd, provider); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 53ef893064c..5da89c3451c 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -91,7 +91,7 @@ #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent #@ stub UiaRaiseTextEditTextChangedEvent -@ stub UiaRegisterProviderCallback +@ stdcall UiaRegisterProviderCallback(ptr) @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0acdc29e0eb..de486710158 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -52,11 +52,21 @@ enum AutomationIdentifierType AutomationIdentifierType_Style }; +enum ProviderType +{ + ProviderType_BaseHwnd, + ProviderType_Proxy, + ProviderType_NonClientArea, +}; + +typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); + HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov);

1 0