March 2019 - Wine-Devel - list.winehq.org

[PATCH] ntdll/tests: Fix failures in the file tests (GetOverlappedResult)

by Detlef Riekenberg

Setting LastError to ERROR_SUCCESS in GetOverlappedResult seems to be broken. Example test failure: http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50279 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/ntdll/tests/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d107c2ed2b..0aa3c041af 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4464,7 +4464,8 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || broken(GetLastError() == ERROR_SUCCESS), + "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -4493,7 +4494,8 @@ static void test_read_write(void) SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || broken(GetLastError() == ERROR_SUCCESS), + "expected 0xdeadbeef, got %d\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); -- 2.21.0.windows.1

March 31, 2019

Re: [PATCH 2/2] kernel32: Stub FindFirstStreamW/FindNextStreamW

by Fabian Maurer

On Sonntag, 31. März 2019 08:36:17 CEST Nikolay Sivov wrote: > On 3/30/19 10:40 PM, Fabian Maurer wrote: > > +/************************************************************************ > > ** + * FindFirstStreamW (KERNEL32.@) > > + */ > > +HANDLE WINAPI FindFirstStreamW(LPCWSTR lpFileName, STREAM_INFO_LEVELS > > infoLevel, + LPVOID lpFindStreamData, DWORD dwFlags) > > +{ > > + FIXME("(%s, %d, %p, %x): stub!\n", debugstr_w(lpFileName), infoLevel, > > lpFindStreamData, dwFlags); + > > + SetLastError(ERROR_HANDLE_EOF); > > + return INVALID_HANDLE_VALUE; > > +} > > + > > + > > +/************************************************************************ > > ** + * FindNextStreamW (KERNEL32.@) > > + */ > > +BOOL WINAPI FindNextStreamW(HANDLE hFindStream, LPVOID lpFindStreamData) > > +{ > > + FIXME("(%p, %p): stub!\n", hFindStream, lpFindStreamData); > > + > > + SetLastError(ERROR_HANDLE_EOF); > > + return FALSE; > > +} > > Please use better argument and type names. I just used the official names from the header. Wine's code style is not consistent on that, what is preferred - windows naming convention or wine naming convention? > > Regarding error code, will it work if you set it to NOT_IMPLEMENTED? > > > @@ -488,7 +488,7 @@ > > > > # @ stub FindFirstFileTransactedW > > @ stdcall FindFirstFileW(wstr ptr) > > # @ stub FindFirstStreamTransactedW > > > > -# @ stub FindFirstStreamW > > +@ stub FindFirstStreamW(str long ptr long) > > > > @ stdcall FindFirstVolumeA(ptr long) > > @ stdcall FindFirstVolumeMountPointA(str ptr long) > > Why 'stub'? Is it enough to have 'stub' entry for application to work? > Also first argument type is wrong. I implemented it with ERROR_HANDLE_EOF because that should be the return value when the function succeeds, but there is no stream. Interesting enough, it works when it's a stub only. The function is never actually called. So is just a spec-stub preferred, or should I add a method stub setting NOT_IMPLEMENTED, or my implementation that just assumes there are no streams? On a side note, why was there a commented out stub? Regards, Fabian Maurer

March 31, 2019

Re: Winetest fails to write to log file

by André Hentschel

Am 03.03.19 um 03:02 schrieb Isira Seneviratne: > Hi, > > I'm getting a bizarre issue where Winetest displays an error message box saying that it cannot write to the log file (error code is 6) with the attached patch applied to the code. > > I referred to the following Perl script as well: https://source.winehq.org/git/tools.git/blob/HEAD:/winetest/dissect > > Also, I tried iterating through the log file after all the tests have finished executing, but that does not display any results as intended, so I reverted to the method that I used in the prior patches. > -- > Isira Seneviratne > isirasen96(a)gmail.com <mailto:isirasen96(a)gmail.com> > > Hi, GSoC is beginning to start again and people are already proposing this project, so I had a look again. Do you think we should remove the idea from the list? What leads to the error 6 is that logfile became NULL, as this is not possible it was most likely overwritten by a buffer overflow. Increasing the sizes of prev_unit and prev_dll fixes it. Your original sizes (20 and 30) indicate that you should think more about how big those buffers should be. If you don't know, allocate them and make them grow dynamically. I would also encourage to move the listview to the right of the existing controls. > > /* Avoid unnecessary copying of the contents of 'dll' and 'unit' to 'prev_dll' and 'prev_unit' */ > if (strcmp(prev_dll, dll)) > strcpy(prev_dll, dll); > if (strcmp(prev_unit, unit)) > strcpy(prev_unit, unit); BTW, this is horrible, simply copy it.

March 31, 2019

[PATCH v2] dinput: Map wheel, gas, and brake axes as well

by Tim Schumacher

The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- v2: This time without tabs --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 628674644e..d1e9d43470 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) { -- 2.21.0

March 31, 2019

[PATCH] winejoystick: Add support for wheel axes

by Tim Schumacher

Wheel, gas, and brake are replacements for X, Y and Z in wheel-like joysticks. Remap them internally to send inputs as X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/winejoystick.drv/joystick_linux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 287f4be60d..7c24040761 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -280,10 +280,13 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', switch (jstck->axesMap[i]) { case 0: /* X */ case 1: /* Y */ + case 8: /* Wheel */ + case 9: /* Gas */ lpCaps->wNumAxes++; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ lpCaps->wNumAxes++; lpCaps->wCaps |= JOYCAPS_HASZ; break; @@ -365,13 +368,16 @@ LRESULT driver_joyGetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) if (ev.type == (JS_EVENT_AXIS)) { switch (jstck->axesMap[ev.number]) { case 0: /* X */ + case 8: /* Wheel */ jstck->x = ev.value; break; case 1: /* Y */ + case 9: /* Gas */ jstck->y = ev.value; break; case 2: /* Z */ case 6: /* Throttle */ + case 10: /* Brake */ jstck->z = ev.value; break; case 5: /* Rz */ -- 2.21.0

March 31, 2019

[PATCH] dinput: Map wheel, gas, and brake axes as well

by Tim Schumacher

The axes wheel, gas, and brake are just differently named replacements for X, Y, and Z when using wheel-like joysticks. Make those accessible by remapping them to X, Y, and Z internally. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 628674644e..d1e9d43470 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -239,6 +239,14 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = j; found_axes++; } + else if (axes_map[j] <= 10) + { + /* Axes 8 through 10 are Wheel, Gas and Brake, + * remap to 0, 1 and 2 + */ + joydev.dev_axes_map[j] = axes_map[j] - 8; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) { -- 2.21.0

March 31, 2019

Re: [PATCH 2/2] kernel32: Stub FindFirstStreamW/FindNextStreamW

by Nikolay Sivov

On 3/30/19 10:40 PM, Fabian Maurer wrote: > +/************************************************************************** > + * FindFirstStreamW (KERNEL32.@) > + */ > +HANDLE WINAPI FindFirstStreamW(LPCWSTR lpFileName, STREAM_INFO_LEVELS infoLevel, > + LPVOID lpFindStreamData, DWORD dwFlags) > +{ > + FIXME("(%s, %d, %p, %x): stub!\n", debugstr_w(lpFileName), infoLevel, lpFindStreamData, dwFlags); > + > + SetLastError(ERROR_HANDLE_EOF); > + return INVALID_HANDLE_VALUE; > +} > + > + > +/************************************************************************** > + * FindNextStreamW (KERNEL32.@) > + */ > +BOOL WINAPI FindNextStreamW(HANDLE hFindStream, LPVOID lpFindStreamData) > +{ > + FIXME("(%p, %p): stub!\n", hFindStream, lpFindStreamData); > + > + SetLastError(ERROR_HANDLE_EOF); > + return FALSE; > +} Please use better argument and type names. Regarding error code, will it work if you set it to NOT_IMPLEMENTED? > @@ -488,7 +488,7 @@ > # @ stub FindFirstFileTransactedW > @ stdcall FindFirstFileW(wstr ptr) > # @ stub FindFirstStreamTransactedW > -# @ stub FindFirstStreamW > +@ stub FindFirstStreamW(str long ptr long) > @ stdcall FindFirstVolumeA(ptr long) > @ stdcall FindFirstVolumeMountPointA(str ptr long) Why 'stub'? Is it enough to have 'stub' entry for application to work? Also first argument type is wrong.

March 31, 2019

[PATCH] kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE)

by Detlef Riekenberg

Microsoft changed FormatMessageA/W and set LastError to ERROR_NO_WORK_DONE, when nothing was done. (After Sep. 2015, but before ot with Win10 v1709) I do not expect, that apps depend on this recently used failure-code, so I did not touch our implementation to save some bytes and code cycles Example failed tests: >From the big 90 failure package afer updating win7 to win10: http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_… win10_cw1-hd6800-1709-* fail since a long time. 30. Jan 2019 as example http://test.winehq.org/data/7003ba44892d39ec0f409c793b97a0c5f4ae72d0/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50231 One machine failed with ERROR_RESOURCE_TYPE_NOT_FOUND, so i changed that test also. -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/kernel32/tests/format_msg.c | 26 ++++++++++++++++++-------- include/winerror.h | 1 + 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78af9e..364741e6ff 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -155,7 +155,8 @@ static void test_message_from_string_wide(void) error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); - ok(error==0xdeadbeef, "last error %u\n", error); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error); /* format placeholder with no specifier */ SetLastError(0xdeadbeef); @@ -443,7 +444,8 @@ static void test_message_from_string(void) r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); - ok(GetLastError()==0xdeadbeef, + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), "last error %u\n", GetLastError()); /* format placeholder with no specifier */ @@ -745,7 +747,9 @@ static void test_message_ignore_inserts(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, @@ -855,7 +859,9 @@ static void test_message_ignore_inserts_wide(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, @@ -1294,8 +1300,9 @@ static void test_message_allocate_buffer(void) "", 0, 0, (char *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + /* Since Win10 v1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1391,8 +1398,9 @@ static void test_message_allocate_buffer_wide(void) empty, 0, 0, (WCHAR *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + /* Since Win10-1709, LastError is set to ERROR_NO_WORK_DONE */ + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1522,6 +1530,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, @@ -1533,6 +1542,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..79be438e16 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NO_DATA 232 #define ERROR_PIPE_NOT_CONNECTED 233 #define ERROR_MORE_DATA 234 +#define ERROR_NO_WORK_DONE 235 #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 -- 2.21.0.windows.1

March 31, 2019

[PATCH v2] kernel32/tests: Add tests for FindFirstFileA with invalid characters.

by Vijay Kiran Kamuju

Includes testcases by Vincent Pelletier. Mark some test as todo. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/tests/file.c | 81 +++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..0d241df02e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2543,11 +2543,58 @@ static char get_windows_drive(void) return windowsdir[0]; } +struct +{ + const char *path; + BOOL expected; + BOOL todo; +} +static const invalid_char_tests[] = +{ + { "./test-dir", TRUE }, + { "./test-dir/", FALSE }, + { ".\\test-dir", TRUE }, + { ".\\test-dir\\", FALSE }, + { "/>test-dir", FALSE }, + { "<\"test->dir", FALSE }, + { "<test->dir", FALSE }, + { "\"test-dir\"", FALSE }, + { "\"test-file\"", FALSE }, + { "test-/>dir", FALSE }, + { "test-dir/", FALSE }, + { "test-dir//", FALSE }, + { "test-dir/:", FALSE }, + { "test-dir/?", TRUE }, + { "test-dir/*", TRUE }, + { "test-dir/<", TRUE, TRUE }, + { "test-dir/\"", TRUE, TRUE }, + { "test-dir/\\", FALSE }, + { "test-dir/|", FALSE }, + { "test-dir<", TRUE, TRUE }, + { "test-dir</", FALSE }, + { "test-dir<<<><><>\"\"\"\"<<<>", TRUE, TRUE }, + { "test-dir>\"", TRUE, TRUE }, + { "test-dir\"/", FALSE }, + { "test-dir\"<", TRUE, TRUE }, + { "test-dir\"\"", TRUE, TRUE }, + { "test-dir\\/", FALSE }, + { "test-dir\\\"", TRUE, TRUE }, + { "test-dir\\\\", FALSE }, + { "test-file/", FALSE }, + { "test-file\\", FALSE }, + { "test-file|", FALSE }, + { "test-file?", TRUE, TRUE }, + { "test-file*", TRUE }, + { "test-file>", TRUE, TRUE }, + { "test-file\"", TRUE, TRUE }, + { "test-file\\", FALSE }, +}; + static void test_FindFirstFileA(void) { HANDLE handle; WIN32_FIND_DATAA data; - int err; + int err, i; char buffer[5] = "C:\\"; char buffer2[100]; char nonexistent[MAX_PATH]; @@ -2715,6 +2762,38 @@ static void test_FindFirstFileA(void) err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + + /* try FindFirstFileA with invalid characters */ + CreateDirectoryA("test-dir", NULL); + _lclose(_lcreat("test-file", 0)); + + for (i = 0; i < sizeof(invalid_char_tests) / sizeof(invalid_char_tests[0]); i++) + { + handle = FindFirstFileA(invalid_char_tests[i].path, &data); + if (invalid_char_tests[i].expected) + { + if (invalid_char_tests[i].todo) + { + todo_wine ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + else + { + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + } + else + { + ok(handle == INVALID_HANDLE_VALUE, "FindFirstFileA on %s should fail\n", + invalid_char_tests[i].path); + } + if (handle != INVALID_HANDLE_VALUE) + FindClose(handle); + } + + DeleteFileA("test-file"); + RemoveDirectoryA("test-dir"); } static void test_FindNextFileA(void) -- 2.21.0

March 31, 2019

[PATCH resend] uianimation: Add stub dll

by Vijay Kiran Kamuju

based on patch from Louis Lenders Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/uianimation/Makefile.in | 4 +++ dlls/uianimation/main.c | 46 +++++++++++++++++++++++++++++++ dlls/uianimation/uianimation.spec | 4 +++ 5 files changed, 57 insertions(+) create mode 100644 dlls/uianimation/Makefile.in create mode 100644 dlls/uianimation/main.c create mode 100644 dlls/uianimation/uianimation.spec diff --git a/configure b/configure index 44d97a89f6..6f9013c3a5 100755 --- a/configure +++ b/configure @@ -1564,6 +1564,7 @@ enable_traffic enable_twain_32 enable_tzres enable_ucrtbase +enable_uianimation enable_uiautomationcore enable_uiribbon enable_unicows @@ -19970,6 +19971,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16 wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests +wine_fn_config_makefile dlls/uianimation enable_uianimation wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon diff --git a/configure.ac b/configure.ac index d5640ed0e9..6c725667dc 100644 --- a/configure.ac +++ b/configure.ac @@ -3691,6 +3691,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) +WINE_CONFIG_MAKEFILE(dlls/uianimation) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in new file mode 100644 index 0000000000..b504181b9a --- /dev/null +++ b/dlls/uianimation/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uianimation.dll + +C_SRCS = \ + main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c new file mode 100644 index 0000000000..0fa9bfb415 --- /dev/null +++ b/dlls/uianimation/main.c @@ -0,0 +1,46 @@ +/* + * Uianimation main file. + * + * Copyright (C) 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "uianimation.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uianimation); + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p %d %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec new file mode 100644 index 0000000000..a43b12d26a --- /dev/null +++ b/dlls/uianimation/uianimation.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow() +@ stub DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer() -- 2.21.0

March 31, 2019