September 2010 - Wine-commits

Nikolay Sivov : comctl32/listview: Use proper A/ W call to measure item text string.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 5d657a106f6ddec07b7d5d70009e4ff969dc7bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d657a106f6ddec07b7d5d700… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 26 23:14:20 2010 +0400 comctl32/listview: Use proper A/W call to measure item text string. --- dlls/comctl32/listview.c | 63 ++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 561b792..c144a49 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5873,20 +5873,20 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) { WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; + HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; + HFONT hOldFont = NULL; + TEXTMETRICW tm; RECT rect; SIZE sz; - HWND hwndSelf = infoPtr->hwndSelf; HDC hdc; - HFONT hOldFont = NULL; - TEXTMETRICW textMetric; TRACE("(nItem=%d, isW=%d)\n", nItem, isW); if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; - /* Is the EditBox still there, if so remove it */ - if(infoPtr->hwndEdit != 0) + /* remove existing edit box */ + if (infoPtr->hwndEdit) { SetFocus(infoPtr->hwndSelf); infoPtr->hwndEdit = 0; @@ -5924,27 +5924,38 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) return 0; } - /* Now position and display edit box */ + /* position and display edit box */ hdc = GetDC(infoPtr->hwndSelf); - /* Select the font to get appropriate metric dimensions */ - if(infoPtr->hFont != 0) + /* select the font to get appropriate metric dimensions */ + if (infoPtr->hFont) hOldFont = SelectObject(hdc, infoPtr->hFont); - /* Get String Length in pixels */ - GetTextExtentPoint32W(hdc, dispInfo.item.pszText, lstrlenW(dispInfo.item.pszText), &sz); + /* get string length in pixels */ + TRACE("text=%s\n", debugtext_t(dispInfo.item.pszText, isW)); - /* Add Extra spacing for the next character */ - GetTextMetricsW(hdc, &textMetric); - sz.cx += (textMetric.tmMaxCharWidth * 2); + if (isW) + GetTextExtentPoint32W(hdc, dispInfo.item.pszText, lstrlenW(dispInfo.item.pszText), &sz); + else + { + const CHAR *textA = (CHAR*)dispInfo.item.pszText; + GetTextExtentPoint32A(hdc, textA, lstrlenA(textA), &sz); + } + + /* add extra spacing for the next character */ + GetTextMetricsW(hdc, &tm); + sz.cx += tm.tmMaxCharWidth * 2; - if(infoPtr->hFont != 0) + if (infoPtr->hFont) SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndSelf, hdc); - MoveWindow(infoPtr->hwndEdit, rect.left - 2, rect.top - 1, sz.cx, - rect.bottom - rect.top + 2, FALSE); + sz.cy = rect.bottom - rect.top + 2; + rect.left -= 2; + rect.top -= 1; + TRACE("moving edit=(%d,%d)-(%d,%d)\n", rect.left, rect.top, sz.cx, sz.cy); + MoveWindow(infoPtr->hwndEdit, rect.left, rect.top, sz.cx, sz.cy, FALSE); ShowWindow(infoPtr->hwndEdit, SW_NORMAL); SetFocus(infoPtr->hwndEdit); SendMessageW(infoPtr->hwndEdit, EM_SETSEL, 0, -1); @@ -6074,7 +6085,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, } if (!lpFindInfo || nItem < 0) return -1; - + lvItem.mask = 0; if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL) || lpFindInfo->flags & LVFI_SUBSTRING) @@ -6213,24 +6224,6 @@ static INT LISTVIEW_FindItemA(const LISTVIEW_INFO *infoPtr, INT nStart, /*** * DESCRIPTION: - * Retrieves the background image of the listview control. - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [O] lpBkImage : background image attributes - * - * RETURN: - * SUCCESS : TRUE - * FAILURE : FALSE - */ -/* static BOOL LISTVIEW_GetBkImage(const LISTVIEW_INFO *infoPtr, LPLVBKIMAGE lpBkImage) */ -/* { */ -/* FIXME (listview, "empty stub!\n"); */ -/* return FALSE; */ -/* } */ - -/*** - * DESCRIPTION: * Retrieves column attributes. * * PARAMETER(S):

1 0

Austin Lund : comctl32/listview: Fix test failures for subitem returned with negative coordinates.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 3fd940b2a123a6c7c3c351a8167bcc0c2e640522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd940b2a123a6c7c3c351a81… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Sep 27 08:42:03 2010 +1000 comctl32/listview: Fix test failures for subitem returned with negative coordinates. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3f02f6b..de7369c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3052,7 +3052,7 @@ static void test_hittest(void) test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* subitem returned with -1 item too */ x = pos.x + 150; - y = -10; + y = -1; test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE);

1 0

Alexandre Julliard : kernel32: Implemented EnumSystemLocalesEx.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 9f792ab3d56acdf38eaba06734667df001c976b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f792ab3d56acdf38eaba0673… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 14:03:12 2010 +0200 kernel32: Implemented EnumSystemLocalesEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 49 +++++++++++++++++++++++++++-------------- include/winnls.h | 19 ++++++++++++++++ 4 files changed, 101 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 43e339b..e4ce77e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -324,6 +324,7 @@ @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall EnumSystemLocalesA(ptr long) +@ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) @ stdcall EnumTimeFormatsW(ptr long long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 168bb19..927d058 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2222,6 +2222,55 @@ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, DWORD dwFlags ) } +struct enum_locale_ex_data +{ + LOCALE_ENUMPROCEX proc; + DWORD flags; + LPARAM lparam; +}; + +static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, + LPCWSTR name, WORD lang, LONG_PTR lparam ) +{ + struct enum_locale_ex_data *data = (struct enum_locale_ex_data *)lparam; + WCHAR buffer[256]; + DWORD neutral; + unsigned int flags; + + GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, + buffer, sizeof(buffer) / sizeof(WCHAR) ); + if (!GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), + LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, + (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) + neutral = 0; + flags = LOCALE_WINDOWS; + flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; + if (data->flags && ~(data->flags & flags)) return TRUE; + return data->proc( buffer, flags, data->lparam ); +} + +/****************************************************************************** + * EnumSystemLocalesEx (KERNEL32.@) + */ +BOOL WINAPI EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD flags, LPARAM lparam, LPVOID reserved ) +{ + struct enum_locale_ex_data data; + + if (reserved) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + data.proc = proc; + data.flags = flags; + data.lparam = lparam; + EnumResourceLanguagesW( kernel32_handle, (LPCWSTR)RT_STRING, + (LPCWSTR)MAKEINTRESOURCE((LOCALE_SNAME >> 4) + 1), + enum_locale_ex_proc, (LONG_PTR)&data ); + return TRUE; +} + + /*********************************************************************** * VerLanguageNameA (KERNEL32.@) * diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9d6f7e4..34b5f00 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -67,23 +67,13 @@ static inline int isdigitW( WCHAR wc ) static HMODULE hKernel32; static WORD enumCount; -typedef BOOL (WINAPI *EnumSystemLanguageGroupsAFn)(LANGUAGEGROUP_ENUMPROC, - DWORD, LONG_PTR); -static EnumSystemLanguageGroupsAFn pEnumSystemLanguageGroupsA; -typedef BOOL (WINAPI *EnumLanguageGroupLocalesAFn)(LANGGROUPLOCALE_ENUMPROC, - LGRPID, DWORD, LONG_PTR); -static EnumLanguageGroupLocalesAFn pEnumLanguageGroupLocalesA; -typedef BOOL (WINAPI *EnumUILanguagesAFn)(UILANGUAGE_ENUMPROC, - DWORD, LONG_PTR); -static EnumUILanguagesAFn pEnumUILanguagesA; - -typedef INT (WINAPI *FoldStringAFn)(DWORD, LPCSTR, INT, LPSTR, INT); -static FoldStringAFn pFoldStringA; -typedef INT (WINAPI *FoldStringWFn)(DWORD, LPCWSTR, INT, LPWSTR, INT); -static FoldStringWFn pFoldStringW; - -typedef BOOL (WINAPI *IsValidLanguageGroupFn)(LGRPID, DWORD); -static IsValidLanguageGroupFn pIsValidLanguageGroup; +static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); +static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); +static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static void InitFunctionPointers(void) { @@ -94,6 +84,7 @@ static void InitFunctionPointers(void) pFoldStringW = (void*)GetProcAddress(hKernel32, "FoldStringW"); pIsValidLanguageGroup = (void*)GetProcAddress(hKernel32, "IsValidLanguageGroup"); pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); + pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); } #define eq(received, expected, label, type) \ @@ -2346,6 +2337,29 @@ static void test_EnumSystemLanguageGroupsA(void) pEnumSystemLanguageGroupsA(langgrp_procA, LGRPID_SUPPORTED, 0); } +static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) +{ + trace( "%s %x\n", wine_dbgstr_w(name), flags ); + return TRUE; +} + +static void test_EnumSystemLocalesEx(void) +{ + BOOL ret; + + if (!pEnumSystemLocalesEx) + { + win_skip( "EnumSystemLocalesEx not available\n" ); + return; + } + SetLastError( 0xdeadbeef ); + ret = pEnumSystemLocalesEx( enum_func, LOCALE_ALL, 0, (void *)1 ); + ok( !ret, "should have failed\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pEnumSystemLocalesEx( enum_func, 0, 0, NULL ); + ok( ret, "failed err %u\n", GetLastError() ); +} static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) @@ -2801,6 +2815,7 @@ START_TEST(locale) test_FoldStringW(); test_ConvertDefaultLocale(); test_EnumSystemLanguageGroupsA(); + test_EnumSystemLocalesEx(); test_EnumLanguageGroupLocalesA(); test_SetLocaleInfoA(); test_EnumUILanguageA(); diff --git a/include/winnls.h b/include/winnls.h index b75e24a..279c944 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -150,6 +150,14 @@ extern "C" { #define LCID_SUPPORTED 0x2 #define LCID_ALTERNATE_SORTS 0x4 +#define LOCALE_ALL 0x00 +#define LOCALE_WINDOWS 0x01 +#define LOCALE_SUPPLEMENTAL 0x02 +#define LOCALE_ALTERNATE_SORTS 0x04 +#define LOCALE_REPLACEMENT 0x08 +#define LOCALE_NEUTRALDATA 0x10 +#define LOCALE_SPECIFICDATA 0x20 + /* Locale flags */ #define LOCALE_NOUSEROVERRIDE 0x80000000 #define LOCALE_USE_CP_ACP 0x40000000 @@ -279,6 +287,16 @@ extern "C" { #define LOCALE_SPARENT 0x006D #define LOCALE_SCONSOLEFALLBACKNAME 0x006E #define LOCALE_SLANGDISPLAYNAME 0x006F +#define LOCALE_IREADINGLAYOUT 0x0070 +#define LOCALE_INEUTRAL 0x0071 +#define LOCALE_INEGATIVEPERCENT 0x0074 +#define LOCALE_IPOSITIVEPERCENT 0x0075 +#define LOCALE_SPERCENT 0x0076 +#define LOCALE_SPERMILLE 0x0077 +#define LOCALE_SMONTHDAY 0x0078 +#define LOCALE_SSHORTTIME 0x0079 +#define LOCALE_SOPENTYPELANGUAGETAG 0X007A +#define LOCALE_SSORTLOCALE 0x007B #define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012 #define LOCALE_IPAPERSIZE 0x100A @@ -624,6 +642,7 @@ typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LON typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCW)(LGRPID,LPWSTR,LPWSTR,DWORD,LONG_PTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR); +typedef BOOL (CALLBACK *LOCALE_ENUMPROCEX)(LPWSTR, DWORD, LPARAM); typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR,LONG_PTR);

1 0

Alexandre Julliard : kernel32/nls: Define the neutral and reading layout locale values.
by Alexandre Julliard 27 Sep '10

27 Sep '10

1 0

Hans Leidekker : msi: Use more descriptive variable names for installer properties.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: fbf45bae049eaed1d6f53dc0c2e4bf31a1eab3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf45bae049eaed1d6f53dc0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:08 2010 +0200 msi: Use more descriptive variable names for installer properties. --- dlls/msi/package.c | 192 ++++++++++++++++++++++------------------------------ 1 files changed, 82 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbf45bae049eaed1d6f53…

1 0

Hans Leidekker : winecfg: Update Windows 7 version to Service Pack 1.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 92b7f57e1e94fcdd8a132404629bcda8afa9eb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b7f57e1e94fcdd8a1324046… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:19 2010 +0200 winecfg: Update Windows 7 version to Service Pack 1. --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9d06d8f..e109905 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -152,9 +152,9 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN7 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB0, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 } }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index cf07fe8..39ecd4e 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win7", "Windows 7", 6, 1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Hans Leidekker : explorerframe: Bump version.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: fbb9afacc90e1e071b6cdf68f9cdafbb2a80e9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb9afacc90e1e071b6cdf68f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:30 2010 +0200 explorerframe: Bump version. --- dlls/explorerframe/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/explorerframe/version.rc b/dlls/explorerframe/version.rc index 257b1fc..30dbe68 100644 --- a/dlls/explorerframe/version.rc +++ b/dlls/explorerframe/version.rc @@ -21,9 +21,9 @@ #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine ExplorerFrame" #define WINE_FILENAME_STR "explorerframe.dll" -#define WINE_FILEVERSION 6,1,7600,16385 -#define WINE_FILEVERSION_STR "6.1.7600.16385" -#define WINE_PRODUCTVERSION 6,1,7600,16385 -#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" +#define WINE_FILEVERSION 6,1,7601,16666 +#define WINE_FILEVERSION_STR "6.1.7601.16666" +#define WINE_PRODUCTVERSION 6,1,7601,16666 +#define WINE_PRODUCTVERSION_STR "6.1.7601.16666" #include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : wuapi: Return success from automatic_updates_Resume.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: a4d7540a4530e9d76e0cd5a3ee47b1d7bfe11d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d7540a4530e9d76e0cd5a3e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:39 2010 +0200 wuapi: Return success from automatic_updates_Resume. --- dlls/wuapi/updates.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 0366ebc..663ff39 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -151,7 +151,7 @@ static HRESULT WINAPI automatic_updates_Resume( IAutomaticUpdates *This ) { FIXME("\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI automatic_updates_ShowSettingsDialog(

1 0

Hans Leidekker : comctl32: Add a stub implementation of TaskDialogIndirect.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: af7e4dbe54c688cf0f92ea721bc2cf8bf076ed31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7e4dbe54c688cf0f92ea721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:55 2010 +0200 comctl32: Add a stub implementation of TaskDialogIndirect. --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 14 +++++++ include/commctrl.h | 90 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 438a4dc..c77c2fa 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -188,5 +188,6 @@ @ stdcall PropertySheet(ptr) PropertySheetA @ stdcall PropertySheetA(ptr) @ stdcall PropertySheetW(ptr) +@ stdcall TaskDialogIndirect(ptr ptr ptr ptr) @ stdcall UninitializeFlatSB(long) @ stdcall _TrackMouseEvent(ptr) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index eb0f6b5..c37c485 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1689,3 +1689,17 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD crText, crShadow, ixOffset, iyOffset); return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); } + +/*********************************************************************** + * TaskDialogIndirect [COMCTL32.@] + */ +HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnButton, + int *pnRadioButton, BOOL *pfVerificationFlagChecked) +{ + FIXME("%p, %p, %p, %p\n", pTaskConfig, pnButton, pnRadioButton, pfVerificationFlagChecked); + + if (pnButton) *pnButton = IDOK; + if (pnRadioButton) *pnRadioButton = pTaskConfig->nDefaultButton; + if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; + return S_OK; +} diff --git a/include/commctrl.h b/include/commctrl.h index e7d0ab4..2261485 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5212,6 +5212,96 @@ static const WCHAR WC_SCROLLBARW[] = { 'S','c','r','o','l','l','B','a','r',0 }; #endif #define WC_SCROLLBAR WINELIB_NAME_AW(WC_SCROLLBAR) +/************************************************************************** + * Task dialog + */ + +#ifndef NOTASKDIALOG + +#include <pshpack1.h> + +enum _TASKDIALOG_FLAGS +{ + TDF_ENABLE_HYPERLINKS = 0x0001, + TDF_USE_HICON_MAIN = 0x0002, + TDF_USE_HICON_FOOTER = 0x0004, + TDF_ALLOW_DIALOG_CANCELLATION = 0x0008, + TDF_USE_COMMAND_LINKS = 0x0010, + TDF_USE_COMMAND_LINKS_NO_ICON = 0x0020, + TDF_EXPAND_FOOTER_AREA = 0x0040, + TDF_EXPANDED_BY_DEFAULT = 0x0080, + TDF_VERIFICATION_FLAG_CHECKED = 0x0100, + TDF_SHOW_PROGRESS_BAR = 0x0200, + TDF_SHOW_MARQUEE_PROGRESS_BAR = 0x0400, + TDF_CALLBACK_TIMER = 0x0800, + TDF_POSITION_RELATIVE_TO_WINDOW = 0x1000, + TDF_RTL_LAYOUT = 0x2000, + TDF_NO_DEFAULT_RADIO_BUTTON = 0x4000, + TDF_CAN_BE_MINIMIZED = 0x8000 +}; +typedef int TASKDIALOG_FLAGS; + +enum _TASKDIALOG_COMMON_BUTTON_FLAGS +{ + TDCBF_OK_BUTTON = 0x0001, + TDCBF_YES_BUTTON = 0x0002, + TDCBF_NO_BUTTON = 0x0004, + TDCBF_CANCEL_BUTTON = 0x0008, + TDCBF_RETRY_BUTTON = 0x0010, + TDCBF_CLOSE_BUTTON = 0x0020 +}; +typedef int TASKDIALOG_COMMON_BUTTON_FLAGS; + +typedef struct _TASKDIALOG_BUTTON +{ + int nButtonID; + PCWSTR pszButtonText; +} TASKDIALOG_BUTTON; + +typedef HRESULT (CALLBACK *PFTASKDIALOGCALLBACK)(HWND, UINT, WPARAM, LPARAM, LONG_PTR); + +typedef struct _TASKDIALOGCONFIG +{ + UINT cbSize; + HWND hwndParent; + HINSTANCE hInstance; + TASKDIALOG_FLAGS dwFlags; + TASKDIALOG_COMMON_BUTTON_FLAGS dwCommonButtons; + PCWSTR pszWindowTitle; + union + { + HICON hMainIcon; + PCWSTR pszMainIcon; + } DUMMYUNIONNAME; + PCWSTR pszMainInstruction; + PCWSTR pszContent; + UINT cButtons; + const TASKDIALOG_BUTTON *pButtons; + int nDefaultButton; + UINT cRadioButtons; + const TASKDIALOG_BUTTON *pRadioButtons; + int nDefaultRadioButton; + PCWSTR pszVerificationText; + PCWSTR pszExpandedInformation; + PCWSTR pszExpandedControlText; + PCWSTR pszCollapsedControlText; + union + { + HICON hFooterIcon; + PCWSTR pszFooterIcon; + } DUMMYUNIONNAME2; + PCWSTR pszFooter; + PFTASKDIALOGCALLBACK pfCallback; + LONG_PTR lpCallbackData; + UINT cxWidth; +} TASKDIALOGCONFIG; + +HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *); + +#include <poppack.h> + +#endif /* NOTASKDIALOG */ + #ifdef __cplusplus } #endif

1 0

Misha Koshelev : d3dx9_36: Add D3DXCreateTeapot to d3dx9shape.h.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 30be5879ecfd47475be7e31633a30a6de871e884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30be5879ecfd47475be7e3163… Author: Misha Koshelev <misha680(a)gmail.com> Date: Sat Sep 25 14:36:45 2010 -0500 d3dx9_36: Add D3DXCreateTeapot to d3dx9shape.h. --- include/d3dx9shape.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index 36bca6b..2890c5d 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -39,6 +39,10 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency); +HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency); + #ifdef __cplusplus } #endif

1 0