August 2009 - Wine-Commits - list.winehq.org

Paul Vriens : gphoto2.ds: Add the UTF-8 pragma for the Danish resources.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 5fc0ccec93ea29aac102548df15853df5a4f5f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc0ccec93ea29aac102548df… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 19:58:41 2009 +0200 gphoto2.ds: Add the UTF-8 pragma for the Danish resources. --- dlls/gphoto2.ds/gphoto2_Da.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Da.rc b/dlls/gphoto2.ds/gphoto2_Da.rc index c18b77a..5f6c126 100644 --- a/dlls/gphoto2.ds/gphoto2_Da.rc +++ b/dlls/gphoto2.ds/gphoto2_Da.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273

1 0

Paul Vriens : xcopy: Add the UTF-8 pragma.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 33f6ed46b62895f12f3dd6a3deaf080e8df8d0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f6ed46b62895f12f3dd6a3d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 19:36:07 2009 +0200 xcopy: Add the UTF-8 pragma. --- programs/xcopy/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Nl.rc b/programs/xcopy/Nl.rc index b9db305..4f5dee5 100644 --- a/programs/xcopy/Nl.rc +++ b/programs/xcopy/Nl.rc @@ -21,6 +21,8 @@ #include "xcopy.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE

1 0

Paul Vriens : appwiz.cpl: Fix Dutch translations.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 6704b44b46a4e7f5a8ef273e7647fc36f27850b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6704b44b46a4e7f5a8ef273e7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 15:52:45 2009 +0200 appwiz.cpl: Fix Dutch translations. --- dlls/appwiz.cpl/Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 34704ec..7a16931 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -40,7 +40,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Installatie-programma's\0*instal*.exe;*setup*.exe;*.msi\0Programma's (*.exe)\0*.exe\0Alle bestanden (*.*)\0*.*\0\0" IDS_REMOVE, "&Verwijderen..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Wijzigen/Verwijderen..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -54,9 +54,9 @@ FONT 8, "MS Shell Dlg" CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Wijzigen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 78, 198, 76, 14 + CONTROL "&Wijzigen...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 198, 68, 14 + CONTROL "&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 230, 198, 82, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Paul Vriens : gphoto2.ds: Remove an used MENU entry from the resources.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 1778338ab2b0efb9cb9668300f3033b6c8265251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1778338ab2b0efb9cb9668300… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 14:13:17 2009 +0200 gphoto2.ds: Remove an used MENU entry from the resources. --- dlls/gphoto2.ds/gphoto2_Da.rc | 1 - dlls/gphoto2.ds/gphoto2_De.rc | 1 - dlls/gphoto2.ds/gphoto2_En.rc | 1 - dlls/gphoto2.ds/gphoto2_Es.rc | 1 - dlls/gphoto2.ds/gphoto2_Fr.rc | 1 - dlls/gphoto2.ds/gphoto2_Ko.rc | 1 - dlls/gphoto2.ds/gphoto2_Lt.rc | 1 - dlls/gphoto2.ds/gphoto2_Nl.rc | 1 - dlls/gphoto2.ds/gphoto2_No.rc | 1 - dlls/gphoto2.ds/gphoto2_Pl.rc | 1 - dlls/gphoto2.ds/gphoto2_Pt.rc | 1 - dlls/gphoto2.ds/gphoto2_Ru.rc | 1 - dlls/gphoto2.ds/gphoto2_Si.rc | 1 - dlls/gphoto2.ds/gphoto2_Sv.rc | 1 - dlls/gphoto2.ds/gphoto2_Zh.rc | 2 -- 15 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Da.rc b/dlls/gphoto2.ds/gphoto2_Da.rc index 8859398..c18b77a 100644 --- a/dlls/gphoto2.ds/gphoto2_Da.rc +++ b/dlls/gphoto2.ds/gphoto2_Da.rc @@ -26,7 +26,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Filer på kamera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_De.rc b/dlls/gphoto2.ds/gphoto2_De.rc index ab1f9d2..25e5307 100644 --- a/dlls/gphoto2.ds/gphoto2_De.rc +++ b/dlls/gphoto2.ds/gphoto2_De.rc @@ -28,7 +28,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Dateien auf der Kamera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_En.rc b/dlls/gphoto2.ds/gphoto2_En.rc index 37577e8..fef5dce 100644 --- a/dlls/gphoto2.ds/gphoto2_En.rc +++ b/dlls/gphoto2.ds/gphoto2_En.rc @@ -26,7 +26,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Files on Camera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc index 3f377fd..c4fad9e 100644 --- a/dlls/gphoto2.ds/gphoto2_Es.rc +++ b/dlls/gphoto2.ds/gphoto2_Es.rc @@ -29,7 +29,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ficheros de la cámara" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Fr.rc b/dlls/gphoto2.ds/gphoto2_Fr.rc index 39267e3..f873ad9 100644 --- a/dlls/gphoto2.ds/gphoto2_Fr.rc +++ b/dlls/gphoto2.ds/gphoto2_Fr.rc @@ -30,7 +30,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Fichiers sur l'appareil photo" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Ko.rc b/dlls/gphoto2.ds/gphoto2_Ko.rc index 8ea0a19..7f83d25 100644 --- a/dlls/gphoto2.ds/gphoto2_Ko.rc +++ b/dlls/gphoto2.ds/gphoto2_Ko.rc @@ -27,7 +27,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ī�޶�� ʸ�" -MENU 20545 FONT 9, "MS Shell Dlg" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Lt.rc b/dlls/gphoto2.ds/gphoto2_Lt.rc index c87dd77..212564f 100644 --- a/dlls/gphoto2.ds/gphoto2_Lt.rc +++ b/dlls/gphoto2.ds/gphoto2_Lt.rc @@ -29,7 +29,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Failai kameroje" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc index 83acb70..39bcdf2 100644 --- a/dlls/gphoto2.ds/gphoto2_Nl.rc +++ b/dlls/gphoto2.ds/gphoto2_Nl.rc @@ -26,7 +26,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Bestanden op de camera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_No.rc b/dlls/gphoto2.ds/gphoto2_No.rc index 7cc0176..3dbd219 100644 --- a/dlls/gphoto2.ds/gphoto2_No.rc +++ b/dlls/gphoto2.ds/gphoto2_No.rc @@ -26,7 +26,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Filer p� kamera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Pl.rc b/dlls/gphoto2.ds/gphoto2_Pl.rc index 4177328..c1e3e85 100644 --- a/dlls/gphoto2.ds/gphoto2_Pl.rc +++ b/dlls/gphoto2.ds/gphoto2_Pl.rc @@ -27,7 +27,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Pliki w aparacie" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc index 7e131f3..284f557 100644 --- a/dlls/gphoto2.ds/gphoto2_Pt.rc +++ b/dlls/gphoto2.ds/gphoto2_Pt.rc @@ -28,7 +28,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ficheiros na Câmara" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Ru.rc b/dlls/gphoto2.ds/gphoto2_Ru.rc index 563b0af..4cef307 100644 --- a/dlls/gphoto2.ds/gphoto2_Ru.rc +++ b/dlls/gphoto2.ds/gphoto2_Ru.rc @@ -28,7 +28,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Файлы в камере" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "Список1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 diff --git a/dlls/gphoto2.ds/gphoto2_Si.rc b/dlls/gphoto2.ds/gphoto2_Si.rc index 2f1179d..d6e1f79 100644 --- a/dlls/gphoto2.ds/gphoto2_Si.rc +++ b/dlls/gphoto2.ds/gphoto2_Si.rc @@ -28,7 +28,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Datoteke na kameri" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 diff --git a/dlls/gphoto2.ds/gphoto2_Sv.rc b/dlls/gphoto2.ds/gphoto2_Sv.rc index c7a3772..1c3593b 100644 --- a/dlls/gphoto2.ds/gphoto2_Sv.rc +++ b/dlls/gphoto2.ds/gphoto2_Sv.rc @@ -26,7 +26,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Filer p� kamera" -MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | diff --git a/dlls/gphoto2.ds/gphoto2_Zh.rc b/dlls/gphoto2.ds/gphoto2_Zh.rc index dfc758a..a251fce 100644 --- a/dlls/gphoto2.ds/gphoto2_Zh.rc +++ b/dlls/gphoto2.ds/gphoto2_Zh.rc @@ -29,7 +29,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "照相机中的文件" -MENU 20545 FONT 9, "MS Shell Dlg" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | @@ -65,7 +64,6 @@ IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "照相機中的檔案" -MENU 20545 FONT 9, "MS Shell Dlg" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER |

1 0

Paul Vriens : wininet: Avoid potential NULL dereferences (Coverity).
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: fededdd2d7a27afa9bc04aabb9aa4498018a2ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=fededdd2d7a27afa9bc04aabb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 30 13:48:31 2009 +0200 wininet: Avoid potential NULL dereferences (Coverity). --- dlls/wininet/dialogs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index d66e7e3..2c4a527 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -70,7 +70,7 @@ static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if (NULL == lpwhr) - goto done; + return FALSE; lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs) @@ -107,7 +107,7 @@ static BOOL WININET_GetServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) lpwhr = (http_request_t*) WININET_GetObject( hRequest ); if (NULL == lpwhr) - goto done; + return FALSE; lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs)

1 0

Rein Klazes : comdlg32: Set MAXTEXTROWS of the toolbar in the file dialog to zero.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 1f825a3631c78ac08383dd6062005526fc9c483d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f825a3631c78ac08383dd606… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jul 28 12:19:20 2009 +0200 comdlg32: Set MAXTEXTROWS of the toolbar in the file dialog to zero. --- dlls/comdlg32/filedlg.c | 1 + dlls/comdlg32/tests/filedlg.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 041d75c..6abdb26 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1383,6 +1383,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* FIXME: use TB_LOADIMAGES when implemented */ /* SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/ + SendMessageW(fodInfos->DlgInfos.hwndTB, TB_SETMAXTEXTROWS, 0, 0); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]); SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 2bef8ce..d18065a 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -29,6 +29,29 @@ /* ##### */ +static void toolbarcheck( HWND hDlg) +{ + /* test toolbar properties */ + /* bug #10532 */ + int maxtextrows; + HWND ctrl; + DWORD ret; + char classname[20]; + + for( ctrl = GetWindow( hDlg, GW_CHILD); + ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) { + GetClassName( ctrl, classname, 10); + classname[7] = '\0'; + if( !strcmp( classname, "Toolbar")) break; + } + ok( ctrl != NULL, "could not get the toolbar control\n"); + ret = SendMessage( ctrl, TB_ADDSTRING, 0, (LPARAM)"winetestwinetest\0\0"); + ok( ret == 0, "addstring returned %d (expected 0)\n", ret); + maxtextrows = SendMessage( ctrl, TB_GETTEXTROWS, 0, 0); + ok( maxtextrows == 0, "Get(Max)TextRows returned %d (expected 0)\n", maxtextrows); +} + + static UINT_PTR CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { LPNMHDR nmh; @@ -49,6 +72,7 @@ static UINT_PTR CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM ok(ret > 0, "CMD_GETFOLDERIDLIST not implemented\n"); if (ret > 5) ok(buf[0] == 0x66 && buf[1] == 0x66, "CMD_GETFOLDERIDLIST: The buffer was touched on failure\n"); + toolbarcheck( GetParent(hDlg)); } }

1 0

Vladimir Pankratov : shlwapi: Convert the Russian resources to UTF-8.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: d61889ab7c43ff3b610a306227d73cfb306596a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61889ab7c43ff3b610a30622… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 28 15:36:07 2009 +0500 shlwapi: Convert the Russian resources to UTF-8. --- dlls/shlwapi/shlwapi_Ru.rc | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ru.rc b/dlls/shlwapi/shlwapi_Ru.rc index 47479e2..42a5c38 100644 --- a/dlls/shlwapi/shlwapi_Ru.rc +++ b/dlls/shlwapi/shlwapi_Ru.rc @@ -20,26 +20,29 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��!" +CAPTION "Ошибка!" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "�� &�� ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Больше не &показывать это сообщение", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"�&��" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&��" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&��" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"О&тменить" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Да" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Нет" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld ��" - IDS_TIME_INTERVAL_HOURS " ��" - IDS_TIME_INTERVAL_MINUTES " ��" - IDS_TIME_INTERVAL_SECONDS " ��" + IDS_BYTES_FORMAT "%ld байт" + IDS_TIME_INTERVAL_HOURS " час" + IDS_TIME_INTERVAL_MINUTES " мин" + IDS_TIME_INTERVAL_SECONDS " сек" }

1 0

Vladimir Pankratov : user32: Convert the Russian resources to UTF-8.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: c8eeb725883988b108c4e15cd006d8a1c428441e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8eeb725883988b108c4e15cd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 28 15:36:14 2009 +0500 user32: Convert the Russian resources to UTF-8. --- dlls/user32/resources/user32_Ru.rc | 53 +++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/user32/resources/user32_Ru.rc b/dlls/user32/resources/user32_Ru.rc index f3bfe0f..7621d25 100644 --- a/dlls/user32/resources/user32_Ru.rc +++ b/dlls/user32/resources/user32_Ru.rc @@ -18,33 +18,36 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { - MENUITEM "&��", 61728 - MENUITEM "&��", 61456 - MENUITEM "��&��", 61440 - MENUITEM "&��", 61472 - MENUITEM "&��", 61488 + MENUITEM "&Восстановить", 61728 + MENUITEM "&Переместить", 61456 + MENUITEM "Раз&мер", 61440 + MENUITEM "&Свернуть", 61472 + MENUITEM "&Развернуть", 61488 MENUITEM SEPARATOR - MENUITEM "&��\tAlt-F4", 61536 + MENUITEM "&Закрыть\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "&� �� Wine...", 61761 + MENUITEM "&О проекте Wine...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { POPUP "" BEGIN - MENUITEM "&��", EM_UNDO + MENUITEM "&Отменить", EM_UNDO MENUITEM SEPARATOR - MENUITEM "&��", WM_CUT - MENUITEM "&��", WM_COPY - MENUITEM "��&��", WM_PASTE - MENUITEM "&��", WM_CLEAR + MENUITEM "&Вырезать", WM_CUT + MENUITEM "&Копировать", WM_COPY + MENUITEM "Вст&авить", WM_PASTE + MENUITEM "&Удалить", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "�� &��", EM_SETSEL + MENUITEM "Выделить в&се", EM_SETSEL END } @@ -54,15 +57,15 @@ BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "�&��", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&��", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "��&��", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&��", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&��", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&��", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "��&��", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "�&��", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "��", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "О&тмена", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Отменить", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "По&втор", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Пропустить", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Да", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Нет", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "По&вторить", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "П&роложить", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Помощь", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 @@ -72,12 +75,12 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 - PUSHBUTTON "��", IDCANCEL, 120, 100, 35, 14 + PUSHBUTTON "Отменить", IDCANCEL, 120, 100, 35, 14 END STRINGTABLE DISCARDABLE { - IDS_ERROR "��" - IDS_MDI_MOREWINDOWS "&�� ..." + IDS_ERROR "ОШИБКА" + IDS_MDI_MOREWINDOWS "&Ещё окна..." }

1 0

Vladimir Pankratov : wineps.drv: Convert the Russian resources to UTF-8.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 81b57f3f8dc7eac518610949e8f6fcc8d1c3c98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b57f3f8dc7eac518610949e… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 28 15:36:23 2009 +0500 wineps.drv: Convert the Russian resources to UTF-8. --- dlls/wineps.drv/wps_Ru.rc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/wps_Ru.rc b/dlls/wineps.drv/wps_Ru.rc index 5250407..246fdd6 100644 --- a/dlls/wineps.drv/wps_Ru.rc +++ b/dlls/wineps.drv/wps_Ru.rc @@ -18,24 +18,25 @@ #include "psdlg.h" -/* Russian strings in cp1251 */ +/* UTF-8 */ +#pragma code_page(65001) LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE -CAPTION "��" +CAPTION "Бумага" FONT 8, "MS Shell Dlg" { - LTEXT "&�� :", -1, 10, 6, 200, 8 + LTEXT "&Размер бумаги:", -1, 10, 6, 200, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "��", -1, 10, 80, 200, 50 - CONTROL "&��", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + GROUPBOX "Ориентация", -1, 10, 80, 200, 50 + CONTROL "&Книжная", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 180, 10 - CONTROL "&��", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "&Альбомная", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 180, 10 - LTEXT "2-� �� :", IDD_DUPLEX_NAME, 10, 140, 200, 8 + LTEXT "2-х сторонняя печать:", IDD_DUPLEX_NAME, 10, 140, 200, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Vladimir Pankratov : wininet: Convert the Russian resources to UTF-8.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: b6ac03a9a7ab080c241eed56a726b9c1f569e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ac03a9a7ab080c241eed56a… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 28 15:36:31 2009 +0500 wininet: Convert the Russian resources to UTF-8. --- dlls/wininet/wininet_Ru.rc | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/wininet_Ru.rc b/dlls/wininet/wininet_Ru.rc index dd8bc85..0e09f84 100644 --- a/dlls/wininet/wininet_Ru.rc +++ b/dlls/wininet/wininet_Ru.rc @@ -20,29 +20,32 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Ввод сетевого пароля" FONT 8, "MS Shell Dlg" { - LTEXT "�� :", -1, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��", -1, 40, 86, 50, 10 + LTEXT "Введите имя пользователя и пароль:", -1, 40, 6, 150, 15 + LTEXT "Прокси", -1, 40, 26, 50, 10 + LTEXT "Домен", -1, 40, 46, 50, 10 + LTEXT "Пользователь", -1, 40, 66, 50, 10 + LTEXT "Пароль", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&�� (��)", IDC_SAVEPASSWORD, + CHECKBOX "&Сохранить этот пароль (небезопасно)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Отмена", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE DISCARDABLE { - IDS_LANCONNECTION "�� " + IDS_LANCONNECTION "Сетевое подключение" }

1 0