Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 31372: Correct size for universal font id.
by jimtabor＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: jimtabor Date: Fri Dec 21 16:48:04 2007 New Revision: 31372 URL: http://svn.reactos.org/svn/reactos?rev=31372&view=rev Log: Correct size for universal font id. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Fri Dec 21 16:48:04 2007 @@ -135,12 +135,15 @@ /* TYPES *********************************************************************/ typedef PVOID KERNEL_PVOID; -typedef DWORD UNIVERSAL_FONT_ID; -typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; typedef DWORD CHWIDTHINFO; typedef CHWIDTHINFO *PCHWIDTHINFO; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; typedef LONG FIX; + +typedef struct _UNIVERSAL_FONT_ID +{ + DWORD dwUfid[2]; +} UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; typedef struct _REALIZATION_INFO // Based on LOCALESIGNATURE {

1 0

[fireball] 31371: - Fix Alex's csrss compilation, however it won't link due to missing functionality in smss.
by fireball＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: fireball Date: Fri Dec 21 16:40:20 2007 New Revision: 31371 URL: http://svn.reactos.org/svn/reactos?rev=31371&view=rev Log: - Fix Alex's csrss compilation, however it won't link due to missing functionality in smss. Modified: trunk/reactos/subsystems/csr/csr.rbuild trunk/reactos/subsystems/csr/csrsrv/api.c (contents, props changed) trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild trunk/reactos/subsystems/csr/csrsrv/srv.h trunk/reactos/subsystems/csr/csrsrv/status.h (contents, props changed) trunk/reactos/subsystems/csr/main.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/csr/csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csr.rbuild?… Modified: trunk/reactos/subsystems/csr/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.… Modified: trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/csrs… Modified: trunk/reactos/subsystems/csr/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/srv.… Modified: trunk/reactos/subsystems/csr/csrsrv/status.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/stat… Modified: trunk/reactos/subsystems/csr/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/main.c?rev=…

1 0

[hpoussin] 31369: No need to compile libxml2, as it is not used
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 13:26:41 2007 New Revision: 31369 URL: http://svn.reactos.org/svn/reactos?rev=31369&view=rev Log: No need to compile libxml2, as it is not used Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… ============================================================================== --- trunk/reactos/lib/3rdparty/3rdparty.rbuild (original) +++ trunk/reactos/lib/3rdparty/3rdparty.rbuild Fri Dec 21 13:26:41 2007 @@ -13,9 +13,9 @@ <directory name="libwine"> <xi:include href="libwine/libwine.rbuild" /> </directory> - <directory name="libxml2"> +  <directory name="mingw"> <xi:include href="mingw/mingw.rbuild" /> </directory>

2 1

[jimtabor] 31370: Add missing devivemode type.
by jimtabor＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: jimtabor Date: Fri Dec 21 16:01:48 2007 New Revision: 31370 URL: http://svn.reactos.org/svn/reactos?rev=31370&view=rev Log: Add missing devivemode type. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Fri Dec 21 16:01:48 2007 @@ -1088,6 +1088,7 @@ #define DM_PAPERSIZE 2 #define DM_PAPERLENGTH 4 #define DM_PAPERWIDTH 8 +#define DM_POSITION 32 #define DM_SCALE 16 #define DM_COPIES 256 #define DM_DEFAULTSOURCE 512

1 0

[hpoussin] 31368: [FORMATTING] Fix indentation
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 13:11:29 2007 New Revision: 31368 URL: http://svn.reactos.org/svn/reactos?rev=31368&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/part_xbox.… ============================================================================== --- trunk/reactos/hal/halx86/xbox/part_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c Fri Dec 21 13:11:29 2007 @@ -64,9 +64,9 @@ ASSERT(DeviceObject); ASSERT(Sector); - KeInitializeEvent(&Event, - NotificationEvent, - FALSE); + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); /* Read the sector */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, @@ -105,7 +105,7 @@ { PVOID SectorData; LARGE_INTEGER Offset; - NTSTATUS Status; + NTSTATUS Status; DPRINT("HalpXboxDeviceHasXboxPartitioning(%p %lu %p)\n", DeviceObject,

1 0

[hpoussin] 31367: Use TRACE/WARN/ERR/FIXME macros for debugging, so they can be enabled at runtime
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 13:09:46 2007 New Revision: 31367 URL: http://svn.reactos.org/svn/reactos?rev=31367&view=rev Log: Use TRACE/WARN/ERR/FIXME macros for debugging, so they can be enabled at runtime Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/ncpa.h trunk/reactos/dll/cpl/ncpa/ncpa.rbuild trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=31… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Fri Dec 21 13:09:46 2007 @@ -40,7 +40,7 @@ * the new network support in Reactos. * * If you intend to extend this code by more, please contact me to avoid duplicate work. - * There are already resources and code for TCP/IP configuration that are not + * There are already resources and code for TCP/IP configuration that are not * mature enough for committing them to CVS yet. */ @@ -53,7 +53,13 @@ #include <commctrl.h> #include <cpl.h> -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(ncpa); +#ifndef _UNICODE +#define debugstr_aw debugstr_a +#else +#define debugstr_aw debugstr_w +#endif #include "resource.h" #include "ncpa.h" @@ -96,7 +102,7 @@ if(RegOpenKeyEx(hBaseKey,tpszRegPath,0,KEY_ENUMERATE_SUB_KEYS,&hKey)!=ERROR_SUCCESS) { - DPRINT("EnumRegKeys failed (key not found): %S\n", tpszRegPath); + WARN("EnumRegKeys failed (key not found): %S\n", tpszRegPath); return; } @@ -106,12 +112,12 @@ ret = RegEnumKeyEx(hKey,i,tpszName,&dwNameLen,NULL,NULL,NULL,NULL); if(ret != ERROR_SUCCESS) { - DPRINT("EnumRegKeys: RegEnumKeyEx failed for %S (rc 0x%lx)\n", tpszName, ret); + WARN("EnumRegKeys: RegEnumKeyEx failed for %S (rc 0x%lx)\n", tpszName, ret); break; } _stprintf(pszNewPath,_T("%s\\%s"),tpszRegPath,tpszName); - DPRINT("EnumRegKeys: Calling user supplied enum function\n"); + TRACE("EnumRegKeys: Calling user supplied enum function\n"); pCallback(pCookie,hBaseKey,pszNewPath); dwNameLen = sizeof(tpszName); @@ -262,6 +268,7 @@ if(!FindNICClassKeyForCfgInstance(pGlobalData->CurrentAdapterName, tpszSubKey)) { + WARN("NIC Entry not found for '%s'\n", debugstr_w(pGlobalData->CurrentAdapterName)); MessageBox(hwndDlg,_T("NIC Entry not found"),_T("Registry error"),MB_ICONSTOP); MessageBox(hwndDlg,pGlobalData->CurrentAdapterName,tpszSubKey,MB_ICONSTOP); } @@ -309,7 +316,6 @@ RegCloseKey(hNDIKey); SetDlgItemText(hwndDlg,IDC_DESCRIPTION,tpszHelpText); - } if(HIWORD(wParam)!=LBN_DBLCLK) break; @@ -322,8 +328,9 @@ } else { + FIXME("If you see this, then the IPHLPAPI.DLL probably needs more work because GetAdaptersInfo did not return the expected data.\n"); MessageBox(NULL,_T("If you see this, then the IPHLPAPI.DLL probably needs more work because GetAdaptersInfo did not return the expected data."),_T("Error"),MB_ICONSTOP); - } + } } break; } @@ -360,8 +367,7 @@ else _tcscat(tpszName,_T(" Properties")); RegCloseKey(hKey); - - + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW; @@ -373,7 +379,6 @@ psh.nStartPage = 0; psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_NETPROPERTIES, NICPropertyPageProc, (LPARAM)pGlobalData); PropertySheet(&psh); @@ -388,17 +393,18 @@ if (pGlobalData->pFirstAdapterInfo) HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); - BufferSize = sizeof(IP_ADAPTER_INFO); + BufferSize = sizeof(IP_ADAPTER_INFO); pGlobalData->pFirstAdapterInfo = (PIP_ADAPTER_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); - - if (GetAdaptersInfo(pGlobalData->pFirstAdapterInfo, &BufferSize) == ERROR_BUFFER_OVERFLOW) - { - HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); - pGlobalData->pFirstAdapterInfo = (PIP_ADAPTER_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); + + if (GetAdaptersInfo(pGlobalData->pFirstAdapterInfo, &BufferSize) == ERROR_BUFFER_OVERFLOW) + { + HeapFree(GetProcessHeap(), 0, pGlobalData->pFirstAdapterInfo); + pGlobalData->pFirstAdapterInfo = (PIP_ADAPTER_INFO) HeapAlloc(GetProcessHeap(), 0, BufferSize); } if ((ErrRet = GetAdaptersInfo(pGlobalData->pFirstAdapterInfo, &BufferSize)) != NO_ERROR) { + ERR("error adapterinfo\n"); MessageBox(hwndDlg, _T("error adapterinfo") ,_T("ncpa.cpl"),MB_ICONSTOP); if (pGlobalData->pFirstAdapterInfo) @@ -449,9 +455,9 @@ } } else if (ERROR_NO_DATA == dwRetVal) - DPRINT("There are no network adapters with IPv4 enabled on the local system\n"); + WARN("There are no network adapters with IPv4 enabled on the local system\n"); else - DPRINT1("GetInterfaceInfo failed.\n"); + ERR("GetInterfaceInfo failed.\n"); } static VOID @@ -471,7 +477,7 @@ if (firstError) { firstError = FALSE; - DPRINT1("Out of memory - could not allocate MIB_IFTABLE(1)"); + WARN("Out of memory - could not allocate MIB_IFTABLE(1)"); return; } } @@ -490,7 +496,7 @@ if (firstError) { firstError = FALSE; - DPRINT1("Out of memory - could not allocate MIB_IFTABLE(2)"); + WARN("Out of memory - could not allocate MIB_IFTABLE(2)"); } pGlobalData->IfTableSize = 0; @@ -518,7 +524,7 @@ PMIB_IFROW pIfRow = NULL; TCHAR Buffer[256], LocBuffer[256]; SYSTEMTIME TimeConnected; - + memset(&TimeConnected, 0, sizeof(TimeConnected)); if (pGlobalData->pCurrentAdapterInfo) @@ -593,7 +599,7 @@ break; default: - DPRINT1("Unknown operation status: %d\n", OperStatus); + WARN("Unknown operation status: %d\n", OperStatus); OperStatus = IDS_STATUS_OPERATIONAL; break; } @@ -630,7 +636,7 @@ if (firstError) { firstError = FALSE; - DPRINT1("GetIfTable failed with error code: %d\n", dwRet); + ERR("GetIfTable failed with error code: %d\n", dwRet); return; } } @@ -698,7 +704,7 @@ switch(uMsg) { case WM_INITDIALOG: - { + { pGlobalData = (PGLOBAL_NCPA_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -706,14 +712,14 @@ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); if (pGlobalData->pCurrentAdapterInfo) - { + { TCHAR Buffer[64]; if (pGlobalData->pCurrentAdapterInfo->DhcpEnabled) LoadString(hApplet, IDS_ASSIGNED_DHCP, Buffer, sizeof(Buffer) / sizeof(TCHAR)); else LoadString(hApplet, IDS_ASSIGNED_MANUAL, Buffer, sizeof(Buffer) / sizeof(TCHAR)); - + SendDlgItemMessage(hwndDlg, IDC_DETAILSTYPE, WM_SETTEXT, 0, (LPARAM)Buffer); _stprintf(Buffer, _T("%S"), pGlobalData->pCurrentAdapterInfo->IpAddressList.IpAddress.String); SendDlgItemMessage(hwndDlg, IDC_DETAILSIP, WM_SETTEXT, 0, (LPARAM)Buffer); @@ -721,7 +727,7 @@ SendDlgItemMessage(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)Buffer); _stprintf(Buffer, _T("%S"), pGlobalData->pCurrentAdapterInfo->GatewayList.IpAddress.String); SendDlgItemMessage(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)Buffer); - } + } } break; case WM_COMMAND: @@ -733,10 +739,10 @@ break; case IDC_DETAILS: { + FIXME("Not implemented: show detail window\n"); MessageBox(hwndDlg,_T("not implemented: show detail window"),_T("ncpa.cpl"),MB_ICONSTOP); } break; - } break; } @@ -808,7 +814,7 @@ InitPropSheetPage(&psp[0], IDD_CARDPROPERTIES, NICStatusPageProc, (LPARAM)pGlobalData); InitPropSheetPage(&psp[1], IDD_CARDSUPPORT, NICSupportPageProc, (LPARAM)pGlobalData); - + PropertySheet(&psh); return; } @@ -828,6 +834,7 @@ size=sizeof(Info); if(GetAdaptersInfo(Info,&size)!=ERROR_SUCCESS) { + WARN("IPHLPAPI.DLL failed to provide Adapter information\n"); MessageBox(hwndDlg,L"IPHLPAPI.DLL failed to provide Adapter information",L"Error",MB_ICONSTOP); return; } @@ -859,33 +866,33 @@ HWND hwndDlg = (HWND)pCookie; DWORD dwCharacteristics; - DPRINT("NetAdapterCallback: %S\n", tpszSubKey); + TRACE("NetAdapterCallback: %s\n", debugstr_aw(tpszSubKey)); if(RegOpenKeyEx(hBaseKey,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!=ERROR_SUCCESS) return; - DPRINT("NetAdapterCallback: Reading Characteristics\n"); + TRACE("NetAdapterCallback: Reading Characteristics\n"); dwType = REG_DWORD; dwSize = sizeof(dwCharacteristics); if(RegQueryValueEx(hKey,_T("Characteristics"),NULL,&dwType,(BYTE*)&dwCharacteristics,&dwSize)!=ERROR_SUCCESS) dwCharacteristics = 0; - if (dwCharacteristics & NCF_HIDDEN) return; - if (!(dwCharacteristics & NCF_VIRTUAL) && !(dwCharacteristics & NCF_PHYSICAL)) return; - - DPRINT("NetAdapterCallback: Reading DriverDesc\n"); + + TRACE("NetAdapterCallback: Reading DriverDesc\n"); dwType = REG_SZ; dwSize = sizeof(tpszDisplayName); if (RegQueryValueEx(hKey,_T("DriverDesc"),NULL,&dwType,(BYTE*)tpszDisplayName,&dwSize)!= ERROR_SUCCESS) _tcscpy(tpszDisplayName,_T("Unnamed Adapter")); + TRACE("Network card: '%s'\n", debugstr_aw(tpszDisplayName)); // get the link to the Enum Subkey (currently unused) //dwType = REG_SZ; //dwSize = sizeof(tpszDeviceID); //if(RegQueryValueEx(hKey,_T("MatchingDeviceId"),NULL,&dwType,(BYTE*)tpszDeviceID,&dwSize) != ERROR_SUCCESS) { + // WARN("Missing MatchingDeviceId Entry\n"); // MessageBox(hwndDlg,_T("Missing MatchingDeviceId Entry"),_T("Registry Problem"),MB_ICONSTOP); // return; //} @@ -893,7 +900,9 @@ // get the card configuration GUID dwType = REG_SZ; dwSize = sizeof(tpszCfgInstanceID); - if(RegQueryValueEx(hKey,_T("NetCfgInstanceId"),NULL,&dwType,(BYTE*)tpszCfgInstanceID,&dwSize) != ERROR_SUCCESS) { + if(RegQueryValueEx(hKey,_T("NetCfgInstanceId"),NULL,&dwType,(BYTE*)tpszCfgInstanceID,&dwSize) != ERROR_SUCCESS) + { + ERR("Missing NetCfgInstanceId Entry\n"); MessageBox(hwndDlg,_T("Missing NetCfgInstanceId Entry"),_T("Registry Problem"),MB_ICONSTOP); return; } @@ -905,7 +914,6 @@ // really represents a device that is currently connected to the system // // How is this done properly ? - nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETITEMDATA,nIndex,(LPARAM)ptpszCfgInstanceID); @@ -940,7 +948,7 @@ EnableWindow(GetDlgItem(hwndDlg,IDC_ADD),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_REMOVE),FALSE); - + EnumAdapters(hwndDlg); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETCURSEL,0,0); } @@ -1078,6 +1086,3 @@ return TRUE; } - - - Modified: trunk/reactos/dll/cpl/ncpa/ncpa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.h?rev=31… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.h (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.h Fri Dec 21 13:09:46 2007 @@ -23,8 +23,6 @@ extern HINSTANCE hApplet; -extern ULONG DbgPrint(PCCH Fmt, ...); - #endif // __NCPA_H /* EOF */ Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Fri Dec 21 13:09:46 2007 @@ -5,6 +5,7 @@ <include base="ncpa">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> + <library>wine</library> <library>kernel32</library> <library>advapi32</library> <library>user32</library> @@ -12,8 +13,6 @@ <library>iphlpapi</library> <library>ws2_32</library> <library>dhcpcsvc</library> - <library>ntdll</library> - <library>msvcrt</library> <file>ncpa.c</file> <file>tcpip_properties.c</file> <file>ncpa.rc</file> Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_propert… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Fri Dec 21 13:09:46 2007 @@ -7,6 +7,7 @@ * Copyright 2006 Ge van Geldorp <gvg(a)reactos.org> */ +#include <assert.h> #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -21,20 +22,13 @@ #ifdef _MSC_VER #include <cpl.h> -#else - -// this is missing on reactos... -#ifndef IPM_SETADDRESS -#define IPM_SETADDRESS (WM_USER+101) -#endif - #endif #include "resource.h" #include "ncpa.h" -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(ncpa); typedef struct _TCPIP_PROPERTIES_DATA { DWORD AdapterIndex; @@ -135,6 +129,7 @@ MsgId, Msg, sizeof(Msg) / sizeof(Msg[0]))) { wcscpy(Msg, L"Unknown error"); } + ERR("%s\n", debugstr_w(Msg)); MessageBoxW(Parent, Msg, Error, MB_OK | MB_ICONSTOP); } @@ -204,7 +199,7 @@ RowToAdd.dwForwardNextHop = DlgData->Gateway; CreateIpForwardEntry( &RowToAdd ); - ASSERT(BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)); + assert(BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)); } else { DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; @@ -250,7 +245,7 @@ if (! ValidateAndStore(Dlg, DlgData)) { /* Should never happen, we should have validated at PSN_KILLACTIVE */ - ASSERT(FALSE); + assert(FALSE); return FALSE; } @@ -300,8 +295,6 @@ goto cleanup; } - // arty ... Not needed anymore ... We update the address live now - //MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); ret = TRUE; cleanup:

1 0

[hpoussin] 31366: [FORMATTING] Fix indentation
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 13:06:46 2007 New Revision: 31366 URL: http://svn.reactos.org/svn/reactos?rev=31366&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/base/system/winlogon/setup.c Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Fri Dec 21 13:06:46 2007 @@ -19,135 +19,137 @@ DWORD GetSetupType(VOID) { - DWORD dwError; - HKEY hKey; - DWORD dwType; - DWORD dwSize; - DWORD dwSetupType; + DWORD dwError; + HKEY hKey; + DWORD dwType; + DWORD dwSize; + DWORD dwSetupType; - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), - 0, - KEY_QUERY_VALUE, - &hKey); - if (dwError != ERROR_SUCCESS) - { - return 0; - } + TRACE("GetSetupType()\n"); - dwSize = sizeof(DWORD); - dwError = RegQueryValueExW (hKey, - L"SetupType", //TEXT("SetupType"), - NULL, - &dwType, - (LPBYTE)&dwSetupType, - &dwSize); - RegCloseKey (hKey); - if (dwError != ERROR_SUCCESS || dwType != REG_DWORD) - { - return 0; - } + /* Open key */ + dwError = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError != ERROR_SUCCESS) + return 0; - return dwSetupType; + /* Read key */ + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW( + hKey, + L"SetupType", + NULL, + &dwType, + (LPBYTE)&dwSetupType, + &dwSize); + + /* Close key, and check if returned values are correct */ + RegCloseKey(hKey); + if (dwError != ERROR_SUCCESS || dwType != REG_DWORD || dwSize != sizeof(DWORD)) + return 0; + + TRACE("GetSetupType() returns %lu\n", dwSetupType); + return dwSetupType; } +static DWORD WINAPI +RunSetupThreadProc( + IN LPVOID lpParameter) +{ + PROCESS_INFORMATION ProcessInformation; + STARTUPINFOW StartupInfo; + WCHAR Shell[MAX_PATH]; + WCHAR CommandLine[MAX_PATH]; + BOOL Result; + DWORD dwError; + HKEY hKey; + DWORD dwType; + DWORD dwSize; + DWORD dwExitCode; -static DWORD WINAPI -RunSetupThreadProc (IN LPVOID lpParameter) -{ - PROCESS_INFORMATION ProcessInformation; - STARTUPINFOW StartupInfo; - WCHAR Shell[MAX_PATH]; - WCHAR CommandLine[MAX_PATH]; - BOOL Result; - DWORD dwError; - HKEY hKey; - DWORD dwType; - DWORD dwSize; - DWORD dwExitCode; + TRACE("RunSetup() called\n"); - TRACE ("RunSetup() called\n"); + /* Open key */ + dwError = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError != ERROR_SUCCESS) + return FALSE; - dwError = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SYSTEM\\Setup", - 0, - KEY_QUERY_VALUE, - &hKey); - if (dwError != ERROR_SUCCESS) - { - return FALSE; - } + /* Read key */ + dwSize = (sizeof(Shell) / sizeof(Shell[0])) - 1; + dwError = RegQueryValueExW( + hKey, + L"CmdLine", + NULL, + &dwType, + (LPBYTE)Shell, + &dwSize); + RegCloseKey(hKey); + if (dwError != ERROR_SUCCESS) + return FALSE; - dwSize = MAX_PATH; - dwError = RegQueryValueExW (hKey, - L"CmdLine", - NULL, - &dwType, - (LPBYTE)Shell, - &dwSize); - RegCloseKey (hKey); - if (dwError != ERROR_SUCCESS) - { - return FALSE; - } + /* Finish string */ + Shell[dwSize / sizeof(WCHAR)] = UNICODE_NULL; - if (dwType == REG_EXPAND_SZ) - { - ExpandEnvironmentStringsW(Shell, CommandLine, MAX_PATH); - } - else if (dwType == REG_SZ) - { - wcscpy(CommandLine, Shell); - } - else - { - return FALSE; - } + /* Expand string (if applicable) */ + if (dwType == REG_EXPAND_SZ) + ExpandEnvironmentStringsW(Shell, CommandLine, MAX_PATH); + else if (dwType == REG_SZ) + wcscpy(CommandLine, Shell); + else + return FALSE; - TRACE ("Should run '%S' now.\n", CommandLine); + TRACE("Should run '%s' now\n", debugstr_w(CommandLine)); - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; + /* Start process */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + Result = CreateProcessW( + NULL, + CommandLine, + NULL, + NULL, + FALSE, + DETACHED_PROCESS, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!Result) + { + TRACE("Failed to run setup process\n"); + return FALSE; + } - TRACE ("Creating new setup process\n"); + /* Wait for process termination */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - Result = CreateProcessW (NULL, - CommandLine, - NULL, - NULL, - FALSE, - DETACHED_PROCESS, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (!Result) - { - TRACE ("Failed to run setup process\n"); - return FALSE; - } + GetExitCodeProcess(ProcessInformation.hProcess, &dwExitCode); - /* Wait for process termination */ - WaitForSingleObject (ProcessInformation.hProcess, INFINITE); + /* Close handles */ + CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); - GetExitCodeProcess (ProcessInformation.hProcess, &dwExitCode); + TRACE ("RunSetup() done\n"); - CloseHandle (ProcessInformation.hThread); - CloseHandle (ProcessInformation.hProcess); - - TRACE ("RunSetup() done.\n"); - - return TRUE; + return TRUE; } - BOOL -RunSetup (VOID) +RunSetup(VOID) { HANDLE hThread;

1 0

[hpoussin] 31365: Fix hazardous UNICODE_STRING buffer manipulations
by hpoussin＠svn.reactos.org 21 Dec '07

21 Dec '07

Author: hpoussin Date: Fri Dec 21 12:40:32 2007 New Revision: 31365 URL: http://svn.reactos.org/svn/reactos?rev=31365&view=rev Log: Fix hazardous UNICODE_STRING buffer manipulations Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Fri Dec 21 12:40:32 2007 @@ -43,7 +43,6 @@ return STATUS_SUCCESS; } - NTSTATUS IopQueueTargetDeviceEvent(const GUID *Guid, @@ -258,119 +257,6 @@ static PDEVICE_OBJECT IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance) { -#if 0 - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ValueName; - LPWSTR KeyNameBuffer; - HANDLE InstanceKeyHandle; - HANDLE ControlKeyHandle; - NTSTATUS Status; - PKEY_VALUE_PARTIAL_INFORMATION ValueInformation; - ULONG ValueInformationLength; - PDEVICE_OBJECT DeviceObject = NULL; - - DPRINT("IopGetDeviceObjectFromDeviceInstance(%wZ) called\n", DeviceInstance); - - KeyNameBuffer = ExAllocatePool(PagedPool, - (49 * sizeof(WCHAR)) + DeviceInstance->Length); - if (KeyNameBuffer == NULL) - { - DPRINT1("Failed to allocate key name buffer!\n"); - return NULL; - } - - wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - wcscat(KeyNameBuffer, DeviceInstance->Buffer); - - RtlInitUnicodeString(&KeyName, - KeyNameBuffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&InstanceKeyHandle, - KEY_READ, - &ObjectAttributes); - ExFreePool(KeyNameBuffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open the instance key (Status %lx)\n", Status); - return NULL; - } - - /* Open the 'Control' subkey */ - RtlInitUnicodeString(&KeyName, - L"Control"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - InstanceKeyHandle, - NULL); - - Status = ZwOpenKey(&ControlKeyHandle, - KEY_READ, - &ObjectAttributes); - ZwClose(InstanceKeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open the 'Control' key (Status %lx)\n", Status); - return NULL; - } - - /* Query the 'DeviceReference' value */ - RtlInitUnicodeString(&ValueName, - L"DeviceReference"); - ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, - Data[0]) + sizeof(ULONG); - ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength); - if (ValueInformation == NULL) - { - DPRINT1("Failed to allocate the name information buffer!\n"); - ZwClose(ControlKeyHandle); - return NULL; - } - - Status = ZwQueryValueKey(ControlKeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInformation, - ValueInformationLength, - &ValueInformationLength); - ZwClose(ControlKeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to query the 'DeviceReference' value (Status %lx)\n", Status); - return NULL; - } - - /* Check the device object */ - RtlCopyMemory(&DeviceObject, - ValueInformation->Data, - sizeof(PDEVICE_OBJECT)); - - DPRINT("DeviceObject: %p\n", DeviceObject); - - if (DeviceObject->Type != IO_TYPE_DEVICE || - DeviceObject->DeviceObjectExtension == NULL || - DeviceObject->DeviceObjectExtension->DeviceNode == NULL || - !RtlEqualUnicodeString(&DeviceObject->DeviceObjectExtension->DeviceNode->InstancePath, - DeviceInstance, TRUE)) - { - DPRINT1("Invalid object type!\n"); - return NULL; - } - - DPRINT("Instance path: %wZ\n", &DeviceObject->DeviceObjectExtension->DeviceNode->InstancePath); - - ObReferenceObject(DeviceObject); - - DPRINT("IopGetDeviceObjectFromDeviceInstance() done\n"); - - return DeviceObject; -#endif - if (IopRootDeviceNode == NULL) return NULL; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Fri Dec 21 12:40:32 2007 @@ -83,7 +83,7 @@ typedef struct _BUFFER { - PVOID *Buffer; + PVOID *Data; PULONG Length; } BUFFER, *PBUFFER; @@ -235,19 +235,17 @@ IN PVOID Context, IN PVOID EntryContext) { - PUNICODE_STRING String = (PUNICODE_STRING)EntryContext; + PUNICODE_STRING Destination = (PUNICODE_STRING)EntryContext; + UNICODE_STRING Source; if (ValueType != REG_SZ || ValueLength == 0 || ValueLength % sizeof(WCHAR) != 0) return STATUS_SUCCESS; - String->Buffer = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); - if (String->Buffer == NULL) - return STATUS_NO_MEMORY; - String->Length = String->MaximumLength = (USHORT)ValueLength; - RtlCopyMemory(String->Buffer, ValueData, ValueLength); - if (ValueLength > 0 && String->Buffer[ValueLength / sizeof(WCHAR) - 1] == L'\0') - String->Length -= sizeof(WCHAR); - return STATUS_SUCCESS; + Source.MaximumLength = Source.Length = ValueLength; + Source.Buffer = ValueData; + if (Source.Length > 0 && Source.Buffer[Source.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) + Source.Length -= sizeof(WCHAR); + return RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &Source, Destination); } static NTSTATUS NTAPI @@ -264,7 +262,7 @@ if (ValueLength == 0) { - *Buffer->Buffer = NULL; + *Buffer->Data = NULL; return STATUS_SUCCESS; } @@ -272,7 +270,7 @@ if (BinaryValue == NULL) return STATUS_NO_MEMORY; RtlCopyMemory(BinaryValue, ValueData, ValueLength); - *Buffer->Buffer = BinaryValue; + *Buffer->Data = BinaryValue; if (Buffer->Length) *Buffer->Length = ValueLength; return STATUS_SUCCESS; } @@ -454,9 +452,9 @@ } /* Fill other informations */ - Buffer1.Buffer = (PVOID *)&Device->ResourceRequirementsList; + Buffer1.Data = (PVOID *)&Device->ResourceRequirementsList; Buffer1.Length = NULL; - Buffer2.Buffer = (PVOID *)&Device->ResourceList; + Buffer2.Data = (PVOID *)&Device->ResourceList; Buffer2.Length = &Device->ResourceListSize; RtlZeroMemory(QueryTable, sizeof(QueryTable)); QueryTable[0].QueryRoutine = QueryStringCallback;

1 0

[gbrunmar] 31364: * Changed to aligned alloc of Direct3D9 object * More fields in IDirect3D9 structure
by gbrunmar＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: gbrunmar Date: Fri Dec 21 00:18:42 2007 New Revision: 31364 URL: http://svn.reactos.org/svn/reactos?rev=31364&view=rev Log: * Changed to aligned alloc of Direct3D9 object * More fields in IDirect3D9 structure Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Fri Dec 21 00:18:42 2007 @@ -5,6 +5,8 @@ <library>advapi32</library> <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> <library>uuid</library> <library>dxguid</library> Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Fri Dec 21 00:18:42 2007 @@ -9,10 +9,13 @@ #include "d3d9_helpers.h" #include <stdio.h> #include <ddraw.h> +#include <debug.h> -#include "d3d9_private.h" +#define MEM_ALIGNMENT 0x20 static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; + +static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface) { @@ -67,9 +70,10 @@ if (ppDirect3D9 == 0) return DDERR_INVALIDPARAMS; - pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECT3D9_INT)); + if (AlignedAlloc((LPVOID *)&pDirect3D9, sizeof(DIRECT3D9_INT)) != S_OK) + return DDERR_OUTOFMEMORY; - if (0 == pDirect3D9) + if (pDirect3D9 == 0) return DDERR_OUTOFMEMORY; pDirect3D9->unknown000007 = 0; @@ -86,11 +90,64 @@ pDirect3D9->unknown004581 = 0; pDirect3D9->unknown004582 = 0; pDirect3D9->unknown004583 = 0; - pDirect3D9->unknown004589 = 0; + pDirect3D9->unknown004589 = 0x20; pDirect3D9->lpInt = pDirect3D9; + pDirect3D9->unknown000007 = 1; + + InitializeCriticalSection(&pDirect3D9->d3d9_cs); + + memcpy(&pDirect3D9->DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; return ERROR_SUCCESS; } + +HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize) +{ + ULONG AddressOffset; + ULONG AlignedMask = MEM_ALIGNMENT - 1; + CHAR *AlignedPtr; + ULONG_PTR *AlignedOffsetPtr; + + if (ppObject == 0) + return DDERR_INVALIDPARAMS; + + if (dwSize == 0) + { + *ppObject = NULL; + return S_OK; + } + + dwSize += MEM_ALIGNMENT; + + AlignedPtr = (CHAR *)LocalAlloc(LMEM_ZEROINIT, dwSize); + + if (AlignedPtr == 0) + return DDERR_OUTOFMEMORY; + + AddressOffset = MEM_ALIGNMENT - ((ULONG)AlignedPtr & AlignedMask); + + AlignedPtr += AddressOffset; + + AlignedOffsetPtr = (ULONG_PTR *)(AlignedPtr - sizeof(ULONG)); + *AlignedOffsetPtr = AddressOffset; + + *ppObject = (ULONG_PTR *)AlignedPtr; + + return S_OK; +} + +VOID AlignedFree(IN OUT LPVOID pObject) +{ + CHAR *NonAlignedPtr = pObject; + ULONG_PTR *AlignedPtr = pObject; + + if (pObject == 0) + return; + + NonAlignedPtr -= *(AlignedPtr - 1); + + LocalFree(NonAlignedPtr); +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Fri Dec 21 00:18:42 2007 @@ -22,4 +22,11 @@ /* Creates a Direct3D9 object */ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); +/* Allocates memory and returns an aligned pointer */ +HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize); + +/* Frees memory allocated with AlignedAlloc */ +VOID AlignedFree(IN OUT LPVOID pObject); + + #endif // _D3D9_HELPERS_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Fri Dec 21 00:18:42 2007 @@ -43,7 +43,7 @@ EnterCriticalSection(&This->d3d9_cs); /* TODO: Free resources here */ LeaveCriticalSection(&This->d3d9_cs); - HeapFree(GetProcessHeap(), 0, This); + AlignedFree(This); } return ref; Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Fri Dec 21 00:18:42 2007 @@ -26,71 +26,10 @@ /* 0x0020 */ DWORD dwProcessId; /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ -/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */ +/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably NumDisplays */ /* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */ -/* 0x0040 */ CHAR DeviceName[16]; -/* 0x0050 */ DWORD unknown000020; -/* 0x0054 */ DWORD unknown000021; -/* 0x0058 */ DWORD unknown000022; -/* 0x005c */ DWORD unknown000023; -/* 0x0060 */ DWORD unknown000024; -/* 0x0064 */ DWORD unknown000025; -/* 0x0068 */ DWORD unknown000026; -/* 0x006c */ DWORD unknown000027; -/* 0x0070 */ DWORD unknown000028; -/* 0x0074 */ DWORD unknown000029; -/* 0x0078 */ DWORD unknown000030; -/* 0x007c */ DWORD unknown000031; -/* 0x0080 */ DWORD unknown000032; -/* 0x0084 */ DWORD unknown000033; -/* 0x0088 */ DWORD unknown000034; -/* 0x008c */ DWORD unknown000035; -/* 0x0090 */ DWORD unknown000036; -/* 0x0094 */ DWORD unknown000037; -/* 0x0098 */ DWORD unknown000038; -/* 0x009c */ DWORD unknown000039; -/* 0x00a0 */ DWORD unknown000040; -/* 0x00a4 */ DWORD unknown000041; -/* 0x00a8 */ DWORD unknown000042; -/* 0x00ac */ DWORD unknown000043; -/* 0x00b0 */ DWORD unknown000044; -/* 0x00b4 */ DWORD unknown000045; -/* 0x00b8 */ DWORD unknown000046; -/* 0x00bc */ DWORD unknown000047; -/* 0x00c0 */ DWORD unknown000048; -/* 0x00c4 */ DWORD unknown000049; -/* 0x00c8 */ DWORD unknown000050; -/* 0x00cc */ DWORD unknown000051; -/* 0x00d0 */ DWORD unknown000052; -/* 0x00d4 */ DWORD unknown000053; -/* 0x00d8 */ DWORD unknown000054; -/* 0x00dc */ DWORD unknown000055; -/* 0x00e0 */ DWORD unknown000056; -/* 0x00e4 */ DWORD unknown000057; -/* 0x00e8 */ DWORD unknown000058; -/* 0x00ec */ DWORD unknown000059; -/* 0x00f0 */ DWORD unknown000060; -/* 0x00f4 */ DWORD unknown000061; -/* 0x00f8 */ DWORD unknown000062; -/* 0x00fc */ DWORD unknown000063; -/* 0x0100 */ DWORD unknown000064; -/* 0x0104 */ DWORD unknown000065; -/* 0x0108 */ DWORD unknown000066; -/* 0x010c */ DWORD unknown000067; -/* 0x0110 */ DWORD unknown000068; -/* 0x0114 */ DWORD unknown000069; -/* 0x0118 */ DWORD unknown000070; -/* 0x011c */ DWORD unknown000071; -/* 0x0120 */ DWORD unknown000072; -/* 0x0124 */ DWORD unknown000073; -/* 0x0128 */ DWORD unknown000074; -/* 0x012c */ DWORD unknown000075; -/* 0x0130 */ DWORD unknown000076; -/* 0x0134 */ DWORD unknown000077; -/* 0x0138 */ DWORD unknown000078; -/* 0x013c */ DWORD unknown000079; -/* 0x0140 */ DWORD unknown000080; -/* 0x0144 */ DWORD unknown000081; /*? 0x80000001 */ +/* 0x0040 */ CHAR DeviceName[MAX_PATH]; +/* 0x0144 */ DWORD StateFlags; /*? 0x80000001 */ /* 0x0148 */ DWORD unknown000082; /*? 0x00000001 */ /* 0x014c */ DWORD unknown000083; /* 0x0150 */ DWORD unknown000084;

1 0

[mpiulachs] 31363: spanish translation for format and regsvr32 by Remialdo <remialdo at gmail dot com> See issue #2908 for more details.
by mpiulachs＠svn.reactos.org 20 Dec '07

20 Dec '07

Author: mpiulachs Date: Thu Dec 20 23:23:06 2007 New Revision: 31363 URL: http://svn.reactos.org/svn/reactos?rev=31363&view=rev Log: spanish translation for format and regsvr32 by Remialdo <remialdo at gmail dot com> See issue #2908 for more details. Added: trunk/reactos/base/system/format/lang/es-ES.rc (with props) trunk/reactos/base/system/regsvr32/lang/es-ES.rc (with props) Modified: trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc Added: trunk/reactos/base/system/format/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/es… ============================================================================== --- trunk/reactos/base/system/format/lang/es-ES.rc (added) +++ trunk/reactos/base/system/format/lang/es-ES.rc Thu Dec 20 23:23:06 2007 @@ -1,0 +1,72 @@ +#include "resource.h" +/* + *Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-19 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +STRING_HELP, "Uso: %S unidad: [-FS:sistema de archivos] [-V:etiqueta] [-Q] [-A:tamaño] [-C]\n\n\ + [unidad:] Especifica la unidad a formatear.\n\ + -FS:sistema de archivos Especifica el sistema de archivos (%s).\n\ + -V:etiqueta Especifica la etiqueta del volumen.\n\ + -Q Realiza un formato rápido.\n\ + -A:tamaño Anula el tamaño por defecto de la unidad asignada. Configuración por defecto\n\ + es altamente recomendado para uso general\n\ + NTFS soporta 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT soporta 8192, 16K, 32K, 64K, 128K, 256K.\n\ + La compresión NTFS no es soportada para tamaños de la unidad asignada\n\ + por encima de 4096.\n\ + -C Por defecto los archivos creados en el nuevo volumen serán \n\ + comprimidos.\n\n" + +STRING_COMPLETE "%lu por ciento completado.\r" + +STRING_FORMAT_FAIL "FormatEx fue incapaz de completarse satisfactoriamente.\n\n" + +STRING_NO_SUPPORT "Operación No Soportada" + +STRING_FMIFS_FAIL "Imposible localizar puntos de entrada FMIFS.\n\n" + +STRING_UNKNOW_ARG "Argumento desconocido: %S\n" + +STRING_DRIVE_PARM "Parámetro de unidad requerido no encontrado.\n\n" + +STRING_ERROR_DRIVE_TYPE "Imposible determinar el tipo de unidad" + +STRING_INSERT_DISK "Inserte un nuevo disco en la unidad %C:\ny presione Enter cuando esté preparado..." + +STRING_NO_VOLUME "Imposible consultar el volumen" + +STRING_NO_VOLUME_SIZE "Imposible consultar el tamaño de volumen" + +STRING_FILESYSTEM "El tipo del Sistema de archivos es %S.\n" + +STRING_LABEL_NAME_EDIT "Introduzca la etiqueta del volumen para la unidad %C: " + +STRING_ERROR_LABEL "Etiqueta de volumen incorrecta para esta unidad.\n" + +STRING_YN_FORMAT "\nADVERTENCIA, ¡TODOS LOS DATOS DEL DISCO\n\ +UNIDAD %C: SE PERDERÁN!\nProceder con el formato (S/N)? " + +STRING_YES_NO_FAQ "SN" + +STRING_VERIFYING "Verificando" + +STRING_FAST_FMT "Dando formato rápido" + +STRING_CREATE_FSYS "Creando archivo de estrucutra del sistema.\n" + +STRING_FMT_COMPLETE "Formato completado.\n" + +STRING_VOL_COMPRESS "El volumen no soporta compresión.\n" + +STRING_ENTER_LABEL "Etiqueta del Volumen (11 caracteres, Enter para ninguno)? " + +STRING_NO_LABEL "Imposible etiquetar el volumen" + +STRING_FREE_SPACE "\n%I64d bytes espacio total del disco.\n%I64d bytes disponibles en el disco.\n" + +STRING_SERIAL_NUMBER "\nNúmero de Serie del Volumen es %04X-%04X\n" +} Propchange: trunk/reactos/base/system/format/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc (original) +++ trunk/reactos/base/system/format/rsrc.rc Thu Dec 20 23:23:06 2007 @@ -15,3 +15,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc" Added: trunk/reactos/base/system/regsvr32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/es-ES.rc (added) +++ trunk/reactos/base/system/regsvr32/lang/es-ES.rc Thu Dec 20 23:23:06 2007 @@ -1,0 +1,32 @@ +#include "resource.h" +/* + * Spanish Language resource file + * Traducido por: Javier Remacha 2007-12-20 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nUtilización: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - No registrar el servidor\n\ +/s - Silencio; no mostrar mensajes\n\ +/c - Salida por la consola\n\ +/i - Llama DllInstall pasando un opcional [cmdline]; cuando se usa con /u provoca la desinstalación de la dll\n\ +/n - No llamar DllRegisterServer; esta opción debe ser usada con /i" + +IDS_NoDllSpecified, "Ninguna DLL especificada." + +IDS_InvalidFlag, "Bandera desconocida: %s" + +IDS_SwitchN_NoI, "Bandera desconocida: /n debe ser usada con el conmutador /i" + +IDS_DllNotLoaded, "LoadLibrary('%s') falló.\nGetLastError devuelve 0x%08x." + +IDS_MissingEntry, "%s fue cargada, pero el %s punto de entrada no fue encontrado.\n\n\ +%s no puede ser exportado, o una versión corrupta de %s puede estar en memoria. Considere usar PView para detectarla y eliminarla." + +IDS_FailureMessage, "%s en %s falló.\nEl código retornado fue: 0x%08x" + +IDS_SuccessMessage "%s en %s satisfactorio." +} Propchange: trunk/reactos/base/system/regsvr32/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… ============================================================================== --- trunk/reactos/base/system/regsvr32/rsrc.rc (original) +++ trunk/reactos/base/system/regsvr32/rsrc.rc Thu Dec 20 23:23:06 2007 @@ -16,3 +16,4 @@ #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/es-ES.rc"

1 0

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