December 2021 - Wine-Commits

Alexandre Julliard : sfnt2fon: Use the standard output buffer functions.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

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

Dec. 10, 2021

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 : wrc: Remove the no longer used resource C name.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

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 Dec. 10, 2021

Dec. 10, 2021

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 Dec. 10, 2021

Dec. 10, 2021

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 Dec. 10, 2021

Dec. 10, 2021

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

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

Dec. 10, 2021

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

Eric Pouech : winedbg: Add helper to transfer memory between lvalues.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: 860de956305d77d847322f9168e421c07a2a8f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=860de956305d77d847322f91… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 8 14:44:27 2021 +0100 winedbg: Add helper to transfer memory between lvalues. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 31 +++++++++++++++++++++++++++++++ programs/winedbg/types.c | 19 +++---------------- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 1d08c0e1262..09bd98e70e6 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -392,6 +392,7 @@ extern void info_wine_dbg_channel(BOOL add, const char* chnl, const /* memory.c */ extern BOOL memory_read_value(const struct dbg_lvalue* lvalue, DWORD size, void* result); extern BOOL memory_write_value(const struct dbg_lvalue* val, DWORD size, void* value); +extern BOOL memory_transfer_value(const struct dbg_lvalue* to, const struct dbg_lvalue* from); extern BOOL memory_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, dbg_lgint_t* ret); extern BOOL memory_store_integer(const struct dbg_lvalue* lvalue, dbg_lgint_t val); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index a5f169c5db4..1cf8726f467 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -133,6 +133,37 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value return ret; } +/* transfer a block of memory + * the two lvalue:s are expected to be of same size + */ +BOOL memory_transfer_value(const struct dbg_lvalue* to, const struct dbg_lvalue* from) +{ + DWORD64 size_to, size_from; + BYTE tmp[256]; + BYTE* ptr = tmp; + BOOL ret; + + if (to->bitlen || from->bitlen) return FALSE; + if (!types_get_info(&to->type, TI_GET_LENGTH, &size_to) || + !types_get_info(&from->type, TI_GET_LENGTH, &size_from) || + size_from != size_to) return FALSE; + /* optimize debugger to debugger transfer */ + if (!to->in_debuggee && !from->in_debuggee) + { + memcpy(memory_to_linear_addr(&to->addr), memory_to_linear_addr(&from->addr), size_from); + return TRUE; + } + if (size_to > sizeof(tmp)) + { + ptr = malloc(size_from); + if (!ptr) return FALSE; + } + ret = memory_read_value(from, size_from, ptr) && + memory_write_value(to, size_from, ptr); + if (size_to > sizeof(tmp)) free(ptr); + return ret; +} + /*********************************************************************** * memory_examine * diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 1fafaac8c80..48f985f7e16 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -162,30 +162,17 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) BOOL types_store_value(struct dbg_lvalue* lvalue_to, const struct dbg_lvalue* lvalue_from) { - dbg_lgint_t val; - DWORD64 size; - BOOL equal; - if (!lvalue_to->bitlen && !lvalue_from->bitlen) { + BOOL equal; if (!types_compare(lvalue_to->type, lvalue_from->type, &equal)) return FALSE; if (equal) - { - if (!types_get_info(&lvalue_to->type, TI_GET_LENGTH, &size)) return FALSE; - if (sizeof(val) < size) - { - return memory_read_value(lvalue_from, size, &val) && - memory_write_value(lvalue_to, size, &val); - } - dbg_printf("NIY\n"); - /* else: should allocate intermediate buffer... */ - return FALSE; - } + return memory_transfer_value(lvalue_to, lvalue_from); } if (types_is_integral_type(lvalue_from) && types_is_integral_type(lvalue_to)) { /* doing integer conversion (about sign, size) */ - val = types_extract_as_integer(lvalue_from); + dbg_lgint_t val = types_extract_as_integer(lvalue_from); return memory_store_integer(lvalue_to, val); } /* FIXME: should support floats as well */

1 0

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

Dec. 10, 2021

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

Nikolay Sivov : include: Add some of the XPS OM interfaces.
by Alexandre Julliard Dec. 10, 2021

Dec. 10, 2021

Module: wine Branch: master Commit: d8f13932b7d97b600a1c503f0c1ba26d6fb182b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f13932b7d97b600a1c503f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 10 09:09:26 2021 +0300 include: Add some of the XPS OM interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 + include/xpsobjectmodel.idl | 546 +++++++++++++++++++++++++++++++++++++++++++ include/xpsobjectmodel_1.idl | 49 ++++ 3 files changed, 597 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f13932b7d97b600a1c…

1 0