wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zhiyi Zhang : gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: b6072314e5410dc4e5a18c0ffae54c71d43936b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6072314e5410dc4e5a18c0f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:27 2019 +0100 gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 0e1fddc..30b0207 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -35,6 +35,7 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y' static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -90,12 +91,82 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } } +static void test_D3DKMTOpenAdapterFromHdc(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMHDC open_adapter_hdc_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + INT adapter_count = 0; + NTSTATUS status; + HDC hdc; + DWORD i; + + if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromHdc(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + adapter_count++; + + hdc = CreateDCW(0, display_device.DeviceName, 0, NULL); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + else + todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + DeleteDC(hdc); + + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + } + + /* HDC covering more than two adapters is invalid for D3DKMTOpenAdapterFromHdc */ + hdc = GetDC(0); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + ReleaseDC(0, hdc); + todo_wine ok(status == (adapter_count > 1 ? STATUS_INVALID_PARAMETER : STATUS_SUCCESS), + "Got unexpected return code %#x.\n", status); + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); + test_D3DKMTOpenAdapterFromHdc(); }

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 012d9bbc233dd9b11cad76b5e94743145398c170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012d9bbc233dd9b11cad76b5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:26 2019 +0100 gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/driver.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90d7223..9d82c27 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ clipping.c \ dc.c \ dib.c \ + driver.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c new file mode 100644 index 0000000..0e1fddc --- /dev/null +++ b/dlls/gdi32/tests/driver.c @@ -0,0 +1,101 @@ +/* + * Unit test suite for kernel mode graphics driver + * + * Copyright 2019 Zhiyi Zhang + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" + +#include "wine/test.h" + +static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + +static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + NTSTATUS status; + DWORD i; + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + if (!pD3DKMTOpenAdapterFromGdiDisplayName + || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + return; + } + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromGdiDisplayName(NULL); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_gdi_desc, 0, sizeof(open_adapter_gdi_desc)); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + lstrcpyW(open_adapter_gdi_desc.DeviceName, display_device.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + else + { + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + continue; + } + + ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_gdi_desc.VidPnSourceId); + else + ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + +START_TEST(driver) +{ + HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); + + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + + test_D3DKMTOpenAdapterFromGdiDisplayName(); +}

1 0

Alistair Leslie-Hughes : include: Add helicopter Direct Input defines.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: a30da077e22e7bb2df950969995f0dac67ade8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30da077e22e7bb2df950969… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 04:53:36 2019 +0000 include: Add helicopter Direct Input defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index beb81a7..aca7005 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2193,6 +2193,29 @@ extern const DIDATAFORMAT c_dfDIJoystick2; #define DIPOV_ANY_4 0xFF004604 #define DIBUTTON_ANY(instance) (0xFF004400 | (instance)) +#define DIVIRTUAL_FLYING_HELICOPTER 0x06000000 +#define DIBUTTON_FLYINGH_MENU 0x060004fd +#define DIBUTTON_FLYINGH_FIRE 0x06001401 +#define DIBUTTON_FLYINGH_WEAPONS 0x06001402 +#define DIBUTTON_FLYINGH_TARGET 0x06001403 +#define DIBUTTON_FLYINGH_DEVICE 0x060044fe +#define DIBUTTON_FLYINGH_PAUSE 0x060044fc +#define DIHATSWITCH_FLYINGH_GLANCE 0x06004601 +#define DIBUTTON_FLYINGH_FIRESECONDARY 0x06004c07 +#define DIBUTTON_FLYINGH_COUNTER 0x06005404 +#define DIBUTTON_FLYINGH_VIEW 0x06006405 +#define DIBUTTON_FLYINGH_GEAR 0x06006406 +#define DIAXIS_FLYINGH_BANK 0x06008a01 +#define DIAXIS_FLYINGH_PITCH 0x06010a02 +#define DIAXIS_FLYINGH_COLLECTIVE 0x06018a03 +#define DIAXIS_FLYINGH_TORQUE 0x06025a04 +#define DIAXIS_FLYINGH_THROTTLE 0x0603da05 +#define DIBUTTON_FLYINGH_FASTER_LINK 0x0603dce0 +#define DIBUTTON_FLYINGH_SLOWER_LINK 0x0603dce8 +#define DIBUTTON_FLYINGH_GLANCE_LEFT_LINK 0x0607c4e4 +#define DIBUTTON_FLYINGH_GLANCE_RIGHT_LINK 0x0607c4ec +#define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 +#define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 /***************************************************************************** * IDirectInputA interface

1 0

Alexandre Julliard : ucrtbase: Move the vsnprintf() wrapper function to the ucrtbase import library.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 030a460934054808d66dab74547d4b150ce01169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030a460934054808d66dab74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 12:20:42 2019 +0200 ucrtbase: Move the vsnprintf() wrapper function to the ucrtbase import library. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47250 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 6 ------ dlls/msvcp90/msvcp_main.c | 10 ++-------- dlls/msvcrt/wcs.c | 4 ++-- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/printf.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 77c96e3..2e3d071 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -662,9 +662,3 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #endif void free_misc(void); - -#if _MSVCP_VER >= 140 -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, - _locale_t locale, __ms_va_list valist); -#endif diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 6d78ce3..52f25a9 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -120,7 +120,7 @@ int WINAPIV _scprintf(const char* fmt, ...) int ret; __ms_va_list valist; __ms_va_start(valist, fmt); - ret = __stdio_common_vsprintf(UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, NULL, 0, fmt, NULL, valist); + ret = _vsnprintf(NULL, 0, fmt, valist); __ms_va_end(valist); return ret; } @@ -130,16 +130,10 @@ int WINAPIV sprintf(char *buf, const char *fmt, ...) int ret; __ms_va_list valist; __ms_va_start(valist, fmt); - ret = __stdio_common_vsprintf(UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buf, -1, fmt, NULL, valist); + ret = _vsnprintf(buf, -1, fmt, valist); __ms_va_end(valist); return ret; } - -int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) -{ - return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, - buf, size, fmt, NULL, args ); -} #endif static void init_cxx_funcs(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2a75030..e62ac25 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -796,8 +796,8 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) /********************************************************************* * __stdio_common_vsprintf (UCRTBASE.@) */ -int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, __ms_va_list valist ) +int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) { static const char nullbyte = '\0'; struct _str_ctx_a ctx = {len, str}; diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 23d8292..63fcc9b 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ math.c \ mbcs.c \ misc.c \ + printf.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/ucrtbase/printf.c b/dlls/ucrtbase/printf.c new file mode 100644 index 0000000..8f58e6c --- /dev/null +++ b/dlls/ucrtbase/printf.c @@ -0,0 +1,34 @@ +/* + * Copyright 2019 Alexandre Julliard + * + * 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 + */ + +/* this function is part of the import lib */ +#if 0 +#pragma makedep implib +#endif + +#include <stdarg.h> +#include "msvcrt.h" + +int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, MSVCRT_size_t len, + const char *format, MSVCRT__locale_t locale, __ms_va_list valist); + +int __cdecl _vsnprintf( char *buf, MSVCRT_size_t size, const char *fmt, __ms_va_list args ) +{ + return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, + buf, size, fmt, NULL, args ); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c64fee2..441ef70 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -156,7 +156,7 @@ @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s -@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf +@ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) @ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf

1 0

Alexandre Julliard : quartz/tests: Add braces to avoid a clang warning.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: c3d3ef752ba53053db7871f0444d00344478430d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d3ef752ba53053db7871f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:35:32 2019 +0200 quartz/tests: Add braces to avoid a clang warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 7155be5..5ca22ab 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -449,7 +449,7 @@ static void test_media_types(void) const WCHAR *filename = load_resource(avifile); IBaseFilter *filter = create_avi_splitter(); - AM_MEDIA_TYPE mt = {0}, *pmt; + AM_MEDIA_TYPE mt = {{0}}, *pmt; IEnumMediaTypes *enummt; IFilterGraph2 *graph; HRESULT hr;

1 0

Alexandre Julliard : setupapi/tests: Avoid size_t in traces.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: d5b77f5a161d1bf4176cf956e46ddf13139c897a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5b77f5a161d1bf4176cf956… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:24:29 2019 +0200 setupapi/tests: Avoid size_t in traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7e59770..ce72a5d 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -265,14 +265,14 @@ static void test_SetupCopyOEMInf(void) ok(file_exists(path), "Expected source inf to exist\n"); ok(file_exists(orig_dest), "Expected dest inf to exist\n"); ok(!strcmp(dest, "aaa"), "Expected dest to be unchanged\n"); - ok(size == strlen(orig_dest) + 1, "Expected size %d, got %d.\n", strlen(orig_dest) + 1, size); + ok(size == strlen(orig_dest) + 1, "Got %d.\n", size); SetLastError(0xdeadbeef); res = SetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, sizeof(dest), &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); - ok(size == strlen(dest) + 1, "Expected size %d, got %d.\n", strlen(dest) + 1, size); + ok(size == strlen(dest) + 1, "Got %d.\n", size); test_original_file_name(strrchr(path, '\\') + 1, dest);

1 0

Alexandre Julliard : ntdll: Don' t pass DLL_WINE_PREATTACH to the TLS callbacks.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 1943fb29bfe539d0a1602d58037e79ebd67ff953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1943fb29bfe539d0a1602d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:22:16 2019 +0200 ntdll: Don't pass DLL_WINE_PREATTACH to the TLS callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index da41fdf..1660667 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1217,6 +1217,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) const PIMAGE_TLS_CALLBACK *callback; ULONG dirsize; + if (reason == DLL_WINE_PREATTACH) return; + dir = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &dirsize ); if (!dir || !dir->AddressOfCallBacks) return;

1 0

Alexandre Julliard : make_unicode: Remove duplicate DECLSPEC_HIDDEN.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: c52b2f128472b704b9e799f2626370c09258e689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c52b2f128472b704b9e799f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 10:13:29 2019 +0200 make_unicode: Remove duplicate DECLSPEC_HIDDEN. Spotted by Matteo Bruni. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/direction.c | 2 +- dlls/gdi32/direction.c | 2 +- dlls/kernel32/wctype.c | 2 +- dlls/usp10/direction.c | 2 +- tools/make_unicode | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 6adbb73..aafd342 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/gdi32/direction.c b/dlls/gdi32/direction.c index 6adbb73..aafd342 100644 --- a/dlls/gdi32/direction.c +++ b/dlls/gdi32/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/kernel32/wctype.c b/dlls/kernel32/wctype.c index f335fac..cf25ccc 100644 --- a/dlls/kernel32/wctype.c +++ b/dlls/kernel32/wctype.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN wctype_table[7664] = +const unsigned short DECLSPEC_HIDDEN wctype_table[7664] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/dlls/usp10/direction.c b/dlls/usp10/direction.c index 6adbb73..aafd342 100644 --- a/dlls/usp10/direction.c +++ b/dlls/usp10/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN DECLSPEC_HIDDEN bidi_direction_table[4512] = +const unsigned short DECLSPEC_HIDDEN bidi_direction_table[4512] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, diff --git a/tools/make_unicode b/tools/make_unicode index adf8c0f..4b79668 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2251,7 +2251,7 @@ sub dump_string_type_table($) $table[$i] |= $c2_types{$direction_table[$i]} << 12 if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN wctype_table", 0, @table ); + dump_two_level_mapping( "wctype_table", 0, @table ); close OUTPUT; save_file($filename); @@ -2276,8 +2276,7 @@ sub dump_bidi_dir_table($) $table[$i] = $bidi_types{$direction_table[$i]} if defined $direction_table[$i]; } - dump_two_level_mapping( "DECLSPEC_HIDDEN bidi_direction_table", - $bidi_types{"L"}, @table ); + dump_two_level_mapping( "bidi_direction_table", $bidi_types{"L"}, @table ); close OUTPUT; save_file($filename);

1 0

Zebediah Figura : setupapi: Fix error handling in SetupInstallServicesFromInfSection().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 6b2b6cde8bbd18ab1645cbf31435eb7a8ceec91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b6cde8bbd18ab1645cbf3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:48 2019 -0500 setupapi: Fix error handling in SetupInstallServicesFromInfSection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 40 +++++++++++++++++++++------------------- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 6a3213c..dae0bc1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1458,36 +1458,38 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = TRUE; + BOOL ret = TRUE; - if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + if (!SetupFindFirstLineW( hinf, section, NULL, &context )) { SetLastError( ERROR_SECTION_NOT_FOUND ); return FALSE; } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - ok = SetupFindFirstLineW( hinf, section, AddService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, AddService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) - goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!SetupGetStringFieldW( &context, 3, service_section, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!(ret = add_service( scm, hinf, service_name, service_section, section_flags | flags ))) + goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } - ok = SetupFindFirstLineW( hinf, section, DelService, &context ); - while (ok) + if (SetupFindFirstLineW( hinf, section, DelService, &context )) { - if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) - continue; - if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; - if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; - ok = SetupFindNextMatchLineW( &context, AddService, &context ); + do + { + if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) + continue; + if (!SetupGetIntField( &context, 2, &section_flags )) section_flags = 0; + if (!(ret = del_service( scm, hinf, service_name, section_flags | flags ))) goto done; + } while (SetupFindNextMatchLineW( &context, AddService, &context )); } if (ret) SetLastError( ERROR_SUCCESS ); done: diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a0a4596..f9e5592 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -574,6 +574,20 @@ static void test_install_svc_from(void) SetupCloseInfFile(infhandle); DeleteFileA(inffile); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[Winetest.Services]\n"); + strcat(inf, "AddService=,2\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "Winetest.Services", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); + /* TODO: Test the Flags */ }

1 0

Zebediah Figura : setupapi: Always fill output parameters in SetupCopyOEMInfA().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 56aab6aaf83098115014512e0a6a5ab7e78bbef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56aab6aaf83098115014512e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 23 18:00:47 2019 -0500 setupapi: Always fill output parameters in SetupCopyOEMInfA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/misc.c | 12 +++--------- dlls/setupapi/tests/misc.c | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 7298ac6..67e2eaf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -851,12 +851,9 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (source && !(sourceW = strdupAtoW( source ))) goto done; if (location && !(locationW = strdupAtoW( location ))) goto done; - if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, - buffer_size, &size, NULL ))) - { - if (required_size) *required_size = size; - goto done; - } + ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, buffer_size, &size, NULL ); + + if (required_size) *required_size = size; if (dest) { @@ -866,10 +863,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, if (component) *component = strrchr( dest, '\\' ) + 1; } else - { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - goto done; - } } done: diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index e2dd12f..7e59770 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -246,7 +246,6 @@ static void test_SetupCopyOEMInf(void) ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); -todo_wine ok(!strcmp(orig_dest, dest), "Expected '%s', got '%s'.\n", orig_dest, dest); SetLastError(0xdeadbeef);

1 0

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 2019