July 2011 - Wine-commits - list.winehq.org

Jacek Caban : audiopolicy.idl: Fixed SetGroupingParam declaration.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: dbba09ca29577892c5f696a7d8e6ca741b28633b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbba09ca29577892c5f696a7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 4 11:18:28 2011 +0200 audiopolicy.idl: Fixed SetGroupingParam declaration. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- include/audiopolicy.idl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 236ae40..6889b2e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2427,7 +2427,7 @@ static HRESULT WINAPI AudioSessionControl_GetGroupingParam( } static HRESULT WINAPI AudioSessionControl_SetGroupingParam( - IAudioSessionControl2 *iface, GUID *group, const GUID *session) + IAudioSessionControl2 *iface, const GUID *group, const GUID *session) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 79c47de..261bb2b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2191,7 +2191,7 @@ static HRESULT WINAPI AudioSessionControl_GetGroupingParam( } static HRESULT WINAPI AudioSessionControl_SetGroupingParam( - IAudioSessionControl2 *iface, GUID *group, const GUID *session) + IAudioSessionControl2 *iface, const GUID *group, const GUID *session) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 3d2385f..7ff33a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2120,7 +2120,7 @@ static HRESULT WINAPI AudioSessionControl_GetGroupingParam( } static HRESULT WINAPI AudioSessionControl_SetGroupingParam( - IAudioSessionControl2 *iface, GUID *group, const GUID *session) + IAudioSessionControl2 *iface, const GUID *group, const GUID *session) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index fad17f5..53655bc 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -115,7 +115,7 @@ interface IAudioSessionControl : IUnknown [out] GUID *pRetVal ); HRESULT SetGroupingParam( - [in] GUID *Override, + [in] LPCGUID Override, [unique,in] LPCGUID EventContext ); HRESULT RegisterAudioSessionNotification(

1 0

Jacek Caban : shobjidl.idl: Added some missing coclasses.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 547cc079618b20da2d9143c44ba08889045a79a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547cc079618b20da2d9143c44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 4 12:33:46 2011 +0200 shobjidl.idl: Added some missing coclasses. --- dlls/uuid/uuid.c | 1 - include/shlguid.h | 1 - include/shobjidl.idl | 41 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index d4ad2ae..0a60a5c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -122,7 +122,6 @@ DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49, DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); diff --git a/include/shlguid.h b/include/shlguid.h index e11f9ff..a19b70c 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -20,7 +20,6 @@ #define __WINE_SHLGUID_H DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 1b4d385..910118d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1855,8 +1855,6 @@ interface ITaskbarList : IUnknown [in] HWND hwnd); } -cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") - /***************************************************************************** * ITaskbarList2 interface */ @@ -3342,4 +3340,43 @@ library ShellObjects { interface IKnownFolderManager; } + + [ + uuid(591209c7-767b-42b2-9fba-44ee4615f2c7) + ] + coclass ApplicationAssociationRegistration + { + interface IApplicationAssociationRegistration; + } + + [ + uuid(00021401-0000-0000-c000-000000000046) + ] + coclass ShellLink + { + interface IShellLinkW; + } + + [ + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) + ] + coclass TaskbarList + { + interface ITaskbarList4; + } + + [ + uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) + ] + coclass DestinationList { + interface ICustomDestinationList; + } + + [ + uuid(2d3468c1-36a7-43b6-ac24-d3f02fd9607a) + ] + coclass EnumerableObjectCollection + { + interface IEnumObjects; + } }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 406e2107210ef1250ac03861860f17fbfcfb404b URL: http://source.winehq.org/git/wine.git/?a=commit;h=406e2107210ef1250ac038618… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 10:57:49 2011 +0400 po: Update Russian translation. --- po/ru.po | 64 +++++++++++++++++++++++-------------------------------------- 1 files changed, 24 insertions(+), 40 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f04849..6d6a80c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -66,14 +66,12 @@ msgid "All files (*.*)" msgstr "Все файлы (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "&Удалить..." +msgstr "&Удалить" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "&Изменить/Удалить..." +msgstr "&Изменить/Удалить" #: appwiz.rc:48 msgid "Downloading..." @@ -358,9 +356,8 @@ msgstr "" "Введите их заново" #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "Значение Числа Копий не может быть пустым" +msgstr "Число копий не может быть пустым" #: comdlg32.rc:76 msgid "" @@ -686,9 +683,8 @@ msgid "Unstructured Address" msgstr "Неструктурированный адрес" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "Возможности SMIME" +msgstr "Возможности S/MIME" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -6246,9 +6242,8 @@ msgid "Pr&int..." msgstr "Пе&чать..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" -msgstr "Пред&варительный просмотр..." +msgstr "Пред&варительный просмотр" #: shdocvw.rc:40 oleview.rc:80 taskmgr.rc:139 msgid "&Close" @@ -6286,9 +6281,8 @@ msgid "&Help" msgstr "&Справка" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "&О программе..." +msgstr "&О программе Internet Explorer" #: shdocvw.rc:67 #, fuzzy @@ -6393,9 +6387,8 @@ msgid "E&xit" msgstr "В&ыйти" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" -msgstr "&О Панели Управления..." +msgstr "&О Панели Управления" #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size" @@ -6832,13 +6825,12 @@ msgid "&About Wine" msgstr "&О Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "&Закрыть\tAlt-F4" +msgstr "&Закрыть\tCtrl-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "С&ледующее\tCtrl-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8410,11 +8402,13 @@ msgstr "Введённая команда слишком длинная.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "Утилита диагностики DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" msgstr "" +"Использование: dxdiag [/whql:off | /whql:on] [/t <имя файла> | /x <имя " +"файла>]" #: explorer.rc:28 #, fuzzy @@ -8423,18 +8417,17 @@ msgstr "Wine Internet Explorer" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Использование: hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Ошибка: неправильное имя раздела\n" +msgstr "Ошибка: неверная опция '%c'.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "" +msgstr "Ошибка: с помощью hostname невозможно измененить имя машины.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n" @@ -8793,9 +8786,8 @@ msgid "&View TypeLib..." msgstr "&Просмотр TypeLib..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "&Конфигурация системы..." +msgstr "&Конфигурация системы" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9080,18 +9072,16 @@ msgid "&Copy...\tF8" msgstr "&Копировать...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "Свойства...\tAlt+Enter" +msgstr "&Свойства\tAlt+Enter" #: progman.rc:37 msgid "&Execute..." msgstr "&Запустить..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "Вы&ход из Wine..." +msgstr "Вы&ход из Windows" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" @@ -9259,9 +9249,8 @@ msgid "&Export Registry File..." msgstr "&Экспортировать файл реестра..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "&Изменить" +msgstr "&Изменить..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9320,9 +9309,8 @@ msgid "&About Registry Editor" msgstr "&О редакторе реестра" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "Изменить &двоичные данные" +msgstr "Изменить &двоичные данные..." #: regedit.rc:109 msgid "&Export..." @@ -10248,9 +10236,8 @@ msgid "Regular Metafile Viewer" msgstr "Просмотрщик обычных метафайлов" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Настроить" +msgstr "Настроить..." #: winecfg.rc:39 msgid "Libraries" @@ -10391,9 +10378,8 @@ msgid "None" msgstr "Нет" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "Автоопределение" +msgstr "Автоопределение..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10801,9 +10787,8 @@ msgid "Re&name..." msgstr "Переименовать..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "Свойства...\tAlt+Enter" +msgstr "&Свойства\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -10822,9 +10807,8 @@ msgid "&Disk" msgstr "&Диск" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "Подклю&чить сетевой диск" +msgstr "Подклю&чить сетевой диск..." #: winefile.rc:46 msgid "&Disconnect Network Drive"

1 0

Daniel Verkamp : msvcrt/tests: Add test for _get_pgmptr.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: fcd04e598701ae0db7bce246be748a2ae1c385db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd04e598701ae0db7bce246b… Author: Daniel Verkamp <daniel(a)drv.nu> Date: Fri Jul 1 21:43:57 2011 -0700 msvcrt/tests: Add test for _get_pgmptr. --- dlls/msvcrt/tests/data.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 7061124..c20be18 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -34,6 +34,8 @@ typedef void (__cdecl *_INITTERMFUN)(void); static void (__cdecl *p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +static int (__cdecl *p_get_pgmptr)(char **p); + static int callbacked; static void __cdecl initcallback(void) @@ -108,6 +110,20 @@ static void test_initvar( HMODULE hmsvcrt ) osplatform, osvi.dwPlatformId); } +static void test_get_pgmptr(void) +{ + char *pgm = NULL; + int res; + + if (!p_get_pgmptr) + return; + + res = p_get_pgmptr(&pgm); + + ok( res == 0, "Wrong _get_pgmptr return value %d expected 0\n", res); + ok( pgm != NULL, "_get_pgmptr returned a NULL pointer\n" ); +} + START_TEST(data) { HMODULE hmsvcrt; @@ -116,7 +132,11 @@ START_TEST(data) if (!hmsvcrt) hmsvcrt = GetModuleHandleA("msvcrtd.dll"); if (hmsvcrt) + { p_initterm=(void*)GetProcAddress(hmsvcrt, "_initterm"); + p_get_pgmptr=(void*)GetProcAddress(hmsvcrt, "_get_pgmptr"); + } test_initterm(); test_initvar(hmsvcrt); + test_get_pgmptr(); }

1 0

Nikolay Sivov : comctl32/tab: Make WM_RBUTTONUP reach default window procedure.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 7d31d39f001ed0aa4f276c8d4f560be018c2e7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d31d39f001ed0aa4f276c8d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 10:19:21 2011 +0400 comctl32/tab: Make WM_RBUTTONUP reach default window procedure. --- dlls/comctl32/tab.c | 6 +++--- dlls/comctl32/tests/tab.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c2f2d25..374d4ee 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -706,11 +706,10 @@ TAB_LButtonUp (const TAB_INFO *infoPtr) return 0; } -static inline LRESULT +static inline void TAB_RButtonUp (const TAB_INFO *infoPtr) { TAB_SendSimpleNotify(infoPtr, NM_RCLICK); - return 0; } /****************************************************************************** @@ -3430,7 +3429,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam); case WM_RBUTTONUP: - return TAB_RButtonUp (infoPtr); + TAB_RButtonUp (infoPtr); + return DefWindowProcW (hwnd, uMsg, wParam, lParam); case WM_MOUSEMOVE: return TAB_MouseMove (infoPtr, wParam, lParam); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index c82f128..36179dc 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -286,6 +286,11 @@ static const struct message delete_focus_seq[] = { { 0 } }; +static const struct message rbuttonup_seq[] = { + { WM_RBUTTONUP, sent|wparam|lparam, 0, 0 }, + { WM_CONTEXTMENU, sent|defwinproc }, + { 0 } +}; static HWND create_tabcontrol (DWORD style, DWORD mask) @@ -1407,6 +1412,22 @@ static void test_TCS_OWNERDRAWFIXED(void) DestroyWindow(hTab); } +static void test_WM_CONTEXTMENU(void) +{ + HWND hTab; + + hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); + ok(hTab != NULL, "Failed to create tab control\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageA(hTab, WM_RBUTTONUP, 0, 0); + + ok_sequence(sequences, TAB_SEQ_INDEX, rbuttonup_seq, "WM_RBUTTONUP response sequence", FALSE); + + DestroyWindow(hTab); +} + START_TEST(tab) { LOGFONTA logfont; @@ -1443,6 +1464,7 @@ START_TEST(tab) test_removeimage(); test_TCM_SETITEMEXTRA(); test_TCS_OWNERDRAWFIXED(); + test_WM_CONTEXTMENU(); DestroyWindow(parent_wnd); }

1 0

Nikolay Sivov : comctl32/treeview: Remove redundant initializer (Clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 7445dcee05384481350d9d29dae6c6000aa685b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7445dcee05384481350d9d29d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 11:33:06 2011 +0400 comctl32/treeview: Remove redundant initializer (Clang). --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 909c1eb..c14bcab 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3026,7 +3026,7 @@ TREEVIEW_CountChildren(const TREEVIEW_ITEM *item) static HDPA TREEVIEW_BuildChildDPA(const TREEVIEW_ITEM *item) { - HTREEITEM child = item->firstChild; + HTREEITEM child; HDPA list = DPA_Create(8); if (list == 0) return NULL;

1 0

Nikolay Sivov : comctl32/monthcal: Remove unused variable (Clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 6cf25732dd7a43b83bccd9c677267a6f71c94978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf25732dd7a43b83bccd9c67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 11:37:14 2011 +0400 comctl32/monthcal: Remove unused variable (Clang). --- dlls/comctl32/monthcal.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ebe53f4..ccede7f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1004,7 +1004,7 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT prev_month, i, j, length; + INT i, j, length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; @@ -1026,9 +1026,6 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const infoPtr->calendars[calIdx].title.bottom + infoPtr->textHeight + 1); SelectObject(hdc, old_pen); - prev_month = date->wMonth - 1; - if (prev_month == 0) prev_month = 12; - infoPtr->calendars[calIdx].wdays.left = infoPtr->calendars[calIdx].days.left = infoPtr->calendars[calIdx].weeknums.right;

1 0

Nikolay Sivov : comctl32/tests: Test more return values in tests (Clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 39694168080c52551464eea02f54ed6c83497e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39694168080c52551464eea02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 11:50:26 2011 +0400 comctl32/tests: Test more return values in tests (Clang). --- dlls/comctl32/tests/listview.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e0dfd72..15a0b5d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -777,6 +777,8 @@ static void test_images(void) ok(r == 0, "should return zero\n"); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELONG(100,50)); + ok(r != 0, "got 0\n"); + /* returns dimensions */ r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); @@ -3856,7 +3858,7 @@ static void test_notifyformat(void) CCM_SETUNICODEFORMAT == LVM_SETUNICODEFORMAT */ r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); - r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); + SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); /* set */ r = SendMessage(hwnd, LVM_SETUNICODEFORMAT, 1, 0); expect(0, r); @@ -4405,6 +4407,8 @@ static void test_approximate_viewrect(void) expect(MAKELONG(77,827), ret); ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(50, 50)); + ok(ret != 0, "got 0\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); expect(MAKELONG(102,302), ret);

1 0

Nikolay Sivov : user32/tests: Test that class data is set with wrong size value too.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 4843cff6ef9fee3b04d98975da22a89dd1531169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4843cff6ef9fee3b04d98975d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 15:06:52 2011 +0400 user32/tests: Test that class data is set with wrong size value too. --- dlls/user32/tests/class.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index ed288aa..57d3632 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -954,22 +954,28 @@ if (0) { /* crashes under XP */ "expected ERROR_NOACCESS, got %d\n", GetLastError()); wcx.cbSize = 0; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); wcx.cbSize = sizeof(wcx) - 1; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) - 1, "expected sizeof(wcx)-1, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); wcx.cbSize = sizeof(wcx) + 1; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); } START_TEST(class)

1 0

André Hentschel : winebuild: Remove dead code (clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 14ac50c7b785f8b806df4b8e437e6ba94b04d1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ac50c7b785f8b806df4b8e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:33:33 2011 +0200 winebuild: Remove dead code (clang). --- tools/winebuild/parser.c | 2 +- tools/winebuild/res32.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 705601e..6a1eb85 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -114,7 +114,7 @@ static int get_next_line(void) static const char * GetToken( int allow_eol ) { - char *p = ParseNext; + char *p; char *token = TokenBuffer; for (;;) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index e3f46ee..729aa2f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -188,7 +188,6 @@ static void dump_res_data( const struct resource *res ) size -= 4; } output( "0x%08x\n", get_dword() ); - size -= 4; assert( input_buffer_pos == input_buffer_size ); }

1 0