May 2023 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul().
by Alexandre Julliard 23 May '23

23 May '23

Module: vkd3d Branch: master Commit: d565caafb513e216b0c829bc27ffd535622ae967 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d565caafb513e216b0c829bc27ffd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:48:13 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_mul(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 24ebbf8d..015b2222 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -222,10 +222,10 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { - enum hlsl_base_type type = dst->node.data_type->base_type; + enum hlsl_base_type type = dst_type->base_type; unsigned int k; assert(type == src1->node.data_type->base_type); @@ -237,20 +237,20 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].f = src1->value.u[k].f * src2->value.u[k].f; + dst->u[k].f = src1->value.u[k].f * src2->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].d = src1->value.u[k].d * src2->value.u[k].d; + dst->u[k].d = src1->value.u[k].d * src2->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: - dst->value.u[k].u = src1->value.u[k].u * src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u * src2->value.u[k].u; break; default: - FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -592,7 +592,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_MUL: - success = fold_mul(ctx, res, arg1, arg2); + success = fold_mul(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_NEQUAL:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_nequal().
by Alexandre Julliard 23 May '23

23 May '23

Module: vkd3d Branch: master Commit: 855bb71f6dc41ae061ecbfdfec1512604c224fda URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/855bb71f6dc41ae061ecbfdfec151… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:49:14 2022 -0600 vkd3d-shader/hlsl: Pass hlsl_constant_value and hlsl_type pointers to fold_nequal(). --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 015b2222..80af9b8f 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -257,12 +257,12 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, - struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { unsigned int k; - assert(dst->node.data_type->base_type == HLSL_TYPE_BOOL); + assert(dst_type->base_type == HLSL_TYPE_BOOL); assert(src1->node.data_type->base_type == src2->node.data_type->base_type); for (k = 0; k < 4; ++k) @@ -271,24 +271,24 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - dst->value.u[k].u = src1->value.u[k].f != src2->value.u[k].f; + dst->u[k].u = src1->value.u[k].f != src2->value.u[k].f; break; case HLSL_TYPE_DOUBLE: - dst->value.u[k].u = src1->value.u[k].d != src2->value.u[k].d; + dst->u[k].u = src1->value.u[k].d != src2->value.u[k].d; break; case HLSL_TYPE_INT: case HLSL_TYPE_UINT: case HLSL_TYPE_BOOL: - dst->value.u[k].u = src1->value.u[k].u != src2->value.u[k].u; + dst->u[k].u = src1->value.u[k].u != src2->value.u[k].u; break; default: vkd3d_unreachable(); } - dst->value.u[k].u *= ~0u; + dst->u[k].u *= ~0u; } return true; } @@ -596,7 +596,7 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_NEQUAL: - success = fold_nequal(ctx, res, arg1, arg2); + success = fold_nequal(ctx, &res->value, instr->data_type, arg1, arg2); break; case HLSL_OP2_DIV:

1 0

Davide Beatrici : winealsa: Implement get_device_period in unixlib.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 1adee1bce4553f2579c4d9fec3061d6de7a7ffdd URL: https://gitlab.winehq.org/wine/wine/-/commit/1adee1bce4553f2579c4d9fec3061d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 23 10:15:32 2023 +0200 winealsa: Implement get_device_period in unixlib. --- dlls/winealsa.drv/alsa.c | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/winealsa.drv/mmdevdrv.c | 15 +++++++++------ 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index f1a55e842db..2ac126f411d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -82,7 +82,9 @@ struct alsa_stream pthread_mutex_t lock; }; -#define EXTRA_SAFE_RT 40000 +#define EXTRA_SAFE_RT 40000 + +static const REFERENCE_TIME def_period = 100000; static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', @@ -2096,6 +2098,20 @@ exit: return STATUS_SUCCESS; } +static NTSTATUS alsa_get_device_period(void *args) +{ + struct get_device_period_params *params = args; + + if (params->def_period) + *params->def_period = def_period; + if (params->min_period) + *params->min_period = def_period; + + params->result = S_OK; + + return STATUS_SUCCESS; +} + static NTSTATUS alsa_get_buffer_size(void *args) { struct get_buffer_size_params *params = args; @@ -2458,7 +2474,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, - alsa_not_implemented, + alsa_get_device_period, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, @@ -2653,6 +2669,28 @@ static NTSTATUS alsa_wow64_get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS alsa_wow64_get_device_period(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + HRESULT result; + PTR32 def_period; + PTR32 min_period; + } *params32 = args; + struct get_device_period_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .def_period = ULongToPtr(params32->def_period), + .min_period = ULongToPtr(params32->min_period), + }; + alsa_get_device_period(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + static NTSTATUS alsa_wow64_get_buffer_size(void *args) { struct @@ -2877,7 +2915,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_release_capture_buffer, alsa_wow64_is_format_supported, alsa_wow64_get_mix_format, - alsa_not_implemented, + alsa_wow64_get_device_period, alsa_wow64_get_buffer_size, alsa_wow64_get_latency, alsa_wow64_get_current_padding, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e556bf5d0c1..0126b1357a2 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -824,18 +824,21 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_device_period_params params; TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); - if(!defperiod && !minperiod) + if (!defperiod && !minperiod) return E_POINTER; - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = DefaultPeriod; + params.device = This->device_name; + params.flow = This->dataflow; + params.def_period = defperiod; + params.min_period = minperiod; - return S_OK; + ALSA_CALL(get_device_period, &params); + + return params.result; } static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)

1 0

Davide Beatrici : winecoreaudio: Implement get_device_period in unixlib.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: d6728615c93f7cbdae710f49d7bc2d9d95efe820 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6728615c93f7cbdae710f49d7bc2d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 23 10:16:19 2023 +0200 winecoreaudio: Implement get_device_period in unixlib. --- dlls/winecoreaudio.drv/coreaudio.c | 43 ++++++++++++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 15 +++++++------ 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ecd137ce609..89265558a1d 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -100,6 +100,9 @@ struct coreaudio_stream BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; }; +static const REFERENCE_TIME def_period = 100000; +static const REFERENCE_TIME min_period = 50000; + static NTSTATUS unix_not_implemented(void *args) { return STATUS_SUCCESS; @@ -1087,6 +1090,20 @@ unsupported: return STATUS_SUCCESS; } +static NTSTATUS unix_get_device_period(void *args) +{ + struct get_device_period_params *params = args; + + if (params->def_period) + *params->def_period = def_period; + if (params->min_period) + *params->min_period = min_period; + + params->result = S_OK; + + return STATUS_SUCCESS; +} + static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) { if(left <= right) @@ -1739,7 +1756,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_release_capture_buffer, unix_is_format_supported, unix_get_mix_format, - unix_not_implemented, + unix_get_device_period, unix_get_buffer_size, unix_get_latency, unix_get_current_padding, @@ -1934,6 +1951,28 @@ static NTSTATUS unix_wow64_get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS unix_wow64_get_device_period(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + HRESULT result; + PTR32 def_period; + PTR32 min_period; + } *params32 = args; + struct get_device_period_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .def_period = ULongToPtr(params32->def_period), + .min_period = ULongToPtr(params32->min_period), + }; + unix_get_device_period(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + static NTSTATUS unix_wow64_get_buffer_size(void *args) { struct @@ -2099,7 +2138,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_release_capture_buffer, unix_wow64_is_format_supported, unix_wow64_get_mix_format, - unix_not_implemented, + unix_wow64_get_device_period, unix_wow64_get_buffer_size, unix_wow64_get_latency, unix_wow64_get_current_padding, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 756aab93f71..d8a2e9e5d21 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -790,18 +790,21 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_device_period_params params; TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); - if(!defperiod && !minperiod) + if (!defperiod && !minperiod) return E_POINTER; - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = MinimumPeriod; + params.device = This->device_name; + params.flow = This->dataflow; + params.def_period = defperiod; + params.min_period = minperiod; - return S_OK; + UNIX_CALL(get_device_period, &params); + + return params.result; } static DWORD WINAPI ca_timer_thread(void *user)

1 0

Davide Beatrici : wineoss: Implement get_device_period in unixlib.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 2127a8a0d74cc81e15a34068ffc986c30f8a75e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2127a8a0d74cc81e15a34068ffc986… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 23 10:17:10 2023 +0200 wineoss: Implement get_device_period in unixlib. --- dlls/wineoss.drv/mmdevdrv.c | 15 +++++++++------ dlls/wineoss.drv/oss.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dac5790e384..c55176307f0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -785,18 +785,21 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_device_period_params params; TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod); - if(!defperiod && !minperiod) + if (!defperiod && !minperiod) return E_POINTER; - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = MinimumPeriod; + params.device = This->device_name; + params.flow = This->dataflow; + params.def_period = defperiod; + params.min_period = minperiod; - return S_OK; + OSS_CALL(get_device_period, &params); + + return params.result; } static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index d8225b65889..585df97bc43 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -69,6 +69,9 @@ struct oss_stream WINE_DEFAULT_DEBUG_CHANNEL(oss); +static const REFERENCE_TIME def_period = 100000; +static const REFERENCE_TIME min_period = 50000; + static NTSTATUS oss_not_implemented(void *args) { return STATUS_SUCCESS; @@ -1245,6 +1248,20 @@ static NTSTATUS oss_get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS oss_get_device_period(void *args) +{ + struct get_device_period_params *params = args; + + if (params->def_period) + *params->def_period = def_period; + if (params->min_period) + *params->min_period = min_period; + + params->result = S_OK; + + return STATUS_SUCCESS; +} + static NTSTATUS oss_get_buffer_size(void *args) { struct get_buffer_size_params *params = args; @@ -1649,7 +1666,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_release_capture_buffer, oss_is_format_supported, oss_get_mix_format, - oss_not_implemented, + oss_get_device_period, oss_get_buffer_size, oss_get_latency, oss_get_current_padding, @@ -1860,6 +1877,28 @@ static NTSTATUS oss_wow64_get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS oss_wow64_get_device_period(void *args) +{ + struct + { + PTR32 device; + EDataFlow flow; + HRESULT result; + PTR32 def_period; + PTR32 min_period; + } *params32 = args; + struct get_device_period_params params = + { + .device = ULongToPtr(params32->device), + .flow = params32->flow, + .def_period = ULongToPtr(params32->def_period), + .min_period = ULongToPtr(params32->min_period), + }; + oss_get_device_period(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + static NTSTATUS oss_wow64_get_buffer_size(void *args) { struct @@ -2051,7 +2090,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_release_capture_buffer, oss_wow64_is_format_supported, oss_wow64_get_mix_format, - oss_not_implemented, + oss_wow64_get_device_period, oss_wow64_get_buffer_size, oss_wow64_get_latency, oss_wow64_get_current_padding,

1 0

Davide Beatrici : winepulse: Implement is_format_supported in unixlib.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: f5baa375c84cd080e36c51f2e8b3df7c18686fa8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5baa375c84cd080e36c51f2e8b3df… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 23 10:11:38 2023 +0200 winepulse: Implement is_format_supported in unixlib. --- dlls/winepulse.drv/mmdevdrv.c | 174 +++++------------------------------------- dlls/winepulse.drv/pulse.c | 171 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 186 insertions(+), 159 deletions(-)

1 0

Piotr Caban : localspl: Implement AbortPrinter while spooling.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 1b2db7f1715c18eee153fb91c2b5a34738b1fc55 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b2db7f1715c18eee153fb91c2b5a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 19:12:45 2023 +0200 localspl: Implement AbortPrinter while spooling. --- dlls/localspl/provider.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 9e990c75e0f..be4b81091eb 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3823,6 +3823,43 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) return ret; } +static BOOL WINAPI fpAbortPrinter(HANDLE hprinter) +{ + printer_t *printer = (printer_t *)hprinter; + job_info_t *job; + + TRACE("%p\n", hprinter); + + if (!printer) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (printer->header.type != HANDLE_PRINTER) + { + FIXME("%x handle not supported\n", printer->header.type); + return FALSE; + } + + if (!printer->doc) + { + SetLastError(ERROR_SPL_NO_STARTDOC); + return FALSE; + } + + CloseHandle(printer->doc->hf); + printer->doc->hf = NULL; + + EnterCriticalSection(&printer->info->jobs_cs); + job = get_job(printer->info, printer->doc->id); + if (job) free_job(job); + LeaveCriticalSection(&printer->info->jobs_cs); + + printer->doc = NULL; + return TRUE; +} + static BOOL WINAPI fpReadPrinter(HANDLE hprinter, void *buf, DWORD size, DWORD *bytes_read) { job_t *job = (job_t *)hprinter; @@ -4003,7 +4040,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpStartPagePrinter */ fpWritePrinter, NULL, /* fpEndPagePrinter */ - NULL, /* fpAbortPrinter */ + fpAbortPrinter, fpReadPrinter, fpEndDocPrinter, fpAddJob,

1 0

Piotr Caban : winspool: Add AbortPrinter implementation.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 083946dbf41f06618db508e510c790de5385ae2e URL: https://gitlab.winehq.org/wine/wine/-/commit/083946dbf41f06618db508e510c790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 18:56:28 2023 +0200 winspool: Add AbortPrinter implementation. --- dlls/winspool.drv/info.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3c513f1c0e8..30df3199f40 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6029,10 +6029,13 @@ DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, /****************************************************************************** * AbortPrinter (WINSPOOL.@) */ -BOOL WINAPI AbortPrinter( HANDLE hPrinter ) +BOOL WINAPI AbortPrinter(HANDLE printer) { - FIXME("(%p), stub!\n", hPrinter); - return TRUE; + HANDLE handle = get_backend_handle(printer); + + TRACE("(%p)\n", printer); + + return backend->fpAbortPrinter(handle); } /******************************************************************************

1 0

Piotr Caban : gdi32: Abort printing if DeleteDC is called before EndDoc.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 0e976ca5444c699517f3ad7e84c7e0468b4adcbc URL: https://gitlab.winehq.org/wine/wine/-/commit/0e976ca5444c699517f3ad7e84c7e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 18:52:26 2023 +0200 gdi32: Abort printing if DeleteDC is called before EndDoc. --- dlls/gdi32/dc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e7f2d8526d1..5ae7cc653d1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -479,7 +479,12 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (is_meta_dc( hdc )) return METADC_DeleteDC( hdc ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - if (dc_attr->print) delete_print_dc( dc_attr ); + if (dc_attr->print) + { + if (dc_attr->emf) + AbortDoc( hdc ); + delete_print_dc( dc_attr ); + } if (dc_attr->emf) EMFDC_DeleteDC( dc_attr ); return NtGdiDeleteObjectApp( hdc ); }

1 0

Piotr Caban : wineps: Remove no longer used PSDRV_SelectDownloadFont helper.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: fe111269016a083125dc805063b1db4e6a0ffe7a URL: https://gitlab.winehq.org/wine/wine/-/commit/fe111269016a083125dc805063b1db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 22 19:23:35 2023 +0200 wineps: Remove no longer used PSDRV_SelectDownloadFont helper. --- dlls/wineps.drv/download.c | 13 ------------- dlls/wineps.drv/psdrv.h | 1 - 2 files changed, 14 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 89dd56d5b38..80cf4a0c13f 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -190,19 +190,6 @@ static UINT get_bbox(HDC hdc, RECT *rc) return GET_BE_WORD(head + 18); /* unitsPerEm */ } -/**************************************************************************** - * PSDRV_SelectDownloadFont - * - * Set up ctx->font for a downloadable font - * - */ -BOOL PSDRV_SelectDownloadFont(print_ctx *ctx) -{ - ctx->font.fontloc = Download; - ctx->font.fontinfo.Download = NULL; - return TRUE; -} - static UINT calc_ppem_for_height(HDC hdc, LONG height) { BYTE os2[78]; /* size of version 0 table */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 389c6a5b562..09b3a57b76c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -491,7 +491,6 @@ SHORT PSDRV_CalcAvgCharWidth(const AFM *afm) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetBuiltinFont(print_ctx *ctx) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteBuiltinGlyphShow(print_ctx *ctx, LPCWSTR str, INT count) DECLSPEC_HIDDEN; -extern BOOL PSDRV_SelectDownloadFont(print_ctx *ctx) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(print_ctx *ctx, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteDownloadGlyphShow(print_ctx *ctx, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; extern BOOL PSDRV_EmptyDownloadList(print_ctx *ctx, BOOL write_undef) DECLSPEC_HIDDEN;

1 0