November 2018 - Wine-commits

Jason Edmeades : cmd: Handle whitespace in 'for' argument items.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 8d8445b6209639e75e92d868ac1ec53cb781ac5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d8445b6209639e75e92d868… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 10 23:30:18 2018 +0100 cmd: Handle whitespace in 'for' argument items. Avoid whitespace affecting the parsing of a for loops items. The leading and trailing quote or backtick needed removing, and it was assumed that the trailing character would be that character, which was wrong when there was whitespace unless the parameter is trimmed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45731 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit becfbb80b4e80680b32cc240b2465e4972590b14) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 8 +++++++- programs/cmd/tests/test_builtins.cmd | 7 ++++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5d1e1b6..752cf43 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2061,17 +2061,22 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd WCHAR temp_str[MAX_PATH]; WCHAR temp_file[MAX_PATH]; WCHAR temp_cmd[MAXSTRING]; + WCHAR *trimmed = NULL; HANDLE hinput = INVALID_HANDLE_VALUE; static const WCHAR redirOutW[] = {'>','%','s','\0'}; static const WCHAR cmdW[] = {'C','M','D','\0'}; static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', '/','C',' ','%','s','\0'}; - /* Remove leading and trailing character */ + /* Remove leading and trailing character (but there may be trailing whitespace too) */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || (iscmd && (itemstr[0] == '\'' && !usebackq)) || (!iscmd && (itemstr[0] == '"' && usebackq))) { + trimmed = WCMD_strtrim(itemstr); + if (trimmed) { + itemstr = trimmed; + } itemstr[strlenW(itemstr)-1] = 0x00; itemstr++; } @@ -2098,6 +2103,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd hinput = CreateFileW(itemstr, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } + heap_free(trimmed); return hinput; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1e4997a..fd63e4e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1630,8 +1630,11 @@ mkdir foobar & cd foobar echo ------ string argument rem NT4 does not support usebackq for /F %%i in ("a b c") do echo %%i +for /F %%i in ( "a b c" ) do echo X%%iX for /f usebackq %%i in ('a b c') do echo %%i>output_file if not exist output_file (echo no output) else (type output_file & del output_file) +for /f usebackq %%i in ( 'a b c' ) do echo X%%iX>output_file +if not exist output_file (echo no output) else (type output_file & del output_file) for /f %%i in ("a ") do echo %%i for /f usebackq %%i in ('a ') do echo %%i>output_file if not exist output_file (echo no output) else (type output_file & del output_file) @@ -1683,9 +1686,11 @@ for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i +for /f %%i in ( 'echo.Passed6' ) do echo %%i +for /f "usebackq" %%i in ( `echo.Passed7` ) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,7) do echo Missing functionality - Broken%%i :ContinueFORF rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a3eca74..30df08a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1165,7 +1165,9 @@ WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] --- for /F ------ string argument a +XaX a(a)or_broken@no output +XaX(a)or_broken@no output a a(a)or_broken@no output a @@ -1203,6 +1205,8 @@ Passed2(a)or_broken@Missing functionality - Broken2 Passed3(a)or_broken@Missing functionality - Broken3 Passed4(a)or_broken@Missing functionality - Broken4 Passed5(a)or_broken@Missing functionality - Broken5 +Passed6(a)or_broken@Missing functionality - Broken6 +Passed7(a)or_broken@Missing functionality - Broken7 ------ eol option and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2

1 0

Jason Edmeades : cmd: Handle unechoed rem commands inside a (..) section.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 12242ae0769864cb46881145d6a5f2c70b3f3fea URL: https://source.winehq.org/git/wine.git/?a=commit;h=12242ae0769864cb46881145… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 10 23:30:20 2018 +0100 cmd: Handle unechoed rem commands inside a (..) section. When processing a (..) multiline section, each line is processed and if it starts with a '@' it is not echoed, but more importantly if is 'rem' then anything else on that line should be ignored. The reported issue was that a pipe was being executed when it was hidden behind a rem, which was trigged by the preceeding '@' character not being skipped. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45729 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f87e25a7bc2a8917091a9d9d93139bb77eb1e154) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + programs/cmd/wcmdmain.c | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index fd63e4e..cf9a986 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1355,6 +1355,12 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- rems inside for loops +for /f %%i IN ("hello") DO ( + REM foo|echo ERROR unexpected execution 1 + @REM foo|echo ERROR unexpected execution 2 + @ REM foo|echo ERROR unexpected execution 3 +) echo --- ifs inside for loops for %%i in (test) do ( echo a1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 30df08a..dd8d1d4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -981,6 +981,7 @@ ErrorLevel 0 -1 1 3 +--- rems inside for loops --- ifs inside for loops a1 b1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5135be4..f1a2679 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2271,12 +2271,21 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } while (*extraData == 0x00); curPos = extraSpace; - if (context) handleExpansion(extraSpace, FALSE, FALSE); + + /* Skip preceding whitespace */ + while (*curPos == ' ' || *curPos == '\t') curPos++; + + /* Replace env vars if in a batch context */ + if (context) handleExpansion(curPos, FALSE, FALSE); + /* Continue to echo commands IF echo is on and in batch program */ - if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + if (context && echo_mode && *curPos && *curPos != '@') { WCMD_output_asis(extraSpace); WCMD_output_asis(newlineW); } + + /* Skip repeated 'no echo' characters and whitespace */ + while (*curPos == '@' || *curPos == ' ' || *curPos == '\t') curPos++; } }

1 0

Henri Verbeet : d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice( ).
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5d756e2020773688743b9e1cf608134553d64e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d756e2020773688743b9e1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 5 03:05:45 2018 +0430 d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6484434cb68cfb497464f9df28a3e1d0c4f8ca3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 52585f0..480e17e 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -63,6 +63,8 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver switch (driver_type) { + case D3D10_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);

1 0

Louis Lenders : pidgen: Add stub for PIDGenSimpW.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 9179d4466e8b92309b8dee175524d08df494f917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9179d4466e8b92309b8dee17… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Sep 6 13:23:29 2018 +0200 pidgen: Add stub for PIDGenSimpW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit db2d831600f9677f81023d639d30f21fcfa29eb3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165ea..95f5389 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778..aba0107 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW

1 0

Alistair Leslie-Hughes : mfplat: Forward IMFMediaType to IMFAttributes.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 92c399b19982a0f29d1bd5573d9e2d68d3532768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c399b19982a0f29d1bd557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 00:19:07 2018 +0000 mfplat: Forward IMFMediaType to IMFAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 71dec0996070bda9b9562e67e7a46ac8f4c59604) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/main.c | 170 ++++++++++++++--------------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92c399b19982a0f29d1b…

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateSample.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: f1dd23ca094039b3da2c1f81b2239dc755d8c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1dd23ca094039b3da2c1f81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:11 2018 +0000 mfplat: Implement MFCreateSample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0826c016142ba669f5836bb34685147fdd4a697) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1dd23ca094039b3da2c…

1 0

Jactry Zeng : ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 21fda36997313fea5b888673808596df68e8524d URL: https://source.winehq.org/git/wine.git/?a=commit;h=21fda36997313fea5b888673… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 4 20:57:06 2018 +0800 ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68e35eb7456e68d4233ffc5e795511823a45ba6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21fda36997313fea5b88…

1 0

Piotr Caban : msvcp140: Add _Last_write_time implementation.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 65e6059b2149180f9becb2844512724850a7acb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e6059b2149180f9becb284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:43:34 2018 +0200 msvcp140: Add _Last_write_time implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a9c5ab9da6a94d56516548ead274dd5bd145a78c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/ios.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f4bdbd1..0efd785 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3666,7 +3666,7 @@ @ extern _LNan _LNan @ stub _LSinh @ extern _LSnan _LSnan -@ stub _Last_write_time +@ cdecl _Last_write_time(int64) @ cdecl _Link(wstr wstr) tr2_sys__Link_wchar @ cdecl _Lock_shared_ptr_spin_lock() @ cdecl _Lstat(wstr ptr) @@ -3696,7 +3696,7 @@ @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ stub _Rename @ stub _Resize -@ stub _Set_last_write_time +@ cdecl _Set_last_write_time(wstr int64) @ stub _Sinh @ extern _Snan _Snan @ cdecl _Stat(wstr ptr) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d7de542..cafc85d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14851,7 +14851,7 @@ static __int64 get_last_write_time(HANDLE h) __int64 ret; if(!GetFileTime(h, 0, 0, &wt)) - return 0; + return -1; ret = (((__int64)wt.dwHighDateTime)<< 32) + wt.dwLowDateTime; ret -= TICKS_1601_TO_1970; @@ -14877,9 +14877,8 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) return ret / TICKSPERSEC; } -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ -__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +/* _Last_write_time */ +__int64 __cdecl _Last_write_time(const wchar_t *path) { HANDLE handle; __int64 ret; @@ -14889,11 +14888,19 @@ __int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) handle = CreateFileW(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return 0; + return -1; ret = get_last_write_time(handle); CloseHandle(handle); - return ret / TICKSPERSEC; + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ +__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return _Last_write_time(path) / TICKSPERSEC; } static int set_last_write_time(HANDLE h, __int64 time) @@ -14928,11 +14935,11 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ -/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ -void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +/* _Set_last_write_time */ +int __cdecl _Set_last_write_time(const wchar_t *path, __int64 time) { HANDLE handle; + int ret; TRACE("(%s)\n", debugstr_w(path)); @@ -14940,10 +14947,19 @@ void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 tim FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); if(handle == INVALID_HANDLE_VALUE) - return; + return 0; - set_last_write_time(handle, time * TICKSPERSEC); + ret = set_last_write_time(handle, time); CloseHandle(handle); + return ret; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ +void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +{ + TRACE("(%s)\n", debugstr_w(path)); + _Set_last_write_time(path, time * TICKSPERSEC); } /* ??_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z */

1 0

Hugh McMaster : regedit: Use the correct window class name.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5baee68c2964dfda31923fd6a00e281823dfd579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5baee68c2964dfda31923fd6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 19 13:21:24 2018 +0000 regedit: Use the correct window class name. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6bca0abb68016df0fe31a1568cc6f8f744caeb92) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regedit/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 460a951..19d720d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -62,7 +62,7 @@ const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C', #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; -const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; +const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0}; const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)

1 0

Fabian Maurer : ntoskrnl: Emulate sti/cli instructions on x86_64.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: fe14404e25c6bcd8d820071e7e6b49585a0e39af URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe14404e25c6bcd8d820071e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 2 17:08:37 2018 +0200 ntoskrnl: Emulate sti/cli instructions on x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45521 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d509b1579ef46638875cc87ec29f937123f8f52c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index aef0ed0..bf1fa3f 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -829,6 +829,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } break; /* Unable to emulate it */ } + + case 0xfa: /* cli */ + case 0xfb: /* sti */ + context->Rip += prefixlen + 1; + return ExceptionContinueExecution; } return ExceptionContinueSearch; /* Unable to emulate it */ }

1 0