November 2020 - Wine-commits

Piotr Caban : msvcrt: Simplify get_current_locale_noalloc implementation.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 40d4fbe45997a1820296e7909ba2212518bcfacc URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d4fbe45997a1820296e790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:56 2020 +0100 msvcrt: Simplify get_current_locale_noalloc implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6d891c3a8e0..73138bfd306 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1174,20 +1174,11 @@ MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) { thread_data_t *data = msvcrt_get_thread_data(); - if(!data || !(data->locale_flags & LOCALE_THREAD)) - { - _lock_locales(); - *locale = *MSVCRT_locale; - } - else - { - locale->locinfo = data->locinfo; - locale->mbcinfo = data->mbcinfo; - } + update_thread_locale(data); + locale->locinfo = data->locinfo; + locale->mbcinfo = data->mbcinfo; grab_locinfo(locale->locinfo); - if(locale->locinfo == MSVCRT_locale->locinfo) - _unlock_locales(); InterlockedIncrement(&locale->mbcinfo->refcount); return locale; }

1 0

Michael Stefaniuc : mmdevapi: Use wide-char string literals.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 591f06d85e155b6a6876d46cf828637084a01183 URL: https://source.winehq.org/git/wine.git/?a=commit;h=591f06d85e155b6a6876d46c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:16 2020 +0100 mmdevapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 95 +++++++++++++---------------------------- dlls/mmdevapi/main.c | 18 +++----- dlls/mmdevapi/tests/mmdevenum.c | 6 +-- dlls/mmdevapi/tests/propstore.c | 13 ++---- 4 files changed, 40 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591f06d85e155b6a6876…

1 0

Michael Stefaniuc : msacm32: Make the registry key variables global.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 31f6332f48d5826d25317a051ac230d875d0639a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f6332f48d5826d25317a05… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:17 2020 +0100 msacm32: Make the registry key variables global. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/internal.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..cccf5014fcf 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -52,17 +52,17 @@ static PWINE_ACMNOTIFYWND MSACM_pLastACMNotifyWnd = NULL; static void MSACM_ReorderDriversByPriority(void); +static const WCHAR drvkey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"; +static const WCHAR baseKey[] = L"Software\\Microsoft\\AudioCompressionManager\\DriverCache\\"; +static const WCHAR basePriorityKey[] = + L"Software\\Microsoft\\Multimedia\\Audio Compression Manager\\Priority v4.00"; + /*********************************************************************** * MSACM_RegisterDriverFromRegistry() */ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) { static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; WCHAR buf[2048]; DWORD bufLen, lRet; HKEY hKey; @@ -181,9 +181,6 @@ errCleanUp: */ static LPWSTR MSACM_GetRegistryKey(const WINE_ACMDRIVERID* padid) { - static const WCHAR baseKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'A','u','d','i','o','C','o','m','p','r','e','s','s','i','o','n','M','a','n','a','g','e','r','\\', - 'D','r','i','v','e','r','C','a','c','h','e','\\','\0'}; LPWSTR ret; int len; @@ -354,11 +351,6 @@ void MSACM_RegisterAllDrivers(void) static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -565,13 +557,6 @@ static void MSACM_ReorderDriversByPriority(void) if (iNumDrivers > 1) { LONG lError; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; unsigned int i; LONG lBufferLength; WCHAR szBuffer[256]; @@ -666,13 +651,6 @@ void MSACM_WriteCurrentPriorities(void) { LONG lError; HKEY hPriorityKey; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'};

1 0

Michael Stefaniuc : msacm32: Use wide-char string literals.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: d37c304ef79dd359f0d98f538ccea2e3a965f99a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37c304ef79dd359f0d98f53… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:18 2020 +0100 msacm32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/driver.c | 6 ++---- dlls/msacm32/format.c | 15 +++++---------- dlls/msacm32/internal.c | 36 ++++++++++++++---------------------- 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index f0d003f648b..a8d6f3cf6d7 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -434,12 +434,10 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA if (!pConfigInfo) { ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); } else { - static const WCHAR drivers32[] = {'D','r','i','v','e','r','s','3','2','\0'}; - pConfigInfo->dwDCISize = iStructSize; - section_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(drivers32) + 1) * sizeof(WCHAR)); - if (section_name) lstrcpyW(section_name, drivers32); + section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); + if (section_name) lstrcpyW(section_name, L"Drivers32"); pConfigInfo->lpszDCISectionName = section_name; alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 284633ccefe..536fa42e767 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -93,7 +93,6 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { - static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; int j, index; afd.dwFormatIndex = i; @@ -105,7 +104,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, for (j = len; j < ACMFORMATTAGDETAILS_FORMATTAG_CHARS; j++) buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, - fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); + L"%d Ko/s", (afd.pwfx->nAvgBytesPerSec + 512) / 1024); index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); @@ -213,19 +212,17 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEW afc) return affd.ret; } -static const WCHAR fmt_prop[] = {'a','c','m','p','r','o','p','\0'}; - static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - PACMFORMATCHOOSEW afc = (PACMFORMATCHOOSEW)GetPropW(hWnd, fmt_prop); + ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; - SetPropW(hWnd, fmt_prop, (HANDLE)afc); + SetPropW(hWnd, L"acmprop", (HANDLE)afc); MSACM_FillFormatTags(hWnd, afc); MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| @@ -431,8 +428,6 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails) { MMRESULT mmr; - static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; - static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); @@ -497,9 +492,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } if (mmr == MMSYSERR_NOERROR && pafd->szFormat[0] == 0) { - wsprintfW(pafd->szFormat, fmt1, pafd->pwfx->nSamplesPerSec); + wsprintfW(pafd->szFormat, L"%d Hz", pafd->pwfx->nSamplesPerSec); if (pafd->pwfx->wBitsPerSample) { - wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, + wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), L"; %d bits", pafd->pwfx->wBitsPerSample); } MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cccf5014fcf..e83f1f5c215 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -347,10 +347,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileNa */ void MSACM_RegisterAllDrivers(void) { - static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -384,7 +381,7 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) + if (GetPrivateProfileSectionW(L"drivers32", buf, ARRAY_SIZE(buf), L"system.ini")) { for(s = buf; *s; s += lstrlenW(s) + 1) { @@ -396,7 +393,7 @@ void MSACM_RegisterAllDrivers(void) } } MSACM_ReorderDriversByPriority(); - MSACM_RegisterDriver(msacm32, msacm32, 0); + MSACM_RegisterDriver(L"msacm32.dll", L"msacm32.dll", 0); } /*********************************************************************** @@ -590,15 +587,13 @@ static void MSACM_ReorderDriversByPriority(void) */ for (i = 0; i < iNumDrivers; i++) { - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; WCHAR szSubKey[17]; unsigned int iTargetPosition; unsigned int iCurrentPosition; WCHAR * pAlias; - static const WCHAR sPrefix[] = {'m','s','a','c','m','.','\0'}; - + /* Build expected entry name */ - swprintf(szSubKey, 17, priorityTmpl, i + 1); + swprintf(szSubKey, 17, L"Priority%ld", i + 1); lBufferLength = sizeof(szBuffer); lError = RegQueryValueExW(hPriorityKey, szSubKey, NULL, NULL, (LPBYTE)szBuffer, (LPDWORD)&lBufferLength); if (lError != ERROR_SUCCESS) continue; @@ -607,7 +602,7 @@ static void MSACM_ReorderDriversByPriority(void) iTargetPosition = i; /* Locate driver alias in driver list */ - pAlias = wcsstr(szBuffer, sPrefix); + pAlias = wcsstr(szBuffer, L"msacm."); if (pAlias == NULL) continue; for (iCurrentPosition = 0; iCurrentPosition < iNumDrivers; iCurrentPosition++) { @@ -653,9 +648,6 @@ void MSACM_WriteCurrentPriorities(void) HKEY hPriorityKey; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; - static const WCHAR valueTmpl[] = {'%','c',',',' ','%','s','\0'}; - static const WCHAR converterAlias[] = {'I','n','t','e','r','n','a','l',' ','P','C','M',' ','C','o','n','v','e','r','t','e','r','\0'}; WCHAR szSubKey[17]; WCHAR szBuffer[256]; @@ -680,10 +672,10 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); + swprintf(szBuffer, 256, L"%c, %s", (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); wcslwr(szBuffer); lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); @@ -695,15 +687,15 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, '1', converterAlias); - + swprintf(szBuffer, 256, L"%c, %s", '1', L"Internal PCM Converter"); + lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", - debugstr_w(converterAlias), debugstr_w(basePriorityKey), lError); + ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); }

1 0

Michael Stefaniuc : mshtml: Use wide-char string literals.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 4618a0a38acfa20e0582831e9d74a8f22fcb18d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4618a0a38acfa20e0582831e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 23:29:19 2020 +0100 mshtml: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 7 ++--- dlls/mshtml/editor.c | 53 +++++++++++++------------------------ dlls/mshtml/main.c | 21 +++------------ dlls/mshtml/mutation.c | 4 +-- dlls/mshtml/navigate.c | 28 ++++++-------------- dlls/mshtml/nsembed.c | 62 +++++++++++++------------------------------- dlls/mshtml/nsio.c | 3 +-- dlls/mshtml/oleobj.c | 11 ++------ dlls/mshtml/omnavigator.c | 40 +++++++++------------------- dlls/mshtml/persist.c | 9 +++---- dlls/mshtml/protocol.c | 15 ++++------- dlls/mshtml/range.c | 48 +++++++++++----------------------- dlls/mshtml/script.c | 40 +++++++++------------------- dlls/mshtml/secmgr.c | 6 ++--- dlls/mshtml/selection.c | 9 ++----- dlls/mshtml/svg.c | 10 +++---- dlls/mshtml/task.c | 6 ++--- dlls/mshtml/view.c | 22 +++++----------- dlls/mshtml/xmlhttprequest.c | 19 ++++---------- 19 files changed, 122 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4618a0a38acfa20e0582…

1 0

Gerald Pfeifer : advapi32/tests: Initialize luid in test_CreateRestrictedToken.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 42c03ef03f2b2e3b63eee2aa923773ceb04e5d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c03ef03f2b2e3b63eee2aa… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 24 23:38:49 2020 +0100 advapi32/tests: Initialize luid in test_CreateRestrictedToken. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eaaa29866bb..020e69277e0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5195,7 +5195,7 @@ static void test_CreateRestrictedToken(void) TOKEN_TYPE type; BOOL is_member; DWORD size; - LUID luid; + LUID luid = { 0, 0 }; BOOL ret; DWORD i;

1 0

Alexandre Julliard : ntdll: Make x86_64 syscall thunks position independent.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 043489456c1f633f86f8dd1fde6b32c48c90c6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=043489456c1f633f86f8dd1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 20:19:43 2020 +0100 ntdll: Make x86_64 syscall thunks position independent. Based on a patch by Paul Gofman. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 111 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/virtual.c | 6 +++ tools/winebuild/import.c | 4 +- 3 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..546a7d83bbd 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -643,6 +643,116 @@ static void test_user_shared_data(void) } } +static void perform_relocations( void *module, INT_PTR delta ) +{ + IMAGE_NT_HEADERS *nt; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + if (!relocs->VirtualAddress || !relocs->Size) return; + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = (char *)module + sec[i].VirtualAddress; + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + rel = (IMAGE_BASE_RELOCATION *)((char *)module + relocs->VirtualAddress); + end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + while (rel && rel < end - 1 && rel->SizeOfBlock) + rel = LdrProcessRelocationBlock( (char *)module + rel->VirtualAddress, + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = (char *)module + sec[i].VirtualAddress; + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } +} + + +static void test_syscalls(void) +{ + HMODULE module = GetModuleHandleW( L"ntdll.dll" ); + HANDLE handle; + NTSTATUS status; + NTSTATUS (WINAPI *pNtClose)(HANDLE); + WCHAR path[MAX_PATH]; + HANDLE file, mapping; + INT_PTR delta; + void *ptr; + + /* initial image */ + pNtClose = (void *)GetProcAddress( module, "NtClose" ); + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + + /* syscall thunk copy */ + ptr = VirtualAlloc( NULL, 0x1000, MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + ok( ptr != NULL, "VirtualAlloc failed\n" ); + memcpy( ptr, pNtClose, 32 ); + pNtClose = ptr; + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + VirtualFree( ptr, 0, MEM_FREE ); + + /* new mapping */ + GetModuleFileNameW( module, path, MAX_PATH ); + file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "can't open %s: %u\n", wine_dbgstr_w(path), GetLastError() ); + mapping = CreateFileMappingW( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); + ok( mapping != NULL, "CreateFileMappingW failed err %u\n", GetLastError() ); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + ok( ptr != NULL, "MapViewOfFile failed err %u\n", GetLastError() ); + CloseHandle( mapping ); + CloseHandle( file ); + delta = (char *)ptr - (char *)module; + + if (memcmp( ptr, module, 0x1000 )) + { + skip( "modules are not identical (non-PE build?)\n" ); + UnmapViewOfFile( ptr ); + return; + } + perform_relocations( ptr, delta ); + pNtClose = (void *)GetProcAddress( module, "NtClose" ); + if (!memcmp( pNtClose, (char *)pNtClose + delta, 32 )) + { + pNtClose = (void *)((char *)pNtClose + delta); + handle = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( handle != 0, "CreateEventWfailed %u\n", GetLastError() ); + status = pNtClose( handle ); + ok( !status, "NtClose failed %x\n", status ); + status = pNtClose( handle ); + ok( status == STATUS_INVALID_HANDLE, "NtClose failed %x\n", status ); + } + else + { +#ifdef __x86_64__ + ok( 0, "syscall thunk relocated\n" ); +#else + skip( "syscall thunk relocated\n" ); +#endif + } + UnmapViewOfFile( ptr ); +} + START_TEST(virtual) { HMODULE mod; @@ -678,4 +788,5 @@ START_TEST(virtual) test_RtlCreateUserStack(); test_NtMapViewOfSection(); test_user_shared_data(); + test_syscalls(); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 853eb0469b9..eaaf7242883 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2582,6 +2582,12 @@ TEB *virtual_alloc_first_teb(void) exit(1); } +#ifdef __x86_64__ /* sneak in a syscall dispatcher pointer at a fixed address (7ffe1000) */ + ptr = (char *)user_shared_data + page_size; + anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); + *(void **)ptr = __wine_syscall_dispatcher; +#endif + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 62d9844e367..53d4fb2869b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1727,8 +1727,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.byte 0xc3\n" ); /* ret */ if (target_platform == PLATFORM_WINDOWS) { - output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 1: callq *(__wine_syscall_dispatcher) */ - output( "\t.long __wine_syscall_dispatcher\n" ); + output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 1: callq *(0x7ffe1000) */ + output( "\t.long 0x7ffe1000\n" ); } else {

1 0

Alexandre Julliard : include: Only define _strnicmp() prototype when needed.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 70102669a8e3cd0311f87e4cbf4f87d45cda37a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70102669a8e3cd0311f87e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 25 21:40:30 2020 +0100 include: Only define _strnicmp() prototype when needed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index a5c4837837f..a7b0e04aade 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3674,7 +3674,9 @@ NTSYSAPI ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); NTSYSAPI void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); #endif +#ifndef __WINE_USE_MSVCRT NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); +#endif /* 32-bit only functions */

1 0

Francois Gouget : xactengine3_7/tests: Fix the spelling of a couple of comments.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: f2f5e2da6d760206f1a13e97d2302fd95bed36f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f5e2da6d760206f1a13e97… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:03 2020 +0100 xactengine3_7/tests: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/tests/xact3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 9b0d3defb09..6b04c36a9f0 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -51,13 +51,13 @@ struct xact_interfaces {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, - /* Version 3.1 to 3.4 use the same inteface */ + /* Version 3.1 to 3.4 use the same interface */ {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, - /* Version 3.5 to 3.7 use the same inteface */ + /* Version 3.5 to 3.7 use the same interface */ {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK },

1 0

Francois Gouget : user32/tests: Fix the spelling of a win_skip() message.
by Alexandre Julliard 25 Nov '20

25 Nov '20

Module: wine Branch: master Commit: 9468e7617c91c86e352ec2b16abfa04b94ca2e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9468e7617c91c86e352ec2b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:08 2020 +0100 user32/tests: Fix the spelling of a win_skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ce272ed73f4..1249f8cf5a1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1771,7 +1771,7 @@ static void test_GetMouseMovePointsEx_process(void) if (winstation1 == NULL && GetLastError() == ERROR_ACCESS_DENIED) { - win_skip("not enough priviledges for CreateWindowStation\n"); + win_skip("not enough privileges for CreateWindowStation\n"); CloseDesktop( desk0 ); CloseWindowStation( winstation0 ); return;

1 0