Ros-diffs

ros-diffs@reactos.org

81390 discussions

[royce] 17927: fix if command to work more like expected. seta_test.cmd gets much further now.
by royce＠svn.reactos.com 19 Sep '05

19 Sep '05

fix if command to work more like expected. seta_test.cmd gets much further now. fixed some msvc6 warnings while I was in here Modified: trunk/reactos/subsys/system/cmd/if.c _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-09-19 05:29:17 UTC (rev 17926) +++ trunk/reactos/subsys/system/cmd/if.c 2005-09-19 05:42:01 UTC (rev 17927) @@ -52,9 +52,16 @@ return 0; } - /* First check if param string begins with word 'not' */ - if (!_tcsnicmp (param, _T("not"), 3) && _istspace (*(param + 3))) + /* First check if param string begins with '!' or 'not' */ + if ( param[0] == _T('!') ) { + x_flag = X_EXEC; /* Remember '!' */ + ++param; /* Step over '!' */ + while (_istspace (*param)) /* And subsequent spaces */ + param++; + } + else if (!_tcsnicmp (param, _T("not"), 3) && _istspace (*(param + 3))) + { x_flag = X_EXEC; /* Remember 'NOT' */ param += 3; /* Step over 'NOT' */ while (_istspace (*param)) /* And subsequent spaces */ @@ -64,14 +71,15 @@ /* Check for 'exist' form */ if (!_tcsnicmp (param, _T("exist"), 5) && _istspace (*(param + 5))) { + UINT i; + BOOL bInside = FALSE; + param += 5; while (_istspace (*param)) param++; pp = param; - INT i; - BOOL bInside = FALSE; /* find the whole path to the file */ for(i = 0; i < _tcslen(param); i++) { @@ -155,38 +163,34 @@ x_flag |= X_EMPTY; /* Syntax error if comd empty */ } - else if (NULL == (pp = _tcsstr (param, _T("==")))) - { - /* Check that '==' is present, syntax error if not */ - error_syntax (NULL); - return 1; - } else { - /* Change first '='to space to terminate comparison loop */ - - *pp = _T(' '); /* Need a space to terminate comparison loop */ - pp += 2; /* over '==' */ + BOOL bInQuote = FALSE; + INT p1len; + pp = param; + while ( *pp && ( bInQuote || *pp != _T('=') ) ) + { + if ( *pp == _T('\"') ) + bInQuote = !bInQuote; + ++pp; + } + p1len = pp-param; + /* check for "==" */ + if ( *pp++ != _T('=') || *pp++ != _T('=') ) + { + error_syntax ( NULL ); + return 1; + } while (_istspace (*pp)) /* Skip subsequent spaces */ pp++; - _tcscat (pp, _T(" ")); /* Add one space to ensure comparison ends */ + /* are the two sides equal, and does the second end in the same place? */ + if ( !_tcsncmp(param,pp,p1len) && _tcschr(_T(" ("),pp[p1len]) ) + x_flag ^= X_EXEC; + pp += p1len; - while (*param == *pp) /* Comparison loop */ - { - if (_istspace (*param)) /* Terminates on space */ - break; - - param++, pp++; - } - - if (x_flag ^= (*param != *pp) ? 0 : X_EXEC) - { - while (*pp && !_istspace (*pp)) /* Find first space, */ - pp++; - + if ( x_flag ) x_flag |= X_EMPTY; - } } if (x_flag & X_EMPTY)

1 0

[royce] 17926: fixed mistakes, extra tests illustrating problems with if command
by royce＠svn.reactos.com 19 Sep '05

19 Sep '05

fixed mistakes, extra tests illustrating problems with if command Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd _____ Modified: trunk/reactos/subsys/system/cmd/seta_test.cmd --- trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-19 01:14:36 UTC (rev 17925) +++ trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-19 05:29:17 UTC (rev 17926) @@ -1,60 +1,67 @@ @echo off -if ("1"=="2") goto failure -if !("1"=="1") goto failure +@rem the next line illustrates a bug in our cmd +set /a a=5%2 +@rem the next two lines illustrate bug in existing if code +if not "=="=="==" goto failure +if "=="=="==" goto next1 +goto failure +:next1 +if "1"=="2" goto failure +if !"1"=="1" goto failure set /a a=1 -if !("%a%"=="1") goto failure +if !"%a%"=="1" goto failure set /a b=a -if !("%b%"=="1") goto failure +if !"%b%"=="1" goto failure set /a a=!5 -if !("%a%"=="0") goto failure +if !"%a%"=="0" goto failure set /a a=~5 -if !("%a%"=="-6") goto failure +if !"%a%"=="-6" goto failure set /a a=5,a=-a -if !("%a%"=="-5") goto failure +if !"%a%"=="-5" goto failure set /a a=5*7 -if !("%a%"=="35") goto failure +if !"%a%"=="35" goto failure set /a a=2000/10 -if !("%a%"=="200") goto failure +if !"%a%"=="200" goto failure set /a a=42%9 -if !("%a%"=="6") goto failure +if !"%a%"=="6" goto failure set /a a=7+9 -if !("%a%"=="16") goto failure +if !"%a%"=="16" goto failure set /a a=9-7 -if !("%a%"=="2") goto failure +if !"%a%"=="2" goto failure set /a a=9^<^<2 -if !("%a%"=="36") goto failure +if !"%a%"=="36" goto failure set /a a=36^>^>2 -if !("%a%"=="9") goto failure +if !"%a%"=="9" goto failure set /a a=42^&9 -if !("%a%"=="8") goto failure +if !"%a%"=="8" goto failure set /a a=32^^9 -if !("%a%"=="41") goto failure +if !"%a%"=="41" goto failure set /a a=10^|22 -if !("%a%"=="30") goto failure +if !"%a%"=="30" goto failure set /a a=2,a*=3 -if !("%a%"=="6") goto failure +if !"%a%"=="6" goto failure set /a a=11,a/=2 -if !("%a%"=="5") goto failure +if !"%a%"=="5" goto failure set /a a=42,a%=9 -if !("%a%"=="6") goto failure +if !"%a%"=="6" goto failure set /a a=7,a+=9 -if !("%a%"=="16") goto failure +if !"%a%"=="16" goto failure set /a a=9,a-=7 -if !("%a%"=="2") goto failure +if !"%a%"=="2" goto failure set /a a=42,a^&=9 -if !("%a%"=="8") goto failure +if !"%a%"=="8" goto failure set /a a=32,a^^=9 -if !("%a%"=="41") goto failure +if !"%a%"=="41" goto failure set /a a=10,a^|=22 -if !("%a%"=="30") goto failure +if !"%a%"=="30" goto failure set /a a=9,a^<^<=2 -if !("%a%"=="36") goto failure +if !"%a%"=="36" goto failure set /a a=36,a^>^>=2 -if !("%a%"=="9") goto failure -set /a a=(1,2) -if !("%a%"=="2") goto failure +if !"%a%"=="9" goto failure +set /a a=1,2 +if !"%a%"=="2" goto failure set /a a=(a=1,a+2) -if ("%a%"=="3") goto success +if "%a%"=="3" goto success goto failure :success @@ -62,6 +69,6 @@ goto done :failure -echo FAILURE! (remove the echo off and see the last formula that executed before this line) +echo FAILURE! remove the echo off and see the last formula that executed before this line :done

1 0

[royce] 17925: move hard-coded strings to En.rc before GreatLord shoots me
by royce＠svn.reactos.com 19 Sep '05

19 Sep '05

move hard-coded strings to En.rc before GreatLord shoots me Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/resource.h Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-09-19 00:02:39 UTC (rev 17924) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-09-19 01:14:36 UTC (rev 17925) @@ -635,4 +635,10 @@ STRING_SCREEN_COL, "invalid value for col" STRING_SCREEN_ROW, "invalid value for row" STRING_TIMER_TIME "Timer %d is %s: " + +STRING_INVALID_OPERAND, "Invalid operand.\n" +STRING_EXPECTED_CLOSE_PAREN, "Expected ')'.\n" +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Expected number or variable name.\n" +STRING_SYNTAX_COMMAND_INCORRECT, "The syntax of the command is incorrect.\n" + } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-09-19 00:02:39 UTC (rev 17924) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-09-19 01:14:36 UTC (rev 17925) @@ -215,6 +215,11 @@ #define STRING_HELP1 718 #define STRING_HELP2 719 +#define STRING_INVALID_OPERAND 720 +#define STRING_EXPECTED_CLOSE_PAREN 721 +#define STRING_EXPECTED_NUMBER_OR_VARIABLE 722 +#define STRING_SYNTAX_COMMAND_INCORRECT 723 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801 _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-19 00:02:39 UTC (rev 17924) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-19 01:14:36 UTC (rev 17925) @@ -225,7 +225,7 @@ *lval |= rval; break; default: - ConErrPrintf ( _T("Invalid operand.\n") ); + ConErrResPuts ( STRING_INVALID_OPERAND ); return FALSE; } return TRUE; @@ -246,7 +246,7 @@ return FALSE; if ( *p != _T(')') ) { - ConErrPrintf ( _T("Expected ')'\n") ); + ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN ); return FALSE; } *result = rval; @@ -267,7 +267,7 @@ } else { - ConErrPrintf ( _T("Expected number or variable name\n") ); + ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE ); return FALSE; } *p_ = p; @@ -369,7 +369,7 @@ lval >>= rval; break; default: - ConErrPrintf ( _T("Invalid operand.\n") ); + ConErrResPuts ( STRING_INVALID_OPERAND ); return FALSE; } } @@ -487,7 +487,7 @@ INT rval; if ( !*p ) { - ConErrPrintf ( _T("The syntax of the command is incorrect.\n") ); + ConErrResPuts ( STRING_SYNTAX_COMMAND_INCORRECT ); return FALSE; } if ( !seta_stmt ( &p, &rval ) )

1 0

[gdalsnes] 17924: -set last error (invalid handle) in cases where handle is NULL also
by gdalsnes＠svn.reactos.com 19 Sep '05

19 Sep '05

-set last error (invalid handle) in cases where handle is NULL also -remove GvG's workaround Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -74,18 +74,20 @@ { PACCELERATOR_TABLE Accel; - if (!hAccel) return NULL; + if (!hAccel) + { + SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); + return NULL; + } Accel= UserGetObject(&gHandleTable, hAccel, otAccel); - - if (Accel) + if (!Accel) { - ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); - } - else - { SetLastWin32Error(ERROR_INVALID_ACCEL_HANDLE); + return NULL; } + + ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0); return Accel; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -77,7 +77,11 @@ { PCURICON_OBJECT CurIcon; - if (!hCurIcon) return NULL; + if (!hCurIcon) + { + SetLastWin32Error(ERROR_INVALID_CURSOR_HANDLE); + return NULL; + } CurIcon = (PCURICON_OBJECT)UserGetObject(&gHandleTable, hCurIcon, otCursorIcon); if (!CurIcon) _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -59,21 +59,28 @@ } -PHOOK FASTCALL IntGetHookObject(HHOOK hWnd) +PHOOK FASTCALL IntGetHookObject(HHOOK hHook) { - - PHOOK Window = (PHOOK)UserGetObject(&gHandleTable, hWnd, otHook); - if (!Window) + PHOOK Hook; + + if (!hHook) { SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); return NULL; } + + Hook = (PHOOK)UserGetObject(&gHandleTable, hHook, otHook); + if (!Hook) + { + SetLastWin32Error(ERROR_INVALID_HOOK_HANDLE); + return NULL; + } - ASSERT(USER_BODY_TO_HEADER(Window)->RefCount >= 0); + ASSERT(USER_BODY_TO_HEADER(Hook)->RefCount >= 0); - USER_BODY_TO_HEADER(Window)->RefCount++; + USER_BODY_TO_HEADER(Hook)->RefCount++; - return Window; + return Hook; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c --- trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -154,6 +154,10 @@ } + +/* SYSCALLS *****************************************************************/ + + BOOL STDCALL NtUserRegisterHotKey(HWND hWnd, int id, _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -115,7 +115,15 @@ PMENU_OBJECT FASTCALL UserGetMenuObject(HMENU hMenu) { - PMENU_OBJECT Menu = (PMENU_OBJECT)UserGetObject(&gHandleTable, hMenu, otMenu); + PMENU_OBJECT Menu; + + if (!hMenu) + { + SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); + return NULL; + } + + Menu = (PMENU_OBJECT)UserGetObject(&gHandleTable, hMenu, otMenu); if (!Menu) { SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); _____ Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c --- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -124,7 +124,16 @@ PMONITOR_OBJECT FASTCALL UserGetMonitorObject(IN HMONITOR hMonitor) { - PMONITOR_OBJECT Monitor = (PMONITOR_OBJECT)UserGetObject(&gHandleTable, hMonitor, otMonitor); + PMONITOR_OBJECT Monitor; + + if (!hMonitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + + Monitor = (PMONITOR_OBJECT)UserGetObject(&gHandleTable, hMonitor, otMonitor); if (!Monitor) { SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-18 23:06:15 UTC (rev 17923) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-19 00:02:39 UTC (rev 17924) @@ -97,7 +97,11 @@ { PWINDOW_OBJECT Window; - if (!hWnd) return NULL; + if (!hWnd) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return NULL; + } Window = (PWINDOW_OBJECT)UserGetObject(&gHandleTable, hWnd, otWindow); if (!Window || 0 != (Window->Status & WINDOWSTATUS_DESTROYED)) @@ -3233,7 +3237,6 @@ if (!(Window = UserGetWindowObject(hWnd))) { - SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return 0; }

1 0

[gdalsnes] 17923: -added better LIST_FOR_EACH macros (ripped from wine) and fix their usage
by gdalsnes＠svn.reactos.com 18 Sep '05

18 Sep '05

-added better LIST_FOR_EACH macros (ripped from wine) and fix their usage -make hotkeys session global (they dont belong in winsta) Modified: trunk/reactos/include/reactos/helper.h Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/subsys/win32k/include/hotkey.h Modified: trunk/reactos/subsys/win32k/include/winsta.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/include/reactos/helper.h 2005-09-18 23:06:15 UTC (rev 17923) @@ -17,12 +17,21 @@ #endif #define EXPORTED __declspec(dllexport) #define IMPORTED __declspec(dllimport) -#define LIST_FOR_EACH(entry, head) \ - for(entry = (head)->Flink; entry != (head); entry = entry->Flink) -#define LIST_FOR_EACH_SAFE(tmp_entry, head, ptr, type, field) \ - for ((tmp_entry)=(head)->Flink; (tmp_entry)!=(head) && \ - ((ptr) = CONTAINING_RECORD(tmp_entry,type,field)) && \ - ((tmp_entry) = (tmp_entry)->Flink); ) + +/* iterate through the list using a list entry */ +#define LIST_FOR_EACH(elem, list, type, field) \ + for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ + &(elem)->field != (list); \ + (elem) = CONTAINING_RECORD((elem)->field.Flink, type, field)) + +/* iterate through the list using a list entry, with safety against removal */ +#define LIST_FOR_EACH_SAFE(cursor, cursor2, list, type, field) \ + for ((cursor) = CONTAINING_RECORD((list)->Flink, type, field), \ + (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field); \ + &(cursor)->field != (list); \ + (cursor) = (cursor2), \ + (cursor2) = CONTAINING_RECORD((cursor)->field.Flink, type, field)) + #define OPTHDROFFSET(a) ((LPVOID)((BYTE *)a + \ ((PIMAGE_DOS_HEADER)a)->e_lfanew + \ sizeof (IMAGE_NT_SIGNATURE) + \ _____ Modified: trunk/reactos/ntoskrnl/fs/filelock.c --- trunk/reactos/ntoskrnl/fs/filelock.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/ntoskrnl/fs/filelock.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -161,7 +161,6 @@ KIRQL oldirql; PFILE_LOCK_TOC LockToc; PFILE_LOCK_GRANTED Granted; - PLIST_ENTRY EnumEntry; LARGE_INTEGER EndOffset; ASSERT(FileLock); @@ -177,10 +176,8 @@ KeAcquireSpinLock(&LockToc->SpinLock, &oldirql); - LIST_FOR_EACH(EnumEntry, &LockToc->GrantedListHead) + LIST_FOR_EACH(Granted, &LockToc->GrantedListHead, FILE_LOCK_GRANTED, ListEntry) { - Granted = CONTAINING_RECORD(EnumEntry, FILE_LOCK_GRANTED, ListEntry); - //if overlapping if(IsOverlappingLock(&Granted->Lock, FileOffset, &EndOffset)) { @@ -358,12 +355,12 @@ { KIRQL oldirql; PFILE_LOCK_TOC LockToc; - PLIST_ENTRY EnumEntry; - PFILE_LOCK_GRANTED Granted; + PFILE_LOCK_GRANTED Granted, tmp; BOOLEAN Unlock = FALSE; //must make local copy since FILE_LOCK struct is allowed to be paged BOOLEAN GotUnlockRoutine; LIST_ENTRY UnlockedListHead; + PLIST_ENTRY EnumEntry; ASSERT(FileLock); LockToc = FileLock->LockInformation; @@ -377,7 +374,7 @@ GotUnlockRoutine = FileLock->UnlockRoutine != NULL; KeAcquireSpinLock(&LockToc->SpinLock, &oldirql); - LIST_FOR_EACH_SAFE(EnumEntry, &LockToc->GrantedListHead, Granted, FILE_LOCK_GRANTED, ListEntry) + LIST_FOR_EACH_SAFE(Granted, tmp, &LockToc->GrantedListHead, FILE_LOCK_GRANTED, ListEntry) { if (Granted->Lock.Process == Process && @@ -506,17 +503,14 @@ IN PVOID Context ) { - PLIST_ENTRY EnumEntry; PFILE_LOCK_GRANTED Granted; LARGE_INTEGER EndOffset; EndOffset.QuadPart = FileOffset->QuadPart + Length->QuadPart - 1; //loop and try to find conflicking locks - LIST_FOR_EACH(EnumEntry, &LockToc->GrantedListHead) + LIST_FOR_EACH(Granted, &LockToc->GrantedListHead, FILE_LOCK_GRANTED, ListEntry) { - Granted = CONTAINING_RECORD(EnumEntry,FILE_LOCK_GRANTED, ListEntry); - if (IsOverlappingLock(&Granted->Lock, FileOffset, &EndOffset)) { //we found a locks that overlap with the new lock @@ -578,13 +572,13 @@ { //walk pending list, FIFO order, try 2 complete locks PLIST_ENTRY EnumEntry; - PIRP Irp; + PIRP Irp, tmp; PIO_STACK_LOCATION Stack; LIST_ENTRY CompletedListHead; InitializeListHead(&CompletedListHead); - LIST_FOR_EACH_SAFE(EnumEntry, &LockToc->PendingListHead, Irp, IRP, Tail.Overlay.ListEntry) + LIST_FOR_EACH_SAFE(Irp, tmp, &LockToc->PendingListHead, IRP, Tail.Overlay.ListEntry) { Stack = IoGetCurrentIrpStackLocation(Irp); if (FsRtlpAddLock(LockToc, @@ -676,8 +670,7 @@ { KIRQL oldirql; PFILE_LOCK_TOC LockToc; - PFILE_LOCK_GRANTED Granted; - PLIST_ENTRY EnumEntry; + PFILE_LOCK_GRANTED Granted, tmp; ASSERT(FileLock); LockToc = FileLock->LockInformation; @@ -689,7 +682,7 @@ KeAcquireSpinLock(&LockToc->SpinLock, &oldirql ); - LIST_FOR_EACH_SAFE(EnumEntry, &LockToc->GrantedListHead, Granted,FILE_LOCK_GRANTED,ListEntry) + LIST_FOR_EACH_SAFE(Granted, tmp, &LockToc->GrantedListHead, FILE_LOCK_GRANTED,ListEntry) { //must be exact match @@ -778,7 +771,6 @@ PFILE_LOCK_TOC LockToc; PFILE_LOCK_GRANTED Granted; PIRP Irp; - PLIST_ENTRY EnumEntry; PIO_STACK_LOCATION Stack; ASSERT(FileLock); @@ -794,10 +786,8 @@ KeAcquireSpinLock(&LockToc->SpinLock, &oldirql); - LIST_FOR_EACH(EnumEntry, &LockToc->GrantedListHead) + LIST_FOR_EACH(Granted, &LockToc->GrantedListHead, FILE_LOCK_GRANTED , ListEntry) { - Granted = CONTAINING_RECORD(EnumEntry, FILE_LOCK_GRANTED , ListEntry); - DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n", Granted->Lock.ExclusiveLock ? "EXCL" : "SHRD", Granted->Lock.StartingByte.QuadPart, @@ -812,9 +802,8 @@ DPRINT1("Dumping pending file locks, FIFO order\n"); - LIST_FOR_EACH(EnumEntry, &LockToc->PendingListHead) + LIST_FOR_EACH(Irp, &LockToc->PendingListHead, IRP , Tail.Overlay.ListEntry) { - Irp = CONTAINING_RECORD(EnumEntry, IRP , Tail.Overlay.ListEntry); Stack = IoGetCurrentIrpStackLocation(Irp); DPRINT1("%s, start: %I64x, len: %I64x, end: %I64x, key: %i, proc: 0x%p, fob: 0x%p\n", _____ Modified: trunk/reactos/ntoskrnl/fs/notify.c --- trunk/reactos/ntoskrnl/fs/notify.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/ntoskrnl/fs/notify.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -120,13 +120,10 @@ PVOID FsContext ) { - PLIST_ENTRY EnumEntry; PNOTIFY_ENTRY NotifyEntry; - LIST_FOR_EACH(EnumEntry, NotifyList) + LIST_FOR_EACH(NotifyEntry, NotifyList, NOTIFY_ENTRY, ListEntry) { - NotifyEntry = CONTAINING_RECORD(EnumEntry, NOTIFY_ENTRY, ListEntry); - if (NotifyEntry->FsContext == FsContext) { return NotifyEntry; @@ -310,15 +307,15 @@ ) { LIST_ENTRY CompletedListHead; - PLIST_ENTRY EnumEntry, TmpEntry; - PNOTIFY_ENTRY NotifyEntry; + PLIST_ENTRY TmpEntry; + PNOTIFY_ENTRY NotifyEntry, tmp; PIRP Irp; InitializeListHead(&CompletedListHead); ExAcquireFastMutex((PFAST_MUTEX)NotifySync); - LIST_FOR_EACH_SAFE(EnumEntry, NotifyList, NotifyEntry, NOTIFY_ENTRY, ListEntry ) + LIST_FOR_EACH_SAFE(NotifyEntry, tmp, NotifyList, NOTIFY_ENTRY, ListEntry ) { if (NotifyEntry->Fcb == Fcb) { @@ -654,8 +651,8 @@ { USHORT FullDirLen; STRING RelativeName; + PNOTIFY_ENTRY NotifyEntry, tmp; PLIST_ENTRY EnumEntry; - PNOTIFY_ENTRY NotifyEntry; PIRP Irp; LIST_ENTRY CompletedListHead; USHORT NameLenU; @@ -676,7 +673,7 @@ ExAcquireFastMutex((PFAST_MUTEX)NotifySync); - LIST_FOR_EACH_SAFE(EnumEntry, NotifyList, NotifyEntry, NOTIFY_ENTRY, ListEntry ) + LIST_FOR_EACH_SAFE(NotifyEntry, tmp, NotifyList, NOTIFY_ENTRY, ListEntry ) { ASSERT(NotifyEntry->Unicode == FsRtlpIsUnicodePath(FullTargetName)); _____ Modified: trunk/reactos/subsys/win32k/include/hotkey.h --- trunk/reactos/subsys/win32k/include/hotkey.h 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/include/hotkey.h 2005-09-18 23:06:15 UTC (rev 17923) @@ -15,23 +15,22 @@ } HOT_KEY_ITEM, *PHOT_KEY_ITEM; NTSTATUS FASTCALL -InitHotKeys(PWINSTATION_OBJECT WinStaObject); +InitHotkeyImpl(); -NTSTATUS FASTCALL -CleanupHotKeys(PWINSTATION_OBJECT WinStaObject); +//NTSTATUS FASTCALL +//CleanupHotKeys(PWINSTATION_OBJECT WinStaObject); -BOOL -GetHotKey (PWINSTATION_OBJECT WinStaObject, - UINT fsModifiers, +BOOL FASTCALL +GetHotKey (UINT fsModifiers, UINT vk, struct _ETHREAD **Thread, HWND *hWnd, int *id); -VOID +VOID FASTCALL UnregisterWindowHotKeys(PWINDOW_OBJECT Window); -VOID +VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *Thread); #endif /* _WIN32K_HOTKEY_H */ _____ Modified: trunk/reactos/subsys/win32k/include/winsta.h --- trunk/reactos/subsys/win32k/include/winsta.h 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/include/winsta.h 2005-09-18 23:06:15 UTC (rev 17923) @@ -41,7 +41,6 @@ ULONG Flags; struct _DESKTOP_OBJECT* ActiveDesktop; /* FIXME: Clipboard */ - LIST_ENTRY HotKeyListHead; } WINSTATION_OBJECT, *PWINSTATION_OBJECT; extern WINSTATION_OBJECT *InputWindowStation; _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -352,6 +352,13 @@ return STATUS_UNSUCCESSFUL; } + Status = InitHotkeyImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize hotkey implementation!\n"); + return STATUS_UNSUCCESSFUL; + } + Status = InitWindowStationImpl(); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c --- trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -27,6 +27,18 @@ * 02-11-2003 EK Created */ + + +/* + +FIXME: Hotkey notifications are triggered by keyboard input (physical or programatically) +and since only desktops on WinSta0 can recieve input in seems very wrong to allow +windows/threads on destops not belonging to WinSta0 to set hotkeys (recieve notifications). + +-Gunnar +*/ + + /* INCLUDES ******************************************************************/ #include <w32k.h> @@ -36,47 +48,40 @@ /* GLOBALS *******************************************************************/ +LIST_ENTRY gHotkeyList; + /* FUNCTIONS *****************************************************************/ NTSTATUS FASTCALL -InitHotKeys(PWINSTATION_OBJECT WinStaObject) +InitHotkeyImpl() { - InitializeListHead(&WinStaObject->HotKeyListHead); + InitializeListHead(&gHotkeyList); return STATUS_SUCCESS; } +#if 0 //not used NTSTATUS FASTCALL -CleanupHotKeys(PWINSTATION_OBJECT WinStaObject) +CleanupHotKeys() { return STATUS_SUCCESS; } +#endif -BOOL -GetHotKey (PWINSTATION_OBJECT WinStaObject, - UINT fsModifiers, +BOOL FASTCALL +GetHotKey (UINT fsModifiers, UINT vk, struct _ETHREAD **Thread, HWND *hWnd, int *id) { - PLIST_ENTRY Entry; PHOT_KEY_ITEM HotKeyItem; - if(!WinStaObject) + LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) { - return FALSE; - } - - Entry = WinStaObject->HotKeyListHead.Flink; - while (Entry != &WinStaObject->HotKeyListHead) - { - HotKeyItem = (PHOT_KEY_ITEM) CONTAINING_RECORD(Entry, - HOT_KEY_ITEM, - ListEntry); if (HotKeyItem->fsModifiers == fsModifiers && HotKeyItem->vk == vk) { @@ -89,37 +94,21 @@ if (id != NULL) *id = HotKeyItem->id; - return TRUE; } - - Entry = Entry->Flink; } return FALSE; } -VOID +VOID FASTCALL UnregisterWindowHotKeys(PWINDOW_OBJECT Window) { - PLIST_ENTRY Entry; - PHOT_KEY_ITEM HotKeyItem; - PWINSTATION_OBJECT WinStaObject = NULL; - - if(Window->OwnerThread && Window->OwnerThread->ThreadsProcess) - WinStaObject = Window->OwnerThread->Tcb.Win32Thread->Desktop->WindowStation; - - if(!WinStaObject) - return; - - Entry = WinStaObject->HotKeyListHead.Flink; - while (Entry != &WinStaObject->HotKeyListHead) + PHOT_KEY_ITEM HotKeyItem, tmp; + + LIST_FOR_EACH_SAFE(HotKeyItem, tmp, &gHotkeyList, HOT_KEY_ITEM, ListEntry) { - HotKeyItem = (PHOT_KEY_ITEM) CONTAINING_RECORD (Entry, - HOT_KEY_ITEM, - ListEntry); - Entry = Entry->Flink; if (HotKeyItem->hWnd == Window->hSelf) { RemoveEntryList (&HotKeyItem->ListEntry); @@ -130,26 +119,13 @@ } -VOID +VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *Thread) { - PLIST_ENTRY Entry; - PHOT_KEY_ITEM HotKeyItem; - PWINSTATION_OBJECT WinStaObject = NULL; + PHOT_KEY_ITEM HotKeyItem, tmp; - if(Thread->Tcb.Win32Thread && Thread->Tcb.Win32Thread->Desktop) - WinStaObject = Thread->Tcb.Win32Thread->Desktop->WindowStation; - - if(!WinStaObject) - return; - - Entry = WinStaObject->HotKeyListHead.Flink; - while (Entry != &WinStaObject->HotKeyListHead) + LIST_FOR_EACH_SAFE(HotKeyItem, tmp, &gHotkeyList, HOT_KEY_ITEM, ListEntry) { - HotKeyItem = (PHOT_KEY_ITEM) CONTAINING_RECORD (Entry, - HOT_KEY_ITEM, - ListEntry); - Entry = Entry->Flink; if (HotKeyItem->Thread == Thread) { RemoveEntryList (&HotKeyItem->ListEntry); @@ -160,27 +136,18 @@ } -static BOOL -IsHotKey (PWINSTATION_OBJECT WinStaObject, - UINT fsModifiers, - UINT vk) +static +BOOL FASTCALL +IsHotKey (UINT fsModifiers, UINT vk) { - PLIST_ENTRY Entry; PHOT_KEY_ITEM HotKeyItem; - Entry = WinStaObject->HotKeyListHead.Flink; - while (Entry != &WinStaObject->HotKeyListHead) + LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) { - HotKeyItem = (PHOT_KEY_ITEM) CONTAINING_RECORD (Entry, - HOT_KEY_ITEM, - ListEntry); - if (HotKeyItem->fsModifiers == fsModifiers && - HotKeyItem->vk == vk) + if (HotKeyItem->fsModifiers == fsModifiers && HotKeyItem->vk == vk) { return TRUE; } - - Entry = Entry->Flink; } return FALSE; @@ -195,7 +162,6 @@ { PHOT_KEY_ITEM HotKeyItem; PWINDOW_OBJECT Window; - PWINSTATION_OBJECT WinStaObject = NULL; PETHREAD HotKeyThread; DECLARE_RETURN(BOOL); @@ -215,17 +181,8 @@ HotKeyThread = Window->OwnerThread; } - - if(HotKeyThread->ThreadsProcess && HotKeyThread->ThreadsProcess->Win32Process) - WinStaObject = HotKeyThread->Tcb.Win32Thread->Desktop->WindowStation; - - if(!WinStaObject) - { - RETURN( FALSE); - } - /* Check for existing hotkey */ - if (IsHotKey (WinStaObject, fsModifiers, vk)) + if (IsHotKey (fsModifiers, vk)) { RETURN( FALSE); } @@ -242,8 +199,7 @@ HotKeyItem->fsModifiers = fsModifiers; HotKeyItem->vk = vk; - InsertHeadList (&WinStaObject->HotKeyListHead, - &HotKeyItem->ListEntry); + InsertHeadList (&gHotkeyList, &HotKeyItem->ListEntry); RETURN( TRUE); @@ -255,13 +211,10 @@ BOOL STDCALL -NtUserUnregisterHotKey(HWND hWnd, - int id) +NtUserUnregisterHotKey(HWND hWnd, int id) { - PLIST_ENTRY Entry; PHOT_KEY_ITEM HotKeyItem; PWINDOW_OBJECT Window; - PWINSTATION_OBJECT WinStaObject = NULL; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserUnregisterHotKey\n"); @@ -272,30 +225,15 @@ RETURN( FALSE); } - if(Window->OwnerThread->ThreadsProcess && Window->OwnerThread->ThreadsProcess->Win32Process) - WinStaObject = Window->OwnerThread->Tcb.Win32Thread->Desktop->WindowStation; - - if(!WinStaObject) + LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) { - RETURN( FALSE); - } - - Entry = WinStaObject->HotKeyListHead.Flink; - while (Entry != &WinStaObject->HotKeyListHead) - { - HotKeyItem = (PHOT_KEY_ITEM) CONTAINING_RECORD (Entry, - HOT_KEY_ITEM, - ListEntry); - if (HotKeyItem->hWnd == hWnd && - HotKeyItem->id == id) + if (HotKeyItem->hWnd == hWnd && HotKeyItem->id == id) { RemoveEntryList (&HotKeyItem->ListEntry); ExFreePool (HotKeyItem); RETURN( TRUE); } - - Entry = Entry->Flink; } RETURN( FALSE); _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -642,6 +642,8 @@ if(NextKeyInput.MakeCode == 0x2E)/* Ctrl-C */ { DPRINT1("Ctrl-C pressed\n"); + /* FIXME: this seems wrong! this bypass hotkeys and all and the winhellos CRTL+C hotkey test + dont work (anymore) */ co_MsqPostKeyboardMessage(WM_COPY,0,0); continue; } @@ -697,8 +699,7 @@ KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); - if (GetHotKey(InputWindowStation, - ModifierState, + if (GetHotKey(ModifierState, msg.wParam, &Thread, &hWnd, _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-09-18 21:48:56 UTC (rev 17922) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2005-09-18 23:06:15 UTC (rev 17923) @@ -535,8 +535,6 @@ return 0; } - InitHotKeys(WindowStationObject); - CurInfo->Enabled = FALSE; CurInfo->ButtonsDown = 0; CurInfo->CursorClipInfo.IsClipped = FALSE;

1 0

[gvg] 17922: Set correct error code, IsWindow() depends on this
by gvg＠svn.reactos.com 18 Sep '05

18 Sep '05

Set correct error code, IsWindow() depends on this Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-18 18:59:59 UTC (rev 17921) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-18 21:48:56 UTC (rev 17922) @@ -3233,6 +3233,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return 0; }

1 0

[royce] 17921: regression test for set /a - fails at the moment because 'if' is bork3d
by royce＠svn.reactos.com 18 Sep '05

18 Sep '05

regression test for set /a - fails at the moment because 'if' is bork3d Added: trunk/reactos/subsys/system/cmd/seta_test.cmd _____ Added: trunk/reactos/subsys/system/cmd/seta_test.cmd --- trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-18 18:58:11 UTC (rev 17920) +++ trunk/reactos/subsys/system/cmd/seta_test.cmd 2005-09-18 18:59:59 UTC (rev 17921) @@ -0,0 +1,67 @@ +@echo off +if ("1"=="2") goto failure +if !("1"=="1") goto failure +set /a a=1 +if !("%a%"=="1") goto failure +set /a b=a +if !("%b%"=="1") goto failure +set /a a=!5 +if !("%a%"=="0") goto failure +set /a a=~5 +if !("%a%"=="-6") goto failure +set /a a=5,a=-a +if !("%a%"=="-5") goto failure +set /a a=5*7 +if !("%a%"=="35") goto failure +set /a a=2000/10 +if !("%a%"=="200") goto failure +set /a a=42%9 +if !("%a%"=="6") goto failure +set /a a=7+9 +if !("%a%"=="16") goto failure +set /a a=9-7 +if !("%a%"=="2") goto failure +set /a a=9^<^<2 +if !("%a%"=="36") goto failure +set /a a=36^>^>2 +if !("%a%"=="9") goto failure +set /a a=42^&9 +if !("%a%"=="8") goto failure +set /a a=32^^9 +if !("%a%"=="41") goto failure +set /a a=10^|22 +if !("%a%"=="30") goto failure +set /a a=2,a*=3 +if !("%a%"=="6") goto failure +set /a a=11,a/=2 +if !("%a%"=="5") goto failure +set /a a=42,a%=9 +if !("%a%"=="6") goto failure +set /a a=7,a+=9 +if !("%a%"=="16") goto failure +set /a a=9,a-=7 +if !("%a%"=="2") goto failure +set /a a=42,a^&=9 +if !("%a%"=="8") goto failure +set /a a=32,a^^=9 +if !("%a%"=="41") goto failure +set /a a=10,a^|=22 +if !("%a%"=="30") goto failure +set /a a=9,a^<^<=2 +if !("%a%"=="36") goto failure +set /a a=36,a^>^>=2 +if !("%a%"=="9") goto failure +set /a a=(1,2) +if !("%a%"=="2") goto failure +set /a a=(a=1,a+2) +if ("%a%"=="3") goto success +goto failure + +:success +echo SUCCESS! +goto done + +:failure +echo FAILURE! (remove the echo off and see the last formula that executed before this line) + +:done Property changes on: trunk/reactos/subsys/system/cmd/seta_test.cmd ___________________________________________________________________ Name: svn:eol-style + native

1 0

[royce] 17920: fixes for UNICODE compilation
by royce＠svn.reactos.com 18 Sep '05

18 Sep '05

fixes for UNICODE compilation Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-18 18:49:30 UTC (rev 17919) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-18 18:58:11 UTC (rev 17920) @@ -51,7 +51,7 @@ static LPCTSTR skip_ws ( LPCTSTR p ) { - return p + strspn ( p, " \t" ); + return p + _tcsspn ( p, _T(" \t") ); } INT cmd_set (LPTSTR cmd, LPTSTR param) @@ -191,7 +191,7 @@ return FALSE; } GetEnvironmentVariable ( ident, buf, dwBuffer ); - *result = atoi ( buf ); + *result = _ttoi ( buf ); return TRUE; } @@ -225,7 +225,7 @@ *lval |= rval; break; default: - printf ( "Invalid operand.\n" ); + ConErrPrintf ( _T("Invalid operand.\n") ); return FALSE; } return TRUE; @@ -238,15 +238,15 @@ seta_unaryTerm ( LPCTSTR* p_, INT* result ) { LPCTSTR p = *p_; - if ( *p == '(' ) + if ( *p == _T('(') ) { INT rval; p = skip_ws ( p + 1 ); if ( !seta_stmt ( &p, &rval ) ) return FALSE; - if ( *p != ')' ) + if ( *p != _T(')') ) { - _tprintf ( _T("Expected ')'\n") ); + ConErrPrintf ( _T("Expected ')'\n") ); return FALSE; } *result = rval; @@ -254,8 +254,8 @@ } else if ( isdigit(*p) ) { - *result = atoi ( p ); - p = skip_ws ( p + strspn ( p, "1234567890" ) ); + *result = _ttoi ( p ); + p = skip_ws ( p + _tcsspn ( p, _T("1234567890") ) ); } else if ( __iscsymf(*p) ) { @@ -267,7 +267,7 @@ } else { - _tprintf ( _T("Expected number or variable name\n") ); + ConErrPrintf ( _T("Expected number or variable name\n") ); return FALSE; } *p_ = p; @@ -369,7 +369,7 @@ lval >>= rval; break; default: - printf ( "Invalid operand.\n" ); + ConErrPrintf ( _T("Invalid operand.\n") ); return FALSE; } } @@ -487,12 +487,12 @@ INT rval; if ( !*p ) { - _tprintf ( _T("The syntax of the command is incorrect.\n") ); + ConErrPrintf ( _T("The syntax of the command is incorrect.\n") ); return FALSE; } if ( !seta_stmt ( &p, &rval ) ) return FALSE; - _tprintf ( _T("%i\n"), rval ); + ConOutPrintf ( _T("%i\n"), rval ); return TRUE; }

1 0

[ion] 17919: Make LogoffWindowsDialog exit the caller (ie: explorer) so that previous shutdown functionality is restored
by ion＠svn.reactos.com 18 Sep '05

18 Sep '05

Make LogoffWindowsDialog exit the caller (ie: explorer) so that previous shutdown functionality is restored Modified: trunk/reactos/lib/shell32/dialogs.c _____ Modified: trunk/reactos/lib/shell32/dialogs.c --- trunk/reactos/lib/shell32/dialogs.c 2005-09-18 18:46:15 UTC (rev 17918) +++ trunk/reactos/lib/shell32/dialogs.c 2005-09-18 18:49:30 UTC (rev 17919) @@ -413,6 +413,7 @@ int WINAPI LogoffWindowsDialog(DWORD uFlags) { ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); + ExitProcess(0); return 0; }

1 0

[ion] 17918: Fix shell32 spec file to properly export LogoffWindowsDialog as the proper ordinal (54) so that explorer won't crash on shutdown when calling it. Implement the LogoffWindowsDialog stub.
by ion＠svn.reactos.com 18 Sep '05

18 Sep '05

Fix shell32 spec file to properly export LogoffWindowsDialog as the proper ordinal (54) so that explorer won't crash on shutdown when calling it. Implement the LogoffWindowsDialog stub. Modified: trunk/reactos/lib/shell32/dialogs.c Modified: trunk/reactos/lib/shell32/shell32.spec _____ Modified: trunk/reactos/lib/shell32/dialogs.c --- trunk/reactos/lib/shell32/dialogs.c 2005-09-18 18:37:08 UTC (rev 17917) +++ trunk/reactos/lib/shell32/dialogs.c 2005-09-18 18:46:15 UTC (rev 17918) @@ -406,7 +406,16 @@ return 0; } +/********************************************************************** *** + * LogoffWindowsDialog [SHELL32.54] + */ +int WINAPI LogoffWindowsDialog(DWORD uFlags) +{ + ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); + return 0; +} + /*********************************************************************** ** * RestartDialog [SHELL32.59] */ _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-09-18 18:37:08 UTC (rev 17917) +++ trunk/reactos/lib/shell32/shell32.spec 2005-09-18 18:46:15 UTC (rev 17918) @@ -47,6 +47,7 @@ 51 stdcall -noname PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 54 stdcall -noname LogoffWindowsDialog(ptr) 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW 57 stdcall -noname PathGetDriveNumber(str) PathGetDriveNumberAW

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