January 2018 - Wine-Commits

Józef Kucia : dxgi: Implement IDXGIAdapter3.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 7f593aa72545a789b1fcd47b72546811a633401f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f593aa72545a789b1fcd47b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:56 2018 +0100 dxgi: Implement IDXGIAdapter3. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 122 +++++++++++++++++++++++++++++++++++----------- dlls/dxgi/device.c | 8 +-- dlls/dxgi/dxgi_private.h | 6 +-- dlls/dxgi/factory.c | 2 +- dlls/dxgi/output.c | 6 +-- dlls/dxgi/swapchain.c | 2 +- include/wine/winedxgi.idl | 2 +- 7 files changed, 107 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f593aa72545a789b1fc…

1 0

Nikolay Sivov : dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: aae9700accdcb5526d5d7092442737a5437c8c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae9700accdcb5526d5d7092… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:28 2018 +0300 dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c6c9d5e..765a723 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -934,7 +934,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi.SizeOfStruct = miw64.SizeOfStruct; + mi.SizeOfStruct = ModuleInfo->SizeOfStruct; mi.BaseOfImage = miw64.BaseOfImage; mi.ImageSize = miw64.ImageSize; mi.TimeDateStamp = miw64.TimeDateStamp; @@ -968,7 +968,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - miw.SizeOfStruct = miw64.SizeOfStruct; + miw.SizeOfStruct = ModuleInfo->SizeOfStruct; miw.BaseOfImage = miw64.BaseOfImage; miw.ImageSize = miw64.ImageSize; miw.TimeDateStamp = miw64.TimeDateStamp; @@ -1003,7 +1003,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi64.SizeOfStruct = miw64.SizeOfStruct; + mi64.SizeOfStruct = ModuleInfo->SizeOfStruct; mi64.BaseOfImage = miw64.BaseOfImage; mi64.ImageSize = miw64.ImageSize; mi64.TimeDateStamp = miw64.TimeDateStamp;

1 0

Nikolay Sivov : dbghelp: Use correct destination buffer length when initializing module data.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 1d3c14d2d1ae9361bb3f1645c1ae19d9683d5e61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d3c14d2d1ae9361bb3f1645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 16:46:30 2018 +0300 dbghelp: Use correct destination buffer length when initializing module data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 9256a8f..6c7f2dc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -100,7 +100,8 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) void module_set_module(struct module* module, const WCHAR* name) { - module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName)); + module_fill_module(name, module->module.ModuleName, + sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); } const WCHAR *get_wine_loader_name(void) @@ -910,7 +911,7 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (!GetModuleInformation(hProcess, hMods[i], &mi, sizeof(mi)) || !GetModuleBaseNameW(hProcess, hMods[i], baseW, sizeof(baseW) / sizeof(WCHAR))) continue; - module_fill_module(baseW, modW, sizeof(modW) / sizeof(CHAR)); + module_fill_module(baseW, modW, sizeof(modW) / sizeof(modW[0])); EnumLoadedModulesCallback(modW, (DWORD_PTR)mi.lpBaseOfDll, mi.SizeOfImage, UserContext); }

1 0

Józef Kucia : dxgi: Require window when creating swapchain.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 7e72c2d4ac8def96cec78114fc6fe292ad68e28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e72c2d4ac8def96cec78114… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 30 15:54:55 2018 +0100 dxgi: Require window when creating swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/dxgi/factory.c | 6 +----- dlls/dxgi/tests/device.c | 14 +++++++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 2b18110..7c2b3ba 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -252,7 +252,7 @@ static void test_create_device(void) swapchain_desc.OutputWindow = NULL; hr = D3D10CreateDeviceAndSwapChain1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, supported_feature_level, D3D10_1_SDK_VERSION, &swapchain_desc, &swapchain, &device); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "D3D10CreateDeviceAndSwapChain1 returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ca71718..2625e08 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1616,7 +1616,7 @@ static void test_create_device(void) swapchain_desc.OutputWindow = NULL; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, &swapchain, &device, &feature_level, &immediate_context); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); ok(!swapchain, "Got unexpected swapchain pointer %p.\n", swapchain); ok(!device, "Got unexpected device pointer %p.\n", device); ok(!feature_level, "Got unexpected feature level %#x.\n", feature_level); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index aa9cdb8..bea116b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -258,7 +258,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - if (!device || !swapchain_desc || !swapchain) + if (!device || !window || !swapchain_desc || !swapchain) { WARN("Invalid pointer.\n"); return DXGI_ERROR_INVALID_CALL; @@ -292,10 +292,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } - if (!window) - { - FIXME("No output window, should use factory output window.\n"); - } if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 4ad5b9f..c4bf826 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1077,7 +1077,6 @@ static void test_create_swapchain(void) return; } - creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; creation_desc.BufferDesc.Height = 600; creation_desc.BufferDesc.RefreshRate.Numerator = 60; @@ -1089,14 +1088,11 @@ static void test_create_swapchain(void) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = NULL; creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0; - memset(&initial_state, 0, sizeof(initial_state)); - capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow); - hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); @@ -1112,6 +1108,14 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + creation_desc.OutputWindow = NULL; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + memset(&initial_state, 0, sizeof(initial_state)); + capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow); + hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain);

1 0

Alistair Leslie-Hughes : advapi32: Support WinLogonIdsSid in IsWellKnownSid.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 2b01220230b102ba665ce6a5359a3de0fb5a8361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b01220230b102ba665ce6a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 29 23:43:44 2018 +0000 advapi32: Support WinLogonIdsSid in IsWellKnownSid. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f0c133e..6f4fb44 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -94,6 +94,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } },

1 0

Zebediah Figura : user32/tests: Wait for the WM_CLIPBOARDUPDATE message to be received.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 318edcc94a24d7140d02b7965825c012d0303aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=318edcc94a24d7140d02b796… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 29 16:16:16 2018 -0600 user32/tests: Wait for the WM_CLIPBOARDUPDATE message to be received. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4fd37fa..3d3ef8b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -895,6 +895,7 @@ static UINT wm_renderformat; static UINT nb_formats; static BOOL cross_thread; static BOOL do_render_format; +static HANDLE update_event; static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -953,6 +954,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ok( msg_flags == ISMEX_NOSEND, "WM_CLIPBOARDUPDATE wrong flags %x\n", msg_flags ); EnterCriticalSection(&clipboard_cs); wm_clipboardupdate++; + SetEvent(update_event); LeaveCriticalSection(&clipboard_cs); break; case WM_USER: @@ -1011,6 +1013,9 @@ static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT u while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); } + if (update && !broken(!pAddClipboardFormatListener)) + ok(WaitForSingleObject(update_event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + count = SendMessageA( win, WM_USER + 1, 0, 0 ); ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); count = SendMessageA( win, WM_USER + 2, 0, 0 ); @@ -1274,6 +1279,7 @@ static void test_messages(void) DWORD tid; InitializeCriticalSection(&clipboard_cs); + update_event = CreateEventW(NULL, FALSE, FALSE, NULL); memset(&cls, 0, sizeof(cls)); cls.lpfnWndProc = clipboard_wnd_proc;

1 0

Bernhard Übelacker : user32: Validate DIB offset in CURSORICON_GetFileEntry.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 9256017adf1b32564d96a745d2ba79c09f0cb02a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9256017adf1b32564d96a745… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun Jan 28 19:15:44 2018 +0100 user32: Validate DIB offset in CURSORICON_GetFileEntry. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 1 + dlls/user32/tests/cursoricon.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1203250..8e272f0 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -678,6 +678,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if ((const char *)&filedir->idEntries[n + 1] - (const char *)dir > size) return FALSE; entry = &filedir->idEntries[n]; + if (entry->dwDIBOffset > size - sizeof(info->biSize)) return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); if (info->biSize != sizeof(BITMAPCOREHEADER)) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 211376b..5099c08 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1031,6 +1031,12 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +/* An invalid cursor with an invalid dwDIBOffset */ +static const unsigned char invalid_dwDIBOffset[] = { + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 +}; + static const DWORD biSize_tests[] = { 0, sizeof(BITMAPCOREHEADER) - 1, @@ -1320,6 +1326,8 @@ static void test_LoadImage(void) test_LoadImageFile("BMP (broken biSize)", bmpimage, sizeof(bmpimage), "bmp", 0); } bitmap_header->biSize = sizeof(BITMAPINFOHEADER); + + test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); } #undef ARRAY_SIZE

1 0

Zebediah Figura : user32/tests: Add a helper to check clipboard sequence and messages.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 0b63b779cc6c12d66ad91cfddcb3d54b17199b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b63b779cc6c12d66ad91cfd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 29 16:16:15 2018 -0600 user32/tests: Add a helper to check clipboard sequence and messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b63b779cc6c12d66ad9…

1 0

Alexandre Julliard : server: Implement the ImageContainsCode flag for image mappings.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 0810e6a68827a864bd9062c63094f5ad072b2697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0810e6a68827a864bd9062c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 11:03:09 2018 +0100 server: Implement the ImageContainsCode flag for image mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 13 ++++++------- server/mapping.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38175da..bd23a1c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -49,6 +49,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE static LONG *child_failures; static WORD cb_count; static DWORD page_size; +static BOOL is_win64 = sizeof(void *) > sizeof(int); static BOOL is_wow64; static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, @@ -267,8 +268,8 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &info_size ); ok( !status, "%u: NtQuerySection failed err %x\n", id, status ); ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %lu\n", id, info_size ); - if (nt_header->OptionalHeader.Magic == (sizeof(void *) > sizeof(int) ? IMAGE_NT_OPTIONAL_HDR64_MAGIC - : IMAGE_NT_OPTIONAL_HDR32_MAGIC)) + if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC + : IMAGE_NT_OPTIONAL_HDR32_MAGIC)) { max_stack = nt_header->OptionalHeader.SizeOfStackReserve; commit_stack = nt_header->OptionalHeader.SizeOfStackCommit; @@ -327,13 +328,11 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); if (nt_header->OptionalHeader.SizeOfCode || nt_header->OptionalHeader.AddressOfEntryPoint) - todo_wine ok( image.ImageContainsCode == TRUE, "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); else if ((nt_header->OptionalHeader.SectionAlignment % page_size) || (nt_header->FileHeader.NumberOfSections == 1 && (section.Characteristics & IMAGE_SCN_MEM_EXECUTE))) - todo_wine ok( image.ImageContainsCode == TRUE || broken(!image.ImageContainsCode), /* <= win8 */ "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); else @@ -416,8 +415,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) info.Size.u.HighPart, info.Size.u.LowPart, file_size ); has_code = query_image_section( line, dll_name, nt_header ); /* test loading dll of wrong 32/64 bitness */ - if (nt_header->OptionalHeader.Magic == (sizeof(void *) > sizeof(int) ? IMAGE_NT_OPTIONAL_HDR32_MAGIC - : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) + if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR32_MAGIC + : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) { SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); @@ -425,7 +424,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) { ok( mod != NULL, "%u: loading failed err %u\n", line, GetLastError() ); } - else todo_wine_if (is_wow64) + else todo_wine_if (is_win64 || is_wow64) { ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); diff --git a/server/mapping.c b/server/mapping.c index b86ac9a..d863d08 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -539,7 +539,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } nt; off_t pos; int size; - unsigned int cpu_mask = get_supported_cpu_mask(); + unsigned int i, cpu_mask = get_supported_cpu_mask(); /* load the headers */ @@ -587,6 +587,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.subsystem_low = nt.opt.hdr32.MinorSubsystemVersion; mapping->image.subsystem_high = nt.opt.hdr32.MajorSubsystemVersion; mapping->image.dll_charact = nt.opt.hdr32.DllCharacteristics; + mapping->image.contains_code = (nt.opt.hdr32.SizeOfCode || + nt.opt.hdr32.AddressOfEntryPoint || + nt.opt.hdr32.SectionAlignment & page_mask); mapping->image.loader_flags = nt.opt.hdr32.LoaderFlags; mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; @@ -614,6 +617,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.subsystem_low = nt.opt.hdr64.MinorSubsystemVersion; mapping->image.subsystem_high = nt.opt.hdr64.MajorSubsystemVersion; mapping->image.dll_charact = nt.opt.hdr64.DllCharacteristics; + mapping->image.contains_code = (nt.opt.hdr64.SizeOfCode || + nt.opt.hdr64.AddressOfEntryPoint || + nt.opt.hdr64.SectionAlignment & page_mask); mapping->image.loader_flags = nt.opt.hdr64.LoaderFlags; mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; @@ -627,7 +633,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.machine = nt.FileHeader.Machine; mapping->image.zerobits = 0; /* FIXME */ mapping->image.gp = 0; /* FIXME */ - mapping->image.contains_code = 0; /* FIXME */ mapping->image.image_flags = 0; /* FIXME */ mapping->image.file_size = file_size; @@ -642,6 +647,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!(sec = malloc( size ))) goto error; if (pread( unix_fd, sec, size, pos ) != size) goto error; + for (i = 0; i < nt.FileHeader.NumberOfSections && !mapping->image.contains_code; i++) + if (sec[i].Characteristics & IMAGE_SCN_MEM_EXECUTE) mapping->image.contains_code = 1; + if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) goto error; free( sec );

1 0

Alexandre Julliard : ntdll: Move file mapping functionality to a helper function.
by Alexandre Julliard Jan. 30, 2018

Jan. 30, 2018

Module: wine Branch: master Commit: 60e6331520bf0a99c41d607f211c5470ddc4dcc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60e6331520bf0a99c41d607f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 14:16:23 2018 +0100 ntdll: Move file mapping functionality to a helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 3 + dlls/ntdll/virtual.c | 326 +++++++++++++++++++++++++----------------------- 2 files changed, 175 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60e6331520bf0a99c41d…

1 0