wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Gabriel Ivăncescu : jscript: Pass a jsval as the 'this' to jsdisp_call_value.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 9d4e93cfde176e679a467a9332725b1861687a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4e93cfde176e679a467a9332725b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass a jsval as the 'this' to jsdisp_call_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 18 ++++++++++-------- dlls/jscript/function.c | 9 ++------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/json.c | 2 +- dlls/jscript/string.c | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index db92a6fe109..80ccfcacb73 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -631,7 +631,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval jsval_t res; double n; - hres = jsdisp_call_value(cmp_func, NULL, DISPATCH_METHOD, 2, args, &res); + hres = jsdisp_call_value(cmp_func, jsval_undefined(), DISPATCH_METHOD, 2, args, &res); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 699e4c87b52..87b1d245aa7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -462,7 +462,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) break; case PROP_ACCESSOR: if(prop->u.accessor.getter) { - hres = jsdisp_call_value(prop->u.accessor.getter, to_disp(This), + hres = jsdisp_call_value(prop->u.accessor.getter, jsval_obj(This), DISPATCH_METHOD, 0, NULL, r); }else { *r = jsval_undefined(); @@ -529,7 +529,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) TRACE("no setter\n"); return S_OK; } - return jsdisp_call_value(prop->u.accessor.setter, to_disp(This), DISPATCH_METHOD, 1, &val, NULL); + return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(This), DISPATCH_METHOD, 1, &val, NULL); case PROP_IDX: if(!This->builtin_info->idx_put) { TRACE("no put_idx\n"); @@ -1602,16 +1602,18 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { jsval_t *argv, buf[6], r; + IDispatch *passed_this; unsigned argc; hres = convert_params(This->ctx, pdp, buf, &argc, &argv); if(FAILED(hres)) break; + passed_this = get_this(pdp); if(prop) - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + hres = invoke_prop_func(This, passed_this, prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); else - hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); + hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); if(argv != buf) free(argv); @@ -1991,14 +1993,14 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } -HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT jsdisp_call_value(jsdisp_t *jsfunc, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); if(is_class(jsfunc, JSCLASS_FUNCTION)) { - hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); + hres = Function_invoke(jsfunc, vthis, flags, argc, argv, r); }else { if(!jsfunc->builtin_info->call) { WARN("Not a function\n"); @@ -2009,7 +2011,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig return E_UNEXPECTED; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - hres = jsfunc->builtin_info->call(jsfunc->ctx, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); + hres = jsfunc->builtin_info->call(jsfunc->ctx, vthis, flags, argc, argv, r); } return hres; } @@ -2202,7 +2204,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); + hres = jsdisp_call_value(jsdisp, jsthis ? jsval_disp(jsthis) : jsval_undefined(), flags, argc, argv, r); jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ef76766df7d..2a03fdd07ae 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,12 +247,11 @@ void detach_arguments_object(jsdisp_t *args_disp) jsdisp_release(frame->arguments_obj); } -HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; - jsval_t vthis; - TRACE("func %p this %p\n", func_this, jsthis); + TRACE("func %p this %s\n", func_this, debugstr_jsval(vthis)); assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); @@ -262,10 +261,6 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi return E_UNEXPECTED; } - if(jsthis) - vthis = jsval_disp(jsthis); - else - vthis = function->dispex.ctx->version < SCRIPTLANGUAGEVERSION_ES5 ? jsval_null() : jsval_undefined(); return function->vtbl->call(function->dispex.ctx, function, vthis, flags, argc, argv, r); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c46dd6ed682..48d7542e3cc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -226,7 +226,7 @@ HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,js HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_value(script_ctx_t*,IDispatch*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_value(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_call_value(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; @@ -255,7 +255,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 005422be426..a595a778324 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -775,7 +775,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na } args[0] = jsval_string(name_str); args[1] = value; - hres = jsdisp_call_value(ctx->replacer, to_disp(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + hres = jsdisp_call_value(ctx->replacer, jsval_obj(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); jsstr_release(name_str); jsval_release(value); if(FAILED(hres)) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 254ead61eef..14bcfbdaaf3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -702,7 +702,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, } if(SUCCEEDED(hres)) - hres = jsdisp_call_value(func, NULL, DISPATCH_METHOD, argc, argv, &val); + hres = jsdisp_call_value(func, jsval_undefined(), DISPATCH_METHOD, argc, argv, &val); for(i=0; i <= match->paren_count; i++) jsstr_release(get_string(argv[i]));

1 0

Gabriel Ivăncescu : jscript: Initialize source and lastIndex for RegExp.prototype.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 3805eef49a323e5022329822cfd87dd32e7ce7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/3805eef49a323e5022329822cfd87d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Initialize source and lastIndex for RegExp.prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsregexp.c | 14 ++++++++------ dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index fa4759b972d..1cbc828ce09 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -585,7 +585,7 @@ static const builtin_info_t RegExpInst_info = { NULL }; -static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegExpInstance **ret) +static HRESULT alloc_regexp(script_ctx_t *ctx, jsstr_t *str, jsdisp_t *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; HRESULT hres; @@ -604,6 +604,9 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx return hres; } + regexp->str = jsstr_addref(str); + regexp->last_index_val = jsval_number(0); + *ret = regexp; return S_OK; } @@ -620,13 +623,10 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r TRACE("%s %lx\n", debugstr_wn(str, jsstr_length(src)), flags); - hres = alloc_regexp(ctx, NULL, &regexp); + hres = alloc_regexp(ctx, src, NULL, &regexp); if(FAILED(hres)) return hres; - regexp->str = jsstr_addref(src); - regexp->last_index_val = jsval_number(0); - regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("regexp_new failed\n"); @@ -959,10 +959,12 @@ static const builtin_info_t RegExpConstr_info = { HRESULT create_regexp_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) { + jsstr_t *str = jsstr_empty(); RegExpInstance *regexp; HRESULT hres; - hres = alloc_regexp(ctx, object_prototype, &regexp); + hres = alloc_regexp(ctx, str, object_prototype, &regexp); + jsstr_release(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c33791f1fb1..a3b2bbcbba5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -335,6 +335,8 @@ ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +ok(RegExp.prototype.source === "", "RegExp.prototype.source = " + RegExp.prototype.source); +ok(RegExp.prototype.lastIndex === 0, "RegExp.prototype.lastIndex = " + RegExp.prototype.lastIndex); String(); new String();

1 0

Piotr Caban : winspool: Correctly free data allocated with GdiConvertToDevmodeW.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: f8a0d965675f91c1f447fd901fc1235d1729d990 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8a0d965675f91c1f447fd901fc123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 22 15:11:21 2022 +0100 winspool: Correctly free data allocated with GdiConvertToDevmodeW. --- dlls/winspool.drv/info.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6286dc36f3e..1434a5c1e2b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1748,7 +1748,7 @@ static void free_printer_info( void *data, DWORD level ) free( piW->pDriverName ); free( piW->pComment ); free( piW->pLocation ); - free( piW->pDevMode ); + heap_free( piW->pDevMode ); free( piW->pSepFile ); free( piW->pPrintProcessor ); free( piW->pDatatype ); @@ -1761,7 +1761,7 @@ static void free_printer_info( void *data, DWORD level ) { PRINTER_INFO_9W *piW = (PRINTER_INFO_9W *)data; - free( piW->pDevMode ); + heap_free( piW->pDevMode ); break; } @@ -1827,7 +1827,7 @@ INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, } cleanup: free(device_name); - free(devmode); + heap_free(devmode); free(port); return ret; } @@ -1893,7 +1893,7 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE DEVMODEWtoA( outputW, output ); free(device); - free(inputW); + heap_free(inputW); free(outputW); if (!mode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; @@ -2113,7 +2113,7 @@ BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, if (p_defaultsW) { RtlFreeUnicodeString(&datatypeU); - free(defaultsW.pDevMode); + heap_free(defaultsW.pDevMode); } RtlFreeUnicodeString(&nameU); @@ -3197,7 +3197,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, free(info2W->pDatatype); free(info2W->pPrintProcessor); free(info2W->pParameters); - free(info2W->pDevMode); + heap_free(info2W->pDevMode); free(info2W->pStatus); break; } @@ -3677,7 +3677,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); - free(dmW); + heap_free(dmW); } *needed = sz; return TRUE;

1 0

Alexandre Julliard : makedep: Pass the actual name of the module in the delay load flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 020e2b6bb46b3bc39d2088d6ff668e64b2576aae URL: https://gitlab.winehq.org/wine/wine/-/commit/020e2b6bb46b3bc39d2088d6ff668e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:50:43 2022 +0100 makedep: Pass the actual name of the module in the delay load flags. --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a3a665cc84a..893808930fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3323,8 +3323,10 @@ static void output_module( struct makefile *make, unsigned int arch ) if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flags[arch], make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + { + struct makefile *import = get_static_lib( make->delayimports.str[i], arch ); + if (import) strarray_add( &all_libs, strmake( "%s%s", delay_load_flags[arch], import->module )); + } } } else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module );

1 0

Alexandre Julliard : makedep: Unify the search for static and import libs.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 51087b9b650952b0f62880826792db1a3d2e5dba URL: https://gitlab.winehq.org/wine/wine/-/commit/51087b9b650952b0f62880826792db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:47:39 2022 +0100 makedep: Unify the search for static and import libs. --- tools/makedep.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 484d2902817..a3a665cc84a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2065,16 +2065,23 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* * get_static_lib * - * Check if makefile builds the named static library and return the full lib path. + * Find the makefile that builds the named static library (which may be an import lib). */ -static const char *get_static_lib( const struct makefile *make, const char *name, unsigned int arch ) +static struct makefile *get_static_lib( const char *name, unsigned int arch ) { - if (!make->staticlib) return NULL; - if (make->disabled[arch]) return NULL; - if (strncmp( make->staticlib, "lib", 3 )) return NULL; - if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL; - if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL; - return obj_dir_path( make, strmake( "%s%s", arch_dirs[arch], make->staticlib )); + unsigned int i; + + for (i = 0; i < subdirs.count; i++) + { + if (submakes[i]->importlib && !strcmp( submakes[i]->importlib, name )) return submakes[i]; + if (!submakes[i]->staticlib) continue; + if (submakes[i]->disabled[arch]) continue; + if (strncmp( submakes[i]->staticlib, "lib", 3 )) continue; + if (strncmp( submakes[i]->staticlib + 3, name, strlen(name) )) continue; + if (strcmp( submakes[i]->staticlib + 3 + strlen(name), ".a" )) continue; + return submakes[i]; + } + return NULL; } @@ -2240,12 +2247,12 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra struct strarray imports, enum import_type type, unsigned int arch ) { struct strarray ret = empty_strarray; - unsigned int i, j; + unsigned int i; for (i = 0; i < imports.count; i++) { const char *name = imports.str[i]; - const char *lib = NULL; + struct makefile *submake; /* add crt import lib only when adding the default imports libs */ if (is_crt_module( imports.str[i] ) && type != IMPORT_TYPE_DEFAULT) continue; @@ -2261,21 +2268,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra } else name = get_base_name( name ); - for (j = 0; j < subdirs.count; j++) + if ((submake = get_static_lib( name, arch ))) { - if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "%slib%s.a", arch_dirs[arch], name )); - else - lib = get_static_lib( submakes[j], name, arch ); - if (lib) break; - } - - if (lib) - { - const char *ext = NULL; - - if (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ext = ".delay.a"; - if (ext) lib = replace_extension( lib, ".a", ext ); + const char *ext = (type == IMPORT_TYPE_DELAYED && !delay_load_flags[arch]) ? ".delay.a" : ".a"; + const char *lib = obj_dir_path( submake, strmake( "%slib%s%s", arch_dirs[arch], name, ext )); strarray_add_uniq( deps, lib ); strarray_add( &ret, lib ); }

1 0

Alexandre Julliard : win32u: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 5084f4da2b5486f2bb6f4a78c5e9762f31ed72b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5084f4da2b5486f2bb6f4a78c5e976… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:13:58 2022 +0100 win32u: Build without -DWINE_NO_LONG_TYPES. --- dlls/win32u/Makefile.in | 1 - dlls/win32u/bitblt.c | 7 +++--- dlls/win32u/bitmap.c | 4 ++-- dlls/win32u/brush.c | 4 ++-- dlls/win32u/cursoricon.c | 2 +- dlls/win32u/dc.c | 6 ++--- dlls/win32u/dce.c | 6 ++--- dlls/win32u/defwnd.c | 14 +++++------ dlls/win32u/dib.c | 10 ++++---- dlls/win32u/dibdrv/bitblt.c | 4 ++-- dlls/win32u/dibdrv/graphics.c | 4 ++-- dlls/win32u/font.c | 55 ++++++++++++++++++++++--------------------- dlls/win32u/freetype.c | 10 ++++---- dlls/win32u/gdiobj.c | 4 ++-- dlls/win32u/hook.c | 11 +++++---- dlls/win32u/imm.c | 8 +++---- dlls/win32u/input.c | 12 +++++----- dlls/win32u/mapping.c | 2 +- dlls/win32u/menu.c | 22 ++++++++--------- dlls/win32u/message.c | 25 +++++++++++--------- dlls/win32u/painting.c | 2 +- dlls/win32u/palette.c | 4 ++-- dlls/win32u/path.c | 4 ++-- dlls/win32u/printdrv.c | 4 ++-- dlls/win32u/rawinput.c | 4 ++-- dlls/win32u/region.c | 6 ++--- dlls/win32u/scroll.c | 10 ++++---- dlls/win32u/spy.c | 30 +++++++++++------------ dlls/win32u/sysparams.c | 42 +++++++++++++++++---------------- dlls/win32u/window.c | 29 ++++++++++++----------- dlls/win32u/winstation.c | 6 ++--- 31 files changed, 181 insertions(+), 171 deletions(-)

1 0

Alexandre Julliard : win32u: Use int instead of long types in a few places.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 670033b2cb04eab8575bab070356b1d51a95fe18 URL: https://gitlab.winehq.org/wine/wine/-/commit/670033b2cb04eab8575bab070356b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:56 2022 +0100 win32u: Use int instead of long types in a few places. To avoid typecasts in debug traces. --- dlls/win32u/clipboard.c | 4 ++-- dlls/win32u/dc.c | 2 +- dlls/win32u/dce.c | 2 +- dlls/win32u/defwnd.c | 8 ++++---- dlls/win32u/dibdrv/dibdrv.h | 2 +- dlls/win32u/font.c | 14 +++++++------- dlls/win32u/input.c | 17 +++++++++-------- dlls/win32u/menu.c | 6 ++++-- dlls/win32u/message.c | 4 ++-- dlls/win32u/ntgdi_private.h | 4 ++-- dlls/win32u/ntuser_private.h | 10 +++++----- dlls/win32u/rawinput.c | 2 +- dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 10 +++++----- dlls/win32u/winstation.c | 2 +- 16 files changed, 49 insertions(+), 46 deletions(-)

1 0

Alexandre Julliard : win32u: Use int instead of long types for monitor index and flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: d38a4a23fb9f54aec728506d4e152a670f649cea URL: https://gitlab.winehq.org/wine/wine/-/commit/d38a4a23fb9f54aec728506d4e152a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:16 2022 +0100 win32u: Use int instead of long types for monitor index and flags. To avoid typecasts in debug traces. --- dlls/win32u/sysparams.c | 18 +++++++++--------- dlls/win32u/win32u_private.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index db6d07110e3..bd5f521eb0d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -438,7 +438,7 @@ static void adapter_release( struct adapter *adapter ) C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); -static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *mode ) +static BOOL write_adapter_mode( HKEY adapter_key, UINT index, const DEVMODEW *mode ) { WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; @@ -448,7 +448,7 @@ static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *m return set_reg_value( adapter_key, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } -static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) +static BOOL read_adapter_mode( HKEY adapter_key, UINT index, DEVMODEW *mode ) { char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; @@ -712,7 +712,7 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i return TRUE; } -static BOOL read_monitor_settings( struct adapter *adapter, DWORD index, struct monitor *monitor ) +static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; @@ -1998,7 +1998,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in } /* display_lock mutex must be held */ -static struct display_device *find_monitor_device( struct display_device *adapter, DWORD index ) +static struct display_device *find_monitor_device( struct display_device *adapter, UINT index ) { struct monitor *monitor; @@ -2011,7 +2011,7 @@ static struct display_device *find_monitor_device( struct display_device *adapte } /* display_lock mutex must be held */ -static struct display_device *find_adapter_device_by_id( DWORD index ) +static struct display_device *find_adapter_device_by_id( UINT index ) { struct adapter *adapter; @@ -2571,7 +2571,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return ret; } -static BOOL adapter_enum_display_settings( const struct adapter *adapter, DWORD index, DEVMODEW *devmode, DWORD flags ) +static BOOL adapter_enum_display_settings( const struct adapter *adapter, UINT index, DEVMODEW *devmode, UINT flags ) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; const DEVMODEW *adapter_mode; @@ -2777,7 +2777,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) return FALSE; } -HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) +HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { HMONITOR primary = 0, nearest = 0, ret = 0; UINT max_area = 0, min_distance = ~0u; @@ -2843,7 +2843,7 @@ HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) return ret; } -HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) +HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) { RECT rect; SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); @@ -2851,7 +2851,7 @@ HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) } /* see MonitorFromWindow */ -HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) +HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) { RECT rect; WINDOWPLACEMENT wp; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bc64bedb22b..3824918a055 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -351,9 +351,9 @@ extern BOOL message_beep( UINT i ) DECLSPEC_HIDDEN; extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; extern void user_lock(void) DECLSPEC_HIDDEN; extern void user_unlock(void) DECLSPEC_HIDDEN; extern void user_check_not_lock(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : win32u: Use int instead of long types for font sizes and flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 8bab39d946dccd5830a399d69abc34c1b96c56fa URL: https://gitlab.winehq.org/wine/wine/-/commit/8bab39d946dccd5830a399d69abc34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:29:38 2022 +0100 win32u: Use int instead of long types for font sizes and flags. To avoid typecasts in debug traces. --- dlls/win32u/font.c | 8 +++---- dlls/win32u/freetype.c | 55 ++++++++++++++++++++++----------------------- dlls/win32u/ntgdi_private.h | 17 +++++++------- 3 files changed, 39 insertions(+), 41 deletions(-)

1 0

Alexandre Julliard : win32u: Add a debug helper to print color values.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 3ae7035afdaa09eade10e33fc3f3609fadfebfdf URL: https://gitlab.winehq.org/wine/wine/-/commit/3ae7035afdaa09eade10e33fc3f360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:02:51 2022 +0100 win32u: Add a debug helper to print color values. --- dlls/win32u/brush.c | 4 ++-- dlls/win32u/dibdrv/graphics.c | 6 +++--- dlls/win32u/palette.c | 4 ++-- dlls/win32u/pen.c | 2 +- dlls/win32u/win32u_private.h | 9 +++++++++ dlls/win32u/window.c | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/brush.c b/dlls/win32u/brush.c index f9b718b4d2e..c5a9eb91d7b 100644 --- a/dlls/win32u/brush.c +++ b/dlls/win32u/brush.c @@ -222,7 +222,7 @@ HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen { LOGBRUSH logbrush; - TRACE( "%d %06x\n", style, color ); + TRACE( "%d %s\n", style, debugstr_color(color) ); logbrush.lbStyle = BS_HATCHED; logbrush.lbColor = color; @@ -282,7 +282,7 @@ HBRUSH WINAPI NtGdiCreateSolidBrush( COLORREF color, HBRUSH brush ) { LOGBRUSH logbrush; - TRACE("%06x\n", color ); + TRACE("%s\n", debugstr_color(color) ); logbrush.lbStyle = BS_SOLID; logbrush.lbColor = color; diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c index 32d98572801..1eda7d2256a 100644 --- a/dlls/win32u/dibdrv/graphics.c +++ b/dlls/win32u/dibdrv/graphics.c @@ -1056,7 +1056,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT RECT row; HRGN rgn; - TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + TRACE( "(%p, %d, %d, %s, %d)\n", pdev, x, y, debugstr_color(color), type ); if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; @@ -1097,7 +1097,7 @@ COLORREF CDECL dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DC *dc = get_physdev_dc( dev ); DWORD pixel; - TRACE( "(%p, %08x)\n", dev, color ); + TRACE( "(%p, %s)\n", dev, debugstr_color(color) ); pixel = get_pixel_color( dc, &pdev->dib, color, FALSE ); return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); @@ -1575,7 +1575,7 @@ COLORREF CDECL dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) POINT pt; DWORD pixel; - TRACE( "(%p, %d, %d, %08x)\n", dev, x, y, color ); + TRACE( "(%p, %d, %d, %s)\n", dev, x, y, debugstr_color(color) ); pt.x = x; pt.y = y; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index e8fd51dba22..6d5d1feb292 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -384,7 +384,7 @@ UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ) } GDI_ReleaseObj( hpalette ); } - TRACE("(%p,%06x): returning %d\n", hpalette, color, index ); + TRACE("(%p,%s): returning %d\n", hpalette, debugstr_color(color), index ); return index; } @@ -413,7 +413,7 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) if (!get_palette_entries( hpal, index, 1, &entry )) { - WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); + WARN("%s: idx %d is out of bounds, assuming NULL\n", debugstr_color(color), index ); if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); diff --git a/dlls/win32u/pen.c b/dlls/win32u/pen.c index 551c4438f3c..f45d7bb1c4e 100644 --- a/dlls/win32u/pen.c +++ b/dlls/win32u/pen.c @@ -59,7 +59,7 @@ HPEN create_pen( INT style, INT width, COLORREF color ) PENOBJ *penPtr; HPEN hpen; - TRACE( "%d %d %06x\n", style, width, color ); + TRACE( "%d %d %s\n", style, width, debugstr_color(color) ); switch (style) { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caab312482e..bc64bedb22b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -506,4 +506,13 @@ static inline const char *debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static inline const char *debugstr_color( COLORREF color ) +{ + if (color & (1 << 24)) /* PALETTEINDEX */ + return wine_dbg_sprintf( "PALETTEINDEX(%u)", LOWORD(color) ); + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return wine_dbg_sprintf( "DIBINDEX(%u)", LOWORD(color) ); + return wine_dbg_sprintf( "RGB(%02x,%02x,%02x)", GetRValue(color), GetGValue(color), GetBValue(color) ); +} + #endif /* __WINE_WIN32U_PRIVATE */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d92c09689ed..e9328cee55b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2066,7 +2066,7 @@ BOOL WINAPI NtUserSetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph { BOOL ret; - TRACE( "(%p,%08x,%d,%x)\n", hwnd, key, alpha, flags ); + TRACE( "(%p,%s,%d,%x)\n", hwnd, debugstr_color(key), alpha, flags ); SERVER_START_REQ( set_window_layered_info ) {

1 0

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 November 2022