wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Nikolay Sivov : dbgeng: Implement ReadVirtual().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 911050d87b5cd61867e06eac978cfd960bdb8e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=911050d87b5cd61867e06eac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 10:38:15 2019 +0300 dbgeng: Implement ReadVirtual(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 23 +++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 27 ++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 1acfe0b..d7f8191 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -725,9 +725,28 @@ static ULONG STDMETHODCALLTYPE debugdataspaces_Release(IDebugDataSpaces *iface) static HRESULT STDMETHODCALLTYPE debugdataspaces_ReadVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, ULONG buffer_size, ULONG *read_len) { - FIXME("%p, %s, %p, %u, %p stub.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + struct debug_client *debug_client = impl_from_IDebugDataSpaces(iface); + static struct target_process *target; + HRESULT hr = S_OK; + SIZE_T length; - return E_NOTIMPL; + TRACE("%p, %s, %p, %u, %p.\n", iface, wine_dbgstr_longlong(offset), buffer, buffer_size, read_len); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (ReadProcessMemory(target->handle, (const void *)(ULONG_PTR)offset, buffer, buffer_size, &length)) + { + if (read_len) + *read_len = length; + } + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to read process memory %#x.\n", hr); + } + + return hr; } static HRESULT STDMETHODCALLTYPE debugdataspaces_WriteVirtual(IDebugDataSpaces *iface, ULONG64 offset, void *buffer, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 2a2dd3ad..c8906c90 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -322,14 +322,15 @@ todo_wine static void test_module_information(void) { static const char *event_name = "dbgeng_test_event"; - unsigned int loaded, unloaded, index; + unsigned int loaded, unloaded, index, length; DEBUG_MODULE_PARAMETERS params[2]; + IDebugDataSpaces *dataspaces; PROCESS_INFORMATION info; IDebugSymbols *symbols; IDebugControl *control; + ULONG64 bases[2], base; IDebugClient *client; - ULONG64 bases[2]; - ULONG64 base; + char buffer[64]; HANDLE event; HRESULT hr; BOOL ret; @@ -343,6 +344,9 @@ static void test_module_information(void) hr = client->lpVtbl->QueryInterface(client, &IID_IDebugSymbols, (void **)&symbols); ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + hr = client->lpVtbl->QueryInterface(client, &IID_IDebugDataSpaces, (void **)&dataspaces); + 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"); @@ -419,6 +423,22 @@ static void test_module_information(void) hr = symbols->lpVtbl->GetModuleParameters(symbols, 1, NULL, loaded, params); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + /* Read memory. */ + 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 = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), &length); + ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); + ok(length == sizeof(buffer), "Unexpected length %u.\n", length); + ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); + + memset(buffer, 0, sizeof(buffer)); + hr = dataspaces->lpVtbl->ReadVirtual(dataspaces, base, buffer, sizeof(buffer), NULL); + ok(hr == S_OK, "Failed to read process memory, hr %#x.\n", hr); + ok(buffer[0] == 'M' && buffer[1] == 'Z', "Unexpected contents.\n"); + hr = client->lpVtbl->DetachProcesses(client); ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); @@ -431,6 +451,7 @@ static void test_module_information(void) client->lpVtbl->Release(client); control->lpVtbl->Release(control); symbols->lpVtbl->Release(symbols); + dataspaces->lpVtbl->Release(dataspaces); } static void target_proc(const char *event_name, const char *event_ready_name)

1 0

Alexandre Julliard : ntdll: Use the correct type for %llu scanf format.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 70d17d39295f10e5eec4739e525128b850107272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d17d39295f10e5eec4739e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 17:10:47 2019 +0200 ntdll: Use the correct type for %llu scanf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c8794e5..d03c0a1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2321,7 +2321,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if ((fp = fopen("/proc/meminfo", "r"))) { - ULONG64 totalram, freeram, totalswap, freeswap; + unsigned long long totalram, freeram, totalswap, freeswap; char line[64]; while (fgets(line, sizeof(line), fp)) {

1 0

Alexandre Julliard : wbemprox: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 6d4cdeb658e1cfd7c73643f674a0043006970b44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4cdeb658e1cfd7c73643f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:59 2019 +0200 wbemprox: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 0c48c98..75ce5b0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -187,7 +187,7 @@ static int wql_lex( void *val, struct parser *parser ); %lex-param { struct parser *ctx } %parse-param { struct parser *ctx } -%error-verbose +%define parse.error verbose %pure-parser %union

1 0

Alexandre Julliard : d3dcompiler: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 2d27c13d5ea76ec80e2a67272c8eafe8527e6af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d27c13d5ea76ec80e2a6727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:53 2019 +0200 d3dcompiler: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c2c415f..358ed96 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -903,7 +903,7 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %} %locations -%error-verbose +%define parse.error verbose %expect 1 %union

1 0

Alexandre Julliard : widl: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 5ea4d5971bff3430c29f1da31166b0a2565347ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea4d5971bff3430c29f1da3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:47:22 2019 +0200 widl: Use %define parse.error verbose instead of %error-verbose. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5156dce..dd676e9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -318,7 +318,7 @@ static typelib_t *current_typelib; %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF %left '.' MEMBERPTR '[' ']' -%error-verbose +%define parse.error verbose %%

1 0

Alexandre Julliard : setupapi/tests: Avoid using snprintf().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 7204f0f67f9fbd8765fce86c4195269c4f5aa876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7204f0f67f9fbd8765fce86c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:50 2019 +0200 setupapi/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a3b562e..4232212 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -455,7 +455,7 @@ static void test_profile_items(void) goto cleanup; } - snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + sprintf(path, "%s\\TestDir", commonprogs); if (!CreateDirectoryA(path, NULL) && GetLastError() == ERROR_ACCESS_DENIED) { skip("need admin rights\n"); @@ -467,23 +467,23 @@ static void test_profile_items(void) sprintf(path, "%s\\%s", CURR_DIR, inffile); run_cmdline("DefaultInstall", 128, path); - snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); - snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + sprintf(path, "%s\\TestItem.lnk", commonprogs); + sprintf(path, "%s\\TestDir", commonprogs); ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "directory not created\n"); - snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); + sprintf(path, "%s\\TestDir\\TestItem2.lnk", commonprogs); ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "link not created\n"); - snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + sprintf(path, "%s\\TestGroup", commonprogs); ok(INVALID_FILE_ATTRIBUTES != GetFileAttributesA(path), "group not created\n"); - snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); + sprintf(path, "%s\\TestItem.lnk", commonprogs); DeleteFileA(path); - snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); + sprintf(path, "%s\\TestDir\\TestItem2.lnk", commonprogs); DeleteFileA(path); - snprintf(path, MAX_PATH, "%s\\TestItem2.lnk", commonprogs); + sprintf(path, "%s\\TestItem2.lnk", commonprogs); DeleteFileA(path); - snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + sprintf(path, "%s\\TestDir", commonprogs); RemoveDirectoryA(path); - snprintf(path, MAX_PATH, "%s\\TestGroup", commonprogs); + sprintf(path, "%s\\TestGroup", commonprogs); RemoveDirectoryA(path); cleanup:

1 0

Alexandre Julliard : ole32/tests: Avoid using snprintf().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 0f38b850c2970f72bff7caed158fbb1c80ad5bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f38b850c2970f72bff7caed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:43 2019 +0200 ole32/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index d43bbf3..8901758 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -44,7 +44,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) { static char buf[100]; - snprintf(buf, sizeof(buf), "cf %04x ptd %p aspect %x lindex %d tymed %x", + sprintf(buf, "cf %04x ptd %p aspect %x lindex %d tymed %x", fmt->cfFormat, fmt->ptd, fmt->dwAspect, fmt->lindex, fmt->tymed); return buf; }

1 0

Alexandre Julliard : msi/tests: Avoid using snprintf().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 72f7f57a21d6e4dd63de56d4a9a265048ed930b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72f7f57a21d6e4dd63de56d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:32 2019 +0200 msi/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 593e254..7915798 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5720,14 +5720,14 @@ static void test_installprops(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "ScreenX", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); - ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + ok(atol(buf) == res, "Expected %d, got %s\n", res, buf); res = GetSystemMetrics(SM_CYSCREEN); buf[0] = 0; size = MAX_PATH; r = MsiGetPropertyA(hpkg, "ScreenY", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); - ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + ok(atol(buf) == res, "Expected %d, got %s\n", res, buf); buf[0] = 0; size = MAX_PATH;

1 0

Alexandre Julliard : mshtml/tests: Avoid using snprintf().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 40de7f2e234dccabba0fb55cadca7f1fa1cb601f URL: https://source.winehq.org/git/wine.git/?a=commit;h=40de7f2e234dccabba0fb55c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:20 2019 +0200 mshtml/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a51e09a..bcc6ccb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2281,7 +2281,7 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, test_disp((IUnknown*)factory, &IID_IHTMLImageElementFactory, NULL, "[object]"); if(wdth >= 0){ - snprintf(buf, 16, "%d", wdth); + sprintf(buf, "%d", wdth); V_VT(&width) = VT_BSTR; V_BSTR(&width) = a2bstr(buf); }else{ @@ -2290,7 +2290,7 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, } if(hght >= 0){ - snprintf(buf, 16, "%d", hght); + sprintf(buf, "%d", hght); V_VT(&height) = VT_BSTR; V_BSTR(&height) = a2bstr(buf); }else{

1 0

Alexandre Julliard : fusion/tests: Avoid using snprintf().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 5348bf674204ab18d2c5e4c45f48acb51972c3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5348bf674204ab18d2c5e4c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:13 2019 +0200 fusion/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmenum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 5091be4..115089e 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -242,10 +242,10 @@ static void enum_gac_assembly_dirs(struct list *assemblies, const char *parent, *end = 0; /* Directories with no dll or exe will not be enumerated */ - snprintf(end, path + MAX_PATH - end, "%s\\%s.dll", ffd.cFileName, parent); + sprintf(end, "%s\\%s.dll", ffd.cFileName, parent); if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) { - snprintf(end, path + MAX_PATH - end, "%s\\%s.exe", ffd.cFileName, parent); + sprintf(end, "%s\\%s.exe", ffd.cFileName, parent); if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) continue; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
81
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 April 2019