April 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : dbgeng: Implement GetNumberModules().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 73a8fe94e631c38a3b0af2c610e998538f595ed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a8fe94e631c38a3b0af2c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 09:42:26 2019 +0300 dbgeng: Implement GetNumberModules(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 63 ++++++++++++++++++++++++++++++++++----- dlls/dbgeng/tests/dbgeng.c | 73 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 121 insertions(+), 15 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 8ce7ac6..077de3b 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "psapi.h" #include "initguid.h" #include "dbgeng.h" @@ -44,6 +45,12 @@ struct target_process unsigned int pid; unsigned int attach_flags; HANDLE handle; + struct + { + unsigned int loaded; + unsigned int unloaded; + BOOL initialized; + } modules; }; struct debug_client @@ -58,6 +65,37 @@ struct debug_client IDebugEventCallbacks *event_callbacks; }; +static struct target_process *debug_client_get_target(struct debug_client *debug_client) +{ + if (list_empty(&debug_client->targets)) + return NULL; + + return LIST_ENTRY(list_head(&debug_client->targets), struct target_process, entry); +} + +static HRESULT debug_target_init_modules_info(struct target_process *target) +{ + DWORD needed; + + if (target->modules.initialized) + return S_OK; + + if (!target->handle) + return E_UNEXPECTED; + + needed = 0; + EnumProcessModules(target->handle, NULL, 0, &needed); + if (!needed) + return E_FAIL; + + target->modules.loaded = needed / sizeof(HMODULE); + target->modules.unloaded = 0; /* FIXME */ + + target->modules.initialized = TRUE; + + return S_OK; +} + static void debug_client_detach_target(struct target_process *target) { NTSTATUS status; @@ -255,7 +293,7 @@ static HRESULT STDMETHODCALLTYPE debugclient_AttachProcess(IDebugClient *iface, return E_NOTIMPL; } - if (!(process = heap_alloc(sizeof(*process)))) + if (!(process = heap_alloc_zero(sizeof(*process)))) return E_OUTOFMEMORY; process->pid = pid; @@ -897,9 +935,22 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetOffsetByLine(IDebugSymbols3 *if static HRESULT STDMETHODCALLTYPE debugsymbols_GetNumberModules(IDebugSymbols3 *iface, ULONG *loaded, ULONG *unloaded) { - FIXME("%p, %p, %p stub.\n", iface, loaded, unloaded); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + static struct target_process *target; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, loaded, unloaded); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (FAILED(hr = debug_target_init_modules_info(target))) + return hr; + + *loaded = target->modules.loaded; + *unloaded = target->modules.unloaded; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *iface, ULONG index, ULONG64 *base) @@ -2679,15 +2730,13 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_WaitForEvent(IDebugControl2 *iface /* FIXME: only one target is used currently */ - if (list_empty(&debug_client->targets)) + if (!(target = debug_client_get_target(debug_client))) return E_UNEXPECTED; - target = LIST_ENTRY(list_head(&debug_client->targets), struct target_process, entry); - if (target->attach_flags & DEBUG_ATTACH_NONINVASIVE) { BOOL suspend = !(target->attach_flags & DEBUG_ATTACH_NONINVASIVE_NO_SUSPEND); - DWORD access = PROCESS_VM_READ | PROCESS_VM_WRITE; + DWORD access = PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_QUERY_LIMITED_INFORMATION; NTSTATUS status; if (suspend) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 650ab4a..6e6e2d3 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -226,17 +226,27 @@ static const IDebugEventCallbacksVtbl event_callbacks_vtbl = static const char *event_name = "dbgeng_test_event"; +static BOOL create_target_process(PROCESS_INFORMATION *info) +{ + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + + winetest_get_mainargs(&argv); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s dbgeng target", argv[0]); + return CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, info); +} + static void test_attach(void) { IDebugEventCallbacks event_callbacks = { &event_callbacks_vtbl }; PROCESS_INFORMATION info; - char path_name[MAX_PATH]; IDebugControl *control; IDebugClient *client; - STARTUPINFOA startup; BOOL is_debugged; HANDLE event; - char **argv; HRESULT hr; BOOL ret; @@ -252,11 +262,7 @@ static void test_attach(void) event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); - winetest_get_mainargs(&argv); - memset(&startup, 0, sizeof(startup)); - startup.cb = sizeof(startup); - sprintf(path_name, "%s dbgeng target", argv[0]); - ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ret = create_target_process(&info); ok(ret, "Failed to create target process.\n"); is_debugged = TRUE; @@ -300,6 +306,56 @@ todo_wine control->lpVtbl->Release(control); } +static void test_module_information(void) +{ + unsigned int loaded, unloaded; + PROCESS_INFORMATION info; + IDebugSymbols *symbols; + IDebugControl *control; + IDebugClient *client; + HANDLE event; + HRESULT hr; + BOOL ret; + + hr = DebugCreate(&IID_IDebugClient, (void **)&client); + ok(hr == S_OK, "Failed to create engine object, hr %#x.\n", hr); + + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugControl, (void **)&control); + ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols, (void **)&symbols); + ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + + event = CreateEventA(NULL, FALSE, FALSE, event_name); + ok(event != NULL, "Failed to create event.\n"); + + ret = create_target_process(&info); + ok(ret, "Failed to create target process.\n"); + + hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); + ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); + + hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); + ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + + /* Number of modules. */ + hr = symbols->lpVtbl->GetNumberModules(symbols, &loaded, &unloaded); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = client->lpVtbl->DetachProcesses(client); + ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); + + SetEvent(event); + winetest_wait_child_process(info.hProcess); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + client->lpVtbl->Release(client); + control->lpVtbl->Release(control); + symbols->lpVtbl->Release(symbols); +} + static void target_proc(void) { HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, event_name); @@ -330,4 +386,5 @@ START_TEST(dbgeng) test_engine_options(); test_attach(); + test_module_information(); }

1 0

Nikolay Sivov : dbgeng: Implement GetModuleByIndex().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: d33180aebdce4bd6859dc206977dbb8bdcc53a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33180aebdce4bd6859dc206… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 09:42:27 2019 +0300 dbgeng: Implement GetModuleByIndex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 74 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dbgeng/tests/dbgeng.c | 63 ++++++++++++++++++++++++++++++--------- 2 files changed, 119 insertions(+), 18 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 077de3b..d4f8205 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -39,6 +39,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); extern NTSTATUS WINAPI NtSuspendProcess(HANDLE handle); extern NTSTATUS WINAPI NtResumeProcess(HANDLE handle); +struct module_info +{ + DEBUG_MODULE_PARAMETERS params; +}; + struct target_process { struct list entry; @@ -47,6 +52,7 @@ struct target_process HANDLE handle; struct { + struct module_info *info; unsigned int loaded; unsigned int unloaded; BOOL initialized; @@ -75,6 +81,9 @@ static struct target_process *debug_client_get_target(struct debug_client *debug static HRESULT debug_target_init_modules_info(struct target_process *target) { + unsigned int i, count; + HMODULE *modules; + MODULEINFO info; DWORD needed; if (target->modules.initialized) @@ -88,7 +97,35 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) if (!needed) return E_FAIL; - target->modules.loaded = needed / sizeof(HMODULE); + count = needed / sizeof(HMODULE); + + if (!(modules = heap_alloc(count * sizeof(*modules)))) + return E_OUTOFMEMORY; + + if (!(target->modules.info = heap_alloc_zero(count * sizeof(*target->modules.info)))) + { + heap_free(modules); + return E_OUTOFMEMORY; + } + + if (EnumProcessModules(target->handle, modules, count * sizeof(*modules), &needed)) + { + for (i = 0; i < count; ++i) + { + if (!GetModuleInformation(target->handle, modules[i], &info, sizeof(info))) + { + WARN("Failed to get module information, error %d.\n", GetLastError()); + continue; + } + + target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; + target->modules.info[i].params.Size = info.SizeOfImage; + } + } + + heap_free(modules); + + target->modules.loaded = count; target->modules.unloaded = 0; /* FIXME */ target->modules.initialized = TRUE; @@ -96,6 +133,17 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) return S_OK; } +static const struct module_info *debug_target_get_module_info(struct target_process *target, unsigned int i) +{ + if (FAILED(debug_target_init_modules_info(target))) + return NULL; + + if (i >= target->modules.loaded) + return NULL; + + return &target->modules.info[i]; +} + static void debug_client_detach_target(struct target_process *target) { NTSTATUS status; @@ -185,6 +233,12 @@ static ULONG STDMETHODCALLTYPE debugclient_AddRef(IDebugClient *iface) return refcount; } +static void debug_target_free(struct target_process *target) +{ + heap_free(target->modules.info); + heap_free(target); +} + static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) { struct debug_client *debug_client = impl_from_IDebugClient(iface); @@ -199,7 +253,7 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) { debug_client_detach_target(cur); list_remove(&cur->entry); - heap_free(cur); + debug_target_free(cur); } if (debug_client->event_callbacks) debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); @@ -955,9 +1009,21 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetNumberModules(IDebugSymbols3 *i static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByIndex(IDebugSymbols3 *iface, ULONG index, ULONG64 *base) { - FIXME("%p, %u, %p stub.\n", iface, index, base); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, base); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (!(info = debug_target_get_module_info(target, index))) + return E_INVALIDARG; + + *base = info->params.Base; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbols3 *iface, const char *name, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 6e6e2d3..74f9e7c 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -224,23 +224,36 @@ static const IDebugEventCallbacksVtbl event_callbacks_vtbl = event_callbacks_ChangeSymbolState, }; -static const char *event_name = "dbgeng_test_event"; - -static BOOL create_target_process(PROCESS_INFORMATION *info) +static BOOL create_target_process(const char *event_name, PROCESS_INFORMATION *info) { + static const char *event_target_ready_name = "dbgeng_test_target_ready_event"; char path_name[MAX_PATH]; STARTUPINFOA startup; + HANDLE ready_event; char **argv; + BOOL ret; + + ready_event = CreateEventA(NULL, FALSE, FALSE, event_target_ready_name); + ok(ready_event != NULL, "Failed to create event.\n"); winetest_get_mainargs(&argv); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); - sprintf(path_name, "%s dbgeng target", argv[0]); - return CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, info); + sprintf(path_name, "%s dbgeng target %s %s", argv[0], event_name, event_target_ready_name); + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, info); + if (ret) + { + WaitForSingleObject(ready_event, INFINITE); + } + + CloseHandle(ready_event); + + return ret; } static void test_attach(void) { + static const char *event_name = "dbgeng_test_event"; IDebugEventCallbacks event_callbacks = { &event_callbacks_vtbl }; PROCESS_INFORMATION info; IDebugControl *control; @@ -262,7 +275,7 @@ static void test_attach(void) event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); - ret = create_target_process(&info); + ret = create_target_process(event_name, &info); ok(ret, "Failed to create target process.\n"); is_debugged = TRUE; @@ -308,11 +321,13 @@ todo_wine static void test_module_information(void) { + static const char *event_name = "dbgeng_test_event"; unsigned int loaded, unloaded; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; IDebugClient *client; + ULONG64 base; HANDLE event; HRESULT hr; BOOL ret; @@ -329,9 +344,12 @@ static void test_module_information(void) event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); - ret = create_target_process(&info); + ret = create_target_process(event_name, &info); ok(ret, "Failed to create target process.\n"); + hr = control->lpVtbl->SetEngineOptions(control, DEBUG_ENGOPT_INITIAL_BREAK); + ok(hr == S_OK, "Failed to set engine options, hr %#x.\n", hr); + hr = client->lpVtbl->AttachProcess(client, 0, info.dwProcessId, DEBUG_ATTACH_NONINVASIVE); ok(hr == S_OK, "Failed to attach to process, hr %#x.\n", hr); @@ -341,6 +359,16 @@ static void test_module_information(void) /* Number of modules. */ hr = symbols->lpVtbl->GetNumberModules(symbols, &loaded, &unloaded); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(loaded > 0, "Unexpected module count %u.\n", loaded); + + /* Module base. */ + hr = symbols->lpVtbl->GetModuleByIndex(symbols, loaded, &base); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + base = 0; + hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!base, "Unexpected module base.\n"); hr = client->lpVtbl->DetachProcesses(client); ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); @@ -356,19 +384,26 @@ static void test_module_information(void) symbols->lpVtbl->Release(symbols); } -static void target_proc(void) +static void target_proc(const char *event_name, const char *event_ready_name) { - HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, event_name); + HANDLE terminate_event, ready_event; - ok(event != NULL, "Failed to open event handle.\n"); + terminate_event = OpenEventA(SYNCHRONIZE, FALSE, event_name); + ok(terminate_event != NULL, "Failed to open event handle.\n"); + + ready_event = OpenEventA(EVENT_MODIFY_STATE, FALSE, event_ready_name); + ok(ready_event != NULL, "Failed to open event handle.\n"); + + SetEvent(ready_event); for (;;) { - if (WaitForSingleObject(event, 100) == WAIT_OBJECT_0) + if (WaitForSingleObject(terminate_event, 100) == WAIT_OBJECT_0) break; } - CloseHandle(event); + CloseHandle(terminate_event); + CloseHandle(ready_event); } START_TEST(dbgeng) @@ -378,9 +413,9 @@ START_TEST(dbgeng) argc = winetest_get_mainargs(&argv); - if (argc >= 3 && !strcmp(argv[2], "target")) + if (argc > 4 && !strcmp(argv[2], "target")) { - target_proc(); + target_proc(argv[3], argv[4]); return; }

1 0

Nikolay Sivov : dbgeng: Implement GetModuleParameters().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: d337e7a6561b8da248f4d2bc97e01e1eedfd0251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d337e7a6561b8da248f4d2bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 09:42:28 2019 +0300 dbgeng: Implement GetModuleParameters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 55 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dbgeng/tests/dbgeng.c | 29 ++++++++++++++++++++++++ include/dbgeng.h | 2 ++ 3 files changed, 83 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index d4f8205..b5650d8 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -144,6 +144,22 @@ static const struct module_info *debug_target_get_module_info(struct target_proc return &target->modules.info[i]; } +static const struct module_info *debug_target_get_module_info_by_base(struct target_process *target, ULONG64 base) +{ + unsigned int i; + + if (FAILED(debug_target_init_modules_info(target))) + return NULL; + + for (i = 0; i < target->modules.loaded; ++i) + { + if (target->modules.info[i].params.Base == base) + return &target->modules.info[i]; + } + + return NULL; +} + static void debug_client_detach_target(struct target_process *target) { NTSTATUS status; @@ -1055,11 +1071,44 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *ifa } static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleParameters(IDebugSymbols3 *iface, ULONG count, ULONG64 *bases, - ULONG start, DEBUG_MODULE_PARAMETERS *parameters) + ULONG start, DEBUG_MODULE_PARAMETERS *params) { - FIXME("%p, %u, %p, %u, %p stub.\n", iface, count, bases, start, parameters); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + const struct module_info *info; + struct target_process *target; + unsigned int i; - return E_NOTIMPL; + TRACE("%p, %u, %p, %u, %p.\n", iface, count, bases, start, params); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (bases) + { + for (i = 0; i < count; ++i) + { + if ((info = debug_target_get_module_info_by_base(target, bases[i]))) + { + params[i] = info->params; + } + else + { + memset(&params[i], 0, sizeof(*params)); + params[i].Base = DEBUG_INVALID_OFFSET; + } + } + } + else + { + for (i = start; i < start + count; ++i) + { + if (!(info = debug_target_get_module_info(target, i))) + return E_INVALIDARG; + params[i] = info->params; + } + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetSymbolModule(IDebugSymbols3 *iface, const char *symbol, ULONG64 *base) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 74f9e7c..2002beb 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -322,11 +322,13 @@ todo_wine static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; + DEBUG_MODULE_PARAMETERS params[2]; unsigned int loaded, unloaded; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; IDebugClient *client; + ULONG64 bases[2]; ULONG64 base; HANDLE event; HRESULT hr; @@ -370,6 +372,33 @@ static void test_module_information(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!base, "Unexpected module base.\n"); + /* Parameters. */ + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, 0, params); + ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); + ok(params[0].Base == base, "Unexpected module base.\n"); + + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, &base, 100, params); + ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); + ok(params[0].Base == base, "Unexpected module base.\n"); + + bases[0] = base + 1; + bases[1] = base; + hr = symbols->lpVtbl->GetModuleParameters(symbols, 2, bases, 0, params); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + ok(params[0].Base == DEBUG_INVALID_OFFSET, "Unexpected module base.\n"); + ok(params[0].Size == 0, "Unexpected module size.\n"); + ok(params[1].Base == base, "Unexpected module base.\n"); + ok(params[1].Size != 0, "Unexpected module size.\n"); + + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, bases, 0, params); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, bases, loaded, params); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get module parameters, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, loaded, params); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + hr = client->lpVtbl->DetachProcesses(client); ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); diff --git a/include/dbgeng.h b/include/dbgeng.h index 3b7ff2b..f50a1ca 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -162,6 +162,8 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_CDS_REFRESH_INLINESTEP 16 #define DEBUG_CDS_REFRESH_INLINESTEP_PSEUDO 17 +#define DEBUG_INVALID_OFFSET ((ULONG64)-1) + typedef struct _DEBUG_MODULE_PARAMETERS { ULONG64 Base;

1 0

Nikolay Sivov : dbgeng: Implement GetModuleByOffset().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 9fb20dda0f87c50a209fe22b06d0d0987febfe79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb20dda0f87c50a209fe22b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 09:42:29 2019 +0300 dbgeng: Implement GetModuleByOffset(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 25 +++++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 22 +++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index b5650d8..1acfe0b 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -1053,9 +1053,30 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByModuleName(IDebugSymbol static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleByOffset(IDebugSymbols3 *iface, ULONG64 offset, ULONG start_index, ULONG *index, ULONG64 *base) { - FIXME("%p, %s, %u, %p, %p stub.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + struct debug_client *debug_client = impl_from_IDebugSymbols3(iface); + static struct target_process *target; + const struct module_info *info; - return E_NOTIMPL; + TRACE("%p, %s, %u, %p, %p.\n", iface, wine_dbgstr_longlong(offset), start_index, index, base); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + while ((info = debug_target_get_module_info(target, start_index))) + { + if (offset >= info->params.Base && offset < info->params.Base + info->params.Size) + { + if (index) + *index = start_index; + if (base) + *base = info->params.Base; + return S_OK; + } + + start_index++; + } + + return E_INVALIDARG; } static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNames(IDebugSymbols3 *iface, ULONG index, ULONG64 base, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 2002beb..2a2dd3ad 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -322,8 +322,8 @@ todo_wine static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; + unsigned int loaded, unloaded, index; DEBUG_MODULE_PARAMETERS params[2]; - unsigned int loaded, unloaded; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; @@ -372,7 +372,27 @@ static void test_module_information(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!base, "Unexpected module base.\n"); + hr = symbols->lpVtbl->GetModuleByOffset(symbols, 0, 0, &index, &base); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, &index, &base); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, 0, NULL, NULL); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base + 1, 0, NULL, NULL); + ok(hr == S_OK, "Failed to get module, hr %#x.\n", hr); + + hr = symbols->lpVtbl->GetModuleByOffset(symbols, base, loaded, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + /* Parameters. */ + base = 0; + hr = symbols->lpVtbl->GetModuleByIndex(symbols, 0, &base); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!base, "Unexpected module base.\n"); + hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, 0, params); ok(hr == S_OK, "Failed to get module parameters, hr %#x.\n", hr); ok(params[0].Base == base, "Unexpected module base.\n");

1 0

Nikolay Sivov : mfreadwrite: Add partial implementation of ReadSample().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 020d2202ea06d395a37b9840b00dd50d26be6d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=020d2202ea06d395a37b9840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:27 2019 +0300 mfreadwrite: Add partial implementation of ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 109 +++++++++++++++++++++++++++++++++++++--- dlls/mfreadwrite/tests/mfplat.c | 7 +++ 2 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 43dfd4e..8145e5b 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -79,13 +79,21 @@ struct sample IMFSample *sample; }; +enum media_stream_state +{ + STREAM_STATE_READY = 0, + STREAM_STATE_EOS, +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; DWORD id; CRITICAL_SECTION cs; + CONDITION_VARIABLE sample_event; struct list samples; + enum media_stream_state state; }; typedef struct source_reader @@ -359,6 +367,8 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); + WakeAllConditionVariable(&reader->streams[i].sample_event); + break; } } @@ -698,14 +708,98 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG return IMFMediaSource_Start(reader->source, reader->descriptor, format, position); } -static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, - DWORD flags, DWORD *actualindex, DWORD *sampleflags, LONGLONG *timestamp, - IMFSample **sample) +static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *stream_flags) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, 0x%08x, %p, %p, %p, %p\n", This, index, flags, actualindex, - sampleflags, timestamp, sample); - return E_NOTIMPL; + IMFSample *ret = NULL; + struct list *head; + + if ((head = list_head(&stream->samples))) + { + struct sample *pending_sample = LIST_ENTRY(head, struct sample, entry); + ret = pending_sample->sample; + list_remove(&pending_sample->entry); + heap_free(pending_sample); + } + + *stream_flags = stream->state == STREAM_STATE_EOS ? MF_SOURCE_READERF_ENDOFSTREAM : 0; + + return ret; +} + +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD flags, DWORD *actual_index, + DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) +{ + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + case MF_SOURCE_READER_ANY_STREAM: + FIXME("Non-specific requests are not supported.\n"); + return E_NOTIMPL; + default: + ; + } + + /* FIXME: probably should happen once */ + IMFMediaSource_Start(reader->source, reader->descriptor, NULL, NULL); + + if (reader->async_callback) + { + FIXME("Async mode is not implemented.\n"); + return E_NOTIMPL; + } + else + { + struct media_stream *stream; + + if (!stream_flags || !sample) + return E_POINTER; + + if (actual_index) + *actual_index = index; + + *sample = NULL; + + if (index >= reader->stream_count) + { + *stream_flags = MF_SOURCE_READERF_ERROR; + return MF_E_INVALIDSTREAMNUMBER; + } + + stream = &reader->streams[index]; + + EnterCriticalSection(&stream->cs); + + if (!(flags & MF_SOURCE_READER_CONTROLF_DRAIN)) + { + while (list_empty(&stream->samples) && stream->state != STREAM_STATE_EOS) + { + if (stream->stream) + { + if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + } + SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); + } + } + + *sample = media_stream_pop_sample(stream, stream_flags); + + LeaveCriticalSection(&stream->cs); + + TRACE("Got sample %p.\n", *sample); + } + + return S_OK; } static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) @@ -922,6 +1016,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri break; InitializeCriticalSection(&object->streams[i].cs); + InitializeConditionVariable(&object->streams[i].sample_event); list_init(&object->streams[i].samples); } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 29e8e08..b86fb06 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -315,6 +315,13 @@ todo_wine ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, &stream_flags, &timestamp, + &sample); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, NULL, NULL, &timestamp, &sample); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfreadwrite: Handle failure path in GetNativeMediaType().
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 56bb5967118584012ae0d97c156c52e65586671c URL: https://source.winehq.org/git/wine.git/?a=commit;h=56bb5967118584012ae0d97c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:28 2019 +0300 mfreadwrite: Handle failure path in GetNativeMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 8145e5b..e27fe82 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -613,10 +613,12 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, &src_type); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr = MFCreateMediaType(type))) - hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); - - IMFMediaType_Release(src_type); + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); + IMFMediaType_Release(src_type); + } return hr; }

1 0

Nikolay Sivov : mfreadwrite: Wake also on new streams.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 279f6dbd0cb1e4f2c48340ce6fd3e43e6fa681eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=279f6dbd0cb1e4f2c48340ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:29 2019 +0300 mfreadwrite: Wake also on new streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e27fe82..490f238 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -253,6 +253,9 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM { WARN("Failed to subscribe to stream events, hr %#x.\n", hr); } + + /* Wake so any waiting ReadSample() calls have a chance to make requests. */ + WakeAllConditionVariable(&reader->streams[i].sample_event); } break; }

1 0

Nikolay Sivov : mfreadwrite: Handle some of stream state change events.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: f8fff8b29731ab55065260e25ce6f2722367f808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fff8b29731ab55065260e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 10:52:30 2019 +0300 mfreadwrite: Handle some of stream state change events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 64 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 490f238..e396dcd 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -385,6 +385,46 @@ failed: return hr; } +static HRESULT source_reader_media_stream_state_handler(struct source_reader *reader, IMFMediaStream *stream, + MediaEventType event) +{ + unsigned int i; + HRESULT hr; + DWORD id; + + if (FAILED(hr = media_stream_get_id(stream, &id))) + { + WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + return hr; + } + + for (i = 0; i < reader->stream_count; ++i) + { + if (id == reader->streams[i].id) + { + EnterCriticalSection(&reader->streams[i].cs); + + switch (event) + { + case MEEndOfStream: + reader->streams[i].state = STREAM_STATE_EOS; + break; + case MEStreamSeeked: + case MEStreamStarted: + reader->streams[i].state = STREAM_STATE_READY; + break; + default: + ; + } + + LeaveCriticalSection(&reader->streams[i].cs); + break; + } + } + + return S_OK; +} + static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); @@ -409,6 +449,11 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba case MEMediaSample: hr = source_reader_media_sample_handler(reader, stream, event); break; + case MEStreamSeeked: + case MEStreamStarted: + case MEEndOfStream: + hr = source_reader_media_stream_state_handler(reader, stream, event_type); + break; default: ; } @@ -735,6 +780,7 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct source_reader *reader = impl_from_IMFSourceReader(iface); + DWORD stream_index; HRESULT hr; TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); @@ -742,16 +788,16 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, switch (index) { case MF_SOURCE_READER_FIRST_VIDEO_STREAM: - index = reader->first_video_stream_index; + stream_index = reader->first_video_stream_index; break; case MF_SOURCE_READER_FIRST_AUDIO_STREAM: - index = reader->first_audio_stream_index; + stream_index = reader->first_audio_stream_index; break; case MF_SOURCE_READER_ANY_STREAM: FIXME("Non-specific requests are not supported.\n"); return E_NOTIMPL; default: - ; + stream_index = index; } /* FIXME: probably should happen once */ @@ -769,18 +815,20 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, if (!stream_flags || !sample) return E_POINTER; - if (actual_index) - *actual_index = index; - *sample = NULL; - if (index >= reader->stream_count) + if (stream_index >= reader->stream_count) { *stream_flags = MF_SOURCE_READERF_ERROR; + if (actual_index) + *actual_index = index; return MF_E_INVALIDSTREAMNUMBER; } - stream = &reader->streams[index]; + if (actual_index) + *actual_index = stream_index; + + stream = &reader->streams[stream_index]; EnterCriticalSection(&stream->cs);

1 0

Alexandre Julliard : winegcc: Add option to put a builtin dll signature in the DOS header of PE files.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 11ee7a7051e86395e3697491f8fed345ac4b6940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ee7a7051e86395e3697491… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:34:14 2019 +0200 winegcc: Add option to put a builtin dll signature in the DOS header of PE files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 674d1a3..46b67ce 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -205,6 +205,7 @@ struct options int compile_only; int force_pointer_size; int large_address_aware; + int wine_builtin; int unwind_tables; int strip; const char* wine_objdir; @@ -515,6 +516,28 @@ static int check_platform( struct options *opts, const char *file ) return ret; } +static void make_wine_builtin( const char *file ) +{ + static const char wine_magic[32] = "Wine builtin DLL"; + int fd; + struct + { + unsigned short e_magic; + unsigned short unused[29]; + unsigned int e_lfanew; + } header; + + if ((fd = open( file, O_RDWR | O_BINARY )) == -1) error( "Failed to add signature to %s\n", file ); + + if (read( fd, &header, sizeof(header) ) == sizeof(header) && !memcmp( &header.e_magic, "MZ", 2 )) + { + if (header.e_lfanew < sizeof(header) + sizeof(wine_magic)) + error( "Not enough space (%x) for Wine signature\n", header.e_lfanew ); + write( fd, wine_magic, sizeof(wine_magic) ); + } + close( fd ); +} + static const char *get_multiarch_dir( enum target_cpu cpu ) { switch(cpu) @@ -1131,6 +1154,8 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); + if (is_pe && opts->wine_builtin) make_wine_builtin( output_path ); + /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1549,6 +1574,11 @@ int main(int argc, char **argv) opts.large_address_aware = 1; continue; } + if (!strcmp(Wl->base[j], "--wine-builtin")) + { + opts.wine_builtin = 1; + continue; + } if (!strcmp(Wl->base[j], "--subsystem") && j < Wl->size - 1) { opts.subsystem = strdup( Wl->base[++j] );

1 0

Alexandre Julliard : server: Add flag for builtin dlls in the image information.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 546fa12755dd0d1d9618214fb02ef9fa5fa6c943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=546fa12755dd0d1d9618214f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 11:34:25 2019 +0200 server: Add flag for builtin dlls in the image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 1 + server/mapping.c | 7 +++++-- server/protocol.def | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fb6ede6..78973a8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3203,7 +3203,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->DllCharacteristics = pe_info->dll_charact; info->Machine = pe_info->machine; info->ImageContainsCode = pe_info->contains_code; - info->u.ImageFlags = pe_info->image_flags & ~IMAGE_FLAGS_WineFakeDll; + info->u.ImageFlags = pe_info->image_flags & ~(IMAGE_FLAGS_WineBuiltin|IMAGE_FLAGS_WineFakeDll); info->LoaderFlags = pe_info->loader_flags; info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c3d1bb6..9e26aa4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -720,6 +720,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineBuiltin 0x40 #define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device diff --git a/server/mapping.c b/server/mapping.c index ddc8be8..3480724 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -558,6 +558,7 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { + static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; IMAGE_COR20_HEADER clr; @@ -565,7 +566,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s struct { IMAGE_DOS_HEADER dos; - char buffer[sizeof(fakedll_signature)]; + char buffer[32]; } mz; struct { @@ -702,7 +703,9 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; + else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ diff --git a/server/protocol.def b/server/protocol.def index 888e22f..79e9802 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -736,6 +736,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineBuiltin 0x40 #define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device

1 0