November 2020 - Wine-Commits

Piotr Caban : msvcrt: Make old locale access thread-safe in setlocale.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: a7f124eb5e57d8be36daa3e87edb66a9b6843e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f124eb5e57d8be36daa3e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:41 2020 +0100 msvcrt: Make old locale access thread-safe in setlocale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2502e556ee2..6d891c3a8e0 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -601,15 +601,6 @@ void CDECL _unlock_locales(void) _unlock(_SETLOCALE_LOCK); } -static MSVCRT_pthreadlocinfo* CDECL get_locinfo_ptr(void) { - thread_data_t *data = msvcrt_get_thread_data(); - - if(!data || !(data->locale_flags & LOCALE_THREAD)) - return &MSVCRT_locale->locinfo; - - return &data->locinfo; -} - static void CDECL grab_locinfo(MSVCRT_pthreadlocinfo locinfo) { int i; @@ -2041,8 +2032,8 @@ MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t */ char* CDECL MSVCRT_setlocale(int category, const char* locale) { - MSVCRT_pthreadlocinfo *plocinfo = get_locinfo_ptr(); - MSVCRT_pthreadlocinfo locinfo = *plocinfo, newlocinfo; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_pthreadlocinfo locinfo = get_locinfo(), newlocinfo; if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX) return NULL; @@ -2063,26 +2054,34 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(locale[0] != 'C' || locale[1] != '\0') initial_locale = FALSE; - _lock_locales(); - free_locinfo(locinfo); - *plocinfo = newlocinfo; - _unlock_locales(); - - if(newlocinfo == MSVCRT_locale->locinfo) { + if(data->locale_flags & LOCALE_THREAD) + { + if(data->locale_flags & LOCALE_FREE) + free_locinfo(data->locinfo); + data->locinfo = newlocinfo; + } + else + { int i; + _lock_locales(); + free_locinfo(MSVCRT_locale->locinfo); + MSVCRT_locale->locinfo = newlocinfo; + MSVCRT___lc_codepage = newlocinfo->lc_codepage; MSVCRT___lc_collate_cp = newlocinfo->lc_collate_cp; MSVCRT___mb_cur_max = newlocinfo->mb_cur_max; MSVCRT__pctype = newlocinfo->pctype; for(i=MSVCRT_LC_MIN; i<=MSVCRT_LC_MAX; i++) MSVCRT___lc_handle[i] = MSVCRT_locale->locinfo->lc_handle[i]; + _unlock_locales(); + update_thread_locale(data); } if(category == MSVCRT_LC_ALL) - return construct_lc_all(newlocinfo); + return construct_lc_all(data->locinfo); - return newlocinfo->lc_category[category].locale; + return data->locinfo->lc_category[category].locale; } /*********************************************************************

1 0

Francois Gouget : dssenh/tests: Fix the spelling of a skip() message.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: ce03715db3bcabeb597e2a9a92cccb921d0a91f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce03715db3bcabeb597e2a9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:13 2020 +0100 dssenh/tests: Fix the spelling of a skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index e9c62cb99de..4d33fc86cd8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -702,7 +702,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { - skip("skipping ciper modes tests\n"); + skip("skipping cipher mode tests\n"); return; } ok(result, "Expected a derived key.\n");

1 0

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

Nov. 25, 2020

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

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

Nov. 25, 2020

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

Francois Gouget : dxgi/tests: Fix the grammar in a comment.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: e76c522ad9f4f03c0439cd4984f15a20d424c36a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76c522ad9f4f03c0439cd49… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:38 2020 +0100 dxgi/tests: Fix the grammar in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e6c8e0eb8c4..3c3a57806a4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4534,7 +4534,7 @@ static void test_swapchain_parameters(void) * the draw on the screen right away (Aero on or off doesn't matter), but * Present with DXGI_PRESENT_DO_NOT_SEQUENCE will show the modifications. * - * Note that if the application doesn't have focused creating a fullscreen + * Note that if the application doesn't have focus creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY;

1 0

Francois Gouget : ole32/tests: Add a trailing linefeed to an ok() message.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: d529e13c5b1553ceee12e90b1a97ea8bb8e205e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d529e13c5b1553ceee12e90b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:40:33 2020 +0100 ole32/tests: Add a trailing linefeed to an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5d44cd5a0ba..2e5006463da 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2775,7 +2775,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish\n"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL);

1 0

Francois Gouget : qmgr/tests: Fix the spelling of an ok() message.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: ed2b42727f5c53b1c44eb8c7805c5e44b23c2f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed2b42727f5c53b1c44eb8c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 19:43:18 2020 +0100 qmgr/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 71da89facad..edf1ef7e592 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -888,7 +888,7 @@ START_TEST(job) */ hres = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(hres)) { - ok(0, "CoInitializeEx faied: %0x\n", hres); + ok(0, "CoInitializeEx failed: %0x\n", hres); return; }

1 0

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

Nov. 25, 2020

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

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

Nov. 25, 2020

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

Piotr Caban : msvcrt: Fix C locale lc_time_curr refconting.
by Alexandre Julliard Nov. 25, 2020

Nov. 25, 2020

Module: wine Branch: master Commit: 6e70b04c68183b4b08b7bbb60abacf9ca9fa3819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e70b04c68183b4b08b7bbb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 25 20:24:09 2020 +0100 msvcrt: Fix C locale lc_time_curr refconting. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 5971882229c..0c4211dc197 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1099,8 +1099,8 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free((void*)locinfo->pcumap); } - if(locinfo->lc_time_curr && locinfo->lc_time_curr != &cloc_time_data - && !InterlockedDecrement(&locinfo->lc_time_curr->refcount)) + if(locinfo->lc_time_curr && !InterlockedDecrement(&locinfo->lc_time_curr->refcount) + && locinfo->lc_time_curr != &cloc_time_data) MSVCRT_free(locinfo->lc_time_curr); if(InterlockedDecrement(&locinfo->refcount)) @@ -1932,8 +1932,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME])) { copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_TIME); locinfo->lc_time_curr = old_locinfo->lc_time_curr; - if(locinfo->lc_time_curr != &cloc_time_data) - InterlockedIncrement(&locinfo->lc_time_curr->refcount); + InterlockedIncrement(&locinfo->lc_time_curr->refcount); } else if(lcid[MSVCRT_LC_TIME]) { if(!update_threadlocinfo_category(lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) { @@ -1952,6 +1951,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, return NULL; } locinfo->lc_time_curr = &cloc_time_data; + InterlockedIncrement(&locinfo->lc_time_curr->refcount); } return locinfo;

1 0