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

Gustavo Henrique Milaré : oleacc: Fix Portuguese (Brazilian) translation.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 9485026baf44239b23623427ed4796d805a17561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9485026baf44239b23623427e… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 16:57:52 2010 -0300 oleacc: Fix Portuguese (Brazilian) translation. --- dlls/oleacc/oleacc_Pt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleacc/oleacc_Pt.rc b/dlls/oleacc/oleacc_Pt.rc index 9620840..769039a 100644 --- a/dlls/oleacc/oleacc_Pt.rc +++ b/dlls/oleacc/oleacc_Pt.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { - 0 "objecto desconhecido" /* undocumented */ + 0 "objeto desconhecido" /* undocumented */ ROLE_SYSTEM_TITLEBAR "barra de título" ROLE_SYSTEM_MENUBAR "barra de menu" ROLE_SYSTEM_SCROLLBAR "barra de rolagem"

1 0

Gustavo Henrique Milaré : winspool.drv: Update Portuguese (Brazilian) translation.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: 906aa5c9040b1ff8ef10a15529c2db2fee9bd964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906aa5c9040b1ff8ef10a1552… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Jul 1 17:06:56 2010 -0300 winspool.drv: Update Portuguese (Brazilian) translation. --- dlls/winspool.drv/Pt.rc | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/Pt.rc b/dlls/winspool.drv/Pt.rc index 02b883a..098dbbd 100644 --- a/dlls/winspool.drv/Pt.rc +++ b/dlls/winspool.drv/Pt.rc @@ -2,6 +2,7 @@ * Portuguese resources for winspool * * Copyright 2008 Ricardo Filipe + * Copyright 2010 Gustavo Henrique Milaré * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +21,22 @@ #include "wspool.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Imprimir para Arquivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nome do Arquivo de Destino:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION @@ -33,9 +49,21 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Porta Local" + IDS_FILE_EXISTS "O arquivo de destino já existe. Clique OK para sobrescrever." + IDS_CANNOT_OPEN "Impossível criar o arquivo de destino." +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + STRINGTABLE DISCARDABLE { IDS_CAPTION "Porta Local" - IDS_FILE_EXISTS "O ficheiro de destino j� existe. Clique OK para reescrever." - IDS_CANNOT_OPEN "Imposs�vel criar o ficheiro de destino." + IDS_FILE_EXISTS "O ficheiro de destino já existe. Clique OK para reescrever." + IDS_CANNOT_OPEN "Impossível criar o ficheiro de destino." }

1 0

Austin English : wininet: Avoid size_t in ERR().
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: eff0aeccef18451088a90e37fdd305878961c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff0aeccef18451088a90e37f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 1 13:02:01 2010 -0500 wininet: Avoid size_t in ERR(). --- dlls/wininet/cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 75cf049..7dfd2a8 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -431,7 +431,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST value = data = heap_strdupW(cookie_data); if (!data) { - ERR("could not allocate %zu bytes for the cookie data buffer\n", (strlenW(cookie_data) + 1) * sizeof(WCHAR)); + ERR("could not allocate the cookie data buffer\n"); return FALSE; } @@ -457,7 +457,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST if (value == NULL) { HeapFree(GetProcessHeap(), 0, data); - ERR("could not allocate %zu bytes for the cookie value buffer\n", (ptr - data) * sizeof(WCHAR)); + ERR("could not allocate the cookie value buffer\n"); return FALSE; } strcpyW(value, data);

1 0

André Hentschel : winecfg: Remove BS_DEFPUSHBUTTON style for AddDll.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: wine Branch: master Commit: afdc767cd383caca16cfa34bc14133e9433d223d URL: http://source.winehq.org/git/wine.git/?a=commit;h=afdc767cd383caca16cfa34bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 18:38:23 2010 +0200 winecfg: Remove BS_DEFPUSHBUTTON style for AddDll. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- 23 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afdc767cd383caca16cfa…

1 0

André Hentschel : winetest: There is no ' pass also-todo'.
by Alexandre Julliard July 2, 2010

July 2, 2010

Module: tools Branch: master Commit: 31c80ed24d8a76d58092722baf336dfb1025c818 URL: http://source.winehq.org/git/tools.git/?a=commit;h=31c80ed24d8a76d58092722b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 20:01:11 2010 +0200 winetest: There is no 'pass also-todo'. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index ce3b530..6cfc954 100755 --- a/winetest/gather +++ b/winetest/gather @@ -403,7 +403,7 @@ my $legend = Some tests fail in some reports. Some tests fail in all reports. This border signals that some tests are skipped. -This border and this background signal that the implementation needs some work. +This border and this background signal that the implementation needs some work. </div>"; sub min_to_max($)

1 0

André Hentschel : include: Add some SYSDBG_COMMANDs.
by Alexandre Julliard July 1, 2010

July 1, 2010

Module: wine Branch: master Commit: f2b874ffae693d667eec0768ac4afa7c3c73cdfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b874ffae693d667eec0768a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 1 16:44:18 2010 +0200 include: Add some SYSDBG_COMMANDs. --- include/winternl.h | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 39a034b..ee3dd98 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1886,7 +1886,21 @@ typedef enum _SYSDBG_COMMAND { SysDbgSetTracepoint, SysDbgSetSpecialCall, SysDbgClearSpecialCalls, - SysDbgQuerySpecialCalls + SysDbgQuerySpecialCalls, + SysDbgBreakPoint, + SysDbgQueryVersion, + SysDbgReadVirtual, + SysDbgWriteVirtual, + SysDbgReadPhysical, + SysDbgWritePhysical, + SysDbgReadControlSpace, + SysDbgWriteControlSpace, + SysDbgReadIoSpace, + SysDbgWriteIoSpace, + SysDbgReadMsr, + SysDbgWriteMsr, + SysDbgReadBusData, + SysDbgWriteBusData } SYSDBG_COMMAND, *PSYSDBG_COMMAND;

1 0

Dmitry Timoshkov : comdlg32: Not all messages depend on initialized custom choose font dialog data.
by Alexandre Julliard July 1, 2010

July 1, 2010

Module: wine Branch: master Commit: 542be258b380dd6e3c70d2102633a9a9a2c4a76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=542be258b380dd6e3c70d2102… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 1 20:45:16 2010 +0900 comdlg32: Not all messages depend on initialized custom choose font dialog data. --- dlls/comdlg32/fontdlg.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 80f1ad9..ad580d5 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -782,7 +782,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( SYSTEM_FONT)); + hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -905,6 +905,8 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO HDC hdc; LPLOGFONTW lpxx=lpcf->lpLogFont; + if (!lpcf) return FALSE; + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { @@ -1071,6 +1073,8 @@ static LRESULT CFn_WMDestroy(HWND hwnd, LPCHOOSEFONTW lpcfw) LPLOGFONTA lpLogFonta; int len; + if (!lpcfw) return FALSE; + lpcfa = GetPropW(hwnd, strWineFontData_a); lpLogFonta = lpcfa->lpLogFont; lpszStyle = lpcfa->lpszStyle; @@ -1098,6 +1102,8 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE { WINDOWINFO info; + if (!lpcf) return FALSE; + info.cbSize=sizeof(info); if( GetWindowInfo( GetDlgItem( hDlg, stc5), &info ) ) { @@ -1156,9 +1162,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, if (uMsg!=WM_INITDIALOG) { lpcfw = GetPropW(hDlg, strWineFontData); - if (!lpcfw) - return FALSE; - if (CFn_HookCallChk32(lpcfw)) + if (lpcfw && CFn_HookCallChk32(lpcfw)) res=CallWindowProcA((WNDPROC)lpcfw->lpfnHook, hDlg, uMsg, wParam, lParam); if (res) return res; @@ -1218,9 +1222,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, if (uMsg!=WM_INITDIALOG) { lpcf= GetPropW(hDlg, strWineFontData); - if (!lpcf) - return FALSE; - if (CFn_HookCallChk32(lpcf)) + if (lpcf && CFn_HookCallChk32(lpcf)) res=CallWindowProcW((WNDPROC)lpcf->lpfnHook, hDlg, uMsg, wParam, lParam); if (res) return res;

1 0

Austin English : user32: Fix a compiler warning on mingw.
by Alexandre Julliard July 1, 2010

July 1, 2010

Module: wine Branch: master Commit: 71fb0068af04d33d106c8c7ec9e4b4746e8fc70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fb0068af04d33d106c8c7ec… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 1 10:20:33 2010 -0500 user32: Fix a compiler warning on mingw. --- dlls/user32/sysparams.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e6d2386..3d4075f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -941,11 +941,7 @@ void SYSPARAMS_Init(void) } /* last chance, take the default */ - if (!bOk) - { - int iNumColors = sscanf( DefSysColors[i*2+1], " %d %d %d", &r, &g, &b ); - assert (iNumColors==3); - } + if (!bOk) sscanf( DefSysColors[i*2+1], " %d %d %d", &r, &g, &b ); SYSPARAMS_SetSysColor( i, RGB(r,g,b) ); }

1 0

Piotr Caban : wininet: Remove get_avail_data check from HTTPREQ_ReadFileExA .
by Alexandre Julliard July 1, 2010

July 1, 2010

Module: wine Branch: master Commit: 898531de80511662ffa61bd93189870bf09ac905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898531de80511662ffa61bd93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 1 13:10:46 2010 +0200 wininet: Remove get_avail_data check from HTTPREQ_ReadFileExA. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4b4bc5b..54895bb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2160,7 +2160,7 @@ static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - if ((hdr->dwFlags & INTERNET_FLAG_ASYNC) && !get_avail_data(req)) + if (hdr->dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest;

1 0

Igor Paliychuk : comdlg32: Ukrainian translation update.
by Alexandre Julliard July 1, 2010

July 1, 2010

Module: wine Branch: master Commit: 4ab5328934e95a70eda14a9424a694ee32acf211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab5328934e95a70eda14a942… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 1 10:42:51 2010 +0300 comdlg32: Ukrainian translation update. --- dlls/comdlg32/cdlg_Uk.rc | 92 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 71 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index 730d610..14a8f1d 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -1,6 +1,8 @@ /* * Copyright 2004 Ilya Korniyko * + * Copyright 2010 Igor Paliychuk + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -41,7 +43,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&��:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "³��", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -63,7 +65,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&��:", 1091, 110, 104, 92, 9 COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "�� ", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP } @@ -81,7 +83,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "�&�� ", 1057, 16, 60, 60, 12 RADIOBUTTON "&��", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "��", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&�:", 1090, 60, 80, 30, 9 LTEXT "&��:", 1091, 120, 80, 30, 9 @@ -103,7 +105,7 @@ FONT 8, "MS Shell Dlg" RADIOBUTTON "&�� ", 1057, 16, 50, 80, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "��", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&��", 1058, 50, 100, 40, 12 @@ -133,7 +135,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&��" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "��",1072,6,72,84,34,WS_GROUP @@ -176,7 +178,7 @@ FONT 8, "MS Shell Dlg" CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1038,100,166, 44, 14 PUSHBUTTON "&�� ", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&�� >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP @@ -198,7 +200,7 @@ FONT 8, "MS Shell Dlg" CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 DEFPUSHBUTTON "�&�� ", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -218,7 +220,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "�&�� ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&��", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "�� &��", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "³��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP } @@ -229,7 +231,7 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "³��", IDCANCEL, 232,164, 48,14, WS_GROUP + PUSHBUTTON "��", IDCANCEL, 232,164, 48,14, WS_GROUP PUSHBUTTON "&��", pshHelp, 50, 161, 48,14, WS_GROUP GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -269,7 +271,7 @@ CAPTION " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "³��",IDCANCEL,232,156,48,14 + PUSHBUTTON "��",IDCANCEL,232,156,48,14 /* PUSHBUTTON "ѳ��...", psh5, 284,156,48,14 */ GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP @@ -297,6 +299,36 @@ BEGIN CONTROL "�&��", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "��", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&��:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "��&��:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "��", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "�&��", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "��&��", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "��", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "�&��:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "�&��:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "��", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "�&��...", psh3, 184, 220, 48, 14 +END + NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "³��" @@ -317,7 +349,7 @@ FONT 8, "MS Shell Dlg" CONTROL "�� &��",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 DEFPUSHBUTTON "&³��", IDOK,222,110,50,14 - PUSHBUTTON "³��", IDCANCEL,222,128,50,14 + PUSHBUTTON "��", IDCANCEL,222,128,50,14 PUSHBUTTON "&��", pshHelp,222,145,50,14 } @@ -376,9 +408,9 @@ STRINGTABLE DISCARDABLE PD32_OUT_OF_MEMORY "�� '��" PD32_GENERIC_ERROR "��(�) ��(�)" PD32_DRIVER_UNKNOWN "�� " - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� \ +�� . \ +�� ." PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d �� " @@ -414,22 +446,40 @@ Please install one and retry." PD32_PRINTER_STATUS_POWER_SAVE "�� ; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "��" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "��" + IDS_FONT_BOLD_ITALIC "�� " +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "��" - IDS_COLOR_MAROON "��" + IDS_COLOR_MAROON "��" IDS_COLOR_GREEN "��" IDS_COLOR_OLIVE "��" IDS_COLOR_NAVY "��" - IDS_COLOR_PURPLE "��" - IDS_COLOR_TEAL "��-��" + IDS_COLOR_PURPLE "��" + IDS_COLOR_TEAL "��-��" IDS_COLOR_GRAY "ѳ��" - IDS_COLOR_SILVER "��" + IDS_COLOR_SILVER "��" IDS_COLOR_RED "��" IDS_COLOR_LIME "��" IDS_COLOR_YELLOW "��" - IDS_COLOR_BLUE "��" - IDS_COLOR_FUCHSIA "Գ��" - IDS_COLOR_AQUA "��" + IDS_COLOR_BLUE "��" + IDS_COLOR_FUCHSIA "��" + IDS_COLOR_AQUA "��" IDS_COLOR_WHITE "��" } + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "�� %d - %d ��." + IDS_SAVE_BUTTON "&��" + IDS_SAVE_IN "�� &�:" + IDS_SAVE "��" + IDS_SAVE_AS "�� " + IDS_OPEN_FILE "³�� " +}

1 0