wine-commits December 2018

1 participants
352 discussions

Michael Stefaniuc : dmstyle/tests: Relax a test for a pristine DMStyle object.

by Alexandre Julliard

Module: wine Branch: master Commit: 6b42be395daabec358870b0bb065935226a166c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42be395daabec358870b0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 19 21:55:42 2018 +0100 dmstyle/tests: Relax a test for a pristine DMStyle object. Based on a patch by Alex Henrie. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c..4c09d44 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || - broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass));

5 years, 4 months

Sven Baars : dsound: Fix a memory leak (Valgrind).

by Alexandre Julliard

Module: wine Branch: master Commit: b3b1033541286c249f1efe95643ea51383c81d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b1033541286c249f1efe95… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Dec 17 21:28:00 2018 +0100 dsound: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 8dd86e4..4e752be 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -480,6 +480,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, } if(count == 0){ + IMMDeviceCollection_Release(coll); release_mmdevenum(devenum, init_hr); return DS_OK; }

5 years, 4 months

Alex Henrie : psapi/tests: Increase GetPerformanceInfo HandleCount error margin.

by Alexandre Julliard

Module: wine Branch: master Commit: 7d268f7de4c2a991e990c397486ed1379bd00d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d268f7de4c2a991e990c397… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 18 20:42:38 2018 -0700 psapi/tests: Increase GetPerformanceInfo HandleCount error margin. This fixes intermittent test failures on all versions of Windows. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index e61cf02..d565053 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -322,7 +322,7 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(check_with_margin(info.HandleCount, handle_count, 24), + ok(check_with_margin(info.HandleCount, handle_count, 256), "expected approximately %d but got %d\n", info.HandleCount, handle_count); ok(check_with_margin(info.ProcessCount, process_count, 4),

5 years, 4 months

Huw Davies : gdi32: Fix building with versions of fontconfig < 2.11.0.

by Alexandre Julliard

Module: wine Branch: master Commit: 54e3bf12cdca3826fdc7fa84c35835de7e0d3106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e3bf12cdca3826fdc7fa84… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 19 11:01:35 2018 +0000 gdi32: Fix building with versions of fontconfig < 2.11.0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e07aada..ebecf79 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -184,7 +184,13 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +#ifndef FC_NAMELANG +#define FC_NAMELANG "namelang" #endif +#ifndef FC_PRGNAME +#define FC_PRGNAME "prgname" +#endif +#endif /* SONAME_LIBFONTCONFIG */ #undef MAKE_FUNCPTR

5 years, 4 months

Dmitry Timoshkov : comctl32: Don' t ignore page creation error for a non-modal propery sheet.

by Alexandre Julliard

Module: wine Branch: master Commit: 4ee173dfdd7b98190e8758782cea3ba88d2237cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee173dfdd7b98190e875878… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 18:45:45 2018 +0300 comctl32: Don't ignore page creation error for a non-modal propery sheet. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 12 ++++++++---- dlls/comctl32/tests/propsheet.c | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8c72f20..09a4551 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2012,6 +2012,13 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, if (!psInfo->proppage[index].hwndPage) { if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage)) { PROPSHEET_RemovePage(hwndDlg, index, NULL); + + if (!psInfo->isModeless) + { + DestroyWindow(hwndDlg); + return FALSE; + } + if(index >= psInfo->nPages) index--; if(index < 0) @@ -2754,7 +2761,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) static INT do_loop(const PropSheetInfo *psInfo) { MSG msg; - INT ret = -1; + INT ret = 0; HWND hwnd = psInfo->hwnd; HWND parent = psInfo->ppshheader.hwndParent; @@ -2771,10 +2778,7 @@ static INT do_loop(const PropSheetInfo *psInfo) } if(ret == 0) - { PostQuitMessage(msg.wParam); - ret = -1; - } if(ret != -1) ret = psInfo->result; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index b5c05b2..ea9b4a8 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -276,7 +276,6 @@ static void test_disableowner(void) psh.pfnCallback = disableowner_callback; p = pPropertySheetA(&psh); - todo_wine ok(p == 0, "Expected 0, got %ld\n", p); ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n"); DestroyWindow(parenthwnd); @@ -1165,11 +1164,8 @@ static void test_bad_control_class(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = &hpsp; -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */ -{ ret = pPropertySheetA(&psh); ok(ret == 0, "got %ld\n", ret); -} /* Need to recreate hpsp otherwise the test fails under Windows */ hpsp = pCreatePropertySheetPageA(&psp);

5 years, 4 months

Dmitry Timoshkov : comctl32/tests: Add a test for passing dialog template with bad control class to PropertySheet.

by Alexandre Julliard

Module: wine Branch: master Commit: ca41fd8904962cb2df03682ad7540ba014f8f7ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca41fd8904962cb2df03682a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 18:45:42 2018 +0300 comctl32/tests: Add a test for passing dialog template with bad control class to PropertySheet. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 7 +++++++ 3 files changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 2a4afaa..b5c05b2 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1143,6 +1143,47 @@ static void test_CreatePropertySheetPage(void) } } +static void test_bad_control_class(void) +{ + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HPROPSHEETPAGE hpsp; + INT_PTR ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_BAD_CONTROL); + psp.pfnDlgProc = page_dlg_proc; + + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = &hpsp; + +if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */ +{ + ret = pPropertySheetA(&psh); + ok(ret == 0, "got %ld\n", ret); +} + + /* Need to recreate hpsp otherwise the test fails under Windows */ + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + U3(psh).phpage = &hpsp; + + psh.dwFlags = PSH_MODELESS; + ret = pPropertySheetA(&psh); + ok(ret != 0, "got %ld\n", ret); + + ok(IsWindow((HWND)ret), "bad window handle %#lx\n", ret); + DestroyWindow((HWND)ret); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1168,6 +1209,7 @@ START_TEST(propsheet) init_functions(); + test_bad_control_class(); test_title(); test_nopage(); test_disableowner(); diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 3a89cd7..53522c0 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -39,6 +39,7 @@ #define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34 #define IDD_PROP_PAGE_MESSAGE_TEST 35 #define IDD_PROP_PAGE_ERROR 36 +#define IDD_PROP_PAGE_BAD_CONTROL 37 #define IDC_PS_EDIT1 1000 #define IDC_PS_EDIT2 1001 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa22..6eb4fe8 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,13 @@ FONT 8, "MS Shell Dlg" { } +IDD_PROP_PAGE_BAD_CONTROL DIALOG 0, 0, 100, 100 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +FONT 8, "MS Shell Dlg" +{ + CONTROL "", -1, "invalid class", 0, 0, 0, 0, 0 +} + STRINGTABLE { IDS_TBADD1 "abc"

5 years, 4 months

Alexandre Julliard : server: Reset hardware breakpoint sizes before setting them.

by Alexandre Julliard

Module: wine Branch: master Commit: 53375be47c07c1aec7f97abaaea177b318f04e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53375be47c07c1aec7f97aba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 18 17:18:09 2018 +0100 server: Reset hardware breakpoint sizes before setting them. Workaround for kernel bug 200965. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 808328e..6be1591 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -628,6 +628,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign if (!suspend_for_ptrace( thread )) return; + /* force all breakpoint lengths to 1, workaround for kernel bug 200965 */ + ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), 0x11110055 ); + switch (context->cpu) { case CPU_x86:

5 years, 4 months

Eberhard Beilharz : Add .editorconfig file.

by Alexandre Julliard

Module: wine Branch: master Commit: 530df61f2f93270905f19c1318d03d985f77337c URL: https://source.winehq.org/git/wine.git/?a=commit;h=530df61f2f93270905f19c13… Author: Eberhard Beilharz <eb1(a)sil.org> Date: Thu Dec 13 09:04:00 2018 +0100 Add .editorconfig file. This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/). Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5f1c49f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +max_line_length = 100

5 years, 4 months

Zhiyi Zhang : setupapi/tests: Fix return value checking.

by Alexandre Julliard

Module: wine Branch: master Commit: 06a86134ab7bbd3ed2660a366181409a83fcd112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a86134ab7bbd3ed2660a36… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 18 11:32:27 2018 +0800 setupapi/tests: Fix return value checking. SetupDiCreateDeviceInfoList returns INVALID_HANDLE_VALUE(~0) on error instead of NULL. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfffcb9..4abc188 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -125,13 +125,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); @@ -286,7 +286,7 @@ static void test_device_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); @@ -366,7 +366,7 @@ static void test_device_info(void) SetupDiDestroyDeviceInfoList(set); set = SetupDiCreateDeviceInfoList(NULL, NULL); - ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); @@ -427,7 +427,7 @@ static void test_get_device_instance_id(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); @@ -485,7 +485,7 @@ static void test_register_device_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); @@ -528,7 +528,7 @@ static void test_register_device_info(void) SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\0000"); check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\0002"); @@ -596,7 +596,7 @@ static void test_device_iface(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); @@ -697,7 +697,7 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiGetDeviceInterfaceDetailA(set, NULL, NULL, 0, NULL, NULL); @@ -787,7 +787,7 @@ static void test_device_key(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); ok(res != ERROR_SUCCESS, "Key should not exist.\n");

5 years, 4 months

Alex Henrie : po: Update Catalan translation.

by Alexandre Julliard

Module: wine Branch: master Commit: e7130b591fda63137060b9520afb9b3ec3c3e625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7130b591fda63137060b952… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 17 22:03:11 2018 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 632 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 264 insertions(+), 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7130b591fda63137060…

5 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
36
Older →

Jump to page:

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 December 2018