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

Piotr Caban : msvcrt: Don't depend on additional mantissa bits when rounding.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: b22ffa589145234d23d07602752dacf9f30b4e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22ffa589145234d23d07602… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 23 15:38:37 2020 +0200 msvcrt: Don't depend on additional mantissa bits when rounding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a2ec9a91ac..802ae5f0af 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -831,12 +831,17 @@ struct fpnum fpnum_parse(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *c 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-4; i>=b->b; i--) { - if (!b->data[bnum_idx(b, b->b)]) continue; - round = FP_ROUND_DOWN; - break; + if(b->e-4 >= b->b && b->data[bnum_idx(b, b->e-4)]) { + if(b->data[bnum_idx(b, b->e-4)] > LIMB_MAX/2) round = FP_ROUND_UP; + else if(b->data[bnum_idx(b, b->e-4)] == LIMB_MAX/2) round = FP_ROUND_EVEN; + else round = FP_ROUND_DOWN; + } + if(round == FP_ROUND_ZERO || round == FP_ROUND_EVEN) { + for(i=b->e-5; i>=b->b; i--) { + if(!b->data[bnum_idx(b, b->b)]) continue; + if(round == FP_ROUND_EVEN) round = FP_ROUND_UP; + else round = FP_ROUND_DOWN; + } } return fpnum(sign, e2, m, round);

1 0

Zebediah Figura : quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame().
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: ead0e8e5cfcfa3a56217c4f535e960ba99b2485b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead0e8e5cfcfa3a56217c4f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:22 2020 -0500 quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ac2cadc4b1..9e6a618a36 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2702,7 +2702,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 092ee87132..789c5e429a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3717,7 +3717,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index a5ff4979ef..07e042eccd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -755,7 +755,7 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("window %p, reftime %p.\n", window, reftime); - *reftime = get_video_format(window)->AvgTimePerFrame; + *reftime = (double)get_video_format(window)->AvgTimePerFrame / 1e7; return S_OK; }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 5b795b658d14bd85ba6783131c6f42a37cfcce27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b795b658d14bd85ba678313… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:12 2020 +0200 server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 11 ++++++ server/console.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 1 + 3 files changed, 108 insertions(+), 3 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 42ca77d382..add88d8885 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) @@ -82,6 +83,16 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; +/* IOCTL_CONDRV_WRITE_OUTPUT */ +struct condrv_write_output_params +{ + unsigned int x; /* destination position */ + unsigned int y; + unsigned int mode; /* char info mode */ + unsigned int width; /* width of output rectangle, 0 for wrapped mode */ + /* followed by an array of data with type depending on mode */ +}; + /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ struct condrv_output_info { diff --git a/server/console.c b/server/console.c index 9f102968a1..9e61987e33 100644 --- a/server/console.c +++ b/server/console.c @@ -1249,7 +1249,85 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) } /* write data into a screen buffer */ -static int write_console_output( struct screen_buffer *screen_buffer, data_size_t size, +static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_write_output_params *params, + data_size_t size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + if (size % entry_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (params->x >= screen_buffer->width) return; + entry_cnt = size / entry_size; + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + + if (i && screen_buffer == screen_buffer->input->active) + { + struct condrv_renderer_event evt; + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + evt.u.update.top = params->y; + evt.u.update.bottom = params->width + ? min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1 + : params->y + (params->x + i - 1) / screen_buffer->width; + console_input_events_append( screen_buffer->input, &evt ); + } + + if (get_reply_max_size() == sizeof(SMALL_RECT)) + { + SMALL_RECT region; + region.Left = params->x; + region.Top = params->y; + region.Right = min( params->x + params->width, screen_buffer->width ) - 1; + region.Bottom = min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1; + set_reply_data( &region, sizeof(region) ); + } + else set_reply_data( &i, sizeof(i) ); +} + +/* write data into a screen buffer */ +static int write_console_output_req( struct screen_buffer *screen_buffer, data_size_t size, const void* data, enum char_info_mode mode, int x, int y, int wrap ) { @@ -1660,6 +1738,21 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * screen_buffer->mode = *(unsigned int *)get_req_data(); return 1; + case IOCTL_CONDRV_WRITE_OUTPUT: + if (get_req_data_size() < sizeof(struct condrv_write_output_params) || + (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_write_output_params) ); + return !get_error(); + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info; @@ -2140,8 +2233,8 @@ DECL_HANDLER(write_console_output) release_object( screen_buffer ); return; } - reply->written = write_console_output( screen_buffer, get_req_data_size(), get_req_data(), - req->mode, req->x, req->y, req->wrap ); + reply->written = write_console_output_req( screen_buffer, get_req_data_size(), get_req_data(), + req->mode, req->x, req->y, req->wrap ); reply->width = screen_buffer->width; reply->height = screen_buffer->height; release_object( screen_buffer ); diff --git a/server/trace.c b/server/trace.c index 21468abd73..16bcc616a5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -127,6 +127,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); CASE(IOCTL_CONDRV_WRITE_INPUT); + CASE(IOCTL_CONDRV_WRITE_OUTPUT); CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN);

1 0

Zebediah Figura : winegstreamer: Check for failure from gst_video_info_set_format().
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: ddd43e0a80bfd4c2e6f3ec650ed4b7d37890c46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd43e0a80bfd4c2e6f3ec65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 22 18:29:23 2020 -0500 winegstreamer: Check for failure from gst_video_info_set_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a32b0b0e41..1aa564f212 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -413,7 +413,11 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) return NULL; } - gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + if (!gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight)) + { + ERR("Failed to set format.\n"); + return NULL; + } if ((caps = gst_video_info_to_caps(&info))) { /* Clear some fields that shouldn't prevent us from connecting. */

1 0

Matteo Bruni : wined3d: Remove some unnecessary "inline" qualifiers.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 901042a123f72675ce3e66a8d1a0bae1dcf1ae9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=901042a123f72675ce3e66a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:57 2020 +0200 wined3d: Remove some unnecessary "inline" qualifiers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a14682c95a..34736a802d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1037,7 +1037,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl } /* Context activation is done by the caller. */ -static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, +static void walk_constant_heap(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { unsigned int start = ~0U, end = 0; @@ -1111,7 +1111,7 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } /* Context activation is done by the caller. */ -static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, +static void apply_clamped_constant(const struct wined3d_gl_info *gl_info, GLint location, const struct wined3d_vec4 *data) { GLfloat clamped_constant[4]; @@ -1127,7 +1127,7 @@ static inline void apply_clamped_constant(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_info, +static void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_info, const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { @@ -8536,7 +8536,7 @@ static GLuint find_glsl_fragment_shader(const struct wined3d_context_gl *context return ret; } -static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, +static BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { if ((stored->swizzle_map & use_map) != new->swizzle_map)

1 0

Zebediah Figura : winspool: Stop modifying the "Devices" profile section.
by Alexandre Julliard July 23, 2020

July 23, 2020

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

Puetz Kevin A : jscript: Fix some memory problems in disp_call_value.
by Alexandre Julliard July 23, 2020

July 23, 2020

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

Zebediah Figura : winspool: Remove the "force" parameter to WINSPOOL_SetDefaultPrinter().
by Alexandre Julliard July 23, 2020

July 23, 2020

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

Puetz Kevin A : jscript: Fix `this` within IDispatchEx::InvokeEx.
by Alexandre Julliard July 23, 2020

July 23, 2020

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

Matteo Bruni : wined3d: Correctly destroy the adapter on format initialization failure in no3d mode.
by Alexandre Julliard July 23, 2020

July 23, 2020

Module: wine Branch: master Commit: 1e25ff3cc4d015aa939ad49e334acb16d44e1b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e25ff3cc4d015aa939ad49e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 22 19:00:54 2020 +0200 wined3d: Correctly destroy the adapter on format initialization failure in no3d mode. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 533d99f026..e797f21888 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2991,6 +2991,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!wined3d_adapter_no3d_init_format_info(adapter)) { + wined3d_adapter_cleanup(adapter); heap_free(adapter); return NULL; }

1 0