Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 29069: - Move W32CLTINFO_TEB structure out of NDK, since it's module-internal structure. - Add a define for easier accessing this field.
by fireball＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: fireball Date: Sun Sep 16 21:37:41 2007 New Revision: 29069 URL: http://svn.reactos.org/svn/reactos?rev=29069&view=rev Log: - Move W32CLTINFO_TEB structure out of NDK, since it's module-internal structure. - Add a define for easier accessing this field. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Sun Sep 16 21:37:41 2007 @@ -675,21 +675,6 @@ } GDI_TEB_BATCH, *PGDI_TEB_BATCH; // -// Window Client Information structure -// -typedef struct _W32CLTINFO_TEB -{ - ULONG Win32ClientInfo0[2]; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG Win32ClientInfo1[5]; - HWND hWND; - PVOID pvWND; - ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, *PW32CLTINFO_TEB; - -// // Initial TEB // typedef struct _INITIAL_TEB @@ -748,7 +733,7 @@ ULONG GdiClientPID; ULONG GdiClientTID; PVOID GdiThreadLocalInfo; - W32CLTINFO_TEB Win32ClientInfo; + ULONG Win32ClientInfo[62]; PVOID glDispatchTable[0xE9]; ULONG glReserved1[0x1D]; PVOID glReserved2; Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h Sun Sep 16 21:37:41 2007 @@ -8,5 +8,19 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); +/* Window Client Information structure */ +typedef struct _W32CLTINFO_TEB +{ + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLTINFO_TEB, *PW32CLTINFO_TEB; + +#define GetWin32ClientInfo() (PW32CLTINFO_TEB)(NtCurrentTeb()->Win32ClientInfo) #endif /* __WIN32K_MISC_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Sun Sep 16 21:37:41 2007 @@ -116,22 +116,22 @@ { HWND hWndS = *hWnd; PWINDOW_OBJECT Window = UserGetWindowObject(*hWnd); - PTEB Teb = NtCurrentTeb(); - - *hWnd = Teb->Win32ClientInfo.hWND; - *pWnd = Teb->Win32ClientInfo.pvWND; - - Teb->Win32ClientInfo.hWND = hWndS; - Teb->Win32ClientInfo.pvWND = (PVOID) Window; + PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + + *hWnd = ClientInfo->hWND; + *pWnd = ClientInfo->pvWND; + + ClientInfo->hWND = hWndS; + ClientInfo->pvWND = (PVOID) Window; } static VOID IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd) { - PTEB Teb = NtCurrentTeb(); - - Teb->Win32ClientInfo.hWND = hWnd; - Teb->Win32ClientInfo.pvWND = pWnd; + PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + + ClientInfo->hWND = hWnd; + ClientInfo->pvWND = pWnd; } /* FUNCTIONS *****************************************************************/

1 0

[jimtabor] 29068: Fix def and size for NtUserValidateHandleSecure.
by jimtabor＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: jimtabor Date: Sun Sep 16 19:32:58 2007 New Revision: 29068 URL: http://svn.reactos.org/svn/reactos?rev=29068&view=rev Log: Fix def and size for NtUserValidateHandleSecure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sun Sep 16 19:32:58 2007 @@ -2002,10 +2002,11 @@ DWORD Unknown1, DWORD Unknown2); -DWORD +BOOL NTAPI NtUserValidateHandleSecure( - DWORD Unknown0); + HANDLE hHdl, + BOOL Restricted); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sun Sep 16 19:32:58 2007 @@ -637,10 +637,11 @@ return 0; } -DWORD +BOOL STDCALL NtUserValidateHandleSecure( - DWORD Unknown0) + HANDLE hHdl, + BOOL Restricted) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sun Sep 16 19:32:58 2007 @@ -590,7 +590,7 @@ NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 -# NtUserValidateHandleSecure 2 Wrong number of param ? +NtUserValidateHandleSecure 2 # NtUserValidateRect 2 # NtUserValidateTimerCallback 3 NtUserVkKeyScanEx 3 @@ -685,7 +685,6 @@ NtUserInitTask 11 NtUserSetCursorIconData 6 NtUserUnregisterClass 2 -NtUserValidateHandleSecure 1 # #ReactOS specify syscall NtGdiSelectObject 2

1 0

[ekohl] 29067: Indentation clean-up. No code changes.
by ekohl＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: ekohl Date: Sun Sep 16 17:38:26 2007 New Revision: 29067 URL: http://svn.reactos.org/svn/reactos?rev=29067&view=rev Log: Indentation clean-up. No code changes. Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/liccpa/liccpa.c Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sun Sep 16 17:38:26 2007 @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS Software Control Panel - * FILE: lib/cpl/system/appwiz.c + * FILE: dll/cpl/appwiz/appwiz.c * PURPOSE: ReactOS Software Control Panel * PROGRAMMER: Gero Kuehn (reactos.filter(a)gkware.com) * UPDATE HISTORY: @@ -49,214 +49,221 @@ /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; static VOID CallUninstall(HWND hwndDlg) { - STARTUPINFO si; - PROCESS_INFORMATION pi; - int nIndex; - HKEY hKey; - DWORD dwType; - TCHAR pszUninstallString[MAX_PATH]; - DWORD dwSize; - - nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); - if (nIndex == -1) - { - MessageBox(hwndDlg, - _TEXT("No item selected"), - _TEXT("Error"), - MB_ICONSTOP); - } - else - { - hKey = (HKEY)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETITEMDATA, (WPARAM)nIndex, 0); - - dwType = REG_SZ; + STARTUPINFO si; + PROCESS_INFORMATION pi; + INT nIndex; + HKEY hKey; + DWORD dwType; + TCHAR pszUninstallString[MAX_PATH]; + DWORD dwSize; + + nIndex = (INT)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); + if (nIndex == -1) + { + MessageBox(hwndDlg, + _TEXT("No item selected"), + _TEXT("Error"), + MB_ICONSTOP); + } + else + { + hKey = (HKEY)SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETITEMDATA, (WPARAM)nIndex, 0); + + dwType = REG_SZ; + dwSize = MAX_PATH; + if (RegQueryValueEx(hKey, + _TEXT("UninstallString"), + NULL, + &dwType, + (LPBYTE)pszUninstallString, + &dwSize) == ERROR_SUCCESS) + { + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = SW_SHOW; + if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } + else + { + MessageBox(hwndDlg, + _TEXT("Unable to read UninstallString. This entry is invalid or has been created by an MSI installer."), + _TEXT("Error"), + MB_ICONSTOP); + } + } +} + + +static VOID +FillSoftwareList(HWND hwndDlg) +{ + TCHAR pszName[MAX_PATH]; + TCHAR pszDisplayName[MAX_PATH]; + TCHAR pszParentKeyName[MAX_PATH]; + FILETIME FileTime; + HKEY hKey; + HKEY hSubKey; + DWORD dwType; + DWORD dwSize; + DWORD dwValue = 0; + BOOL bIsUpdate = FALSE; + BOOL bIsSystemComponent = FALSE; + BOOL bShowUpdates = FALSE; + INT i; + ULONG ulIndex; + + bShowUpdates = (SendMessage(GetDlgItem(hwndDlg, IDC_SHOWUPDATES), BM_GETCHECK, 0, 0) == BST_CHECKED); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), + &hKey) != ERROR_SUCCESS) + { + MessageBox(hwndDlg, + _TEXT("Unable to open Uninstall Key"), + _TEXT("Error"), + MB_ICONSTOP); + return; + } + + i = 0; dwSize = MAX_PATH; - if (RegQueryValueEx(hKey, - _TEXT("UninstallString"), - NULL, - &dwType, - (LPBYTE)pszUninstallString, - &dwSize) == ERROR_SUCCESS) - { - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - si.wShowWindow = SW_SHOW; - if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) - { - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); - } - } - else - { - MessageBox(hwndDlg, - _TEXT("Unable to read UninstallString. This entry is invalid or has been created by an MSI installer."), - _TEXT("Error"), - MB_ICONSTOP); - } - } -} - - -static void FillSoftwareList(HWND hwndDlg) -{ - TCHAR pszName[MAX_PATH]; - TCHAR pszDisplayName[MAX_PATH]; - TCHAR pszParentKeyName[MAX_PATH]; - FILETIME FileTime; - HKEY hKey; - HKEY hSubKey; - DWORD dwType; - DWORD dwSize; - DWORD dwValue = 0; - BOOL bIsUpdate = FALSE; - BOOL bIsSystemComponent = FALSE; - BOOL bShowUpdates = FALSE; - int i; - ULONG index; - - bShowUpdates = (SendMessage(GetDlgItem(hwndDlg, IDC_SHOWUPDATES), BM_GETCHECK, 0, 0) == BST_CHECKED); - - if (RegOpenKey(HKEY_LOCAL_MACHINE, - _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), - &hKey) != ERROR_SUCCESS) - { - MessageBox(hwndDlg, - _TEXT("Unable to open Uninstall Key"), - _TEXT("Error"), - MB_ICONSTOP); - return; - } - - i = 0; - dwSize = MAX_PATH; - while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) - { - if (RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS) - { - dwType = REG_DWORD; - dwSize = sizeof(DWORD); - if (RegQueryValueEx(hSubKey, - _TEXT("SystemComponent"), - NULL, - &dwType, - (LPBYTE)&dwValue, - &dwSize) == ERROR_SUCCESS) - { - bIsSystemComponent = (dwValue == 0x1); - } - else { - bIsSystemComponent = FALSE; - } - dwType = REG_SZ; - dwSize = MAX_PATH; - bIsUpdate = (RegQueryValueEx(hSubKey, - _TEXT("ParentKeyName"), - NULL, - &dwType, - (LPBYTE)pszParentKeyName, - &dwSize) == ERROR_SUCCESS); - dwSize = MAX_PATH; - if (RegQueryValueEx(hSubKey, - _TEXT("DisplayName"), - NULL, - &dwType, - (LPBYTE)pszDisplayName, - &dwSize) == ERROR_SUCCESS) - { - if ((!bIsUpdate) && (!bIsSystemComponent)) + while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) + { + if (RegOpenKey(hKey,pszName,&hSubKey) == ERROR_SUCCESS) { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); - SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hSubKey, + _TEXT("SystemComponent"), + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else + { + bIsSystemComponent = FALSE; + } + + dwType = REG_SZ; + dwSize = MAX_PATH; + bIsUpdate = (RegQueryValueEx(hSubKey, + _TEXT("ParentKeyName"), + NULL, + &dwType, + (LPBYTE)pszParentKeyName, + &dwSize) == ERROR_SUCCESS); + dwSize = MAX_PATH; + if (RegQueryValueEx(hSubKey, + _TEXT("DisplayName"), + NULL, + &dwType, + (LPBYTE)pszDisplayName, + &dwSize) == ERROR_SUCCESS) + { + if ((!bIsUpdate) && (!bIsSystemComponent)) + { + ulIndex = (ULONG)SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,ulIndex,(LPARAM)hSubKey); + } + else if (bIsUpdate && bShowUpdates) + { + ulIndex = (ULONG)SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,ulIndex,(LPARAM)hSubKey); + } + } } - else if (bIsUpdate && bShowUpdates) - { - index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); - SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); - } - } - } - - dwSize = MAX_PATH; - i++; - } - - RegCloseKey(hKey); -} + + dwSize = MAX_PATH; + i++; + } + + RegCloseKey(hKey); +} + /* Property page dialog callback */ static INT_PTR CALLBACK -InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - switch (uMsg) - { - case WM_INITDIALOG: - EnableWindow(GetDlgItem(hwndDlg,IDC_INSTALL), FALSE); - FillSoftwareList(hwndDlg); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_SHOWUPDATES: - if (HIWORD(wParam) == BN_CLICKED) - { - SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_RESETCONTENT, 0, 0); +InstallPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (uMsg) + { + case WM_INITDIALOG: + EnableWindow(GetDlgItem(hwndDlg, IDC_INSTALL), FALSE); FillSoftwareList(hwndDlg); - } - break; - case IDC_SOFTWARELIST: - if (HIWORD(wParam) == LBN_DBLCLK) - { - CallUninstall(hwndDlg); - } - break; - - case IDC_ADDREMOVE: - CallUninstall(hwndDlg); - break; - } - break; - } - - return FALSE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_SHOWUPDATES: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_RESETCONTENT, 0, 0); + FillSoftwareList(hwndDlg); + } + break; + + case IDC_SOFTWARELIST: + if (HIWORD(wParam) == LBN_DBLCLK) + { + CallUninstall(hwndDlg); + } + break; + + case IDC_ADDREMOVE: + CallUninstall(hwndDlg); + break; + } + break; + } + + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK -RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) -{ - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - - return FALSE; +RosPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) + { + case WM_INITDIALOG: + break; + } + + return FALSE; } static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; } @@ -265,28 +272,28 @@ LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[2]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; - - LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = NULL; - - InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); - - return (LONG)(PropertySheet(&psh) != -1); + PROPSHEETPAGE psp[2]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; + + InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); + + return (LONG)(PropertySheet(&psh) != -1); } @@ -294,47 +301,49 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - CPLINFO *CPlInfo; - DWORD i; - - UNREFERENCED_PARAMETER(hwndCPl); - - i = (DWORD)lParam1; - switch(uMsg) - { - case CPL_INIT: - return TRUE; - - case CPL_GETCOUNT: - return NUM_APPLETS; - - case CPL_INQUIRE: - CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - - case CPL_DBLCLK: - Applets[i].AppletProc(); - break; - } - - return FALSE; + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch (uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; + } + + return FALSE; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; -} + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; +} Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Sun Sep 16 17:38:26 2007 @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS Add hardware control panel - * FILE: lib/cpl/hdwwiz/hdwwiz.c + * FILE: dll/cpl/hdwwiz/hdwwiz.c * PURPOSE: ReactOS Add hardware control panel * PROGRAMMER: Hervé Poussineau (hpoussin(a)reactos.org) */ @@ -39,7 +39,7 @@ /* Applets */ APPLET Applets[] = { - {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} + {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); @@ -47,105 +47,108 @@ static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - HMODULE hNewDev = NULL; - PINSTALL_NEW_DEVICE InstallNewDevice; - DWORD Reboot; - BOOL ret; - LONG rc; + HMODULE hNewDev = NULL; + PINSTALL_NEW_DEVICE InstallNewDevice; + DWORD Reboot; + BOOL ret; + LONG rc; - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); - hNewDev = LoadLibrary(_T("newdev.dll")); - if (!hNewDev) - { - rc = 1; - goto cleanup; - } + hNewDev = LoadLibrary(_T("newdev.dll")); + if (!hNewDev) + { + rc = 1; + goto cleanup; + } - InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); - if (!InstallNewDevice) - { - rc = 2; - goto cleanup; - } + InstallNewDevice = (PINSTALL_NEW_DEVICE)GetProcAddress(hNewDev, (LPCSTR)"InstallNewDevice"); + if (!InstallNewDevice) + { + rc = 2; + goto cleanup; + } - ret = InstallNewDevice(hwnd, NULL, &Reboot); - if (!ret) - { - rc = 3; - goto cleanup; - } + ret = InstallNewDevice(hwnd, NULL, &Reboot); + if (!ret) + { + rc = 3; + goto cleanup; + } - if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) - { - /* We're done with installation */ - rc = 0; - goto cleanup; - } + if (Reboot != DI_NEEDRESTART && Reboot != DI_NEEDREBOOT) + { + /* We're done with installation */ + rc = 0; + goto cleanup; + } - /* We need to reboot */ - if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) - { - /* User doesn't want to reboot, or an error occurred */ - rc = 5; - goto cleanup; - } + /* We need to reboot */ + if (SetupPromptReboot(NULL, hwnd, FALSE) == -1) + { + /* User doesn't want to reboot, or an error occurred */ + rc = 5; + goto cleanup; + } - rc = 0; + rc = 0; cleanup: - if (hNewDev != NULL) - FreeLibrary(hNewDev); - return rc; + if (hNewDev != NULL) + FreeLibrary(hNewDev); + return rc; } + /* Control Panel Callback */ LONG CALLBACK CPlApplet(HWND hwndCpl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - int i = (int)lParam1; + INT i = (INT)lParam1; - switch (uMsg) - { - case CPL_INIT: - return TRUE; + switch (uMsg) + { + case CPL_INIT: + return TRUE; - case CPL_GETCOUNT: - return sizeof(Applets)/sizeof(Applets[0]); + case CPL_GETCOUNT: + return sizeof(Applets)/sizeof(Applets[0]); - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } + break; - case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); - break; - } - } - return FALSE; + case CPL_DBLCLK: + Applets[i].AppletProc(hwndCpl, uMsg, lParam1, lParam2); + break; + } + + return FALSE; } + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + UNREFERENCED_PARAMETER(lpvReserved); + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; } Modified: trunk/reactos/dll/cpl/liccpa/liccpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.c?re… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.c (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.c Sun Sep 16 17:38:26 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS License Manager - * FILE: lib/cpl/liccpa + * FILE: dll/cpl/liccpa/liccpa.c * PURPOSE: License Manager GUI * * PROGRAMMERS: Steven Edwards (steven_ed4153(a)yahoo.com) @@ -20,108 +20,97 @@ HINSTANCE hApplet = 0; + INT_PTR CALLBACK -DlgMainProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) +DlgMainProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { - TCHAR szString[256]; + TCHAR szString[256]; - switch(uMsg) - { - case WM_INITDIALOG: - break; + switch (uMsg) + { + case WM_INITDIALOG: + break; - case WM_COMMAND: - { - switch(HIWORD(wParam)) - { - case LBN_DBLCLK: - { - switch(LOWORD(wParam)) - { - } - break; - } - default: - { - switch(LOWORD(wParam)) - { - case IDC_OK: + case WM_COMMAND: + switch (HIWORD(wParam)) { - break; + case LBN_DBLCLK: + switch (LOWORD(wParam)) + { + } + break; + + default: + switch (LOWORD(wParam)) + { + case IDC_OK: + break; + + case IDC_CANCEL: + EndDialog(hwndDlg, IDC_CANCEL); + break; + } + break; } - case IDC_CANCEL: - { - EndDialog(hwndDlg, IDC_CANCEL); - break; - } - } - break; - } - } - break; + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDC_CANCEL); + return TRUE; } - case WM_CLOSE: - { - EndDialog(hwndDlg, IDC_CANCEL); - return TRUE; - } - } - return FALSE; + + return FALSE; } + LONG CALLBACK -CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) { - switch(uMsg) - { - case CPL_INIT: + switch (uMsg) { - return TRUE; + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return 1; + + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = IDC_CPLICON_1; + CPlInfo->idName = IDS_CPLNAME_1; + CPlInfo->idInfo = IDS_CPLDESCRIPTION_1; + } + break; + + case CPL_DBLCLK: + DialogBox(hApplet, MAKEINTRESOURCE(IDD_PROPPAGE1), NULL, DlgMainProc); + break; } - case CPL_GETCOUNT: - { - return 1; - } - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = IDC_CPLICON_1; - CPlInfo->idName = IDS_CPLNAME_1; - CPlInfo->idInfo = IDS_CPLDESCRIPTION_1; - break; - } - case CPL_DBLCLK: - { - DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_PROPPAGE1), hwndCPl, DlgMainProc, WM_INITDIALOG); - break; - } - } - return FALSE; + + return FALSE; } BOOL STDCALL -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) { - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + + return TRUE; }

1 0

[ekohl] 29066: Enable the filter keys settings when the test area EDITTEXT control gets the focus and disable the settings when the focus leaves the control.
by ekohl＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: ekohl Date: Sun Sep 16 17:25:34 2007 New Revision: 29066 URL: http://svn.reactos.org/svn/reactos?rev=29066&view=rev Log: Enable the filter keys settings when the test area EDITTEXT control gets the focus and disable the settings when the focus leaves the control. Modified: trunk/reactos/dll/cpl/access/keyboard.c Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sun Sep 16 17:25:34 2007 @@ -42,6 +42,47 @@ static INT nWaitArray[WAITTICKS] = {0, 300, 500, 700, 1000, 1500, 2000, 5000, 10000, 20000}; +static VOID +EnableFilterKeysTest(PGLOBAL_DATA pGlobalData) +{ + pGlobalData->filterKeys.dwFlags |= FKF_FILTERKEYSON; + pGlobalData->filterKeys.dwFlags &= ~FKF_INDICATOR; + + SystemParametersInfo(SPI_SETFILTERKEYS, + sizeof(FILTERKEYS), + &pGlobalData->filterKeys, + 0); +} + + +static VOID +DisableFilterKeysTest(PGLOBAL_DATA pGlobalData) +{ + if (pGlobalData->oldFilterKeys.dwFlags & FKF_FILTERKEYSON) + { + pGlobalData->filterKeys.dwFlags |= FKF_FILTERKEYSON; + } + else + { + pGlobalData->filterKeys.dwFlags &= ~FKF_FILTERKEYSON; + } + + if (pGlobalData->oldFilterKeys.dwFlags & FKF_INDICATOR) + { + pGlobalData->filterKeys.dwFlags |= FKF_INDICATOR; + } + else + { + pGlobalData->filterKeys.dwFlags &= ~FKF_INDICATOR; + } + + SystemParametersInfo(SPI_SETFILTERKEYS, + sizeof(FILTERKEYS), + &pGlobalData->filterKeys, + 0); +} + + /* Property page dialog callback */ INT_PTR CALLBACK StickyKeysDlgProc(HWND hwndDlg, @@ -182,13 +223,31 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_BOUNCE_TIME_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; + } + } + break; + + case IDC_BOUNCE_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } + break; + case IDOK: - i = SendDlgItemMessage(hwndDlg, IDC_BOUNCE_TIME_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iBounceMSec = nBounceArray[i]; - } - EndDialog(hwndDlg, TRUE); break; @@ -296,25 +355,53 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_REPEAT_REPEAT_COMBO), TRUE); break; + case IDC_REPEAT_DELAY_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iDelayMSec = nDelayArray[i]; + } + } + break; + + case IDC_REPEAT_REPEAT_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i]; + } + } + break; + + case IDC_REPEAT_WAIT_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + { + pGlobalData->filterKeys.iWaitMSec = nWaitArray[i]; + } + } + break; + + case IDC_REPEAT_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } + break; + case IDOK: - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_DELAY_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iDelayMSec = nDelayArray[i]; - } - - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_REPEAT_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iRepeatMSec = nRepeatArray[i]; - } - - i = SendDlgItemMessage(hwndDlg, IDC_REPEAT_WAIT_COMBO, CB_GETCURSEL, 0, 0); - if (i != CB_ERR) - { - pGlobalData->filterKeys.iWaitMSec = nWaitArray[i]; - } - EndDialog(hwndDlg, TRUE); break; @@ -402,6 +489,19 @@ hwndDlg, (DLGPROC)BounceKeysDlgProc, (LPARAM)pGlobalData); + break; + + case IDC_FILTER_TEST_EDIT: + switch (HIWORD(wParam)) + { + case EN_SETFOCUS: + EnableFilterKeysTest(pGlobalData); + break; + + case EN_KILLFOCUS: + DisableFilterKeysTest(pGlobalData); + break; + } break; case IDC_FILTER_SOUND_CHECK:

1 0

[fireball] 29065: Gregor Brunmar <gregor.brunmar@home.se>: - Don't include files that aren't in the source directory to the project generation. - Fix tab indentation in generated files.
by fireball＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: fireball Date: Sun Sep 16 16:54:52 2007 New Revision: 29065 URL: http://svn.reactos.org/svn/reactos?rev=29065&view=rev Log: Gregor Brunmar <gregor.brunmar(a)home.se>: - Don't include files that aren't in the source directory to the project generation. - Fix tab indentation in generated files. Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 16 16:54:52 2007 @@ -101,6 +101,9 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { + if (files[i]->file.directory != SourceDirectory) + continue; + // We want the full path here for directory support later on string path = Path::RelativeFromDirectory ( files[i]->file.relative_path, Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 16 16:54:52 2007 @@ -156,6 +156,9 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { + if (files[i]->file.directory != SourceDirectory) + continue; + // We want the full path here for directory support later on string path = Path::RelativeFromDirectory ( files[i]->file.relative_path, @@ -622,27 +625,31 @@ break; } - if ( same_folder_index < split_path.size() ) - { + if ( same_folder_index < split_path.size() || last_folder.size() > split_path.size() ) + { + int tabStart = 1; if ( split_path.size() > last_folder.size() ) { for ( size_t ifolder = last_folder.size(); ifolder < split_path.size(); ifolder++ ) indent_tab.push_back('\t'); + tabStart = split_path.size() - last_folder.size() + 1; } else if ( split_path.size() < last_folder.size() ) { indent_tab.resize( split_path.size() + 3 ); - } - - for ( size_t ifolder = last_folder.size(); ifolder > same_folder_index; ifolder-- ) - { - fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); - } - - for ( size_t ifolder = same_folder_index; ifolder < split_path.size(); ifolder++ ) - { - fprintf ( OUT, "%s<Filter\r\n", indent_tab.substr(0, indent_tab.size() - 1).c_str() ); - fprintf ( OUT, "%sName=\"%s\">\r\n", indent_tab.c_str(), split_path[ifolder].c_str() ); + tabStart = split_path.size() - last_folder.size() + 1; + } + + for ( size_t ifolder = last_folder.size(), itab = tabStart; ifolder > same_folder_index; ifolder--, itab++ ) + { + fprintf ( OUT, "%s</Filter>\r\n", indent_tab.substr(0, indent_tab.size() - itab).c_str() ); + } + + for ( size_t ifolder = same_folder_index, itab = split_path.size() - same_folder_index; ifolder < split_path.size(); ifolder++, itab-- ) + { + const string tab = indent_tab.substr(0, indent_tab.size() - itab); + fprintf ( OUT, "%s<Filter\r\n", tab.c_str() ); + fprintf ( OUT, "%s\tName=\"%s\">\r\n", tab.c_str(), split_path[ifolder].c_str() ); } last_folder = split_path; @@ -723,7 +730,7 @@ for ( size_t ifolder = last_folder.size(); ifolder > 0; ifolder-- ) { - indent_tab.resize( ifolder + 3 ); + indent_tab.resize( ifolder + 2 ); fprintf ( OUT, "%s</Filter>\r\n", indent_tab.c_str() ); }

1 0

[hpoussin] 29064: Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se
by hpoussin＠svn.reactos.org 16 Sep '07

16 Sep '07

Author: hpoussin Date: Sun Sep 16 13:12:15 2007 New Revision: 29064 URL: http://svn.reactos.org/svn/reactos?rev=29064&view=rev Log: Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 16 13:12:15 2007 @@ -82,7 +82,6 @@ //$output->progress("$dsp_file (file $progress_current of $progress_max)"); // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? - string dsp_path = module.output->relative_path; vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -102,8 +101,11 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want only the name of the file here? - string file = files[i]->file.name; + // We want the full path here for directory support later on + string path = Path::RelativeFromDirectory ( + files[i]->file.relative_path, + module.output->relative_path ); + string file = path + std::string("\\") + files[i]->file.name; source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 16 13:12:15 2007 @@ -131,7 +131,6 @@ bool console = exe && (module.type == Win32CUI); bool include_idl = false; - string vcproj_path = module.output->relative_path; vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries; StringSet common_defines; vector<const IfableData*> ifs_list; @@ -157,8 +156,11 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want only the name of the file here? - string file = files[i]->file.name; + // We want the full path here for directory support later on + string path = Path::RelativeFromDirectory ( + files[i]->file.relative_path, + module.output->relative_path ); + string file = path + std::string("\\") + files[i]->file.name; if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file );

1 0

[winesync] 29063: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: winesync Date: Sat Sep 15 21:06:51 2007 New Revision: 29063 URL: http://svn.reactos.org/svn/reactos?rev=29063&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/printdlg16.c Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_No.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_No.rc Sat Sep 15 21:06:51 2007 @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. Sørnes + * Copyright 2005-2007 Alexander N. Sørnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -134,8 +134,8 @@ PUSHBUTTON "&Bruk", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hjelp" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effekter",grp1,6,72,84,34,WS_GROUP - CHECKBOX "Gjennomstre&ket", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Understreket", chx2, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "Gjennomstre&ket", chx1, 10,82,70,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Understreket", chx2, 10,94,70,10, BS_AUTOCHECKBOX LTEXT "&Farge:", stc4 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -189,10 +189,10 @@ LTEXT "Fi&nn:", -1, 4, 8, 42, 8 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill &mellom store/små bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Retning", grp1, 107, 26, 68, 28 - CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Retning", grp1, 137, 23, 40, 36 + CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 141, 31, 30, 12 + CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 141, 44, 30, 12 DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Avbryt", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ LTEXT "&Erstatt med:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Skill mellom store og små bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Skill mellom store og små bokstaver", chx2, 5, 62, 125, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "E&rsatt", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc Sat Sep 15 21:06:51 2007 @@ -1,7 +1,7 @@ /* * Copyright 1997 Ricardo R. Massaro * Copyright 2003 Marcelo Duarte - * Copyright 2006 Américo José Melo + * Copyright 2006-2007 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,7 +55,7 @@ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&DirectÃ³rios:", -1, 110, 6, 92, 9 + LTEXT "&Directórios:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9 @@ -102,7 +102,7 @@ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&DirectÃ³rios:", -1, 110, 6, 92, 9 + LTEXT "&Directórios:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9 @@ -149,16 +149,16 @@ { LTEXT "Impressora:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Faixa de ImpressÃ£o", 1072, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12 - RADIOBUTTON "S&elecÃ§Ã£o", 1057, 16, 60, 60, 12 - RADIOBUTTON "&PÃ¡ginas", 1058, 16, 75, 60, 12 + RADIOBUTTON "S&elecção", 1057, 16, 60, 60, 12 + RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12 DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&De:", 1090, 60, 80, 30, 9 - LTEXT "&AtÃ©:", 1091, 120, 80, 30, 9 - LTEXT "&Qualidade de ImpressÃ£o:", 1092, 6, 100, 76, 9 + LTEXT "&Até:", 1091, 120, 80, 30, 9 + LTEXT "&Qualidade de Impressão:", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "Imprimir para Ficheiro", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP @@ -196,25 +196,25 @@ PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ConfiguraÃ§Ãµes de ImpressÃ£o" +CAPTION "Configurações de Impressão" FONT 8, "MS Shell Dlg" { GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "&Impressora Prdefinida", 1056, 16, 20, 80, 12 + RADIOBUTTON "&Impressora Predefinida", 1056, 16, 20, 80, 12 LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Impressora &EspecÃfica", 1057, 16, 50, 80, 12 + RADIOBUTTON "Impressora &Específica", 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 "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "OrientaÃ§Ã£o", 1073, 6, 85, 100, 50, BS_GROUPBOX + GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12 RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12 ICON "LANDSCAP", 1097, 10, 95, 32, 32 ICON "PORTRAIT", 1098, 10, 95, 32, 32 GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Tamanho", 1089, 130, 95, 30, 9 - LTEXT "&Fonte de AlimentaÃ§Ã£o", 1090, 130, 110, 30, 9 + LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9 COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } @@ -323,6 +323,40 @@ PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like &o in "solid&o" */ } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Cor" +FONT 8, "MS Shell Dlg" +{ +LTEXT "Cores &Básicas:", 1088, 4, 4, 140, 10 +LTEXT "&Cores do Utilizador:", 1089, 4, 106, 140, 10 +LTEXT "Colorido|Sólid&o", 1090, 150, 151, 48, 10 +LTEXT "Ver&melho:", 726 /*1094*/,249,126,24,10 +EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "&Verde:",727/*1095*/,249,140,24,10 +EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "A&zul:",728 /*1096*/,249,154,24,10 +EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "Mat&iz:" ,723 /*1091*/,202,126,22,10 +EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "Sa&t:" ,724 /*1092*/,202,140,22,10 +EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10 +EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP +CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 +CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 +CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 +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 "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14 +PUSHBUTTON "&Adicionar Cor Personalizada", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like &o in "solid&o" */ +} LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -354,12 +388,12 @@ LTEXT "&Procurar:", -1, 4, 8, 42, 8 EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maisculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "DirecÃ§Ã£o", 1072, 107, 26, 68, 28 + CHECKBOX "&Maiúsculas/minúsculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Direcção", 1072, 107, 26, 68, 28 CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Procurar Próximo", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -398,9 +432,9 @@ LTEXT "Substituir Pa&ra:", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Maisculas/minsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "Procurar PrÃ³xima", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + CHECKBOX "&Maiúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "Procurar Próxima", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&Substituir", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Substituir &Todas", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP @@ -463,7 +497,7 @@ PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "Imprimir em &ficheiro", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 + CONTROL "Imprimir para &ficheiro", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "Propri&edades", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Nome:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -471,25 +505,25 @@ LTEXT "Estado 'Dummy'", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "Onde:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ComentÃ¡rio:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "ComentÃ¡rio 'Dummy'", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "CÃ³pias", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "Nmero de &cÃ³pias:", stc5, 168,108, 68, 8 + LTEXT "Localizaça:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Localizaçao 'Dummy'", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentário:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Comentário 'Dummy'", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + + GROUPBOX "Cópias", grp2, 160, 92, 120,64, WS_GROUP + LTEXT "Número de &cópias:", stc5, 168,108, 68, 8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE CONTROL "&Agrupar", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Faixa de impressÃ£o", grp1, 8,92, 144,64, WS_GROUP + GROUPBOX "Faixa de impressão", grp1, 8,92, 144,64, WS_GROUP CONTROL "&Todos", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "PÃ¡ginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "SelecÃ§Ã£o", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + CONTROL "Páginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + CONTROL "Selecção", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "&de:", stc2, 52,124, 20,8 - RTEXT "&atÃ©", stc3, 100,124, 16,8 + RTEXT "&até", stc3, 100,124, 16,8 } @@ -535,7 +569,7 @@ PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "Print Setup" +CAPTION "Configuração de Impressão" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,180,156,50,14,WS_GROUP @@ -550,10 +584,10 @@ LTEXT "EStado 'Dummy'", stc12, 52, 36, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36, 10, SS_NOPREFIX LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "LocalizaÃ§Ã£o:", stc10, 16, 60, 36, 10, SS_NOPREFIX - LTEXT "LocalizaÃ§Ã£o 'Dummy'", stc14, 52, 60, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ComentÃ¡rio", stc9, 16, 72, 36, 10, SS_NOPREFIX - LTEXT "ComentÃ¡rio 'Dummy'", stc13, 52, 72, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Localização:", stc10, 16, 60, 36, 10, SS_NOPREFIX + LTEXT "Localização 'Dummy'", stc14, 52, 60, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Comentário", stc9, 16, 72, 36, 10, SS_NOPREFIX + LTEXT "Comentário 'Dummy'", stc13, 52, 72, 224, 10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Papel", grp2, 8, 92, 164, 56, WS_GROUP LTEXT "&Tamanho:", stc2, 16, 108, 36, 8 @@ -561,7 +595,7 @@ LTEXT "&Origem:", stc3, 16, 128, 36, 8 COMBOBOX cmb3, 52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - GROUPBOX "OrientaÃ§Ã£o", grp1, 180, 92, 100, 56, WS_GROUP + GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP ICON "", ico1, 195, 112, 18, 20, WS_GROUP CONTROL "&Retrato", rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12 CONTROL "&Paisagem", rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12 @@ -604,7 +638,7 @@ PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ConfiguraÃ§Ãµes de PÃ¡gina" +CAPTION "Configurações de Página" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -615,7 +649,7 @@ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "&Bandeja:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "OrientaÃ§ao", grp1, 8, 156, 64, 56, BS_GROUPBOX + GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX @@ -678,7 +712,7 @@ LTEXT "Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Abrir como &apenas- leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 + CONTROL "Abrir como &apenas-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,14 PUSHBUTTON "Cancelar", IDCANCEL,222,128,50,14 @@ -704,12 +738,12 @@ STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&Acerca do FolderPicker Test" + IDS_ABOUTBOX "&Acerca do Teste FolderPicker" IDS_DOCUMENTFOLDERS "Pastas de Documentos" IDS_PERSONAL "Os Meus Documentos" IDS_FAVORITES "Favoritos" - IDS_PATH "LocalizaÃ§Ã£o do Sistema" - IDS_DESKTOP "Ãrea de Trabalho" + IDS_PATH "Localização do Sistema" + IDS_DESKTOP "Ecrã" IDS_FONTS "Tipos de Letra" IDS_MYCOMPUTER "O Meu Computador" } @@ -736,15 +770,15 @@ STRINGTABLE DISCARDABLE { IDS_SYSTEMFOLDERS "Pastas do Sistema" - IDS_LOCALHARDRIVES "Discos RÃgidos Locais" - IDS_FILENOTFOUND "Ficheiro nÃ£o encontrado" + IDS_LOCALHARDRIVES "Discos Rígidos Locais" + IDS_FILENOTFOUND "Ficheiro não encontrado" IDS_VERIFYFILE "Por favor verifique se foi fornecido o nome correcto do ficheiro" - IDS_CREATEFILE "O ficheiro nÃ£o existe\nGostaria de o criar" - IDS_OVERWRITEFILE "O ficheiro jÃ¡ existe.\nGostaria de o substituir?" - IDS_INVALID_FILENAME_TITLE "Caracter(es) invÃ¡lidos na localizaÃ§Ã£o" - IDS_INVALID_FILENAME "Um nome de ficheiro nÃ£o pode conter quaisquer dos seguintes caracteres: \n / : < > |" - IDS_PATHNOTEXISTING "A localizaÃ§Ã£o nÃ£o existe" - IDS_FILENOTEXISTING "O ficheiro nÃ£o existe" + IDS_CREATEFILE "O ficheiro não existe\nGostaria de o criar" + IDS_OVERWRITEFILE "O ficheiro já existe.\nGostaria de o substituir?" + IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização" + IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos seguintes caracteres: \n / : < > |" + IDS_PATHNOTEXISTING "A localização não existe" + IDS_FILENOTEXISTING "O ficheiro não existe" } @@ -763,11 +797,11 @@ STRINGTABLE DISCARDABLE { - IDS_UPFOLDER "Um NÃvel Acima" + IDS_UPFOLDER "Um Nível Acima" IDS_NEWFOLDER "Criar Nova Pasta" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Detalhes" - IDS_TODESKTOP "Ãrea de Trabalho" + IDS_TODESKTOP "Ecrã" } @@ -836,26 +870,26 @@ { PD32_PRINT_TITLE "Imprimir" - PD32_VALUE_UREADABLE "Entrada IlegÃvel" - PD32_INVALID_PAGE_RANGE "Este valor nÃ£o se encaixa na faixa de pÃ¡ginas\n\ -Por favor entre um valor entre %d e %d." - PD32_FROM_NOT_ABOVE_TO "A entrada DE nÃ£o pode exceder ATÃ" - PD32_MARGINS_OVERLAP "As margens estÃ£o fora das medidas \ -do papel.\nPor favor reentre as margens." - PD32_NR_OF_COPIES_EMPTY "O nÃºmero de cÃ³pias nÃ£o pode ter valor vazio." - PD32_TOO_LARGE_COPIES "Esta grande quantidade de cÃ³pias nÃ£o Ã© suportada \ -pela sua impressora.\nPor favor entre um valor entre 1 e %d." - PD32_PRINT_ERROR "Ocorreu um erro de impressÃ£o." - PD32_NO_DEFAULT_PRINTER "NÃ£o existe uma impressora predefinida." - PD32_CANT_FIND_PRINTER "NÃ£o Ã© possÃvel encontrar uma impressora." - PD32_OUT_OF_MEMORY "MemÃ³ria insuficiente." + PD32_VALUE_UREADABLE "Entrada Ilegível" + PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas\n\ +Por favor indique um valor entre %d e %d." + PD32_FROM_NOT_ABOVE_TO "A entrada DE não pode exceder ATÉ" + PD32_MARGINS_OVERLAP "As margens estão fora das medidas \ +do papel.\nPor favor indique as margens." + PD32_NR_OF_COPIES_EMPTY "O número de cópias não pode ter valor vazio." + PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada \ +pela sua impressora.\nPor favor indique um valor entre 1 e %d." + PD32_PRINT_ERROR "Ocorreu um erro de impressão." + PD32_NO_DEFAULT_PRINTER "Não existe uma impressora predefinida." + PD32_CANT_FIND_PRINTER "Não é possível encontrar uma impressora." + PD32_OUT_OF_MEMORY "Memória insuficiente." PD32_GENERIC_ERROR "Ocorreu algum erro." PD32_DRIVER_UNKNOWN "Controlador de impressora desconhecido." PD32_NO_DEVICES "Antes de realizar tarefas relacionadas com a impressora \ -tais como configuraÃ§Ã£o de pÃ¡ginas ou imprimir um documento, precisa instalar uma impressora. \ +tais como configuração de páginas ou imprimir um documento, precisa instalar uma impressora. \ Por favor instale uma e tente novamente." - PD32_DEFAULT_PRINTER "Impressora Prdefinida; " + PD32_DEFAULT_PRINTER "Impressora Predefinida; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila" PD32_MARGINS_IN_INCHES "Margens [polegadas]" PD32_MARGINS_IN_MILIMETERS "Margens [mm]" @@ -864,29 +898,29 @@ PD32_PRINTER_STATUS_READY "Pronto" PD32_PRINTER_STATUS_PAUSED "Pausada; " PD32_PRINTER_STATUS_ERROR "Erro; " - PD32_PRINTER_STATUS_PENDING_DELETION "ExclusÃ£o pendente; " + PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente; " PD32_PRINTER_STATUS_PAPER_JAM "Papel atolado; " PD32_PRINTER_STATUS_PAPER_OUT "Sem papel; " - PD32_PRINTER_STATUS_MANUAL_FEED "AlimentaÃ§Ã£o manual; " + PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemas com o papel; " PD32_PRINTER_STATUS_OFFLINE "Impressora desligada; " PD32_PRINTER_STATUS_IO_ACTIVE "E/S Activa; " PD32_PRINTER_STATUS_BUSY "Ocupada; " PD32_PRINTER_STATUS_PRINTING "A imprimir; " PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "A bandeja de saida encontra-se cheia; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "NÃ£o disponÃvel; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponível; " PD32_PRINTER_STATUS_WAITING "A esperar; " PD32_PRINTER_STATUS_PROCESSING "A processar; " PD32_PRINTER_STATUS_INITIALIZING "A inicializar; " PD32_PRINTER_STATUS_WARMING_UP "A aquecer; " PD32_PRINTER_STATUS_TONER_LOW "Pouco toner; " PD32_PRINTER_STATUS_NO_TONER "Sem toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "LanÃ§ar pÃ¡gina; " - PD32_PRINTER_STATUS_USER_INTERVENTION "IntervenÃ§Ã£o do utilizador; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "MemÃ³ria insuficiente; " - PD32_PRINTER_STATUS_DOOR_OPEN "A impressora estÃ¡ aberta; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressÃ£o desconhecido; " - PD32_PRINTER_STATUS_POWER_SAVE "Modo econÃ³mico; " + PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente; " + PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido; " + PD32_PRINTER_STATUS_POWER_SAVE "Modo económico; " } @@ -919,10 +953,10 @@ IDS_COLOR_BLACK "Preto" IDS_COLOR_MAROON "Castanho" IDS_COLOR_GREEN "Verde" - IDS_COLOR_OLIVE "Verde-oliva" + IDS_COLOR_OLIVE "Verde-oliveira" IDS_COLOR_NAVY "Azul-marinho" IDS_COLOR_PURPLE "Roxo" - IDS_COLOR_TEAL "Azul-petrÃ³leo" + IDS_COLOR_TEAL "Azul-petróleo" IDS_COLOR_GRAY "Cinza" IDS_COLOR_SILVER "Prateado" IDS_COLOR_RED "Vermelho" @@ -951,7 +985,7 @@ STRINGTABLE DISCARDABLE { - IDS_FONT_SIZE "Selecione o tamanho da fonte entre %d e %d pontos." + IDS_FONT_SIZE "Seleccione o tamanho do tipo de letra entre %d e %d pontos." IDS_SAVE_BUTTON "&Gravar" IDS_SAVE_IN "Gravar &em:" IDS_SAVE "Gravar" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Sat Sep 15 21:06:51 2007 @@ -1,6 +1,5 @@ /* * Copyright 2004 Ilya Korniyko - * 2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,7 +30,7 @@ LTEXT "&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9 + LTEXT "&Òåêè:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 @@ -39,7 +38,7 @@ 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 } @@ -53,7 +52,7 @@ LTEXT "&&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9 EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9 + LTEXT "&Òåêè:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9 @@ -61,7 +60,7 @@ 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 } @@ -79,7 +78,7 @@ 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 @@ -101,7 +100,7 @@ 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 @@ -131,7 +130,7 @@ 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 @@ -174,7 +173,7 @@ 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 @@ -196,7 +195,7 @@ 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 } @@ -216,7 +215,7 @@ 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 } @@ -227,7 +226,7 @@ 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 @@ -267,7 +266,7 @@ 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 @@ -315,25 +314,25 @@ 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 } STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÏàïêè" - IDS_DOCUMENTFOLDERS "Ïàïêè äîêóìåíò³â" + IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÒåêè" + IDS_DOCUMENTFOLDERS "Òåêè äîêóìåíò³â" IDS_PERSONAL "Ìî¿ äîêóìåíòè" IDS_FAVORITES "Çàêëàäêè" IDS_PATH "Ñèñòåìíèé øëÿõ" - IDS_DESKTOP "Ðîáî÷èé ñò³ë" + IDS_DESKTOP "Ñò³ëüíèöÿ" IDS_FONTS "Øðèôòè" IDS_MYCOMPUTER "Ì³é êîìï'þòåð" } STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "Ñèñòåìí³ ïàïêè" + IDS_SYSTEMFOLDERS "Ñèñòåìí³ òåêè" IDS_LOCALHARDRIVES "Ëîêàëüí³ æîðñòê³ äèñêè" IDS_FILENOTFOUND "Ôàéë íå çíàéäåíî" IDS_VERIFYFILE "Ïåðåâ³ðòå, ÷è ïðàâèëüíî âêàçàíî ³ì'ÿ ôàéëó" @@ -348,10 +347,10 @@ STRINGTABLE DISCARDABLE { IDS_UPFOLDER "Âãîðó íà îäèí ð³âåíü" - IDS_NEWFOLDER "Ñòâîðèòè íîâó ïàïêó" + IDS_NEWFOLDER "Ñòâîðèòè íîâó òåêó" IDS_LISTVIEW "Ñïèñîê" IDS_REPORTVIEW "Ïîäðîáèö³" - IDS_TODESKTOP "Ïåðåõ³ä íà ðîáî÷èé ñò³ë" + IDS_TODESKTOP "Ïåðåõ³ä íà ñò³ëüíèöþ" } STRINGTABLE DISCARDABLE @@ -391,7 +390,7 @@ PD32_PRINTER_STATUS_PAPER_JAM "Ïàï³ð çàñòðÿã; " PD32_PRINTER_STATUS_PAPER_OUT "Íå âèñòà÷àº ïàïåðó; " PD32_PRINTER_STATUS_MANUAL_FEED "Ïîñòàâòå ïàï³ð âðó÷íó; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ç ïàïåðîì; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ñ ïàïåðîì; " PD32_PRINTER_STATUS_OFFLINE "Ïðèíòåð â ðåæèì³ offline; " PD32_PRINTER_STATUS_IO_ACTIVE "Ââ³ä/Âèâ³ä àêòèâíèé; " PD32_PRINTER_STATUS_BUSY "Çàéíÿòèé; " Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sat Sep 15 21:06:51 2007 @@ -1,4 +1,6 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" entrypoint="0"> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Sat Sep 15 21:06:51 2007 @@ -220,7 +220,7 @@ SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hLandscapeIcon); -@@ -2507,15 +2507,15 @@ +@@ -2513,15 +2513,15 @@ /* Save paper orientation into device context */ if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) @@ -239,7 +239,7 @@ else FIXME("could not get dialog text for papersize cmbbox?\n"); -@@ -2523,7 +2523,7 @@ +@@ -2529,7 +2529,7 @@ paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA, SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) @@ -248,7 +248,7 @@ else FIXME("could not get dialog text for papersize cmbbox?\n"); -@@ -2574,9 +2574,9 @@ +@@ -2580,9 +2580,9 @@ /* Save orientation */ if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) @@ -260,7 +260,7 @@ GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); -@@ -2824,7 +2824,7 @@ +@@ -2834,7 +2834,7 @@ case cmb3: if(msg == CBN_SELCHANGE){ DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode); @@ -269,7 +269,7 @@ SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); GlobalUnlock(pda->pdlg.hDevMode); } -@@ -2847,10 +2847,10 @@ +@@ -2857,10 +2857,10 @@ DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); ClosePrinter(hPrinter); /* Changing paper */ @@ -282,7 +282,7 @@ DWORD tmp = pda->curdlg.ptPaperSize.x; pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; pda->curdlg.ptPaperSize.y = tmp; -@@ -2864,7 +2864,7 @@ +@@ -2874,7 +2874,7 @@ count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0); if(count != CB_ERR){ for(i=0; i<count; ++i){ @@ -291,16 +291,16 @@ SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0); break; } -@@ -3168,7 +3168,7 @@ - } - /* Set orientation radiobutton properly */ - dm = GlobalLock(pda->dlga->hDevMode); -- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) -+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); -@@ -3213,8 +3213,8 @@ +@@ -3180,7 +3180,7 @@ + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); +- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) ++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); +@@ -3226,8 +3226,8 @@ PRINTDLG_PS_ChangePrinterA(hDlg, pda); dm = GlobalLock(pda->pdlg.hDevMode); if(dm){ @@ -311,16 +311,16 @@ GlobalUnlock(pda->pdlg.hDevMode); pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); -@@ -3282,7 +3282,7 @@ - - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ -- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) -+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); -@@ -3422,7 +3422,7 @@ +@@ -3297,7 +3297,7 @@ + { + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ +- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) ++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); +@@ -3439,7 +3439,7 @@ setupdlg->hDevMode = pdlg.hDevMode; setupdlg->hDevNames = pdlg.hDevNames; dm = GlobalLock(pdlg.hDevMode); Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Sat Sep 15 21:06:51 2007 @@ -617,6 +617,15 @@ himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); + /* Set effect flags */ + if((lpcf->Flags & CF_EFFECTS) && (lpcf->Flags & CF_INITTOLOGFONTSTRUCT)) + { + if(lpxx->lfUnderline) + CheckDlgButton(hDlg, chx2, TRUE); + if(lpxx->lfStrikeOut) + CheckDlgButton(hDlg, chx1, TRUE); + } + if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner)) ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE); if (!(lpcf->Flags & CF_APPLY)) Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Sat Sep 15 21:06:51 2007 @@ -2059,7 +2059,10 @@ GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),pbuf->pPrinterName); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2206,7 +2209,10 @@ GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName)); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),debugstr_w(pbuf->pPrinterName)); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2615,6 +2621,8 @@ lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed); if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n", lpPrinterInfo->pPrinterName); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } ClosePrinter(hprn); @@ -2622,6 +2630,8 @@ needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0); if(needed == -1) { ERR("DocumentProperties fails on %s\n", debugstr_a(name)); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } pDevMode = HeapAlloc(GetProcessHeap(), 0, needed); @@ -3167,12 +3177,15 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } /* Set orientation radiobutton properly */ - dm = GlobalLock(pda->dlga->hDevMode); - if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { @@ -3280,13 +3293,17 @@ EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - dm = GlobalLock(pda->dlga->hDevMode); - /* Landscape orientation */ - if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) - CheckRadioButton(hDlg, rad1, rad2, rad2); - else /* this is default if papersize is not set */ - CheckRadioButton(hDlg, rad1, rad2, rad1); - GlobalUnlock(pda->dlga->hDevMode); + if(pda->dlga->hDevMode) + { + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); + } + if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE); Modified: trunk/reactos/dll/win32/comdlg32/printdlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg16.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg16.c Sat Sep 15 21:06:51 2007 @@ -390,9 +390,10 @@ GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", - pbuf->pPrinterName,GetLastError()); - HeapFree(GetProcessHeap(), 0, dbuf); + ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", + pbuf->pPrinterName,GetLastError()); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -506,7 +507,7 @@ HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode); HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo); HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo); - HeapFree(GetProcessHeap(), 0, PrintStructures); + HeapFree(GetProcessHeap(), 0, ptr16); } if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC)) bRet = PRINTDLG_CreateDC16(lppd);

1 0

[cfinck] 29062: Rename "Properties::" to "Properties" in the context menu (patch by Mario Kacmar, kario AT szm DOT sk)
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 20:10:10 2007 New Revision: 29062 URL: http://svn.reactos.org/svn/reactos?rev=29062&view=rev Log: Rename "Properties::" to "Properties" in the context menu (patch by Mario Kacmar, kario AT szm DOT sk) Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Sat Sep 15 20:10:10 2007 @@ -262,7 +262,7 @@ } _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties::", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST));

1 0

[cfinck] 29061: Add a slovak translation for "desk.cpl" and fix a small mistake in the translation for "timedate.cpl" Patch by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 19:45:24 2007 New Revision: 29061 URL: http://svn.reactos.org/svn/reactos?rev=29061&view=rev Log: Add a slovak translation for "desk.cpl" and fix a small mistake in the translation for "timedate.cpl" Patch by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc Added: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Sat Sep 15 19:45:24 2007 @@ -1,0 +1,194 @@ +/* + * FILE: dll/cpl/desk/lang/sk-SK.rc + * PURPOSE: Slovak Language File for desk + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 15-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Pozadie" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Vyberte obrázok, ktorý chcete poui ako pozadie pracovnej plochy:", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Preh¾adáva...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Farba...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "&Umiestnenie:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "etriè obrazovky" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "etriè o&brazovky",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Nastavenie",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Ukáka",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Poèka",IDC_WAITTEXT, 14, 125, 16, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 54, 123, 12, 13 + LTEXT "minút", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Pri obnovení chráni &heslom.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + IDC_STATIC, 14, 166, 146 ,20 + PUSHBUTTON "N&apájanie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 +END + + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vzh¾ad" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Farebná schéma:", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Spresnenie vzh¾adu" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "P&oloka:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Ve¾kos", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&Farba 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "Far&ba 2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&Písmo:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "V&e¾kos:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + + LTEXT "Fa&rba:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Zrui", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nastavenie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Display:",1820,3,100,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Screen area",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 + LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP + LTEXT "More",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colors",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Display" + IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_NONE "(Nie je)" + IDS_CENTER "V strede" + IDS_STRETCH "Roztiahnu" + IDS_TILE "Dladice" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 farieb" + IDS_COLOR_8BIT "256 farieb" + IDS_COLOR_16BIT "High Color (16 bitov)" + IDS_COLOR_24BIT "Pravé farby (24 bitov)" + IDS_COLOR_32BIT "Pravé farby (32 bitov)" + IDS_PIXEL "%lux%lu Pixel" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Obrázky (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Neaktívne okno" + IDS_ACTWIN "Aktívne okno" + IDS_WINTEXT "Text okna" + IDS_MESSBOX "Okno správy" + IDS_MESSTEXT "Text správy" + IDS_BUTTEXT "OK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "Pracovná plocha" + IDS_ELEMENT_2 "Caption of inactive windows" + IDS_ELEMENT_3 "Border of inactive windows" + IDS_ELEMENT_4 "Caption of active windows" + IDS_ELEMENT_5 "Border of active windows" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Hilited elements" + IDS_ELEMENT_8 "Windows" + IDS_ELEMENT_9 "Scrollbars" + IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_11 "Palette title" + IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_13 "Captionbar" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Dialog" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_18 "Small captionbar" + IDS_ELEMENT_19 "Symbol distance (horizontal)" + IDS_ELEMENT_20 "Symbol distance (vertical)" + IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_22 "Symbol" +END Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/rsrc.rc (original) +++ trunk/reactos/dll/cpl/desk/rsrc.rc Sat Sep 15 19:45:24 2007 @@ -15,5 +15,6 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc Sat Sep 15 19:45:24 2007 @@ -39,7 +39,7 @@ COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "A&utomaticky posunú hodiny pri prechode na letný èas a spä", + AUTOCHECKBOX "A&utomaticky posunú hodiny pri prechode na letný èas a spä", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END

1 0

[cfinck] 29060: [FORMATTING] - Use TABs instead of spaces in some more .rbuild files - No code changes
by cfinck＠svn.reactos.org 15 Sep '07

15 Sep '07

Author: cfinck Date: Sat Sep 15 19:20:31 2007 New Revision: 29060 URL: http://svn.reactos.org/svn/reactos?rev=29060&view=rev Log: [FORMATTING] - Use TABs instead of spaces in some more .rbuild files - No code changes Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/base/base.rbuild trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Sat Sep 15 19:20:31 2007 @@ -1,68 +1,68 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="baseaddress.rbuild" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> + <define name="_REACTOS_" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include>include/crt</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include>include/reactos/libs</include> + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include>include/crt</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include>include/reactos/libs</include> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/drivers.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/hal.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/lib.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/media.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=29… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Sat Sep 15 19:20:31 2007 @@ -1,45 +1,45 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config.rbuild"> + <xi:fallback> + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> + <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - </if> + <if property="GDB" value="0"> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + </if> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> </project> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=290… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Sat Sep 15 19:20:31 2007 @@ -1,35 +1,35 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config-ppc.rbuild"> - <xi:fallback> - <xi:include href="config-ppc.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config-ppc.rbuild"> + <xi:fallback> + <xi:include href="config-ppc.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> - <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/> + <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="_REACTOS_" /> - <define name="stdcall" empty="true" /> - <define name="__stdcall__" empty="true" /> - <define name="fastcall" empty="true" /> - <define name="cdecl" empty="true" /> - <define name="__cdecl__" empty="true" /> - <define name="dllimport" empty="true" /> - <define name="WORDS_BIGENDIAN" empty="true" /> - <define name="MB_CUR_MAX">1</define> - <define name="_BSDTYPES_DEFINED"/> - <compilerflag>-fshort-wchar</compilerflag> - <compilerflag>-fsigned-char</compilerflag> - <compilerflag>-mfull-toc</compilerflag> - <compilerflag>-meabi</compilerflag> - <compilerflag>-O2</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wno-trampolines</compilerflag> + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="_REACTOS_" /> + <define name="stdcall" empty="true" /> + <define name="__stdcall__" empty="true" /> + <define name="fastcall" empty="true" /> + <define name="cdecl" empty="true" /> + <define name="__cdecl__" empty="true" /> + <define name="dllimport" empty="true" /> + <define name="WORDS_BIGENDIAN" empty="true" /> + <define name="MB_CUR_MAX">1</define> + <define name="_BSDTYPES_DEFINED"/> + <compilerflag>-fshort-wchar</compilerflag> + <compilerflag>-fsigned-char</compilerflag> + <compilerflag>-mfull-toc</compilerflag> + <compilerflag>-meabi</compilerflag> + <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wno-trampolines</compilerflag> </project> Modified: trunk/reactos/base/base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/base.rbuild?rev=29060… ============================================================================== --- trunk/reactos/base/base.rbuild (original) +++ trunk/reactos/base/base.rbuild Sat Sep 15 19:20:31 2007 @@ -1,19 +1,19 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="applications"> - <xi:include href="applications/applications.rbuild" /> - </directory> - <directory name="services"> - <xi:include href="services/services.rbuild" /> - </directory> - <directory name="setup"> - <xi:include href="setup/setup.rbuild" /> - </directory> - <directory name="shell"> - <xi:include href="shell/shell.rbuild" /> - </directory> - <directory name="system"> - <xi:include href="system/system.rbuild" /> - </directory> + <directory name="applications"> + <xi:include href="applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <xi:include href="shell/shell.rbuild" /> + </directory> + <directory name="system"> + <xi:include href="system/system.rbuild" /> + </directory> </group> Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Sat Sep 15 19:20:31 2007 @@ -3,57 +3,57 @@ <group>   <property name="SARCH" value="" />  <property name="OARCH" value="" />  <property name="MP" value="0" />  <property name="KDBG" value="0" />  <property name="DBG" value="1" />  <property name="NSWPAT" value="0" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Sep 15 19:20:31 2007 @@ -3,89 +3,89 @@ <group>   <property name="SARCH" value="" />  <property name="OARCH" value="pentium" />  <property name="OPTIMIZE" value="1" />  <property name="MP" value="0" />  <property name="KDBG" value="0" />  <property name="DBG" value="1" />  <property name="GDB" value="0" />  <property name="NSWPAT" value="0" />  <property name="_WINKD_" value="0" />

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007