February 2022 - Wine-commits

Zebediah Figura : quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 2a51b72ec3cd0219c4cf9e189748cda73d431077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a51b72ec3cd0219c4cf9e18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 15:00:15 2021 -0500 quartz: Do not print an incorrect state warning in MediaFilter_GetState() if a filter has been run asynchronously. This is a valid case in which the filter state may or may not match the graph state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f1623bc626d3ca2411c1a3088512d8ef461252b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/filtergraph.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 58038829217..20eec80e00c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5095,7 +5095,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F { struct filter_graph *graph = impl_from_IMediaFilter(iface); DWORD end = GetTickCount() + timeout; - FILTER_STATE expect_state; HRESULT hr; TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); @@ -5111,7 +5110,6 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); *state = graph->state; - expect_state = graph->needs_async_run ? State_Paused : graph->state; for (;;) { @@ -5143,9 +5141,18 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F else if (filter_state != graph->state && filter_state != State_Paused) hr = E_FAIL; - if (filter_state != expect_state) - ERR("Filter %p reported incorrect state %u (expected %u).\n", - filter->filter, filter_state, expect_state); + if (graph->needs_async_run) + { + if (filter_state != State_Paused && filter_state != State_Running) + ERR("Filter %p reported incorrect state %u (expected %u or %u).\n", + filter->filter, filter_state, State_Paused, State_Running); + } + else + { + if (filter_state != graph->state) + ERR("Filter %p reported incorrect state %u (expected %u).\n", + filter->filter, filter_state, graph->state); + } } LeaveCriticalSection(&graph->cs);

1 0

Jacek Caban : include: Use __builtin_offsetof on Clang.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: d1d979bf914f9d9d348bf1f2da32471944729fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d979bf914f9d9d348bf1f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 7 16:27:22 2021 +0200 include: Use __builtin_offsetof on Clang. Fixes a number of warning on MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de9982f069e576b6aaebd96383af263584eedb03) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 8d946e5aedf..b3fdaf0c052 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -20,7 +20,7 @@ #include <corecrt.h> -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define offsetof(s,m) __builtin_offsetof(s,m) #elif defined(_WIN64) #define offsetof(s,m) (size_t)((ptrdiff_t)&(((s*)NULL)->m))

1 0

Alexandre Julliard : ntdll: Avoid crash on shutting down partially initialized thread.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: a59337fb7e0d876dc90625dcd3244c04fcb0bf32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a59337fb7e0d876dc90625dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 27 19:32:48 2021 +0200 ntdll: Avoid crash on shutting down partially initialized thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 364099f528f83f0056f00178d9be6fe332692dc7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1f8e6c24400..35527119eae 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3230,7 +3230,7 @@ void WINAPI LdrShutdownThread(void) if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH ); RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + if (NtCurrentTeb()->TlsLinks.Flink) RemoveEntryList( &NtCurrentTeb()->TlsLinks ); if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] );

1 0

Zebediah Figura : server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 83923e43d57d624f52ef478bfb18d7f0fb6a91e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83923e43d57d624f52ef478b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:09 2021 -0500 server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key. This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 089b2528c2c933e3c9b45a5f559fa4b5f830872a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index c937e051597..49601bda77e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -402,6 +402,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL;

1 0

Francois Gouget : oleaut32: Setting sThousand to a non-breaking space also matches regular spaces.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: bb652772af76c76d1dfd4844616abbfeac41c4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb652772af76c76d1dfd4844… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:43 2021 +0200 oleaut32: Setting sThousand to a non-breaking space also matches regular spaces. As the test_VarParseNumFromStrMisc() tests show the converse is not true. Note also that the " 1 000" test was failing as expected because in the French locale Wine was not recognizing regular spaces as thousands separators. Now it does and Wine incorrectly allows them before the first digit, just like it does for the English tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c50dff867d797f7c43a8a319afb735fea6e8bf31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 32 +++++++++++++------------------- dlls/oleaut32/variant.c | 10 +++++++++- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bf6152554ad..258b747b03d 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1915,7 +1915,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Trailing thousands separators are allowed as usual */ - todo_wine_if(spaces[i] == ' ') EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(3,FAILDIG); } @@ -1948,7 +1947,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Non-breaking space and regular spaces work */ - todo_wine_if(i == 0) EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -1964,34 +1962,31 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1 001,0", NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); - todo_wine ok(np.cDig == 4, "Expected cDig = 4, got %d\n", np.cDig); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,0); - todo_wine EXPECTRGB(2,0); - todo_wine EXPECTRGB(3,1); + EXPECT2(1,0); + EXPECTRGB(2,0); + EXPECTRGB(3,1); EXPECTRGB(4,FAILDIG); /* With flag, consecutive thousands separators are allowed */ CONVERT("1 000", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, thousands separators can be sprinkled at random */ CONVERT("1 00 0 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - EXPECTFAIL; + todo_wine EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(1,FAILDIG); @@ -2038,7 +2033,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2066,12 +2061,11 @@ static void test_VarParseNumFromStrFr(void) /* Thousands flag can also be used with currency */ WCONVERT(L"1 234,5 \x20ac", NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,2); - todo_wine EXPECTRGB(2,3); - todo_wine EXPECTRGB(3,4); - todo_wine EXPECTRGB(4,5); + EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,3); + EXPECTRGB(3,4); + EXPECTRGB(4,5); EXPECTRGB(5,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b80a8537380..5e71d0a536d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1614,6 +1614,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS; int iMaxDigits = ARRAY_SIZE(rgbTmp); int cchUsed = 0; + OLECHAR cDigitSeparator2; TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); @@ -1633,6 +1634,10 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + /* Setting the thousands separator to a non-breaking space implies regular + * spaces are allowed too. But the converse is not true. + */ + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; /* First consume all the leading symbols and space from the string */ while (1) @@ -1673,6 +1678,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator; + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1780,7 +1786,9 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, cchUsed++; } } - else if (*lpszStr == chars.cDigitSeparator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++;

1 0

Jacek Caban : advapi32: Link to msvcrt.dll.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 8cc412b90ca8fbfb70945eefee93ae36af502743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cc412b90ca8fbfb70945eef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 21 15:15:51 2021 +0200 advapi32: Link to msvcrt.dll. Some applications expect msvcrt.dll to be pulled by system DLLs. On Windows, loading advapi32 causes msvcrt.dll to be loaded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51465 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b3a300cbfee15dd6771a0a984c13591a2b36358) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 5175563cea1..11b3b5aaaf7 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_ADVAPI32_ MODULE = advapi32.dll IMPORTLIB = advapi32 -IMPORTS = kernelbase sechost +IMPORTS = kernelbase sechost msvcrt DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin

1 0

Akihiro Sagawa : midimap: Introduce XP form and prefer it.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: c55a6b6407cd9b11217ca1b76d7af3e0e6271955 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55a6b6407cd9b11217ca1b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 24 21:45:24 2021 +0900 midimap: Introduce XP form and prefer it. Since XP form doesn't support channel mappings, old form is remained for compatiblity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51505 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dbf3b3b6bf88c8a003dc4ca9023e3182d64b34bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 58 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 86e4289d897..2ac8aea2c90 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -36,7 +36,15 @@ /* * Here's how Windows stores the midiOut mapping information. * - * Full form (in HKU) is: + * Windows XP form (in HKU) is: + * + * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] + * "szPname"="TiMidity port 0" + * (incomplete) + * + * szPname: name of midiOut device to use. + * + * If szPname isn't defined, we use Windows 2000 form (also in HKU): * * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] 988836060 * "AutoScheme"=dword:00000000 @@ -214,33 +222,41 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) else { DWORD type, size, out; - WCHAR buffer[256]; + WCHAR buffer[256]; - ret = 2; - size = sizeof(out); - if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"szPname", 0, &type, (void*)buffer, &size)) { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) - { - if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - else - { - ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); - } + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } - if (ret == 2) + else { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + ret = 2; + size = sizeof(out); + if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) + { + if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } + else + { + ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); + } } - else + if (ret == 2) { - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + { + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + } + else + { + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } } } }

1 0

Zhiyi Zhang : uxtheme: Fix incorrect part IDs in button class map.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 72a7c1991c1b2bb3e076d25b578178339feaba2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a7c1991c1b2bb3e076d25b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 26 10:25:30 2021 +0800 uxtheme: Fix incorrect part IDs in button class map. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51506 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ec82a0ebe65a0bd9f41c743d301c853e77dd8b8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/stylemap.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b38b18b623d..4875ec60604 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -358,21 +358,21 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_RADIOBUTTON, RBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, {BP_RADIOBUTTON, RBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, {BP_CHECKBOX, 0, L"CHECKBOX"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, - {BP_RADIOBUTTON, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, - {BP_RADIOBUTTON, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, - {BP_RADIOBUTTON, CBS_CHECKEDHOT, L"CHECKEDHOT"}, - {BP_RADIOBUTTON, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, - {BP_RADIOBUTTON, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, - {BP_RADIOBUTTON, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, - {BP_RADIOBUTTON, CBS_MIXEDHOT, L"MIXEDHOT"}, - {BP_RADIOBUTTON, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, - {BP_RADIOBUTTON, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, + {BP_CHECKBOX, CBS_UNCHECKEDNORMAL, L"UNCHECKEDNORMAL"}, + {BP_CHECKBOX, CBS_UNCHECKEDHOT, L"UNCHECKEDHOT"}, + {BP_CHECKBOX, CBS_UNCHECKEDPRESSED, L"UNCHECKEDPRESSED"}, + {BP_CHECKBOX, CBS_UNCHECKEDDISABLED, L"UNCHECKEDDISABLED"}, + {BP_CHECKBOX, CBS_CHECKEDNORMAL, L"CHECKEDNORMAL"}, + {BP_CHECKBOX, CBS_CHECKEDHOT, L"CHECKEDHOT"}, + {BP_CHECKBOX, CBS_CHECKEDPRESSED, L"CHECKEDPRESSED"}, + {BP_CHECKBOX, CBS_CHECKEDDISABLED, L"CHECKEDDISABLED"}, + {BP_CHECKBOX, CBS_MIXEDNORMAL, L"MIXEDNORMAL"}, + {BP_CHECKBOX, CBS_MIXEDHOT, L"MIXEDHOT"}, + {BP_CHECKBOX, CBS_MIXEDPRESSED, L"MIXEDPRESSED"}, + {BP_CHECKBOX, CBS_MIXEDDISABLED, L"MIXEDDISABLED"}, {BP_GROUPBOX, 0, L"GROUPBOX"}, - {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"}, - {BP_RADIOBUTTON, GBS_DISABLED, L"DISABLED"}, + {BP_GROUPBOX, GBS_NORMAL, L"NORMAL"}, + {BP_GROUPBOX, GBS_DISABLED, L"DISABLED"}, {BP_USERBUTTON, 0, L"USERBUTTON"}, {0, 0, L""} };

1 0

Alex Henrie : ntoskrnl: Add MmGetPhysicalAddress semi-stub.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: dfe1fa9abcbc071f32cf11b7e538c0633ad54e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe1fa9abcbc071f32cf11b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 6 21:13:44 2021 -0600 ntoskrnl: Add MmGetPhysicalAddress semi-stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c5c9c589743f921ce3dd0961cf051b0861fd75e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9dc5809614a..52172cc180d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2670,6 +2670,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + FIXME("(%p): semi-stub\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 145ea3099d7..54e8b6cb6cc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -701,7 +701,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical

1 0

Oleg Dubinskiy : include: Add RASCREDENTIALSA/W structures.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 10646cd4e08f02e59ff27f38f2814426e64efc4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10646cd4e08f02e59ff27f38… Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Date: Tue Aug 3 23:40:54 2021 -0600 include: Add RASCREDENTIALSA/W structures. Signed-off-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2d8fa6b4d14792296383af616a387d39a4d1479b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/ras.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/ras.h b/include/ras.h index a8c04da2b6d..210a2a45f09 100644 --- a/include/ras.h +++ b/include/ras.h @@ -372,6 +372,27 @@ typedef struct tagRASCONNSTATUSW DECL_WINELIB_TYPE_AW(RASCONNSTATUS) +typedef struct tagRASCREDENTIALSA +{ + DWORD dwSize; + DWORD dwMask; + CHAR szUserName[UNLEN + 1]; + CHAR szPassword[PWLEN + 1]; + CHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSA, *LPRASCREDENTIALSA; + +typedef struct tagRASCREDENTIALSW +{ + DWORD dwSize; + DWORD dwMask; + WCHAR szUserName[UNLEN + 1]; + WCHAR szPassword[PWLEN + 1]; + WCHAR szDomain[DNLEN + 1]; +} RASCREDENTIALSW, *LPRASCREDENTIALSW; + +DECL_WINELIB_TYPE_AW(RASCREDENTIALS) +DECL_WINELIB_TYPE_AW(LPRASCREDENTIALS) + typedef enum tagRASPROJECTION { RASP_Amb = 0x10000,

1 0