September 2019 - Wine-Commits

Francois Gouget : libwine: Like Linux, NetBSD has /proc/self/exe.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: wine Branch: master Commit: 896292a7fef818c640f77b8c18fbb9d3e3034cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=896292a7fef818c640f77b8c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 2 04:16:53 2019 +0200 libwine: Like Linux, NetBSD has /proc/self/exe. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index bdf065f..2a3314c 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -61,7 +61,7 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( static void fatal_perror( const char *err, ... ) __attribute__((noreturn,format(printf,1,2))); #endif -#if defined(__linux__) || defined(__FreeBSD_kernel__ ) +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; #elif defined (__FreeBSD__) || defined(__DragonFly__) static const char exe_link[] = "/proc/curproc/file";

1 0

Francois Gouget : tests: Add support for subtests.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: wine Branch: master Commit: 033196641b0c33c1047234cdb278f6630f226681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=033196641b0c33c1047234cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 04:14:29 2019 +0200 tests: Add support for subtests. Some Wine tests run code compiled from another C file, resulting in traces and errors that look like they come from a different test. subtest() allows such tests to declare their subtests so they are recognized by scripts parsing the results such as the TestBot and WineTest website. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index b5aa9c1..bfd893e 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -68,6 +68,7 @@ extern int winetest_report_success; extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); +extern void winetest_subtest( const char* name ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); @@ -123,17 +124,20 @@ extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) WINETEST_ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); #ifdef WINETEST_NO_LINE_NUMBERS +# define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest # define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace #else +# define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace #endif +#define subtest subtest_(__FILE__, __LINE__) #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) @@ -308,6 +312,13 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +void winetest_subtest( const char* name ) +{ + struct tls_data *data = get_tls_data(); + printf( "%s:%d: Subtest %s\n", + data->current_file, data->current_line, name); +} + int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition;

1 0

Francois Gouget : ntoskrnl/tests: Declare the driver subtest.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: wine Branch: master Commit: c9f222e775a4b9a2c032a3977b31932db2c5b3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f222e775a4b9a2c032a397… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 04:14:40 2019 +0200 ntoskrnl/tests: Declare the driver subtest. It may print test failures and as such should be declared by its parent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 86dce75..eb58878 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,7 @@ START_TEST(ntoskrnl) pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); + subtest("driver"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; if (!start_driver(service))

1 0

Francois Gouget : testbot/TestLauncher: Fix a couple of GNU make dependencies.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: tools Branch: master Commit: 5e9a7f7b9fe5ab840055e017bb9ce6881b61c6d1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e9a7f7b9fe5ab840055e01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:52:33 2019 +0200 testbot/TestLauncher: Fix a couple of GNU make dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 6b41e01..b040353 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -9,7 +9,7 @@ CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c - $(CROSSCC32) -Wall -o $@ $< + $(CROSSCC32) -Wall -o $@ TestLauncher.c $(CROSSSTRIP32) $@ if which $(CROSSZIPEXE); \ then \ @@ -17,7 +17,7 @@ TestLauncher32.exe: TestLauncher.c fi TestLauncher64.exe: TestLauncher.c - $(CROSSCC64) -Wall -o $@ $< + $(CROSSCC64) -Wall -o $@ TestLauncher.c $(CROSSSTRIP64) $@ if which $(CROSSZIPEXE); \ then \

1 0

Francois Gouget : testbot/SetWinLocale: Don' t delete the Windows commands in debug mode.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: tools Branch: master Commit: 4bf153802e7395fb92b6bd8735b20d7c4ec798d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bf153802e7395fb92b6bd8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:53:03 2019 +0200 testbot/SetWinLocale: Don't delete the Windows commands in debug mode. This makes it possible to analyze or re-run them manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 824d8f5..7477c5d 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -805,8 +805,15 @@ if (!$DryRun) FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); } - $TA->Rm("script.bat"); - $TA->Rm("locales.xml"); + if ($Debug) + { + print STDERR "Not deleting script.bat and locales.xml\n"; + } + else + { + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); + } } if ($OptReboot)

1 0

Francois Gouget : testbot/testagentd: Fix a couple of GNU make dependencies.
by Alexandre Julliard Sept. 3, 2019

Sept. 3, 2019

Module: tools Branch: master Commit: dc79153f8309252a82c0eb6b81a66d29d7727aa4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc79153f8309252a82c0eb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:52:22 2019 +0200 testbot/testagentd: Fix a couple of GNU make dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 4f16f9c..b2f9e82 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,7 +9,7 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ $^ + $(CC) -o $@ testagentd.o platform_unix.o strip $@ .c.o: @@ -17,7 +17,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ $^ -lws2_32 + $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj

1 0

Francois Gouget : advapi32/tests: Spelling tweaks in ok() messages.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 171f24eba2ea19176dc58965b2575ecfd29e7b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=171f24eba2ea19176dc58965… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:31:13 2019 +0200 advapi32/tests: Spelling tweaks in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt_lmhash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index a6e812e..4c96e5b 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -287,18 +287,18 @@ static void test_SystemFunction004(void) r = pSystemFunction002(out.Buffer, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); - ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); + ok(((unsigned int*)output)[0] == in.Length, "encrypted length wrong\n"); + ok(((unsigned int*)output)[1] == 1, "encrypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); } static void test_SystemFunction005(void)

1 0

Francois Gouget : advapi32/tests: Spelling fixes in a couple of comments.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: 432cb69178b729d02f13275b2075508c149aa637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=432cb69178b729d02f13275b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:30:55 2019 +0200 advapi32/tests: Spelling fixes in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6b199bc..675426d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3933,7 +3933,7 @@ static void test_RegLoadMUIString(void) ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); ok(ret > 0, "GetSystemDirectoryA failed\n"); - /* change the current direcoty to system32 */ + /* change the current directory to system32 */ GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); SetCurrentDirectoryW(sysdirW); @@ -3982,7 +3982,7 @@ static void test_RegLoadMUIString(void) ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); - /* change the current direcoty to other than system32 directory */ + /* change the current directory to other than system32 directory */ SetCurrentDirectoryA("\\"); size = 0xdeadbeef;

1 0

Francois Gouget : comctl32: Typo and spelling fixes in comments.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: e0e119e41f2437826f8b9f5f1857742887ab4244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e119e41f2437826f8b9f5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:30:40 2019 +0200 comctl32: Typo and spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 82ed38e..ac53a2c 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -671,7 +671,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy, * * NOTES * This function is just a dummy - all the controls are registered at - * the DLL initialization time. See InitCommonContolsEx for details. + * the DLL initialization time. See InitCommonControlsEx for details. */ VOID WINAPI diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9e91a2f..05ae3a6 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -237,7 +237,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy * *'dddddd' is handled as 'dddd' plus 'dd'. * *unrecognized formats are strings (here given the type DT_STRING; * start of the string is encoded in lower bits of DT_STRING. - * Therefore, 'string' ends finally up as '<show seconds>tring'. + * Therefore, 'string' ends up as '<show seconds>tring'. * */ static void diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f113bb2..8c667a1 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2135,7 +2135,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) } else { - /* Place the band in the prexisting row the mouse is hovering over */ + /* Place the band in the preexisting row the mouse is hovering over */ iRowBegin = first_visible(infoPtr); while(iRowBegin < infoPtr->uNumBands) { diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7b9cccf..b2d3682 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -951,7 +951,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) /*********************************************************************** * SYSLINK_SetFocusLink - * Updates the focus status bits and focusses the specified link. + * Updates the focus status bits and focuses the specified link. * If no document item is specified, the focus bit will be removed from all links. * Returns the previous focused item. */ diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0e62ab9..daa1715 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2164,7 +2164,7 @@ static void test_color_table(UINT ilc) rgb[2].rgbBlue = 0xff; check_color_table("remove all, add 8", hdc, himl, ilc, rgb, default_table); - /* remove all, add 4. Color table remains the same since it's inplicitly + /* remove all, add 4. Color table remains the same since it's implicitly been set by the previous _Add */ ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4e4fd75..ceab532 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5691,7 +5691,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (nButton == infoPtr->nButtonDrag) { - /* if the button is moved sightly left and we have a + /* if the button is moved slightly left and we have a * separator there then remove it */ if (pt.x < (btnPtr->rect.left + (btnPtr->rect.right - btnPtr->rect.left)/2)) {

1 0

Francois Gouget : cabinet: A spelling fix in a variable / field name.
by Alexandre Julliard Sept. 2, 2019

Sept. 2, 2019

Module: wine Branch: master Commit: cdd1fd835aca4fcc9ddc13162c86ef950a57a9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd1fd835aca4fcc9ddc1316… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:31:51 2019 +0200 cabinet: A spelling fix in a variable / field name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fci.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 03fbf46..df10322 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -174,7 +174,7 @@ typedef struct FCI_Int cab_UWORD cFolders; cab_UWORD cFiles; cab_ULONG cDataBlocks; - cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + cab_ULONG cbFileRemainder; /* uncompressed, yet to be written data */ /* of spanned file of a spanning folder of a spanning cabinet */ struct temp_file data; BOOL fNewPrevious; @@ -839,7 +839,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG * static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG payload ) { cab_ULONG sizeOfFiles = 0, sizeOfFilesPrev; - cab_ULONG cbFileRemainer = 0; + cab_ULONG cbFileRemainder = 0; struct file *file, *next; LIST_FOR_EACH_ENTRY_SAFE( file, next, &fci->files_list, struct file, entry ) @@ -852,10 +852,10 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG sizeOfFilesPrev = sizeOfFiles; /* set complete size of all processed files */ - if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainer != 0) + if (file->folder == cffileCONTINUED_FROM_PREV && fci->cbFileRemainder != 0) { - sizeOfFiles += fci->cbFileRemainer; - fci->cbFileRemainer = 0; + sizeOfFiles += fci->cbFileRemainder; + fci->cbFileRemainder = 0; } else sizeOfFiles += file->size; @@ -888,7 +888,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG { /* The size of the uncompressed, data of a spanning file in a */ /* spanning data */ - cbFileRemainer = sizeOfFiles - payload; + cbFileRemainder = sizeOfFiles - payload; } file->folder = cffileCONTINUED_FROM_PREV; } @@ -899,7 +899,7 @@ static BOOL add_files_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG fci->files_size -= size; } } - fci->cbFileRemainer = cbFileRemainer; + fci->cbFileRemainder = cbFileRemainder; return TRUE; }

1 0