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

Juan Lang : wintrust: Implement IsCatalogFile.
by Alexandre Julliard April 18, 2011

April 18, 2011

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

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 7a5b50a81c0be6485faaabbcbe65090e2dd99090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5b50a81c0be6485faaabbcb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 15 17:05:25 2011 +0900 cmdlgtst: Update Korean resource. --- programs/cmdlgtst/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 507886a..e659e06 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -64,7 +64,7 @@ CmdlgtstMenu MENU POPUP "도움말(&H)" { MENUITEM "사용법(&U)", CM_H_USAGE - MENUITEM "정보(&A)", CM_H_ABOUT + MENUITEM "공용 대화상자 테스트 정보(&A)", CM_H_ABOUT } } @@ -150,7 +150,7 @@ FONT 9, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Marks flags that are set by the system and must be cleared by the user.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "표시된 플래그는 시스템에 의해 설정되고 반드시 사용자에 위해 해제되어야 합니다.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 @@ -247,8 +247,8 @@ CAPTION "정보" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 72, 96, 50, 14 - LTEXT "Common Dialog Test Jig Exerciser, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 18, 60, 157, 24 + LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 12 + LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -258,13 +258,13 @@ CAPTION "사용법" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 70, 276, 50, 14 - LTEXT "Common Dialog Test Jig Exerciser, version 1.20", -1, 13, 48, 168, 12 + LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 48, 168, 12 LTEXT "This tool tests COMMDLG for Wine.", -1, 12, 72, 168, 12 LTEXT "Flags are specified in the Flags menu.", -1, 12, 96, 168, 12 LTEXT "Color dialog changes background color.", -1, 12, 120, 168, 12 LTEXT "Font dialog changes all fonts, and font color if CF_EFFECTS is selected.", -1, 12, 144, 168, 24 LTEXT "Upper left hand corner indicate full pathname and title of the last successful Open or Save.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. Don't hoard code... share it!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 }

1 0

Frédéric Delanoy : inetcpl: Update French translation.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: b1ad8ecc84e48094f7341d076b5b7e6f41f4420b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ad8ecc84e48094f7341d076… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 16 12:04:41 2011 +0200 inetcpl: Update French translation. --- dlls/inetcpl.cpl/cpl_Fr.rc | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc index 1244ff6..6c55754 100644 --- a/dlls/inetcpl.cpl/cpl_Fr.rc +++ b/dlls/inetcpl.cpl/cpl_Fr.rc @@ -2,7 +2,7 @@ * Internet control panel applet * French language support * - * Copyright 2010 Frédéric Delanoy + * Copyright 2010-2011 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +49,46 @@ BEGIN END +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Effacer l'historique de navigation" +BEGIN + + AUTOCHECKBOX "Fichiers internet temporaires\nCopies en cache de pages web, d'images et de certificats.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Cookies\nDonnées enregistrées sur votre ordinateur par des sites web, telles que préférences utilisateur et informations de connexion.", + IDC_DELETE_COOKIES, 10, 32, 230, 35, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Historique\nListe des sites web accédés.", + IDC_DELETE_HISTORY, 10, 73, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Données de formulaires\nNoms d'utilisateur et autres informations entrées dans des formulaires.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Mots de passe\nMots de passe entrés dans des formulaires et sauvegardés.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Annuler", IDCANCEL, 185, 228, 60, 15, WS_GROUP + PUSHBUTTON "Effacer", IDOK, 120, 228, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Sécurité" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Andrew Nguyen : regedit: Convert the treeview code to Unicode.
by Alexandre Julliard April 18, 2011

April 18, 2011

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

Andrew Nguyen : regedit: Explicitly use ANSI functions in regedit helper functions.
by Alexandre Julliard April 18, 2011

April 18, 2011

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

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard April 18, 2011

April 18, 2011

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

Andrew Nguyen : regedit: Convert the listview code to Unicode.
by Alexandre Julliard April 18, 2011

April 18, 2011

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: Convert the hex edit code to Unicode.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 172ce3eed83cbba499c529da2e1aa8c300912453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172ce3eed83cbba499c529da2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:21 2011 -0500 regedit: Convert the hex edit code to Unicode. --- programs/regedit/hexedit.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index ddf6b09..103a062 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -58,7 +58,7 @@ const WCHAR szHexEditClass[] = {'H','e','x','E','d','i','t',0}; static inline LRESULT HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw); -static inline BYTE hexchar_to_byte(TCHAR ch) +static inline BYTE hexchar_to_byte(WCHAR ch) { if (ch >= '0' && ch <= '9') return ch - '0'; @@ -70,17 +70,19 @@ static inline BYTE hexchar_to_byte(TCHAR ch) return -1; } -static LPTSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) +static LPWSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) { - LPTSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, - (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(TCHAR)); + static const WCHAR percent_02xW[] = {'%','0','2','X',' ',0}; + + LPWSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, + (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); LONG i; if (!lpszLine) return NULL; for (i = 0; i < cbData; i++) - wsprintf(lpszLine + i*3, TEXT("%02X "), pData[i]); + wsprintfW(lpszLine + i*3, percent_02xW, pData[i]); for (i = 0; i < pad * 3; i++) lpszLine[cbData * 3 + i] = ' '; @@ -117,7 +119,7 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) nXStart = GetSystemMetrics(SM_CXBORDER); nYStart = GetSystemMetrics(SM_CYBORDER); - if (GetWindowLong(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) + if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) clrOldText = SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); else clrOldText = SetTextColor(hdc, GetSysColor(COLOR_WINDOWTEXT)); @@ -127,14 +129,14 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) for (pData = infoPtr->pData + lByteOffset; pData < infoPtr->pData + infoPtr->cbData; pData += infoPtr->nBytesPerLine) { - LPTSTR lpszLine; + LPWSTR lpszLine; LONG nLineLen = min((LONG)((infoPtr->pData + infoPtr->cbData) - pData), infoPtr->nBytesPerLine); lpszLine = HexEdit_GetLineText(pData, nLineLen, infoPtr->nBytesPerLine - nLineLen); /* FIXME: draw hex <-> ASCII mapping highlighted? */ - TextOut(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); + TextOutW(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); nYStart += infoPtr->nHeight; HeapFree(GetProcessHeap(), 0, lpszLine); @@ -157,7 +159,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) INT nByteLinePos = nCaretBytePos % infoPtr->nBytesPerLine; INT nLine = nCaretBytePos / infoPtr->nBytesPerLine; LONG nLineLen = min(infoPtr->cbData - nLine * infoPtr->nBytesPerLine, infoPtr->nBytesPerLine); - LPTSTR lpszLine = HexEdit_GetLineText(infoPtr->pData + nLine * infoPtr->nBytesPerLine, nLineLen, infoPtr->nBytesPerLine - nLineLen); + LPWSTR lpszLine = HexEdit_GetLineText(infoPtr->pData + nLine * infoPtr->nBytesPerLine, nLineLen, infoPtr->nBytesPerLine - nLineLen); INT nCharOffset; /* calculate offset of character caret is on in the line */ @@ -169,7 +171,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) hdc = GetDC(infoPtr->hwndSelf); hOldFont = SelectObject(hdc, infoPtr->hFont); - GetTextExtentPoint32(hdc, lpszLine, nCharOffset, &size); + GetTextExtentPoint32W(hdc, lpszLine, nCharOffset, &size); SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndSelf, hdc); @@ -221,7 +223,7 @@ HexEdit_EnsureVisible(HEXEDIT_INFO *infoPtr, INT nCaretPos) si.fMask = SIF_POS; SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &si, FALSE); - SendMessage(infoPtr->hwndSelf, WM_VSCROLL, MAKELONG(SB_THUMBPOSITION, 0), 0); + SendMessageW(infoPtr->hwndSelf, WM_VSCROLL, MAKELONG(SB_THUMBPOSITION, 0), 0); } @@ -255,7 +257,7 @@ HexEdit_GetData(HEXEDIT_INFO *infoPtr, INT cbData, BYTE *pData) } static inline LRESULT -HexEdit_Char (HEXEDIT_INFO *infoPtr, TCHAR ch) +HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) { INT nCaretBytePos = infoPtr->nCaretPos/2; @@ -349,7 +351,7 @@ HexEdit_Destroy (HEXEDIT_INFO *infoPtr) HeapFree(GetProcessHeap(), 0, infoPtr->pData); /* free info data */ HeapFree(GetProcessHeap(), 0, infoPtr); - SetWindowLongPtr(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, 0, 0); return 0; } @@ -360,12 +362,12 @@ HexEdit_EraseBackground (HEXEDIT_INFO *infoPtr, HDC hdc) HBRUSH hBrush, hSolidBrush = NULL; RECT rc; - if (GetWindowLong(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) + if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); else { - hBrush = (HBRUSH)SendMessage(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + hBrush = (HBRUSH)SendMessageW(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); if (!hBrush) hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } @@ -505,7 +507,7 @@ HexEdit_SetFocus (HEXEDIT_INFO *infoPtr, HWND lostFocus) static inline LRESULT HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) { - TEXTMETRIC tm; + TEXTMETRICW tm; HDC hdc; HFONT hOldFont = NULL; LONG i; @@ -517,7 +519,7 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) if (infoPtr->hFont) hOldFont = SelectObject(hdc, infoPtr->hFont); - GetTextMetrics(hdc, &tm); + GetTextMetricsW(hdc, &tm); infoPtr->nHeight = tm.tmHeight + tm.tmExternalLeading; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -525,9 +527,9 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) for (i = 0; ; i++) { BYTE *pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, i); - LPTSTR lpszLine = HexEdit_GetLineText(pData, i, 0); + LPWSTR lpszLine = HexEdit_GetLineText(pData, i, 0); SIZE size; - GetTextExtentPoint32(hdc, lpszLine, lstrlen(lpszLine), &size); + GetTextExtentPoint32W(hdc, lpszLine, lstrlenW(lpszLine), &size); HeapFree(GetProcessHeap(), 0, lpszLine); HeapFree(GetProcessHeap(), 0, pData); if (size.cx > (rcClient.right - rcClient.left))

1 0

Jacek Caban : mshtml: Moved nsChannel initialization to separated function.
by Alexandre Julliard April 18, 2011

April 18, 2011

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

Andrew Nguyen : regedit: Remove obsolete comments in InitInstance.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 3571ae27a240472a208d744a5853642eaebf169d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3571ae27a240472a208d744a5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:06:38 2011 -0500 regedit: Remove obsolete comments in InitInstance. --- programs/regedit/main.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index f10741b..0bc43e0 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -94,18 +94,6 @@ static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATO return TRUE; } -/******************************************************************************* - * - * - * FUNCTION: InitInstance(HANDLE, int) - * - * PURPOSE: Saves instance handle and creates main window - * - * COMMENTS: - * - * In this function, we save the instance handle in a global variable and - * create and display the main program window. - */ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { @@ -125,9 +113,6 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) HexEdit_Register(); nClipboardFormat = RegisterClipboardFormat(strClipboardFormat); - /* if (nClipboardFormat == 0) { - DWORD dwError = GetLastError(); - } */ hFrameWnd = CreateWindowEx(0, MAKEINTRESOURCE(hFrameWndClass), szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE,

1 0