- Wine-Devel - list.winehq.org

[PATCH] control: Use wide-char string literals.
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/control/control.c | 52 ++++++++++++-------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 9f9005f7488..df23016bce3 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -26,26 +26,6 @@ #include <windows.h> #include <shellapi.h> -/* alphabetical list of recognized optional command line parameters */ -static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0}; -static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0}; -static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0}; -static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0}; -static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0}; -static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0}; -static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0}; -static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; - -/* alphabetical list of appropriate commands to execute */ -static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; -static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; -static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; -static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; -static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0}; -static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0}; -static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0}; - extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); @@ -63,22 +43,22 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nC } /* check for optional parameter */ - if (!lstrcmpiW(lpszCmdLine,szP_COLOR)) - launch(szC_COLOR); - if (!lstrcmpiW(lpszCmdLine,szP_DATETIME)) - launch(szC_DATETIME); - if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP)) - launch(szC_DESKTOP); - if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL)) - launch(szC_INTERNATIONAL); - if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD)) - launch(szC_KEYBOARD); - if (!lstrcmpiW(lpszCmdLine,szP_MOUSE)) - launch(szC_MOUSE); - if (!lstrcmpiW(lpszCmdLine,szP_PORTS)) - launch(szC_PORTS); - if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS)) - launch(szC_PRINTERS); + if (!lstrcmpiW(lpszCmdLine, L"COLOR")) + launch(L"desk.cpl,,2"); + if (!lstrcmpiW(lpszCmdLine, L"DATE/TIME")) + launch(L"timedate.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"DESKTOP")) + launch(L"desk.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"INTERNATIONAL")) + launch(L"intl.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"KEYBOARD")) + launch(L"main.cpl @1"); + if (!lstrcmpiW(lpszCmdLine, L"MOUSE")) + launch(L"main.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"PORTS")) + launch(L"sysdm.cpl,,1"); + if (!lstrcmpiW(lpszCmdLine, L"PRINTERS")) + launch(L"main.cpl @2"); /* try to launch if a .cpl file is given directly */ launch(lpszCmdLine); -- 2.26.2

1 0

[PATCH] clock: Use wide-char string literals.
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/clock/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 3ad636be431..43364745ea5 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -104,10 +104,9 @@ static BOOL CLOCK_ResetTimer(void) period = 1000; if (!SetTimer (Globals.hMainWnd, TIMER_ID, period, NULL)) { - static const WCHAR notimersW[] = {'N','o',' ','a','v','a','i','l','a','b','l','e',' ','t','i','m','e','r','s',0}; WCHAR szApp[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, MAX_STRING_LEN); - MessageBoxW(0, notimersW, szApp, MB_ICONEXCLAMATION | MB_OK); + MessageBoxW(0, L"No available timers", szApp, MB_ICONEXCLAMATION | MB_OK); return FALSE; } return TRUE; @@ -390,9 +389,6 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; - static const WCHAR szClassName[] = {'C','L','C','l','a','s','s',0}; - static const WCHAR szWinName[] = {'C','l','o','c','k',0}; - /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; @@ -408,13 +404,13 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = 0; class.lpszMenuName = 0; - class.lpszClassName = szClassName; + class.lpszClassName = L"CLClass"; } - + if (!RegisterClassW(&class)) return FALSE; - + Globals.MaxX = Globals.MaxY = INITIAL_WINDOW_SIZE; - Globals.hMainWnd = CreateWindowW(szClassName, szWinName, WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowW(L"CLClass", L"Clock", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, Globals.MaxX, Globals.MaxY, 0, 0, hInstance, 0); -- 2.26.2

1 0

[PATCH] cabarc: Use wide-char string literals.
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cabarc/cabarc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index d244d6ce27e..3eb28fe9083 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -470,7 +470,6 @@ static BOOL add_file( HFCI fci, WCHAR *name ) static BOOL add_directory( HFCI fci, WCHAR *dir ) { - static const WCHAR wildcardW[] = {'*',0}; WCHAR *p, *buffer; HANDLE handle; WIN32_FIND_DATAW data; @@ -480,7 +479,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - lstrcpyW( p, wildcardW ); + lstrcpyW( p, L"*" ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -524,7 +523,6 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { - static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -550,7 +548,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!lstrcmpW( *file, plusW )) + if (!lstrcmpW( *file, L"+" )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -586,9 +584,6 @@ static void usage( void ) int __cdecl wmain( int argc, WCHAR *argv[] ) { - static const WCHAR noneW[] = {'n','o','n','e',0}; - static const WCHAR mszipW[] = {'m','s','z','i','p',0}; - WCHAR *p, *command; char buffer[MAX_PATH]; char filename[MAX_PATH]; @@ -617,8 +612,8 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) break; case 'm': argv++; argc--; - if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], L"none" )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], L"mszip" )) opt_compression = tcompTYPE_MSZIP; else { WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); -- 2.26.2

1 0

[PATCH] attrib: Use wide-char string literals.
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/attrib/attrib.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 558a393253c..53f63020973 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); -static const WCHAR starW[] = {'*','\0'}; - /* ========================================================================= * Load a string from the resource file, handling any error * Returns string retrieved from resource file @@ -33,11 +31,10 @@ static const WCHAR starW[] = {'*','\0'}; static WCHAR *ATTRIB_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -144,8 +141,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WCHAR buffer[MAX_PATH]; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR slashW[] = {'\\','\0'}; + WCHAR flags[] = L" "; WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), @@ -155,25 +151,22 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Build spec to search for */ lstrcpyW(buffer, rootdir); - lstrcatW(buffer, starW); + lstrcatW(buffer, L"*"); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; - /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; /* Build new root dir to go searching in */ lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - lstrcatW(buffer, slashW); + lstrcatW(buffer, L"\\"); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -191,12 +184,10 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -212,7 +203,6 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[4] = 'H'; } @@ -233,7 +223,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - ATTRIB_wprintf(fmt, flags, buffer); + ATTRIB_wprintf(L"%1 %2\n", flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } @@ -253,18 +243,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD attrib_clear = 0; BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; - static const WCHAR help_option[] = {'/','?','\0'}; - static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], L"/?")) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - lstrcpyW(name, starW); + lstrcpyW(name, L"*"); while (i < argc) { WCHAR *param = argv[i++]; @@ -311,7 +299,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, L"*?") == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, -- 2.26.2

1 0

[PATCH] packager: Use wide-char string literals.
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/packager_main.c | 11 +++-------- dlls/packager/tests/oleobj.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0a0790e9030..de07e5ca265 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -181,8 +181,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese static HRESULT do_activate_object(struct Package *This, HWND parent) { - static const WCHAR openW[] = {'o','p','e','n',0}; - ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + ShellExecuteW(parent, L"open", This->filename, NULL, NULL, SW_SHOW); return S_OK; } @@ -396,11 +395,9 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, WCHAR *stream_filename; WCHAR *base_end, extension[MAX_PATH]; - static const WCHAR ole10nativeW[] = {0x0001,'O','l','e','1','0','N','a','t','i','v','e',0}; - TRACE("(%p)->(%p)\n", This, pStg); - hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ TRACE("OpenStream gave: %08x\n", hr); @@ -489,8 +486,6 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ - static const WCHAR fmtW[] = {' ','(','%','u',')',0}; - if(GetLastError() != ERROR_FILE_EXISTS){ WARN("CreateFile failed: %u\n", GetLastError()); hr = E_FAIL; @@ -499,7 +494,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, /* file exists, so increment file name and try again */ ++i; - wsprintfW(base_end, fmtW, i); + wsprintfW(base_end, L" (%u)", i); lstrcatW(base_end, extension); file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1ce54eda7e7..62875584931 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -210,9 +210,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { - static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; - - if(lstrcmpW(pwcsName, ole10NativeW)) + if(lstrcmpW(pwcsName, L"\1Ole10Native")) return STG_E_FILENOTFOUND; *ppstm = &ole10native_stream; @@ -417,8 +415,6 @@ static void test_packager(void) char contents[11]; BOOL br, extended = FALSE; - static const WCHAR filename3W[] = {'f','i','l','e','n','a','m','e','3','.','t','x','t',0}; - hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || @@ -458,7 +454,7 @@ static void test_packager(void) if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); - lstrcpyW(filename + len, filename3W); + lstrcpyW(filename + len, L"filename3.txt"); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -- 2.26.2

1 0

[PATCH] conhost: Correct whitespace placement in a TRACE()
by Michael Stefaniuc Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ac0e22b4c42..a54238c80f6 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2477,7 +2477,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_PEEK: { void *result; - TRACE( "peek\n "); + TRACE( "peek\n" ); if (in_size) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); -- 2.26.2

1 0

[PATCH 1/2] ntdll: Unwind to the LR register if no unwind info is available
by Martin Storsjo Oct. 5, 2020

Oct. 5, 2020

Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe4..c9f44e92d30 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp; -- 2.17.1

2 3

[PATCH v2 1/5] ntdll: Introduce RtlProcessFlsData() and use it for FLS data destruction.
by Paul Gofman Oct. 5, 2020

Oct. 5, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernelbase/thread.c | 2 +- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 10 ++++++++++ include/winternl.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0bfef62a7da..f2b746856e1 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1022,7 +1022,7 @@ void WINAPI DECLSPEC_HOTPATCH DeleteFiber( LPVOID fiber_ptr ) RtlExitUserThread( 1 ); } RtlFreeUserStack( fiber->stack_allocation ); - HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); + RtlProcessFlsData( fiber->fls_slots, 3 ); HeapFree( GetProcessHeap(), 0, fiber ); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20bc3f977d1..cd27ce5658b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3255,7 +3255,8 @@ void WINAPI LdrShutdownThread(void) for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] ); RtlFreeHeap( GetProcessHeap(), 0, pointers ); } - RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); + RtlProcessFlsData( NtCurrentTeb()->FlsSlots, 3 ); + NtCurrentTeb()->FlsSlots = NULL; RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); NtCurrentTeb()->TlsExpansionSlots = NULL; RtlReleasePebLock(); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9f6281d5d..6f44f499825 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -874,6 +874,7 @@ @ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) +@ stdcall RtlProcessFlsData(ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap @ stdcall RtlPushFrame(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 716ef3b61d0..57292043582 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -343,3 +343,13 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlProcessFlsData (NTDLL.@) + */ +void WINAPI DECLSPEC_HOTPATCH RtlProcessFlsData( void *teb_fls_data, ULONG flags ) +{ + if (flags & 2) + RtlFreeHeap( GetProcessHeap(), 0, teb_fls_data ); +} diff --git a/include/winternl.h b/include/winternl.h index 82328167c9e..75324635ed7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3480,6 +3480,7 @@ NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlProcessFlsData(void*,ULONG); NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings(DWORD,HANDLE,const WCHAR*,const WCHAR*,WCHAR*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); -- 2.26.2

2 9

[PATCH] ucrtbase: Add [_]strtold[_l].
by Gijs Vermeulen Oct. 5, 2020

Oct. 5, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49873 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a67828e6d22..d662921d028 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -35,7 +35,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) ucrtbase._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) ucrtbase._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) ucrtbase._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) ucrtbase._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) ucrtbase._strtoui64_l @@ -96,7 +96,7 @@ @ cdecl strtof(str ptr) ucrtbase.strtof @ cdecl -ret64 strtoimax(str ptr long) ucrtbase.strtoimax @ cdecl strtol(str ptr long) ucrtbase.strtol -@ stub strtold +@ cdecl strtold(str ptr) ucrtbase.strtold @ cdecl -ret64 strtoll(str ptr long) ucrtbase.strtoll @ cdecl strtoul(str ptr long) ucrtbase.strtoul @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 87dc6585f3c..4dd07406db3 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -719,7 +719,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) ucrtbase._o__strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) ucrtbase._o__strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) ucrtbase._o__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) ucrtbase._o__strtold_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) ucrtbase._o__strtoll_l @ cdecl -ret64 _o__strtoui64(str ptr long) ucrtbase._o__strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) ucrtbase._o__strtoui64_l @@ -1126,7 +1126,7 @@ @ cdecl _o_strtok(str str) ucrtbase._o_strtok @ cdecl _o_strtok_s(ptr str ptr) ucrtbase._o_strtok_s @ cdecl _o_strtol(str ptr long) ucrtbase._o_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) ucrtbase._o_strtold @ cdecl -ret64 _o_strtoll(str ptr long) ucrtbase._o_strtoll @ cdecl _o_strtoul(str ptr long) ucrtbase._o_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) ucrtbase._o_strtoull diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0d38f97fffe..4c944a9d213 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1736,7 +1736,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2391,7 +2391,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2013b06cc7c..9d292ccef5a 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1447,7 +1447,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) msvcr120._strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @@ -2054,7 +2054,7 @@ @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol -@ stub strtold +@ cdecl strtold(str ptr) msvcr120.strtold @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f556b9e1c3d..468d8dbb5ab 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1383,7 +1383,7 @@ @ cdecl -ret64 _o__strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _o__strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _o__strtold_l +@ cdecl _o__strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _o__strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _o__strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -1791,7 +1791,7 @@ @ cdecl _o_strtok(str str) MSVCRT_strtok @ cdecl _o_strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl _o_strtol(str ptr long) MSVCRT_strtol -@ stub _o_strtold +@ cdecl _o_strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 _o_strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 _o_strtoull(str ptr long) MSVCRT_strtoui64 @@ -1954,7 +1954,7 @@ @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ stub _strtold_l +@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @@ -2522,7 +2522,7 @@ @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol -@ stub strtold +@ cdecl strtold(str ptr) MSVCRT_strtod @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -- 2.28.0

2 1

[PATCH 5/5] dxgi: Retrieve d3d12 swapchain fullscreen state from wined3d.
by Zhiyi Zhang Oct. 5, 2020

Oct. 5, 2020

Once Alt+Enter handling is implemented, the fullscreen state may change without dxgi necessarily being aware of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 19 +++++++++++++++++-- dlls/wined3d/swapchain.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index d778ab9e03d..f3b74389d29 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2276,7 +2276,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapCha TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = !swapchain->fullscreen_desc.Windowed; + { + wined3d_mutex_lock(); + *fullscreen = !wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + } if (target && (*target = swapchain->target)) IDXGIOutput_AddRef(*target); @@ -2289,6 +2293,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc = &swapchain->fullscreen_desc; const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2298,6 +2303,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + desc->BufferDesc.Width = swapchain_desc->Width; desc->BufferDesc.Height = swapchain_desc->Height; desc->BufferDesc.RefreshRate = fullscreen_desc->RefreshRate; @@ -2308,7 +2317,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain4 *iface, desc->BufferUsage = swapchain_desc->BufferUsage; desc->BufferCount = swapchain_desc->BufferCount; desc->OutputWindow = swapchain->window; - desc->Windowed = fullscreen_desc->Windowed; + desc->Windowed = windowed; desc->SwapEffect = swapchain_desc->SwapEffect; desc->Flags = swapchain_desc->Flags; @@ -2470,6 +2479,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface); + BOOL windowed; TRACE("iface %p, desc %p.\n", iface, desc); @@ -2479,7 +2489,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenDesc(IDXGISwapChai return E_INVALIDARG; } + wined3d_mutex_lock(); + windowed = wined3d_swapchain_state_is_windowed(swapchain->state); + wined3d_mutex_unlock(); + *desc = swapchain->fullscreen_desc; + desc->Windowed = windowed; return S_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6270c363bb9..d0d93417a18 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2266,6 +2266,13 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st return WINED3D_OK; } +BOOL CDECL wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state) +{ + TRACE("state %p.\n", state); + + return state->desc.windowed; +} + void CDECL wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state) { heap_free(state); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cf792746cc7..d11e06d0c34 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -291,6 +291,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) +@ cdecl wined3d_swapchain_state_is_windowed(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr) @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3535a69bacb..238961006a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2806,6 +2806,7 @@ void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, H HRESULT __cdecl wined3d_swapchain_state_create(const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d_swapchain_state **state); void __cdecl wined3d_swapchain_state_destroy(struct wined3d_swapchain_state *state); +BOOL __cdecl wined3d_swapchain_state_is_windowed(const struct wined3d_swapchain_state *state); HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_state *state, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, -- 2.25.1

2 1