wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

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

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 : 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 : 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: 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: Don't catch SIGSEGV.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 49564a92bbf899be06e18ef4873faad06715da8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=49564a92bbf899be06e18ef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:11:50 2021 +0100 wrc: Don't catch SIGSEGV. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index f848b30a0f8..ca9361c3017 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -155,7 +155,6 @@ int parser_debug, yy_flex_debug; resource_t *resource_top; /* The top of the parsed resources */ static void cleanup_files(void); -static void segvhandler(int sig); enum long_options_values { @@ -434,7 +433,6 @@ int main(int argc,char *argv[]) { int i; - signal(SIGSEGV, segvhandler); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); #ifdef SIGHUP @@ -551,11 +549,3 @@ static void cleanup_files(void) if (output_name) unlink(output_name); if (temp_name) unlink(temp_name); } - -static void segvhandler(int sig) -{ - fprintf(stderr, "\n%s:%d: Oops, segment violation\n", input_name, line_number); - fflush(stdout); - fflush(stderr); - abort(); -}

1 0

Alexandre Julliard : wmc: Don't catch SIGSEGV.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: aaa5216a3a4ddc96b3a43845ad9b07e737cb50ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa5216a3a4ddc96b3a43845… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:11:33 2021 +0100 wmc: Don't catch SIGSEGV. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/wmc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 2d3dcaf328c..f3cd8840276 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -136,8 +136,6 @@ static const struct long_option long_options[] = { NULL } }; -static void segvhandler(int sig); - static void cleanup_files(void) { if (output_name) unlink( output_name ); @@ -241,7 +239,6 @@ int main(int argc,char *argv[]) struct strarray files; atexit( cleanup_files ); - signal(SIGSEGV, segvhandler); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); #ifdef SIGHUP @@ -337,11 +334,3 @@ int main(int argc,char *argv[]) header_name = NULL; return 0; } - -static void segvhandler(int sig) -{ - fprintf(stderr, "\n%s:%d: Oops, segment violation\n", input_name, line_number); - fflush(stdout); - fflush(stderr); - abort(); -}

1 0

Rémi Bernon : winejoystick.drv: Remove unnecessary driver.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: f9d7acbf45672b6e60abe9b3116d79cc8b73468d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9d7acbf45672b6e60abe9b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 10 09:44:49 2021 +0100 winejoystick.drv: Remove unnecessary driver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 56 -- configure.ac | 25 - dlls/winejoystick.drv/Makefile.in | 10 - dlls/winejoystick.drv/joystick.c | 52 -- dlls/winejoystick.drv/joystick.h | 34 - dlls/winejoystick.drv/joystick_linux.c | 458 -------------- dlls/winejoystick.drv/joystick_osx.c | 935 ---------------------------- dlls/winejoystick.drv/winejoystick.drv.spec | 1 - include/config.h.in | 6 - tools/winapi/win32.api | 13 - 10 files changed, 1590 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9d7acbf45672b6e60ab…

1 0

Rémi Bernon : winmm: Reimplement joystick APIs on top of dinput.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 4f1095a0ee4c7577e5287e56e388c36d0ba659ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1095a0ee4c7577e5287e56… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:09 2021 +0100 winmm: Reimplement joystick APIs on top of dinput. Based on a patch from Zebediah Figura <zfigura(a)codeweavers.com>. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 51 ------- dlls/winmm/Makefile.in | 2 +- dlls/winmm/joystick.c | 345 ++++++++++++++++++++++++++++++++++++++++------- dlls/winmm/winemm.h | 3 + dlls/winmm/winmm.c | 2 + 5 files changed, 303 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1095a0ee4c7577e528…

1 0

Rémi Bernon : winmm: Guard accesses to joystick array with a critical section.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 591dcfda0112476083e2567530c6d3d1fed29ea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591dcfda0112476083e25675… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 3 12:19:08 2021 +0100 winmm: Guard accesses to joystick array with a critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 842b521a586..20a69e8119d 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -40,6 +40,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); +static CRITICAL_SECTION joystick_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &joystick_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": joystick_cs") } +}; +static CRITICAL_SECTION joystick_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + #define JOY_PERIOD_MIN (10) /* min Capture time period */ #define JOY_PERIOD_MAX (1000) /* max Capture time period */ @@ -91,6 +100,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD LONG pos; int i; + EnterCriticalSection( &joystick_cs ); + for (i = 0; i < ARRAY_SIZE(joysticks); i++) { if (joysticks[i].capture != hwnd) continue; @@ -125,6 +136,8 @@ static void CALLBACK joystick_timer( HWND hwnd, UINT msg, UINT_PTR timer, DWORD joysticks[i].info.wButtons = info.wButtons; } } + + LeaveCriticalSection( &joystick_cs ); } /************************************************************************** @@ -285,7 +298,10 @@ MMRESULT WINAPI joyGetThreshold( UINT id, UINT *threshold ) if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; + EnterCriticalSection( &joystick_cs ); *threshold = joysticks[id].threshold; + LeaveCriticalSection( &joystick_cs ); + return JOYERR_NOERROR; } @@ -299,6 +315,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) if (id >= ARRAY_SIZE(joysticks)) return JOYERR_PARMS; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; + EnterCriticalSection( &joystick_cs ); + if (!joysticks[id].capture) TRACE("Joystick is not captured, ignoring request.\n"); else @@ -308,6 +326,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) joysticks[id].timer = 0; } + LeaveCriticalSection( &joystick_cs ); + return JOYERR_NOERROR; } @@ -316,6 +336,8 @@ MMRESULT WINAPI joyReleaseCapture( UINT id ) */ MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed ) { + MMRESULT res = JOYERR_NOERROR; + TRACE( "hwnd %p, id %u, period %u, changed %u.\n", hwnd, id, period, changed ); if (id >= ARRAY_SIZE(joysticks) || hwnd == 0) return JOYERR_PARMS; @@ -323,16 +345,22 @@ MMRESULT WINAPI joySetCapture( HWND hwnd, UINT id, UINT period, BOOL changed ) else if (period > JOY_PERIOD_MAX) period = JOY_PERIOD_MAX; if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; - if (joysticks[id].capture || !IsWindow( hwnd )) - return JOYERR_NOCANDO; /* FIXME: what should be returned ? */ - if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR) return JOYERR_UNPLUGGED; - if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0) - return JOYERR_NOCANDO; + EnterCriticalSection( &joystick_cs ); - joysticks[id].capture = hwnd; - joysticks[id].changed = changed; + if (joysticks[id].capture || !IsWindow( hwnd )) + res = JOYERR_NOCANDO; /* FIXME: what should be returned ? */ + else if (joyGetPos( id, &joysticks[id].info ) != JOYERR_NOERROR) + res = JOYERR_UNPLUGGED; + else if ((joysticks[id].timer = SetTimer( hwnd, 0, period, joystick_timer )) == 0) + res = JOYERR_NOCANDO; + else + { + joysticks[id].capture = hwnd; + joysticks[id].changed = changed; + } - return JOYERR_NOERROR; + LeaveCriticalSection( &joystick_cs ); + return res; } /************************************************************************** @@ -344,7 +372,9 @@ MMRESULT WINAPI joySetThreshold( UINT id, UINT threshold ) if (id >= ARRAY_SIZE(joysticks) || threshold > 65535) return MMSYSERR_INVALPARAM; + EnterCriticalSection( &joystick_cs ); joysticks[id].threshold = threshold; + LeaveCriticalSection( &joystick_cs ); return JOYERR_NOERROR; }

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021