Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[chorns] 14532: Correct some wrong dependencies for 'make bootcd'

by chorns＠svn.reactos.com

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

19 years, 8 months

[robertk] 14531: version info 0.2.6

by robertk＠svn.reactos.com

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

19 years, 8 months

[weiden] 14530: reformat some code to make it readably

by weiden＠svn.reactos.com

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]

19 years, 8 months

[weiden] 14529: Saveliy Tretiakov <saveliyt@mail.ru>:

by weiden＠svn.reactos.com

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; }

19 years, 8 months

[weiden] 14528: add image base address for serialui.dll

by weiden＠svn.reactos.com

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

19 years, 8 months

[weiden] 14527: use unicode functions only and some minor fixes to preserve 64bit compatibility

by weiden＠svn.reactos.com

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

19 years, 8 months

[royce] 14526: fix uninitialized variable warnings

by royce＠svn.reactos.com

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);

19 years, 8 months

[hpoussin] 14525: Saveliy Tretiakov <saveliyt@mail.ru>

by hpoussin＠svn.reactos.com

Saveliy Tretiakov <saveliyt(a)mail.ru> - Started serialui dll - Implemented drvCommConfigDialogA and drvCommConfigDialogW Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/lib/serialui/ Added: trunk/reactos/lib/serialui/Makefile Added: trunk/reactos/lib/serialui/resource.h Added: trunk/reactos/lib/serialui/serialui.c Added: trunk/reactos/lib/serialui/serialui.def Added: trunk/reactos/lib/serialui/serialui.h Added: trunk/reactos/lib/serialui/serialui.rc _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/Makefile 2005-04-06 11:14:57 UTC (rev 14525) @@ -61,7 +61,7 @@ DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smlib smdll snmpapi \ + packet psapi riched20 richedit rpcrt4 samlib secur32 serialui setupapi shell32 shlwapi smlib smdll snmpapi \ syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-04-06 11:14:57 UTC (rev 14525) @@ -115,6 +115,7 @@ lib\rpcrt4\rpcrt4.dll 1 lib\samlib\samlib.dll 1 lib\secur32\secur32.dll 1 +lib\serialui\serialui.dll 1 lib\setupapi\setupapi.dll 1 lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 _____ Added: trunk/reactos/lib/serialui/Makefile --- trunk/reactos/lib/serialui/Makefile 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/Makefile 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,36 @@ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = serialui + +TARGET_BASE = $(TARGET_BASE_LIB_SERIALUI) + +TARGET_CFLAGS = \ + -I./include \ + -Wall \ + -Werror \ + -fno-builtin \ + -DUNICODE \ + -DLE \ + -DDBG \ + -D__USE_W32API + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = kernel32.a user32.a shlwapi.a + +TARGET_OBJECTS = serialui.o + +DEP_OBJECTS := $(TARGET_OBJECTS) + +TARGET_CLEAN = $(DEP_FILES) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +# EOF Property changes on: trunk/reactos/lib/serialui/Makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/serialui/resource.h --- trunk/reactos/lib/serialui/resource.h 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/resource.h 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,32 @@ +#define IDS_EVENPARITY 2001 +#define IDS_MARKPARITY 2002 +#define IDS_NOPARITY 2003 +#define IDS_ODDPARITY 2004 +#define IDS_SPACEPARITY 2005 + +#define IDS_ONESTOPBIT 2006 +#define IDS_ONE5STOPBITS 2007 +#define IDS_TWOSTOPBITS 2008 + +#define IDS_FC_NO 2009 +#define IDS_FC_CTSRTS 2010 +#define IDS_FC_XONXOFF 2011 + +#define IDS_TITLE 2012 + +#define IDD_COMMDLG 1000 +#define IDC_GRP1 1001 +#define IDC_OKBTN 1002 +#define IDC_CANCELBTN 1003 +#define IDC_BTN 1004 +#define IDC_STC1 1005 +#define IDC_STC2 1006 +#define IDC_STC3 1007 +#define IDC_STC4 1008 +#define IDC_STC5 1009 +#define IDC_BAUDRATE 1010 +#define IDC_BYTESIZE 1011 +#define IDC_PARITY 1012 +#define IDC_STOPBITS 1013 +#define IDC_FLOW 1014 +#define IDC_RESTOREBTN 1015 Property changes on: trunk/reactos/lib/serialui/resource.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/serialui/serialui.c --- trunk/reactos/lib/serialui/serialui.c 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/serialui.c 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,440 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SerialUI DLL + * FILE: serialui.c + * PUROPSE: A dialog box to cunfigure COM port. + * Functions to set(and get too) default configuration. + * PROGRAMMERS: Saveliy Tretiakov (saveliyt(a)mail.ru) + * REVISIONS: + * ST (05/04/2005) Created. Implemented drvCommConfigDialog. + */ + +#include <serialui.h> + +static HINSTANCE hDllInstance; + +/************************************ + * + * DATA + * + ************************************/ + +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 } +}; + +struct +{ + BYTE ByteSize; + CHAR *Str; +} ByteSizes[] = +{ + { 5, "5" }, + { 6, "6" }, + { 7, "7" }, + { 8, "8" }, + { 0, 0 } +}; + +struct +{ + BYTE Parity; + UINT StrId; +} Paritys[] = +{ + { EVENPARITY, IDS_EVENPARITY }, + { MARKPARITY, IDS_MARKPARITY }, + { NOPARITY, IDS_NOPARITY }, + { ODDPARITY, IDS_ODDPARITY }, + { SPACEPARITY, IDS_SPACEPARITY }, + { 0, 0 } +}; + +struct +{ + BYTE StopBit; + UINT StrId; +} StopBits[] = +{ + { ONESTOPBIT, IDS_ONESTOPBIT }, + { ONE5STOPBITS, IDS_ONE5STOPBITS }, + { TWOSTOPBITS, IDS_TWOSTOPBITS }, + { 0, 0 } +}; + + +/************************************ + * + * DLLMAIN + * + ************************************/ + +BOOL +STDCALL +DllMain(HINSTANCE hInstance, + DWORD dwReason, + LPVOID reserved) +{ + if(dwReason==DLL_PROCESS_ATTACH) + { + hDllInstance = hInstance; + } + else if(dwReason==DLL_THREAD_ATTACH) + { + DisableThreadLibraryCalls(hInstance); + } + + return TRUE; +} + + +/************************************ + * + * EXPORTS + * + ************************************/ + +/* + * @implemented + */ +BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, + HWND hWnd, + LPCOMMCONFIG lpCommConfig) +{ + DIALOG_INFO DialogInfo; + + if(!lpszDevice || !lpCommConfig) + { + return FALSE; + } + + DialogInfo.lpszDevice = lpszDevice; + DialogInfo.lpCC = lpCommConfig; + + return DialogBoxParamW(hDllInstance, MAKEINTRESOURCEW(IDD_COMMDLG), + hWnd, (DLGPROC)CommDlgProc, (LPARAM)&DialogInfo); +} + +/* + * @implemented + */ +BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, + HWND hWnd, + LPCOMMCONFIG lpCommConfig) +{ + BOOL result; + UINT len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, NULL, 0); + if((wstr = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) + { + MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, wstr, len); + result = drvCommConfigDialogW(wstr, hWnd, lpCommConfig); + HeapFree(GetProcessHeap(), 0, wstr); + return result; + } + else + return FALSE; +} + +/* + * @unimplemented + */ +BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + DWORD dwSize) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + DWORD dwSize) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + LPDWORD lpdwSize) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + LPDWORD lpdwSize) +{ + UNIMPLEMENTED +} + + +/************************************ + * + * INTERNALS + * + ************************************/ + +LRESULT CommDlgProc(HWND hDlg, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + LPDIALOG_INFO lpDlgInfo = NULL; + HWND hBox; + + switch (Msg) + { + + case WM_INITDIALOG: + { + WCHAR wstr[255], *format; + CHAR str[255]; + RECT rc, rcDlg, rcOwner; + HWND hOwner; + INT i, len; + + lpDlgInfo = (LPDIALOG_INFO)lParam; + SetWindowLong(hDlg, DWL_USER, (LONG)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)))) + { + MultiByteToWideChar(CP_ACP, 0, str, -1, format, len); + wnsprintfW(wstr, 254, format, lpDlgInfo->lpszDevice); + HeapFree(GetProcessHeap(), 0, format); + SetWindowTextW(hDlg, wstr); + } + + if(!(hOwner = GetParent(hDlg))) + hOwner = GetDesktopWindow(); + + /* Position dialog in the center of owner window */ + GetWindowRect(hOwner, &rcOwner); + GetWindowRect(hDlg, &rcDlg); + CopyRect(&rc, &rcOwner); + OffsetRect(&rcDlg, -rcDlg.left, -rcDlg.top); + OffsetRect(&rc, -rc.left, -rc.top); + OffsetRect(&rc, -rcDlg.right, -rcDlg.bottom); + SetWindowPos(hDlg, HWND_TOP, + rcOwner.left + (rc.right / 2), + rcOwner.top + (rc.bottom / 2), + 0, 0, SWP_NOSIZE); + + /* Initialize baud rate combo */ + if(!(hBox = GetDlgItem(hDlg, IDC_BAUDRATE))) + EndDialog(hDlg, 0); + + for(i = 0; Bauds[i].Str; 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); + } + + if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageA(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++) + { + 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); + } + + if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageA(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++) + { + if(LoadStringA(hDllInstance, Paritys[i].StrId, str, 254)) + { + SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)str); + if(Paritys[i].Parity == lpDlgInfo->lpCC->dcb.Parity) + SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + } + } + + if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageA(hBox, CB_SETCURSEL, DEFAULT_PARITY_INDEX, 0); + + /* Initialize stop bits combo */ + if(!(hBox = GetDlgItem(hDlg, IDC_STOPBITS))) + EndDialog(hDlg, 0); + + for(i = 0; StopBits[i].StrId; i++) + { + if(LoadStringA(hDllInstance,StopBits[i].StrId, str, 254)) + { + SendMessageA(hBox, CB_INSERTSTRING, (WPARAM)i, (LPARAM)str); + if(StopBits[i].StopBit == lpDlgInfo->lpCC->dcb.StopBits) + SendMessageA(hBox, CB_SETCURSEL, (WPARAM)i, 0); + } + } + + if(SendMessage(hBox, CB_GETCURSEL, 0, 0)==CB_ERR) + SendMessageA(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)) + { + SendMessageA(hBox, CB_INSERTSTRING, 0, (LPARAM)str); + SendMessageA(hBox, CB_SETCURSEL, 0, 0); + lpDlgInfo->InitialFlowIndex = 0; + } + + + if(LoadStringA(hDllInstance,IDS_FC_CTSRTS, str, 254)) + { + SendMessageA(hBox, CB_INSERTSTRING, 1, (LPARAM)str); + if(lpDlgInfo->lpCC->dcb.fRtsControl == RTS_CONTROL_HANDSHAKE + || lpDlgInfo->lpCC->dcb.fOutxCtsFlow == TRUE) + { + SendMessageA(hBox, CB_SETCURSEL, 1, 0); + lpDlgInfo->InitialFlowIndex = 1; + } + } + + if(LoadStringA(hDllInstance,IDS_FC_XONXOFF, str, 254)) + { + SendMessageA(hBox, CB_INSERTSTRING, 2, (LPARAM)str); + if(lpDlgInfo->lpCC->dcb.fOutX || lpDlgInfo->lpCC->dcb.fInX) + { + SendMessageA(hBox, CB_SETCURSEL, 2, 0); + lpDlgInfo->InitialFlowIndex = 2; + } + } + + /* Set focus */ + SetFocus(GetDlgItem(hDlg, IDC_OKBTN)); + + return FALSE; + } /* WM_INITDIALOG */ + + case WM_COMMAND: + { + switch(wParam) + { + case IDC_CANCELBTN: + EndDialog(hDlg, FALSE); + break; + case IDC_OKBTN: + OkButton(hDlg); + EndDialog(hDlg, TRUE); + break; + } + return TRUE; + } /* WM_COMMAND */ + + case WM_CLOSE: + { + EndDialog(hDlg, FALSE); + return TRUE; + } /* WM_CLOSE */ + + default: + return FALSE; + } + +} + + +VOID OkButton(HWND hDlg) +{ + LPDIALOG_INFO lpDlgInfo; + UINT Index; + + lpDlgInfo = (LPDIALOG_INFO) GetWindowLong(hDlg, DWL_USER); + + /* Baud rate */ + Index = SendMessage(GetDlgItem(hDlg, IDC_BAUDRATE), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.BaudRate = Bauds[Index].Baud; + + /* Byte size */ + Index = SendMessage(GetDlgItem(hDlg, IDC_BYTESIZE), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.ByteSize = ByteSizes[Index].ByteSize; + + /* Parity */ + Index = SendMessage(GetDlgItem(hDlg, IDC_PARITY), CB_GETCURSEL, 0, 0); + lpDlgInfo->lpCC->dcb.Parity = Paritys[Index].Parity; + + /* Stop bits */ + Index = SendMessage(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); + if(lpDlgInfo->InitialFlowIndex != Index) + { + switch(Index) + { + case 0: /* NO */ + lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE; + lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_DISABLE; + lpDlgInfo->lpCC->dcb.fOutxCtsFlow = FALSE; + lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE; + lpDlgInfo->lpCC->dcb.fOutX = FALSE; + lpDlgInfo->lpCC->dcb.fInX = FALSE; + break; + case 1: /* CTS/RTS */ + lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE; + lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_HANDSHAKE; + lpDlgInfo->lpCC->dcb.fOutxCtsFlow = TRUE; + lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE; + lpDlgInfo->lpCC->dcb.fOutX = FALSE; + lpDlgInfo->lpCC->dcb.fInX = FALSE; + break; + case 2: /* XON/XOFF */ + lpDlgInfo->lpCC->dcb.fDtrControl = DTR_CONTROL_DISABLE; + lpDlgInfo->lpCC->dcb.fRtsControl = RTS_CONTROL_DISABLE; + lpDlgInfo->lpCC->dcb.fOutxCtsFlow = FALSE; + lpDlgInfo->lpCC->dcb.fOutxDsrFlow = FALSE; + lpDlgInfo->lpCC->dcb.fOutX = TRUE; + lpDlgInfo->lpCC->dcb.fInX = TRUE; + break; + } + } +} Property changes on: trunk/reactos/lib/serialui/serialui.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/serialui/serialui.def --- trunk/reactos/lib/serialui/serialui.def 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/serialui.def 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,10 @@ +LIBRARY serialui.dll + +EXPORTS +drvCommConfigDialogW@12 +drvCommConfigDialogA@12 +drvSetDefaultCommConfigW@12 +drvSetDefaultCommConfigA@12 +drvGetDefaultCommConfigW@12 +drvGetDefaultCommConfigA@12 + Property changes on: trunk/reactos/lib/serialui/serialui.def ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/serialui/serialui.h --- trunk/reactos/lib/serialui/serialui.h 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/serialui.h 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,74 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SerialUI DLL + * FILE: serialui.h + * PURPOSE: header file + * PROGRAMMERS: Saveliy Tretiakov (saveliyt(a)mail.ru) + */ + +#include <windows.h> +#include <shlwapi.h> +#include "resource.h" + +#define UNIMPLEMENTED \ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ + return FALSE; + +#define DEFAULT_BAUD_INDEX 6 +#define DEFAULT_BYTESIZE_INDEX 3 +#define DEFAULT_PARITY_INDEX 2 +#define DEFAULT_STOPBITS_INDEX 0 + +typedef struct _DIALOG_INFO +{ + LPCWSTR lpszDevice; + UINT InitialFlowIndex; + LPCOMMCONFIG lpCC; +} DIALOG_INFO, *LPDIALOG_INFO; + + +/************************************ + * + * EXPORTS + * + ************************************/ + +BOOL WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, + HWND hWnd, + LPCOMMCONFIG lpCommConfig); + +BOOL WINAPI drvCommConfigDialogA(LPCSTR lpszDevice, + HWND hWnd, + LPCOMMCONFIG lpCommConfig); + +BOOL WINAPI drvSetDefaultCommConfigW(LPCWSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + DWORD dwSize); + +BOOL WINAPI drvSetDefaultCommConfigA(LPCSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + DWORD dwSize); + +BOOL WINAPI drvGetDefaultCommConfigW(LPCWSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + LPDWORD lpdwSize); + +BOOL WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, + LPCOMMCONFIG lpCommConfig, + LPDWORD lpdwSize); + + +/************************************ + * + * INTERNALS + * + ************************************/ + +LRESULT CommDlgProc(HWND hDlg, + UINT Msg, + WPARAM wParam, + LPARAM lParam); + +VOID OkButton(HWND hDlg); + + Property changes on: trunk/reactos/lib/serialui/serialui.h ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/serialui/serialui.rc --- trunk/reactos/lib/serialui/serialui.rc 2005-04-06 06:09:01 UTC (rev 14524) +++ trunk/reactos/lib/serialui/serialui.rc 2005-04-06 11:14:57 UTC (rev 14525) @@ -0,0 +1,48 @@ +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS SerialUI DLL\0" +#define REACTOS_STR_INTERNAL_NAME "serialui\0" +#define REACTOS_STR_ORIGINAL_FILENAME "serialui.dll\0" +#include <reactos/version.rc> + + +STRINGTABLE LOADONCALL DISCARDABLE +BEGIN + IDS_EVENPARITY, "Even" + IDS_MARKPARITY, "Mark" + IDS_NOPARITY, "No parity" + IDS_ODDPARITY, "Odd" + IDS_SPACEPARITY, "Space" + + IDS_ONESTOPBIT, "1 stop bit" + IDS_ONE5STOPBITS, "1.5 stop bits" + IDS_TWOSTOPBITS, "2 stop bits" + + IDS_FC_NO, "No" + IDS_FC_CTSRTS, "CTS/RTS" + IDS_FC_XONXOFF, "XON/XOFF" + + IDS_TITLE, "Properties for %s" +END + +IDD_COMMDLG DIALOGEX 6,5,222,175 +FONT 8,"MS Sans Serif" +STYLE 0x10C80080 +EXSTYLE 0x00000001 +BEGIN + CONTROL "",IDC_GRP1,"Button",0x50000007,6,5,210,146,0x00000000 + CONTROL "OK",IDC_OKBTN,"Button",0x50010000,98,156,56,13,0x00000000 + CONTROL "Cancel",IDC_CANCELBTN,"Button",0x50010000,158,156,56,13,0x00000000 + CONTROL "Baud rate:",IDC_STC1,"Static",0x50000000,24,31,42,9,0x00000000 + CONTROL "Byte size:",IDC_STC2,"Static",0x50000000,24,53,42,9,0x00000000 + CONTROL "Parity:",IDC_STC3,"Static",0x50000000,24,73,42,9,0x00000000 + CONTROL "Stop bits:",IDC_STC4,"Static",0x50000000,24,96,42,9,0x00000000 + CONTROL "Flow control:",IDC_STC5,"Static",0x50000000,24,120,42,9,0x00000000 + CONTROL "",IDC_BAUDRATE,"ComboBox",0x50210003,98,29,100,50,0x00000000 + CONTROL "",IDC_BYTESIZE,"ComboBox",0x50210003,98,49,100,50,0x00000000 + CONTROL "",IDC_PARITY,"ComboBox",0x50210003,98,72,100,50,0x00000000 + CONTROL "",IDC_STOPBITS,"ComboBox",0x50210003,98,94,100,50,0x00000000 + CONTROL "",IDC_FLOW,"ComboBox",0x50210003,98,116,100,50,0x00000000 +END + Property changes on: trunk/reactos/lib/serialui/serialui.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 8 months

[hpoussin] 14524: Verify that allocated resource list is not NULL in IRP_MN_START_DEVICE.

by hpoussin＠svn.reactos.com

Verify that allocated resource list is not NULL in IRP_MN_START_DEVICE. Modified: trunk/reactos/drivers/dd/serial/pnp.c _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-06 04:03:41 UTC (rev 14523) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-06 06:09:01 UTC (rev 14524) @@ -320,7 +320,17 @@ Status = STATUS_SUCCESS; break; } - /* FIXME: second HACK: verify that we don't have resource conflict, + /* FIXME: second HACK: verify that we have some allocated resources. + * It seems not to be always the case on some hardware + */ + if (Stack->Parameters.StartDevice.AllocatedResources == NULL) + { + DPRINT1("Serial: no allocated resources. Can't start COM%lu\n", + ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + /* FIXME: third HACK: verify that we don't have resource conflict, * because PnP manager doesn't do it automatically */ Status = IoReportResourceForDetection(

19 years, 8 months

[royce] 14523: patch by kjk::hyperion, fix syntax of gcc inline asm

by royce＠svn.reactos.com

patch by kjk::hyperion, fix syntax of gcc inline asm Modified: trunk/reactos/hal/halx86/include/hal.h _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-04-05 23:04:24 UTC (rev 14522) +++ trunk/reactos/hal/halx86/include/hal.h 2005-04-06 04:03:41 UTC (rev 14523) @@ -419,13 +419,13 @@ static inline BYTE Ki386ReadFsByte(ULONG offset) { BYTE b; - __asm__ __volatile__("movb %%fs:(%1),%0":"=q" (b):"0" (offset)); + __asm__ __volatile__("movb %%fs:(%1),%0":"=r" (b):"r" (offset)); return b; } static inline VOID Ki386WriteFsByte(ULONG offset, BYTE value) { - __asm__ __volatile__("movb %0,%%fs:(%1)"::"q" (value), "r" (offset)); + __asm__ __volatile__("movb %0,%%fs:(%1)"::"r" (value), "r" (offset)); } #elif defined(_MSC_VER)

19 years, 8 months

← Newer
1
...
32
33
34
35
36
37
38
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005