January 2024 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Forbid objects in ternary conditions.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 2c8751478ff9c46d9aa6ff82cc9aa4200ae1aa4f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2c8751478ff9c46d9aa6ff82cc9aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 11 14:06:00 2023 -0600 vkd3d-shader/hlsl: Forbid objects in ternary conditions. --- libs/vkd3d-shader/hlsl.y | 10 ++++++++++ tests/hlsl/ternary.shader_test | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e30b3dc5..5552db11 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4091,6 +4091,16 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; struct hlsl_type *common_type; + if (cond->data_type->class > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, cond->data_type))) + hlsl_error(ctx, &cond->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Ternary condition type '%s' is not numeric.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + if (first->data_type->class <= HLSL_CLASS_LAST_NUMERIC && second->data_type->class <= HLSL_CLASS_LAST_NUMERIC) { diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index 50f40201..f4fffb29 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -353,7 +353,7 @@ float4 main() : sv_target % Of course objects cannot be used as the condition. -[pixel shader fail todo] +[pixel shader fail] Texture2D t; float4 main() : sv_target

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle scalar conditions in ternaries.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 11112798c8812c507266c2be4d36494e6135ec20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/11112798c8812c507266c2be4d364… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 16 18:09:43 2024 -0600 vkd3d-shader/hlsl: Handle scalar conditions in ternaries. --- libs/vkd3d-shader/hlsl.y | 13 +++++++++++-- tests/hlsl/ternary.shader_test | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5552db11..9ee67914 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4089,13 +4089,14 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *cond, struct hlsl_ir_node *first, struct hlsl_ir_node *second) { struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *cond_type = cond->data_type; struct hlsl_type *common_type; - if (cond->data_type->class > HLSL_CLASS_LAST_NUMERIC) + if (cond_type->class > HLSL_CLASS_LAST_NUMERIC) { struct vkd3d_string_buffer *string; - if ((string = hlsl_type_to_string(ctx, cond->data_type))) + if ((string = hlsl_type_to_string(ctx, cond_type))) hlsl_error(ctx, &cond->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Ternary condition type '%s' is not numeric.", string->buffer); hlsl_release_string_buffer(ctx, string); @@ -4107,6 +4108,14 @@ static bool add_ternary(struct hlsl_ctx *ctx, struct hlsl_block *block, if (!(common_type = get_common_numeric_type(ctx, first, second, &first->loc))) return false; + if (cond_type->dimx == 1 && cond_type->dimy == 1) + { + cond_type = hlsl_get_numeric_type(ctx, common_type->class, + HLSL_TYPE_BOOL, common_type->dimx, common_type->dimy); + if (!(cond = add_implicit_conversion(ctx, block, cond, cond_type, &cond->loc))) + return false; + } + if (!(first = add_implicit_conversion(ctx, block, first, common_type, &first->loc))) return false; diff --git a/tests/hlsl/ternary.shader_test b/tests/hlsl/ternary.shader_test index f4fffb29..3b62513d 100644 --- a/tests/hlsl/ternary.shader_test +++ b/tests/hlsl/ternary.shader_test @@ -114,7 +114,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (5.0, 6.0, 7.0, 1.0) +probe all rgba (5.0, 6.0, 7.0, 1.0) % More restrictions are placed on the type of the first (condition) operand, @@ -265,7 +265,7 @@ draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) -[pixel shader todo] +[pixel shader] // "scalar" can mean any 1-component numeric type. static float1x1 cond = {0}; @@ -278,7 +278,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (5.0, 6.0, 7.0, 8.0)

1 0

Giovanni Mascellani : ci: Rename CI target build-image to image-linux.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 847930d5e0b7595f7056990a565240cdcc486856 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/847930d5e0b7595f7056990a56524… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 11:31:47 2024 +0100 ci: Rename CI target build-image to image-linux. --- gitlab/README | 2 +- gitlab/build.yml | 6 +++--- gitlab/image.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitlab/README b/gitlab/README index 310912be..3b520323 100644 --- a/gitlab/README +++ b/gitlab/README @@ -5,7 +5,7 @@ vkd3d testing scripts These scripts are used by the GitLab CI feature to automatically run the vkd3d tests on each merge request. -The CI target build-image, in the file image.yml, builds a Docker +The CI target image-linux, in the file image.yml, builds a Docker image based on Debian bookworm with all the packages required for testing, and uploads it to the GitLab container registry. The Docker script is in the file image.docker. diff --git a/gitlab/build.yml b/gitlab/build.yml index 9a19316b..b87ab969 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -5,7 +5,7 @@ image: $CI_REGISTRY/wine/vkd3d:debian-bookworm interruptible: true needs: - - job: build-image + - job: image-linux optional: true dependencies: [] script: @@ -68,7 +68,7 @@ build-crosstest: image: $CI_REGISTRY/wine/vkd3d:debian-bookworm interruptible: true needs: - - job: build-image + - job: image-linux optional: true dependencies: [] script: @@ -94,7 +94,7 @@ build-crosstest: image: $CI_REGISTRY/wine/vkd3d:debian-bookworm interruptible: true needs: - - job: build-image + - job: image-linux optional: true dependencies: [] script: diff --git a/gitlab/image.yml b/gitlab/image.yml index 45a87770..cda71df6 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -1,4 +1,4 @@ -build-image: +image-linux: stage: image rules: - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/vkd3d" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

1 0

Giovanni Mascellani : ci: Prepare the macOS build environment in a dedicated CI job.
by Alexandre Julliard 18 Jan '24

18 Jan '24

Module: vkd3d Branch: master Commit: 866e5de95b457b22b8e5b2ea9db3aeb5d599acd7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/866e5de95b457b22b8e5b2ea9db3a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jan 4 14:04:36 2024 +0100 ci: Prepare the macOS build environment in a dedicated CI job. --- gitlab/build.yml | 15 ++++++--------- gitlab/image.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/gitlab/build.yml b/gitlab/build.yml index b87ab969..af68e9ef 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -130,7 +130,9 @@ build-mac: exit_codes: - 2 interruptible: true - needs: [] + needs: + - job: image-mac + optional: true dependencies: [] tags: - mac @@ -147,14 +149,9 @@ build-mac: - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" - - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git - - cd wine - - mkdir build - - cd build - - ../configure --enable-win64 --without-x --without-freetype - - make tools/widl/widl - - cd ../.. - - export PATH="$PWD/wine/build/tools/widl:$PATH" + - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/maste… + - unzip image.zip + - export PATH="$PWD/image/bin:$PATH" - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac - if [ -f build_failed ] ; then exit 1 ; fi - if [ -f tests_failed ] ; then exit 2 ; fi diff --git a/gitlab/image.yml b/gitlab/image.yml index cda71df6..c93ea0d6 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -18,3 +18,32 @@ image-linux: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"},\"$CI_DEPENDENCY_PROXY_SERVER\":{\"auth\":\"$(printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE" - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL" + +image-mac: + stage: image + rules: + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_PATH == "wine/vkd3d" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + changes: + - .gitlab-ci.yml + - gitlab/image.yml + interruptible: true + tags: + - mac + script: + - mkdir image + - cd image + - mkdir bin + - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" + - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git + - cd wine + - mkdir build + - cd build + - ../configure --enable-win64 --without-x --without-freetype + - make tools/widl/widl + - cd ../.. + - cp wine/build/tools/widl/widl bin + - rm -fr wine + - cd .. + artifacts: + paths: + - image

1 0

Rémi Bernon : winemac: Use the default ImeToAsciiEx implementation.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: f341b8003c8cce40db0ebcf2d3a49019709e236c URL: https://gitlab.winehq.org/wine/wine/-/commit/f341b8003c8cce40db0ebcf2d3a490… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 29 12:04:54 2023 +0100 winemac: Use the default ImeToAsciiEx implementation. And support updates pushed from the host IME directly. --- dlls/winemac.drv/event.c | 129 ++++------------------------------------------ dlls/winemac.drv/gdi.c | 1 - dlls/winemac.drv/macdrv.h | 1 - 3 files changed, 10 insertions(+), 121 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 2fc699e3f77..9fbbe9d3d66 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -34,25 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); WINE_DECLARE_DEBUG_CHANNEL(imm); -/* IME works synchronously, key input is passed from ImeProcessKey, to the - * host IME. We wait for it to be handled, or not, which is notified using - * the sent_text_input event. Meanwhile, while processing the key, the host - * IME may send one or more im_set_text events to update the input text. - * - * If ImeProcessKey returns TRUE, ImeToAsciiEx is then be called to retrieve - * the composition string updates. We use ime_update.comp_str != NULL as flag that - * composition is started, even if the preedit text is empty. - * - * If ImeProcessKey returns FALSE, ImeToAsciiEx will not be called. - */ -struct ime_update -{ - DWORD cursor_pos; - WCHAR *comp_str; - WCHAR *result_str; -}; -static struct ime_update ime_update; - /* return the name of an Mac event */ static const char *dbgstr_event(int type) { @@ -166,6 +147,11 @@ static macdrv_event_mask get_event_mask(DWORD mask) return event_mask; } +static void post_ime_update( HWND hwnd, UINT cursor_pos, WCHAR *comp_str, WCHAR *result_str ) +{ + NtUserMessageCall( hwnd, WINE_IME_POST_UPDATE, cursor_pos, (LPARAM)comp_str, + result_str, NtUserImeDriverCall, FALSE ); +} /*********************************************************************** * macdrv_im_set_text @@ -173,7 +159,6 @@ static macdrv_event_mask get_event_mask(DWORD mask) static void macdrv_im_set_text(const macdrv_event *event) { HWND hwnd = macdrv_get_window_hwnd(event->window); - CFIndex length = 0; WCHAR *text = NULL; TRACE_(imm)("win %p/%p himc %p text %s complete %u\n", hwnd, event->window, event->im_set_text.himc, @@ -181,27 +166,16 @@ static void macdrv_im_set_text(const macdrv_event *event) if (event->im_set_text.text) { - length = CFStringGetLength(event->im_set_text.text); + CFIndex length = CFStringGetLength(event->im_set_text.text); if (!(text = malloc((length + 1) * sizeof(WCHAR)))) return; if (length) CFStringGetCharacters(event->im_set_text.text, CFRangeMake(0, length), text); text[length] = 0; } - /* discard any pending comp text */ - free(ime_update.comp_str); - ime_update.comp_str = NULL; - ime_update.cursor_pos = -1; + if (event->im_set_text.complete) post_ime_update(hwnd, -1, NULL, text); + else post_ime_update(hwnd, event->im_set_text.cursor_pos, text, NULL); - if (event->im_set_text.complete) - { - free(ime_update.result_str); - ime_update.result_str = text; - } - else - { - ime_update.comp_str = text; - ime_update.cursor_pos = event->im_set_text.cursor_pos; - } + free(text); } /*********************************************************************** @@ -210,90 +184,7 @@ static void macdrv_im_set_text(const macdrv_event *event) static void macdrv_sent_text_input(const macdrv_event *event) { TRACE_(imm)("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE"); - *event->sent_text_input.done = event->sent_text_input.handled || ime_update.result_str ? 1 : -1; -} - - -/*********************************************************************** - * ImeToAsciiEx (MACDRV.@) - */ -UINT macdrv_ImeToAsciiEx(UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc) -{ - UINT needed = sizeof(COMPOSITIONSTRING), comp_len, result_len; - struct ime_update *update = &ime_update; - void *dst; - - TRACE_(imm)("vkey %#x, vsc %#x, state %p, compstr %p, himc %p\n", vkey, vsc, state, compstr, himc); - - if (!update->comp_str) comp_len = 0; - else - { - comp_len = wcslen(update->comp_str); - needed += comp_len * sizeof(WCHAR); /* GCS_COMPSTR */ - needed += comp_len; /* GCS_COMPATTR */ - needed += 2 * sizeof(DWORD); /* GCS_COMPCLAUSE */ - } - - if (!update->result_str) result_len = 0; - else - { - result_len = wcslen(update->result_str); - needed += result_len * sizeof(WCHAR); /* GCS_RESULTSTR */ - needed += 2 * sizeof(DWORD); /* GCS_RESULTCLAUSE */ - } - - if (compstr->dwSize < needed) - { - compstr->dwSize = needed; - return STATUS_BUFFER_TOO_SMALL; - } - - memset( compstr, 0, sizeof(*compstr) ); - compstr->dwSize = sizeof(*compstr); - - if (update->comp_str) - { - compstr->dwCursorPos = update->cursor_pos; - - compstr->dwCompStrLen = comp_len; - compstr->dwCompStrOffset = compstr->dwSize; - dst = (BYTE *)compstr + compstr->dwCompStrOffset; - memcpy(dst, update->comp_str, compstr->dwCompStrLen * sizeof(WCHAR)); - compstr->dwSize += compstr->dwCompStrLen * sizeof(WCHAR); - - compstr->dwCompClauseLen = 2 * sizeof(DWORD); - compstr->dwCompClauseOffset = compstr->dwSize; - dst = (BYTE *)compstr + compstr->dwCompClauseOffset; - *((DWORD *)dst + 0) = 0; - *((DWORD *)dst + 1) = compstr->dwCompStrLen; - compstr->dwSize += compstr->dwCompClauseLen; - - compstr->dwCompAttrLen = compstr->dwCompStrLen; - compstr->dwCompAttrOffset = compstr->dwSize; - dst = (BYTE *)compstr + compstr->dwCompAttrOffset; - memset(dst, ATTR_INPUT, compstr->dwCompAttrLen); - compstr->dwSize += compstr->dwCompAttrLen; - } - - if (update->result_str) - { - compstr->dwResultStrLen = result_len; - compstr->dwResultStrOffset = compstr->dwSize; - dst = (BYTE *)compstr + compstr->dwResultStrOffset; - memcpy(dst, update->result_str, compstr->dwResultStrLen * sizeof(WCHAR)); - compstr->dwSize += compstr->dwResultStrLen * sizeof(WCHAR); - - compstr->dwResultClauseLen = 2 * sizeof(DWORD); - compstr->dwResultClauseOffset = compstr->dwSize; - dst = (BYTE *)compstr + compstr->dwResultClauseOffset; - *((DWORD *)dst + 0) = 0; - *((DWORD *)dst + 1) = compstr->dwResultStrLen; - compstr->dwSize += compstr->dwResultClauseLen; - } - - free(update->result_str); - update->result_str = NULL; - return 0; + *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1; } diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 6c2241514a9..137945c4b74 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -304,7 +304,6 @@ static const struct user_driver_funcs macdrv_funcs = .pUpdateLayeredWindow = macdrv_UpdateLayeredWindow, .pVkKeyScanEx = macdrv_VkKeyScanEx, .pImeProcessKey = macdrv_ImeProcessKey, - .pImeToAsciiEx = macdrv_ImeToAsciiEx, .pNotifyIMEStatus = macdrv_NotifyIMEStatus, .pWindowMessage = macdrv_WindowMessage, .pWindowPosChanged = macdrv_WindowPosChanged, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index b9cd9fde2ed..7e43314dce1 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -167,7 +167,6 @@ extern BOOL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey); extern void macdrv_UnregisterHotKey(HWND hwnd, UINT modifiers, UINT vkey); extern SHORT macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl); extern UINT macdrv_ImeProcessKey(HIMC himc, UINT wparam, UINT lparam, const BYTE *state); -extern UINT macdrv_ImeToAsciiEx(UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc); extern UINT macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl); extern INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR bufW, int bufW_size, UINT flags, HKL hkl);

1 0

Rémi Bernon : win32u: Remove now unnecessary ImeToAsciiEx driver entry.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 746de318975a8d5287c424433129c180483b1dc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/746de318975a8d5287c424433129c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 17 08:20:57 2024 +0100 win32u: Remove now unnecessary ImeToAsciiEx driver entry. --- dlls/win32u/driver.c | 12 ------------ dlls/win32u/imm.c | 2 -- include/wine/gdi_driver.h | 1 - 3 files changed, 15 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 2937f0d7248..fcfb7d55d54 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -729,11 +729,6 @@ static UINT nulldrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const BY return 0; } -static UINT nulldrv_ImeToAsciiEx( UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc ) -{ - return STATUS_NOT_IMPLEMENTED; -} - static void nulldrv_NotifyIMEStatus( HWND hwnd, UINT status ) { } @@ -1138,11 +1133,6 @@ static UINT loaderdrv_ImeProcessKey( HIMC himc, UINT wparam, UINT lparam, const return load_driver()->pImeProcessKey( himc, wparam, lparam, state ); } -static UINT loaderdrv_ImeToAsciiEx( UINT vkey, UINT vsc, const BYTE *state, COMPOSITIONSTRING *compstr, HIMC himc ) -{ - return load_driver()->pImeToAsciiEx( vkey, vsc, state, compstr, himc ); -} - static void loaderdrv_NotifyIMEStatus( HWND hwnd, UINT status ) { return load_driver()->pNotifyIMEStatus( hwnd, status ); @@ -1292,7 +1282,6 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_KbdLayerDescriptor, loaderdrv_ReleaseKbdTables, loaderdrv_ImeProcessKey, - loaderdrv_ImeToAsciiEx, loaderdrv_NotifyIMEStatus, /* cursor/icon functions */ nulldrv_DestroyCursorIcon, @@ -1384,7 +1373,6 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(KbdLayerDescriptor); SET_USER_FUNC(ReleaseKbdTables); SET_USER_FUNC(ImeProcessKey); - SET_USER_FUNC(ImeToAsciiEx); SET_USER_FUNC(NotifyIMEStatus); SET_USER_FUNC(DestroyCursorIcon); SET_USER_FUNC(SetCursor); diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 82124f72567..05b8b60090f 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -590,8 +590,6 @@ LRESULT ime_driver_call( HWND hwnd, enum wine_ime_call call, WPARAM wparam, LPAR return res; } case WINE_IME_TO_ASCII_EX: - res = user_driver->pImeToAsciiEx( wparam, lparam, params->state, params->compstr, params->himc ); - if ((NTSTATUS)res != STATUS_NOT_IMPLEMENTED) return res; return ime_to_tascii_ex( wparam, lparam, params->state, params->compstr, params->himc ); case WINE_IME_POST_UPDATE: post_ime_update( hwnd, wparam, (WCHAR *)lparam, (WCHAR *)params ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 26562bfef2b..bd827c31cb1 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -299,7 +299,6 @@ struct user_driver_funcs void (*pReleaseKbdTables)(const KBDTABLES *); /* IME functions */ UINT (*pImeProcessKey)(HIMC,UINT,UINT,const BYTE*); - UINT (*pImeToAsciiEx)(UINT,UINT,const BYTE*,COMPOSITIONSTRING*,HIMC); void (*pNotifyIMEStatus)(HWND,UINT); /* cursor/icon functions */ void (*pDestroyCursorIcon)(HCURSOR);

1 0

Brendan Shanks : combase: Make RoGetActivationFactory hookable.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 1932c3a2516b181291ce430505dcfa8a82eb70bd URL: https://gitlab.winehq.org/wine/wine/-/commit/1932c3a2516b181291ce430505dcfa… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 16 13:29:00 2024 -0800 combase: Make RoGetActivationFactory hookable. --- dlls/combase/roapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index e1017f1f3fd..02d9e0b536e 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -143,7 +143,7 @@ void WINAPI RoUninitialize(void) /*********************************************************************** * RoGetActivationFactory (combase.@) */ -HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_factory) +HRESULT WINAPI DECLSPEC_HOTPATCH RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_factory) { PFNGETACTIVATIONFACTORY pDllGetActivationFactory; IActivationFactory *factory;

1 0

Zhiyi Zhang : msi: Fix a memory leak (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 4afca1787febb012d0cdd2c007dd32beba35178d URL: https://gitlab.winehq.org/wine/wine/-/commit/4afca1787febb012d0cdd2c007dd32… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:58:04 2023 +0800 msi: Fix a memory leak (Coverity). --- dlls/msi/action.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 575af431854..20da818e686 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5263,9 +5263,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) MSI_RecordSetStringW(record, 0, NULL); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ERROR, record); if (rc == IDCANCEL) + { + msiobj_release(&record->hdr); return ERROR_INSTALL_USEREXIT; + } attrib = GetFileAttributesW(package->db->path); } + msiobj_release(&record->hdr); rc = ERROR_SUCCESS; } else

1 0

Zhiyi Zhang : bcrypt: Fix an possible out-of-bounds read (Coverity).
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: fe7e7c62ee938407e0e411f5fd64637b40bfc2d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe7e7c62ee938407e0e411f5fd6463… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 30 11:52:42 2023 +0800 bcrypt: Fix an possible out-of-bounds read (Coverity). --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 26472cbfe2b..52066a32c74 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -272,7 +272,7 @@ static struct object *get_object( BCRYPT_HANDLE handle, ULONG magic ) } idx = (ULONG_PTR)handle >> 4; - if (idx > ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) + if (idx >= ARRAY_SIZE(pseudo_algorithms) || !pseudo_algorithms[idx].hdr.magic) { FIXME( "pseudo-handle %p not supported\n", handle ); return NULL;

1 0

Alistair Leslie-Hughes : include: Add more D3D_FEATURE_LEVEL_ defines.
by Alexandre Julliard 17 Jan '24

17 Jan '24

Module: wine Branch: master Commit: 7ea0a3609c94868e8298702b42901079daa31f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ea0a3609c94868e8298702b429010… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 4 12:27:13 2024 +1100 include: Add more D3D_FEATURE_LEVEL_ defines. --- include/d3dcommon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 7a53a84079d..5ffb4cd5b5b 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -100,6 +100,7 @@ typedef enum D3D_DRIVER_TYPE typedef enum D3D_FEATURE_LEVEL { + D3D_FEATURE_LEVEL_1_0_CORE = 0x1000, D3D_FEATURE_LEVEL_9_1 = 0x9100, D3D_FEATURE_LEVEL_9_2 = 0x9200, D3D_FEATURE_LEVEL_9_3 = 0x9300, @@ -109,6 +110,7 @@ typedef enum D3D_FEATURE_LEVEL D3D_FEATURE_LEVEL_11_1 = 0xb100, D3D_FEATURE_LEVEL_12_0 = 0xc000, D3D_FEATURE_LEVEL_12_1 = 0xc100, + D3D_FEATURE_LEVEL_12_2 = 0xc200, } D3D_FEATURE_LEVEL; cpp_quote("#define D3D_FL9_1_REQ_TEXTURE1D_U_DIMENSION 2048")

1 0