July 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32: Move mutex functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 93a5451152ae0a2ab7252bfc422abdabc62d9663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a5451152ae0a2ab7252bfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:05:17 2019 +0200 kernel32: Move mutex functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 12 ++--- dlls/kernel32/sync.c | 99 --------------------------------------- dlls/kernelbase/kernelbase.spec | 12 ++--- dlls/kernelbase/sync.c | 100 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93a5451152ae0a2ab725…

1 0

Jacek Caban : mshtml/tests: Introduce set_body_html helper.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: a91ed60f4342aeaa9bc4262650d4f8c4e35b769e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a91ed60f4342aeaa9bc42626… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:28:08 2019 +0200 mshtml/tests: Introduce set_body_html helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b615eb7..8c6efd3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5092,6 +5092,14 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) return elem; } +static void set_body_html(IHTMLDocument2 *doc, const char *html) +{ + IHTMLElement *body; + body = doc_get_body(doc); + test_elem_set_innerhtml((IUnknown*)body, html); + IHTMLElement_Release(body); +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -9453,16 +9461,12 @@ static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocume static void test_elem_names(IHTMLDocument2 *doc) { IHTMLElementCollection *col; - IHTMLElement *body; LONG len; HRESULT hres; static const elem_type_t test1_types[] = {ET_INPUT, ET_A, ET_DIV}; - body = doc_get_body(doc); - - test_elem_set_innerhtml((IUnknown*)body, - "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); + set_body_html(doc, "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); col = doc_get_elems_by_name(doc, "test"); test_elem_collection((IUnknown*)col, test1_types, ARRAY_SIZE(test1_types)); IHTMLElementCollection_Release(col); @@ -9477,8 +9481,6 @@ static void test_elem_names(IHTMLDocument2 *doc) ok(hres == S_OK, "get_length failed: %08x\n", hres); todo_wine ok(len == 1, "len = %d\n", len); IHTMLElementCollection_Release(col); - - IHTMLElement_Release(body); } static void test_elems2(IHTMLDocument2 *doc) @@ -9714,17 +9716,15 @@ static void test_svg_element(IHTMLDocument2 *doc, IHTMLElement *parent) static void test_dom_elements(IHTMLDocument2 *doc) { - IHTMLElement *body, *div; + IHTMLElement *div; - body = doc_get_body(doc); - test_elem_set_innerhtml((IUnknown*)body, "<div id=\"parentdiv\"></div>"); + set_body_html(doc, "<div id=\"parentdiv\"></div>"); div = get_doc_elem_by_id(doc, "parentdiv"); test_textarea_element(doc, div); test_form_element(doc, div); test_svg_element(doc, div); - IHTMLElement_Release(body); IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml/tests: Fix comment tests on recent IE versions.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 866880fb7601124e0aa7d681b1964e61dbbac7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=866880fb7601124e0aa7d681… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 1 15:27:59 2019 +0200 mshtml/tests: Fix comment tests on recent IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 586df7d..b615eb7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -567,11 +567,16 @@ static const elem_type_info_t elem_type_infos[] = { {"tspan", tspan_iids, NULL} }; +static int strncmp_wa(LPCWSTR strw, const char *stra, size_t len) +{ + WCHAR buf[512]; + size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, sizeof(buf)); + return wlen == len && memcmp(strw, buf, len * sizeof(WCHAR)); +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); + return strncmp_wa(strw, stra, strlen(stra)); } static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) @@ -2033,12 +2038,16 @@ static IHTMLFormElement *_get_textarea_form(unsigned line, IUnknown *unk) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { IHTMLCommentElement *comment = _get_comment_iface(__LINE__,unk); + const char *p; BSTR text; HRESULT hres; hres = IHTMLCommentElement_get_text(comment, &text); ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + if((p = strstr(extext, "-->")) && SysStringLen(text) == p - extext) /* Some IEs drop comment ending */ + ok_(__FILE__,line)(!strncmp_wa(text, extext, p - extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); + else + ok_(__FILE__,line)(!strcmp_wa(text, extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), extext); IHTMLCommentElement_Release(comment); SysFreeString(text); @@ -3050,12 +3059,17 @@ static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const char *o static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer_html) { IHTMLElement *elem = _get_elem_iface(line, unk); + const char *p; BSTR html; HRESULT hres; hres = IHTMLElement_get_outerHTML(elem, &html); ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08x\n", hres); - ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); + if((p = strstr(outer_html, "-->")) && !p[3] && SysStringLen(html) == p - outer_html) /* Some IEs drop comment ending */ + ok_(__FILE__,line)(!strncmp_wa(html, outer_html, p - outer_html), "text = \"%s\", expected \"%s\"\n", + wine_dbgstr_w(html), outer_html); + else + ok_(__FILE__,line)(!strcmp_wa(html, outer_html), "outerHTML = '%s', expected '%s'\n", wine_dbgstr_w(html), outer_html); IHTMLElement_Release(elem); SysFreeString(html);

1 0

Alexandre Julliard : kernel32: Move event functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 558e48aafdcc55fb2b184a619dae35f58e4f6601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558e48aafdcc55fb2b184a61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 15:53:28 2019 +0200 kernel32: Move event functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +-- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/sync.c | 195 +---------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.h | 33 +++++ dlls/kernelbase/kernelbase.spec | 20 +-- dlls/kernelbase/security.c | 7 +- dlls/kernelbase/sync.c | 265 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 326 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=558e48aafdcc55fb2b18…

1 0

Alexandre Julliard : kernel32: Move named pipe functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: bc28ed4c6c626f918f1b6f92e7e44f9694b12c10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc28ed4c6c626f918f1b6f92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 19:28:32 2019 +0200 kernel32: Move named pipe functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 +- dlls/kernel32/sync.c | 439 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 18 +- dlls/kernelbase/sync.c | 360 ++++++++++++++++++++++++++++++++ 4 files changed, 378 insertions(+), 457 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc28ed4c6c626f918f1b…

1 0

Alexandre Julliard : kernel32: Move I/ O completion functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 1834d9e9fe20f7e01e68c481a6a5e49c27f4f3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1834d9e9fe20f7e01e68c481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 18:45:06 2019 +0200 kernel32: Move I/O completion functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 +-- dlls/kernel32/sync.c | 115 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 8 +-- dlls/kernelbase/sync.c | 109 +++++++++++++++++++++++++++++++++++++ 4 files changed, 117 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1834d9e9fe20f7e01e68…

1 0

Alexandre Julliard : kernel32: Move condition variable functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 9585990a46442a36dd0ecca770847f0b56966eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=9585990a46442a36dd0ecca7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 17:15:13 2019 +0200 kernel32: Move condition variable functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/sync.c | 36 ------------------------------------ dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/sync.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bd4f551..c42ec44 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1482,8 +1482,8 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) -@ stdcall SleepConditionVariableCS(ptr ptr long) -@ stdcall SleepConditionVariableSRW(ptr ptr long long) +@ stdcall -import SleepConditionVariableCS(ptr ptr long) +@ stdcall -import SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) # @ stub SortCloseHandle # @ stub SortGetHandle diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 036bf85..be92aee 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1875,39 +1875,3 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, "ret $4") #endif /* __i386__ */ - -/*********************************************************************** - * SleepConditionVariableCS (KERNEL32.@) - */ -BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SECTION *crit, DWORD timeout ) -{ - NTSTATUS status; - LARGE_INTEGER time; - - status = RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ) ); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} - -/*********************************************************************** - * SleepConditionVariableSRW (KERNEL32.@) - */ -BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) -{ - NTSTATUS status; - LARGE_INTEGER time; - - status = RtlSleepConditionVariableSRW( variable, lock, get_nt_timeout( &time, timeout ), flags ); - - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - return TRUE; -} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7851675..52982b2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1512,8 +1512,8 @@ @ stdcall SignalObjectAndWait(long long long long) kernel32.SignalObjectAndWait @ stdcall SizeofResource(long long) kernel32.SizeofResource @ stdcall Sleep(long) kernel32.Sleep -@ stdcall SleepConditionVariableCS(ptr ptr long) kernel32.SleepConditionVariableCS -@ stdcall SleepConditionVariableSRW(ptr ptr long long) kernel32.SleepConditionVariableSRW +@ stdcall SleepConditionVariableCS(ptr ptr long) +@ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) kernel32.SleepEx @ stub SpecialMBToWC @ stub StartThreadpoolIo diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 5ab9005..ba64b85 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -45,6 +45,14 @@ static inline BOOL is_version_nt(void) return !(GetVersion() & 0x80000000); } +/* helper for kernel32->ntdll timeout format conversion */ +static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout ) +{ + if (timeout == INFINITE) return NULL; + time->QuadPart = (ULONGLONG)timeout * -10000; + return time; +} + /*********************************************************************** * BaseGetNamedObjectDirectory (kernelbase.@) @@ -719,3 +727,33 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingW( DWORD access, BOOL inherit, LP } return ret; } + + +/*********************************************************************** + * Condition variables + ***********************************************************************/ + + +/*********************************************************************** + * SleepConditionVariableCS (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SleepConditionVariableCS( CONDITION_VARIABLE *variable, + CRITICAL_SECTION *crit, DWORD timeout ) +{ + LARGE_INTEGER time; + + return set_ntstatus( RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ))); +} + + +/*********************************************************************** + * SleepConditionVariableSRW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, DWORD timeout, ULONG flags ) +{ + LARGE_INTEGER time; + + return set_ntstatus( RtlSleepConditionVariableSRW( variable, lock, + get_nt_timeout( &time, timeout ), flags )); +}

1 0

Alexandre Julliard : kernel32: Move file mapping functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 628d4450cdd84230780235f78798ab47bd2e2ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628d4450cdd84230780235f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 17:01:01 2019 +0200 kernel32: Move file mapping functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/sync.c | 97 -------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/sync.c | 102 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 101 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3f3f903..bd4f551 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -285,7 +285,7 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateFileMappingW(long ptr long long long wstr) +@ stdcall -import CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) @ stdcall CreateHardLinkTransactedA(str str ptr ptr) @@ -1117,7 +1117,7 @@ @ stdcall OpenFile(str ptr long) @ stdcall OpenFileById(long ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) -@ stdcall OpenFileMappingW(long long wstr) +@ stdcall -import OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) @ stdcall OpenJobObjectW(long long wstr) @ stdcall OpenMutexA(long long str) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7667af9..036bf85 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -663,73 +663,6 @@ HANDLE WINAPI CreateFileMappingA( HANDLE file, SECURITY_ATTRIBUTES *sa, DWORD pr /*********************************************************************** - * CreateFileMappingW (KERNEL32.@) - */ -HANDLE WINAPI CreateFileMappingW( HANDLE file, LPSECURITY_ATTRIBUTES sa, DWORD protect, - DWORD size_high, DWORD size_low, LPCWSTR name ) -{ - static const int sec_flags = (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | - SEC_NOCACHE | SEC_WRITECOMBINE | SEC_LARGE_PAGES); - HANDLE ret; - NTSTATUS status; - DWORD access, sec_type; - LARGE_INTEGER size; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - - sec_type = protect & sec_flags; - protect &= ~sec_flags; - if (!sec_type) sec_type = SEC_COMMIT; - - /* Win9x compatibility */ - if (!protect && !is_version_nt()) protect = PAGE_READONLY; - - switch(protect) - { - case PAGE_READONLY: - case PAGE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; - break; - case PAGE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; - break; - case PAGE_EXECUTE_READ: - case PAGE_EXECUTE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; - break; - case PAGE_EXECUTE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; - break; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - size.u.LowPart = size_low; - size.u.HighPart = size_high; - - if (file == INVALID_HANDLE_VALUE) - { - file = 0; - if (!size.QuadPart) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - } - - get_create_object_attributes( &attr, &nameW, sa, name ); - - status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, file ); - if (status == STATUS_OBJECT_NAME_EXISTS) - SetLastError( ERROR_ALREADY_EXISTS ); - else - SetLastError( RtlNtStatusToDosError(status) ); - return ret; -} - - -/*********************************************************************** * OpenFileMappingA (KERNEL32.@) */ HANDLE WINAPI OpenFileMappingA( DWORD access, BOOL inherit, LPCSTR name ) @@ -747,36 +680,6 @@ HANDLE WINAPI OpenFileMappingA( DWORD access, BOOL inherit, LPCSTR name ) } -/*********************************************************************** - * OpenFileMappingW (KERNEL32.@) - */ -HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name ) -{ - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE ret; - NTSTATUS status; - - if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; - - if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; - - if (!is_version_nt()) - { - /* win9x doesn't do access checks, so try with full access first */ - if (!NtOpenSection( &ret, access | SECTION_MAP_READ | SECTION_MAP_WRITE, &attr )) return ret; - } - - status = NtOpenSection( &ret, access, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - - /* * Pipes */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e9fa0d2..7851675 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -189,7 +189,7 @@ @ stdcall CreateFileA(str long long ptr long long long) kernel32.CreateFileA # @ stub CreateFileMappingFromApp @ stub CreateFileMappingNumaW -@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) kernel32.CreateFileW @ stdcall CreateHardLinkA(str str ptr) kernel32.CreateHardLinkA @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW @@ -985,7 +985,7 @@ @ stdcall OpenEventW(long long wstr) @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById # @ stub OpenFileMappingFromApp -@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall OpenFileMappingW(long long wstr) # @ stub OpenGlobalizationUserSettingsKey @ stdcall OpenMutexW(long long wstr) # @ stub OpenPackageInfoByFullName diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 21ba6d2..5ab9005 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -617,3 +617,105 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionEx( CRITICAL_SECTION *cri if (ret) RtlRaiseStatus( ret ); return !ret; } + + +/*********************************************************************** + * File mappings + ***********************************************************************/ + + +/*********************************************************************** + * CreateFileMappingW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileMappingW( HANDLE file, LPSECURITY_ATTRIBUTES sa, DWORD protect, + DWORD size_high, DWORD size_low, LPCWSTR name ) +{ + static const int sec_flags = (SEC_FILE | SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | + SEC_NOCACHE | SEC_WRITECOMBINE | SEC_LARGE_PAGES); + HANDLE ret; + NTSTATUS status; + DWORD access, sec_type; + LARGE_INTEGER size; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + + sec_type = protect & sec_flags; + protect &= ~sec_flags; + if (!sec_type) sec_type = SEC_COMMIT; + + /* Win9x compatibility */ + if (!protect && !is_version_nt()) protect = PAGE_READONLY; + + switch(protect) + { + case PAGE_READONLY: + case PAGE_WRITECOPY: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; + break; + case PAGE_READWRITE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; + break; + case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READWRITE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + size.u.LowPart = size_low; + size.u.HighPart = size_high; + + if (file == INVALID_HANDLE_VALUE) + { + file = 0; + if (!size.QuadPart) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } + + get_create_object_attributes( &attr, &nameW, sa, name ); + + status = NtCreateSection( &ret, access, &attr, &size, protect, sec_type, file ); + if (status == STATUS_OBJECT_NAME_EXISTS) + SetLastError( ERROR_ALREADY_EXISTS ); + else + SetLastError( RtlNtStatusToDosError(status) ); + return ret; +} + + +/*********************************************************************** + * OpenFileMappingW (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE ret; + NTSTATUS status; + + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; + + if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; + + if (!is_version_nt()) + { + /* win9x doesn't do access checks, so try with full access first */ + if (!NtOpenSection( &ret, access | SECTION_MAP_READ | SECTION_MAP_WRITE, &attr )) return ret; + } + + status = NtOpenSection( &ret, access, &attr ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + return ret; +}

1 0

Alexandre Julliard : kernel32: Move critical section functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: aa7f8e930d730876fd560fe1aef94f392b210eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa7f8e930d730876fd560fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 16:59:39 2019 +0200 kernel32: Move critical section functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 ++-- dlls/kernel32/sync.c | 61 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/sync.c | 25 +++++++++++++++++ 4 files changed, 30 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be9ed3f..3f3f903 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -946,9 +946,9 @@ @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable # @ stub InitializeContext -@ stdcall InitializeCriticalSection(ptr) -@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stdcall InitializeCriticalSectionEx(ptr long long) +@ stdcall InitializeCriticalSection(ptr) ntdll.RtlInitializeCriticalSection +@ stdcall -import InitializeCriticalSectionAndSpinCount(ptr long) +@ stdcall -import InitializeCriticalSectionEx(ptr long long) @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5b8eef6..7667af9 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -308,67 +308,6 @@ DWORD WINAPI SignalObjectAndWait( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn } /*********************************************************************** - * InitializeCriticalSection (KERNEL32.@) - * - * Initialise a critical section before use. - * - * PARAMS - * crit [O] Critical section to initialise. - * - * RETURNS - * Nothing. If the function fails an exception is raised. - */ -void WINAPI InitializeCriticalSection( CRITICAL_SECTION *crit ) -{ - InitializeCriticalSectionEx( crit, 0, 0 ); -} - -/*********************************************************************** - * InitializeCriticalSectionAndSpinCount (KERNEL32.@) - * - * Initialise a critical section with a spin count. - * - * PARAMS - * crit [O] Critical section to initialise. - * spincount [I] Number of times to spin upon contention. - * - * RETURNS - * Success: TRUE. - * Failure: Nothing. If the function fails an exception is raised. - * - * NOTES - * spincount is ignored on uni-processor systems. - */ -BOOL WINAPI InitializeCriticalSectionAndSpinCount( CRITICAL_SECTION *crit, DWORD spincount ) -{ - return InitializeCriticalSectionEx( crit, spincount, 0 ); -} - -/*********************************************************************** - * InitializeCriticalSectionEx (KERNEL32.@) - * - * Initialise a critical section with a spin count and flags. - * - * PARAMS - * crit [O] Critical section to initialise. - * spincount [I] Number of times to spin upon contention. - * flags [I] CRITICAL_SECTION_ flags from winbase.h. - * - * RETURNS - * Success: TRUE. - * Failure: Nothing. If the function fails an exception is raised. - * - * NOTES - * spincount is ignored on uni-processor systems. - */ -BOOL WINAPI InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, DWORD flags ) -{ - NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); - if (ret) RtlRaiseStatus( ret ); - return !ret; -} - -/*********************************************************************** * MakeCriticalSectionGlobal (KERNEL32.@) */ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c81fd0e..e9fa0d2 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -802,8 +802,8 @@ @ stdcall InitializeConditionVariable(ptr) kernel32.InitializeConditionVariable # @ stub InitializeContext @ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection -@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount -@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) +@ stdcall InitializeCriticalSectionEx(ptr long long) # @ stub InitializeEnclave @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList # @ stub InitializeProcessForWsWatch diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index cd0348d..21ba6d2 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -592,3 +592,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteTimerQueueTimer( HANDLE queue, HANDLE timer, { return set_ntstatus( RtlDeleteTimer( queue, timer, event )); } + + +/*********************************************************************** + * Critical sections + ***********************************************************************/ + + +/*********************************************************************** + * InitializeCriticalSectionAndSpinCount (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionAndSpinCount( CRITICAL_SECTION *crit, DWORD count ) +{ + return !RtlInitializeCriticalSectionAndSpinCount( crit, count ); +} + +/*********************************************************************** + * InitializeCriticalSectionEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionEx( CRITICAL_SECTION *crit, DWORD spincount, + DWORD flags ) +{ + NTSTATUS ret = RtlInitializeCriticalSectionEx( crit, spincount, flags ); + if (ret) RtlRaiseStatus( ret ); + return !ret; +}

1 0

Alexandre Julliard : kernel32: Move wait functions to kernelbase.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: aa58676ae0cb1c5c48d772dadd1aa9c0e119fb76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa58676ae0cb1c5c48d772da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 1 17:44:38 2019 +0200 kernel32: Move wait functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 18 ++--- dlls/kernel32/kernel_private.h | 5 -- dlls/kernel32/process.c | 2 + dlls/kernel32/sync.c | 145 +------------------------------------ dlls/kernelbase/kernelbase.h | 5 ++ dlls/kernelbase/kernelbase.spec | 18 ++--- dlls/kernelbase/sync.c | 157 ++++++++++++++++++++++++++++++++++++++++ include/wincon.h | 9 ++- 8 files changed, 191 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa58676ae0cb1c5c48d7…

1 0