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

Akihiro Sagawa : comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: a0e6d45519ff440a060311a865f32c7bfb3ad2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e6d45519ff440a060311a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:33 2019 +0900 comctl32/tests: Skip margin tests if a font for the target charset isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 64d2fe8..3e0239c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1490,6 +1490,7 @@ static void test_margins_usefontinfo(UINT charset) INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk; LOGFONTA lf; @@ -1513,7 +1514,16 @@ static void test_margins_usefontinfo(UINT charset) hdc = GetDC(hwnd); hfont = SelectObject(hdc, hfont); - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } expect = MAKELONG(size.cx / 2, size.cx / 2); small_expect = 0; empty_expect = size.cx >= 28 ? small_expect : expect;

1 0

Alexandre Julliard : wbemprox: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard April 23, 2019

April 23, 2019

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 : ntdll: Use the correct type for %llu scanf format.
by Alexandre Julliard April 23, 2019

April 23, 2019

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 : d3dcompiler: Use %define parse.error verbose instead of %error-verbose.
by Alexandre Julliard April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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

Nikolay Sivov : dbgeng: Implement ReadVirtual().
by Alexandre Julliard April 23, 2019

April 23, 2019

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

Nikolay Sivov : dbgeng: Implement IsPointer64Bit().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: f2f9d8b26982a168017f66002e2d73c14994f915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f9d8b26982a168017f6600… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 10:38:16 2019 +0300 dbgeng: Implement IsPointer64Bit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/dbgeng/tests/dbgeng.c | 9 +++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index d7f8191..5352d3c 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -57,6 +57,7 @@ struct target_process unsigned int unloaded; BOOL initialized; } modules; + ULONG cpu_type; }; struct debug_client @@ -79,6 +80,21 @@ 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 WORD debug_target_get_module_machine(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + WORD machine = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* signature */, &machine, + sizeof(machine), NULL); + } + + return machine; +} + static HRESULT debug_target_init_modules_info(struct target_process *target) { unsigned int i, count; @@ -123,6 +139,8 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) } } + target->cpu_type = debug_target_get_module_machine(target, modules[0]); + heap_free(modules); target->modules.loaded = count; @@ -2465,9 +2483,35 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_GetPageSize(IDebugControl2 *iface, static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *iface) { - FIXME("%p stub.\n", iface); + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + if (FAILED(hr = debug_target_init_modules_info(target))) + return hr; + + switch (target->cpu_type) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + hr = S_FALSE; + break; + case IMAGE_FILE_MACHINE_IA64: + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + hr = S_OK; + break; + default: + FIXME("Unexpected cpu type %#x.\n", target->cpu_type); + hr = E_UNEXPECTED; + } + + return hr; } static HRESULT STDMETHODCALLTYPE debugcontrol_ReadBugCheckData(IDebugControl2 *iface, ULONG *code, ULONG64 *arg1, diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index c8906c90..32f9001 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -347,6 +347,9 @@ static void test_module_information(void) hr = client->lpVtbl->QueryInterface(client, &IID_IDebugDataSpaces, (void **)&dataspaces); ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); + hr = control->lpVtbl->IsPointer64Bit(control); + ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + event = CreateEventA(NULL, FALSE, FALSE, event_name); ok(event != NULL, "Failed to create event.\n"); @@ -359,9 +362,15 @@ static void test_module_information(void) 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->IsPointer64Bit(control); + ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + hr = control->lpVtbl->WaitForEvent(control, 0, INFINITE); ok(hr == S_OK, "Waiting for event failed, hr %#x.\n", hr); + hr = control->lpVtbl->IsPointer64Bit(control); + ok(SUCCEEDED(hr), "Failed to get pointer length, hr %#x.\n", hr); + /* Number of modules. */ hr = symbols->lpVtbl->GetNumberModules(symbols, &loaded, &unloaded); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : setupapi/tests: Avoid using snprintf().
by Alexandre Julliard April 23, 2019

April 23, 2019

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 : msi/tests: Avoid using snprintf().
by Alexandre Julliard April 23, 2019

April 23, 2019

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

Nikolay Sivov : dbgeng: Implement GetModuleVersionInformation().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 5c90a0dc35d9503b951dcb730662723ccaece2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c90a0dc35d9503b951dcb73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 10:38:19 2019 +0300 dbgeng: Implement GetModuleVersionInformation(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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,

1 0

Alexandre Julliard : ole32/tests: Avoid using snprintf().
by Alexandre Julliard April 23, 2019

April 23, 2019

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

Vijay Kiran Kamuju : kernel32: Add implementation for CAL_SMONTHDAY.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 9ed363a1fe7ab6fc8c6564de690f387f34bee1dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed363a1fe7ab6fc8c6564de… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 23 11:17:24 2019 +0200 kernel32: Add implementation for CAL_SMONTHDAY. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7807f99..4a4c494 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1067,6 +1067,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME11: case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: + case CAL_SMONTHDAY: case CAL_SYEARMONTH: case CAL_SSHORTESTDAYNAME1: case CAL_SSHORTESTDAYNAME2: @@ -1097,9 +1098,6 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; - case CAL_SMONTHDAY: - FIXME("Unimplemented caltype %d\n", calinfo); - return 0; case CAL_SABBREVERASTRING: FIXME("Unimplemented caltype %d\n", calinfo); return 0;

1 0

Akihiro Sagawa : comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 81c30446d9b13c6e68d4b6b84523d801c7db3cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c30446d9b13c6e68d4b6b8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:35 2019 +0900 comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins. Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 3e0239c..521daff 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1485,17 +1485,28 @@ static void test_edit_control_scroll(void) DestroyWindow (hwEdit); } +static BOOL is_cjk_charset(HDC dc) +{ + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return FALSE; + } +} + static void test_margins_usefontinfo(UINT charset) { - INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk; + BOOL cjk, cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; + INT margins, threshold, expect, empty_expect; + const UINT small_margins = MAKELONG(1, 5); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1525,8 +1536,6 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - small_expect = 0; - empty_expect = size.cx >= 28 ? small_expect : expect; charset = GetTextCharset(hdc); switch (charset) @@ -1540,26 +1549,35 @@ static void test_margins_usefontinfo(UINT charset) default: cjk = FALSE; } + cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - expect = empty_expect = small_expect = margins; + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + expect = margins; } DestroyWindow(hwnd); - threshold = (size.cx / 2 + size.cx) * 2; + threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; + empty_expect = threshold > 80 ? small_margins : expect; - /* Size below which non-cjk margins are zero */ + /* Size below the threshold, margins remain unchanged */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1569,11 +1587,14 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == small_margins, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); - /* Size at which non-cjk margins become non-zero */ + /* Size at the threshold, margins become non-zero */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1583,6 +1604,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1597,6 +1620,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Alexandre Julliard : mshtml/tests: Avoid using snprintf().
by Alexandre Julliard April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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

Alexandre Julliard : include/msvcrt: Add noreturn attributes.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 52bc3abb1bbc28825019dbbcb94a3171f7491441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bc3abb1bbc28825019dbbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 13:55:43 2019 +0200 include/msvcrt: Add noreturn attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 10 ++++++++++ include/msvcrt/eh.h | 4 ++-- include/msvcrt/process.h | 10 +++++----- include/msvcrt/stdlib.h | 8 ++++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 0c0b087..653d459 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -117,6 +117,16 @@ # endif #endif +#ifndef DECLSPEC_NORETURN +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NORETURN __declspec(noreturn) +# elif defined(__GNUC__) +# define DECLSPEC_NORETURN __attribute__((noreturn)) +# else +# define DECLSPEC_NORETURN +# endif +#endif + #ifndef DECLSPEC_ALIGN # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) # define DECLSPEC_ALIGN(x) __declspec(align(x)) diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h index 932972f..90f8896 100644 --- a/include/msvcrt/eh.h +++ b/include/msvcrt/eh.h @@ -40,8 +40,8 @@ terminate_function __cdecl set_terminate(terminate_function func); unexpected_function __cdecl set_unexpected(unexpected_function func); _se_translator_function __cdecl set_se_translator(_se_translator_function func); -void __cdecl terminate(void); -void __cdecl unexpected(void); +void __cdecl terminate(void) DECLSPEC_NORETURN; +void __cdecl unexpected(void) DECLSPEC_NORETURN; #include <poppack.h> diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 3cae112..4d286f6 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -30,8 +30,8 @@ typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*); uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*); intptr_t __cdecl _cwait(int*,intptr_t,int); -void __cdecl _endthread(void); -void __cdecl _endthreadex(unsigned int); +void __cdecl _endthread(void) DECLSPEC_NORETURN; +void __cdecl _endthreadex(unsigned int) DECLSPEC_NORETURN; intptr_t WINAPIV _execl(const char*,const char*,...); intptr_t WINAPIV _execle(const char*,const char*,...); intptr_t WINAPIV _execlp(const char*,const char*,...); @@ -52,9 +52,9 @@ intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* cons void __cdecl _c_exit(void); void __cdecl _cexit(void); -void __cdecl _exit(int); -void __cdecl abort(void); -void __cdecl exit(int); +void __cdecl _exit(int) DECLSPEC_NORETURN; +void __cdecl abort(void) DECLSPEC_NORETURN; +void __cdecl exit(int) DECLSPEC_NORETURN; int __cdecl system(const char*); #ifndef _WPROCESS_DEFINED diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index bc7c86e..3454b17 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -184,9 +184,9 @@ errno_t __cdecl _ui64toa_s(unsigned __int64,char*,size_t,int); char* __cdecl _ultoa(__msvcrt_ulong,char*,int); errno_t __cdecl _ultoa_s(__msvcrt_ulong,char*,size_t,int); -void __cdecl _Exit(int); -void __cdecl _exit(int); -void __cdecl abort(void); +void __cdecl _Exit(int) DECLSPEC_NORETURN; +void __cdecl _exit(int) DECLSPEC_NORETURN; +void __cdecl abort(void) DECLSPEC_NORETURN; int __cdecl abs(int); int __cdecl atexit(void (__cdecl *)(void)); double __cdecl atof(const char*); @@ -200,7 +200,7 @@ div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif lldiv_t __cdecl lldiv(__int64,__int64); -void __cdecl exit(int); +void __cdecl exit(int) DECLSPEC_NORETURN; void __cdecl free(void*); char* __cdecl getenv(const char*); __msvcrt_long __cdecl labs(__msvcrt_long);

1 0

Alexandre Julliard : include/msvcrt: Define math constants by default, for compatibility with Mingw.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: b9ae3bf095ce145ac9038a27b698caa4a6e999a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ae3bf095ce145ac9038a27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 12:46:09 2019 +0200 include/msvcrt: Define math constants by default, for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c2e61b7..f8b2add 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -195,7 +195,7 @@ short __cdecl _dclass(double); #include <poppack.h> -#ifdef _USE_MATH_DEFINES +#if !defined(__STRICT_ANSI__) || defined(_POSIX_C_SOURCE) || defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_USE_MATH_DEFINES) #ifndef _MATH_DEFINES_DEFINED #define _MATH_DEFINES_DEFINED #define M_E 2.71828182845904523536

1 0

Alexandre Julliard : cryptnet/tests: Avoid using snprintf().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 740c1c37cb359020fee30a68500393dc419a2a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=740c1c37cb359020fee30a68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 23 11:12:00 2019 +0200 cryptnet/tests: Avoid using snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/tests/cryptnet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 8600fda..0b01760 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -316,7 +316,7 @@ static void make_tmp_file(LPSTR path) static void test_retrieveObjectByUrl(void) { BOOL ret; - char tmpfile[MAX_PATH * 2], url[MAX_PATH + 8]; + char tmpfile[MAX_PATH], url[MAX_PATH + 8]; CRYPT_BLOB_ARRAY *pBlobArray; PCCERT_CONTEXT cert; PCCRL_CONTEXT crl; @@ -332,7 +332,7 @@ static void test_retrieveObjectByUrl(void) GetLastError(), GetLastError()); make_tmp_file(tmpfile); - snprintf(url, sizeof(url), "file://%s", tmpfile); + sprintf(url, "file://%s", tmpfile); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray,

1 0

Alexandre Julliard : include/msvcrt: Use _fpclass() instead of _dclass().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: ca6478b2a319b0f518f14df6f815138cbe5711a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca6478b2a319b0f518f14df6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 13:30:02 2019 +0200 include/msvcrt: Use _fpclass() instead of _dclass(). dclass() is only available in MSVCR120. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c22c053..c539ebe 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -184,10 +184,10 @@ static const union { #define FP_ZERO 0 short __cdecl _dclass(double); -#define isfinite(x) (_dclass((double)(x)) <= FP_ZERO) -#define isinf(x) (_dclass((double)(x)) == FP_INFINITE) -#define isnan(x) (_dclass((double)(x)) == FP_NAN) -#define isnormal(x) (_dclass((double)(x)) == FP_NORMAL) +#define isfinite(x) (_finite(x)) +#define isinf(x) (!(_finite(x) || _isnan(x))) +#define isnan(x) (_isnan(x)) +#define isnormal(x) (!!(_fpclass((double)(x)) & (_FPCLASS_NN|_FPCLASS_PN))) #ifdef __cplusplus }

1 0

Alistair Leslie-Hughes : winex11/wintab: Set all Device Orientation values.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 13243a28b2493a8760f7d3041998b14412d3d281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13243a28b2493a8760f7d304… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 23 03:39:41 2019 +0000 winex11/wintab: Set all Device Orientation values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 486c356..fe3d4a8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -717,6 +717,11 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.ORIENTATION[1].axUnits = TU_CIRCLE; gSysDevice.ORIENTATION[1].axResolution = CASTFIX32(3600); + gSysDevice.ORIENTATION[2].axMin = 0; + gSysDevice.ORIENTATION[2].axMax = 3600; + gSysDevice.ORIENTATION[2].axUnits = TU_CIRCLE; + gSysDevice.ORIENTATION[2].axResolution + = CASTFIX32(3600); Axis++; } }

1 0

Nikolay Sivov : ntdll/tests: Add some tests for unloaded modules traces.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 91763843b76fd36c00522e9b3fabaad1b2a3f1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91763843b76fd36c00522e9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 08:47:29 2019 +0300 ntdll/tests: Add some tests for unloaded modules traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 147 ++++++++++++++++++++++++++++++------------- 1 file changed, 102 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3b3f72f..d2e0317 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -56,6 +56,21 @@ static NTSTATUS (WINAPI *pNtClose)(HANDLE); static NTSTATUS (WINAPI *pNtSuspendProcess)(HANDLE process); static NTSTATUS (WINAPI *pNtResumeProcess)(HANDLE process); +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 + +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + void *BaseAddress; + SIZE_T SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +static RTL_UNLOAD_EVENT_TRACE *(WINAPI *pRtlGetUnloadEventTrace)(void); +static void (WINAPI *pRtlGetUnloadEventTraceEx)(ULONG **element_size, ULONG **element_count, void **event_trace); + #if defined(__x86_64__) typedef struct { @@ -3325,6 +3340,53 @@ static void test_suspend_process(void) CloseHandle(event2); } +static void test_unload_trace(void) +{ + static const WCHAR imageW[] = {'m','s','x','m','l','3','.','d','l','l',0}; + RTL_UNLOAD_EVENT_TRACE *unload_trace, *ptr; + ULONG *element_size, *element_count, size; + BOOL found = FALSE; + HMODULE hmod; + + unload_trace = pRtlGetUnloadEventTrace(); +todo_wine + ok(unload_trace != NULL, "Failed to get unload events pointer.\n"); + + if (pRtlGetUnloadEventTraceEx) + { + ptr = NULL; + pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&ptr); + todo_wine { + ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); + ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); + ok(ptr != NULL, "Unexpected pointer %p.\n", ptr); + } + size = *element_size; + } + else + size = sizeof(*unload_trace); + + hmod = LoadLibraryA("msxml3.dll"); + ok(hmod != NULL, "Failed to load library.\n"); + FreeLibrary(hmod); + +if (unload_trace) +{ + ptr = unload_trace; + while (ptr->BaseAddress != NULL) + { + if (!lstrcmpW(imageW, ptr->ImageName)) + { + found = TRUE; + break; + } + ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); + } +} +todo_wine + ok(found, "Unloaded module wasn't found.\n"); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3346,29 +3408,28 @@ START_TEST(exception) return; } - pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); - pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); - pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); - pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); - pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); - pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); - pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); - pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredExceptionHandler" ); - pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredExceptionHandler" ); - pRtlAddVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlAddVectoredContinueHandler" ); - pRtlRemoveVectoredContinueHandler = (void *)GetProcAddress( hntdll, - "RtlRemoveVectoredContinueHandler" ); - pNtQueryInformationProcess = (void*)GetProcAddress( hntdll, - "NtQueryInformationProcess" ); - pNtSetInformationProcess = (void*)GetProcAddress( hntdll, - "NtSetInformationProcess" ); +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(NtGetContextThread); + X(NtSetContextThread); + X(NtReadVirtualMemory); + X(NtClose); + X(RtlUnwind); + X(RtlRaiseException); + X(RtlCaptureContext); + X(NtTerminateProcess); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); + X(RtlAddVectoredContinueHandler); + X(RtlRemoveVectoredContinueHandler); + X(NtQueryInformationProcess); + X(NtSetInformationProcess); + X(NtSuspendProcess); + X(NtResumeProcess); + X(RtlGetUnloadEventTrace); + X(RtlGetUnloadEventTraceEx); +#undef X + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); - pNtSuspendProcess = (void *)GetProcAddress( hntdll, "NtSuspendProcess" ); - pNtResumeProcess = (void *)GetProcAddress( hntdll, "NtResumeProcess" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3455,31 +3516,26 @@ START_TEST(exception) test_thread_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); #elif defined(__x86_64__) - pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, - "RtlAddFunctionTable" ); - pRtlDeleteFunctionTable = (void *)GetProcAddress( hntdll, - "RtlDeleteFunctionTable" ); - pRtlInstallFunctionTableCallback = (void *)GetProcAddress( hntdll, - "RtlInstallFunctionTableCallback" ); - pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, - "RtlLookupFunctionEntry" ); - pRtlAddGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddGrowableFunctionTable" ); - pRtlGrowFunctionTable = (void *)GetProcAddress( hntdll, "RtlGrowFunctionTable" ); - pRtlDeleteGrowableFunctionTable = (void *)GetProcAddress( hntdll, "RtlDeleteGrowableFunctionTable" ); - p__C_specific_handler = (void *)GetProcAddress( hntdll, - "__C_specific_handler" ); - pRtlCaptureContext = (void *)GetProcAddress( hntdll, - "RtlCaptureContext" ); - pRtlRestoreContext = (void *)GetProcAddress( hntdll, - "RtlRestoreContext" ); - pRtlUnwindEx = (void *)GetProcAddress( hntdll, - "RtlUnwindEx" ); - pRtlWow64GetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64GetThreadContext" ); - pRtlWow64SetThreadContext = (void *)GetProcAddress( hntdll, - "RtlWow64SetThreadContext" ); + +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f) + X(RtlAddFunctionTable); + X(RtlDeleteFunctionTable); + X(RtlInstallFunctionTableCallback); + X(RtlLookupFunctionEntry); + X(RtlAddGrowableFunctionTable); + X(RtlGrowFunctionTable); + X(RtlDeleteGrowableFunctionTable); + X(__C_specific_handler); + X(RtlCaptureContext); + X(RtlRestoreContext); + X(RtlUnwindEx); + X(RtlWow64GetThreadContext); + X(RtlWow64SetThreadContext); +#undef X + p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" ); @@ -3498,6 +3554,7 @@ START_TEST(exception) test_wow64_context(); test_suspend_thread(); test_suspend_process(); + test_unload_trace(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Nikolay Sivov : ntdll: Implement RtlGetUnloadEventTrace()/ RtlGetUnloadEventTraceEx().
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: 5431409bd3ede441b490a730893fe563f3384cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5431409bd3ede441b490a730… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 23 08:47:30 2019 +0300 ntdll: Implement RtlGetUnloadEventTrace()/RtlGetUnloadEventTraceEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtl.c | 33 --------------------------- dlls/ntdll/tests/exception.c | 7 ------ 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c0708c6..994ff6f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -159,6 +159,57 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) while (len--) *dst++ = (unsigned char)*src++; } +#define RTL_UNLOAD_EVENT_TRACE_NUMBER 64 + +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + void *BaseAddress; + SIZE_T SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +static RTL_UNLOAD_EVENT_TRACE unload_traces[RTL_UNLOAD_EVENT_TRACE_NUMBER]; +static unsigned int unload_trace_seq; + +static void module_push_unload_trace( const LDR_MODULE *ldr ) +{ + RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; + unsigned int len = min(sizeof(ptr->ImageName), ldr->BaseDllName.Length); + + ptr->BaseAddress = ldr->BaseAddress; + ptr->SizeOfImage = ldr->SizeOfImage; + ptr->Sequence = unload_trace_seq; + ptr->TimeDateStamp = ldr->TimeDateStamp; + ptr->CheckSum = ldr->CheckSum; + memcpy(ptr->ImageName, ldr->BaseDllName.Buffer, len); + ptr->ImageName[len / sizeof(*ptr->ImageName)] = 0; + + unload_trace_seq = (unload_trace_seq + 1) % ARRAY_SIZE(unload_traces); +} + +/********************************************************************* + * RtlGetUnloadEventTrace [NTDLL.@] + */ +RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) +{ + return unload_traces; +} + +/********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static unsigned int element_size = sizeof(*unload_traces); + static unsigned int element_count = ARRAY_SIZE(unload_traces); + + *size = &element_size; + *count = &element_count; + *trace = unload_traces; +} /************************************************************************* * call_dll_entry_point @@ -3358,6 +3409,8 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) MODULE_DecRefCount( wm->deps[i] ); wm->ldr.Flags &= ~LDR_UNLOAD_IN_PROGRESS; + + module_push_unload_trace( &wm->ldr ); } } diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 755cc6e..2e459b2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1657,39 +1657,6 @@ void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, FIXME("%p %p %u %p: stub\n", table, buffer, size, element); } -typedef struct _RTL_UNLOAD_EVENT_TRACE -{ - PVOID BaseAddress; - SIZE_T SizeOfImage; - ULONG Sequence; - ULONG TimeDateStamp; - ULONG CheckSum; - WCHAR ImageName[32]; -} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; - -/********************************************************************* - * RtlGetUnloadEventTrace [NTDLL.@] - */ -RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) -{ - FIXME("stub!\n"); - return NULL; -} - -/********************************************************************* - * RtlGetUnloadEventTraceEx [NTDLL.@] - */ -void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) -{ - static ULONG dummy_size, dummy_count; - - FIXME("(%p, %p, %p): stub!\n", size, count, trace); - - if (size) *size = &dummy_size; - if (count) *count = &dummy_count; - if (trace) *trace = NULL; -} - /********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d2e0317..4f75cc2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3349,18 +3349,15 @@ static void test_unload_trace(void) HMODULE hmod; unload_trace = pRtlGetUnloadEventTrace(); -todo_wine ok(unload_trace != NULL, "Failed to get unload events pointer.\n"); if (pRtlGetUnloadEventTraceEx) { ptr = NULL; pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&ptr); - todo_wine { ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); ok(ptr != NULL, "Unexpected pointer %p.\n", ptr); - } size = *element_size; } else @@ -3370,8 +3367,6 @@ todo_wine ok(hmod != NULL, "Failed to load library.\n"); FreeLibrary(hmod); -if (unload_trace) -{ ptr = unload_trace; while (ptr->BaseAddress != NULL) { @@ -3382,8 +3377,6 @@ if (unload_trace) } ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); } -} -todo_wine ok(found, "Unloaded module wasn't found.\n"); }

1 0

Alexandre Julliard : include/msvcrt: Remove some prototypes that conflict with gcc builtins.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: f402bcd0c310b15e547cf426f88a017e6600fecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f402bcd0c310b15e547cf426… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 12:46:58 2019 +0200 include/msvcrt: Remove some prototypes that conflict with gcc builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 1 - include/msvcrt/process.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index f8b2add..c22c053 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -221,7 +221,6 @@ static inline double jn( int n, double x ) { return _jn( n, x ); } static inline double y0( double x ) { return _y0( x ); } static inline double y1( double x ) { return _y1( x ); } static inline double yn( int n, double x ) { return _yn( n, x ); } -static inline double cabs( struct _complex z ) { return _cabs( z ); } static inline float hypotf( float x, float y ) { return _hypotf( x, y ); } diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 94017c6..3cae112 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -94,14 +94,14 @@ int __cdecl _wsystem(const wchar_t*); static inline intptr_t cwait(int *status, intptr_t pid, int action) { return _cwait(status, pid, action); } static inline int getpid(void) { return _getpid(); } -static inline intptr_t execv(const char* name, const char* const* argv) { return _execv(name, argv); } -static inline intptr_t execve(const char* name, const char* const* argv, const char* const* envv) { return _execve(name, argv, envv); } -static inline intptr_t execvp(const char* name, const char* const* argv) { return _execvp(name, argv); } -static inline intptr_t execvpe(const char* name, const char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); } static inline intptr_t spawnv(int flags, const char* name, const char* const* argv) { return _spawnv(flags, name, argv); } static inline intptr_t spawnve(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnve(flags, name, argv, envv); } static inline intptr_t spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); } static inline intptr_t spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); } +#define execv _execv +#define execve _execve +#define execvp _execvp +#define execvpe _execvpe #if defined(__GNUC__) && (__GNUC__ < 4) extern intptr_t WINAPIV execl(const char*,const char*,...) __attribute__((alias("_execl")));

1 0

Alexandre Julliard : include/msvcrt: Make offsetof constant for compatibility with Mingw.
by Alexandre Julliard April 23, 2019

April 23, 2019

Module: wine Branch: master Commit: e76912880aca42f21db6445bf48ed24c4221af41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76912880aca42f21db6445b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 13:13:36 2019 +0200 include/msvcrt: Make offsetof constant for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stddef.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h index 0ceb65d..cc38d56 100644 --- a/include/msvcrt/stddef.h +++ b/include/msvcrt/stddef.h @@ -28,7 +28,9 @@ #endif #endif -#ifdef _WIN64 +#ifdef __GNUC__ +#define offsetof(s,m) __builtin_offsetof(s,m) +#elif defined(_WIN64) #define offsetof(s,m) (size_t)((ptrdiff_t)&(((s*)NULL)->m)) #else #define offsetof(s,m) (size_t)&(((s*)NULL)->m)

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 54dee9a9346deee075abf06ae921eebb897811f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54dee9a9346deee075abf06a… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Apr 14 08:22:54 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 121 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 64 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54dee9a9346deee075ab…

1 0