Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 14535: fixed warnings
by weiden＠svn.reactos.com 07 Apr '05

07 Apr '05

fixed warnings Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/thread/thread.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-04-07 11:24:38 UTC (rev 14534) +++ trunk/reactos/lib/kernel32/process/create.c 2005-04-07 13:11:46 UTC (rev 14535) @@ -283,7 +283,7 @@ void * DispatcherContext) { EXCEPTION_POINTERS ExceptionInfo; - EXCEPTION_DISPOSITION ExceptionDisposition; + EXCEPTION_DISPOSITION ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; ExceptionInfo.ExceptionRecord = ExceptionRecord; ExceptionInfo.ContextRecord = ContextRecord; @@ -300,10 +300,6 @@ } _SEH_END; } - else - { - ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - } if (ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) ExitProcess(ExceptionRecord->ExceptionCode); _____ Modified: trunk/reactos/lib/kernel32/thread/thread.c --- trunk/reactos/lib/kernel32/thread/thread.c 2005-04-07 11:24:38 UTC (rev 14534) +++ trunk/reactos/lib/kernel32/thread/thread.c 2005-04-07 13:11:46 UTC (rev 14535) @@ -29,7 +29,7 @@ void * DispatcherContext) { EXCEPTION_POINTERS ExceptionInfo; - EXCEPTION_DISPOSITION ExceptionDisposition; + EXCEPTION_DISPOSITION ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; ExceptionInfo.ExceptionRecord = ExceptionRecord; ExceptionInfo.ContextRecord = ContextRecord; @@ -46,10 +46,6 @@ } _SEH_END; } - else - { - ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; - } if (ExceptionDisposition == EXCEPTION_EXECUTE_HANDLER) ExitThread(ExceptionRecord->ExceptionCode);

1 0

[greatlrd] 14534: Remove more hardcode string to En.rc
by greatlrd＠svn.reactos.com 07 Apr '05

07 Apr '05

Remove more hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/dirstack.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-07 11:24:38 UTC (rev 14534) @@ -147,10 +147,69 @@ /%c Yes. Kill even *.* without asking.\n \ /%c Zap. Delete hidden, read-only and system files).\n" +STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" STRING_DEL_HELP3, " %lu file deleted\n" - STRING_DEL_HELP4, " %lu files deleted\n" +STRING_DELAY_HELP, "pause for n seconds or milliseconds\n \ +DELAY [/m]n\n\n \ + /m specifiy than n are milliseconds\n \ + otherwise n are seconds" + +STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n \ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n \ + [drive:][path][filename]\n \ + Specifies drive, directory, and/or files to list.\n\n \ + /A Displays files with specified attributes.\n \ + attributes D Directories R Read-only files\n \ + H Hidden files A Files ready for archiving\n \ + S System files - Prefix meaning not\n \ + /B Uses bare format (no heading information or summary).\n \ + /C Display the thousand separator in file sizes. This is the\n \ + default. Use /-C to disable display of separator.\n \ + /D Same as wide but files are list sorted by column.\n \ + /L Uses lowercase.\n \ + /N New long list format where filenames are on the far right.\n \ + /O List by files in sorted order.\n \ + sortorder N By name (alphabetic) S By size (smallest first)\n \ + E By extension (alphabetic) D By date/time (oldest first)\n \ + G Group directories first - Prefix to reverse order\n \ + /P Pauses after each screenful of information.\n \ + /Q Display the owner of the file.\n \ + /S Displays files in specified directory and all subdirectories.\n \ + /T Controls which time field displayed or used for sorting\n \ + timefield C Creation\n \ + A Last Access\n \ + W Last Written\n \ + /W Uses wide list format.\n \ + /X This displays the short names generated for non-8dot3 file\n \ + names. The format is that of /N with the short name inserted\n \ + before the long name. If no short name is present, blanks are\n \ + displayed in its place.\n \ + /4 Displays four-digit years\n\n \ +Switches may be preset in the DIRCMD environment variable. Override\n \ +preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n " + +STRING_DIR_HELP2, " Volume in drive %c is %s" +STRING_DIR_HELP3, " Volume in drive %c has no label" +STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" +STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP7, "\n Directory of %s\n\n" +STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n \ +changes to the specified directory.\n\n \ +PUSHD [path | ..]\n\n \ + path Specifies the directory to make the current directory" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + + STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_MKDIR_HELP, "Creates a directory.\n\n \ @@ -161,15 +220,16 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" -STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" + + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" STRING_DEL_OPTION, "AENPQSTWXYZ" _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -10,6 +10,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_DELAY @@ -18,17 +19,14 @@ { DWORD val; DWORD mul=1000; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutPuts(_T( - "pause for n seconds or milliseconds" - "\n" - "DELAY [/m]n\n" - "\n" - " /m specifiy than n are milliseconds\n" - " otherwise n are seconds")); - return 0; + LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + + return 0; } if (*param==0) _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -129,6 +129,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_DIR @@ -209,44 +210,9 @@ static VOID DirHelp (VOID) { - ConOutPuts(_T( - "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n" - " [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n" - "\n" - " [drive:][path][filename]\n" - " Specifies drive, directory, and/or files to list.\n" - "\n" - " /A Displays files with specified attributes.\n" - " attributes D Directories R Read-only files\n" - " H Hidden files A Files ready for archiving\n" - " S System files - Prefix meaning not\n" - " /B Uses bare format (no heading information or summary).\n" - " /C Display the thousand separator in file sizes. This is the\n" - " default. Use /-C to disable display of separator.\n" - " /D Same as wide but files are list sorted by column.\n" - " /L Uses lowercase.\n" - " /N New long list format where filenames are on the far right.\n" - " /O List by files in sorted order.\n" - " sortorder N By name (alphabetic) S By size (smallest first)\n" - " E By extension (alphabetic) D By date/time (oldest first)\n" - " G Group directories first - Prefix to reverse order\n" - " /P Pauses after each screenful of information.\n" - " /Q Display the owner of the file.\n" - " /S Displays files in specified directory and all subdirectories.\n" - " /T Controls which time field displayed or used for sorting\n" - " timefield C Creation\n" - " A Last Access\n" - " W Last Written\n" - " /W Uses wide list format.\n" - " /X This displays the short names generated for non-8dot3 file\n" - " names. The format is that of /N with the short name inserted\n" - " before the long name. If no short name is present, blanks are\n" - " displayed in its place.\n" - " /4 Displays four-digit years\n" - " \n" - "Switches may be preset in the DIRCMD environment variable. Override\n" - "preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" - )); + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); } @@ -807,6 +773,7 @@ TCHAR szVolName[80]; DWORD dwSerialNr; LPTSTR p; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (lpFlags->bBareFormat) return(TRUE); @@ -858,17 +825,27 @@ } /* print drive info */ - ConOutPrintf(_T(" Volume in drive %c"), szRootName[0]); - + if (szVolName[0] != _T('\0')) - ConOutPrintf(_T(" is %s\n"), szVolName); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); + } else - ConOutPrintf(_T(" has no label\n")); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); + } + + + /* print the volume serial number if the return was successful */ - ConOutPrintf(_T(" Volume Serial Number is %04X-%04X\n"), - HIWORD(dwSerialNr), - LOWORD(dwSerialNr)); + + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), + HIWORD(dwSerialNr), + LOWORD(dwSerialNr)); return(TRUE); } @@ -1079,6 +1056,7 @@ TCHAR szBuffer[64]; ULARGE_INTEGER uliFree; TCHAR szRoot[] = _T("A:\\"); +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Here we check if we didn't find anything */ @@ -1095,15 +1073,17 @@ if (lpFlags->bRecursive) { ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - ConOutPrintf (_T("\n Total Files Listed:\n")); - ConOutPrintf(_T("%16i File(s)% 14s bytes\n"),ulFiles, szBuffer); + + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); } /* Print total directories and freespace */ szRoot[0] = szPath[0]; GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); - ConOutPrintf (_T("%16i Dir(s)% 15s bytes\n"),ulDirs, szBuffer); + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); return 0; } @@ -1408,6 +1388,7 @@ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Print directory header */ _tcscpy(szTemp, szCurPath); @@ -1417,7 +1398,10 @@ We are not printing in bare format and if we are in recursive mode... we must have results */ if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) - ConOutPrintf("\n Directory of %s\n\n", szTemp); + { + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T( (LPTSTR)szMsg), szTemp); + } /* Bare format */ if (lpFlags->bBareFormat) @@ -1626,6 +1610,7 @@ DWORD dwCountDirs; /* Counter for directories */ ULARGE_INTEGER u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64Temp; /* A temporary counter */ +WCHAR szMsg[RC_STRING_MAX_SIZE]; /* Initialize Variables */ ptrStartNode = NULL; @@ -1743,8 +1728,8 @@ if (!(lpFlags->bBareFormat) && (dwCount > 0)) { ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); - ConOutPrintf(_T("%16i File(s) %14s bytes\n"), - dwCountFiles, szBytes); + LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); } /* Add statistics to recursive statistics*/ _____ Modified: trunk/reactos/subsys/system/cmd/dirstack.c --- trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/dirstack.c 2005-04-07 11:24:38 UTC (rev 14534) @@ -15,6 +15,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef FEATURE_DIRECTORY_STACK @@ -139,13 +140,13 @@ TCHAR curPath[MAX_PATH]; TCHAR newPath[MAX_PATH]; BOOL bChangePath = FALSE; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (rest, _T("/?"), 2)) { - ConOutPuts (_T("Stores the current directory for use by the POPD command, then\n" - "changes to the specified directory.\n\n" - "PUSHD [path | ..]\n\n" - " path Specifies the directory to make the current directory")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -172,11 +173,13 @@ INT CommandPopd (LPTSTR first, LPTSTR rest) { TCHAR szPath[MAX_PATH]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp(rest, _T("/?"), 2)) - { - ConOutPuts (_T("Changes to the directory stored by the PUSHD command.\n\n" - "POPD")); + { + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -198,12 +201,13 @@ INT CommandDirs (LPTSTR first, LPTSTR rest) { LPDIRENTRY lpDir; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp(rest, _T("/?"), 2)) { - ConOutPuts (_T("Prints the contents of the directory stack.\n" - "\n" - "DIRS")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } @@ -212,7 +216,9 @@ if (lpDir == NULL) { - ConOutPuts (_T("Directory stack empty")); + LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts (_T((LPTSTR)szMsg)); + return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-06 22:27:22 UTC (rev 14533) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-07 11:24:38 UTC (rev 14534) @@ -65,13 +65,29 @@ #define STRING_DEL_HELP2 424 #define STRING_DEL_HELP3 425 #define STRING_DEL_HELP4 426 -#define STRING_EXIT_HELP 427 -#define STRING_MKDIR_HELP 428 -#define STRING_RMDIR_HELP 429 -#define STRING_REM_HELP 430 +#define STRING_DELAY_HELP 427 +#define STRING_DIR_HELP1 428 +#define STRING_DIR_HELP2 429 +#define STRING_DIR_HELP3 430 +#define STRING_DIR_HELP4 431 +#define STRING_DIR_HELP5 432 +#define STRING_DIR_HELP6 433 +#define STRING_DIR_HELP7 434 +#define STRING_DIR_HELP8 435 +#define STRING_DIRSTACK_HELP1 436 +#define STRING_DIRSTACK_HELP2 437 +#define STRING_DIRSTACK_HELP3 438 +#define STRING_DIRSTACK_HELP4 439 +#define STRING_EXIT_HELP 440 +#define STRING_MKDIR_HELP 441 +#define STRING_RMDIR_HELP 442 +#define STRING_REM_HELP 443 + + +

1 0

[chorns] 14533: Add the files where they are located
by chorns＠svn.reactos.com 06 Apr '05

06 Apr '05

Add the files where they are located Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx Modified: branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-06 22:27:22 UTC (rev 14533) @@ -181,7 +181,7 @@ ifneq ($(ROS_TEMPORARY),) TEMPORARY := $(ROS_TEMPORARY) else - TEMPORARY := . + TEMPORARY := endif TEMPORARY_ := $(TEMPORARY)$(SEP) _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-06 22:27:22 UTC (rev 14533) @@ -31,6 +31,9 @@ <directory name="reporterror"> <xi:include href="reporterror/reporterror.xml" /> </directory> +<directory name="rundll32"> + <xi:include href="rundll32/rundll32.xml" /> +</directory> <directory name="services"> <xi:include href="services/services.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabinet.cxx 2005-04-06 22:27:22 UTC (rev 14533) @@ -1755,23 +1755,20 @@ { FILEHANDLE SrcFile; PCFFILE_NODE FileNode; + char* NewFileName; - FileNode = NewFileNode(); - if (!FileNode) { + NewFileName = (char*)AllocateMemory(strlen(FileName) + 1); + if (!NewFileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); return CAB_STATUS_NOMEMORY; } + strcpy(NewFileName, FileName); + ConvertPath(NewFileName, false); - FileNode->FolderNode = CurrentFolderNode; - - FileNode->FileName = (char*)AllocateMemory(strlen(FileName) + 1); - strcpy(FileNode->FileName, FileName); - ConvertPath(FileNode->FileName, false); - /* Try to open file */ #if defined(WIN32) SrcFile = CreateFile( - FileNode->FileName, // Open this file + NewFileName, // Open this file GENERIC_READ, // Open for reading FILE_SHARE_READ, // Share for reading NULL, // No security @@ -1779,21 +1776,34 @@ FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (SrcFile == INVALID_HANDLE_VALUE) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_OPEN; } #else /* !WIN32 */ - SrcFile = fopen(FileNode->FileName, "rb"); + SrcFile = fopen(NewFileName, "rb"); if (SrcFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_OPEN; } #endif + FileNode = NewFileNode(); + if (!FileNode) { + DPRINT(MIN_TRACE, ("Insufficient memory.\n")); + FreeMemory(NewFileName); + return CAB_STATUS_NOMEMORY; + } + + FileNode->FolderNode = CurrentFolderNode; + FileNode->FileName = NewFileName; + /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); if (FileNode->File.FileSize == (unsigned long)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); + FreeMemory(NewFileName); return CAB_STATUS_CANNOT_READ; } _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx --- branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/cabman/dfp.cxx 2005-04-06 22:27:22 UTC (rev 14533) @@ -1016,8 +1016,9 @@ char SrcName[MAX_PATH]; char DstName[MAX_PATH]; char InfLine[MAX_PATH]; + char BaseFilename[MAX_PATH]; - strcpy(SrcName, FileRelativePath); + strcpy(SrcName, ""); strcpy(DstName, ""); i = CurrentChar; @@ -1031,7 +1032,8 @@ CurrentString[i] = '\0'; CurrentToken = TokenString; CurrentChar = i + 1; - strcat(SrcName, CurrentString); + strcpy(BaseFilename, CurrentString); + strcat(SrcName, BaseFilename); SkipSpaces(); @@ -1080,6 +1082,11 @@ WriteInfLine(InfLine); Status = AddFile(SrcName); + if (Status == CAB_STATUS_CANNOT_OPEN) { + strcpy(SrcName, FileRelativePath); + strcat(SrcName, BaseFilename); + Status = AddFile(SrcName); + } if (Status != CAB_STATUS_SUCCESS) { if (Status == CAB_STATUS_CANNOT_OPEN) printf("File does not exist: %s.\n", SrcName); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 20:49:49 UTC (rev 14532) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 22:27:22 UTC (rev 14533) @@ -2195,6 +2195,9 @@ const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) { + string sourceFilename = PassThruCacheDirectory ( + NormalizeFilename ( m.GetPath () ), + backend->outputDirectory ); string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd ); string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), @@ -2203,7 +2206,7 @@ "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, "\t${cp} %s %s 1>$(NUL)\n", - m.GetPath ().c_str (), + sourceFilename.c_str (), targetFilename.c_str () ); } } @@ -2314,16 +2317,21 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; + string bootcd = PassThruCacheDirectory ( + NormalizeFilename ( bootcdDirectory + SSEP ), + backend->outputDirectory ); string isoboot = PassThruCacheDirectory ( - NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ), - backend->intermediateDirectory ); - string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; + NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ), + backend->outputDirectory ); + string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos"; string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup ), backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); - string reactosInf = ros_temp + NormalizeFilename ( bootcdReactosNoFixup + "/reactos.inf" ); - string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); + string reactosInf = PassThruCacheDirectory ( + NormalizeFilename ( bootcdReactosNoFixup + SSEP "reactos.inf" ), + backend->outputDirectory ); + string reactosDff = NormalizeFilename ( "bootdata" SSEP "packages" SSEP "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); vector<string> vCdFiles; GetCdFiles ( vCdFiles ); @@ -2340,7 +2348,7 @@ cdFiles.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I\n", + "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", reactosDff.c_str (), bootcdReactos.c_str () ); fprintf ( fMakefile, @@ -2357,7 +2365,7 @@ fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n", isoboot.c_str (), - bootcdDirectory.c_str () ); + bootcd.c_str () ); fprintf ( fMakefile, "\n" ); }

1 0

[chorns] 14532: Correct some wrong dependencies for 'make bootcd'
by chorns＠svn.reactos.com 06 Apr '05

06 Apr '05

Correct some wrong dependencies for 'make bootcd' Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-06 20:05:23 UTC (rev 14531) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-06 20:49:49 UTC (rev 14532) @@ -178,6 +178,13 @@ endif OUTPUT_ := $(OUTPUT)$(SEP) +ifneq ($(ROS_TEMPORARY),) + TEMPORARY := $(ROS_TEMPORARY) +else + TEMPORARY := . +endif +TEMPORARY_ := $(TEMPORARY)$(SEP) + ifneq ($(ROS_INSTALL),) INSTALL := $(ROS_INSTALL) else _____ Modified: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-06 20:05:23 UTC (rev 14531) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-04-06 20:49:49 UTC (rev 14532) @@ -18,7 +18,7 @@ CABMAN_TARGET = \ $(EXEPREFIX)$(CABMAN_OUT_)cabman$(EXEPOSTFIX) -CABMAN_SOURCES = $(addprefix $(CABMAN_INT_), \ +CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \ cabinet.cxx \ dfp.cxx \ main.cxx \ @@ -42,23 +42,23 @@ $(ECHO_LD) ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ -$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ -$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_BASE_DIR) +$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx $(CABMAN_INT) $(ECHO_CC) ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 20:05:23 UTC (rev 14531) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-06 20:49:49 UTC (rev 14532) @@ -10,7 +10,7 @@ #define CLEAN_FILE(f) clean_files.push_back ( f ); /*if ( module.name == "crt" ) printf ( "%s(%i): clean: %s\n", __FILE__, __LINE__, f.c_str() )*/ -static string ros_temp = "$(ROS_TEMPORARY)"; +static string ros_temp = "$(TEMPORARY)"; MingwBackend* MingwModuleHandler::backend = NULL; FILE* @@ -339,6 +339,8 @@ const string& sourceFilename, string_list* pclean_files ) const { + Directory* directoryTree; + string newExtension; string extension = GetExtension ( sourceFilename ); if ( extension == ".rc" || extension == ".RC" ) @@ -347,11 +349,17 @@ newExtension = ".stubs.o"; else newExtension = ".o"; + + if ( module.type == BootSector ) + directoryTree = backend->outputDirectory; + else + directoryTree = backend->intermediateDirectory; + string obj_file = PassThruCacheDirectory ( NormalizeFilename ( ReplaceExtension ( RemoveVariables ( sourceFilename ), newExtension ) ), - backend->intermediateDirectory ); + directoryTree ); if ( pclean_files ) { string_list& clean_files = *pclean_files; @@ -2188,7 +2196,9 @@ if ( m.bootstrap != NULL ) { string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd ); - string targetFilename ( GetTargetMacro ( module ) ); + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + NormalizeFilename ( targetFilenameNoFixup ), + backend->outputDirectory ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); fprintf ( fMakefile, @@ -2272,7 +2282,12 @@ { const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) - out.push_back ( NormalizeFilename ( m.GetPath () ) ); + { + string filename = PassThruCacheDirectory ( + NormalizeFilename ( m.GetPath () ), + backend->outputDirectory ); + out.push_back ( filename ); + } } } @@ -2283,7 +2298,7 @@ for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { const CDFile& cdfile = *module.project.cdfiles[i]; - out.push_back ( NormalizeFilename ( cdfile.GetPath () ) ); + out.push_back ( cdfile.GetPath () ); } } @@ -2299,7 +2314,9 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; - string isoboot = NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ); + string isoboot = PassThruCacheDirectory ( + NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ), + backend->intermediateDirectory ); string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup ), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-04-06 20:05:23 UTC (rev 14531) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-04-06 20:49:49 UTC (rev 14532) @@ -589,7 +589,10 @@ string Module::GetPath () const { - return path + CSEP + GetTargetName (); + if ( path.length() > 0 ) + return path + CSEP + GetTargetName (); + else + return GetTargetName (); } string

1 0

[robertk] 14531: version info 0.2.6
by robertk＠svn.reactos.com 06 Apr '05

06 Apr '05

version info 0.2.6 Modified: branches/ros-branch-0_2_6/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_6/reactos/include/reactos/version.h --- branches/ros-branch-0_2_6/reactos/include/reactos/version.h 2005-04-06 18:30:09 UTC (rev 14530) +++ branches/ros-branch-0_2_6/reactos/include/reactos/version.h 2005-04-06 20:05:23 UTC (rev 14531) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 6 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

1 0

[weiden] 14530: reformat some code to make it readably
by weiden＠svn.reactos.com 06 Apr '05

06 Apr '05

reformat some code to make it readably Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-04-06 17:40:25 UTC (rev 14529) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-04-06 18:30:09 UTC (rev 14530) @@ -28,40 +28,32 @@ /* TYPES */ /* Pointer to a callback that handles a particular parameter */ -typedef BOOL (*COMMDCB_PARAM_CALLBACK) -( - DCB *, - COMMTIMEOUTS *, - BOOL *, - LPWSTR * -); +typedef BOOL (*COMMDCB_PARAM_CALLBACK)(DCB *, COMMTIMEOUTS *, BOOL *, LPWSTR *); /* Symbolic flag of any length */ typedef struct _COMMDCB_PARAM_STRFLAG { - UNICODE_STRING String; - ULONG_PTR Value; -} COMMDCB_PARAM_STRFLAG; + UNICODE_STRING String; + ULONG_PTR Value; +} COMMDCB_PARAM_STRFLAG, *PCOMMDCB_PARAM_STRFLAG; /* One char long symbolic flag */ typedef struct _COMMDCB_PARAM_CHARFLAG { - WCHAR Char; - ULONG_PTR Value; -} COMMDCB_PARAM_CHARFLAG; + WCHAR Char; + ULONG_PTR Value; +} COMMDCB_PARAM_CHARFLAG, *PCOMMDCB_PARAM_CHARFLAG; /* MACROS */ -/* stupid Borland C++ requires this */ -#define _L(__S__) L ## __S__ /* Declare a parameter handler */ #define COMMDCB_PARAM_HANDLER(__P__) \ BOOL COMMDCB_ ## __P__ ## Param \ ( \ - DCB * Dcb, \ - COMMTIMEOUTS * Timeouts, \ - BOOL * StopBitsSet, \ - LPWSTR * StrTail \ + DCB * Dcb, \ + COMMTIMEOUTS * Timeouts, \ + BOOL *StopBitsSet, \ + LPWSTR *StrTail \ ) /* UTILITIES */ @@ -69,67 +61,54 @@ Lookup a string flag and return its numerical value. The flags array must be sorted - a dichotomycal search is performed */ -BOOL COMMDCB_LookupStrFlag -( - UNICODE_STRING * Flag, - COMMDCB_PARAM_STRFLAG * Flags, - int FlagCount, - ULONG_PTR * Value -) +static BOOL +COMMDCB_LookupStrFlag(PUNICODE_STRING Flag, + PCOMMDCB_PARAM_STRFLAG Flags, + int FlagCount, + PULONG_PTR Value) { - /* Lower and upper bound for dichotomycal search */ - int nLowerBound = 0; - int nUpperBound = FlagCount - 1; + /* Lower and upper bound for dichotomycal search */ + int nLowerBound = 0; + int nUpperBound = FlagCount - 1; - do - { - LONG nComparison; - /* pick the element in the middle of the area of interest as the pivot */ - int nCurFlag = nLowerBound + (nUpperBound - nLowerBound) / 2; + do + { + LONG nComparison; + /* pick the element in the middle of the area of interest as the pivot */ + int nCurFlag = nLowerBound + (nUpperBound - nLowerBound) / 2; - /* compare the string with the pivot */ - nComparison = RtlCompareUnicodeString - ( - Flag, - &Flags[nCurFlag].String, - TRUE - ); + /* compare the string with the pivot */ + nComparison = RtlCompareUnicodeString(Flag, + &Flags[nCurFlag].String, + TRUE); - /* string is equal */ - if(nComparison == 0) - { - /* return the flag's value */ - *Value = Flags[nCurFlag].Value; + /* string is equal */ + if(nComparison == 0) + { + /* return the flag's value */ + *Value = Flags[nCurFlag].Value; - /* success */ - return TRUE; - } - /* string is less than */ - else if(nComparison < 0) - { - /* - restrict the search to the first half of the current slice, minus the pivot - */ - nUpperBound = nCurFlag - 1; + /* success */ + return TRUE; + } + else if(nComparison < 0) + { + /* + * restrict the search to the first half of the current slice, minus the pivot + */ + nUpperBound = nCurFlag - 1; + } + else + { + /* + * restrict the search to the second half of the current slice, minus the pivot + */ + nLowerBound = nCurFlag + 1; + } + } while(nLowerBound <= nUpperBound); - /* fallthrough */ - } - /* string is greater than */ - else - { - /* - restrict the search to the second half of the current slice, minus the pivot - */ - nLowerBound = nCurFlag + 1; - - /* fallthrough */ - } - } - /* continue until the slice is empty */ - while(nLowerBound <= nUpperBound); - - /* string not found: failure */ - return FALSE; + /* string not found: failure */ + return FALSE; } /* PARSERS */ @@ -137,450 +116,463 @@ Find the next character flag and return its numerical value. The flags array must be sorted - a dichotomycal search is performed */ -BOOL COMMDCB_ParseCharFlag -( - LPWSTR * StrTail, - COMMDCB_PARAM_CHARFLAG * Flags, - int FlagCount, - ULONG_PTR * Value -) +static BOOL +COMMDCB_ParseCharFlag(LPWSTR *StrTail, + PCOMMDCB_PARAM_CHARFLAG Flags, + int FlagCount, + PULONG_PTR Value) { - /* Lower and upper bound for dichotomycal search */ - int nLowerBound = 0; - int nUpperBound = FlagCount - 1; - /* get the first character as the flag */ - WCHAR wcFlag = (*StrTail)[0]; + /* Lower and upper bound for dichotomycal search */ + int nLowerBound = 0; + int nUpperBound = FlagCount - 1; + /* get the first character as the flag */ + WCHAR wcFlag = (*StrTail)[0]; - /* premature end of string, or the character is whitespace */ - if(!wcFlag || iswspace(wcFlag)) - /* failure */ - return FALSE; + /* premature end of string, or the character is whitespace */ + if(!wcFlag || iswspace(wcFlag)) + return FALSE; - /* uppercase the character for case-insensitive search */ - wcFlag = towupper(wcFlag); + /* uppercase the character for case-insensitive search */ + wcFlag = towupper(wcFlag); - /* skip the character flag */ - ++ (*StrTail); + /* skip the character flag */ + (*StrTail)++; - /* see COMMDCB_LookupStrFlag for a description of the algorithm */ - do - { - LONG nComparison; - int nCurFlag = nLowerBound + (nUpperBound - nLowerBound) / 2; + /* see COMMDCB_LookupStrFlag for a description of the algorithm */ + do + { + LONG nComparison; + int nCurFlag = nLowerBound + (nUpperBound - nLowerBound) / 2; - nComparison = wcFlag - towupper(Flags[nCurFlag].Char); + nComparison = wcFlag - towupper(Flags[nCurFlag].Char); - if(nComparison == 0) - { - *Value = Flags[nCurFlag].Value; + if(nComparison == 0) + { + *Value = Flags[nCurFlag].Value; - return TRUE; - } - else if(nComparison < 0) - { - nUpperBound = nCurFlag - 1; - } - else - { - nLowerBound = nCurFlag + 1; - } - } - while(nUpperBound >= nLowerBound); + return TRUE; + } + else if(nComparison < 0) + { + nUpperBound = nCurFlag - 1; + } + else + { + nLowerBound = nCurFlag + 1; + } + } while(nUpperBound >= nLowerBound); - /* flag not found: failure */ - return FALSE; + /* flag not found: failure */ + return FALSE; } /* Find the next string flag and return its numerical value. The flags array must be sorted - a dichotomycal search is performed */ -BOOL COMMDCB_ParseStrFlag -( - LPWSTR * StrTail, - COMMDCB_PARAM_STRFLAG * Flags, - int FlagCount, - ULONG_PTR * Value -) +static BOOL +COMMDCB_ParseStrFlag(LPWSTR *StrTail, + PCOMMDCB_PARAM_STRFLAG Flags, + int FlagCount, + PULONG_PTR Value) { - LPWSTR pwcNewTail = *StrTail; - UNICODE_STRING wstrFlag; + LPWSTR pwcNewTail; + UNICODE_STRING wstrFlag; - /* scan the string until the first space character or the terminating null */ - while(pwcNewTail[0] && !iswspace(pwcNewTail[0])) - ++ pwcNewTail; + /* scan the string until the first space character or the terminating null */ + for(pwcNewTail = *StrTail; + pwcNewTail[0] && !iswspace(pwcNewTail[0]); + pwcNewTail++); - /* string flag empty */ - if(pwcNewTail == *StrTail) - /* failure */ - return FALSE; + /* string flag empty */ + if(pwcNewTail == *StrTail) + return FALSE; - /* build the UNICODE_STRING description of the string flag */ - wstrFlag.Buffer = *StrTail; - wstrFlag.Length = (pwcNewTail - *StrTail) * sizeof(WCHAR); - wstrFlag.MaximumLength = wstrFlag.Length; + /* build the UNICODE_STRING description of the string flag */ + wstrFlag.Buffer = *StrTail; + wstrFlag.Length = (pwcNewTail - *StrTail) * sizeof(WCHAR); + wstrFlag.MaximumLength = wstrFlag.Length; - /* skip the string flag */ - *StrTail = pwcNewTail; + /* skip the string flag */ + *StrTail = pwcNewTail; - /* lookup the string flag's value and return it */ - return COMMDCB_LookupStrFlag(&wstrFlag, Flags, FlagCount, Value); + /* lookup the string flag's value and return it */ + return COMMDCB_LookupStrFlag(&wstrFlag, Flags, FlagCount, Value); } /* Parse a boolean value in the symbolic form on/off */ -BOOL COMMDCB_ParseBool(LPWSTR * StrTail, BOOL * Value) +static BOOL +COMMDCB_ParseBool(LPWSTR *StrTail, + PBOOL Value) { - BOOL bRetVal; - ULONG_PTR nValue; - static COMMDCB_PARAM_STRFLAG a_BoolFlags[] = - { - { ROS_STRING_INITIALIZER(L"off"), FALSE }, - { ROS_STRING_INITIALIZER(L"on"), TRUE } - }; + BOOL bRetVal; + ULONG_PTR nValue; + static COMMDCB_PARAM_STRFLAG a_BoolFlags[] = { + { ROS_STRING_INITIALIZER(L"off"), FALSE }, + { ROS_STRING_INITIALIZER(L"on"), TRUE } + }; - /* try to recognize the next flag as a boolean */ - bRetVal = COMMDCB_ParseStrFlag - ( - StrTail, - a_BoolFlags, - sizeof(a_BoolFlags) / sizeof(a_BoolFlags[0]), - &nValue - ); + /* try to recognize the next flag as a boolean */ + bRetVal = COMMDCB_ParseStrFlag(StrTail, + a_BoolFlags, + sizeof(a_BoolFlags) / sizeof(a_BoolFlags[0]), + &nValue); - /* failure */ - if(!bRetVal) return FALSE; - /* success */ - *Value = nValue ? TRUE : FALSE; - return TRUE; + if(!bRetVal) + return FALSE; + + /* success */ + *Value = (nValue ? TRUE : FALSE); + return TRUE; } /* Parse a decimal integer */ -BOOL COMMDCB_ParseInt(LPWSTR * StrTail, DWORD * Value) +static BOOL +COMMDCB_ParseInt(LPWSTR *StrTail, + DWORD *Value) { - LPWSTR pwcPrevTail = *StrTail; - DWORD nValue = wcstoul(*StrTail, StrTail, 10); + LPWSTR pwcPrevTail = *StrTail; + DWORD nValue = wcstoul(*StrTail, StrTail, 10); - /* no character was consumed: failure */ - if(pwcPrevTail == *StrTail) return FALSE; + /* no character was consumed: failure */ + if(pwcPrevTail == *StrTail) + return FALSE; - /* success */ - *Value = nValue; - return TRUE; + /* success */ + *Value = nValue; + return TRUE; } /* PARAMETER HANDLERS */ /* baud= */ COMMDCB_PARAM_HANDLER(baud) { - DWORD nValue; + DWORD nValue; - (void)Timeouts; + (void)Timeouts; - /* parse the baudrate */ - if(!COMMDCB_ParseInt(StrTail, &nValue)) - /* failure */ - return FALSE; + /* parse the baudrate */ + if(!COMMDCB_ParseInt(StrTail, &nValue)) + return FALSE; - switch(nValue) - { - /* documented abbreviations */ - case 11: Dcb->BaudRate = 110; break; - case 15: Dcb->BaudRate = 150; break; - case 30: Dcb->BaudRate = 300; break; - case 60: Dcb->BaudRate = 600; break; - case 12: Dcb->BaudRate = 1200; break; - case 24: Dcb->BaudRate = 2400; break; - case 48: Dcb->BaudRate = 4800; break; - case 96: Dcb->BaudRate = 9600; break; - case 19: Dcb->BaudRate = 19200; break; - /* literal value */ - default: Dcb->BaudRate = nValue; break; - } + switch(nValue) + { + /* documented abbreviations */ + case 11: + Dcb->BaudRate = 110; + break; + case 15: + Dcb->BaudRate = 150; + break; + case 30: + Dcb->BaudRate = 300; + break; + case 60: + Dcb->BaudRate = 600; + break; + case 12: + Dcb->BaudRate = 1200; + break; + case 24: + Dcb->BaudRate = 2400; + break; + case 48: + Dcb->BaudRate = 4800; + break; + case 96: + Dcb->BaudRate = 9600; + break; + case 19: + Dcb->BaudRate = 19200; + break; - /* if the stop bits haven't been specified explicitely */ - if(!(*StopBitsSet)) - { - /* default the stop bits to 2 for 110 baud */ - if(Dcb->BaudRate == 110) Dcb->StopBits = TWOSTOPBITS; - /* else, default the stop bits to 1 */ - else Dcb->StopBits = ONESTOPBIT; - } + /* literal value */ + default: + Dcb->BaudRate = nValue; + break; + } - /* success */ - return TRUE; + /* if the stop bits haven't been specified explicitely */ + if(!(*StopBitsSet)) + { + /* default the stop bits to 2 for 110 baud */ + if(Dcb->BaudRate == 110) + Dcb->StopBits = TWOSTOPBITS; + /* else, default the stop bits to 1 */ + else + Dcb->StopBits = ONESTOPBIT; + } + + /* success */ + return TRUE; } /* data= */ COMMDCB_PARAM_HANDLER(data) { - DWORD nValue; + DWORD nValue; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the data bits */ - if(!COMMDCB_ParseInt(StrTail, &nValue)) - /* failure */ - return FALSE; + /* parse the data bits */ + if(!COMMDCB_ParseInt(StrTail, &nValue)) + return FALSE; - /* value out of range: failure */ - if(nValue < 5 || nValue > 8) return FALSE; + /* value out of range: failure */ + if(nValue < 5 || nValue > 8) + return FALSE; - /* success */ - Dcb->ByteSize = nValue; - return TRUE; + /* success */ + Dcb->ByteSize = nValue; + return TRUE; } /* dtr= */ COMMDCB_PARAM_HANDLER(dtr) { - BOOL bRetVal; - ULONG_PTR nValue; - static COMMDCB_PARAM_STRFLAG a_DTRFlags[] = - { - { ROS_STRING_INITIALIZER(L"hs"), DTR_CONTROL_HANDSHAKE }, - { ROS_STRING_INITIALIZER(L"off"), DTR_CONTROL_DISABLE }, - { ROS_STRING_INITIALIZER(L"on"), DTR_CONTROL_ENABLE } - }; + BOOL bRetVal; + ULONG_PTR nValue; + static COMMDCB_PARAM_STRFLAG a_DTRFlags[] = { + { ROS_STRING_INITIALIZER(L"hs"), DTR_CONTROL_HANDSHAKE }, + { ROS_STRING_INITIALIZER(L"off"), DTR_CONTROL_DISABLE }, + { ROS_STRING_INITIALIZER(L"on"), DTR_CONTROL_ENABLE } + }; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - bRetVal = COMMDCB_ParseStrFlag - ( - StrTail, - a_DTRFlags, - sizeof(a_DTRFlags) / sizeof(a_DTRFlags[0]), - &nValue - ); + /* parse the flag */ + bRetVal = COMMDCB_ParseStrFlag(StrTail, + a_DTRFlags, + sizeof(a_DTRFlags) / sizeof(a_DTRFlags[0]), + &nValue); - /* failure */ - if(!bRetVal) return FALSE; + /* failure */ + if(!bRetVal) + return FALSE; - /* success */ - Dcb->fDtrControl = nValue; - return TRUE; + /* success */ + Dcb->fDtrControl = nValue; + return TRUE; } /* idsr= */ COMMDCB_PARAM_HANDLER(idsr) { - BOOL bValue; + BOOL bValue; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - if(!COMMDCB_ParseBool(StrTail, &bValue)) - /* failure */ - return FALSE; + /* parse the flag */ + if(!COMMDCB_ParseBool(StrTail, &bValue)) + return FALSE; - /* success */ - Dcb->fDsrSensitivity = bValue; - return TRUE; + /* success */ + Dcb->fDsrSensitivity = bValue; + return TRUE; } /* octs= */ COMMDCB_PARAM_HANDLER(octs) { - BOOL bValue; + BOOL bValue; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - if(!COMMDCB_ParseBool(StrTail, &bValue)) - /* failure */ - return FALSE; + /* parse the flag */ + if(!COMMDCB_ParseBool(StrTail, &bValue)) + return FALSE; - /* success */ - Dcb->fOutxCtsFlow = bValue; - return TRUE; + /* success */ + Dcb->fOutxCtsFlow = bValue; + return TRUE; } /* odsr= */ COMMDCB_PARAM_HANDLER(odsr) { - BOOL bValue; + BOOL bValue; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - if(!COMMDCB_ParseBool(StrTail, &bValue)) - /* failure */ - return FALSE; + /* parse the flag */ + if(!COMMDCB_ParseBool(StrTail, &bValue)) + return FALSE; - /* success */ - Dcb->fOutxDsrFlow = bValue; - return TRUE; + /* success */ + Dcb->fOutxDsrFlow = bValue; + return TRUE; } /* parity= */ COMMDCB_PARAM_HANDLER(parity) { - BOOL bRetVal; - ULONG_PTR nValue; - static COMMDCB_PARAM_CHARFLAG a_ParityFlags[] = - { - { L'e', EVENPARITY }, - { L'm', MARKPARITY }, - { L'n', NOPARITY }, - { L'o', ODDPARITY }, - { L's', SPACEPARITY } - }; + BOOL bRetVal; + ULONG_PTR nValue; + static COMMDCB_PARAM_CHARFLAG a_ParityFlags[] = { + { L'e', EVENPARITY }, + { L'm', MARKPARITY }, + { L'n', NOPARITY }, + { L'o', ODDPARITY }, + { L's', SPACEPARITY } + }; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - bRetVal = COMMDCB_ParseCharFlag - ( - StrTail, - a_ParityFlags, - sizeof(a_ParityFlags) / sizeof(a_ParityFlags[0]), - &nValue - ); + /* parse the flag */ + bRetVal = COMMDCB_ParseCharFlag(StrTail, + a_ParityFlags, + sizeof(a_ParityFlags) / sizeof(a_ParityFlags[0]), + &nValue); - /* failure */ - if(!bRetVal) return FALSE; + /* failure */ + if(!bRetVal) + return FALSE; - /* success */ - Dcb->Parity = nValue; - return TRUE; + /* success */ + Dcb->Parity = nValue; + return TRUE; } /* rts= */ COMMDCB_PARAM_HANDLER(rts) { - DWORD nRetVal; - ULONG_PTR nValue; - static COMMDCB_PARAM_STRFLAG a_RTSFlags[] = - { - { ROS_STRING_INITIALIZER(L"hs"), RTS_CONTROL_HANDSHAKE }, - { ROS_STRING_INITIALIZER(L"off"), RTS_CONTROL_DISABLE }, - { ROS_STRING_INITIALIZER(L"on"), RTS_CONTROL_ENABLE }, - { ROS_STRING_INITIALIZER(L"tg"), RTS_CONTROL_TOGGLE } - }; + DWORD nRetVal; + ULONG_PTR nValue; + static COMMDCB_PARAM_STRFLAG a_RTSFlags[] = { + { ROS_STRING_INITIALIZER(L"hs"), RTS_CONTROL_HANDSHAKE }, + { ROS_STRING_INITIALIZER(L"off"), RTS_CONTROL_DISABLE }, + { ROS_STRING_INITIALIZER(L"on"), RTS_CONTROL_ENABLE }, + { ROS_STRING_INITIALIZER(L"tg"), RTS_CONTROL_TOGGLE } + }; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - nRetVal = COMMDCB_ParseStrFlag - ( - StrTail, - a_RTSFlags, - sizeof(a_RTSFlags) / sizeof(a_RTSFlags[0]), - &nValue - ); + /* parse the flag */ + nRetVal = COMMDCB_ParseStrFlag(StrTail, + a_RTSFlags, + sizeof(a_RTSFlags) / sizeof(a_RTSFlags[0]), + &nValue); - /* failure */ - if(!nRetVal) return FALSE; + /* failure */ + if(!nRetVal) + return FALSE; - /* success */ - Dcb->fRtsControl = nValue; - return TRUE; + /* success */ + Dcb->fRtsControl = nValue; + return TRUE; } /* stop= */ COMMDCB_PARAM_HANDLER(stop) { - BOOL bRetVal; - ULONG_PTR nValue; - static COMMDCB_PARAM_STRFLAG a_StopFlags[] = - { - { ROS_STRING_INITIALIZER(L"1"), ONESTOPBIT }, - { ROS_STRING_INITIALIZER(L"1.5"), ONE5STOPBITS }, - { ROS_STRING_INITIALIZER(L"2"), TWOSTOPBITS } - }; + BOOL bRetVal; + ULONG_PTR nValue; + static COMMDCB_PARAM_STRFLAG a_StopFlags[] = { + { ROS_STRING_INITIALIZER(L"1"), ONESTOPBIT }, + { ROS_STRING_INITIALIZER(L"1.5"), ONE5STOPBITS }, + { ROS_STRING_INITIALIZER(L"2"), TWOSTOPBITS } + }; - (void)Timeouts; + (void)Timeouts; - /* parse the flag */ - bRetVal = COMMDCB_ParseStrFlag - ( - StrTail, - a_StopFlags, - sizeof(a_StopFlags) / sizeof(a_StopFlags[0]), - &nValue - ); + /* parse the flag */ + bRetVal = COMMDCB_ParseStrFlag(StrTail, + a_StopFlags, + sizeof(a_StopFlags) / sizeof(a_StopFlags[0]), + &nValue); - /* failure */ - if(!bRetVal) return FALSE; + /* failure */ + if(!bRetVal) + return FALSE; - /* tell the baud= handler that the stop bits have been specified explicitely */ - *StopBitsSet = TRUE; + /* tell the baud= handler that the stop bits have been specified explicitely */ + *StopBitsSet = TRUE; - /* success */ - Dcb->StopBits = nValue; - return TRUE; + /* success */ + Dcb->StopBits = nValue; + return TRUE; } /* to= */ COMMDCB_PARAM_HANDLER(to) { - BOOL bValue; + BOOL bValue; - (void)Dcb; - (void)StopBitsSet; + (void)Dcb; + (void)StopBitsSet; - /* parse the flag */ - if(!COMMDCB_ParseBool(StrTail, &bValue)) - /* failure */ - return FALSE; + /* parse the flag */ + if(!COMMDCB_ParseBool(StrTail, &bValue)) + return FALSE; - /* for BuildCommDCB(), Timeouts is NULL */ - if(Timeouts) - { - /* why? no idea. All values taken from Windows 2000 with experimentation */ - Timeouts->ReadIntervalTimeout = 0; - Timeouts->ReadTotalTimeoutMultiplier = 0; - Timeouts->ReadTotalTimeoutConstant = 0; - Timeouts->WriteTotalTimeoutMultiplier = 0; + /* for BuildCommDCB(), Timeouts is NULL */ + if(Timeouts) + { + /* why? no idea. All values taken from Windows 2000 with experimentation */ + Timeouts->ReadIntervalTimeout = 0; + Timeouts->ReadTotalTimeoutMultiplier = 0; + Timeouts->ReadTotalTimeoutConstant = 0; + Timeouts->WriteTotalTimeoutMultiplier = 0; - /* timeout */ - if(bValue) Timeouts->WriteTotalTimeoutConstant = 60000; - /* no timeout */ - else Timeouts->WriteTotalTimeoutConstant = 0; - } + if(bValue) + { + /* timeout */ + Timeouts->WriteTotalTimeoutConstant = 60000; + } + else + { + /* no timeout */ + Timeouts->WriteTotalTimeoutConstant = 0; + } + } - /* success */ - return TRUE; + /* success */ + return TRUE; } /* xon= */ COMMDCB_PARAM_HANDLER(xon) { - BOOL bValue; + BOOL bValue; - (void)Timeouts; - (void)StopBitsSet; + (void)Timeouts; + (void)StopBitsSet; - /* parse the flag */ - if(!COMMDCB_ParseBool(StrTail, &bValue)) - /* failure */ - return FALSE; + /* parse the flag */ + if(!COMMDCB_ParseBool(StrTail, &bValue)) + return FALSE; - /* XON/XOFF */ - if(bValue) Dcb->fInX = Dcb->fOutX = TRUE; - /* no XON/XOFF */ - else Dcb->fInX = Dcb->fOutX = FALSE; + if(bValue) + { + /* XON/XOFF */ + Dcb->fInX = Dcb->fOutX = TRUE; + } + else + { + /* no XON/XOFF */ + Dcb->fInX = Dcb->fOutX = FALSE; + } - /* success */ - return TRUE; + /* success */ + return TRUE; } /* FUNCTIONS */ #define COMMDCB_PARAM(__P__) \ { \ - ROS_STRING_INITIALIZER(_L(#__P__)), \ + ROS_STRING_INITIALIZER( L""#__P__ ), \ (ULONG_PTR)&COMMDCB_ ## __P__ ## Param \ } @@ -589,121 +581,118 @@ */ BOOL STDCALL -BuildCommDCBAndTimeoutsW -( - LPCWSTR lpDef, - LPDCB lpDCB, - LPCOMMTIMEOUTS lpCommTimeouts -) +BuildCommDCBAndTimeoutsW(LPCWSTR lpDef, + LPDCB lpDCB, + LPCOMMTIMEOUTS lpCommTimeouts) { - /* tell the baud= handler that the stop bits should be defaulted */ - BOOL bStopBitsSet = FALSE; + /* tell the baud= handler that the stop bits should be defaulted */ + BOOL bStopBitsSet = FALSE; - /* parameter validation */ - if(lpDCB->DCBlength != sizeof(DCB)) goto InvalidParam; + /* parameter validation */ + if(lpDCB->DCBlength != sizeof(DCB)) + goto InvalidParam; - /* set defaults */ - lpDCB->StopBits = ONESTOPBIT; + /* set defaults */ + lpDCB->StopBits = ONESTOPBIT; - /* - The documentation for MODE says that data= defaults to 7, but BuildCommDCB - doesn't seem to set it - */ - /* lpDCB->ByteSize = 7; */ + /* + * The documentation for MODE says that data= defaults to 7, but BuildCommDCB + * doesn't seem to set it + */ + /* lpDCB->ByteSize = 7; */ - /* skip COMx[n] */ - if - ( - lpDef[0] && - towupper(lpDef[0]) == L'C' && - lpDef[1] && - towupper(lpDef[1]) == L'O' && - lpDef[2] && - towupper(lpDef[2]) == L'M' - ) - { - DWORD nDummy; + /* skip COMx[n] */ + if(lpDef[0] && + towupper(lpDef[0]) == L'C' && + lpDef[1] && + towupper(lpDef[1]) == L'O' && + lpDef[2] && + towupper(lpDef[2]) == L'M') + { + DWORD nDummy; - /* skip "COM" */ - lpDef += 3; + /* skip "COM" */ + lpDef += 3; - /* premature end of string */ [truncated at 1000 lines; 207 more skipped]

1 0

[weiden] 14529: Saveliy Tretiakov <saveliyt@mail.ru>:
by weiden＠svn.reactos.com 06 Apr '05

06 Apr '05

Saveliy Tretiakov <saveliyt(a)mail.ru>: - Implemented CommConfigDialogA and CommConfigDialogW - Removed @unimplemented comments for some implemented functions Modified: trunk/reactos/lib/kernel32/misc/comm.c _____ Modified: trunk/reactos/lib/kernel32/misc/comm.c --- trunk/reactos/lib/kernel32/misc/comm.c 2005-04-06 17:08:17 UTC (rev 14528) +++ trunk/reactos/lib/kernel32/misc/comm.c 2005-04-06 17:40:25 UTC (rev 14529) @@ -14,6 +14,7 @@ * KJK (11/02/2003) implemented BuildCommDCB & BuildCommDCBAndTimeouts * ST (21/03/2005) implemented GetCommProperties * ST (24/03/2005) implemented ClearCommError. Corrected many functions. + * ST (05/04/2005) implemented CommConfigDialog * */ @@ -584,7 +585,7 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -707,7 +708,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -736,7 +737,7 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -747,7 +748,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -833,26 +834,68 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL CommConfigDialogA(LPCSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL (STDCALL *drvCommDlgA)(LPCSTR, HWND, LPCOMMCONFIG); + HMODULE hSerialuiDll; + BOOL result; + + //FIXME: Get dll name from registry. (setupapi needed) + if(!(hSerialuiDll = LoadLibraryW(L"serialui.dll"))) + { + DPRINT("CommConfigDialogA: serialui.dll not found.\n"); + return FALSE; + } + + drvCommDlgA = GetProcAddress(hSerialuiDll, "drvCommConfigDialogA"); + + if(!drvCommDlgA) + { + DPRINT("CommConfigDialogA: serialui does not export drvCommConfigDialogA\n"); + FreeLibrary(hSerialuiDll); + return FALSE; + } + + result = drvCommDlgA(lpszName, hWnd, lpCC); + FreeLibrary(hSerialuiDll); + return result; } /* - * @unimplemented + * @implemented */ BOOL STDCALL CommConfigDialogW(LPCWSTR lpszName, HWND hWnd, LPCOMMCONFIG lpCC) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL (STDCALL *drvCommDlgW)(LPCWSTR, HWND, LPCOMMCONFIG); + HMODULE hSerialuiDll; + BOOL result; + + //FIXME: Get dll name from registry. (setupapi needed) + if(!(hSerialuiDll = LoadLibraryW(L"serialui.dll"))) + { + DPRINT("CommConfigDialogW: serialui.dll not found.\n"); + return FALSE; + } + + drvCommDlgW = GetProcAddress(hSerialuiDll, "drvCommConfigDialogW"); + + if(!drvCommDlgW) + { + DPRINT("CommConfigDialogW: serialui does not export drvCommConfigDialogW\n"); + FreeLibrary(hSerialuiDll); + return FALSE; + } + + result = drvCommDlgW(lpszName, hWnd, lpCC); + FreeLibrary(hSerialuiDll); + return result; }

1 0

[weiden] 14528: add image base address for serialui.dll
by weiden＠svn.reactos.com 06 Apr '05

06 Apr '05

add image base address for serialui.dll Modified: trunk/reactos/baseaddress.cfg _____ Modified: trunk/reactos/baseaddress.cfg --- trunk/reactos/baseaddress.cfg 2005-04-06 17:04:28 UTC (rev 14527) +++ trunk/reactos/baseaddress.cfg 2005-04-06 17:08:17 UTC (rev 14528) @@ -14,6 +14,7 @@ TARGET_BASE_LIB_GLU32 =0x50000000 TARGET_BASE_LIB_OPENGL32 =0x50000000 TARGET_BASE_LIB_EXT_SLAYER =0x5C7E0000 +TARGET_BASE_LIB_SERIALUI =0x5CDA0000 TARGET_BASE_LIB_DINPUT =0x5F580000 TARGET_BASE_LIB_CPL_TIMEDATE =0x64DA0000 TARGET_BASE_LIB_CPL_SYSDM =0x64DD0000

1 0

[weiden] 14527: use unicode functions only and some minor fixes to preserve 64bit compatibility
by weiden＠svn.reactos.com 06 Apr '05

06 Apr '05

use unicode functions only and some minor fixes to preserve 64bit compatibility Modified: trunk/reactos/lib/serialui/serialui.c Modified: trunk/reactos/lib/serialui/serialui.h _____ Modified: trunk/reactos/lib/serialui/serialui.c --- trunk/reactos/lib/serialui/serialui.c 2005-04-06 12:32:14 UTC (rev 14526) +++ trunk/reactos/lib/serialui/serialui.c 2005-04-06 17:04:28 UTC (rev 14527) @@ -19,49 +19,35 @@ * ************************************/ -struct -{ - DWORD Baud; - CHAR *Str; -} Bauds[] = -{ - { CBR_110, "110" }, - { CBR_300, "300" }, - { CBR_600, "600" }, - { CBR_1200, "1200" }, - { CBR_2400, "2400" }, - { CBR_4800, "4800" }, - { CBR_9600, "9600" }, - { CBR_14400, "14400" }, - { CBR_19200, "19200" }, - { CBR_38400, "38400" }, - { CBR_56000, "56000" }, - { CBR_57600, "57600" }, - { CBR_115200, "115200" }, - { CBR_128000, "128000" }, - { CBR_256000, "256000" }, - { 0, 0 } +const DWORD Bauds[] = { + CBR_110, + CBR_300, + CBR_600, + CBR_1200, + CBR_2400, + CBR_4800, + CBR_9600, + CBR_14400, + CBR_19200, + CBR_38400, + CBR_56000, + CBR_57600, + CBR_115200, + CBR_128000, + CBR_256000, + 0 }; -struct -{ - BYTE ByteSize; - CHAR *Str; -} ByteSizes[] = -{ - { 5, "5" }, - { 6, "6" }, - { 7, "7" }, - { 8, "8" }, - { 0, 0 } +const BYTE ByteSizes[] = { + 5, + 6, + 7, + 8, + 0 }; -struct -{ - BYTE Parity; - UINT StrId; -} Paritys[] = -{ + +const PARITY_INFO Parities[] = { { EVENPARITY, IDS_EVENPARITY }, { MARKPARITY, IDS_MARKPARITY }, { NOPARITY, IDS_NOPARITY }, @@ -70,12 +56,7 @@ { 0, 0 } }; -struct -{ - BYTE StopBit; - UINT StrId; -} StopBits[] = -{ +const STOPBIT_INFO StopBits[] = { { ONESTOPBIT, IDS_ONESTOPBIT }, { ONE5STOPBITS, IDS_ONE5STOPBITS }, { TWOSTOPBITS, IDS_TWOSTOPBITS }, @@ -218,27 +199,22 @@ case WM_INITDIALOG: { - WCHAR wstr[255], *format; - CHAR str[255]; + WCHAR wstr[255]; RECT rc, rcDlg, rcOwner; HWND hOwner; - INT i, len; + INT i; lpDlgInfo = (LPDIALOG_INFO)lParam; - SetWindowLong(hDlg, DWL_USER, (LONG)lpDlgInfo); + SetWindowLongPtrW(hDlg, DWL_USER, (LONG_PTR)lpDlgInfo); /* Set title */ - LoadStringA(hDllInstance, IDS_TITLE, str, 254); - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - if((format = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) + if(LoadStringW(hDllInstance, IDS_TITLE, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - MultiByteToWideChar(CP_ACP, 0, str, -1, format, len); - wnsprintfW(wstr, 254, format, lpDlgInfo->lpszDevice); - HeapFree(GetProcessHeap(), 0, format); - SetWindowTextW(hDlg, wstr); + SetWindowTextW(hDlg, wstr); } - if(!(hOwner = GetParent(hDlg))) + /* FIXME - this won't work correctly systems with multiple monitors! */ + if(!(hOwner = GetParent(hDlg))) hOwner = GetDesktopWindow(); /* Position dialog in the center of owner window */ @@ -257,46 +233,48 @@ if(!(hBox = GetDlgItem(hDlg, IDC_BAUDRATE))) EndDialog(hDlg, 0); - for(i = 0; Bauds[i].Str; i++) + for(i = 0; Bauds[i]; i++) { - SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)Bauds[i].Str); - if(Bauds[i].Baud == lpDlgInfo->lpCC->dcb.BaudRate) - SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + wsprintf(wstr, L"%d", Bauds[i]); + SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr); + if(Bauds[i] == lpDlgInfo->lpCC->dcb.BaudRate) + SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0); } - if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) - SendMessageA(hBox, CB_SETCURSEL, DEFAULT_BAUD_INDEX, 0); + if(SendMessageW(hBox, CB_GETCURSEL, 0, 0) == CB_ERR) + SendMessageW(hBox, CB_SETCURSEL, DEFAULT_BAUD_INDEX, 0); /* Initialize byte size combo */ if(!(hBox = GetDlgItem(hDlg, IDC_BYTESIZE))) EndDialog(hDlg, 0); - for(i = 0; ByteSizes[i].Str; i++) + for(i = 0; ByteSizes[i]; i++) { - SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)ByteSizes[i].Str); - if(ByteSizes[i].ByteSize == lpDlgInfo->lpCC->dcb.ByteSize) - SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + wsprintf(wstr, L"%d", Bauds[i]); + SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr); + if(ByteSizes[i] == lpDlgInfo->lpCC->dcb.ByteSize) + SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0); } - if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) - SendMessageA(hBox, CB_SETCURSEL, DEFAULT_BYTESIZE_INDEX, 0); + if(SendMessageW(hBox, CB_GETCURSEL, 0, 0) == CB_ERR) + SendMessageW(hBox, CB_SETCURSEL, DEFAULT_BYTESIZE_INDEX, 0); /* Initialize parity combo */ if(!(hBox = GetDlgItem(hDlg, IDC_PARITY))) EndDialog(hDlg, 0); - for(i = 0; Paritys[i].StrId; i++) + for(i = 0; Parities[i].StrId; i++) { - if(LoadStringA(hDllInstance, Paritys[i].StrId, str, 254)) + if(LoadStringW(hDllInstance, Parities[i].StrId, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)str); - if(Paritys[i].Parity == lpDlgInfo->lpCC->dcb.Parity) - SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr); + if(Parities[i].Parity == lpDlgInfo->lpCC->dcb.Parity) + SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0); } } - if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) - SendMessageA(hBox, CB_SETCURSEL, DEFAULT_PARITY_INDEX, 0); + if(SendMessageW(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageW(hBox, CB_SETCURSEL, DEFAULT_PARITY_INDEX, 0); /* Initialize stop bits combo */ if(!(hBox = GetDlgItem(hDlg, IDC_STOPBITS))) @@ -304,46 +282,46 @@ for(i = 0; StopBits[i].StrId; i++) { - if(LoadStringA(hDllInstance,StopBits[i].StrId, str, 254)) + if(LoadStringW(hDllInstance, StopBits[i].StrId, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)str); + SendMessageW(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)wstr); if(StopBits[i].StopBit == lpDlgInfo->lpCC->dcb.StopBits) - SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + SendMessageW(hBox, CB_SETCURSEL, (WPARAM)i, 0); } } - if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) - SendMessageA(hBox, CB_SETCURSEL, DEFAULT_STOPBITS_INDEX, 0); + if(SendMessageW(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageW(hBox, CB_SETCURSEL, DEFAULT_STOPBITS_INDEX, 0); /* Initialize flow control combo */ if(!(hBox = GetDlgItem(hDlg, IDC_FLOW))) EndDialog(hDlg, 0); - if(LoadStringA(hDllInstance,IDS_FC_NO, str, 254)) + if(LoadStringW(hDllInstance, IDS_FC_NO, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - SendMessageA(hBox, CB_INSERTSTRING, 0, (LPARAM)str); - SendMessageA(hBox, CB_SETCURSEL, 0, 0); + SendMessageW(hBox, CB_INSERTSTRING, 0, (LPARAM)wstr); + SendMessageW(hBox, CB_SETCURSEL, 0, 0); lpDlgInfo->InitialFlowIndex = 0; } - if(LoadStringA(hDllInstance,IDS_FC_CTSRTS, str, 254)) + if(LoadStringW(hDllInstance, IDS_FC_CTSRTS, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - SendMessageA(hBox, CB_INSERTSTRING, 1, (LPARAM)str); + SendMessageW(hBox, CB_INSERTSTRING, 1, (LPARAM)wstr); if(lpDlgInfo->lpCC->dcb.fRtsControl == RTS_CONTROL_HANDSHAKE || lpDlgInfo->lpCC->dcb.fOutxCtsFlow == TRUE) { - SendMessageA(hBox, CB_SETCURSEL, 1, 0); + SendMessageW(hBox, CB_SETCURSEL, 1, 0); lpDlgInfo->InitialFlowIndex = 1; } } - if(LoadStringA(hDllInstance,IDS_FC_XONXOFF, str, 254)) + if(LoadStringW(hDllInstance, IDS_FC_XONXOFF, wstr, sizeof(wstr) / sizeof(wstr[0]))) { - SendMessageA(hBox, CB_INSERTSTRING, 2, (LPARAM)str); + SendMessageW(hBox, CB_INSERTSTRING, 2, (LPARAM)wstr); if(lpDlgInfo->lpCC->dcb.fOutX || lpDlgInfo->lpCC->dcb.fInX) { - SendMessageA(hBox, CB_SETCURSEL, 2, 0); + SendMessageW(hBox, CB_SETCURSEL, 2, 0); lpDlgInfo->InitialFlowIndex = 2; } } @@ -387,26 +365,26 @@ LPDIALOG_INFO lpDlgInfo; UINT Index; - lpDlgInfo = (LPDIALOG_INFO) GetWindowLong(hDlg, DWL_USER); + lpDlgInfo = (LPDIALOG_INFO) GetWindowLongPtrW(hDlg, DWL_USER); /* Baud rate */ - Index = SendMessage(GetDlgItem(hDlg, IDC_BAUDRATE), CB_GETCURSEL, 0, 0); - lpDlgInfo->lpCC->dcb.BaudRate = Bauds[Index].Baud; + Index = SendMessageW(GetDlgItem(hDlg, IDC_BAUDRATE), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.BaudRate = Bauds[Index]; /* Byte size */ - Index = SendMessage(GetDlgItem(hDlg, IDC_BYTESIZE), CB_GETCURSEL, 0, 0); - lpDlgInfo->lpCC->dcb.ByteSize = ByteSizes[Index].ByteSize; + Index = SendMessageW(GetDlgItem(hDlg, IDC_BYTESIZE), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.ByteSize = ByteSizes[Index]; /* Parity */ - Index = SendMessage(GetDlgItem(hDlg, IDC_PARITY), CB_GETCURSEL, 0, 0); - lpDlgInfo->lpCC->dcb.Parity = Paritys[Index].Parity; + Index = SendMessageW(GetDlgItem(hDlg, IDC_PARITY), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.Parity = Parities[Index].Parity; /* Stop bits */ - Index = SendMessage(GetDlgItem(hDlg, IDC_STOPBITS), CB_GETCURSEL, 0, 0); + Index = SendMessageW(GetDlgItem(hDlg, IDC_STOPBITS), CB_GETCURSEL, 0, 0); lpDlgInfo->lpCC->dcb.StopBits = StopBits[Index].StopBit; /* Flow Control */ - Index = SendMessage(GetDlgItem(hDlg, IDC_FLOW), CB_GETCURSEL, 0, 0); + Index = SendMessageW(GetDlgItem(hDlg, IDC_FLOW), CB_GETCURSEL, 0, 0); if(lpDlgInfo->InitialFlowIndex != Index) { switch(Index) _____ Modified: trunk/reactos/lib/serialui/serialui.h --- trunk/reactos/lib/serialui/serialui.h 2005-04-06 12:32:14 UTC (rev 14526) +++ trunk/reactos/lib/serialui/serialui.h 2005-04-06 17:04:28 UTC (rev 14527) @@ -26,7 +26,19 @@ LPCOMMCONFIG lpCC; } DIALOG_INFO, *LPDIALOG_INFO; +typedef struct _PARITY_INFO +{ + BYTE Parity; + UINT StrId; +} PARITY_INFO, *PPARITY_INFO; +typedef struct _STOPBIT_INFO +{ + BYTE StopBit; + UINT StrId; +} STOPBIT_INFO, *PSTOPBIT_INFO; + + /************************************ * * EXPORTS

1 0

[royce] 14526: fix uninitialized variable warnings
by royce＠svn.reactos.com 06 Apr '05

06 Apr '05

fix uninitialized variable warnings Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/fdo.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-06 11:14:57 UTC (rev 14525) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-06 12:32:14 UTC (rev 14526) @@ -105,7 +105,7 @@ IN PUNICODE_STRING CompatibleIds) { PDEVICE_OBJECT Pdo = NULL; - PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PPDO_DEVICE_EXTENSION PdoDeviceExtension = NULL; PFDO_DEVICE_EXTENSION FdoDeviceExtension; NTSTATUS Status; _____ Modified: trunk/reactos/drivers/bus/serenum/fdo.c --- trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-06 11:14:57 UTC (rev 14525) +++ trunk/reactos/drivers/bus/serenum/fdo.c 2005-04-06 12:32:14 UTC (rev 14526) @@ -100,7 +100,7 @@ PDEVICE_RELATIONS DeviceRelations; ULONG NumPDO; ULONG i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(DeviceExtension->Common.IsFDO);

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