May 2022 - Wine-devel - list.winehq.org

[PATCH 0/7] MR104: Revamp type management (on input)
by eric pouech (＠epo) 20 May '22

20 May '22

This serie revamps type management inside winedbg: - parsing of a type is done when input command is parsed (and no longer when it's executed). It allows to discriminate between identifier and type (as any C compiler would do) and act accordingly. - basic type (int, long...) are now searched inside data model - types can be prefixed by a module name (like struct ntdll!CONTEXT64) to force lookup of type inside that module (otherwise all modules are searched) - print command is extended to print the details of a type (p struct _CONTEXT64 will show details) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/104

2 7

[PATCH] wininet: Return failure when adding HTTP header with empty value.
by Ziqing Hui 20 May '22

20 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/tests/http.c | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 55698467cda..f6680790986 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6139,6 +6139,12 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR { HTTPHEADERW hdr; + if (!value[0]) + { + LeaveCriticalSection(&request->headers_section); + return ERROR_INVALID_PARAMETER; + } + hdr.lpszField = (LPWSTR)field; hdr.lpszValue = (LPWSTR)value; hdr.wFlags = hdr.wCount = 0; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ec576ae81e2..1cde6ea257c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2064,8 +2064,6 @@ static void HttpHeaders_test(void) ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %lu\n", GetLastError()); /* Header with empty value should cause a failure */ - todo_wine - { SetLastError(0xdeadbeef); ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest1:", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %lu.\n", GetLastError()); @@ -2087,7 +2085,6 @@ static void HttpHeaders_test(void) ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), "Header with empty value is present.\n"); ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %lu.\n", GetLastError()); - } ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: -- 2.25.1

3 2

Re: [PATCH] winegstreamer: reintroduce flushing for wg_parser
by Bernhard Kölbl 20 May '22

20 May '22

Am Fr., 20. Mai 2022 um 16:36 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > wow I did. gitlab phew thx I'll do that > Great! > On Fri, May 20, 2022 at 10:34 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> Hi Zlice, >> >> I guess you forgot to attach the patch file. >> >> Btw. if you're more versed in GitLab you could also try to submit a >> merge request there: https://gitlab.winehq.org/ >> >> Cheers, >> Bernhard >> >> Am Fr., 20. Mai 2022 um 16:26 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: >> > >> > Previous commit removed flushing but this causes issues in some games. >> > >> > - add flushing back >> > - move variable creation after initial condition returns in wm_reader_get_stream_sample. This caused some slow down. >> > - Remove EOS sets. Some are not what flushing did before. Had some seg faults on exiting Fallout 3 with them in. >> > >> > I'm not confident on the EOS sets but they seemed to cause issues leaving them in and the commit that removed flushing 5144b27661fcd6705353d832e0383085f8afe842 mentioned it should be done client side. >> > >> > -zlice

1 0

[PATCH] winegstreamer: reintroduce flushing for wg_parser
by Zlice Z 20 May '22

20 May '22

Previous commit removed flushing but this causes issues in some games. - add flushing back - move variable creation after initial condition returns in wm_reader_get_stream_sample. This caused some slow down. - Remove EOS sets. Some are not what flushing did before. Had some seg faults on exiting Fallout 3 with them in. I'm not confident on the EOS sets but they seemed to cause issues leaving them in and the commit that removed flushing 5144b27661fcd6705353d832e0383085f8afe842 <https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085…> mentioned it should be done client side. -zlice

2 1

[PATCH 1/5] mshtml: Expose IHTMLDOMImplementation2 members in IE9+ modes.
by Gabriel Ivăncescu 20 May '22

20 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 9 ++++++++- dlls/mshtml/tests/documentmode.js | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 9962cc2..4385c4c 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -299,6 +299,12 @@ static const IHTMLDOMImplementation2Vtbl HTMLDOMImplementation2Vtbl = { HTMLDOMImplementation2_hasFeature }; +static void HTMLDOMImplementation_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) +{ + if(compat_mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDOMImplementation2_tid, NULL); +} + static const tid_t HTMLDOMImplementation_iface_tids[] = { IHTMLDOMImplementation_tid, 0 @@ -307,7 +313,8 @@ static dispex_static_data_t HTMLDOMImplementation_dispex = { L"DOMImplementation", NULL, DispHTMLDOMImplementation_tid, - HTMLDOMImplementation_iface_tids + HTMLDOMImplementation_iface_tids, + HTMLDOMImplementation_init_dispex_info }; HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementation **ret) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 74e871e..eeeb1c8 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -364,6 +364,23 @@ sync_test("window_props", function() { test_exposed("console", v >= 10); }); +sync_test("domimpl_props", function() { + var domimpl = document.implementation; + function test_exposed(prop, expect) { + if(expect) + ok(prop in domimpl, prop + " not found in DOMImplementation."); + else + ok(!(prop in domimpl), prop + " found in DOMImplementation."); + } + + var v = document.documentMode; + + test_exposed("hasFeature", true); + test_exposed("createDocument", v >= 9); + test_exposed("createDocumentType", v >= 9); + test_exposed("createHTMLDocument", v >= 9); +}); + sync_test("xhr_props", function() { var xhr = new XMLHttpRequest(); -- 2.34.1

3 11

Re: winegstream reintroduce parser flushing
by Bernhard Kölbl 20 May '22

20 May '22

Am Fr., 20. Mai 2022 um 15:54 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > I think I did the patch right this time? Not really fluent with git. > It's still missing your full name in the "from" line, according to: https://wiki.winehq.org/Submitting_Patches#Check_your_Git_setup > I see the part about needing to be subscribed to the mailing list. > Can I unsub immediately after? > You probably should stay subscribed for the time your patch will be reviewed. > Can send directly to wine-devel again with the patch subject if this looks good. > Sure, and it's probably best to set the E-Mail subject to the commit message. Just look how other patches are submitted. Thanks, Bernhard > Thanks > > On Fri, May 20, 2022 at 9:21 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> This still doesn't meet the requirements for how a patch needs to look like. >> Please check the link I sent, again and rework the patch and mail >> accordingly: i.e. Correct commit message, correct patch format, etc. >> >> Thanks, >> Bernhard >> >> Am Fr., 20. Mai 2022 um 14:34 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: >> > >> > Removed commented blocks, added more verbose comments. >> > >> > On Fri, May 20, 2022 at 3:46 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> >> >> Hi Zlice, >> >> >> >> thanks for your patch. Unfortunately you're missing out on quite a few requirements for this to get accepted. I'd recommend to refactor your submission using this guide as reference: https://wiki.winehq.org/Submitting_Patches and to resend it afterwards. >> >> >> >> E.g. you left in C++ comments, which aren't allowed. >> >> >> >> Thanks, >> >> Bernhard >> >> >> >> >> >> Zlice Z <zlice555(a)gmail.com> schrieb am Fr., 20. Mai 2022, 09:22: >> >>> >> >>> Sent a patch yesterday that was mediocre and barely helps. >> >>> >> >>> commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… >> >>> >> >>> removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. >> >>> >> >>> - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) >> >>> >> >>> - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though >> >>> >> >>> - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

1 0

[PATCH v3] vbscript: Implement CDate().
by Jacek Caban 20 May '22

20 May '22

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: more tests dlls/vbscript/global.c | 27 +++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-)

1 0

Re: winegstream reintroduce parser flushing
by Bernhard Kölbl 20 May '22

20 May '22

This still doesn't meet the requirements for how a patch needs to look like. Please check the link I sent, again and rework the patch and mail accordingly: i.e. Correct commit message, correct patch format, etc. Thanks, Bernhard Am Fr., 20. Mai 2022 um 14:34 Uhr schrieb Zlice Z <zlice555(a)gmail.com>: > > Removed commented blocks, added more verbose comments. > > On Fri, May 20, 2022 at 3:46 AM Bernhard Kölbl <besentv(a)gmail.com> wrote: >> >> Hi Zlice, >> >> thanks for your patch. Unfortunately you're missing out on quite a few requirements for this to get accepted. I'd recommend to refactor your submission using this guide as reference: https://wiki.winehq.org/Submitting_Patches and to resend it afterwards. >> >> E.g. you left in C++ comments, which aren't allowed. >> >> Thanks, >> Bernhard >> >> >> Zlice Z <zlice555(a)gmail.com> schrieb am Fr., 20. Mai 2022, 09:22: >>> >>> Sent a patch yesterday that was mediocre and barely helps. >>> >>> commit https://github.com/wine-mirror/wine/commit/5144b27661fcd6705353d832e0383085… >>> >>> removed flushing from parser, which after commit bisecting turns out to be the cause of Fallout 3 radio chugging every new song. >>> >>> - re-introduced parser flushing (self explanatory, commit said it's not worth it but it helps here) >>> >>> - moved some variable initialization in wm_reader.c to after initial conditional returns. these were in a switch-case before in the middle of the function and it seems to be part of the stuttering, wasn't moved in the mentioned commit though >>> >>> - commented out and left my name by some EOS sets. they used to be checked for EOS 'events' but those references have been changed to 'buffer' and idk what the right action is. wine seemed to randomly seg fault on exit with leaving them on though. suspect they incorrectly guess and set 'end of stream' ?

1 0

[PATCH v2] vbscript: Implement CDate().
by Robert Wilhelm 20 May '22

20 May '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- v2: if VT_DATE conversion fails, doing arg -> R8 -> DATE. --- dlls/vbscript/global.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5280730f19f..d5d3ec585c0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -742,8 +742,33 @@ static HRESULT Global_CByte(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_CDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&v, &v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CDbl(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e5b0ee6d37..a23bb043090 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1183,6 +1183,38 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDateError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDate(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDate(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDate(Empty) = 0, "CDate(Empty) = " & CDate(Empty)) +Call ok(getVT(CDate(Empty)) = "VT_DATE", "getVT(CDate(Empty)) = " & getVT(CDate(Empty))) +Call ok(CDate(0) = 0, "CDate(0) = " & CDate(0)) +Call ok(getVT(CDate(0)) = "VT_DATE", "getVT(CDate(0)) = " & getVT(CDate(0))) +Call ok(CDate(1) = #1899-12-31#, "CDate(1) = " & CDate(1)) +Call ok(getVT(CDate(1)) = "VT_DATE", "getVT(CDate(1)) = " & getVT(CDate(1))) +Call ok(CDate("1") = #1899-12-31#, "CDate(""1"") = " & CDate("1")) +Call ok(getVT(CDate("1")) = "VT_DATE", "getVT(CDate(""1"")) = " & getVT(CDate("1"))) +If isEnglishLang Then + Call ok(CDate("1/1/2000") = #2000-1-1#, "CDate(""1/1/2000"") = " & CDate("1/1/2000")) + Call ok(getVT(CDate("1/1/2000")) = "VT_DATE", "getVT(CDate(""1/1/2000"")) = " & getVT(CDate("1/1/2000"))) +End If +Call ok(CDate(-1) = #1899-12-29#, "CDate(-1) = " & CDate(-1)) +Call ok(getVT(CDate(-1)) = "VT_DATE", "getVT(CDate(-1)) = " & getVT(CDate(-1))) +Call ok(CDate(100000) = #2173-10-14#, "CDate(100000) = " & CDate(100000)) +Call ok(getVT(CDate(100000)) = "VT_DATE", "getVT(CDate(100000)) = " & getVT(CDate(100000))) +Call testCDateError("", 13, 13) +Call testCDateError(null, 94, 94) + Sub testCDblError(strings, error_num1, error_num2) on error resume next Dim x -- 2.36.1

1 0

[PATCH] kernelbase: Add SetThreadInformation().
by Nikolay Sivov 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 19 +++++++++++++++++++ include/processthreadsapi.h | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ca339181e32..cbba3abdba0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1470,6 +1470,7 @@ @ stdcall -import SetThreadGroupAffinity(long ptr ptr) @ stdcall -import SetThreadIdealProcessor(long long) @ stdcall -import SetThreadIdealProcessorEx(long ptr ptr) +@ stdcall -import SetThreadInformation(long long ptr long) @ stdcall -import SetThreadLocale(long) @ stdcall -import SetThreadPreferredUILanguages(long ptr ptr) @ stdcall -import SetThreadPriority(long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 791c3603918..fd9701dd20b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1520,7 +1520,7 @@ @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadIdealProcessorEx(long ptr ptr) -# @ stub SetThreadInformation +@ stdcall SetThreadInformation(long long ptr long) @ stdcall SetThreadLocale(long) @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 6ba58cf0a67..f11d17748fe 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -606,6 +606,25 @@ LANGID WINAPI DECLSPEC_HOTPATCH SetThreadUILanguage( LANGID langid ) } +/********************************************************************** + * SetThreadInformation (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetThreadInformation( HANDLE thread, THREAD_INFORMATION_CLASS info_class, + VOID *info, DWORD size ) +{ + switch (info_class) + { + case ThreadMemoryPriority: + return set_ntstatus( NtSetInformationThread( thread, ThreadPagePriority, info, size )); + case ThreadPowerThrottling: + return set_ntstatus( NtSetInformationThread( thread, ThreadPowerThrottlingState, info, size )); + default: + FIXME("Unsupported class %u.\n", info_class); + return FALSE; + } +} + + /********************************************************************** * SuspendThread (kernelbase.@) */ diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h index 8cdaff4796a..d266b7a727b 100644 --- a/include/processthreadsapi.h +++ b/include/processthreadsapi.h @@ -23,8 +23,23 @@ extern "C" { #endif +typedef enum _THREAD_INFORMATION_CLASS +{ + ThreadMemoryPriority, + ThreadAbsoluteCpuPriority, + ThreadDynamicCodePolicy, + ThreadPowerThrottling, + ThreadInformationClassMax +} THREAD_INFORMATION_CLASS; + +typedef struct _MEMORY_PRIORITY_INFORMATION +{ + ULONG MemoryPriority; +} MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; + WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); +WINBASEAPI BOOL WINAPI SetThreadInformation(HANDLE,THREAD_INFORMATION_CLASS,LPVOID,DWORD); #ifdef __cplusplus } -- 2.35.1

1 0