July 2020 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 413e34df586ed172c964e1386ea9136fc8ec6e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=413e34df586ed172c964e138… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:21 2020 +0200 msvcrt: Add __STRINGTOLD_L and _atoldbl_l partial stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 52 ++++++++++++++-------- dlls/ucrtbase/ucrtbase.spec | 4 +- 11 files changed, 50 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=413e34df586ed172c964…

1 0

Piotr Caban : msvcrt: Support arbitrary buffer size in bnum.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 74958219747843c0d260ca76dd046988909fccdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=74958219747843c0d260ca76… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:25 2020 +0200 msvcrt: Support arbitrary buffer size in bnum. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 51 +++++++++++++++------------ dlls/msvcrt/printf.h | 99 +++++++++++++++++++++++++++------------------------- dlls/msvcrt/string.c | 62 ++++++++++++++++---------------- 3 files changed, 112 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74958219747843c0d260…

1 0

Piotr Caban : msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 450015781e7ad45a79df01225ee75271563317ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=450015781e7ad45a79df0122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:28 2020 +0200 msvcrt: Introduce fpnum structure that can be used to represent 64 and 80-bit double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 19 ++++- dlls/msvcrt/scanf.h | 6 +- dlls/msvcrt/string.c | 212 ++++++++++++++++++++++++++++++--------------------- dlls/msvcrt/wcs.c | 7 +- 4 files changed, 151 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=450015781e7ad45a79df…

1 0

Piotr Caban : msvcrt: Create 64-bit mantissa in fpnum_parse.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 8fc48e8bc2507ae8123c749a09c0be60a26e397d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc48e8bc2507ae8123c749a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:34 2020 +0200 msvcrt: Create 64-bit mantissa in fpnum_parse. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 11 ++--------- dlls/msvcrt/string.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/bnum.h b/dlls/msvcrt/bnum.h index 5cc71c1e68..144db353fe 100644 --- a/dlls/msvcrt/bnum.h +++ b/dlls/msvcrt/bnum.h @@ -28,7 +28,8 @@ static const int p10s[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, #define LIMB_MAX 1000000000 /* 10^9 */ #define BNUM_PREC64 128 /* data size needed to store 64-bit double */ -/* bnum represents real number with fixed decimal point (after 2 limbs) */ + +/* bnum represents real number with fixed decimal point */ struct bnum { int b; /* least significant digit position */ int e; /* most significant digit position + 1 */ @@ -41,14 +42,6 @@ static inline int bnum_idx(struct bnum *b, int idx) return idx & (b->size - 1); } -/* Returns integral part of bnum */ -static inline ULONGLONG bnum_to_mant(struct bnum *b) -{ - ULONGLONG ret = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX; - if(b->b != b->e-1) ret += b->data[bnum_idx(b, b->e-2)]; - return ret; -} - /* Returns TRUE if new most significant limb was added */ static inline BOOL bnum_lshift(struct bnum *b, int shift) { diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5732d511fd..a2ec9a91ac 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -597,6 +597,21 @@ static struct fpnum fpnum_parse16(MSVCRT_wchar_t get(void *ctx), void unget(void } #endif +/* Converts first 3 limbs to ULONGLONG */ +/* Return FALSE on overflow */ +static inline BOOL bnum_to_mant(struct bnum *b, ULONGLONG *m) +{ + if(MSVCRT_UI64_MAX / LIMB_MAX / LIMB_MAX < b->data[bnum_idx(b, b->e-1)]) return FALSE; + *m = (ULONGLONG)b->data[bnum_idx(b, b->e-1)] * LIMB_MAX * LIMB_MAX; + if(b->b == b->e-1) return TRUE; + if(MSVCRT_UI64_MAX - *m < (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX) return FALSE; + *m += (ULONGLONG)b->data[bnum_idx(b, b->e-2)] * LIMB_MAX; + if(b->b == b->e-2) return TRUE; + if(MSVCRT_UI64_MAX - *m < b->data[bnum_idx(b, b->e-3)]) return FALSE; + *m += b->data[bnum_idx(b, b->e-3)]; + return TRUE; +} + struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), void *ctx, MSVCRT_pthreadlocinfo locinfo) { @@ -612,6 +627,7 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c struct bnum *b = (struct bnum*)bnum_data; enum fpmod round = FP_ROUND_ZERO; MSVCRT_wchar_t nch; + ULONGLONG m; nch = get(ctx); if(nch == '-') { @@ -797,28 +813,33 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c if(dp-1 < MSVCRT_DBL_MIN_10_EXP-MSVCRT_DBL_DIG-18) return fpnum(sign, INT_MIN, 1, FP_ROUND_ZERO); - while(dp > 2*LIMB_DIGITS) { + while(dp > 3*LIMB_DIGITS) { if(bnum_rshift(b, 9)) dp -= LIMB_DIGITS; e2 += 9; } - while(dp <= LIMB_DIGITS) { + while(dp <= 2*LIMB_DIGITS) { if(bnum_lshift(b, 29)) dp += LIMB_DIGITS; e2 -= 29; } - while(b->data[bnum_idx(b, b->e-1)] < LIMB_MAX/10) { + /* Make sure most significant mantissa bit will be set */ + while(b->data[bnum_idx(b, b->e-1)] <= 9) { bnum_lshift(b, 1); e2--; } + while(!bnum_to_mant(b, &m)) { + bnum_rshift(b, 1); + e2++; + } /* Check if fractional part is non-zero */ /* Caution: it's only correct because bnum_to_mant returns more than 53 bits */ - for(i=b->e-3; i>=b->b; i--) { + for(i=b->e-4; i>=b->b; i--) { if (!b->data[bnum_idx(b, b->b)]) continue; round = FP_ROUND_DOWN; break; } - return fpnum(sign, e2, bnum_to_mant(b), round); + return fpnum(sign, e2, m, round); } static MSVCRT_wchar_t strtod_str_get(void *ctx)

1 0

Puetz Kevin A : jscript: Fix some memory problems in disp_call_value.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 616f5a5d4b05ab7278658549d15f5ff50b2c824f URL: https://source.winehq.org/git/wine.git/?a=commit;h=616f5a5d4b05ab7278658549… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 23 04:58:37 2020 +0000 jscript: Fix some memory problems in disp_call_value. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d9097c47dd..2ba706252b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2095,12 +2095,14 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(argc > ARRAY_SIZE(buf) && !(args = heap_alloc(argc * sizeof(VARIANT)))) + if(dp.cArgs > ARRAY_SIZE(buf) && !(args = heap_alloc(dp.cArgs * sizeof(VARIANT)))) return E_OUTOFMEMORY; dp.rgvarg = args; - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = jsthis; + if(jsthis) { + V_VT(dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(dp.rgvarg) = jsthis; + } for(i=0; SUCCEEDED(hres) && i < argc; i++) hres = jsval_to_variant(argv[i], dp.rgvarg+dp.cArgs-i-1); @@ -2110,7 +2112,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W hres = disp_invoke(ctx, disp, DISPID_VALUE, flags, &dp, r ? &retv : NULL); } - for(i = 0; i < argc&&0; i++) + for(i = 0; i < argc; i++) VariantClear(dp.rgvarg + dp.cArgs - i - 1); if(args != buf) heap_free(args);

1 0

Puetz Kevin A : jscript: Fix `this` within IDispatchEx::InvokeEx.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: b60c4c6ef60c768d8eb823eb830c7bd35028ea6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60c4c6ef60c768d8eb823eb… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 23 22:25:38 2020 +0200 jscript: Fix `this` within IDispatchEx::InvokeEx. Latent bug revealed by 614ea7e6243ead003bcfe4624895154972f3445f; Now that cross-context calls go through disp_call* instead of jsdisp_call*, and thus through InvokeEx, the `this` pointer is lost when calling methods inherited from a prototype. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 +++-- dlls/jscript/tests/run.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2ba706252b..f49d5da971 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -419,8 +419,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t return hres; } case PROP_PROTREF: - return invoke_prop_func(This->prototype, jsthis, This->prototype->props+prop->u.ref, - flags, argc, argv, r, caller); + return invoke_prop_func(This->prototype, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, + This->prototype->props+prop->u.ref, flags, argc, argv, r, caller); case PROP_JSVAL: { if(!is_object_instance(prop->u.val)) { FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); @@ -429,7 +429,9 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - return disp_call_value(This->ctx, get_object(prop->u.val), jsthis, flags, argc, argv, r); + return disp_call_value(This->ctx, get_object(prop->u.val), + jsthis ? jsthis : (IDispatch*)&This->IDispatchEx_iface, + flags, argc, argv, r); } case PROP_ACCESSOR: FIXME("accessor\n"); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 675bd819ee..7cd0755497 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2784,7 +2784,7 @@ static void test_invokeex(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *dispex; - VARIANT v; + VARIANT v, arg; BSTR str; HRESULT hres; @@ -2834,6 +2834,93 @@ static void test_invokeex(void) IDispatchEx_Release(dispex); IActiveScript_Release(script); + + /* test InvokeEx following prototype chain of builtin object (PROP_PROTREF) */ + hres = parse_script_expr(L"o = new Array(); o.push(\"foo\"); o", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"push"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + dp.rgvarg = &arg; + dp.cArgs = 1; + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(L"bar"); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + + str = SysAllocString(L"join"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + V_BSTR(&arg) = SysAllocString(L";"); + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + SysFreeString(V_BSTR(&arg)); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo;bar"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + VariantClear(&v); + + dp.rgvarg = NULL; + dp.cArgs = 0; + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); + + /* test InvokeEx following prototype chain of JScript objects (PROP_JSVAL) */ + hres = parse_script_expr(L"function c() { this.func = function() { return this.prop1 * this.prop2 };" + L"this.prop1 = 6; this.prop2 = 9; }; var o = new c(); o.prop2 = 7; o", + &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + VariantClear(&v); + + str = SysAllocString(L"prop1"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 6, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"prop2"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 7, "V_I4(v) = %d\n", V_I4(&v)); + + str = SysAllocString(L"func"); + hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id); + SysFreeString(str); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + + hres = IDispatchEx_InvokeEx(dispex, func_id, 0, DISPATCH_METHOD, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_variant(&v)); + + IDispatchEx_Release(dispex); + IActiveScript_Release(script); } static void test_eval(void)

1 0

Zebediah Figura : winspool: Remove the "force" parameter to WINSPOOL_SetDefaultPrinter().
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: e8d254116eb52908f6cd99a0394aab12e29462c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d254116eb52908f6cd99a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:47 2020 -0500 winspool: Remove the "force" parameter to WINSPOOL_SetDefaultPrinter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1a8d572f43..d46fefc461 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -555,30 +555,19 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } -static void -WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { - char qbuf[200]; +static void set_default_printer(const char *devname, const char *name) +{ + char *buf = HeapAlloc(GetProcessHeap(), 0, strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); + HKEY hkey; - /* If forcing, or no profile string entry for device yet, set the entry - * - * The always change entry if not WINEPS yet is discussable. - */ - if (force || - !GetProfileStringA("windows","device","*",qbuf,sizeof(qbuf)) || - !strcmp(qbuf,"*") || - !strstr(qbuf,"WINEPS.DRV") - ) { - char *buf = HeapAlloc(GetProcessHeap(),0,strlen(name)+strlen(devname)+strlen(",WINEPS.DRV,LPR:")+1); - HKEY hkey; - - sprintf(buf,"%s,WINEPS.DRV,LPR:%s",devname,name); - WriteProfileStringA("windows","device",buf); - if(RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey) == ERROR_SUCCESS) { - RegSetValueExA(hkey, "Device", 0, REG_SZ, (LPBYTE)buf, strlen(buf) + 1); - RegCloseKey(hkey); - } - HeapFree(GetProcessHeap(),0,buf); + sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); + WriteProfileStringA("windows","device", buf); + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) + { + RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); + RegCloseKey(hkey); } + HeapFree(GetProcessHeap(), 0, buf); } static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) @@ -1273,7 +1262,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) } if (isfirst || set_default) - WINSPOOL_SetDefaultPrinter(devname,name,TRUE); + set_default_printer(devname, name); end: if (hkeyPrinters) RegCloseKey( hkeyPrinters );

1 0

Zebediah Figura : winspool: Stop setting the "Devices" key.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0ab71192b8c4137b1db55cbb6d9ea74381ac5988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab71192b8c4137b1db55cbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:48 2020 -0500 winspool: Stop setting the "Devices" key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d46fefc461..07398966e7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -561,7 +561,6 @@ static void set_default_printer(const char *devname, const char *name) HKEY hkey; sprintf(buf, "%s,WINEPS.DRV,LPR:%s", devname, name); - WriteProfileStringA("windows","device", buf); if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hkey)) { RegSetValueExA(hkey, "Device", 0, REG_SZ, (BYTE *)buf, strlen(buf) + 1); @@ -3445,7 +3444,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) if (GetDefaultPrinterW( def, &size ) && !strcmpW( def, lpNameW )) { - WriteProfileStringW( windowsW, deviceW, NULL ); if (!RegCreateKeyW( HKEY_CURRENT_USER, user_default_reg_key, &hkey )) { RegDeleteValueW( hkey, deviceW ); @@ -6078,20 +6076,12 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) size = ((MAX_PATH * 2) + 2) * sizeof(WCHAR); /* driver,port and a 0 */ lres = RegQueryValueExW(hreg, pszPrinter, NULL, NULL, (LPBYTE) (&buffer[namelen]), &size); if (!lres) { - TRACE("set device to %s\n", debugstr_w(buffer)); + HKEY hdev; - if (!WriteProfileStringW(windowsW, deviceW, buffer)) { - TRACE("failed to set the device entry: %d\n", GetLastError()); - lres = ERROR_INVALID_PRINTER_NAME; - } - - /* remove the next section, when INIFileMapping is implemented */ + if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { - HKEY hdev; - if (!RegCreateKeyW(HKEY_CURRENT_USER, user_default_reg_key, &hdev)) { - RegSetValueExW(hdev, deviceW, 0, REG_SZ, (LPBYTE)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); - RegCloseKey(hdev); - } + RegSetValueExW(hdev, deviceW, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR)); + RegCloseKey(hdev); } } else

1 0

Zebediah Figura : wine.inf: Map the Devices section of win.ini to the registry.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 96115da054d2a1f142df121eb79c4a912505fc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96115da054d2a1f142df121e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:49 2020 -0500 wine.inf: Map the Devices section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 23b91af480..65b224c37f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

Zebediah Figura : winspool: Stop modifying the "Devices" profile section.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: a5ef9295bc4994b30dd702f708debb776ccf55ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5ef9295bc4994b30dd702f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:50 2020 -0500 winspool: Stop modifying the "Devices" profile section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 07398966e7..f9c10f3de1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -270,7 +270,6 @@ static const WCHAR txTimeoutW[] = {'t','x','T','i','m','e','o','u','t',0}; static const WCHAR UntilTimeW[] = {'U','n','t','i','l','T','i','m','e',0}; static WCHAR WinPrintW[] = {'W','i','n','P','r','i','n','t',0}; static const WCHAR deviceW[] = {'d','e','v','i','c','e',0}; -static const WCHAR devicesW[] = {'d','e','v','i','c','e','s',0}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s',0}; static WCHAR rawW[] = {'R','A','W',0}; static WCHAR driver_9x[] = {'w','i','n','e','p','s','1','6','.','d','r','v',0}; @@ -3165,7 +3164,6 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) lstrcatW(devline, pi->pPortName); TRACE("using %s\n", debugstr_w(devline)); - WriteProfileStringW(devicesW, pi->pPrinterName, devline); if (!RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey)) { RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, (lstrlenW(devline) + 1) * sizeof(WCHAR)); @@ -3429,7 +3427,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegDeleteTreeW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters); } - WriteProfileStringW(devicesW, lpNameW, NULL); WriteProfileStringW(PrinterPortsW, lpNameW, NULL); if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) {

1 0