wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Francois Gouget : shell32/tests: Fix the known folder relative path check for multiple CD drives.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 8aaf9e64607f72806391843cfeb38adeb5b8aaa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aaf9e64607f72806391843c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 17:59:51 2021 +0200 shell32/tests: Fix the known folder relative path check for multiple CD drives. When there is more than one CD drive the extra drives typically get a folder called "Burn1", etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 62fa68eb20a..ea6f92ce827 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2067,7 +2067,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', "Missing slash\n"); - ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + ok_(__FILE__, known_folder->line)( + wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0 || + /* With multiple drives, there are multiple CD-burning folders */ + (IsEqualGUID(folderId, &FOLDERID_CDBurning) && + wcsnicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1, wcslen(kfd.pszRelativePath)) == 0), "Full path %s does not end with relative path %s\n", debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath));

1 0

Hugh McMaster : reg/tests: Test use of registry views with the 'query' operation.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 76b30097525f755f572d835b0187d9496941d985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b30097525f755f572d835b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 29 23:54:43 2021 +1000 reg/tests: Test use of registry views with the 'query' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index f5ba32f97e3..590d322c37c 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -132,6 +132,16 @@ static void test_command_syntax(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry view */ + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_query(void) @@ -296,6 +306,165 @@ static void test_query(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static const char *test9a = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n"; + +static const char *test9b = "\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_LOCAL_MACHINE\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n" + " Wine REG_SZ Second instance\r\n\r\n"; + +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); + dword = 0x123; + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "Wine", REG_SZ, "First instance", 15); + + add_key(hkey, "subkey", sam, &subkey); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); + dword = 0xabc; + add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "Wine", REG_SZ, "Second instance", 16); + + close_key(subkey); + close_key(hkey); +} + +static void test_registry_view_win32(void) +{ + BOOL is_wow64, is_win32; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + BOOL is_wow64, is_win64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + BOOL is_wow64; + DWORD r; + BYTE buf[512]; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try querying the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, 0); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:32", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, 0); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try querying the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + + read_reg_output("reg query HKLM\\" KEY_BASE " /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKLM\\" KEY_BASE " /s /reg:64", buf, sizeof(buf), &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test9b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(query) { DWORD r; @@ -307,4 +476,16 @@ START_TEST(query) test_command_syntax(); test_query(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Retry timer wait to address spurious failures.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: c2e9ee36d3de25523180823fb6c1c2c6159273a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e9ee36d3de25523180823f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 29 09:21:39 2021 +0200 ntoskrnl.exe/tests: Retry timer wait to address spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f1c72d8fdaf..918b4632c40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -756,6 +756,8 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); + /* aliasing makes it sometimes succeeds, try again in that case */ + if (ret == 0) ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = wait_single(&timer, -40 * 10000);

1 0

Francois Gouget : msvcr120/tests: Wcstof() depends on the system locale.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 858f2bf268c380caea66cb83b834da15a328d10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=858f2bf268c380caea66cb83… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 09:11:03 2021 +0200 msvcr120/tests: Wcstof() depends on the system locale. Arabic numerals are only recognized Arabic system locales. Also test a mix of Arabic and Roman numerals. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8002f6cb55..2a0e638be1b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -601,6 +601,7 @@ static void test__strtof(void) const char float3[] = "-3.402823466e+38"; const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ + BOOL is_arabic; char *end; float f; @@ -638,8 +639,12 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + is_arabic = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ARABIC); + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); + + f = p_wcstof(L"\x0662\x34\x0663", NULL); /* Arabic + Roman numerals mix */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 243.0 : 0.0), "f = %lf\n", f); if(!p_setlocale(LC_ALL, "Arabic")) { win_skip("Arabic locale not available\n"); @@ -649,8 +654,8 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); p_setlocale(LC_ALL, "C"); }

1 0

Hans Leidekker : secur32: Use blocking mode for DTLS sessions.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8aaf86b2dbb8ecb3f7094cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 29 13:56:41 2021 +0200 secur32: Use blocking mode for DTLS sessions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +------ dlls/secur32/schannel_gnutls.c | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9c7e98b32a4..515f01d08a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,11 +879,6 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } -static inline BOOL is_dtls_context(const struct schan_context *ctx) -{ - return (ctx->header_size == HEADER_SIZE_DTLS); -} - /*********************************************************************** * InitializeSecurityContextW */ @@ -1011,7 +1006,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; } } - else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; + else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 03124924644..bcf38e3f23f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,10 +292,6 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - struct schan_transport *t = (struct schan_transport *)transport; - SIZE_T count = 0; - - if (callbacks->get_buffer(t, &t->in, &count)) return 1; return 0; } @@ -309,7 +305,7 @@ static BOOL CDECL schan_create_session(schan_session *session, schan_credentials if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { - flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + flags |= GNUTLS_DATAGRAM; } err = pgnutls_init(s, flags);

1 0

Jacek Caban : gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: c359b4a0e96d06defef6c880cfbd4336739a4be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c359b4a0e96d06defef6c880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:42:09 2021 +0200 gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 41 +++++++++++------------------------------ dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6c41aa88feb..ca50792fb57 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -196,8 +196,7 @@ static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) */ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { - DWORD len; - DWORD bytes_written; + DWORD len, size; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); @@ -209,21 +208,16 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nBytes += emr->nSize; physDev->emh->nRecords++; - if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) - return FALSE; - } else { - DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); - len = physDev->emh->nBytes; - if (len > nEmfSize) { - nEmfSize += (nEmfSize / 2) + emr->nSize; - emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, nEmfSize); - if (!emh) return FALSE; - physDev->emh = emh; - } - memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, - emr->nSize); + size = HeapSize(GetProcessHeap(), 0, physDev->emh); + len = physDev->emh->nBytes; + if (len > size) { + size += (size / 2) + emr->nSize; + emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, size); + if (!emh) return FALSE; + physDev->emh = emh; } + memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, + emr->nSize); return TRUE; } @@ -337,7 +331,6 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; - DWORD bytes_written; int cap; TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); @@ -439,11 +432,6 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle( hFile ); - return 0; - } physDev->hFile = hFile; } @@ -508,14 +496,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->hFile) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) - { - CloseHandle( physDev->hFile ); - free_dc_ptr( dc ); - return 0; - } - - if (!WriteFile(physDev->hFile, physDev->emh, sizeof(*physDev->emh), + if (!WriteFile(physDev->hFile, physDev->emh, physDev->emh->nBytes, NULL, NULL)) { CloseHandle( physDev->hFile ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a3b51418ab7..fa00438ddfe 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3123,7 +3123,6 @@ static void test_enhmetafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); pts[0].x = pts[0].y = 10; @@ -3142,7 +3141,6 @@ static void test_enhmetafile_file(void) ok( ret, "PolyBezierTo failed\n" ); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseEnhMetaFile(dc);

1 0

Jacek Caban : gdi32: Remove no longer used disk-based metafile special-cases.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 80aed7cae6fe88c10af73c5550f0157093ff8bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80aed7cae6fe88c10af73c55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:58 2021 +0200 gdi32: Remove no longer used disk-based metafile special-cases. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile.c | 79 ++---------------------------------------------- dlls/gdi32/mfdrv/init.c | 10 ++---- 3 files changed, 5 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 71493c185b6..62fd9045b98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -464,7 +464,6 @@ extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; -extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; /* Format of comment record added by GetWinMetaFileBits */ #include <pshpack2.h> diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 1c831ef83ef..12fd10c98c9 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -60,15 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); -#include "pshpack1.h" -typedef struct -{ - DWORD dw1, dw2, dw3; - WORD w4; - CHAR filename[0x100]; -} METAHEADERDISK; -#include "poppack.h" - /****************************************************************** * MF_AddHandle @@ -231,56 +222,6 @@ HMETAFILE WINAPI GetMetaFileW( LPCWSTR lpFilename ) } -/****************************************************************** - * MF_LoadDiskBasedMetaFile - * - * Creates a new memory-based metafile from a disk-based one. - */ -static METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) -{ - METAHEADERDISK *mhd; - HANDLE hfile; - METAHEADER *mh2; - - if(mh->mtType != METAFILE_DISK) { - ERR("Not a disk based metafile\n"); - return NULL; - } - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if((hfile = CreateFileA(mhd->filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) { - WARN("Can't open file of disk based metafile\n"); - return NULL; - } - mh2 = MF_ReadMetaFile(hfile); - CloseHandle(hfile); - return mh2; -} - -/****************************************************************** - * MF_CreateMetaHeaderDisk - * - * Take a memory based METAHEADER and change it to a disk based METAHEADER - * associated with filename. Note: Trashes contents of old one. - */ -METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni ) -{ - METAHEADERDISK *mhd; - - mh = HeapReAlloc( GetProcessHeap(), 0, mh, - sizeof(METAHEADER) + sizeof(METAHEADERDISK)); - mh->mtType = METAFILE_DISK; - mhd = (METAHEADERDISK *)((char *)mh + sizeof(METAHEADER)); - - if( uni ) - WideCharToMultiByte(CP_ACP, 0, filename, -1, - mhd->filename, sizeof mhd->filename, NULL, NULL); - else - lstrcpynA( mhd->filename, filename, sizeof mhd->filename ); - return mh; -} - /* return a copy of the metafile bits, to be freed with HeapFree */ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) { @@ -288,13 +229,8 @@ static METAHEADER *get_metafile_bits( HMETAFILE hmf ) if (!mh) return NULL; - if (mh->mtType != METAFILE_DISK) - { - ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); - if (ret) memcpy( ret, mh, mh->mtSize * 2 ); - } - else ret = MF_LoadDiskBasedMetaFile( mh ); - + ret = HeapAlloc( GetProcessHeap(), 0, mh->mtSize * 2 ); + if (ret) memcpy( ret, mh, mh->mtSize * 2 ); GDI_ReleaseObj( hmf ); return ret; } @@ -1092,16 +1028,7 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) TRACE("(%p,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ - if(mh->mtType == METAFILE_DISK) - { - mh = MF_LoadDiskBasedMetaFile( mh ); - if (!mh) - { - GDI_ReleaseObj( hmf ); - return 0; - } - mf_copy = TRUE; - } + mfSize = mh->mtSize * 2; if (buf) { diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d64e754da84..b093e1abd63 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -330,22 +330,17 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) if (!(dc = MFDRV_AllocMetaFile())) return 0; physDev = (METAFILEDRV_PDEVICE *)dc->physDev; + physDev->mh->mtType = METAFILE_MEMORY; if (filename) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_DISK; if ((hFile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { free_dc_ptr( dc ); return 0; } physDev->hFile = hFile; - - /* Grow METAHEADER to include filename */ - physDev->mh = MF_CreateMetaHeaderDisk(physDev->mh, filename, TRUE); } - else /* memory based metafile */ - physDev->mh->mtType = METAFILE_MEMORY; TRACE("returning %p\n", physDev->dev.hdc); ret = physDev->dev.hdc; @@ -413,9 +408,8 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) return 0; } - if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ + if (physDev->hFile) /* disk based metafile */ { - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc );

1 0

Jacek Caban : gdi32: Delay writing metafile file until CloseMetaFile is called.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: 0c9bc0ed6bc616c50e020552a93233e64e8a9262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9bc0ed6bc616c50e020552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:41 2021 +0200 gdi32: Delay writing metafile file until CloseMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/init.c | 50 +++++++++++---------------------------------- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index fe7aae631d7..d64e754da84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -325,7 +325,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; - DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -340,12 +339,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), - &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle (hFile ); - return 0; - } physDev->hFile = hFile; /* Grow METAHEADER to include filename */ @@ -422,19 +415,13 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) { - free_dc_ptr( dc ); - return 0; - } - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ - if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), + if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; } CloseHandle(physDev->hFile); - physDev->mh->mtType = METAFILE_DISK; } return dc; @@ -481,32 +468,19 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen) METAHEADER *mh; METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - switch(physDev->mh->mtType) + len = physDev->mh->mtSize * 2 + rlen; + /* reallocate memory if needed */ + size = HeapSize( GetProcessHeap(), 0, physDev->mh ); + if (len > size) { - case METAFILE_MEMORY: - len = physDev->mh->mtSize * 2 + rlen; - /* reallocate memory if needed */ - size = HeapSize( GetProcessHeap(), 0, physDev->mh ); - if (len > size) - { - /*expand size*/ - size += size / 2 + rlen; - mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); - if (!mh) return FALSE; - physDev->mh = mh; - TRACE("Reallocated metafile: new size is %d\n",size); - } - memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); - break; - case METAFILE_DISK: - TRACE("Writing record to disk\n"); - if (!WriteFile(physDev->hFile, mr, rlen, NULL, NULL)) - return FALSE; - break; - default: - ERR("Unknown metafile type %d\n", physDev->mh->mtType ); - return FALSE; + /*expand size*/ + size += size / 2 + rlen; + mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); + if (!mh) return FALSE; + physDev->mh = mh; + TRACE("Reallocated metafile: new size is %d\n",size); } + memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); physDev->mh->mtSize += rlen / 2; physDev->mh->mtMaxRecord = max(physDev->mh->mtMaxRecord, rlen / 2); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index dcd6cea0c2b..a3b51418ab7 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3043,7 +3043,6 @@ static void test_metafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); ret = MoveToEx(dc, 1, 1, NULL); @@ -3056,7 +3055,6 @@ static void test_metafile_file(void) ok( ret, "Ellipse error %d.\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseMetaFile(dc);

1 0

Jacek Caban : gdi32/tests: Add metafile file creation tests.
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: d19ac108f91d19f7dd06bb48a1c00dfaa07fd387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19ac108f91d19f7dd06bb48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:30 2021 +0200 gdi32/tests: Add metafile file creation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 171 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 062eb4c8a44..dcd6cea0c2b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3015,6 +3015,175 @@ static void test_mf_Blank(void) ok( ret, "DeleteMetaFile(%p) error %d\n", hMetafile, GetLastError()); } +static void test_metafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HMETAFILE metafile; + POINT oldpoint; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateMetaFileA(mf_name); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + ret = MoveToEx(dc, 1, 1, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(dc, 2, 2); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = MoveToEx(dc, 1, 1, &oldpoint); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = Ellipse(dc, 0, 0, 2, 2); + ok( ret, "Ellipse error %d.\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + ok(!memcmp(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS)), "unexpected file content\n"); + CloseHandle(file); + + if (compare_mf_bits(metafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) + { + dump_mf_bits(metafile, "mf_Graphics"); + EnumMetaFile(0, metafile, mf_enum_proc, 0); + } + + DeleteMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + +static void test_enhmetafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HENHMETAFILE metafile; + POINT pts[4]; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateEnhMetaFileA(NULL, mf_name, NULL, NULL); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + pts[0].x = pts[0].y = 10; + pts[1].x = pts[1].y = 20; + pts[2].x = pts[2].y = 15; + pts[3].x = pts[3].y = 25; + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO16 */ + ok( ret, "PolyBezierTo failed\n" ); + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER16 */ + ok( ret, "PolyBezier failed\n" ); + + pts[0].x = pts[0].y = 32769; + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER */ + ok( ret, "PolyBezier failed\n" ); + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO */ + ok( ret, "PolyBezierTo failed\n" ); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseEnhMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + CloseHandle(file); + + if (compare_emf_bits(metafile, EMF_BEZIER_BITS, sizeof(EMF_BEZIER_BITS), "emf_Bezier", FALSE) != 0) + { + dump_emf_bits(metafile, "emf_Bezier"); + dump_emf_records(metafile, "emf_Bezier"); + } + + DeleteEnhMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseEnhMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6107,6 +6276,7 @@ START_TEST(metafile) test_emf_GradientFill(); test_emf_WorldTransform(); test_emf_text_extents(); + test_enhmetafile_file(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6120,6 +6290,7 @@ START_TEST(metafile) test_mf_clipping(); test_mf_GetPath(); test_mf_SetLayout(); + test_metafile_file(); /* For metafile conversions */ test_mf_conversions();

1 0

Huw Davies : nsi: Implement NsiEnumerateObjectsAllParameterEx().
by Alexandre Julliard 29 Jun '21

29 Jun '21

Module: wine Branch: master Commit: bc4db065c06764e0488e965134283131200bc33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4db065c06764e0488e9651… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 29 08:04:22 2021 +0100 nsi: Implement NsiEnumerateObjectsAllParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d3292af9ee3..981fcdba954 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -25,10 +25,16 @@ #include "iptypes.h" #include "netiodef.h" #include "wine/nsi.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static inline HANDLE get_nsi_device( void ) +{ + return CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); +} + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) @@ -46,7 +52,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ struct nsi_enumerate_all_ex params; DWORD err; - FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); params.unknown[0] = 0; @@ -72,7 +78,52 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD out_size, received, err = ERROR_SUCCESS; + HANDLE device = get_nsi_device(); + struct nsiproxy_enumerate_all in; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + out_size = sizeof(DWORD) + + (params->key_size + params->rw_size + params->dynamic_size + params->static_size) * params->count; + + out = heap_alloc( out_size ); + if (!out) + { + CloseHandle( device ); + return ERROR_OUTOFMEMORY; + } + + in.module = *params->module; + in.first_arg = params->first_arg; + in.second_arg = params->second_arg; + in.table = params->table; + in.key_size = params->key_size; + in.rw_size = params->rw_size; + in.dynamic_size = params->dynamic_size; + in.static_size = params->static_size; + in.count = params->count; + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_ENUMERATE_ALL, &in, sizeof(in), out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS || err == ERROR_MORE_DATA) + { + params->count = *(DWORD *)out; + ptr = out + sizeof(DWORD); + if (params->key_size) memcpy( params->key_data, ptr, params->key_size * params->count ); + ptr += params->key_size * in.count; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size * params->count ); + ptr += params->rw_size * in.count; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size * params->count ); + ptr += params->dynamic_size * in.count; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size * params->count ); + } + + heap_free( out ); + CloseHandle( device ); + + return err; } void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data )

1 0

← Newer
1
2
3
4
5
6
7
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021