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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: wine Branch: master Commit: 762dda3837b7ec19062fe845aa8845cd6ad8bdb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/762dda3837b7ec19062fe845aa8845… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jul 27 21:32:14 2023 +0300 po: Update Finnish translation. --- po/fi.po | 135 ++++++++++++++++----------------------------------------------- 1 file changed, 33 insertions(+), 102 deletions(-) diff --git a/po/fi.po b/po/fi.po index 761fd602a18..4e433e14a6f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -320,7 +320,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "Odota, että nykyinen poisto- tai muokkausprosessi päättyy." #: dlls/avifil32/avifil32.rc:42 msgid "Compress options" @@ -3706,16 +3706,12 @@ msgid "High" msgstr "Korkea" #: dlls/ir50_32/ir50_32.rc:28 -#, fuzzy -#| msgid "Index" msgid "Indeo5" -msgstr "Sisällys" +msgstr "Indeo5" #: dlls/ir50_32/ir50_32.rc:29 -#, fuzzy -#| msgid "Wine Video 1 video codec" msgid "Indeo Video Interactive version 5 video codec" -msgstr "Winen Video 1 -videokoodekki" +msgstr "Indeo Video Interactive versio 5 -videokoodekki" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks" @@ -4015,10 +4011,8 @@ msgid "Syntax error in regular expression" msgstr "Syntaksivirhe säännöllisessä lausekkeessa" #: dlls/jscript/jscript.rc:66 -#, fuzzy -#| msgid "Expected identifier" msgid "Unexpected quantifier" -msgstr "Odotettiin tunnistetta" +msgstr "Odottamaton määre" #: dlls/jscript/jscript.rc:67 msgid "Exception thrown and not caught" @@ -4080,10 +4074,8 @@ msgid "'this' is not a | object" msgstr "'this' ei ole |-objekti" #: dlls/jscript/jscript.rc:81 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'key' is not an object" -msgstr "'this' ei ole |-objekti" +msgstr "'key' ei ole objekti" #: dlls/jscript/jscript.rc:82 msgid "Property cannot have both accessors and a value" @@ -14697,24 +14689,20 @@ msgid "&Run..." msgstr "&Suorita..." #: programs/findstr/findstr.rc:28 -#, fuzzy -#| msgid "Use c&onnection string" msgid "Usage: findstr /options string\n" -msgstr "Syötä yhteysasetukset &merkkijonona" +msgstr "Käyttö: findstr /asetukset merkkijono\n" #: programs/findstr/findstr.rc:29 -#, fuzzy -#| msgid "Invalid command line.\n" msgid "FINDSTR: Bad command line\n" -msgstr "Komentorivi ei kelpaa.\n" +msgstr "FINDSTR: Komentorivi ei kelpaa\n" #: programs/findstr/findstr.rc:30 msgid "FINDSTR: Cannot open %s\n" -msgstr "" +msgstr "FINDSTR: Tiedostoa %s ei voi avata\n" #: programs/findstr/findstr.rc:31 msgid "FINDSTR: /%c ignored\n" -msgstr "" +msgstr "FINDSTR: /%c ohitettu\n" #: programs/fsutil/fsutil.mc:28 msgid "" @@ -14832,52 +14820,39 @@ msgstr "Ensisijainen DNS-liite" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" -msgstr "" +msgstr "Käyttö: klist <tickets | tgt | purge | get [palvelun päänimi (SPN)]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "Tuntematon virhe" +msgstr "Tuntematon virhe\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Käynnistä-valikko" +msgstr "Alkamisaika" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "Suomen normaaliaika" +msgstr "Päättymisaika" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "Syötä uusi aika: " +msgstr "Uudistamisaika" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "Tiketin liput" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "Välimuistissa olevat tiketit" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "Salauksen tyyppi" +msgstr "KerbTicketin salauksen tyyppi" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "Yhteyksiä nyt" +msgstr "Nykyinen LogonId on" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -17165,38 +17140,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL:n '%1' asennus purettu\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17249,6 +17192,7 @@ msgstr "" "/belownormal Käynnistä ohjelma prioriteetilla 'normaalia matalampi'.\n" "/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" "/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" +"/machine arkk. Käytä väkisin tätä arkkitehtuuria (x86,arm,amd64,arm64).\n" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" "/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin\n" " Windows Explorer avaisi sen.\n" @@ -17329,27 +17273,26 @@ msgid "Error: Process self-termination is not permitted.\n" msgstr "Virhe: Prosessin itsensä sulkemista ei sallita.\n" #: programs/taskkill/taskkill.rc:44 -#, fuzzy -#| msgid "Process with PID %1!u! was forcibly terminated.\n" msgid "" "The process with PID %1!u! (child process of PID %2!u!) has been " "terminated.\n" -msgstr "Prosessi PID %1!u! suljettiin väkisin.\n" +msgstr "Prosessi PID %1!u! (prosessin PID %2!u! lapsi) suljettiin " +"väkisin.\n" #: programs/taskkill/taskkill.rc:45 msgid "" "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n" msgstr "" +"Lähetettiin lopetussignaali prosessille PID %1!u! (prosessin PID %2!u! " +"lapsi).\n" #: include/wine/wine_common_ver.rc:138 -#, fuzzy -#| msgid "page tab list" msgid "Wine tasklist" -msgstr "välilehtilista" +msgstr "Winen tehtävälista" #: programs/tasklist/tasklist.rc:29 msgid "Usage: tasklist [/?]\n" -msgstr "" +msgstr "Käyttö: tasklist [/?]\n" #: programs/tasklist/tasklist.rc:30 programs/taskmgr/taskmgr.rc:272 msgid "Image Name" @@ -17360,38 +17303,28 @@ msgid "PID" msgstr "PID" #: programs/tasklist/tasklist.rc:32 -#, fuzzy -#| msgid "Session ID" msgid "Session Name" -msgstr "Istunnon ID" +msgstr "Istunnon nimi" #: programs/tasklist/tasklist.rc:33 -#, fuzzy -#| msgid "Session ID" msgid "Session#" -msgstr "Istunnon ID" +msgstr "Istunto#" #: programs/tasklist/tasklist.rc:34 programs/taskmgr/taskmgr.rc:276 msgid "Mem Usage" msgstr "Muistin käyttö" #: programs/tasklist/tasklist.rc:35 -#, fuzzy -#| msgid "OK" msgid "K" -msgstr "OK" +msgstr "K" #: programs/tasklist/tasklist.rc:36 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "ERROR: Invalid syntax\n" -msgstr "reg: Syntaksi ei kelpaa. " +msgstr "VIRHE: Syntaksi ei kelpaa\n" #: programs/tasklist/tasklist.rc:37 -#, fuzzy -#| msgid "The filename cannot be resolved.\n" msgid "ERROR: The search filter cannot be recognized.\n" -msgstr "Tiedostonimeä ei pystytä tulkitsemaan.\n" +msgstr "VIRHE: Haun suodatinta ei tunnistettu.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18519,7 +18452,7 @@ msgstr "&Teema:" #: programs/winecfg/winecfg.rc:295 msgid "&WinRT app theme:" -msgstr "" +msgstr "&WinRT-sovellusten teema:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18642,14 +18575,12 @@ msgid "Mono" msgstr "Mono" #: programs/winecfg/winecfg.rc:98 -#, fuzzy -#| msgid "Right" msgid "Light" -msgstr "Oikea" +msgstr "Vaalea" #: programs/winecfg/winecfg.rc:99 msgid "Dark" -msgstr "" +msgstr "Tumma" #: programs/winecfg/winecfg.rc:53 msgid ""

1 0

Rémi Bernon : winegstreamer: Avoid releasing wg_allocator memory samples twice.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: wine Branch: master Commit: 1b5ddc1e2f9e4dc4bbda2318e8e13adc6067ba52 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b5ddc1e2f9e4dc4bbda2318e8e13a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 25 11:17:12 2023 +0200 winegstreamer: Avoid releasing wg_allocator memory samples twice. When the sample size is too small, we were releasing it from the memory, but kept the next_sample pointer set. Later, when the transform removes the sample from the allocator, its refcount was decremented one more time, effectively leaking the sample. --- dlls/winegstreamer/wg_allocator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c index 5cc2a6fcf12..a46a3de142a 100644 --- a/dlls/winegstreamer/wg_allocator.c +++ b/dlls/winegstreamer/wg_allocator.c @@ -196,9 +196,9 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, pthread_mutex_lock(&allocator->mutex); memory->sample = allocator->next_sample; - if (memory->sample && memory->sample->max_size >= size) - allocator->next_sample = NULL; - else + allocator->next_sample = NULL; + + if (memory->sample && memory->sample->max_size < size) release_memory_sample(allocator, memory, true); list_add_tail(&allocator->memory_list, &memory->entry);

1 0

Hans Leidekker : winscard: Handle different type sizes on macOS.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: wine Branch: master Commit: a577d28a8b8176636b1dec9b95d0aaf2be2a6fb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a577d28a8b8176636b1dec9b95d0aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 28 10:07:56 2023 +0200 winscard: Handle different type sizes on macOS. --- dlls/winscard/unixlib.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 182 insertions(+), 5 deletions(-)

1 0

Gabriel Ivăncescu : win32u: Don't clip captured mouse pointer if it's done by the system.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: wine Branch: master Commit: 19d2dc0dfc22d0fc1255a462be6494906b9bd3e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/19d2dc0dfc22d0fc1255a462be6494… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 27 16:30:04 2023 +0300 win32u: Don't clip captured mouse pointer if it's done by the system. We have similar checks in X11DRV_SetCapture for example, where this would have been moved before the merge to win32u. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55231 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/win32u/input.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 0c462f42675..1f9e48423fc 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2461,6 +2461,13 @@ BOOL WINAPI NtUserIsMouseInPointerEnabled(void) return FALSE; } +static BOOL is_captured_by_system(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) && info.hwndCapture && (info.flags & (GUI_INMOVESIZE | GUI_INMENUMODE)); +} + /*********************************************************************** * clip_fullscreen_window * @@ -2486,7 +2493,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!NtUserGetWindowRect( hwnd, &rect )) return FALSE; if (!NtUserIsWindowRectFullScreen( &rect )) return FALSE; - if (get_capture()) return FALSE; + if (is_captured_by_system()) return FALSE; if (NtGetTickCount() - thread_info->clipping_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_info->clipping_cursor) return FALSE; /* already clipping */

1 0

Nikolay Sivov : tests: Add some tests for GetDimensions().
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: vkd3d Branch: master Commit: 18731d71a692deda97d364a9ab7d805ce75be57e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18731d71a692deda97d364a9ab7d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 18:21:59 2023 +0200 tests: Add some tests for GetDimensions(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl/getdimensions.shader_test | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/Makefile.am b/Makefile.am index b5e77f4e..ecb7c7e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ vkd3d_shader_tests = \ tests/hlsl/function.shader_test \ tests/hlsl/gather-offset.shader_test \ tests/hlsl/gather.shader_test \ + tests/hlsl/getdimensions.shader_test \ tests/hlsl/initializer-flatten.shader_test \ tests/hlsl/initializer-implicit-array.shader_test \ tests/hlsl/initializer-invalid-arg-count.shader_test \ diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test new file mode 100644 index 00000000..f8cf8b71 --- /dev/null +++ b/tests/hlsl/getdimensions.shader_test @@ -0,0 +1,57 @@ +[require] +shader model >= 4.0 + +[texture 0] +size (2, 3) + +1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 +1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 + +[pixel shader todo] +Texture2D t : register(t0); + +float4 main() : sv_target +{ + uint u1, u2; + float f1, f2; + float4 ret; + + t.GetDimensions(u1, u2); + t.GetDimensions(f1, f2); + ret.x = u1; + ret.y = f2; + t.GetDimensions(u1, f2); + ret.z = u1; + t.GetDimensions(f1, u2); + ret.w = u2; + return ret; +} + +[test] +todo draw quad +todo probe all rgba (2.0, 3.0, 2.0, 3.0) + +[texture 1] +size (2, 2) +levels 2 + +1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 +1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 + +0.0 0.0 1.0 0.0 + +[pixel shader todo] +Texture2D t : register(t1); + +float4 main() : sv_target +{ + float4 ret; + + t.GetDimensions(ret.x, ret.y); + t.GetDimensions(1, ret.z, ret.z, ret.w); + return ret; +} + +[test] +todo draw quad +todo probe all rgba (2.0, 2.0, 1.0, 2.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse GetDimensions() method.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: vkd3d Branch: master Commit: d50b5fe767243eda64fcc7380fc272b8a7a59652 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d50b5fe767243eda64fcc7380fc27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 19:56:02 2023 +0200 vkd3d-shader/hlsl: Parse GetDimensions() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 9 +- libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl.y | 188 ++++++++++++++++++++++++++++++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 5 +- libs/vkd3d-shader/tpf.c | 5 ++ 5 files changed, 204 insertions(+), 5 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/tpf: Add support for writing 'sampleinfo' instruction.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: vkd3d Branch: master Commit: 78719dc8149a64d2597b84b169d1cbf3c2efc016 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78719dc8149a64d2597b84b169d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 19:58:31 2023 +0200 vkd3d-shader/tpf: Add support for writing 'sampleinfo' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c5bd2bd8..888d920f 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4299,6 +4299,29 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm4_instruction(buffer, &instr); } +static void write_sm4_sampleinfo(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_ir_resource_load *load) +{ + const struct hlsl_deref *resource = &load->resource; + const struct hlsl_ir_node *dst = &load->node; + struct sm4_instruction instr; + + assert(dst->data_type->base_type == HLSL_TYPE_UINT || dst->data_type->base_type == HLSL_TYPE_FLOAT); + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_SAMPLE_INFO; + if (dst->data_type->base_type == HLSL_TYPE_UINT) + instr.opcode |= VKD3DSI_SAMPLE_INFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + + sm4_dst_from_node(&instr.dsts[0], dst); + instr.dst_count = 1; + + sm4_src_from_deref(ctx, &instr.srcs[0], resource, instr.dsts[0].writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static bool type_is_float(const struct hlsl_type *type) { return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; @@ -5119,6 +5142,9 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE_INFO: + write_sm4_sampleinfo(ctx, buffer, load); + break; + case HLSL_RESOURCE_RESINFO: hlsl_fixme(ctx, &load->node.loc, "Unsupported load type %u.\n", load->load_type); break;

1 0

Nikolay Sivov : vkd3d-shader/tpf: Add support for writing 'resinfo' instruction.
by Alexandre Julliard 31 Jul '23

31 Jul '23

Module: vkd3d Branch: master Commit: bfdd5c142d2e59b4785111ef8134c2ca36fb8a4e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bfdd5c142d2e59b4785111ef8134c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 7 20:34:59 2023 +0200 vkd3d-shader/tpf: Add support for writing 'resinfo' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 26 +++++++++++++++++++++++++- tests/hlsl/getdimensions.shader_test | 12 ++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 888d920f..f3ca223c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4322,6 +4322,30 @@ static void write_sm4_sampleinfo(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buf write_sm4_instruction(buffer, &instr); } +static void write_sm4_resinfo(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_ir_resource_load *load) +{ + const struct hlsl_deref *resource = &load->resource; + const struct hlsl_ir_node *dst = &load->node; + struct sm4_instruction instr; + + assert(dst->data_type->base_type == HLSL_TYPE_UINT || dst->data_type->base_type == HLSL_TYPE_FLOAT); + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_RESINFO; + if (dst->data_type->base_type == HLSL_TYPE_UINT) + instr.opcode |= VKD3DSI_RESINFO_UINT << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT; + + sm4_dst_from_node(&instr.dsts[0], dst); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], load->lod.node, VKD3DSP_WRITEMASK_ALL); + sm4_src_from_deref(ctx, &instr.srcs[1], resource, instr.dsts[0].writemask); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static bool type_is_float(const struct hlsl_type *type) { return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; @@ -5146,7 +5170,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_RESINFO: - hlsl_fixme(ctx, &load->node.loc, "Unsupported load type %u.\n", load->load_type); + write_sm4_resinfo(ctx, buffer, load); break; } } diff --git a/tests/hlsl/getdimensions.shader_test b/tests/hlsl/getdimensions.shader_test index f8cf8b71..4d781b32 100644 --- a/tests/hlsl/getdimensions.shader_test +++ b/tests/hlsl/getdimensions.shader_test @@ -7,7 +7,7 @@ size (2, 3) 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0 0.0 -[pixel shader todo] +[pixel shader] Texture2D t : register(t0); float4 main() : sv_target @@ -28,8 +28,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2.0, 3.0, 2.0, 3.0) +draw quad +probe all rgba (2.0, 3.0, 2.0, 3.0) [texture 1] size (2, 2) @@ -40,7 +40,7 @@ levels 2 0.0 0.0 1.0 0.0 -[pixel shader todo] +[pixel shader] Texture2D t : register(t1); float4 main() : sv_target @@ -53,5 +53,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (2.0, 2.0, 1.0, 2.0) +draw quad +probe all rgba (2.0, 2.0, 1.0, 2.0)

1 0

Rémi Bernon : imm32: Hide the composition window if the string is empty.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 428120441bd39f9311d75aa6ebad97d342837f45 URL: https://gitlab.winehq.org/wine/wine/-/commit/428120441bd39f9311d75aa6ebad97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 11:35:19 2023 +0200 imm32: Hide the composition window if the string is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55258 --- dlls/imm32/ime.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 0470f3b6d6c..60672b366ab 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -98,6 +98,8 @@ static void input_context_set_comp_str( INPUTCONTEXT *ctx, const WCHAR *str, UIN UINT size; BYTE *dst; + TRACE( "ctx %p, str %s\n", ctx, debugstr_wn( str, len ) ); + size = sizeof(*compstr); size += len * sizeof(WCHAR); /* GCS_COMPSTR */ size += len; /* GCS_COMPSTRATTR */ @@ -310,20 +312,17 @@ static void ime_ui_paint( HIMC himc, HWND hwnd ) static void ime_ui_update_window( INPUTCONTEXT *ctx, HWND hwnd ) { - COMPOSITIONSTRING *string; - - if (ctx->hCompStr) string = ImmLockIMCC( ctx->hCompStr ); - else string = NULL; + WCHAR *str; + UINT len; - if (!string || string->dwCompStrLen == 0) + if (!(str = input_context_get_comp_str( ctx, FALSE, &len )) || !*str) ShowWindow( hwnd, SW_HIDE ); else { ShowWindow( hwnd, SW_SHOWNOACTIVATE ); RedrawWindow( hwnd, NULL, NULL, RDW_ERASENOW | RDW_INVALIDATE ); } - - if (string) ImmUnlockIMCC( ctx->hCompStr ); + free( str ); ctx->hWnd = GetFocus(); }

1 0

Francois Gouget : dxgi: Fix a typo in a comment.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: aeeaad0ea5cec70a9fd1761a82929933ed0c541d URL: https://gitlab.winehq.org/wine/wine/-/commit/aeeaad0ea5cec70a9fd1761a829299… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 26 11:41:39 2023 +0200 dxgi: Fix a typo in a comment. --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 64c5958f780..d567056062e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2180,7 +2180,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (swapchain->frame_latency_fence) { /* Use the same bias as d3d12_swapchain_present(). Add one to - * account for the "++swapchain->frame_numer" there. */ + * account for the "++swapchain->frame_number" there. */ uint64_t number = op->present.frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS + 1; if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue,

1 0