wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Frédéric Delanoy : inetcpl: Update French translation.
by Alexandre Julliard 18 Apr '11

18 Apr '11

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

Hwang YunSong : inetcpl: Update Korean resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 8673fa90366f26772b0780e8f6c29ff1e16a35a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673fa90366f26772b0780e8f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 15 17:09:59 2011 +0900 inetcpl: Update Korean resource. --- dlls/inetcpl.cpl/cpl_Ko.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ko.rc b/dlls/inetcpl.cpl/cpl_Ko.rc index 615fab5..401e227 100644 --- a/dlls/inetcpl.cpl/cpl_Ko.rc +++ b/dlls/inetcpl.cpl/cpl_Ko.rc @@ -70,6 +70,24 @@ BEGIN END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "보안" +BEGIN + + CONTROL "목록보기", 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 "트랙바", 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

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

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

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

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

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 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: Convert the hex edit code to Unicode.
by Alexandre Julliard 18 Apr '11

18 Apr '11

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

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

18 Apr '11

Module: wine Branch: master Commit: 9b586bc2ee8ac299306717f21a8bd49f2417599b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b586bc2ee8ac299306717f21… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:17 2011 -0500 regedit: Convert the frame window code to Unicode. --- programs/regedit/framewnd.c | 55 ++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c4f4f92..0cdedec 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -105,7 +105,10 @@ static void UpdateMenuItems(HMENU hMenu) { BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPWSTR keyName; - keyName = GetItemPath(hwndTV, TreeView_GetSelection(hwndTV), &hRootKey); + HTREEITEM selection; + + selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + keyName = GetItemPath(hwndTV, selection, &hRootKey); if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ bAllowEdit = TRUE; } @@ -327,10 +330,12 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAMEW *pofn) return TRUE; } -static BOOL import_registry_filename(LPTSTR filename) +static BOOL import_registry_filename(LPWSTR filename) { + static const WCHAR mode_r[] = {'r',0}; + BOOL Success; - FILE* reg_file = fopen(filename, "r"); + FILE* reg_file = _wfopen(filename, mode_r); if(!reg_file) return FALSE; @@ -353,13 +358,8 @@ static BOOL ImportRegistryFile(HWND hWnd) LoadStringW(hInst, IDS_FILEDIALOG_IMPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; if (GetOpenFileNameW(&ofn)) { - CHAR* fileA = GetMultiByteString(ofn.lpstrFile); - if (!import_registry_filename(fileA)) { - /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ - HeapFree(GetProcessHeap(), 0, fileA); + if (!import_registry_filename(ofn.lpstrFile)) return FALSE; - } - HeapFree(GetProcessHeap(), 0, fileA); } else { CheckCommDlgError(hWnd); } @@ -397,8 +397,8 @@ static BOOL PrintRegistryHive(HWND hWnd, LPCWSTR path) #if 1 PRINTDLGW pd; - ZeroMemory(&pd, sizeof(PRINTDLG)); - pd.lStructSize = sizeof(PRINTDLG); + ZeroMemory(&pd, sizeof(PRINTDLGW)); + pd.lStructSize = sizeof(PRINTDLGW); pd.hwndOwner = hWnd; pd.hDevMode = NULL; /* Don't forget to free or store hDevMode*/ pd.hDevNames = NULL; /* Don't forget to free or store hDevNames*/ @@ -555,7 +555,7 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(LOWORD(wParam)) { case IDC_VALUE_NAME: if (HIWORD(wParam) == EN_UPDATE) { - EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLength(hwndValue)>0); + EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLengthW(hwndValue) > 0); return TRUE; } break; @@ -696,11 +696,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); + curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); while(curIndex != -1) { WCHAR* valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); - curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, curIndex, LVNI_SELECTED); + curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, curIndex, MAKELPARAM(LVNI_SELECTED, 0)); if(curIndex != -1 && firstItem) { if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_BOX_TEXT_MULTIPLE), MAKEINTRESOURCEW(IDS_DELETE_BOX_TITLE), @@ -720,7 +720,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HeapFree(GetProcessHeap(), 0, keyPath); } else if (IsChild(g_pChildWnd->hTreeWnd, hWndDelete) || IsChild(g_pChildWnd->hListWnd, hWndDelete)) { - SendMessage(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); + SendMessageW(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); } break; } @@ -738,14 +738,14 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { HTREEITEM hItem; if (LOWORD(wParam) == ID_EDIT_FIND && - DialogBox(0, MAKEINTRESOURCE(IDD_FIND), hWnd, find_dlgproc) != IDOK) + DialogBoxW(0, MAKEINTRESOURCEW(IDD_FIND), hWnd, find_dlgproc) != IDOK) break; if (!*searchString) break; - hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + hItem = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); if (hItem) { - int row = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_FOCUSED); - HCURSOR hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); + int row = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); + HCURSOR hcursorOld = SetCursor(LoadCursorW(NULL, (LPCWSTR)IDC_WAIT)); hItem = FindNext(g_pChildWnd->hTreeWnd, hItem, searchString, searchMask, &row); SetCursor(hcursorOld); if (hItem) { @@ -753,8 +753,15 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) InvalidateRect(g_pChildWnd->hTreeWnd, NULL, TRUE); UpdateWindow(g_pChildWnd->hTreeWnd); if (row != -1) { - ListView_SetItemState(g_pChildWnd->hListWnd, -1, 0, LVIS_FOCUSED|LVIS_SELECTED); - ListView_SetItemState(g_pChildWnd->hListWnd, row, LVIS_FOCUSED|LVIS_SELECTED, LVIS_FOCUSED|LVIS_SELECTED); + LVITEMW item; + + item.state = 0; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, (UINT)-1, (LPARAM)&item); + + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, row, (LPARAM)&item); SetFocus(g_pChildWnd->hListWnd); } else { SetFocus(g_pChildWnd->hTreeWnd); @@ -840,7 +847,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) HKEY hKey; LPWSTR lpKeyPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); if (lpKeyPath) { - if (DialogBox(0, MAKEINTRESOURCE(IDD_ADDFAVORITE), hWnd, addtofavorites_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_ADDFAVORITE), hWnd, addtofavorites_dlgproc) == IDOK) { if (RegCreateKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, NULL, 0, KEY_READ|KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) { @@ -854,7 +861,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } case ID_FAVORITES_REMOVEFAVORITE: { - if (DialogBox(0, MAKEINTRESOURCE(IDD_DELFAVORITE), hWnd, removefavorite_dlgproc) == IDOK) { + if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_DELFAVORITE), hWnd, removefavorite_dlgproc) == IDOK) { HKEY hKey; if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ|KEY_WRITE, &hKey) == ERROR_SUCCESS) { @@ -896,7 +903,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) pts = pt; if(ClientToScreen(g_pChildWnd->hWnd, &pts)) { SetCursorPos(pts.x, pts.y); - SetCursor(LoadCursor(0, IDC_SIZEWE)); + SetCursor(LoadCursorW(0, (LPCWSTR)IDC_SIZEWE)); SendMessageW(g_pChildWnd->hWnd, WM_LBUTTONDOWN, 0, MAKELPARAM(pt.x, pt.y)); } return TRUE;

1 0

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

18 Apr '11

Module: wine Branch: master Commit: 8f0bc1e2ed31158af0b43571c55ac28784a262c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0bc1e2ed31158af0b43571c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:07:13 2011 -0500 regedit: Convert the edit code to Unicode. --- programs/regedit/edit.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d9f4005..57edbb5 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -106,13 +106,16 @@ static void error_code_messagebox(HWND hwnd, DWORD error_code) static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { - TCHAR buf[128]; + static const WCHAR percent_u[] = {'%','u',0}; + static const WCHAR percent_x[] = {'%','x',0}; + + WCHAR buf[128]; DWORD val; - if (!GetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; - if (!_stscanf(buf, toHex ? "%u" : "%x", &val)) return FALSE; - wsprintf(buf, toHex ? "%x" : "%u", val); - return SetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf); + if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; + if (!swscanf(buf, toHex ? percent_u : percent_x, &val)) return FALSE; + wsprintfW(buf, toHex ? percent_x : percent_u, val); + return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); } static INT_PTR CALLBACK modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -163,18 +166,18 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara switch(uMsg) { case WM_INITDIALOG: params = (struct edit_params *)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (ULONG_PTR)params); + SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); if (params->lpszValueName) SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->lpszValueName); else SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); - SendDlgItemMessage(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); + SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->cbData, (LPARAM)params->pData); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - params = (struct edit_params *)GetWindowLongPtr(hwndDlg, DWLP_USER); - cbData = SendDlgItemMessage(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); + params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); + cbData = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); pData = HeapAlloc(GetProcessHeap(), 0, cbData); if (pData) @@ -263,7 +266,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) goto done; } - if (!LoadStringW(GetModuleHandle(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; /* try to find out a name for the newly create key (max 100 times) */ for (keyNum = 1; keyNum < 100; keyNum++) { @@ -330,7 +333,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) params.lpszValueName = valueName; params.pData = stringValueData; params.cbData = len; - result = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_EDIT_BINARY), hwnd, + result = DialogBoxParamW(NULL, MAKEINTRESOURCEW(IDD_EDIT_BINARY), hwnd, bin_modify_dlgproc, (LPARAM)&params); } else if ( type == REG_MULTI_SZ ) { WCHAR char1 = '\r', char2 = '\n'; @@ -467,7 +470,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW return FALSE; } - if (!LoadStringW(GetModuleHandle(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; + if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; /* try to find out a name for the newly create key (max 100 times) */ for (valueNum = 1; valueNum < 100; valueNum++) {

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011