wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Zebediah Figura : server: Also clear pending events in set_socket_event.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 609dfea1fde4deaefc5c67b2544c4a5cab987dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609dfea1fde4deaefc5c67b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 21:45:50 2021 -0500 server: Also clear pending events in set_socket_event. In particular, prevent FD_CONNECT from being reported when not selected for. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 945895b51a4..565fb4c5a2c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1809,7 +1809,10 @@ DECL_HANDLER(set_socket_event) old_event = sock->event; sock->mask = req->mask; if (req->window) - sock->reported_events &= ~req->mask; /* re-enable held events */ + { + sock->pending_events &= ~req->mask; + sock->reported_events &= ~req->mask; + } sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Zebediah Figura : quartz/tests: Use CRT memory allocators.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 226897bec73768f78c9ea2137c34d0df87c54fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=226897bec73768f78c9ea213… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:37:27 2021 -0500 quartz/tests: Use CRT memory allocators. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 11 ++--------- dlls/quartz/tests/videorenderer.c | 5 ++--- dlls/quartz/tests/vmr7.c | 5 ++--- dlls/quartz/tests/vmr9.c | 5 ++--- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b2d5b4e26e8..c663b5d8a99 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -23,7 +23,6 @@ #define CONST_VTABLE #include "dshow.h" -#include "wine/heap.h" #include "wine/test.h" static const GUID testguid = {0xabbccdde}; @@ -1486,14 +1485,8 @@ static HRESULT WINAPI testfilter_JoinFilterGraph(IBaseFilter *iface, IFilterGrap if (winetest_debug > 1) trace("%p->JoinFilterGraph(%p, %s)\n", filter, graph, wine_dbgstr_w(name)); filter->graph = graph; - heap_free(filter->name); - if (name) - { - filter->name = heap_alloc((wcslen(name) + 1) * sizeof(WCHAR)); - wcscpy(filter->name, name); - } - else - filter->name = NULL; + free(filter->name); + filter->name = name ? wcsdup(name) : NULL; return S_OK; } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ffe370acf43..f4d9660316c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -20,7 +20,6 @@ #define COBJMACROS #include "dshow.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -765,13 +764,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); IMemAllocator *allocator; REFERENCE_TIME end_time; IMediaSample *sample; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index ba2a98cb69d..212ce213e89 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -23,7 +23,6 @@ #include "dshow.h" #include "d3d9.h" #include "vmr9.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -969,13 +968,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame(IMemInputPin *sink) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); REFERENCE_TIME start_time, end_time; IMemAllocator *allocator; IMediaSample *sample; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 8b46e4706a5..44b9a453305 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -28,7 +28,6 @@ #include "d3d9.h" #include "vmr9.h" #include "wmcodecdsp.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -976,13 +975,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, DWORD color) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); IMemAllocator *allocator; REFERENCE_TIME end_time; IMediaSample *sample;

1 0

Zebediah Figura : quartz/tests: Remove the no longer used TestFilterImpl structure.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 11c336b4a97e7520df3c100b9a95e1a15262194e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c336b4a97e7520df3c100b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:37:26 2021 -0500 quartz/tests: Remove the no longer used TestFilterImpl structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4822b65a7a6..b2d5b4e26e8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -28,19 +28,6 @@ static const GUID testguid = {0xabbccdde}; -typedef struct TestFilterImpl -{ - IBaseFilter IBaseFilter_iface; - - LONG refCount; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - FILTER_INFO filterInfo; - CLSID clsid; - IPin **ppPins; - UINT nPins; -} TestFilterImpl; - static BOOL compare_time(ULONGLONG x, ULONGLONG y, unsigned int max_diff) { ULONGLONG diff = x > y ? x - y : y - x;

1 0

Martin Storsjo : widl: Pick up the target arch from a prefix on argv[0].
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 57433856b46c96227552dfc577a6139f7a173bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57433856b46c96227552dfc5… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 17 00:22:42 2021 +0300 widl: Pick up the target arch from a prefix on argv[0]. If the executable is named <target>-widl, try to pick up the target arch implicitly from there. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 99 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 992eef73e82..b40745a49f8 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -211,6 +211,31 @@ static const struct option long_options[] = { { NULL, 0, NULL, 0 } }; +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, + { "x86_64", CPU_x86_64 }, + { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, + { "powerpc64le", CPU_POWERPC64 }, + { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "armv7a", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, +}; + static void rm_tempfile(void); enum stub_mode get_stub_mode(void) @@ -274,51 +299,54 @@ static void add_widl_version_define(void) wpp_add_cmdline_define(version_str); } -/* set the target platform */ -static void set_target( const char *target ) +static void set_cpu( const char *cpu, int error_out ) { - static const struct + unsigned int i; + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { - const char *name; - enum target_cpu cpu; - } cpu_names[] = + if (!strcmp( cpu_names[i].name, cpu )) + { + target_cpu = cpu_names[i].cpu; + return; + } + } + if (error_out) + error( "Unrecognized CPU '%s'\n", cpu ); +} + +/* Set the target platform based on a potential prefix of the executable name. + * If not found, or not matching a known CPU name, just proceed silently. */ +static void init_argv0_target( const char *argv0 ) +{ + char *p, *name; + + if ((p = strrchr(argv0, '/')) != NULL) + argv0 = p + 1; + if ((p = strrchr(argv0, '\\')) != NULL) + argv0 = p + 1; + + name = xstrdup( argv0 ); + if (!(p = strchr(name, '-'))) { - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "amd64", CPU_x86_64 }, - { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "powerpc64", CPU_POWERPC64 }, - { "powerpc64le", CPU_POWERPC64 }, - { "arm", CPU_ARM }, - { "armv5", CPU_ARM }, - { "armv6", CPU_ARM }, - { "armv7", CPU_ARM }, - { "armv7a", CPU_ARM }, - { "arm64", CPU_ARM64 }, - { "aarch64", CPU_ARM64 }, - }; + free( name ); + return; + } + *p = 0; + set_cpu( name, 0 ); + free( name ); +} - unsigned int i; +/* set the target platform */ +static void set_target( const char *target ) +{ char *p, *spec = xstrdup( target ); /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) - { - if (!strcmp( cpu_names[i].name, spec )) - { - target_cpu = cpu_names[i].cpu; - free( spec ); - return; - } - } - error( "Unrecognized CPU '%s'\n", spec ); + set_cpu( spec, 1 ); + free( spec ); } /* clean things up when aborting on a signal */ @@ -607,6 +635,7 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif init_argv0_dir( argv[0] ); + init_argv0_target( argv[0] ); now = time(NULL);

1 0

Martin Storsjo : widl: Allow switching between 32 and 64 bit ARM with the -m32/64 option.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 4766a018184d2ffa95657dbc926dd0cfe81158c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4766a018184d2ffa95657dbc… Author: Martin Storsjo <martin(a)martin.st> Date: Sun May 16 23:57:57 2021 +0300 widl: Allow switching between 32 and 64 bit ARM with the -m32/64 option. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8da887ea636..992eef73e82 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -796,8 +796,12 @@ int main(int argc,char *argv[]) if (pointer_size == 4) target_cpu = CPU_x86; else pointer_size = 8; break; + case CPU_ARM: + if (pointer_size == 8) target_cpu = CPU_ARM64; + else pointer_size = 4; + break; case CPU_ARM64: - if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + if (pointer_size == 4) target_cpu = CPU_ARM; pointer_size = 8; break; case CPU_POWERPC64:

1 0

Francois Gouget : mshtml/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 53cba4f066a022e9be0d84a2d36c6b1c2694992c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cba4f066a022e9be0d84a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 15 17:41:03 2021 +0200 mshtml/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index d171b516cfd..a2c70540eba 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -453,7 +453,7 @@ async_test("animation_frame", function() { var id = requestAnimationFrame(function(x) { ok(this === window, "this != window"); ok(typeof(x) === "number", "x = " + x); - ok(arguments.length === 1, "arguments.lenght = " + arguments.length); + ok(arguments.length === 1, "arguments.length = " + arguments.length); next_test(); }); ok(typeof(id) === "number", "id = " + id);

1 0

Francois Gouget : advapi32/tests: Trace failures to open the event log.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 832b7f1e8666dac7054b61f47ae685edbae07981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832b7f1e8666dac7054b61f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat May 15 17:39:19 2021 +0200 advapi32/tests: Trace failures to open the event log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 72bcb4d1788..0c5d1e2523f 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -64,8 +64,10 @@ static BOOL create_backup(const char *filename) HANDLE handle; DWORD rc, attribs; - DeleteFileA(filename); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); + + DeleteFileA(filename); rc = BackupEventLogA(handle, filename); if (!rc && GetLastError() == ERROR_PRIVILEGE_NOT_HELD) { @@ -160,6 +162,7 @@ static void test_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, NULL, 0, NULL); @@ -216,6 +219,7 @@ static void test_count(void) ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, NULL); @@ -270,6 +274,7 @@ static void test_oldest(void) ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(handle, NULL); @@ -322,6 +327,7 @@ static void test_backup(void) ok(GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = BackupEventLogA(handle, NULL); @@ -433,6 +439,7 @@ static void test_read(void) HeapFree(GetProcessHeap(), 0, buf); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); /* Show that we need the proper dwFlags with a (for the rest) proper call */ buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD));

1 0

Francois Gouget : advapi32/tests: Trace GetLastError() when an event log API fails.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 59588b66cea635f696f65a45937dc1f8a142373f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59588b66cea635f696f65a45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat May 15 17:38:47 2021 +0200 advapi32/tests: Trace GetLastError() when an event log API fails. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 6722ea7d622..72bcb4d1788 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -113,9 +113,9 @@ static void test_open_close(void) /* This one opens the Application log */ handle = OpenEventLogA(NULL, "deadbeef"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); ret = CloseEventLog(handle); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); /* Close a second time */ SetLastError(0xdeadbeef); ret = CloseEventLog(handle); @@ -127,11 +127,11 @@ static void test_open_close(void) /* Empty servername should be read as local server */ handle = OpenEventLogA("", "Application"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); CloseEventLog(handle); handle = OpenEventLogA(NULL, "Application"); - ok(handle != NULL, "Expected a handle\n"); + ok(handle != NULL, "Expected a handle : %d\n", GetLastError()); CloseEventLog(handle); } @@ -189,7 +189,7 @@ static void test_info(void) efi->dwFull = 0xdeadbeef; needed = sizeof(buffer); ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, efi, needed, &needed); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); ok(efi->dwFull == 0 || efi->dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi->dwFull); @@ -224,7 +224,7 @@ static void test_count(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count != 0xdeadbeef, "Expected the number of records\n"); CloseEventLog(handle); @@ -241,7 +241,7 @@ static void test_count(void) ret = GetNumberOfEventLogRecords(handle, &count); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count != 0xdeadbeef, "Expected the number of records\n"); } @@ -278,7 +278,7 @@ static void test_oldest(void) oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); CloseEventLog(handle); @@ -295,7 +295,7 @@ static void test_oldest(void) ret = GetOldestEventLogRecord(handle, &oldest); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); } @@ -335,7 +335,7 @@ static void test_backup(void) CloseEventLog(handle); return; } - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); todo_wine ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); @@ -358,7 +358,7 @@ static void test_backup(void) ret = BackupEventLogA(handle, backup2); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(GetFileAttributesA(backup2) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); } @@ -505,7 +505,7 @@ static void test_read(void) read = needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, toread, &read, &needed); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(read == toread || broken(read < toread), /* NT4 wants a buffer size way bigger than just 1 record */ "Expected the requested size to be read\n"); @@ -886,7 +886,7 @@ static void test_readwrite(void) handle = OpenEventLogA(NULL, eventlogname); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1024,11 +1024,11 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected success\n"); + ok(ret, "Expected success : %d\n", GetLastError()); ok(count == 0, "Expected an empty eventlog, got %d records\n", count); CloseEventLog(handle);

1 0

Francois Gouget : winevulkan: Fix the spelling of a make_vulkan comment.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: a76fd1c312bfdff33774e361660f7fd29041099f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76fd1c312bfdff33774e361… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 15 17:31:57 2021 +0200 winevulkan: Fix the spelling of a make_vulkan comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index cc79b0a58cd..135fd5cf06a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1720,7 +1720,7 @@ class VkParam(object): def needs_unwrapping(self): """ Returns if parameter needs unwrapping of handle. """ - # Wrapped handle parameters are handled seperately, only look for wrapped handles in structs + # Wrapped handle parameters are handled separately, only look for wrapped handles in structs if self.is_struct(): return self.struct.needs_unwrapping()

1 0

Haoyang Chen : gdiplus: Avoid filtering of special characters.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 43e2563f449372a0f7ff72052bda56505f0c4359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e2563f449372a0f7ff7205… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Wed May 12 17:30:06 2021 +0800 gdiplus: Avoid filtering of special characters. Symbols such as ← should also be displayed. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df4a89e8294..4a428c49869 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5229,9 +5229,6 @@ GpStatus gdip_format_string(HDC hdc, hotkeyprefix_count = 0; for(i = 0, j = 0; i < length; i++){ - /* FIXME: This makes the indexes passed to callback inaccurate. */ - if(!iswprint(string[i]) && (string[i] != '\n')) - continue; /* FIXME: tabs should be handled using tabstops from stringformat */ if (string[i] == '\t')

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
77
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 May 2021