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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 043bdc16a57121a063967ce4505e84a3112fdb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043bdc16a57121a063967ce45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 17:49:49 2011 +0400 po: Update Russian translation. --- po/ru.po | 100 ++++++++++++++++++++++--------------------------------------- 1 files changed, 36 insertions(+), 64 deletions(-) diff --git a/po/ru.po b/po/ru.po index 55404a0..989eb87 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-02-11 05:35+0300\n" -"Last-Translator: Alexander Lakhin <exclusion(a)gmail.com>\n" +"PO-Revision-Date: 2011-04-17 17:06+0300\n" +"Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" "MIME-Version: 1.0\n" @@ -2008,13 +2008,12 @@ msgid "Default MidiOut Device" msgstr "Устройство вывода MIDI по умолчанию" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Установки по умолчанию" +msgstr "Региональные настройки" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uМБ используется, %uМБ доступно" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -2173,36 +2172,32 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Настройка браузера Wine и связанных параметров" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "&Сохранять настройки при выходе" +msgstr "Настройки безопасности для зоны: " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Персонализовать" +msgstr "Пользовательский" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Очень низкий" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "&Низкая" +msgstr "Низкий" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Средний" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Повышенный" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Высокая" +msgstr "Высокий" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -2825,9 +2820,8 @@ msgid "Signal pending\n" msgstr "Сигнал обрабатывается\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" -msgstr "Невозможно создать дополнительный поток\n" +msgstr "Создано максимально возможное количество потоков\n" #: winerror.mc:686 msgid "Lock failed\n" @@ -4254,9 +4248,8 @@ msgid "Private dialog index\n" msgstr "Индекс частного диалога\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" -msgstr "Код списка не найден\n" +msgstr "Идентификатор элемента \"Список\" не найден\n" #: winerror.mc:2481 msgid "No wildcard characters\n" @@ -4319,18 +4312,16 @@ msgid "Hook procedure not installed\n" msgstr "Процедура обработчика не установлена\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" -msgstr "Неверное сообщение для списка\n" +msgstr "Неверное сообщение для элемента \"Список\"\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent\n" msgstr "Послано неверное сообщение LB_SETCOUNT\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" -msgstr "Список не поддерживает позиции табуляции\n" +msgstr "Элемент \"Список\" не имеет позиции табуляции\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread\n" @@ -4345,9 +4336,8 @@ msgid "Window has no system menu\n" msgstr "У окна нет системного меню\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" -msgstr "Неверный стиль окна сообщения\n" +msgstr "Неверный стиль окна-сообщения\n" #: winerror.mc:2591 msgid "Invalid SPI parameter\n" @@ -4398,7 +4388,6 @@ msgid "No system resources\n" msgstr "Недостаточно системных ресурсов\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "Недостаточно невыгружаемых системных ресурсов\n" @@ -4411,9 +4400,8 @@ msgid "No working set quota\n" msgstr "Превышена квота рабочего набора\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" -msgstr "Превышена квота файла подкачки\n" +msgstr "Не задана квота файла подкачки\n" #: winerror.mc:2671 msgid "Exceeded commitment limit\n" @@ -4488,7 +4476,6 @@ msgid "Unknown component\n" msgstr "Неизвестный компонент\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "Неизвестное свойство\n" @@ -5021,7 +5008,6 @@ msgid "Invalid printer command\n" msgstr "Неверная команда принтеру\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "Неверный тип данных\n" @@ -5334,7 +5320,6 @@ msgid "insert disk %s" msgstr "вставьте диск %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6915,13 +6900,12 @@ msgid "An invalid parameter was passed to a system function." msgstr "Недопустимый параметр передан системной функции." #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." msgstr "" -"Указанный формат не поддерживается или не может быть оттранслирован. " -"Используйте функцию Capabilities, чтобы определить поддерживаемые форматы." +"Указанный формат не поддерживается или не может быть преобразован. " +"Используйте функцию Возможности, чтобы определить поддерживаемые форматы." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -7111,13 +7095,12 @@ msgstr "" "команде." #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" "Ошибки в нескольких устройствах. Укажите отдельно каждую команду и " -"устройство, чтобы определить, какие устройства вызывали ошибки." +"устройство, чтобы определить устройство, вызвавшее ошибку." #: winmm.rc:78 msgid "Cannot determine the device type from the given filename extension." @@ -7738,9 +7721,8 @@ msgid "&Always on Top" msgstr "&Поверх всех" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&О программе..." +msgstr "&О Часах" #: clock.rc:48 msgid "Clock" @@ -8029,9 +8011,8 @@ msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Справка о REN\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" -msgstr "Справка о RENAME\n" +msgstr "RENAME <имя файла> переименовывает файл.\n" #: cmd.rc:160 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" @@ -8127,9 +8108,8 @@ msgstr "" "Флаг verify не используется Wine.\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" -msgstr "VER отображает версию запущенного cmd\n" +msgstr "VER выводит версию используемого cmd\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" @@ -8627,9 +8607,8 @@ msgid "&Replace...\tCtrl+H" msgstr "&Заменить...\tCtrl+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" -msgstr "&Содержание" +msgstr "&Содержание\tF1" #: notepad.rc:59 msgid "&About Notepad" @@ -9089,9 +9068,8 @@ msgid "&Arrange Icons" msgstr "&Упорядочить при выходе" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Диспетчер программ" +msgstr "&О диспетчере программ" #: progman.rc:60 msgid "Program Manager" @@ -9251,9 +9229,8 @@ msgid "&Multi String Value" msgstr "&Многостроковый параметр" #: regedit.rc:52 regedit.rc:103 -#, fuzzy msgid "&Expandable String Value" -msgstr "&Строковый параметр" +msgstr "&Вычисляемый строковый параметр" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" @@ -10371,15 +10348,15 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" "Each drive must have a letter, from A to Z, so you cannot have more than 26." msgstr "" -"Невозможно создать новый диск.\n" +"Невозможно добавить ещё один диск.\n" "\n" -"У каждого диска должна быть буква - от A до Z, и у вас уже 26 дисков." +"Каждый диск имеет букву - от A до Z, поэтому общее количество дисков " +"ограничено 26-ю." #: winecfg.rc:87 msgid "System drive" @@ -10840,9 +10817,8 @@ msgid "Arrange &Symbols" msgstr "&Расположить" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "&О Winefile..." +msgstr "&О Wine File" #: winefile.rc:93 msgid "Applying font settings" @@ -10906,7 +10882,7 @@ msgstr "%s из %s свободно" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Игра" #: winemine.rc:35 msgid "&New\tF2" @@ -10914,7 +10890,7 @@ msgstr "&Новая игра\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "Вопросительные &знаки" #: winemine.rc:39 msgid "&Beginner" @@ -10933,14 +10909,12 @@ msgid "&Custom..." msgstr "Нестандартные &параметры" #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "&Лучшее время" +msgstr "&Лучшие результаты" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&О Wine" +msgstr "&О WineMine" #: winemine.rc:27 msgid "WineMine" @@ -10991,9 +10965,8 @@ msgid "Large" msgstr "Крупный" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "&Использование справки" +msgstr "&Справка о справочной программе" #: winhlp32.rc:55 msgid "Always on &top" @@ -11152,9 +11125,8 @@ msgid "&System\tCtrl+1" msgstr "&Системный\tCtrl+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" -msgstr "&Желтоватый PostThat\tCtrl+2" +msgstr "&Светло-жёлтый\tCtrl+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Juan Lang : wintrust: Implement IsCatalogFile.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3effba78051a7309a443c36b8c3ca4d5aca85386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3effba78051a7309a443c36b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Apr 16 10:30:34 2011 -0700 wintrust: Implement IsCatalogFile. --- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 0627711..53a2468 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -50,7 +50,7 @@ @ stdcall GenericChainFinalProv(ptr) @ stdcall HTTPSCertificateTrust(ptr) @ stdcall HTTPSFinalProv(ptr) -@ stub IsCatalogFile +@ stdcall IsCatalogFile(ptr wstr) @ stub MsCatConstructHashTag @ stub MsCatFreeHashTag @ stub OfficeCleanupPolicy diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 1c87b6e..302b2bd 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -1201,3 +1201,18 @@ HRESULT WINAPI WTHelperCertCheckValidSignature(CRYPT_PROVIDER_DATA *pProvData) FIXME("Stub\n"); return S_OK; } + +/*********************************************************************** + * IsCatalogFile + */ +BOOL WINAPI IsCatalogFile(HANDLE hFile, WCHAR *pwszFileName) +{ + static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + GUID guid; + + TRACE("(%p, %s)\n", hFile, debugstr_w(pwszFileName)); + + if (!CryptSIPRetrieveSubjectGuid(pwszFileName, hFile, &guid)) + return FALSE; + return IsEqualGUID(&guid, &catGUID); +}

1 0

Gerald Pfeifer : wine: Use { } instead of ; for an empty basic block.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 309a8c8d48b7daa790253146f24564e65fa6b287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309a8c8d48b7daa790253146f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 17 01:23:32 2011 +0200 wine: Use { } instead of ; for an empty basic block. --- dlls/krnl386.exe16/instr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 61f92ab..5db0b2b 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -632,11 +632,13 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int seg = outp ? context->SegDs : context->SegEs; /* FIXME: is this right? */ if (outp) + { /* FIXME: Check segment is readable. */ - ; + } else + { /* FIXME: Check segment is writable. */ - ; + } if (repX) {

1 0

Andrew Nguyen : regedit: Convert the listview code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 87bd8ef6e1beec002bab370f37a836bfa1215799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bd8ef6e1beec002bab370f3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:27 2011 -0500 regedit: Convert the listview code to Unicode. --- programs/regedit/listview.c | 45 ++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 333b2a4..bbd5dd6 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -85,7 +85,7 @@ LPCWSTR GetValueName(HWND hwndLV) HeapFree(GetProcessHeap(), 0, g_valueName); g_valueName = NULL; - item = ListView_GetNextItem(hwndLV, -1, LVNI_FOCUSED); + item = SendMessageW(hwndLV, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); if (item == -1) return NULL; g_valueName = GetItemText(hwndLV, item); @@ -133,7 +133,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, } item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.iItem = ListView_GetItemCount(hwndLV);/*idx; */ + item.iItem = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; @@ -348,12 +348,12 @@ HWND StartValueRename(HWND hwndLV) { int item; - item = ListView_GetNextItem(hwndLV, -1, LVNI_FOCUSED | LVNI_SELECTED); + item = SendMessageW(hwndLV, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); if (item < 1) { /* cannot rename default key */ MessageBeep(MB_ICONHAND); return 0; } - return ListView_EditLabel(hwndLV, item); + return (HWND)SendMessageW(hwndLV, LVM_EDITLABELW, item, 0); } static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -372,7 +372,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR switch (message) { case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { - return CallWindowProc(g_orgListWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(g_orgListWndProc, hWnd, message, wParam, lParam); } break; case WM_NOTIFY_REFLECT: @@ -409,11 +409,11 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR return 0; } case NM_RETURN: { - int cnt = ListView_GetNextItem(hWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); - if (cnt != -1) - SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); - } - break; + int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); + if (cnt != -1) + SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); + } + break; case NM_DBLCLK: { NMITEMACTIVATE* nmitem = (LPNMITEMACTIVATE)lParam; LVHITTESTINFO info; @@ -435,11 +435,18 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR #endif info.pt.x = nmitem->ptAction.x; info.pt.y = nmitem->ptAction.y; - if (ListView_HitTest(hWnd, &info) != -1) { - ListView_SetItemState(hWnd, -1, 0, LVIS_FOCUSED|LVIS_SELECTED); - ListView_SetItemState(hWnd, info.iItem, LVIS_FOCUSED|LVIS_SELECTED, - LVIS_FOCUSED|LVIS_SELECTED); - SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); + if (SendMessageW(hWnd, LVM_HITTEST, 0, (LPARAM)&info) != -1) { + LVITEMW item; + + item.state = 0; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(hWnd, LVM_SETITEMSTATE, (UINT)-1, (LPARAM)&item); + + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(hWnd, LVM_SETITEMSTATE, info.iItem, (LPARAM)&item); + + SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); } } break; @@ -449,14 +456,14 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR } break; case WM_CONTEXTMENU: { - int cnt = ListView_GetNextItem(hWnd, -1, LVNI_SELECTED); + int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); TrackPopupMenu(GetSubMenu(hPopupMenus, cnt == -1 ? PM_NEW : PM_MODIFYVALUE), TPM_RIGHTBUTTON, (short)LOWORD(lParam), (short)HIWORD(lParam), 0, hFrameWnd, NULL); break; } default: - return CallWindowProc(g_orgListWndProc, hWnd, message, wParam, lParam); + return CallWindowProcW(g_orgListWndProc, hWnd, message, wParam, lParam); } return 0; } @@ -512,11 +519,11 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ, &hKey); if (errCode != ERROR_SUCCESS) goto done; - count = ListView_GetItemCount(hwndLV); + count = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); for (i = 0; i < count; i++) { item.mask = LVIF_PARAM; item.iItem = i; - SendMessageW( hwndLV, LVM_GETITEM, 0, (LPARAM)&item ); + SendMessageW( hwndLV, LVM_GETITEMW, 0, (LPARAM)&item ); HeapFree(GetProcessHeap(), 0, ((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); }

1 0

Andrew Nguyen : regedit: Explicitly use ANSI functions in regedit helper functions.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3e19c4ca3bc4306e5a0cf1eb49d08c25e0897702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e19c4ca3bc4306e5a0cf1eb4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:34 2011 -0500 regedit: Explicitly use ANSI functions in regedit helper functions. --- programs/regedit/regedit.c | 16 ++++++++-------- programs/regedit/regproc.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 0de71cf..cc0fc3a 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -141,29 +141,29 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) if (strcmp(filename, "-") == 0) { - reg_file=stdin; + reg_file = stdin; } else { int size; - size=SearchPath(NULL, filename, NULL,0, NULL, NULL); - if (size>0) + size = SearchPathA(NULL, filename, NULL, 0, NULL, NULL); + if (size > 0) { - realname=HeapAlloc(GetProcessHeap(), 0, size); - size=SearchPath(NULL, filename, NULL, size, realname, NULL); + realname = HeapAlloc(GetProcessHeap(), 0, size); + size = SearchPathA(NULL, filename, NULL, size, realname, NULL); } - if (size==0) + if (size == 0) { fprintf(stderr, "%s: File not found \"%s\" (%d)\n", getAppName(), filename, GetLastError()); exit(1); } reg_file = fopen(realname, "r"); - if (reg_file==NULL) + if (reg_file == NULL) { perror(""); - fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), filename); + fprintf(stderr, "%s: Can't open file \"%s\"\n", getAppName(), filename); exit(1); } } diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 841ab79..1f1a059 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -890,8 +890,8 @@ static void REGPROC_print_error(void) int status; error_code = GetLastError (); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPTSTR) &lpMsgBuf, 0, NULL); + status = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (LPSTR) &lpMsgBuf, 0, NULL); if (!status) { fprintf(stderr,"%s: Cannot display message for error %d, status %d\n", getAppName(), error_code, GetLastError());

1 0

Andrew Nguyen : regedit: Convert the treeview code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3c0af2fcd1fc7cc83597a6cab99abf182c8eea82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0af2fcd1fc7cc83597a6cab… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:39 2011 -0500 regedit: Convert the treeview code to Unicode. --- programs/regedit/Makefile.in | 2 +- programs/regedit/treeview.c | 91 +++++++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c0af2fcd1fc7cc83597a…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: c841c7a32df152af1c91be0f7b1da17c99662807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c841c7a32df152af1c91be0f7… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 15 16:53:18 2011 +0900 po: Update Korean translation. --- po/ko.po | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/po/ko.po b/po/ko.po index d0f89d6..a9d014e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2170,34 +2170,30 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Wine 인터넷 브라우저와 관련 설정 처리" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "나갈때 설정 저장(&S)" +msgstr "영역에 대한 보안 설정: " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" msgstr "사용자정의" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "매우 낮음" #: inetcpl.rc:33 -#, fuzzy msgid "Low" msgstr "낮음(&L)" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "중간" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "증가" #: inetcpl.rc:36 -#, fuzzy msgid "High" msgstr "높음(&H)" @@ -7703,7 +7699,6 @@ msgid "&Always on Top" msgstr "항상 앞에 (&A)" #: clock.rc:42 -#, fuzzy msgid "&About Clock" msgstr "시계 정보(&A)..." @@ -8579,7 +8574,6 @@ msgid "&Replace...\tCtrl+H" msgstr " 바꾸기(&R)...\tCtrl+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" msgstr "목차(&C)" @@ -9038,9 +9032,8 @@ msgid "&Arrange Icons" msgstr "아이콘 정렬(&A)" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "풀그림 관리자" +msgstr "프로그램 관리자 정보(&A)" #: progman.rc:60 msgid "Program Manager" @@ -10776,9 +10769,8 @@ msgid "Arrange &Symbols" msgstr "심벌로 정렬(&S)" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "Winefile에 관하여(&I)..." +msgstr "와인파일 정보(&A)" #: winefile.rc:93 msgid "Applying font settings" @@ -10842,7 +10834,7 @@ msgstr "%s of %s 사용가능" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "게임(&G)" #: winemine.rc:35 msgid "&New\tF2" @@ -10850,7 +10842,7 @@ msgstr "새 게임(&N)\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "물음표(&M)" #: winemine.rc:39 msgid "&Beginner" @@ -10869,14 +10861,12 @@ msgid "&Custom..." msgstr "사용자 정의(&C)" #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" msgstr "가장 빠른 시간(&F)" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "WINE 정보(&A)" +msgstr "WINE지뢰찾기 정보(&A)" #: winemine.rc:27 msgid "WineMine"

1 0

Henri Verbeet : wined3d: Merge surface_gdi.c into surface.c.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 52edf556f61ebae8e8163b0d9d6073394f3d9005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52edf556f61ebae8e8163b0d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 15 18:33:39 2011 +0200 wined3d: Merge surface_gdi.c into surface.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/surface.c | 663 ++++++++++++++++++++++++++++++++++------ dlls/wined3d/surface_gdi.c | 501 ------------------------------ dlls/wined3d/wined3d_private.h | 2 - 4 files changed, 565 insertions(+), 602 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52edf556f61ebae8e8163…

1 0

Henri Verbeet : wined3d: Remove IWineD3DSurface::GetImplType() from the public interface.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 84d50f735327d39bcc65f7f006706a5a6ec90fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d50f735327d39bcc65f7f00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 15 18:33:40 2011 +0200 wined3d: Remove IWineD3DSurface::GetImplType() from the public interface. --- dlls/wined3d/surface.c | 13 ++----------- dlls/wined3d/surface_base.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 2 -- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1aeea95..bf379ca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4891,10 +4891,6 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE return WINED3D_OK; } -static WINED3DSURFTYPE WINAPI IWineD3DSurfaceImpl_GetImplType(IWineD3DSurface *iface) { - return SURFACE_OPENGL; -} - BOOL surface_is_offscreen(IWineD3DSurfaceImpl *surface) { struct wined3d_swapchain *swapchain = surface->container.u.swapchain; @@ -4952,7 +4948,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = /* Internal use: */ IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, - IWineD3DSurfaceImpl_GetImplType, }; static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } @@ -5539,11 +5534,6 @@ static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *m return WINED3D_OK; } -static WINED3DSURFTYPE WINAPI IWineGDISurfaceImpl_GetImplType(IWineD3DSurface *iface) -{ - return SURFACE_GDI; -} - static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = { /* IUnknown */ @@ -5586,7 +5576,6 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = /* Internal use: */ IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, - IWineGDISurfaceImpl_GetImplType, }; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, @@ -5650,6 +5639,8 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, if (!resource_size) return WINED3DERR_INVALIDCALL; + surface->surface_type = surface_type; + /* Look at the implementation and set the correct Vtable. */ switch (surface_type) { diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 0705719..6bd073d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -899,8 +899,7 @@ static IWineD3DSurfaceImpl *surface_convert_format(IWineD3DSurfaceImpl *source, IWineD3DDevice_CreateSurface((IWineD3DDevice *)source->resource.device, source->resource.width, source->resource.height, to_fmt, TRUE /* lockable */, TRUE /* discard */, 0 /* level */, 0 /* usage */, WINED3DPOOL_SCRATCH, WINED3DMULTISAMPLE_NONE /* TODO: Multisampled conversion */, - 0 /* MultiSampleQuality */, IWineD3DSurface_GetImplType((IWineD3DSurface *) source), - NULL /* parent */, &wined3d_null_parent_ops, &ret); + 0 /* MultiSampleQuality */, source->surface_type, NULL /* parent */, &wined3d_null_parent_ops, &ret); if(!ret) { ERR("Failed to create a destination surface for conversion\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 416082c..8c90464 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2041,6 +2041,7 @@ struct IWineD3DSurfaceImpl DWORD flags; + WINED3DSURFTYPE surface_type; UINT pow2Width; UINT pow2Height; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 82f5f76..422551d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2285,8 +2285,6 @@ interface IWineD3DSurface : IUnknown ); HRESULT PrivateSetup( ); - WINED3DSURFTYPE GetImplType( - ); } [

1 0

Jacek Caban : mshtml: Moved nsChannel initialization to separated function.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: f24be9fa541cafc043eec884950b6c80fc0ad5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24be9fa541cafc043eec8849… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 19:36:24 2011 +0200 mshtml: Moved nsChannel initialization to separated function. --- dlls/mshtml/nsio.c | 57 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bd6a411..29825fe 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2532,6 +2532,37 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) return S_OK; } +static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) +{ + nsChannel *channel; + HRESULT hres; + + if(!ensure_uri(uri)) + return NS_ERROR_UNEXPECTED; + + channel = heap_alloc_zero(sizeof(nsChannel)); + if(!channel) + return NS_ERROR_OUT_OF_MEMORY; + + channel->nsIHttpChannel_iface.lpVtbl = &nsChannelVtbl; + channel->nsIUploadChannel_iface.lpVtbl = &nsUploadChannelVtbl; + channel->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; + channel->ref = 1; + channel->request_method = METHOD_GET; + list_init(&channel->response_headers); + list_init(&channel->request_headers); + + nsIURL_AddRef(&uri->nsIURL_iface); + channel->uri = uri; + + hres = IUri_GetScheme(uri->uri, &channel->url_scheme); + if(FAILED(hres)) + channel->url_scheme = URL_SCHEME_UNKNOWN; + + *ret = channel; + return NS_OK; +} + typedef struct { nsIProtocolHandler nsIProtocolHandler_iface; @@ -2839,10 +2870,9 @@ static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI *aURI, nsIChannel **_retval) { - nsChannel *ret; nsWineURI *wine_uri; + nsChannel *ret; nsresult nsres; - HRESULT hres; TRACE("(%p %p)\n", aURI, _retval); @@ -2852,29 +2882,14 @@ static nsresult NSAPI nsIOService_NewChannelFromURI(nsIIOService *iface, nsIURI return nsIIOService_NewChannelFromURI(nsio, aURI, _retval); } - if(!ensure_uri(wine_uri)) { - nsIURI_Release(&wine_uri->nsIURL_iface); - return NS_ERROR_UNEXPECTED; - } - - ret = heap_alloc_zero(sizeof(nsChannel)); - - ret->nsIHttpChannel_iface.lpVtbl = &nsChannelVtbl; - ret->nsIUploadChannel_iface.lpVtbl = &nsUploadChannelVtbl; - ret->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; - ret->ref = 1; - ret->uri = wine_uri; - ret->request_method = METHOD_GET; - list_init(&ret->response_headers); - list_init(&ret->request_headers); + nsres = create_nschannel(wine_uri, &ret); + nsIURL_Release(&wine_uri->nsIURL_iface); + if(NS_FAILED(nsres)) + return nsres; nsIURI_AddRef(aURI); ret->original_uri = aURI; - hres = IUri_GetScheme(wine_uri->uri, &ret->url_scheme); - if(FAILED(hres)) - ret->url_scheme = URL_SCHEME_UNKNOWN; - *_retval = (nsIChannel*)&ret->nsIHttpChannel_iface; return NS_OK; }

1 0