Nikolay Sivov : dbgeng: Implement GetModuleVersionInformation().
Alexandre Julliard
julliard at winehq.org
Tue Apr 23 17:39:54 CDT 2019
Module: wine
Branch: master
Commit: 5c90a0dc35d9503b951dcb730662723ccaece2de
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c90a0dc35d9503b951dcb730662723ccaece2de
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Apr 23 10:38:19 2019 +0300
dbgeng: Implement GetModuleVersionInformation().
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dbgeng/Makefile.in | 1 +
dlls/dbgeng/dbgeng.c | 77 +++++++++++++++++++++++++++++++++++++++----------
2 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in
index 3a16e2e..c2639c5 100644
--- a/dlls/dbgeng/Makefile.in
+++ b/dlls/dbgeng/Makefile.in
@@ -1,4 +1,5 @@
MODULE = dbgeng.dll
IMPORTLIB = dbgeng
+DELAYIMPORTS = version
C_SRCS = dbgeng.c
diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c
index 704084c..287e0d8 100644
--- a/dlls/dbgeng/dbgeng.c
+++ b/dlls/dbgeng/dbgeng.c
@@ -81,6 +81,25 @@ static struct target_process *debug_client_get_target(struct debug_client *debug
return LIST_ENTRY(list_head(&debug_client->targets), struct target_process, entry);
}
+static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size,
+ unsigned int *size)
+{
+ unsigned int len = strlen(str), dst_len;
+
+ if (size)
+ *size = len + 1;
+
+ if (buffer && buffer_size)
+ {
+ dst_len = min(len, buffer_size - 1);
+ if (dst_len)
+ memcpy(buffer, str, dst_len);
+ buffer[dst_len] = 0;
+ }
+
+ return len < buffer_size ? S_OK : S_FALSE;
+}
+
static WORD debug_target_get_module_machine(struct target_process *target, HMODULE module)
{
IMAGE_DOS_HEADER dos = { 0 };
@@ -1446,29 +1465,57 @@ static HRESULT STDMETHODCALLTYPE debugsymbols_GetSourceFileLineOffsets(IDebugSym
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleVersionInformation(IDebugSymbols3 *iface, ULONG index,
ULONG64 base, const char *item, void *buffer, ULONG buffer_size, ULONG *info_size)
{
- FIXME("%p, %u, %s, %s, %p, %u, %p stub.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer,
+ struct debug_client *debug_client = impl_from_IDebugSymbols3(iface);
+ const struct module_info *info;
+ struct target_process *target;
+ void *version_info, *ptr;
+ HRESULT hr = E_FAIL;
+ DWORD handle, size;
+
+ TRACE("%p, %u, %s, %s, %p, %u, %p.\n", iface, index, wine_dbgstr_longlong(base), debugstr_a(item), buffer,
buffer_size, info_size);
- return E_NOTIMPL;
-}
+ if (!(target = debug_client_get_target(debug_client)))
+ return E_UNEXPECTED;
-static HRESULT debug_target_return_string(const char *str, char *buffer, unsigned int buffer_size,
- unsigned int *size)
-{
- unsigned int len = strlen(str), dst_len;
+ if (index == DEBUG_ANY_ID)
+ info = debug_target_get_module_info_by_base(target, base);
+ else
+ info = debug_target_get_module_info(target, index);
- if (size)
- *size = len + 1;
+ if (!info)
+ {
+ WARN("Was unable to locate module.\n");
+ return E_INVALIDARG;
+ }
- if (buffer && buffer_size)
+ if (!(size = GetFileVersionInfoSizeA(info->image_name, &handle)))
+ return E_FAIL;
+
+ if (!(version_info = heap_alloc(size)))
+ return E_OUTOFMEMORY;
+
+ if (GetFileVersionInfoA(info->image_name, handle, size, version_info))
{
- dst_len = min(len, buffer_size - 1);
- if (dst_len)
- memcpy(buffer, str, dst_len);
- buffer[dst_len] = 0;
+ if (VerQueryValueA(version_info, item, &ptr, &size))
+ {
+ if (info_size)
+ *info_size = size;
+
+ if (buffer && buffer_size)
+ {
+ unsigned int dst_len = min(size, buffer_size);
+ if (dst_len)
+ memcpy(buffer, ptr, dst_len);
+ }
+
+ hr = buffer && buffer_size < size ? S_FALSE : S_OK;
+ }
}
- return len < buffer_size ? S_OK : S_FALSE;
+ heap_free(version_info);
+
+ return hr;
}
static HRESULT STDMETHODCALLTYPE debugsymbols_GetModuleNameString(IDebugSymbols3 *iface, ULONG which, ULONG index,
More information about the wine-cvs
mailing list