September 2022 - Wine-commits

Alistair Leslie-Hughes : oledb32/tests: Free returned property set memory.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 5308c71cfd1f79e43b016d92e0b7b2a35b0bf195 URL: https://gitlab.winehq.org/wine/wine/-/commit/5308c71cfd1f79e43b016d92e0b7b2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 18 12:12:44 2022 +1000 oledb32/tests: Free returned property set memory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36312 --- dlls/oledb32/tests/marshal.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 747995cfe67..88af99a0659 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -219,6 +219,22 @@ static IDBProperties Test_DBProperties = &Test_DBProperties_Vtbl }; +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + ULONG i; + + for (i = 0; i < count; i++) + { + ULONG p; + + for (p = 0; p < propset[i].cProperties; p++) + VariantClear(&propset[i].rgProperties[p].vValue); + + CoTaskMemFree(propset[i].rgProperties); + } + CoTaskMemFree(propset); +} + static void test_IDBProperties(void) { HRESULT hr; @@ -257,6 +273,8 @@ static void test_IDBProperties(void) ok(propsets->cProperties == 1, "Expected property count of 1 but got %ld\n", propsets->cProperties); ok(IsEqualGUID(&propsets->guidPropertySet, &IID_IDBProperties), "Unexpected guid for property set\n"); + free_dbpropset(propset_count, propsets); + IDBProperties_Release(pProxy); end_host_object(tid, thread);

1 0

Eric Pouech : jscript: Fix GCC 12.2 warning.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 4bdf92cb7fa9bcd06eef318c57ae1c30fb5a2dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bdf92cb7fa9bcd06eef318c57ae1c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 16 18:01:53 2022 +0200 jscript: Fix GCC 12.2 warning. When initializing a jsstr_inline_t with a len < 3, the size passed for the allocation is smaller then the size of the structure (as the later is rounded up to the alignment = 4 bytes). GCC 12.2 complains about this when dereferencing the pointer to the structure as the size passed for allocation is smaller than the size of the structure. The warning is fixed by using flexible array member in jsstr_inline_t. Given the rounding behavior in memory allocation, this should not change the size of allocated blocks. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/jscript/jsstr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index f42c95de5ea..290ca6e8119 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -79,7 +79,7 @@ static inline BOOL jsstr_is_rope(jsstr_t *str) typedef struct { jsstr_t str; - WCHAR buf[1]; + WCHAR buf[]; } jsstr_inline_t; typedef struct {

1 0

Alistair Leslie-Hughes : wininet: Use standard HTTP_ADD Flags.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: b114b2c9eb14c1f1f934141c955c8ea4ba54e83e URL: https://gitlab.winehq.org/wine/wine/-/commit/b114b2c9eb14c1f1f934141c955c8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 18 11:07:17 2022 +1000 wininet: Use standard HTTP_ADD Flags. --- dlls/wininet/http.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 55698467cda..be4572442f0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -58,11 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -#define HTTP_ADDHDR_FLAG_ADD 0x20000000 -#define HTTP_ADDHDR_FLAG_ADD_IF_NEW 0x10000000 -#define HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA 0x40000000 -#define HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON 0x01000000 -#define HTTP_ADDHDR_FLAG_REPLACE 0x80000000 #define HTTP_ADDHDR_FLAG_REQ 0x02000000 #define COLLECT_TIME 60000 @@ -1591,7 +1586,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); HTTP_ProcessHeader(request, header, authorization, - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(authorization); } else @@ -1620,7 +1615,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); HTTP_ProcessHeader(request, header, authorization, - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(data); heap_free(authorization); } @@ -3422,9 +3417,9 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { if (!*lpszAcceptTypes[i]) continue; HTTP_ProcessHeader(request, L"Accept", lpszAcceptTypes[i], - HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | + HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | - (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); + (i == 0 ? (HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD) : 0)); } } @@ -4945,7 +4940,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength ) - HTTP_HttpAddRequestHeadersW(request, lpszHeaders, dwHeaderLength, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); + HTTP_HttpAddRequestHeadersW(request, lpszHeaders, dwHeaderLength, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE); do { @@ -4974,7 +4969,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { HTTP_ProcessHeader(request, L"Connection", L"Keep-Alive", - HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); + HTTP_ADDHDR_FLAG_REQ | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); } HTTP_InsertAuthorization(request, request->authInfo, L"Authorization"); HTTP_InsertAuthorization(request, request->proxyAuthInfo, L"Proxy-Authorization"); @@ -5060,7 +5055,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - + if (HTTP_GetResponseHeaders(request, &responseLen)) { http_release_netconn(request, FALSE); @@ -5991,7 +5986,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) /* Add status code */ HTTP_ProcessHeader(request, L"Status", status_code, - HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); + HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); heap_free(request->version); heap_free(request->statusText); @@ -6104,7 +6099,7 @@ static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer) * */ -#define COALESCEFLAGS (HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) +#define COALESCEFLAGS (HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA|HTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON) static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR value, DWORD dwModifier) { @@ -6118,17 +6113,17 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR EnterCriticalSection( &request->headers_section ); /* REPLACE wins out over ADD */ - if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) - dwModifier &= ~HTTP_ADDHDR_FLAG_ADD; - - if (dwModifier & HTTP_ADDHDR_FLAG_ADD) + if (dwModifier & HTTP_ADDREQ_FLAG_REPLACE) + dwModifier &= ~HTTP_ADDREQ_FLAG_ADD; + + if (dwModifier & HTTP_ADDREQ_FLAG_ADD) index = -1; else index = HTTP_GetCustomHeaderIndex(request, field, 0, request_only); if (index >= 0) { - if (dwModifier & HTTP_ADDHDR_FLAG_ADD_IF_NEW) + if (dwModifier & HTTP_ADDREQ_FLAG_ADD_IF_NEW) { LeaveCriticalSection( &request->headers_section ); return ERROR_HTTP_INVALID_HEADER; @@ -6162,7 +6157,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR else lphttpHdr->wFlags &= ~HDR_ISREQUEST; - if (dwModifier & HTTP_ADDHDR_FLAG_REPLACE) + if (dwModifier & HTTP_ADDREQ_FLAG_REPLACE) { HTTP_DeleteCustomHeader( request, index ); @@ -6193,12 +6188,12 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR INT origlen = lstrlenW(lphttpHdr->lpszValue); INT valuelen = lstrlenW(value); - if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA) + if (dwModifier & HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA) { ch = ','; lphttpHdr->wFlags |= HDR_COMMADELIMITED; } - else if (dwModifier & HTTP_ADDHDR_FLAG_COALESCE_WITH_SEMICOLON) + else if (dwModifier & HTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON) { ch = ';'; lphttpHdr->wFlags |= HDR_COMMADELIMITED;

1 0

Nikolay Sivov : kernelbase: Add OpenFileMappingFromApp().
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 40d0e55d4c03be43a7b5a5906496a588f61ca00c URL: https://gitlab.winehq.org/wine/wine/-/commit/40d0e55d4c03be43a7b5a5906496a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 15:50:47 2022 +0300 kernelbase: Add OpenFileMappingFromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/sync.c | 18 ++++++++++++++++++ dlls/kernelbase/tests/process.c | 27 +++++++++++++++++++++++++++ include/winbase.h | 1 + 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index feb1fce8f7a..961c2bf45ee 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1015,7 +1015,7 @@ @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFileById(long ptr long long ptr long) -# @ stub OpenFileMappingFromApp +@ stdcall OpenFileMappingFromApp(long long wstr) @ stdcall OpenFileMappingW(long long wstr) # @ stub OpenGlobalizationUserSettingsKey @ stdcall OpenMutexW(long long wstr) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 5c4fb76536f..1526db25f33 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -971,6 +971,24 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingW( DWORD access, BOOL inherit, LP } +/*********************************************************************** + * OpenFileMappingFromApp (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileMappingFromApp( ULONG access, BOOL inherit, LPCWSTR name ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE ret; + + if (!get_open_object_attributes( &attr, &nameW, inherit, name )) return 0; + + if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; + + if (!set_ntstatus( NtOpenSection( &ret, access, &attr ))) return 0; + return ret; +} + + /*********************************************************************** * Condition variables ***********************************************************************/ diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 62debfb9861..d86dc38afcd 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -36,6 +36,7 @@ static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, S static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); static LPVOID (WINAPI *pVirtualAlloc2FromApp)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); +static HANDLE (WINAPI *pOpenFileMappingFromApp)( ULONG, BOOL, LPCWSTR); static void test_CompareObjectHandles(void) { @@ -324,6 +325,30 @@ static void test_VirtualAlloc2FromApp(void) } } +static void test_OpenFileMappingFromApp(void) +{ + HANDLE file, mapping; + + if (!pOpenFileMappingFromApp) + { + win_skip("OpenFileMappingFromApp is not available.\n"); + return; + } + + file = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READ, 0, 4090, "foo"); + ok(!!file, "Failed to create a mapping.\n"); + + mapping = pOpenFileMappingFromApp(FILE_MAP_READ, FALSE, L"foo"); + ok(!!mapping, "Failed to open a mapping.\n"); + CloseHandle(mapping); + + mapping = pOpenFileMappingFromApp(FILE_MAP_EXECUTE, FALSE, L"foo"); + ok(!!mapping, "Failed to open a mapping.\n"); + CloseHandle(mapping); + + CloseHandle(file); +} + static void init_funcs(void) { HMODULE hmod = GetModuleHandleA("kernelbase.dll"); @@ -331,6 +356,7 @@ static void init_funcs(void) #define X(f) { p##f = (void*)GetProcAddress(hmod, #f); } X(CompareObjectHandles); X(MapViewOfFile3); + X(OpenFileMappingFromApp); X(VirtualAlloc2); X(VirtualAlloc2FromApp); X(VirtualAllocFromApp); @@ -346,4 +372,5 @@ START_TEST(process) test_VirtualAlloc2(); test_VirtualAllocFromApp(); test_VirtualAlloc2FromApp(); + test_OpenFileMappingFromApp(); } diff --git a/include/winbase.h b/include/winbase.h index 0a8409c10e1..83282ec8af5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2537,6 +2537,7 @@ WINBASEAPI HFILE WINAPI OpenFile(LPCSTR,OFSTRUCT*,UINT); WINBASEAPI HANDLE WINAPI OpenFileMappingA(DWORD,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI OpenFileMappingW(DWORD,BOOL,LPCWSTR); #define OpenFileMapping WINELIB_NAME_AW(OpenFileMapping) +WINBASEAPI HANDLE WINAPI OpenFileMappingFromApp(ULONG,BOOL,LPCWSTR); WINBASEAPI HANDLE WINAPI OpenJobObjectA(DWORD,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI OpenJobObjectW(DWORD,BOOL,LPCWSTR); #define OpenJobObject WINELIB_NAME_AW(OpenJobObject)

1 0

Nikolay Sivov : kernelbase: Add CreateFileMappingFromApp().
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 3ede82e2a8dedcd90f4a2098581e2b74d8d84093 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ede82e2a8dedcd90f4a2098581e2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 17:26:32 2022 +0300 kernelbase: Add CreateFileMappingFromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/sync.c | 10 +++++++++- dlls/kernelbase/tests/process.c | 43 +++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 961c2bf45ee..0e9f0d7febd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -190,7 +190,7 @@ @ stdcall CreateFiberEx(long long long ptr ptr) @ stdcall CreateFile2(wstr long long long ptr) @ stdcall CreateFileA(str long long ptr long long long) -# @ stub CreateFileMappingFromApp +@ stdcall CreateFileMappingFromApp(long ptr long int64 wstr) @ stdcall CreateFileMappingNumaW(long ptr long long long wstr long) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 1526db25f33..60b33af99c3 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -879,7 +879,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeCriticalSectionEx( CRITICAL_SECTION *cri * File mappings ***********************************************************************/ - /*********************************************************************** * CreateFileMappingW (kernelbase.@) */ @@ -947,6 +946,15 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileMappingW( HANDLE file, LPSECURITY_ATTR } +/*********************************************************************** + * CreateFileMappingFromApp (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileMappingFromApp( HANDLE file, LPSECURITY_ATTRIBUTES sa, ULONG protect, + ULONG64 size, LPCWSTR name ) +{ + return CreateFileMappingW( file, sa, protect, size << 32, size, name ); +} + /*********************************************************************** * OpenFileMappingW (kernelbase.@) */ diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index d86dc38afcd..d5dddda0733 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -30,6 +30,8 @@ #include "wine/test.h" +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); + static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, SIZE_T size, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); @@ -37,6 +39,7 @@ static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM static LPVOID (WINAPI *pVirtualAlloc2FromApp)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static HANDLE (WINAPI *pOpenFileMappingFromApp)( ULONG, BOOL, LPCWSTR); +static HANDLE (WINAPI *pCreateFileMappingFromApp)(HANDLE, PSECURITY_ATTRIBUTES, ULONG, ULONG64, PCWSTR); static void test_CompareObjectHandles(void) { @@ -327,7 +330,10 @@ static void test_VirtualAlloc2FromApp(void) static void test_OpenFileMappingFromApp(void) { + OBJECT_BASIC_INFORMATION info; HANDLE file, mapping; + NTSTATUS status; + ULONG length; if (!pOpenFileMappingFromApp) { @@ -340,26 +346,62 @@ static void test_OpenFileMappingFromApp(void) mapping = pOpenFileMappingFromApp(FILE_MAP_READ, FALSE, L"foo"); ok(!!mapping, "Failed to open a mapping.\n"); + status = pNtQueryObject(mapping, ObjectBasicInformation, &info, sizeof(info), &length); + ok(!status, "Failed to get object information.\n"); + ok(info.GrantedAccess == SECTION_MAP_READ, "Unexpected access mask %#lx.\n", info.GrantedAccess); CloseHandle(mapping); mapping = pOpenFileMappingFromApp(FILE_MAP_EXECUTE, FALSE, L"foo"); ok(!!mapping, "Failed to open a mapping.\n"); + status = pNtQueryObject(mapping, ObjectBasicInformation, &info, sizeof(info), &length); + ok(!status, "Failed to get object information.\n"); + todo_wine + ok(info.GrantedAccess == SECTION_MAP_EXECUTE, "Unexpected access mask %#lx.\n", info.GrantedAccess); CloseHandle(mapping); CloseHandle(file); } +static void test_CreateFileMappingFromApp(void) +{ + OBJECT_BASIC_INFORMATION info; + NTSTATUS status; + ULONG length; + HANDLE file; + + if (!pCreateFileMappingFromApp) + { + win_skip("CreateFileMappingFromApp is not available.\n"); + return; + } + + file = pCreateFileMappingFromApp(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 1024, L"foo"); + ok(!!file || broken(!file) /* Win8 */, "Failed to create a mapping, error %lu.\n", GetLastError()); + if (!file) return; + + status = pNtQueryObject(file, ObjectBasicInformation, &info, sizeof(info), &length); + ok(!status, "Failed to get object information.\n"); + ok(info.GrantedAccess & SECTION_MAP_EXECUTE, "Unexpected access mask %#lx.\n", info.GrantedAccess); + + CloseHandle(file); +} + static void init_funcs(void) { HMODULE hmod = GetModuleHandleA("kernelbase.dll"); #define X(f) { p##f = (void*)GetProcAddress(hmod, #f); } X(CompareObjectHandles); + X(CreateFileMappingFromApp); X(MapViewOfFile3); X(OpenFileMappingFromApp); X(VirtualAlloc2); X(VirtualAlloc2FromApp); X(VirtualAllocFromApp); + + hmod = GetModuleHandleA("ntdll.dll"); + + X(NtQueryObject); #undef X } @@ -373,4 +415,5 @@ START_TEST(process) test_VirtualAllocFromApp(); test_VirtualAlloc2FromApp(); test_OpenFileMappingFromApp(); + test_CreateFileMappingFromApp(); } diff --git a/include/winbase.h b/include/winbase.h index 83282ec8af5..ff96fc1072f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1876,6 +1876,7 @@ WINBASEAPI HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBU WINBASEAPI HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR); WINBASEAPI HANDLE WINAPI CreateFileMappingW(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR); #define CreateFileMapping WINELIB_NAME_AW(CreateFileMapping) +WINBASEAPI HANDLE WINAPI CreateFileMappingFromApp(HANDLE,PSECURITY_ATTRIBUTES,ULONG,ULONG64,PCWSTR); WINBASEAPI HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,ULONG_PTR,DWORD); WINBASEAPI HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR); WINBASEAPI HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);

1 0

Nikolay Sivov : kernelbase: Add MapViewOfFileFromApp().
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 1ceba3533e498d070aedba812b6605d41bc20782 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ceba3533e498d070aedba812b6605… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 18:15:37 2022 +0300 kernelbase: Add MapViewOfFileFromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 9 +++++++++ dlls/kernelbase/tests/process.c | 37 +++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 0e9f0d7febd..c9b8649c800 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -984,7 +984,7 @@ @ stdcall MapViewOfFile3(long long ptr int64 long long long ptr long) @ stdcall MapViewOfFileEx(long long long long long ptr) @ stdcall MapViewOfFileExNuma(long long long long long ptr long) -# @ stub MapViewOfFileFromApp +@ stdcall MapViewOfFileFromApp(long long int64 long) @ stdcall MoveFileExW(wstr wstr long) # @ stub MoveFileWithProgressTransactedW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 14d8c4817a5..412d80f5cfd 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -237,6 +237,15 @@ LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFileEx( HANDLE handle, DWORD access, DW return addr; } + +/*********************************************************************** + * MapViewOfFileFromApp (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFileFromApp( HANDLE handle, ULONG access, ULONG64 offset, SIZE_T size ) +{ + return MapViewOfFile( handle, access, offset << 32, offset, size ); +} + /*********************************************************************** * MapViewOfFile3 (kernelbase.@) */ diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index d5dddda0733..ed213f1f7b6 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -40,6 +40,7 @@ static LPVOID (WINAPI *pVirtualAlloc2FromApp)(HANDLE, void *, SIZE_T, DWORD, DWO static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static HANDLE (WINAPI *pOpenFileMappingFromApp)( ULONG, BOOL, LPCWSTR); static HANDLE (WINAPI *pCreateFileMappingFromApp)(HANDLE, PSECURITY_ATTRIBUTES, ULONG, ULONG64, PCWSTR); +static LPVOID (WINAPI *pMapViewOfFileFromApp)(HANDLE, ULONG, ULONG64, SIZE_T); static void test_CompareObjectHandles(void) { @@ -386,6 +387,40 @@ static void test_CreateFileMappingFromApp(void) CloseHandle(file); } +static void test_MapViewOfFileFromApp(void) +{ + static const char testfile[] = "testfile.xxx"; + HANDLE file, mapping; + void *ptr; + BOOL ret; + + if (!pMapViewOfFileFromApp) + { + win_skip("MapViewOfFileFromApp() is not supported.\n"); + return; + } + + SetLastError(0xdeadbeef); + file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "Failed to create a file, error %lu.\n", GetLastError() ); + SetFilePointer( file, 12288, NULL, FILE_BEGIN ); + SetEndOfFile( file ); + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL ); + ok( mapping != 0, "Failed to create file mapping, error %lu.\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ptr = pMapViewOfFileFromApp( mapping, PAGE_EXECUTE_READWRITE, 0, 4096 ); + ok( ptr != NULL, "Mapping failed, error %lu.\n", GetLastError() ); + UnmapViewOfFile( ptr ); + + CloseHandle( mapping ); + CloseHandle( file ); + ret = DeleteFileA( testfile ); + ok(ret, "Failed to delete a test file.\n"); +} + static void init_funcs(void) { HMODULE hmod = GetModuleHandleA("kernelbase.dll"); @@ -394,6 +429,7 @@ static void init_funcs(void) X(CompareObjectHandles); X(CreateFileMappingFromApp); X(MapViewOfFile3); + X(MapViewOfFileFromApp); X(OpenFileMappingFromApp); X(VirtualAlloc2); X(VirtualAlloc2FromApp); @@ -416,4 +452,5 @@ START_TEST(process) test_VirtualAlloc2FromApp(); test_OpenFileMappingFromApp(); test_CreateFileMappingFromApp(); + test_MapViewOfFileFromApp(); } diff --git a/include/winbase.h b/include/winbase.h index ff96fc1072f..3cfc4649c7d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2493,6 +2493,7 @@ WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFile3(HANDLE,HANDLE,PVOID,ULONG64,SIZE_T,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); +WINBASEAPI LPVOID WINAPI MapViewOfFileFromApp(HANDLE,ULONG,ULONG64,SIZE_T); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR); #define MoveFile WINELIB_NAME_AW(MoveFile)

1 0

Gijs Vermeulen : ntdll: Add RtlDosPathNameToRelativeNtPathName_U.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 1b3f61d7a596c4673a734243d166cdabf028537b URL: https://gitlab.winehq.org/wine/wine/-/commit/1b3f61d7a596c4673a734243d166cd… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 18 23:52:23 2022 +0200 ntdll: Add RtlDosPathNameToRelativeNtPathName_U. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53700 --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/path.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7469763e7dc..244f9acd2ab 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -621,6 +621,7 @@ # @ stub RtlDosApplyFileIsolationRedirection_Ustr @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U_WithStatus(wstr ptr ptr ptr) +@ stdcall RtlDosPathNameToRelativeNtPathName_U(wstr ptr ptr ptr) @ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus(wstr ptr ptr ptr) @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) # @ stub RtlDosSearchPath_Ustr diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cccd000a6c6..37ad4bbcea2 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -330,6 +330,15 @@ NTSTATUS WINAPI RtlDosPathNameToRelativeNtPathName_U_WithStatus(const WCHAR *dos return RtlDosPathNameToNtPathName_U_WithStatus(dos_path, ntpath, file_part, NULL); } +/************************************************************************** + * RtlDosPathNameToRelativeNtPathName_U [NTDLL.@] + */ +BOOLEAN WINAPI RtlDosPathNameToRelativeNtPathName_U(const WCHAR *dos_path, UNICODE_STRING *ntpath, + WCHAR **file_part, RTL_RELATIVE_NAME *relative) +{ + return RtlDosPathNameToRelativeNtPathName_U_WithStatus(dos_path, ntpath, file_part, relative) == STATUS_SUCCESS; +} + /************************************************************************** * RtlReleaseRelativeName [NTDLL.@] */

1 0

Shaun Ren : msvcrt: Fix strncmp return value.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: 6d2a9af43b6e40ced85fb62544f4a07776f3d237 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d2a9af43b6e40ced85fb62544f4a0… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Sep 6 14:59:05 2022 -0400 msvcrt: Fix strncmp return value. Some programs, such as Final Fantasy IV (3D remake), expect strncmp to return exactly +/-1 when the strings are not equal. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- configure | 2 + configure.ac | 2 + dlls/msvcr100/tests/msvcr100.c | 47 +++++++++++++++++++++++ dlls/msvcr110/tests/msvcr110.c | 38 ++++++++++++++++++ dlls/msvcr120/tests/msvcr120.c | 36 +++++++++++++++++ dlls/msvcr70/tests/Makefile.in | 4 ++ dlls/msvcr70/tests/msvcr70.c | 87 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr71/tests/Makefile.in | 4 ++ dlls/msvcr71/tests/msvcr71.c | 87 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr80/tests/msvcr80.c | 46 ++++++++++++++++++++++ dlls/msvcr90/tests/msvcr90.c | 45 ++++++++++++++++++++++ dlls/msvcrt/string.c | 7 ++++ dlls/msvcrt/tests/string.c | 15 ++++++-- dlls/ucrtbase/tests/string.c | 32 ++++++++++++++++ 14 files changed, 449 insertions(+), 3 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: wine Branch: master Commit: e04a406a0ab5a3397315334c1195127613226c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/e04a406a0ab5a3397315334c119512… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Sep 17 12:50:39 2022 +0300 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1c5c682e6e8..a070f267e8e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-08-19 17:01+0300\n" +"PO-Revision-Date: 2022-09-17 12:50+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15248,7 +15248,7 @@ msgstr "" #: programs/notepad/notepad.rc:89 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "Eil. %ld, Stulp. %ld" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..."

1 0

Zebediah Figura : tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in test_bufinfo_instruction().
by Alexandre Julliard 19 Sep '22

19 Sep '22

Module: vkd3d Branch: master Commit: 7393e6ed135aed555d431540006a691504db9b5f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7393e6ed135aed555d431540006a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 16 00:13:25 2022 -0500 tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in test_bufinfo_instruction(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9fc199bc..531ea1a4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34655,6 +34655,8 @@ static void test_bufinfo_instruction(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &test->expected_result); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12Resource_Release(buffer); }

1 0