December 2021 - Wine-commits

Alexandre Julliard : wrc: Remove the no longer used resource C name.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 1226595b164022a70e5912268f9409916cedae21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1226595b164022a70e591226… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:14:15 2021 +0100 wrc: Remove the no longer used resource C name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 115 --------------------------------------------------- tools/wrc/genres.h | 3 -- tools/wrc/wrctypes.h | 1 - 3 files changed, 119 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index d2a8bf3f036..4ce0821a730 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -1476,120 +1476,6 @@ static res_t *dlginit2res(name_id_t *name, dlginit_t *dit) return end_res(res, restag); } -/* - ***************************************************************************** - * Function : prep_nid_for_label - * Syntax : char *prep_nid_for_label(const name_id_t *nid) - * Input : - * Output : - * Description : Converts a resource name into the first 32 (or less) - * characters of the name with conversions. - * Remarks : - ***************************************************************************** -*/ -#define MAXNAMELEN 32 -char *prep_nid_for_label(const name_id_t *nid) -{ - static char buf[MAXNAMELEN+1]; - - switch (nid->type) - { - case name_str: - if(nid->name.s_name->type == str_unicode) - { - WCHAR *sptr; - int i; - sptr = nid->name.s_name->str.wstr; - buf[0] = '\0'; - for(i = 0; *sptr && i < MAXNAMELEN; i++) - { - if((unsigned)*sptr < 0x80 && isprint(*sptr & 0xff)) - buf[i] = *sptr++; - else - warning("Resourcename (str_unicode) contain unprintable characters or invalid translation, ignored\n"); - } - buf[i] = '\0'; - } - else - { - char *cptr; - int i; - cptr = nid->name.s_name->str.cstr; - buf[0] = '\0'; - for(i = 0; *cptr && i < MAXNAMELEN; i++) - { - if((unsigned)*cptr < 0x80 && isprint(*cptr & 0xff)) - buf[i] = *cptr++; - else - warning("Resourcename (str_char) contain unprintable characters, ignored\n"); - } - buf[i] = '\0'; - } - break; - - case name_ord: - sprintf(buf, "%u", nid->name.i_name); - break; - } - return buf; -} -#undef MAXNAMELEN - -/* - ***************************************************************************** - * Function : make_c_name - * Syntax : char *make_c_name(const char *base, const name_id_t *nid, const language_t *lan) - * Input : - * Output : - * Description : Converts a resource name into a valid c-identifier in the - * form "_base_nid". - * Remarks : - ***************************************************************************** -*/ -char *make_c_name(const char *base, const name_id_t *nid, const language_t *lan) -{ - char *buf = prep_nid_for_label(nid); - return strmake( "_%s_%s_%d", base, buf, lan ? MAKELANGID(lan->id, lan->sub) : 0); -} - -/* - ***************************************************************************** - * Function : get_c_typename - * Syntax : const char *get_c_typename(enum res_e type) - * Input : - * Output : - * Description : Convert resource enum to char string to be used in c-name - * creation. - * Remarks : - ***************************************************************************** -*/ -const char *get_c_typename(enum res_e type) -{ - switch(type) - { - case res_acc: return "Acc"; - case res_anicur:return "AniCur"; - case res_aniico:return "AniIco"; - case res_bmp: return "Bmp"; - case res_cur: return "Cur"; - case res_curg: return "CurGrp"; - case res_dlg: return "Dlg"; - case res_fnt: return "Fnt"; - case res_fntdir:return "FntDir"; - case res_ico: return "Ico"; - case res_icog: return "IcoGrp"; - case res_men: return "Men"; - case res_rdt: return "RCDat"; - case res_stt: return "StrTab"; - case res_usr: return "Usr"; - case res_msg: return "MsgTab"; - case res_ver: return "VerInf"; - case res_toolbar: return "TlBr"; - case res_dlginit: return "DlgInit"; - default: return "Oops"; - } -} - /* ***************************************************************************** * Function : resources2res @@ -1687,7 +1573,6 @@ void resources2res(resource_t *top) default: assert(0); } - top->c_name = make_c_name(get_c_typename(top->type), top->name, top->lan); top = top->next; } } diff --git a/tools/wrc/genres.h b/tools/wrc/genres.h index f8007d14cd9..de24f8d1ff0 100644 --- a/tools/wrc/genres.h +++ b/tools/wrc/genres.h @@ -29,8 +29,5 @@ void put_byte(res_t *res, unsigned c); void put_word(res_t *res, unsigned w); void put_dword(res_t *res, unsigned d); void resources2res(resource_t *top); -const char *get_c_typename(enum res_e type); -char *make_c_name(const char *base, const name_id_t *nid, const language_t *lan); -char *prep_nid_for_label(const name_id_t *nid); #endif diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h index da5e0e6ce95..565b8066483 100644 --- a/tools/wrc/wrctypes.h +++ b/tools/wrc/wrctypes.h @@ -589,7 +589,6 @@ typedef struct resource { void *overlay; /* To catch all types at once... */ } res; res_t *binres; /* To binary converted resource */ - char *c_name; /* BaseName in output */ DWORD memopt; } resource_t;

1 0

Alexandre Julliard : wrc: Move write_resfile() into genres.c and remove writeres.c.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 952d849e488bfc7be622ebb697df14b63e90f4ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=952d849e488bfc7be622ebb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:16:41 2021 +0100 wrc: Move write_resfile() into genres.c and remove writeres.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 3 +- tools/wrc/genres.c | 88 ++++++++++++++++++++++++++++++++++++++---- tools/wrc/genres.h | 33 ---------------- tools/wrc/po.c | 1 - tools/wrc/wrc.c | 4 -- tools/wrc/writeres.c | 103 -------------------------------------------------- 6 files changed, 82 insertions(+), 150 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 140240962e4..29529a2d71e 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -9,8 +9,7 @@ C_SRCS = \ translation.c \ utils.c \ wpp.c \ - wrc.c \ - writeres.c + wrc.c LEX_SRCS = \ parser.l \ diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 4ce0821a730..ba848084ac9 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -36,14 +36,13 @@ #include "../tools.h" #include "wrc.h" -#include "genres.h" #include "utils.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" -res_t *new_res(void) +static res_t *new_res(void) { res_t *r; r = xmalloc(sizeof(res_t)); @@ -54,7 +53,7 @@ res_t *new_res(void) return r; } -res_t *grow_res(res_t *r, unsigned int add) +static res_t *grow_res(res_t *r, unsigned int add) { r->allocsize += add; r->data = xrealloc(r->data, r->allocsize); @@ -78,7 +77,7 @@ res_t *grow_res(res_t *r, unsigned int add) * Remarks : ***************************************************************************** */ -void put_byte(res_t *res, unsigned c) +static void put_byte(res_t *res, unsigned c) { if(res->allocsize - res->size < sizeof(char)) grow_res(res, RES_BLOCKSIZE); @@ -86,7 +85,7 @@ void put_byte(res_t *res, unsigned c) res->size += sizeof(char); } -void put_word(res_t *res, unsigned w) +static void put_word(res_t *res, unsigned w) { if(res->allocsize - res->size < sizeof(WORD)) grow_res(res, RES_BLOCKSIZE); @@ -95,7 +94,7 @@ void put_word(res_t *res, unsigned w) res->size += sizeof(WORD); } -void put_dword(res_t *res, unsigned d) +static void put_dword(res_t *res, unsigned d) { if(res->allocsize - res->size < sizeof(DWORD)) grow_res(res, RES_BLOCKSIZE); @@ -1487,7 +1486,7 @@ static res_t *dlginit2res(name_id_t *name, dlginit_t *dit) * Remarks : ***************************************************************************** */ -void resources2res(resource_t *top) +static void resources2res(resource_t *top) { while(top) { @@ -1576,3 +1575,78 @@ void resources2res(resource_t *top) top = top->next; } } + +/* + ***************************************************************************** + * Function : write_resfile + * Syntax : void write_resfile(char *outname, resource_t *top) + * Input : + * outname - Filename to write to + * top - The resource-tree to convert + * Output : + * Description : + * Remarks : + ***************************************************************************** +*/ +void write_resfile(char *outname, resource_t *top) +{ + FILE *fo; + unsigned int ret; + char zeros[3] = {0, 0, 0}; + + /* Convert the internal lists to binary data */ + resources2res(resource_top); + + fo = fopen(outname, "wb"); + if(!fo) + fatal_perror("Could not open %s", outname); + + if(win32) + { + /* Put an empty resource first to signal win32 format */ + res_t *res = new_res(); + put_dword(res, 0); /* ResSize */ + put_dword(res, 0x00000020); /* HeaderSize */ + put_word(res, 0xffff); /* ResType */ + put_word(res, 0); + put_word(res, 0xffff); /* ResName */ + put_word(res, 0); + put_dword(res, 0); /* DataVersion */ + put_word(res, 0); /* Memory options */ + put_word(res, 0); /* Language */ + put_dword(res, 0); /* Version */ + put_dword(res, 0); /* Characteristics */ + ret = fwrite(res->data, 1, res->size, fo); + if(ret != res->size) + { + fclose(fo); + error("Error writing %s\n", outname); + } + free(res); + } + + for(; top; top = top->next) + { + if(!top->binres) + continue; + + ret = fwrite(top->binres->data, 1, top->binres->size, fo); + if(ret != top->binres->size) + { + fclose(fo); + error("Error writing %s\n", outname); + } + if(win32 && (top->binres->size & 0x03)) + { + /* Write padding */ + ret = fwrite(zeros, 1, 4 - (top->binres->size & 0x03), fo); + if(ret != 4 - (top->binres->size & 0x03)) + { + fclose(fo); + error("Error writing %s\n", outname); + } + } + } + if (fclose(fo)) + fatal_perror("Error writing %s", outname); +} diff --git a/tools/wrc/genres.h b/tools/wrc/genres.h deleted file mode 100644 index de24f8d1ff0..00000000000 --- a/tools/wrc/genres.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Generate resource prototypes - * - * Copyright 1998 Bertho A. Stultiens (BS) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WRC_GENRES_H -#define __WRC_GENRES_H - -#include "wrctypes.h" - -res_t *new_res(void); -res_t *grow_res(res_t *r, unsigned int add); -void put_byte(res_t *res, unsigned c); -void put_word(res_t *res, unsigned w); -void put_dword(res_t *res, unsigned d); -void resources2res(resource_t *top); - -#endif diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 520c7de266b..42e06f93c10 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -32,7 +32,6 @@ #include "../tools.h" #include "wrc.h" -#include "genres.h" #include "newstruc.h" #include "utils.h" #include "windef.h" diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ca9361c3017..41207120237 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -37,7 +37,6 @@ #include "wrc.h" #include "utils.h" #include "dumpres.h" -#include "genres.h" #include "newstruc.h" #include "parser.h" #include "wpp_private.h" @@ -528,9 +527,6 @@ int main(int argc,char *argv[]) } if (win32) add_translations( po_dir ); - /* Convert the internal lists to binary data */ - resources2res(resource_top); - chat("Writing .res-file\n"); if (!output_name) { diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c deleted file mode 100644 index 7a75cb1e0d6..00000000000 --- a/tools/wrc/writeres.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Write .res file from a resource-tree - * - * Copyright 1998 Bertho A. Stultiens - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> - -#include "wrc.h" -#include "genres.h" -#include "newstruc.h" -#include "utils.h" - -/* - ***************************************************************************** - * Function : write_resfile - * Syntax : void write_resfile(char *outname, resource_t *top) - * Input : - * outname - Filename to write to - * top - The resource-tree to convert - * Output : - * Description : - * Remarks : - ***************************************************************************** -*/ -void write_resfile(char *outname, resource_t *top) -{ - FILE *fo; - unsigned int ret; - char zeros[3] = {0, 0, 0}; - - fo = fopen(outname, "wb"); - if(!fo) - fatal_perror("Could not open %s", outname); - - if(win32) - { - /* Put an empty resource first to signal win32 format */ - res_t *res = new_res(); - put_dword(res, 0); /* ResSize */ - put_dword(res, 0x00000020); /* HeaderSize */ - put_word(res, 0xffff); /* ResType */ - put_word(res, 0); - put_word(res, 0xffff); /* ResName */ - put_word(res, 0); - put_dword(res, 0); /* DataVersion */ - put_word(res, 0); /* Memory options */ - put_word(res, 0); /* Language */ - put_dword(res, 0); /* Version */ - put_dword(res, 0); /* Characteristics */ - ret = fwrite(res->data, 1, res->size, fo); - if(ret != res->size) - { - fclose(fo); - error("Error writing %s\n", outname); - } - free(res); - } - - for(; top; top = top->next) - { - if(!top->binres) - continue; - - ret = fwrite(top->binres->data, 1, top->binres->size, fo); - if(ret != top->binres->size) - { - fclose(fo); - error("Error writing %s\n", outname); - } - if(win32 && (top->binres->size & 0x03)) - { - /* Write padding */ - ret = fwrite(zeros, 1, 4 - (top->binres->size & 0x03), fo); - if(ret != 4 - (top->binres->size & 0x03)) - { - fclose(fo); - error("Error writing %s\n", outname); - } - } - } - if (fclose(fo)) - fatal_perror("Error writing %s", outname); -}

1 0

Alexandre Julliard : wrc: Convert resource output to the standard output buffer functions.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 7f0943dde6598d36a2abf108e493269c87c86e75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0943dde6598d36a2abf108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:53:49 2021 +0100 wrc: Convert resource output to the standard output buffer functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 1273 ++++++++++++++++++-------------------------------- tools/wrc/wrctypes.h | 11 - 2 files changed, 444 insertions(+), 840 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f0943dde6598d36a2ab…

1 0

Alexandre Julliard : tools: Move the output buffer functions to the common header.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: b53773cff2f878709bf7783a6830e1b937ed49a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b53773cff2f878709bf7783a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:56:41 2021 +0100 tools: Move the output buffer functions to the common header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/tools.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.c | 71 ------------------------------------------ tools/widl/utils.h | 12 -------- tools/winebuild/build.h | 11 ------- tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 2 +- tools/winebuild/utils.c | 75 --------------------------------------------- tools/wmc/utils.c | 64 -------------------------------------- tools/wmc/utils.h | 13 -------- tools/wrc/genres.c | 77 +++------------------------------------------- 10 files changed, 86 insertions(+), 321 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b53773cff2f878709bf7…

1 0

Alexandre Julliard : sfnt2fon: Use the standard output buffer functions.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 4670846dfc10df84dd00538011cfad8154fd3737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4670846dfc10df84dd005380… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 14:36:55 2021 +0100 sfnt2fon: Use the standard output buffer functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 423 +++++++++++++++++++++------------------------- 1 file changed, 189 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4670846dfc10df84dd00…

1 0

Huw Davies : maintainers: Add the nsi include file.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: acabb7d078da474798d60b7fbebeff9d7286c4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=acabb7d078da474798d60b7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 10 11:43:32 2021 +0000 maintainers: Add the nsi include file. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ea27dc41af3..d1f92c3a50b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -221,6 +221,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/iphlpapi/ F: dlls/nsi/ F: dlls/nsiproxy.sys/ +F: include/wine/nsi.h OLE Embedding M: Huw Davies <huw(a)codeweavers.com>

1 0

Alex Henrie : nsi: Use a whole byte for each nsi_ip_neighbour_dynamic flag.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: cba1faeef76b411e60c34db44986ca9f9ad56e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba1faeef76b411e60c34db4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 8 23:12:04 2021 -0700 nsi: Use a whole byte for each nsi_ip_neighbour_dynamic flag. Fixes the failure of the test at dlls/nsi/tests/nsi.c:679 on certain testbot machines. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/nsi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8c3488dc19c..b8e59c7bf54 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -226,8 +226,8 @@ struct nsi_ip_neighbour_dynamic DWORD time; struct { - USHORT is_router : 1; - USHORT is_unreachable : 1; + BOOLEAN is_router; + BOOLEAN is_unreachable; } flags; USHORT phys_addr_len; DWORD unk;

1 0

Hans Leidekker : msi: GetBinaryType() doesn't accept DLLs.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 4aa858c9badfb35bcc3cdd38abfd40dc5b06c696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aa858c9badfb35bcc3cdd38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:51:43 2021 +0100 msi: GetBinaryType() doesn't accept DLLs. With help from Dmitry Timoshkov. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51790 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fb03958eb11..19ad3917265 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -22,6 +22,9 @@ #include <stdarg.h> #include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -697,6 +700,51 @@ static DWORD WINAPI custom_client_thread(void *arg) return rc; } +/* based on kernel32.GetBinaryTypeW() */ +static BOOL get_binary_type( const WCHAR *name, DWORD *type ) +{ + HANDLE hfile, mapping; + NTSTATUS status; + + hfile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (hfile == INVALID_HANDLE_VALUE) + return FALSE; + + status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY, NULL, NULL, PAGE_READONLY, + SEC_IMAGE, hfile ); + CloseHandle( hfile ); + + switch (status) + { + case STATUS_SUCCESS: + { + SECTION_IMAGE_INFORMATION info; + + status = NtQuerySection( mapping, SectionImageInformation, &info, sizeof(info), NULL ); + CloseHandle( mapping ); + if (status) return FALSE; + switch (info.Machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARMNT: + *type = SCS_32BIT_BINARY; + return TRUE; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } + } + case STATUS_INVALID_IMAGE_WIN_64: + *type = SCS_64BIT_BINARY; + return TRUE; + default: + return FALSE; + } +} + static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { @@ -744,7 +792,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->package->rpc_server_started = 1; } - ret = GetBinaryTypeW(source, &info->arch); + ret = get_binary_type(source, &info->arch); if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY);

1 0

Francois Gouget : server: Fix the spelling of a comment.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 7afb9b7d0c77ba6feae1198c6f421a7067e1479f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7afb9b7d0c77ba6feae1198c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 10 16:16:56 2021 +0100 server: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 296f7a5d265..467ccd1f0db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -33,7 +33,7 @@ #include <time.h> #include <poll.h> #ifdef HAVE_SCHED_H -/* FreeBSD needs this for cpu_set_t intead of its cpuset_t */ +/* FreeBSD needs this for cpu_set_t instead of its cpuset_t */ #define _WITH_CPU_SET_T #include <sched.h> #endif

1 0

Henri Verbeet : d2d1: Create feature level 10.0 device context state objects.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 7fabf0297894e714caf24cc2d79f2495dff1328f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fabf0297894e714caf24cc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 10 16:25:06 2021 +0100 d2d1: Create feature level 10.0 device context state objects. Commit 8c9354926204242cde714a51e5283bc3aac55837 introduced a feature level 11.0 requirement for Direct2D, but that was unintentional. We want Direct2D to be usable with feature level 10.0 hardware, and don't actually require any feature level 11.0 features. This issue was pointed out by Matteo Bruni. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2069eeda0fc..e6b6f9efbea 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -3863,7 +3863,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { 1.0f, -1.0f}, }; static const UINT16 indices[] = {0, 1, 2, 2, 1, 3}; - static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_11_0; + static const D3D_FEATURE_LEVEL feature_levels = D3D_FEATURE_LEVEL_10_0; render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl;

1 0