August 2021 - Wine-Devel - list.winehq.org

[v2 PATCH] d3dcompiler/tests: Add a D3DDisassemble() test with sm2 shader.
by Nikolay Sivov Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fix failures on Wine dlls/d3dcompiler_43/tests/asm.c | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 749b1153267..bc5af487627 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -31,6 +31,7 @@ static HRESULT (WINAPI *pD3DAssemble)(const void *data, SIZE_T datasize, const c const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT flags, ID3DBlob **shader, ID3DBlob **error_messages); static pD3DPreprocess ppD3DPreprocess; +static pD3DDisassemble ppD3DDisassemble; struct shader_test { const char *text; @@ -1721,6 +1722,41 @@ static void d3dpreprocess_test(void) if (shader) ID3D10Blob_Release(shader); } +static const DWORD vs_2_0[] = +{ + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ + 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ + 0x0200001f, 0x80000005, 0x900f0003, /* dcl_texcoord0 v3 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0001, 0x90e40002, /* mov oD1, v2 */ + 0x02000001, 0xe0070000, 0x90e40003, /* mov oT0.xyz, v3 */ + 0x02000001, 0xc00f0001, 0x90ff0002, /* mov oFog, v2.w */ + 0x02000001, 0xc00f0002, 0x90ff0001, /* mov oPts, v1.w */ + 0x0000ffff +}; + +static void test_disassemble_shader(void) +{ + ID3DBlob *blob; + HRESULT hr; + + hr = ppD3DDisassemble(vs_2_0, 0, 0, NULL, &blob); +todo_wine +#if D3D_COMPILER_VERSION == 47 + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); +#else + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); +#endif + + hr = ppD3DDisassemble(vs_2_0, sizeof(vs_2_0), 0, NULL, &blob); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); +} + static BOOL load_d3dcompiler(void) { HMODULE module; @@ -1733,6 +1769,7 @@ static BOOL load_d3dcompiler(void) pD3DAssemble = (void*)GetProcAddress(module, "D3DAssemble"); ppD3DPreprocess = (void*)GetProcAddress(module, "D3DPreprocess"); + ppD3DDisassemble = (void *)GetProcAddress(module, "D3DDisassemble"); return TRUE; } @@ -1761,4 +1798,5 @@ START_TEST(asm) assembleshader_test(); d3dpreprocess_test(); + test_disassemble_shader(); } -- 2.32.0

2 1

[PATCH] d3dx9: Forward D3DXDisassembleShader() to d3dcompiler.
by Nikolay Sivov Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6dc145a4faa..02fca402f86 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2338,10 +2338,13 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample return D3D_OK; } -HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, ID3DXBuffer **disassembly) +HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments, + ID3DXBuffer **buffer) { - FIXME("%p %d %s %p: stub\n", shader, colorcode, debugstr_a(comments), disassembly); - return E_OUTOFMEMORY; + TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer); + + return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0, + comments, (ID3DBlob **)buffer); } struct d3dx9_texture_shader -- 2.32.0

2 1

[PATCH] d3dx10_40/tests: Enable tests.
by Nikolay Sivov Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_40/Makefile.in | 1 + dlls/d3dx10_40/tests/Makefile.in | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 dlls/d3dx10_40/tests/Makefile.in diff --git a/configure.ac b/configure.ac index f139c59be74..594794ed93c 100644 --- a/configure.ac +++ b/configure.ac @@ -3086,6 +3086,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index af15cc5c921..3f1c534702a 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_40.dll +IMPORTLIB = d3dx10_40 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_40/tests/Makefile.in b/dlls/d3dx10_40/tests/Makefile.in new file mode 100644 index 00000000000..ba566ff908d --- /dev/null +++ b/dlls/d3dx10_40/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_40.dll +IMPORTS = d3dx10_40 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.32.0

2 1

[PATCH] d3dx10: Remove redundant NULL check before heap_free()
by Michael Stefaniuc Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder) -- 2.31.1

2 1

[PATCH vkd3d] Cleanup HLSL context during error path.
by Giovanni Mascellani Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d9186ae..40731e67 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1821,6 +1821,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Entry point \"%s\" is not defined.", entry_point); + hlsl_ctx_cleanup(&ctx); return VKD3D_ERROR_INVALID_SHADER; } -- 2.33.0

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 92 +++++++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index a5e42fd9831..f55f847a4c7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "Sikkerhet" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "Br&ukernavn:" +msgstr "&Gruppe eller brukernavn:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Gul" +msgstr "Tillat" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Nekt" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Tilgang nektet.\n" +msgstr "Tilgang for %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3769,7 +3763,7 @@ msgstr "Spillkontrollere" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Test og konfigurer spillkontrollere." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3875,7 +3869,7 @@ msgstr "Forventet '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompileringsfeil" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" @@ -6969,38 +6963,28 @@ msgid "Connection reset by peer.\n" msgstr "Tilkobling nullstilt av likemann.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ikke implementert" +msgstr "Ikke implementert.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kall feilet.\n" +msgstr "Kall feilet.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Fant ingen signatur i filen.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ugyldig nivå.\n" +msgstr "Ugyldig kall.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Verdi er ikke tilgjengelig.\n" +msgstr "Ressursen er for øyeblikket ikke tilgjengelig.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenavn:" +msgstr "Klassisk Blå" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -9200,32 +9184,24 @@ msgid "Provider" msgstr "Tilbyder" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Velg data du ønsker å koble til:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Nettverksforbindelser" +msgstr "Nettverksforbindelse" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Spesifiser følgende for å koble til ODBC-data:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Spesifiser datakilden:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Skriv inn navnet ditt" +msgstr "Bruk &datakilde-navnet" #: dlls/oledb32/version.rc:74 #, fuzzy @@ -9250,64 +9226,48 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "Br&ukernavn:" +msgstr "Bruker&navn:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tom side" +msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Feil passord.\n" +msgstr "Tillat lagring av pa%ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Tilbakestill tilkoblinger" +msgstr "&Test tilkobling" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avansert" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Nettverksressurs" +msgstr "Nettverksinnstillinger" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Ugyldig personifiseringsnivå.\n" +msgstr "Person&ifiseringsnivå:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Tilkoblet" +msgstr "Koble til:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sekunder" +msgstr "sekunder." #: dlls/oledb32/version.rc:104 #, fuzzy @@ -10371,7 +10331,7 @@ msgstr "Nedlastinger" #: dlls/shell32/shell32.rc:169 msgid "Unable to create new Folder: Permission denied." -msgstr "Kunne ikke opprette ny mappe: tilgang nektet." +msgstr "Kunne ikke opprette ny mappe: Tilgang nektet." #: dlls/shell32/shell32.rc:170 msgid "Error during creation of a new folder" @@ -13957,7 +13917,7 @@ msgstr "Ethernet" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "TIlkoblingsspesifikt DNS-suffiks" +msgstr "Tilkoblingsspesifikt DNS-suffiks" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address" -- 2.30.2

1 0

[PATCH 2/2] ntdll: Remove unnecessary casts on macOS registers.
by Huw Davies Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e033a3987ee..1c1022886fc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -313,8 +313,8 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define SS_sig(context) ((context)->uc_mcontext->__ss.__ss) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) +#define EIP_sig(context) ((context)->uc_mcontext->__ss.__eip) +#define ESP_sig(context) ((context)->uc_mcontext->__ss.__esp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) NULL diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8065f1b8220..a9bdbf62929 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -229,8 +229,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) -#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) -#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) +#define RIP_sig(context) ((context)->uc_mcontext->__ss.__rip) +#define RSP_sig(context) ((context)->uc_mcontext->__ss.__rsp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw) -- 2.23.0

1 0

[PATCH 1/2] ntdll: Remove old macOS register names.
by Huw Davies Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7067435bf0b..e033a3987ee 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -299,8 +299,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <i386/user_ldt.h> -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32) #define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax) #define EBX_sig(context) ((context)->uc_mcontext->__ss.__ebx) #define ECX_sig(context) ((context)->uc_mcontext->__ss.__ecx) @@ -322,29 +320,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define FPU_sig(context) NULL #define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->__fs.__fpu_fcw) #define XState_sig(context) NULL /* FIXME */ -#else -#define EAX_sig(context) ((context)->uc_mcontext->ss.eax) -#define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) -#define ECX_sig(context) ((context)->uc_mcontext->ss.ecx) -#define EDX_sig(context) ((context)->uc_mcontext->ss.edx) -#define ESI_sig(context) ((context)->uc_mcontext->ss.esi) -#define EDI_sig(context) ((context)->uc_mcontext->ss.edi) -#define EBP_sig(context) ((context)->uc_mcontext->ss.ebp) -#define CS_sig(context) ((context)->uc_mcontext->ss.cs) -#define DS_sig(context) ((context)->uc_mcontext->ss.ds) -#define ES_sig(context) ((context)->uc_mcontext->ss.es) -#define FS_sig(context) ((context)->uc_mcontext->ss.fs) -#define GS_sig(context) ((context)->uc_mcontext->ss.gs) -#define SS_sig(context) ((context)->uc_mcontext->ss.ss) -#define EFL_sig(context) ((context)->uc_mcontext->ss.eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) -#define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext->es.err) -#define FPU_sig(context) NULL -#define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->fs.fpu_fcw) -#define XState_sig(context) NULL /* FIXME */ -#endif #elif defined(__NetBSD__) -- 2.23.0

1 0

[PATCH] ntoskrnl.exe: Implement PsGetCurrentProcessSessionId
by Alistair Leslie-Hughes Aug. 27, 2021

Aug. 27, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1248300683..5c3a42c3d76 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3008,6 +3008,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 071dae6ceca..0208e2f633f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode -- 2.32.0

1 0

[PATCH] cmd: Ensure new volume label is null-terminated (Coverity)
by Alex Henrie Aug. 27, 2021

Aug. 27, 2021

The command `echo | wine cmd /k 'label c:'` causes WCMD_ReadFile to return the single character '\n' without a null terminator, which would then cause garbage to be written to ~/.wine/drive_c/.windows-label. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..62ace7510a1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4716,8 +4716,8 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (count > 1) { - string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } if (*path) { -- 2.33.0

1 0