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

Tim Cadogan-Cowper : winmm: Wrap TRACE strings with debugstr_a/debugstr_an.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d6610b8b3a77aa9f85a1070fdcd57b5c6e719fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6610b8b3a77aa9f85a1070fd… Author: Tim Cadogan-Cowper <tccowper(a)yahoo.com.au> Date: Wed Jul 21 20:17:48 2010 +1000 winmm: Wrap TRACE strings with debugstr_a/debugstr_an. --- dlls/winmm/mmio.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index a6e06b5..3f0790d 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -584,7 +584,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, MMIOINFO mmioinfo; DWORD pos; - TRACE("('%s', %p, %08X, %s);\n", szFileName, refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%s, %p, %08X, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); if (!refmminfo) { refmminfo = &mmioinfo; @@ -1058,7 +1058,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags) /* Pad with spaces */ while (i < 4) cc[i++] = ' '; - TRACE("Got '%.4s'\n",cc); + TRACE("Got %s\n",debugstr_an(cc,4)); return mmioFOURCC(cc[0],cc[1],cc[2],cc[3]); } @@ -1173,8 +1173,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, srchType = lpck->fccType; } - TRACE("searching for %4.4s.%4.4s\n", - (LPCSTR)&srchCkId, srchType ? (LPCSTR)&srchType : "any"); + TRACE("searching for %s.%s\n", + debugstr_an((LPCSTR)&srchCkId, 4), srchType ? debugstr_an((LPCSTR)&srchType, 4) : "<any>"); while (TRUE) { @@ -1189,9 +1189,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, } lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD); - TRACE("ckid=%4.4s fcc=%4.4s cksize=%08X !\n", - (LPCSTR)&lpck->ckid, - srchType ? (LPCSTR)&lpck->fccType:"<na>", + TRACE("ckid=%s fcc=%s cksize=%08X !\n", + debugstr_an((LPCSTR)&lpck->ckid, 4), + srchType ? debugstr_an((LPCSTR)&lpck->fccType, 4) : "<na>", lpck->cksize); if ( (!srchCkId || (srchCkId == lpck->ckid)) && (!srchType || (srchType == lpck->fccType)) ) @@ -1213,9 +1213,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); lpck->fccType = 0; } - TRACE("lpck: ckid=%.4s, cksize=%d, dwDataOffset=%d fccType=%08X (%.4s)!\n", - (LPSTR)&lpck->ckid, lpck->cksize, lpck->dwDataOffset, - lpck->fccType, srchType?(LPSTR)&lpck->fccType:""); + TRACE("lpck: ckid=%s, cksize=%d, dwDataOffset=%d fccType=%08X (%s)!\n", + debugstr_an((LPSTR)&lpck->ckid, 4), lpck->cksize, lpck->dwDataOffset, + lpck->fccType, srchType ? debugstr_an((LPSTR)&lpck->fccType, 4):""); return MMSYSERR_NOERROR; } @@ -1272,7 +1272,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) else if (uFlags == MMIO_CREATERIFF) lpck->ckid = FOURCC_RIFF; - TRACE("ckid=%.4s\n", (LPSTR)&lpck->ckid); + TRACE("ckid=%s\n", debugstr_an((LPSTR)&lpck->ckid, 4)); size = 2 * sizeof(DWORD); lpck->dwDataOffset = dwOldPos + size; @@ -1302,7 +1302,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, struct IOProcList tmp; FOURCC fcc; - TRACE("('%s', '%s', %p, %08X);\n", + TRACE("(%s, %s, %p, %08X);\n", debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags); /* If both params are NULL, then parse the file name */

1 0

Igor Paliychuk : wineconsole: Add Ukrainian translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 0a3f093fe4ab2407fa68a224afd85bb33f9fb496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3f093fe4ab2407fa68a224a… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Jul 21 14:55:12 2010 +0300 wineconsole: Add Ukrainian translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_Uk.rc | 139 ++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index f925a10..74e99a1 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -36,6 +36,7 @@ RC_SRCS = \ wineconsole_Si.rc \ wineconsole_Sv.rc \ wineconsole_Tr.rc \ + wineconsole_Uk.rc \ wineconsole_Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/wineconsole/wineconsole_Uk.rc b/programs/wineconsole/wineconsole_Uk.rc new file mode 100644 index 0000000..47d164e --- /dev/null +++ b/programs/wineconsole/wineconsole_Uk.rc @@ -0,0 +1,139 @@ +/* + * Copyright 2001 Eric Pouech + * Copyright 2010 Igor Paliychuk + * + * 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 "wineconsole_res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +IDS_EDIT, "Реда&гування" +IDS_DEFAULT, "За &замовчанням" +IDS_PROPERTIES, "&Властивості" +IDS_MARK, "Ві&дзначити" +IDS_COPY, "&Копіювати" +IDS_PASTE, "В&ставити" +IDS_SELECTALL, "Вид&ілити все" +IDS_SCROLL, "Прок&рутити" +IDS_SEARCH, "По&шук" +IDS_FNT_DISPLAY, "Кожен символ має %ld пікселів в ширину і %ld пікселів в висоту" +IDS_FNT_PREVIEW, "Це тест" +IDS_DLG_TIT_DEFAULT, "Налаштування - Станд. параметри" +IDS_DLG_TIT_CURRENT, "Налаштування - Поточні параметри" +IDS_DLG_TIT_ERROR, "Помилка конфігурації" +IDS_DLG_ERR_SBWINSIZE, "Розмір буфера екрану повинен бути не менший буфера вікна" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Невірний код події\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Невірний backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Невідомий параметр командного рядка\n" +IDS_CMD_ABOUT "Запуск програми в консолі Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Запуск програми %s не вдався.\n"\ + "Команда невірна.\n" + +IDS_USAGE_HEADER "\nВикористання:\n wineconsole [параметри] <команда>\n\nПараметри:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Вибір user відкриє нове вікно, curses спробує\n"\ + " налаштувати поточний термінал як консоль Wine\n" +IDS_USAGE_COMMAND " <команда> Назва програми для запуску в консолі Wine\n" +IDS_USAGE_FOOTER "\nПриклад:\n wineconsole cmd\nЗапуск командного рядка Wine в консолі Wine\n\n" + +END + +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Параметри " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Розмір курсора", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "&Малий", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Середній", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Великий", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "Керування", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "Сплив. меню", -1, 79, 23, 44, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 140, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 140, 33, 60, 10, WS_TABSTOP + LTEXT "Швидке редагув.", -1, 79, 43, 58, 10 + AUTOCHECKBOX "вв&імкнути", IDC_OPT_QUICK_EDIT, 140, 43, 60, 10, WS_TABSTOP + + GROUPBOX "Історія команд", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "&Кількість нагаданих команд :", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "Видаляти &повтори", IDC_OPT_HIST_NODOUBLE, 140, 67, 50, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Шрифт " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Шрифт", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&Колір", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&Розмір", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 25 +} + +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION " Конфігурація " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Зона буфера", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "&Ширина :", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&Висота :", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Розмір вікна", -1, 10, 55, 100, 42 + LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "Висо&та :", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "Завершення програми", -1, 115, 11, 84, 42, BS_GROUPBOX + AUTOCHECKBOX "&Закрити консоль", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "Випуск", -1, 115, 55, 84, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 202, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Параметри консолі" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 182, 31, BS_GROUPBOX + AUTORADIOBUTTON "Зберегти ці налаштування для наступних сесій", IDC_SAV_SAVE, 14, 15, 172, 10, WS_TABSTOP + AUTORADIOBUTTON "Змінювати лише поточну сесію", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "OK", IDOK, 55, 45, 40, 12 + PUSHBUTTON "Скасувати", IDCANCEL, 105, 45, 40, 12 +}

1 0

Andrew Eikum : shlwapi: Implement SHGetIniStringW.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ef8cf0fdf2d6f892296f43616d1a5ef1ed2579b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8cf0fdf2d6f892296f43616… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 21 11:23:55 2010 -0500 shlwapi: Implement SHGetIniStringW. --- dlls/shlwapi/ordinal.c | 43 ++++++++++++++++++++-- dlls/shlwapi/tests/ordinal.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 7c00669..2c9db24 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3246,12 +3246,47 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) /************************************************************************* * @ [SHLWAPI.294] + * + * Retrieve a key value from an INI file. See GetPrivateProfileString for + * more information. + * + * PARAMS + * appName [I] The section in the INI file that contains the key + * keyName [I] The key to be retrieved + * out [O] The buffer into which the key's value will be copied + * outLen [I] The length of the `out' buffer + * filename [I] The location of the INI file + * + * RETURNS + * Length of string copied into `out'. */ -BOOL WINAPI SHGetIniStringW(LPCWSTR str1, LPCWSTR str2, LPWSTR pStr, DWORD some_len, LPCWSTR lpStr2) +DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, + DWORD outLen, LPCWSTR filename) { - FIXME("(%s,%s,%p,%08x,%s): stub!\n", debugstr_w(str1), debugstr_w(str2), - pStr, some_len, debugstr_w(lpStr2)); - return TRUE; + INT ret; + WCHAR *buf; + + TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + out, outLen, debugstr_w(filename)); + + if(outLen == 0) + return 0; + + buf = HeapAlloc(GetProcessHeap(), 0, outLen * sizeof(WCHAR)); + if(!buf){ + *out = 0; + return 0; + } + + ret = GetPrivateProfileStringW(appName, keyName, NULL, buf, outLen, filename); + if(ret) + strcpyW(out, buf); + else + *out = 0; + + HeapFree(GetProcessHeap(), 0, buf); + + return strlenW(out); } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 4b1690a..829819d 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -58,6 +58,7 @@ static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUI static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); +static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -70,6 +71,13 @@ static const CHAR ie_international[] = { static const CHAR acceptlanguage[] = { 'A','c','c','e','p','t','L','a','n','g','u','a','g','e',0}; +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + typedef struct { int id; const void *args[5]; @@ -2518,6 +2526,79 @@ static void test_SHIShellFolder_EnumObjects(void) IShellFolder_Release(folder); } +static void write_inifile(LPCWSTR filename) +{ + DWORD written; + HANDLE file; + + static const char data[] = + "[TestApp]\r\n" + "AKey=1\r\n" + "AnotherKey=asdf\r\n"; + + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, sizeof(data), &written, NULL); + + CloseHandle(file); +} + +static void test_SHGetIniString(void) +{ + DWORD ret; + WCHAR out[64] = {0}; + + static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; + static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + static const WCHAR AKeyW[] = {'A','K','e','y',0}; + static const WCHAR AnotherKeyW[] = {'A','n','o','t','h','e','r','K','e','y',0}; + static const WCHAR JunkKeyW[] = {'J','u','n','k','K','e','y',0}; + + if(!pSHGetIniStringW || is_win2k_and_lower){ + win_skip("SHGetIniStringW is not available\n"); + return; + } + + write_inifile(TestIniW); + + if(0){ + /* these crash on Windows */ + ret = pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); + ret = pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); + ret = pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + } + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW); + ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); + + /* valid arguments */ + ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s\n", + wine_dbgstr_w(AKeyW), wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); + ok(broken(*out == 0) || /*win 98 */ + !strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), TestIniW); + ok(broken(ret == 0) || /* win 98 */ + ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(broken(*out == 0) || /* win 98 */ + !strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), TestIniW); + ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); + ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); + + DeleteFileW(TestIniW); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2534,6 +2615,7 @@ static void init_pointers(void) MAKEFUNC(SHPackDispParams, 282); MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); + MAKEFUNC(SHGetIniStringW, 294); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); @@ -2570,4 +2652,5 @@ START_TEST(ordinal) test_IUnknown_ProfferService(); test_SHCreateWorkerWindowA(); test_SHIShellFolder_EnumObjects(); + test_SHGetIniString(); }

1 0

Andrew Eikum : shlwapi: Implement SHSetIniStringW.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ab418fc258165a1a4ac05f91983d34a230759439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab418fc258165a1a4ac05f919… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 21 11:23:57 2010 -0500 shlwapi: Implement SHSetIniStringW. --- dlls/shlwapi/ordinal.c | 26 +++++++++++------ dlls/shlwapi/tests/ordinal.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 2c9db24..2bf0e79 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3292,18 +3292,26 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, /************************************************************************* * @ [SHLWAPI.295] * - * Called by ICQ2000b install via SHDOCVW: - * str1: "InternetShortcut" - * x: some unknown pointer - * str2: "http://free.aol.com/tryaolfree/index.adp?139269" - * str3: "C:\\WINDOWS\\Desktop.new2\\Free AOL & Unlimited Internet.url" + * Set a key value in an INI file. See WritePrivateProfileString for + * more information. + * + * PARAMS + * appName [I] The section in the INI file that contains the key + * keyName [I] The key to be set + * str [O] The value of the key + * filename [I] The location of the INI file * - * In short: this one maybe creates a desktop link :-) + * RETURNS + * Success: TRUE + * Failure: FALSE */ -BOOL WINAPI SHSetIniStringW(LPWSTR str1, LPVOID x, LPWSTR str2, LPWSTR str3) +BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, + LPCWSTR filename) { - FIXME("(%s, %p, %s, %s), stub.\n", debugstr_w(str1), x, debugstr_w(str2), debugstr_w(str3)); - return TRUE; + TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + debugstr_w(filename)); + + return WritePrivateProfileStringW(appName, keyName, str, filename); } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 829819d..88165ef 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -59,6 +59,7 @@ static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServicePr static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG_PTR); static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); +static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2545,6 +2546,26 @@ static void write_inifile(LPCWSTR filename) CloseHandle(file); } +#define verify_inifile(f, e) r_verify_inifile(__LINE__, f, e) +static void r_verify_inifile(unsigned l, LPCWSTR filename, LPCSTR exp) +{ + HANDLE file; + CHAR buf[1024]; + DWORD read; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) + return; + + ReadFile(file, buf, sizeof(buf) * sizeof(CHAR), &read, NULL); + buf[read] = '\0'; + + CloseHandle(file); + + ok_(__FILE__,l)(!strcmp(buf, exp), "Expected:\n%s\nGot:\n%s\n", exp, + buf); +} + static void test_SHGetIniString(void) { DWORD ret; @@ -2599,6 +2620,44 @@ static void test_SHGetIniString(void) DeleteFileW(TestIniW); } +static void test_SHSetIniString(void) +{ + BOOL ret; + + static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; + static const WCHAR AnotherAppW[] = {'A','n','o','t','h','e','r','A','p','p',0}; + static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + static const WCHAR AKeyW[] = {'A','K','e','y',0}; + static const WCHAR NewKeyW[] = {'N','e','w','K','e','y',0}; + static const WCHAR AValueW[] = {'A','V','a','l','u','e',0}; + + if(!pSHSetIniStringW || is_win2k_and_lower){ + win_skip("SHSetIniStringW is not available\n"); + return; + } + + write_inifile(TestIniW); + + ret = pSHSetIniStringW(TestAppW, AKeyW, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + todo_wine /* wine sticks an extra \r\n at the end of the file */ + verify_inifile(TestIniW, "[TestApp]\r\nAKey=AValue\r\nAnotherKey=asdf\r\n"); + + ret = pSHSetIniStringW(TestAppW, AKeyW, NULL, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[TestApp]\r\nAnotherKey=asdf\r\n"); + + ret = pSHSetIniStringW(AnotherAppW, NewKeyW, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[TestApp]\r\nAnotherKey=asdf\r\n[AnotherApp]\r\nNewKey=AValue\r\n"); + + ret = pSHSetIniStringW(TestAppW, NULL, AValueW, TestIniW); + ok(ret == TRUE, "SHSetIniStringW should not have failed\n"); + verify_inifile(TestIniW, "[AnotherApp]\r\nNewKey=AValue\r\n"); + + DeleteFileW(TestIniW); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2616,6 +2675,7 @@ static void init_pointers(void) MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); MAKEFUNC(IConnectionPoint_SimpleInvoke, 284); MAKEFUNC(SHGetIniStringW, 294); + MAKEFUNC(SHSetIniStringW, 295); MAKEFUNC(SHFormatDateTimeA, 353); MAKEFUNC(SHFormatDateTimeW, 354); MAKEFUNC(SHIShellFolder_EnumObjects, 404); @@ -2653,4 +2713,5 @@ START_TEST(ordinal) test_SHCreateWorkerWindowA(); test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); + test_SHSetIniString(); }

1 0

Henri Verbeet : wined3d: Remove ModifyLocation() from the public wined3d surface interface.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 147f24dd7865d8942e3f16ca8acf5dd8f7b7f89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f24dd7865d8942e3f16ca8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:21 2010 +0200 wined3d: Remove ModifyLocation() from the public wined3d surface interface. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 10 ++-- dlls/wined3d/drawprim.c | 8 ++-- dlls/wined3d/surface.c | 99 +++++++++++++++++++++---------------- dlls/wined3d/surface_gdi.c | 11 ---- dlls/wined3d/swapchain.c | 18 ++++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 4 -- 11 files changed, 81 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=147f24dd7865d8942e3f1…

1 0

Henri Verbeet : wined3d: Remove LoadLocation() from the public wined3d surface interface.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: f7760656f3b09b3151e8c274c4151a0cdec19174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7760656f3b09b3151e8c274c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:22 2010 +0200 wined3d: Remove LoadLocation() from the public wined3d surface interface. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 8 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 268 ++++++++++++++++++++------------------- dlls/wined3d/surface_gdi.c | 13 -- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 4 - 10 files changed, 147 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7760656f3b09b3151e8c…

1 0

David Hedberg : include: Add IFileDialogControlEvents interface declaration .
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 17bc7be58dd16ce966b70171b844349e0b2a5b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bc7be58dd16ce966b70171b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:13 2010 +0200 include: Add IFileDialogControlEvents interface declaration. --- include/shobjidl.idl | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 9b5fc17..d634d53 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2756,3 +2756,32 @@ interface IFileDialogCustomize : IUnknown [in] DWORD dwIDItem, [in, string] LPCWSTR pszLabel); } + +/***************************************************************************** + * IFileDialogControlEvents interface + */ +[ + object, + uuid(36116642-D713-4B97-9B83-7484A9D00433), + pointer_default(unique) +] +interface IFileDialogControlEvents : IUnknown +{ + HRESULT OnItemSelected( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT OnButtonClicked( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl); + + HRESULT OnCheckButtonToggled( + [in] IFileDialogCustomize *pfdc, + [in] BOOL dwIDCtl, + [in] BOOL bChecked); + + HRESULT OnControlActivating( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl); +}

1 0

David Hedberg : include: Add IFileDialogCustomize interface declaration.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cdfe614fcc815a12651da89332d6b3627a2932b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfe614fcc815a12651da8933… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:12 2010 +0200 include: Add IFileDialogCustomize interface declaration. --- include/shobjidl.idl | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index bc813ed..9b5fc17 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2632,3 +2632,127 @@ interface IFileOpenDialog : IFileDialog HRESULT GetSelectedItems( [out] IShellItemArray **ppsai); } + +typedef [v1_enum] enum CDCONTROLSTATEF +{ + CDCS_INACTIVE = 0x0, + CDCS_ENABLED = 0x1, + CDCS_VISIBLE = 0x2, + CDCS_ENABLEDVISIBLE = 0x3 +} CDCONTROLSTATEF; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(CDCONTROLSTATEF)") +/***************************************************************************** + * IFileDialogCustomize interface + */ +[ + object, + uuid(E6FDD21A-163F-4975-9C8C-A69F1BA37034), + pointer_default(unique) +] +interface IFileDialogCustomize : IUnknown +{ + HRESULT EnableOpenDropDown( + [in] DWORD dwIDCtl); + + HRESULT AddMenu( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT AddPushButton( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT AddComboBox( + [in] DWORD dwIDCtl); + + HRESULT AddRadioButtonList( + [in] DWORD dwIDCtl); + + HRESULT AddCheckButton( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel, + [in] BOOL bChecked); + + HRESULT AddEditBox( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT AddSeparator( + [in] DWORD dwIDCtl); + + HRESULT AddText( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT SetControlLabel( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT GetControlState( + [in] DWORD dwIDCtl, + [out] CDCONTROLSTATEF *pdwState); + + HRESULT SetControlState( + [in] DWORD dwIDCtl, + [in] CDCONTROLSTATEF dwState); + + HRESULT GetEditBoxText( + [in] DWORD dwIDCtl, + [out, string] WCHAR **ppszText); + + HRESULT SetEditBoxText( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT GetCheckButtonState( + [in] DWORD dwIDCtl, + [out] BOOL *pbChecked); + + HRESULT SetCheckButtonState( + [in] DWORD dwIDCtl, + [in] BOOL bChecked); + + HRESULT AddControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in] LPCWSTR pszLabel); + + HRESULT RemoveControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT RemoveAllControlItems( + [in] DWORD dwIDCtl); + + HRESULT GetControlItemState( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [out] CDCONTROLSTATEF *pdwState); + + HRESULT SetControlItemState( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in] CDCONTROLSTATEF dwState); + + HRESULT GetSelectedControlItem( + [in] DWORD dwIDCtl, + [out] DWORD *pdwIDItem); + + HRESULT SetSelectedControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT StartVisualGroup( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT EndVisualGroup(); + + HRESULT MakeProminent( + [in] DWORD dwIDCtl); + + HRESULT SetControlItemText( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in, string] LPCWSTR pszLabel); +}

1 0

David Hedberg : include: Add INameSpaceTreeControlCustomDraw interface declaration.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 5acb6f0132ef1d62abdab1a78ac91051f06aeffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acb6f0132ef1d62abdab1a78… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:09 2010 +0200 include: Add INameSpaceTreeControlCustomDraw interface declaration. --- include/shobjidl.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 333c32a..fa6d86d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2195,3 +2195,52 @@ interface INameSpaceTreeControlEvents : IUnknown [out] int *piDefaultIcon, [out] int *piOpenIcon); } + +cpp_quote("#ifdef MIDL_PASS") +typedef IUnknown *HIMAGELIST; +cpp_quote("#endif") + +/***************************************************************************** + * INameSpaceTreeControlCustomDraw interface + */ +[ + object, + uuid(2D3BA758-33EE-42D5-BB7B-5F3431D86C78), + local +] + +interface INameSpaceTreeControlCustomDraw : IUnknown +{ + typedef struct NSTCCUSTOMDRAW + { + IShellItem *psi; + UINT uItemState; + NSTCITEMSTATE nstcis; + LPCWSTR pszText; + int iImage; + HIMAGELIST himl; + int iLevel; + int iIndent; + } NSTCCUSTOMDRAW; + + HRESULT PrePaint( + [in] HDC hdc, + [in] RECT *prc, + [out] LRESULT *plres); + + HRESULT PostPaint( + [in] HDC hdc, + [in] RECT *prc); + + HRESULT ItemPrePaint( + [in] HDC hdc, + [in] RECT *prc, + [in, out] COLORREF *pclrText, + [in, out] COLORREF *pclrTextBk, + [out] LRESULT *plres); + + HRESULT ItemPostPaint( + [in] HDC hdc, + [in] RECT *prc, + [in] NSTCCUSTOMDRAW *pnstccdItem); +}

1 0

David Hedberg : include: Add INameSpaceTreeControlDropHandler interface declaration.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 64aabaa80659179c9c5065a95b96fa7d388ffe8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aabaa80659179c9c5065a95… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:10 2010 +0200 include: Add INameSpaceTreeControlDropHandler interface declaration. --- include/shobjidl.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index fa6d86d..6624df4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2244,3 +2244,50 @@ interface INameSpaceTreeControlCustomDraw : IUnknown [in] RECT *prc, [in] NSTCCUSTOMDRAW *pnstccdItem); } + +/***************************************************************************** + * INameSpaceTreeControlDropHandler interface + */ +[ + object, + uuid(F9C665D6-C2F2-4C19-BF33-8322D7352F51), + local +] +interface INameSpaceTreeControlDropHandler : IUnknown +{ + HRESULT OnDragEnter( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] BOOL fOutsideSource, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDragOver( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDragPosition( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iNewPosition, + [in] int iOldPosition); + + HRESULT OnDrop( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iPosition, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDropPosition( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iNewPosition, + [in] int iOldPosition); + + HRESULT OnDragLeave( + [in, unique] IShellItem *psiOver); +} +cpp_quote("#define NSTCDHPOS_ONTOP -1")

1 0