Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 15097: Wipe out current includes to start fresh.
by ion＠svn.reactos.com 08 May '05

08 May '05

Wipe out current includes to start fresh. Deleted: branches/new_headers/reactos/include/ Deleted: branches/new_headers/reactos/w32api/

1 0

[ion] 15096: New Headers Branch. Final version.
by ion＠svn.reactos.com 08 May '05

08 May '05

New Headers Branch. Final version. Added: branches/new_headers/reactos/ _____ Copied: branches/new_headers/reactos (from rev 15095, trunk/reactos)

1 0

[ion] 15095: New Headers Branch. Final version.
by ion＠svn.reactos.com 08 May '05

08 May '05

New Headers Branch. Final version. Added: branches/new_headers/

1 0

[ion] 15094: Delete my outdated headers branch.
by ion＠svn.reactos.com 08 May '05

08 May '05

Delete my outdated headers branch. Deleted: branches/new_headers/

1 0

[ion] 15093: Delete my branch. Everything has been merged in
by ion＠svn.reactos.com 08 May '05

08 May '05

Delete my branch. Everything has been merged in Deleted: branches/alex_devel_branch/

1 0

[greatlrd] 15092: Fireball patch for fixing RtlUnicodeStringToInteger and RtlCharToInteger
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

Fireball patch for fixing RtlUnicodeStringToInteger and RtlCharToInteger <Fireball> Imported WINE's RtlUnicodeStringToInteger and RtlCharToInteger - they were seriously broken in our revision. Thanks to GreatLord for his help pointing out this bug with me :) Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-05-07 21:24:31 UTC (rev 15091) +++ trunk/reactos/lib/rtl/unicode.c 2005-05-07 22:17:03 UTC (rev 15092) @@ -154,50 +154,95 @@ } -/* +/********************************************************************** **** + * RtlCharToInteger (NTDLL.@) * @implemented + * Converts a character string into its integer equivalent. + * + * RETURNS + * Success: STATUS_SUCCESS. value contains the converted number + * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. + * STATUS_ACCESS_VIOLATION, if value is NULL. + * + * NOTES + * For base 0 it uses 10 as base and the string should be in the format + * "{whitespace} [+|-] [0[x|o|b]] {digits}". + * For other bases the string should be in the format + * "{whitespace} [+|-] {digits}". + * No check is made for value overflow, only the lower 32 bits are assigned. + * If str is NULL it crashes, as the native function does. + * + * DIFFERENCES + * This function does not read garbage behind '\0' as the native version does. */ NTSTATUS STDCALL RtlCharToInteger( - IN PCSZ String, - IN ULONG Base, - IN OUT PULONG Value) + PCSZ str, /* [I] '\0' terminated single-byte string containing a number */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + PULONG value) /* [O] Destination for the converted value */ { - ULONG Val; + CHAR chCurrent; + int digit; + ULONG RunningTotal = 0; + char bMinus = 0; - *Value = 0; + while (*str != '\0' && *str <= ' ') { + str++; + } /* while */ - if (Base == 0) - { - Base = 10; - if (*String == '0') - { - Base = 8; - String++; - if ((*String == 'x') && isxdigit (String[1])) - { - String++; - Base = 16; - } - } - } + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = 1; + str++; + } /* if */ - if (!isxdigit (*String)) - return STATUS_INVALID_PARAMETER; + if (base == 0) { + base = 10; + if (str[0] == '0') { + if (str[1] == 'b') { + str += 2; + base = 2; + } else if (str[1] == 'o') { + str += 2; + base = 8; + } else if (str[1] == 'x') { + str += 2; + base = 16; + } /* if */ + } /* if */ + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ - while (isxdigit (*String) && - (Val = isdigit (*String) ? * String - '0' : (islower (*String) - ? toupper (*String) : *String) - 'A' + 10) < Base) - { - *Value = *Value * Base + Val; - String++; - } + if (value == NULL) { + return STATUS_ACCESS_VIOLATION; + } /* if */ - return STATUS_SUCCESS; -} + while (*str != '\0') { + chCurrent = *str; + if (chCurrent >= '0' && chCurrent <= '9') { + digit = chCurrent - '0'; + } else if (chCurrent >= 'A' && chCurrent <= 'Z') { + digit = chCurrent - 'A' + 10; + } else if (chCurrent >= 'a' && chCurrent <= 'z') { + digit = chCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ + RunningTotal = RunningTotal * base + digit; + str++; + } /* while */ + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; +} /* * @implemented @@ -807,113 +852,113 @@ return FALSE; } - - -/* +/********************************************************************** **** + * RtlUnicodeStringToInteger (NTDLL.@) * @implemented + * Converts an unicode string into its integer equivalent. * - * Note that regardless of success or failure status, we should leave the - * partial value in Value. An error is never returned based on the chars - * in the string. + * RETURNS + * Success: STATUS_SUCCESS. value contains the converted number + * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. + * STATUS_ACCESS_VIOLATION, if value is NULL. * - * This function does check the base. Only 2, 8, 10, 16 are permitted, - * else STATUS_INVALID_PARAMETER is returned. + * NOTES + * For base 0 it uses 10 as base and the string should be in the format + * "{whitespace} [+|-] [0[x|o|b]] {digits}". + * For other bases the string should be in the format + * "{whitespace} [+|-] {digits}". + * No check is made for value overflow, only the lower 32 bits are assigned. + * If str is NULL it crashes, as the native function does. + * + * Note that regardless of success or failure status, we should leave the + * partial value in Value. An error is never returned based on the chars + * in the string. + * + * DIFFERENCES + * This function does not read garbage on string length 0 as the native + * version does. */ NTSTATUS STDCALL RtlUnicodeStringToInteger( - IN PUNICODE_STRING String, - IN ULONG Base, - OUT PULONG Value) + PUNICODE_STRING str, /* [I] Unicode string to be converted */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + PULONG value) /* [O] Destination for the converted value */ { - PWCHAR Str; - ULONG lenmin = 0; - ULONG i; - ULONG Val; - BOOLEAN addneg = FALSE; - NTSTATUS Status = STATUS_SUCCESS; + LPWSTR lpwstr = str->Buffer; + USHORT CharsRemaining = str->Length / sizeof(WCHAR); + WCHAR wchCurrent; + int digit; + ULONG RunningTotal = 0; + char bMinus = 0; - *Value = 0; - Str = String->Buffer; + while (CharsRemaining >= 1 && *lpwstr <= ' ') { + lpwstr++; + CharsRemaining--; + } /* while */ - if( Base && Base != 2 && Base != 8 && Base != 10 && Base != 16 ) - return STATUS_INVALID_PARAMETER; + if (CharsRemaining >= 1) { + if (*lpwstr == '+') { + lpwstr++; + CharsRemaining--; + } else if (*lpwstr == '-') { + bMinus = 1; + lpwstr++; + CharsRemaining--; + } /* if */ + } /* if */ - for (i = 0; i < String->Length / sizeof(WCHAR); i++) - { - if (*Str == L'b') - { - Base = 2; - lenmin++; - } - else if (*Str == L'o') - { - Base = 8; - lenmin++; - } - else if (*Str == L'd') - { - Base = 10; - lenmin++; - } - else if (*Str == L'x') - { - Base = 16; - lenmin++; - } - else if (*Str == L'+') - { - lenmin++; - } - else if (*Str == L'-') - { - addneg = TRUE; - lenmin++; - } - else if ((*Str > L'1') && (Base == 2)) - { - break; - } - else if (((*Str > L'7') || (*Str < L'0')) && (Base == 8)) - { - break; - } - else if (((*Str > L'9') || (*Str < L'0')) && (Base == 10)) - { - break; - } - else if ( ((*Str > L'9') || (*Str < L'0')) && - ((towupper (*Str) > L'F') || (towupper (*Str) < L'A')) && - (Base == 16)) - { - break; - } - Str++; - } + if (base == 0) { + base = 10; + if (CharsRemaining >= 2 && lpwstr[0] == '0') { + if (lpwstr[1] == 'b') { + lpwstr += 2; + CharsRemaining -= 2; + base = 2; + } else if (lpwstr[1] == 'o') { + lpwstr += 2; + CharsRemaining -= 2; + base = 8; + } else if (lpwstr[1] == 'x') { + lpwstr += 2; + CharsRemaining -= 2; + base = 16; + } /* if */ + } /* if */ + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ - Str = String->Buffer + lenmin; + if (value == NULL) { + return STATUS_ACCESS_VIOLATION; + } /* if */ - if (Base == 0) - Base = 10; + while (CharsRemaining >= 1) { + wchCurrent = *lpwstr; + if (wchCurrent >= '0' && wchCurrent <= '9') { + digit = wchCurrent - '0'; + } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { + digit = wchCurrent - 'A' + 10; + } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { + digit = wchCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ - while (iswxdigit (*Str) && - (Val = - iswdigit (*Str) ? - *Str - L'0' : - (towupper (*Str) - L'A' + 10)) < Base) - { - *Value = *Value * Base + Val; - Str++; - } + RunningTotal = RunningTotal * base + digit; + lpwstr++; + CharsRemaining--; + } /* while */ - if (addneg == TRUE) - *Value *= -1; - - return Status; + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; } - /* * @implemented *

1 0

[sedwards] 15091: remove trailing whitespace at end of lines
by sedwards＠svn.reactos.com 07 May '05

07 May '05

remove trailing whitespace at end of lines Modified: trunk/rosapps/cmdutils/mode/mode.c Modified: trunk/rosapps/cmdutils/more.c Modified: trunk/rosapps/cmdutils/tee.c Modified: trunk/rosapps/cmdutils/touch/touch.c Modified: trunk/rosapps/cmdutils/y.c Modified: trunk/rosapps/demos/maze/maze.c Modified: trunk/rosapps/demos/maze/resource.h Modified: trunk/rosapps/devutils/zoomin/framewnd.c Modified: trunk/rosapps/devutils/zoomin/main.c Modified: trunk/rosapps/dflat32/applicat.c Modified: trunk/rosapps/dflat32/classes.h Modified: trunk/rosapps/dflat32/config.c Modified: trunk/rosapps/dflat32/dialbox.c Modified: trunk/rosapps/dflat32/fileopen.c Modified: trunk/rosapps/dflat32/listbox.c Modified: trunk/rosapps/dflat32/memopad.c Modified: trunk/rosapps/dflat32/menu.h Modified: trunk/rosapps/dflat32/menubar.c Modified: trunk/rosapps/dflat32/message.c Modified: trunk/rosapps/dflat32/msgbox.c Modified: trunk/rosapps/dflat32/pictbox.c Modified: trunk/rosapps/dflat32/popdown.c Modified: trunk/rosapps/dflat32/statbar.c Modified: trunk/rosapps/dflat32/sysmenu.c Modified: trunk/rosapps/dflat32/textbox.c Modified: trunk/rosapps/games/solitaire/resource.h Modified: trunk/rosapps/lib/dflat32/applicat.c Modified: trunk/rosapps/lib/dflat32/config.c Modified: trunk/rosapps/lib/dflat32/dialbox.c Modified: trunk/rosapps/lib/dflat32/dllmain.c Modified: trunk/rosapps/lib/dflat32/listbox.c Modified: trunk/rosapps/lib/dflat32/menubar.c Modified: trunk/rosapps/lib/dflat32/message.c Modified: trunk/rosapps/lib/dflat32/msgbox.c Modified: trunk/rosapps/lib/dflat32/pictbox.c Modified: trunk/rosapps/lib/dflat32/popdown.c Modified: trunk/rosapps/lib/dflat32/statbar.c Modified: trunk/rosapps/lib/dflat32/stubs.c Modified: trunk/rosapps/lib/dflat32/sysmenu.c Modified: trunk/rosapps/mc/acconfig.h Modified: trunk/rosapps/mc/config.h Modified: trunk/rosapps/mc/edit/edit.c Modified: trunk/rosapps/mc/edit/edit.h Modified: trunk/rosapps/mc/edit/edit_key_translator.c Modified: trunk/rosapps/mc/edit/editcmd.c Modified: trunk/rosapps/mc/edit/editdraw.c Modified: trunk/rosapps/mc/edit/editmenu.c Modified: trunk/rosapps/mc/edit/editwidget.c Modified: trunk/rosapps/mc/edit/syntax.c Modified: trunk/rosapps/mc/edit/wordproc.c Modified: trunk/rosapps/mc/pc/chmod.c Modified: trunk/rosapps/mc/pc/config.h Modified: trunk/rosapps/mc/pc/cons_nt.c Modified: trunk/rosapps/mc/pc/cons_os2.c Modified: trunk/rosapps/mc/pc/dirent_nt.c Modified: trunk/rosapps/mc/pc/dirent_os2.c Modified: trunk/rosapps/mc/pc/drive.c Modified: trunk/rosapps/mc/pc/key_nt.c Modified: trunk/rosapps/mc/pc/key_os2.c Modified: trunk/rosapps/mc/pc/slint_pc.c Modified: trunk/rosapps/mc/pc/trace_nt.c Modified: trunk/rosapps/mc/pc/trace_nt.h Modified: trunk/rosapps/mc/pc/util_nt.c Modified: trunk/rosapps/mc/pc/util_os2.c Modified: trunk/rosapps/mc/pc/util_win32.c Modified: trunk/rosapps/mc/pc/util_win32.h Modified: trunk/rosapps/mc/pc/util_winnt.c Modified: trunk/rosapps/mc/slang/_slang.h Modified: trunk/rosapps/mc/slang/jdmacros.h Modified: trunk/rosapps/mc/slang/slang.h Modified: trunk/rosapps/mc/slang/sldisply.c Modified: trunk/rosapps/mc/slang/slerr.c Modified: trunk/rosapps/mc/slang/slgetkey.c Modified: trunk/rosapps/mc/slang/slmemcpy.c Modified: trunk/rosapps/mc/slang/slmemset.c Modified: trunk/rosapps/mc/slang/slos2tty.c Modified: trunk/rosapps/mc/slang/slsignal.c Modified: trunk/rosapps/mc/slang/slsmg.c Modified: trunk/rosapps/mc/slang/sltermin.c Modified: trunk/rosapps/mc/slang/sltoken.c Modified: trunk/rosapps/mc/slang/slutty.c Modified: trunk/rosapps/mc/slang/slvideo.c Modified: trunk/rosapps/mc/slang/slw32tty.c Modified: trunk/rosapps/mc/src/achown.c Modified: trunk/rosapps/mc/src/background.c Modified: trunk/rosapps/mc/src/boxes.c Modified: trunk/rosapps/mc/src/chmod.c Modified: trunk/rosapps/mc/src/chown.c Modified: trunk/rosapps/mc/src/cmd.c Modified: trunk/rosapps/mc/src/cmd.h Modified: trunk/rosapps/mc/src/color.c Modified: trunk/rosapps/mc/src/color.h Modified: trunk/rosapps/mc/src/command.c Modified: trunk/rosapps/mc/src/complete.c Modified: trunk/rosapps/mc/src/cons.handler.c Modified: trunk/rosapps/mc/src/cons.saver.c Modified: trunk/rosapps/mc/src/dialog.c Modified: trunk/rosapps/mc/src/dir.c Modified: trunk/rosapps/mc/src/dir.h Modified: trunk/rosapps/mc/src/dlg.c [truncated at 100 lines; 285 more skipped] _____ Modified: trunk/rosapps/cmdutils/mode/mode.c --- trunk/rosapps/cmdutils/mode/mode.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/mode/mode.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -32,7 +32,7 @@ #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define ASSERT(a) -const TCHAR* const usage_strings[] = { +const TCHAR* const usage_strings[] = { _T("Device Status: MODE [device] [/STATUS]"), _T("Select code page: MODE CON[:] CP SELECT=yyy"), _T("Code page status: MODE CON[:] CP [/STATUS]"), @@ -45,7 +45,7 @@ _T(" [rts=on|off|hs|tg] [idsr=on|off]"), }; -const TCHAR* const parity_strings[] = { +const TCHAR* const parity_strings[] = { _T("None"), // default _T("Odd"), // only symbol in this set to have a 'd' in it _T("Even"), // ... 'v' in it @@ -75,7 +75,7 @@ TCHAR buffer[10240]; int len; TCHAR* ptr = buffer; - + *ptr = '\0'; if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) { while (*ptr != '\0') { @@ -146,7 +146,7 @@ return 0; } -static +static BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite) { BOOL result; @@ -270,7 +270,7 @@ return 0; } -static +static int ExtractModeSerialParams(const TCHAR* param) { if ( _tcsstr(param, _T("OFF"))) { @@ -428,7 +428,7 @@ goto show_status; } else if (_tcsstr(param1, _T("lpt"))) { nPortNum = find_portnum(param1); - if (nPortNum != -1) + if (nPortNum != -1) return ShowParallelStatus(nPortNum); } else if (_tcsstr(param1, _T("con"))) { return ShowConsoleStatus(); _____ Modified: trunk/rosapps/cmdutils/more.c --- trunk/rosapps/cmdutils/more.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/more.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -1,10 +1,10 @@ -/* +/* * MORE.C - external command. * * clone from 4nt more command * * 26 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started + * started * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm> * use window size instead of buffer size. */ _____ Modified: trunk/rosapps/cmdutils/tee.c --- trunk/rosapps/cmdutils/tee.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/tee.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -1,10 +1,10 @@ -/* +/* * TEE.C - external command. * * clone from 4nt tee command * * 01 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started + * started * * */ @@ -69,7 +69,7 @@ /*handle for file and console*/ HANDLE hConsoleIn,hConsoleOut; - + /*bytes written by WriteFile and ReadFile*/ DWORD dwRead,dwWritten; @@ -82,7 +82,7 @@ INT i; BOOL bQuote; - /*file list implementation*/ + /*file list implementation*/ LPTSTR *files; INT iFileCounter=0; HANDLE *hFile; @@ -140,7 +140,7 @@ /* if( iFileCounter >= sizeof(files) / sizeof(*files) ) { - ConErrPrintf("too many files, maximum is %d\n",sizeof(files) / sizeof(*files)); + ConErrPrintf("too many files, maximum is %d\n",sizeof(files) / sizeof(*files)); return 1; } */ @@ -150,7 +150,7 @@ /*open file(s)*/ for(i=0;i<iFileCounter;i++) - { + { //l=0; hFile[i] = CreateFile(files[i],GENERIC_WRITE, 0,NULL, _____ Modified: trunk/rosapps/cmdutils/touch/touch.c --- trunk/rosapps/cmdutils/touch/touch.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/touch/touch.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -204,10 +204,10 @@ { struct tm *t; int yearset; - char *p; + char *p; /* Start with the current time. */ if ((t = localtime(&tvp[0])) == NULL) - err(1, "localtime"); DbgPrint("[%s]", "[23]"); + err(1, "localtime"); DbgPrint("[%s]", "[23]"); /* [[CC]YY]MMDDhhmm[.SS] */ if ((p = strchr(arg, '.')) == NULL) t->tm_sec = 0; /* Seconds defaults to 0. */ @@ -217,7 +217,7 @@ *p++ = '\0'; t->tm_sec = ATOI2(p); } - + yearset = 0; switch(strlen(arg)) { case 12: /* CCYYMMDDhhmm */ _____ Modified: trunk/rosapps/cmdutils/y.c --- trunk/rosapps/cmdutils/y.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/y.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -80,7 +80,7 @@ for (i = 1; i < argc; i++) { hFind=FindFirstFile(argv[i],&FindData); - + if (hFind==INVALID_HANDLE_VALUE) { ConErrPrintf("File not found - %s\n",argv[i]); @@ -107,7 +107,7 @@ if (dwRead>0 && bRet) WriteFile(hConsoleOut,buff,dwRead,&dwWritten,NULL); - + } while(dwRead>0 && bRet); CloseHandle(hFile); _____ Modified: trunk/rosapps/demos/maze/maze.c --- trunk/rosapps/demos/maze/maze.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/demos/maze/maze.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -13,36 +13,36 @@ * screenhack stuff. There's still some work that could * be done on this, particularly allowing a resource to * specify how big the squares are. - * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess + * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess * [ Revised primary execution loop within main()... * [ Extended X event handler, check_events()... - * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com + * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com * [ Hacked for X11... - * [ Note the word "hacked" -- this is extremely ugly, but at - * [ least it does the job. NOT a good programming example + * [ Note the word "hacked" -- this is extremely ugly, but at + * [ least it does the job. NOT a good programming example * [ for X. * original: [ 6/21/85 ] Martin Weiss Sun Microsystems [ SunView ] * ************************************************************************ ****** Copyright 1988 by Sun Microsystems, Inc. Mountain View, CA. - + All Rights Reserved - + Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, + documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in + both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun or MIT not be used in advertising or publicity pertaining to distribution of the - software without specific prior written permission. Sun and M.I.T. - make no representations about the suitability of this software for + software without specific prior written permission. Sun and M.I.T. + make no representations about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - + SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************ *****/ @@ -115,7 +115,7 @@ unsigned char x; unsigned char y; unsigned char dir; - unsigned char dummy; + unsigned char dummy; } move_list[MOVE_LIST_SIZE], save_path[MOVE_LIST_SIZE], path[MOVE_LIST_SIZE]; static int maze_size_x, maze_size_y; @@ -139,50 +139,50 @@ initialize_maze() /* draw the surrounding wall and start/end squares */ { register int i, j, wall; - + /* initialize all squares */ for ( i=0; i<maze_size_x; i++) { for ( j=0; j<maze_size_y; j++) { maze[i][j] = 0; } } - + /* top wall */ for ( i=0; i<maze_size_x; i++ ) { maze[i][0] |= WALL_TOP; } - + /* right wall */ for ( j=0; j<maze_size_y; j++ ) { maze[maze_size_x-1][j] |= WALL_RIGHT; } - + /* bottom wall */ for ( i=0; i<maze_size_x; i++ ) { maze[i][maze_size_y-1] |= WALL_BOTTOM; } - + /* left wall */ for ( j=0; j<maze_size_y; j++ ) { maze[0][j] |= WALL_LEFT; } - + /* set start square */ wall = get_random(4); switch (wall) { - case 0: + case 0: i = get_random(maze_size_x); j = 0; break; - case 1: + case 1: i = maze_size_x - 1; j = get_random(maze_size_y); break; - case 2: + case 2: i = get_random(maze_size_x); j = maze_size_y - 1; break; - case 3: + case 3: i = 0; j = get_random(maze_size_y); break; @@ -196,7 +196,7 @@ start_y = j; start_dir = wall; sqnum = 0; - + /* set end square */ wall = (wall + 2)%4; switch (wall) { @@ -236,7 +236,7 @@ { register int i, newdoor = 0; HDC hDC; - + hDC = GetDC(hWnd); do { move_list[sqnum].x = cur_sq_x; @@ -248,10 +248,10 @@ return; /* done ... return */ } } - + /* mark the out door */ maze[cur_sq_x][cur_sq_y] |= ( DOOR_OUT_TOP >> newdoor ); - + switch (newdoor) { case 0: cur_sq_y--; break; @@ -263,10 +263,10 @@ break; } sqnum++; - + /* mark the in door */ maze[cur_sq_x][cur_sq_y] |= ( DOOR_IN_TOP >> ((newdoor+2)%4) ); - + /* if end square set path length and save path */ if ( maze[cur_sq_x][cur_sq_y] & END_SQUARE ) { path_length = sqnum; @@ -276,9 +276,9 @@ save_path[i].dir = move_list[i].dir; } } - + } while (1); - + } @@ -287,9 +287,9 @@ { int candidates[3]; register int num_candidates; - + num_candidates = 0; - + /* top wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_TOP ) goto rightwall; @@ -304,7 +304,7 @@ goto rightwall; } candidates[num_candidates++] = 0; - + rightwall: /* right wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_RIGHT ) @@ -320,7 +320,7 @@ goto bottomwall; } candidates[num_candidates++] = 1; - + bottomwall: /* bottom wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_BOTTOM ) @@ -336,7 +336,7 @@ goto leftwall; } candidates[num_candidates++] = 2; - + leftwall: /* left wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_LEFT ) @@ -352,14 +352,14 @@ goto donewall; } candidates[num_candidates++] = 3; - + donewall: if (num_candidates == 0) return ( -1 ); if (num_candidates == 1) return ( candidates[0] ); return ( candidates[ get_random(num_candidates) ] ); - + } @@ -385,19 +385,19 @@ RECT rc; switch (dir) { - case 0: + case 0: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width - (bw + bw); rc.top = border_y - bw + grid_height * j; rc.bottom = rc.top + grid_height; break; - case 1: + case 1: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width; rc.top = border_y + bw + grid_height * j; rc.bottom = rc.top + grid_height - (bw + bw); break; - case 2: + case 2: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width - (bw + bw); rc.top = border_y + bw + grid_height * j; @@ -418,8 +418,8 @@ { register int i, j; HBRUSH hBrush; - - + + for ( i=0; i<maze_size_x; i++) { if ( maze[i][0] & WALL_TOP ) { MoveToEx(hDC, border_x + grid_width * i, border_y, NULL); @@ -459,7 +459,7 @@ switch (dir) { case 0: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); - (void) LineTo(hDC, border_x + grid_width * (i+1), + (void) LineTo(hDC, border_x + grid_width * (i+1), border_y + grid_height * j); break; case 1: @@ -471,13 +471,13 @@ case 2: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * (j+1), NULL); - (void) LineTo(hDC, border_x + grid_width * (i+1), + (void) LineTo(hDC, border_x + grid_width * (i+1), border_y + grid_height * (j+1)); break; case 3: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); - (void) LineTo(hDC, border_x + grid_width * i, + (void) LineTo(hDC, border_x + grid_width * i, border_y + grid_height * (j+1)); break; } @@ -497,11 +497,11 @@ 0xaaaaaaaa }; static RGBQUAD argbq[] = { - { 0, 0, 255, 0 }, + { 0, 0, 255, 0 }, { 255, 255, 255, 0 } }; BITMAPINFO *pbmi; - + hDC = GetDC(hWnd); pbmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(argbq) + sizeof(grayPattern)); pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -525,31 +525,31 @@ /* plug up the surrounding wall */ maze[start_x][start_y] |= (WALL_TOP >> start_dir); maze[end_x][end_y] |= (WALL_TOP >> end_dir); - + /* initialize search path */ pathi = 0; path[pathi].x = end_x; path[pathi].y = end_y; path[pathi].dir = -1; } - + static int solve_maze() /* solve it with graphical feedback */ { int ret; int action_done; - + do { action_done = 1; if ( ++path[pathi].dir >= 4 ) { pathi--; - draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), + draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), (int)(path[pathi].dir), hDC, hBrushDead); ret = 0; } - else if ( ! (maze[path[pathi].x][path[pathi].y] & - (WALL_TOP >> path[pathi].dir)) && - ( (pathi == 0) || ( (path[pathi].dir != + else if ( ! (maze[path[pathi].x][path[pathi].y] & + (WALL_TOP >> path[pathi].dir)) && + ( (pathi == 0) || ( (path[pathi].dir != (int)(path[pathi-1].dir+2)%4) ) ) ) { enter_square(pathi, hDC, hBrushLiving); pathi++; @@ -567,15 +567,15 @@ } while (! action_done); return ret; -} +} static void enter_square(int n, HDC hDC, HBRUSH hBrush) /* move into a neighboring square */ { - draw_solid_square( (int)path[n].x, (int)path[n].y, + draw_solid_square( (int)path[n].x, (int)path[n].y, (int)path[n].dir, hDC, hBrush); - + path[n+1].dir = -1; switch (path[n].dir) { case 0: path[n+1].x = path[n].x; _____ Modified: trunk/rosapps/demos/maze/resource.h --- trunk/rosapps/demos/maze/resource.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/demos/maze/resource.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -23,7 +23,7 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <windows.h> #include <tchar.h> - + #include "main.h" #include "framewnd.h" _____ Modified: trunk/rosapps/devutils/zoomin/main.c --- trunk/rosapps/devutils/zoomin/main.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/devutils/zoomin/main.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -25,7 +25,7 @@ #include <tchar.h> #include <stdlib.h> #include <stdio.h> - + #include "main.h" #include "framewnd.h" @@ -109,7 +109,7 @@ // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); LoadString(hInstance, IDC_ZOOMIN, szFrameClass, MAX_LOADSTRING); - + // Store instance handle in our global variable hInst = hInstance; _____ Modified: trunk/rosapps/dflat32/applicat.c --- trunk/rosapps/dflat32/applicat.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/applicat.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -81,7 +81,7 @@ if (wnd->StatusBar != NULL) { if (p1 && *(char *)p1) DfSendMessage(wnd->StatusBar, DFM_SETTEXT, p1, 0); - else + else DfSendMessage(wnd->StatusBar, DFM_CLEARTEXT, 0, 0); DfSendMessage(wnd->StatusBar, DFM_PAINT, 0, 0); } @@ -95,7 +95,7 @@ DfInFocus = p1 ? wnd : NULL; if (DfIsVisible(wnd)) DfSendMessage(wnd, DFM_BORDER, 0, 0); - else + else DfSendMessage(wnd, DFM_SHOW_WINDOW, 0, 0); } @@ -195,7 +195,7 @@ if (DfDialogBox(wnd, &Display, TRUE, NULL)) { if (DfInFocus == wnd->MenuBarWnd || DfInFocus == wnd->StatusBar) oldFocus = DfApplicationWindow; - else + else oldFocus = DfInFocus; DfSendMessage(wnd, DFM_HIDE_WINDOW, 0, 0); SelectColors(wnd); @@ -389,7 +389,7 @@ { if (DfGetClass(wnd) == DF_DIALOG) return ((DF_DBOX *)(wnd->extension))->HelpName; - else + else return "Untitled"; } else _____ Modified: trunk/rosapps/dflat32/classes.h --- trunk/rosapps/dflat32/classes.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/classes.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -7,7 +7,7 @@ * You must add entries to the DfColor tables in * DFCONFIG.C for new classes. * - * Class Name Base Class Processor Attribute + * Class Name Base Class Processor Attribute * ------------ --------- --------------- ----------- */ DfClassDef( DF_NORMAL, -1, DfNormalProc, 0 ) _____ Modified: trunk/rosapps/dflat32/config.c --- trunk/rosapps/dflat32/config.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/config.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -449,7 +449,7 @@ cp = strrchr(path, '\\'); if (cp == NULL) cp = path; - else + else cp++; strcpy(cp, DFlatApplication); strcat(cp, ext); _____ Modified: trunk/rosapps/dflat32/dialbox.c --- trunk/rosapps/dflat32/dialbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/dialbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -529,11 +529,11 @@ int oldattr = DfGetAttribute(wnd); if (wnd->wlines > DfClientHeight(wnd)) DfAddAttribute(wnd, DF_VSCROLLBAR); - else + else DfClearAttribute(wnd, DF_VSCROLLBAR); if (wnd->textwidth > DfClientWidth(wnd)) DfAddAttribute(wnd, DF_HSCROLLBAR); - else + else DfClearAttribute(wnd, DF_HSCROLLBAR); if (DfGetAttribute(wnd) != oldattr) DfSendMessage(wnd, DFM_BORDER, 0, 0); @@ -643,15 +643,15 @@ { if (ct->class != DF_SPINBUTTON && ct->class != DF_COMBOBOX) { - wnd->WindowColors[DF_FRAME_COLOR][DF_FG] = + wnd->WindowColors[DF_FRAME_COLOR][DF_FG] = DfGetParent(wnd)->WindowColors[DF_FRAME_COLOR][DF_FG]; - wnd->WindowColors[DF_FRAME_COLOR][DF_BG] = + wnd->WindowColors[DF_FRAME_COLOR][DF_BG] = DfGetParent(wnd)->WindowColors[DF_FRAME_COLOR][DF_BG]; if (ct->class != DF_EDITBOX && ct->class != DF_LISTBOX) { - wnd->WindowColors[DF_STD_COLOR][DF_FG] = + wnd->WindowColors[DF_STD_COLOR][DF_FG] = DfGetParent(wnd)->WindowColors[DF_STD_COLOR][DF_FG]; - wnd->WindowColors[DF_STD_COLOR][DF_BG] = + wnd->WindowColors[DF_STD_COLOR][DF_BG] = DfGetParent(wnd)->WindowColors[DF_STD_COLOR][DF_BG]; } } _____ Modified: trunk/rosapps/dflat32/fileopen.c --- trunk/rosapps/dflat32/fileopen.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/fileopen.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -183,7 +183,7 @@ DfGetItemText(wnd, DF_ID_PATH, FileSpec, 65); strcat(FileSpec, FileName); } - else + else strcpy(FileSpec, FileName); } break; _____ Modified: trunk/rosapps/dflat32/listbox.c --- trunk/rosapps/dflat32/listbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/listbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -398,7 +398,7 @@ } static int ExtendSelections(DFWINDOW wnd, int sel, int shift) -{ +{ if (shift & (DF_LEFTSHIFT | DF_RIGHTSHIFT) && wnd->AnchorPoint != -1) { int i = sel; _____ Modified: trunk/rosapps/dflat32/memopad.c --- trunk/rosapps/dflat32/memopad.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/memopad.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -125,7 +125,7 @@ case DF_ID_PRINT: PrintPad(DfInFocus); return TRUE; - case DF_ID_EXIT: + case DF_ID_EXIT: if (!DfYesNoBox("Exit Memopad?")) return FALSE; break; @@ -144,7 +144,7 @@ FixTabMenu(); return TRUE; case DF_ID_TAB6: - DfCfg.Tabs = 6; + DfCfg.Tabs = 6; FixTabMenu(); return TRUE; case DF_ID_TAB8: @@ -254,7 +254,7 @@ } DfSendMessage(wwnd, DFM_CLOSE_WINDOW, 0, 0); DfSendMessage(wnd1, DFM_SETFOCUS, TRUE, 0); - DfSendMessage(wnd1, DFM_MAXIMIZE, 0, 0); + DfSendMessage(wnd1, DFM_MAXIMIZE, 0, 0); } /* --- Load the notepad file into the editor text buffer --- */ @@ -414,7 +414,7 @@ rtn = DfDefaultWndProc(wnd, msg, p1, p2); if ((int)p1 == FALSE) DfSendMessage(DfGetParent(wnd), DFM_ADDSTATUS, 0, 0); - else + else ShowPosition(wnd); return rtn; case DFM_KEYBOARD_CURSOR: _____ Modified: trunk/rosapps/dflat32/menu.h --- trunk/rosapps/dflat32/menu.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/menu.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -49,7 +49,7 @@ #define DF_INACTIVE 1 #define DF_CHECKED 2 #define DF_TOGGLE 4 -#define DF_CASCADED 8 +#define DF_CASCADED 8 /* --------- the standard menus ---------- */ extern DF_MBAR DfMainMenu; _____ Modified: trunk/rosapps/dflat32/menubar.c --- trunk/rosapps/dflat32/menubar.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/menubar.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -196,7 +196,7 @@ if (mwnd != NULL) DfSendMessage(wnd, DFM_MB_SELECTION, DfActiveMenuBar->ActiveSelection, 0); - else + else DfSendMessage(wnd, DFM_PAINT, 0, 0); break; case DF_BS: @@ -207,7 +207,7 @@ if (mwnd != NULL) DfSendMessage(wnd, DFM_MB_SELECTION, DfActiveMenuBar->ActiveSelection, 0); - else + else DfSendMessage(wnd, DFM_PAINT, 0, 0); break; default: _____ Modified: trunk/rosapps/dflat32/message.c --- trunk/rosapps/dflat32/message.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/message.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -593,7 +593,7 @@ while (EventQueueCtr > 0) { struct events ev; - + ev = EventQueue[EventQueueOffCtr]; if (++EventQueueOffCtr == DF_MAXMESSAGES) EventQueueOffCtr = 0; _____ Modified: trunk/rosapps/dflat32/msgbox.c --- trunk/rosapps/dflat32/msgbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/msgbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -123,7 +123,7 @@ InputText = text; TextLength = len; InputBoxDB.dwnd.title = ttl; - InputBoxDB.dwnd.w = 4 + + InputBoxDB.dwnd.w = 4 + max(20, max(len, max((int)strlen(ttl), (int)strlen(msg)))); InputBoxDB.ctl[1].dwnd.x = (InputBoxDB.dwnd.w-2-len)/2; InputBoxDB.ctl[0].dwnd.w = strlen(msg); _____ Modified: trunk/rosapps/dflat32/pictbox.c --- trunk/rosapps/dflat32/pictbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/pictbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -74,7 +74,7 @@ coll = 0; else if (rc.lf+x == rcc.rt) coll = 2; - else + else coll = 1; } } @@ -88,7 +88,7 @@ coll = 0; else if (rc.tp+y == rcc.bt) coll = 2; - else + else coll = 1; } } _____ Modified: trunk/rosapps/dflat32/popdown.c --- trunk/rosapps/dflat32/popdown.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/popdown.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -228,7 +228,7 @@ case DF_F1: if (ActivePopDown == NULL) DfSendMessage(DfGetParent(wnd), DFM_KEYBOARD, p1, p2); - else + else DfDisplayHelp(wnd, (ActivePopDown+wnd->selection)->help); return TRUE; _____ Modified: trunk/rosapps/dflat32/statbar.c --- trunk/rosapps/dflat32/statbar.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/statbar.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -14,7 +14,7 @@ if ((int)p1 == DF_CTRL_F4) return TRUE; break; - case DFM_PAINT: + case DFM_PAINT: if (!DfIsVisible(wnd)) break; statusbar = DfCalloc(1, DfWindowWidth(wnd)+1); _____ Modified: trunk/rosapps/dflat32/sysmenu.c --- trunk/rosapps/dflat32/sysmenu.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/sysmenu.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -45,7 +45,7 @@ int lf, tp, ht, wd; DFWINDOW SystemMenuWnd; - DfSystemMenu.PullDown[0].Selections[6].Accelerator = + DfSystemMenu.PullDown[0].Selections[6].Accelerator = (DfGetClass(wnd) == DF_APPLICATION) ? DF_ALT_F4 : DF_CTRL_F4; lf = DfGetLeft(wnd)+1; _____ Modified: trunk/rosapps/dflat32/textbox.c --- trunk/rosapps/dflat32/textbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/textbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -713,7 +713,7 @@ if (*(lp+i) && i < wnd->wleft+3) { if (wnd->wleft+4 > lnlen) trunc = TRUE; - else + else lp += 4; } else { _____ Modified: trunk/rosapps/games/solitaire/resource.h --- trunk/rosapps/games/solitaire/resource.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/games/solitaire/resource.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -14,7 +14,7 @@ #define IDM_HELP_ABOUT 40006 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 105 _____ Modified: trunk/rosapps/lib/dflat32/applicat.c --- trunk/rosapps/lib/dflat32/applicat.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/applicat.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -81,7 +81,7 @@ if (wnd->StatusBar != NULL) { if (p1 && *(char *)p1) DfSendMessage(wnd->StatusBar, SETTEXT, p1, 0); - else + else DfSendMessage(wnd->StatusBar, CLEARTEXT, 0, 0); DfSendMessage(wnd->StatusBar, PAINT, 0, 0); } @@ -95,7 +95,7 @@ inFocus = p1 ? wnd : NULL; if (isVisible(wnd)) DfSendMessage(wnd, BORDER, 0, 0); - else + else DfSendMessage(wnd, SHOW_WINDOW, 0, 0); } @@ -195,7 +195,7 @@ if (DfDialogBox(wnd, &Display, TRUE, NULL)) { if (inFocus == wnd->MenuBarWnd || inFocus == wnd->StatusBar) oldFocus = ApplicationWindow; - else + else oldFocus = inFocus; DfSendMessage(wnd, DFM_HIDE_WINDOW, 0, 0); SelectColors(wnd); @@ -389,7 +389,7 @@ { if (GetClass(wnd) == DIALOG) return ((DBOX *)(wnd->extension))->HelpName; - else + else return "Untitled"; } else _____ Modified: trunk/rosapps/lib/dflat32/config.c --- trunk/rosapps/lib/dflat32/config.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/config.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -449,7 +449,7 @@ cp = strrchr(path, '\\'); if (cp == NULL) cp = path; - else + else cp++; strcpy(cp, DFlatApplication); strcat(cp, ext); _____ Modified: trunk/rosapps/lib/dflat32/dialbox.c --- trunk/rosapps/lib/dflat32/dialbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/dialbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -529,11 +529,11 @@ int oldattr = GetAttribute(wnd); if (wnd->wlines > ClientHeight(wnd)) AddAttribute(wnd, VSCROLLBAR); - else + else ClearAttribute(wnd, VSCROLLBAR); if (wnd->textwidth > ClientWidth(wnd)) AddAttribute(wnd, HSCROLLBAR); - else + else ClearAttribute(wnd, HSCROLLBAR); if (GetAttribute(wnd) != oldattr) DfSendMessage(wnd, BORDER, 0, 0); @@ -643,15 +643,15 @@ { if (ct->class != SPINBUTTON && ct->class != COMBOBOX) { - wnd->WindowColors[FRAME_COLOR][FG] = + wnd->WindowColors[FRAME_COLOR][FG] = GetParent(wnd)->WindowColors[FRAME_COLOR][FG]; - wnd->WindowColors[FRAME_COLOR][BG] = + wnd->WindowColors[FRAME_COLOR][BG] = GetParent(wnd)->WindowColors[FRAME_COLOR][BG]; if (ct->class != EDITBOX && ct->class != LISTBOX) { - wnd->WindowColors[STD_COLOR][FG] = + wnd->WindowColors[STD_COLOR][FG] = GetParent(wnd)->WindowColors[STD_COLOR][FG]; - wnd->WindowColors[STD_COLOR][BG] = + wnd->WindowColors[STD_COLOR][BG] = GetParent(wnd)->WindowColors[STD_COLOR][BG]; } } _____ Modified: trunk/rosapps/lib/dflat32/dllmain.c [truncated at 1000 lines; 37354 more skipped]

1 0

[greatlrd] 15090: doubicate res id my fualt
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

doubicate res id my fualt now everthing should print out right strings Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 20:20:46 UTC (rev 15089) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 20:47:57 UTC (rev 15090) @@ -160,46 +160,46 @@ #define STRING_REN_HELP2 672 #define STRING_REN_HELP3 673 -#define STRING_RMDIR_HELP 672 +#define STRING_RMDIR_HELP 674 -#define STRING_SCREEN_HELP 673 +#define STRING_SCREEN_HELP 675 -#define STRING_SHIFT_HELP 674 +#define STRING_SHIFT_HELP 676 -#define STRING_SET_HELP 675 +#define STRING_SET_HELP 677 -#define STRING_START_HELP1 676 +#define STRING_START_HELP1 678 -#define STRING_TITLE_HELP 677 +#define STRING_TITLE_HELP 679 -#define STRING_TIME_HELP1 678 -#define STRING_TIME_HELP2 679 +#define STRING_TIME_HELP1 680 +#define STRING_TIME_HELP2 681 -#define STRING_TIMER_HELP1 680 -#define STRING_TIMER_HELP2 681 -#define STRING_TIMER_HELP3 682 +#define STRING_TIMER_HELP1 682 +#define STRING_TIMER_HELP2 683 +#define STRING_TIMER_HELP3 684 -#define STRING_TYPE_HELP1 683 +#define STRING_TYPE_HELP1 685 -#define STRING_VERIFY_HELP1 684 -#define STRING_VERIFY_HELP2 685 -#define STRING_VERIFY_HELP3 686 +#define STRING_VERIFY_HELP1 686 +#define STRING_VERIFY_HELP2 687 +#define STRING_VERIFY_HELP3 688 -#define STRING_VERSION_HELP1 687 -#define STRING_VERSION_HELP2 688 -#define STRING_VERSION_HELP3 689 -#define STRING_VERSION_HELP4 690 -#define STRING_VERSION_HELP5 691 -#define STRING_VERSION_HELP6 692 -#define STRING_VERSION_HELP7 693 +#define STRING_VERSION_HELP1 689 +#define STRING_VERSION_HELP2 690 +#define STRING_VERSION_HELP3 691 +#define STRING_VERSION_HELP4 692 +#define STRING_VERSION_HELP5 693 +#define STRING_VERSION_HELP6 694 +#define STRING_VERSION_HELP7 695 -#define STRING_VOL_HELP1 694 -#define STRING_VOL_HELP2 695 -#define STRING_VOL_HELP3 696 -#define STRING_VOL_HELP4 697 +#define STRING_VOL_HELP1 696 +#define STRING_VOL_HELP2 697 +#define STRING_VOL_HELP3 698 +#define STRING_VOL_HELP4 699 -#define STRING_WINDOW_HELP1 698 -#define STRING_WINDOW_HELP2 699 +#define STRING_WINDOW_HELP1 700 +#define STRING_WINDOW_HELP2 701 /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800

1 0

[hbirr] 15089: - initialize a user profile before loading syssetup.dll.
by hbirr＠svn.reactos.com 07 May '05

07 May '05

- initialize a user profile before loading syssetup.dll. - this makes it possible to install ros over an existing ros. Modified: trunk/reactos/subsys/system/setup/makefile Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/makefile --- trunk/reactos/subsys/system/setup/makefile 2005-05-07 20:02:50 UTC (rev 15088) +++ trunk/reactos/subsys/system/setup/makefile 2005-05-07 20:20:46 UTC (rev 15089) @@ -10,7 +10,7 @@ TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = kernel32.a +TARGET_SDKLIBS = kernel32.a userenv.a ntdll.a TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_IE=0x0400 _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-05-07 20:02:50 UTC (rev 15088) +++ trunk/reactos/subsys/system/setup/setup.c 2005-05-07 20:20:46 UTC (rev 15089) @@ -27,6 +27,7 @@ #include <windows.h> #include <tchar.h> #include <syssetup.h> +#include <userenv.h> #define NDEBUG #include <debug.h> @@ -59,6 +60,9 @@ HMODULE hDll; PINSTALL_REACTOS InstallReactOS; + /* some dlls (loaded by syssetup) need a valid user profile */ + InitializeProfiles(); + hDll = LoadLibrary (TEXT("syssetup")); if (hDll == NULL) {

1 0

[greatlrd] 15088: Fix a old bug in dir it did only accpet lower letters as param
by greatlrd＠svn.reactos.com 07 May '05

07 May '05

Fix a old bug in dir it did only accpet lower letters as param change from ansi _toupper to tchar _totupper it is now both uncide and ansi compatible Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 18:20:23 UTC (rev 15087) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-05-07 20:02:50 UTC (rev 15088) @@ -262,7 +262,7 @@ { /* we save current character as it is and its upper case */ cCurChar = *Line; - cCurUChar = _toupper(*Line); + cCurUChar = _totupper(*Line); /* 1st section (see README_DIR.txt) */ /* When a switch is expecting */

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