Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[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

[royce] 17917: fix escaping
by royce＠svn.reactos.com 18 Sep '05

18 Sep '05

fix escaping 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 17:52:28 UTC (rev 17916) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-18 18:37:08 UTC (rev 17917) @@ -69,9 +69,10 @@ /* remove escapes */ if ( param[0] ) for ( i = 0; param[i+1]; i++ ) { - if ( param[i] == '^' && strchr("<|>",param[i+1]) ) + if ( param[i] == '^' && strchr("<|>&^",param[i+1]) ) { memmove ( &param[i], &param[i+1], _tcslen(&param[i]) * sizeof(TCHAR) ); + ++i; } }

1 0

[royce] 17916: (hopefully) last bugfix to set /a - assignment works again
by royce＠svn.reactos.com 18 Sep '05

18 Sep '05

(hopefully) last bugfix to set /a - assignment works again 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 17:33:11 UTC (rev 17915) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-18 17:52:28 UTC (rev 17916) @@ -408,36 +408,22 @@ if ( identlen ) { if ( *p == _T('=') ) - op = *p, p++; + op = *p, p = skip_ws(p+1); else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') ) - op = *p, p += 2; + op = *p, p = skip_ws(p+2); else if ( _tcschr ( _T("<>"), *p ) && *p == p[1] && p[2] == _T('=') ) - op = *p, p += 3; - else - { - _tprintf ( _T("Missing operand.\n") ); - return FALSE; - } - p = skip_ws ( p ); + op = *p, p = skip_ws(p+3); } /* allow to chain multiple assignments, such as: a=b=1 */ if ( ident && op ) { - if ( !seta_assignment ( &p, &exprval ) ) - return FALSE; - } - else - { - if ( !seta_expr ( &p, &exprval ) ) - return FALSE; - } - - if ( identlen ) - { INT identval; LPTSTR buf; + if ( !seta_assignment ( &p, &exprval ) ) + return FALSE; + if ( !seta_identval ( ident, &identval ) ) identval = 0; switch ( op ) @@ -460,6 +446,13 @@ SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value exprval = identval; } + else + { + /* restore p in case we found an ident but not an op */ + p = *p_; + if ( !seta_expr ( &p, &exprval ) ) + return FALSE; + } *result = exprval; *p_ = p;

1 0

[ros-diffs] [royce] 17915: fixed bugs in shifting (<<, >>, <<=, >>=)
by royce＠svn.reactos.com 18 Sep '05

18 Sep '05

fixed bugs in shifting (<<, >>, <<=, >>=) eliminated some code duplication while I was in there. 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 16:56:33 UTC (rev 17914) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-18 17:33:11 UTC (rev 17915) @@ -305,20 +305,20 @@ } static BOOL -seta_addTerm ( LPCTSTR* p_, INT* result ) +seta_ltorTerm ( LPCTSTR* p_, INT* result, LPCTSTR ops, BOOL (*subTerm)(LPCTSTR*,INT*) ) { LPCTSTR p = *p_; INT lval; - if ( !seta_mulTerm ( &p, &lval ) ) + if ( !subTerm ( &p, &lval ) ) return FALSE; - while ( *p && _tcschr(_T("*/%"),*p) ) + while ( *p && _tcschr(ops,*p) ) { INT rval; TCHAR op = *p; p = skip_ws ( p+1 ); - if ( !seta_mulTerm ( &p, &rval ) ) + if ( !subTerm ( &p, &rval ) ) return FALSE; if ( !calc ( &lval, op, rval ) ) @@ -331,29 +331,15 @@ } static BOOL -seta_logShiftTerm ( LPCTSTR* p_, INT* result ) +seta_addTerm ( LPCTSTR* p_, INT* result ) { - LPCTSTR p = *p_; - INT lval; - if ( !seta_addTerm ( &p, &lval ) ) - return FALSE; - while ( *p && _tcschr(_T("+-"),*p) ) - { - INT rval; - TCHAR op = *p; + return seta_ltorTerm ( p_, result, _T("*/%"), seta_mulTerm ); +} - p = skip_ws ( p+1 ); - - if ( !seta_addTerm ( &p, &rval ) ) - return FALSE; - - if ( !calc ( &lval, op, rval ) ) - return FALSE; - } - - *result = lval; - *p_ = p; - return TRUE; +static BOOL +seta_logShiftTerm ( LPCTSTR* p_, INT* result ) +{ + return seta_ltorTerm ( p_, result, _T("+-"), seta_addTerm ); } static BOOL @@ -373,8 +359,18 @@ if ( !seta_logShiftTerm ( &p, &rval ) ) return FALSE; - if ( !calc ( &lval, op, rval ) ) + switch ( op ) + { + case '<': + lval <<= rval; + break; + case '>': + lval >>= rval; + break; + default: + printf ( "Invalid operand.\n" ); return FALSE; + } } *result = lval; @@ -385,73 +381,19 @@ static BOOL seta_bitExclOrTerm ( LPCTSTR* p_, INT* result ) { - LPCTSTR p = *p_; - INT lval; - if ( !seta_bitAndTerm ( &p, &lval ) ) - return FALSE; - while ( *p == _T('&') ) - { - INT rval; - - p = skip_ws ( p+1 ); - - if ( !seta_bitAndTerm ( &p, &rval ) ) - return FALSE; - - lval &= rval; - } - - *result = lval; - *p_ = p; - return TRUE; + return seta_ltorTerm ( p_, result, _T("&"), seta_bitAndTerm ); } static BOOL seta_bitOrTerm ( LPCTSTR* p_, INT* result ) { - LPCTSTR p = *p_; - INT lval; - if ( !seta_bitExclOrTerm ( &p, &lval ) ) - return FALSE; - while ( *p == _T('^') ) - { - INT rval; - - p = skip_ws ( p+1 ); - - if ( !seta_bitExclOrTerm ( &p, &rval ) ) - return FALSE; - - lval ^= rval; - } - - *result = lval; - *p_ = p; - return TRUE; + return seta_ltorTerm ( p_, result, _T("^"), seta_bitExclOrTerm ); } static BOOL seta_expr ( LPCTSTR* p_, INT* result ) { - LPCTSTR p = *p_; - INT lval; - if ( !seta_bitOrTerm ( &p, &lval ) ) - return FALSE; - while ( *p == _T('|') ) - { - INT rval; - - p = skip_ws ( p+1 ); - - if ( !seta_bitOrTerm ( &p, &rval ) ) - return FALSE; - - lval |= rval; - } - - *result = lval; - *p_ = p; - return TRUE; + return seta_ltorTerm ( p_, result, _T("|"), seta_bitOrTerm ); } static BOOL @@ -498,10 +440,21 @@ if ( !seta_identval ( ident, &identval ) ) identval = 0; - if ( op == '=' ) + switch ( op ) + { + case '=': identval = exprval; - else if ( !calc ( &identval, op, exprval ) ) - return FALSE; + break; + case '<': + identval <<= exprval; + break; + case '>': + identval >>= exprval; + break; + default: + if ( !calc ( &identval, op, exprval ) ) + return FALSE; + } buf = (LPTSTR)alloca ( 32 * sizeof(TCHAR) ); _sntprintf ( buf, 32, _T("%i"), identval ); SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value

1 0

[gdalsnes] 17914: -remove meaningless use of winstas
by gdalsnes＠svn.reactos.com 18 Sep '05

18 Sep '05

-remove meaningless use of winstas -move syscalls to end of file Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-18 15:25:34 UTC (rev 17913) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-09-18 16:56:33 UTC (rev 17914) @@ -91,194 +91,6 @@ } - - -int -STDCALL -NtUserCopyAcceleratorTable( - HACCEL hAccel, - LPACCEL Entries, - int EntriesCount) -{ - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - int Ret; - DECLARE_RETURN(int); - - DPRINT("Enter NtUserCopyAcceleratorTable\n"); - UserEnterShared(); - - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN(0); - } - - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN(0); - } - - if(Entries) - { - Ret = min(EntriesCount, Accel->Count); - Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN(0); - } - } - else - { - Ret = Accel->Count; - } - - ObDereferenceObject(WindowStation); - - RETURN(Ret); - -CLEANUP: - DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -HACCEL -STDCALL -NtUserCreateAcceleratorTable( - LPACCEL Entries, - SIZE_T EntriesCount) -{ - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - HACCEL hAccel; - DECLARE_RETURN(HACCEL); - - DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", - Entries, EntriesCount); - UserEnterExclusive(); - - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( FALSE ); - } - - Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); - - if (Accel == NULL) - { - ObDereferenceObject(WindowStation); - SetLastNtError(STATUS_NO_MEMORY); - RETURN( (HACCEL) 0 ); - } - - Accel->Count = EntriesCount; - if (Accel->Count > 0) - { - Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); - if (Accel->Table == NULL) - { - ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN( (HACCEL) 0); - } - - Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); - if (!NT_SUCCESS(Status)) - { - ExFreePool(Accel->Table); - ObmDeleteObject(hAccel, otAccel); - ObDereferenceObject(WindowStation); - SetLastNtError(Status); - RETURN((HACCEL) 0); - } - } - - ObDereferenceObject(WindowStation); - - /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ - - RETURN(hAccel); - -CLEANUP: - DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", - Entries, EntriesCount,_ret_); - UserLeave(); - END_CLEANUP; -} - - - -BOOLEAN -STDCALL -NtUserDestroyAcceleratorTable( - HACCEL hAccel) -{ - PWINSTATION_OBJECT WindowStation; - PACCELERATOR_TABLE Accel; - NTSTATUS Status; - DECLARE_RETURN(BOOLEAN); - - /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's - usage count (and return TRUE). - FIXME: Destroy only tables created using CreateAcceleratorTable. - */ - - DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); - UserEnterExclusive(); - - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - DPRINT1("E1\n"); - RETURN( FALSE); - } - - if (!(Accel = UserGetAccelObject(hAccel))) - { - ObDereferenceObject(WindowStation); - RETURN( FALSE); - } - - ObmDeleteObject(hAccel, otAccel); - - if (Accel->Table != NULL) - { - ExFreePool(Accel->Table); - } - - ObDereferenceObject(WindowStation); - - RETURN( TRUE); - -CLEANUP: - DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); - UserLeave(); - END_CLEANUP; -} - static BOOLEAN FASTCALL co_IntTranslateAccelerator( @@ -299,7 +111,6 @@ if (wParam != key) { - DPRINT("T0\n"); return FALSE; } @@ -469,17 +280,156 @@ return TRUE; } + +/* SYSCALLS *****************************************************************/ + + int STDCALL +NtUserCopyAcceleratorTable( + HACCEL hAccel, + LPACCEL Entries, + int EntriesCount) +{ + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + int Ret; + DECLARE_RETURN(int); + + DPRINT("Enter NtUserCopyAcceleratorTable\n"); + UserEnterShared(); + + if (!(Accel = UserGetAccelObject(hAccel))) + { + RETURN(0); + } + + if(Entries) + { + Ret = min(EntriesCount, Accel->Count); + Status = MmCopyToCaller(Entries, Accel->Table, Ret * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(0); + } + } + else + { + Ret = Accel->Count; + } + + RETURN(Ret); + +CLEANUP: + DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +HACCEL +STDCALL +NtUserCreateAcceleratorTable( + LPACCEL Entries, + SIZE_T EntriesCount) +{ + PACCELERATOR_TABLE Accel; + NTSTATUS Status; + HACCEL hAccel; + DECLARE_RETURN(HACCEL); + + DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d)\n", + Entries, EntriesCount); + UserEnterExclusive(); + + Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); + + if (Accel == NULL) + { + SetLastNtError(STATUS_NO_MEMORY); + RETURN( (HACCEL) 0 ); + } + + Accel->Count = EntriesCount; + if (Accel->Count > 0) + { + Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount * sizeof(ACCEL), TAG_ACCEL); + if (Accel->Table == NULL) + { + ObmDeleteObject(hAccel, otAccel); + SetLastNtError(Status); + RETURN( (HACCEL) 0); + } + + Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount * sizeof(ACCEL)); + if (!NT_SUCCESS(Status)) + { + ExFreePool(Accel->Table); + ObmDeleteObject(hAccel, otAccel); + SetLastNtError(Status); + RETURN((HACCEL) 0); + } + } + + /* FIXME: Save HandleTable in a list somewhere so we can clean it up again */ + + RETURN(hAccel); + +CLEANUP: + DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", + Entries, EntriesCount,_ret_); + UserLeave(); + END_CLEANUP; +} + + + +BOOLEAN +STDCALL +NtUserDestroyAcceleratorTable( + HACCEL hAccel) +{ + PACCELERATOR_TABLE Accel; + DECLARE_RETURN(BOOLEAN); + + /* FIXME: If the handle table is from a call to LoadAcceleratorTable, decrement it's + usage count (and return TRUE). + FIXME: Destroy only tables created using CreateAcceleratorTable. + */ + + DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel); + UserEnterExclusive(); + + if (!(Accel = UserGetAccelObject(hAccel))) + { + RETURN( FALSE); + } + + ObmDeleteObject(hAccel, otAccel); + + if (Accel->Table != NULL) + { + ExFreePool(Accel->Table); + } + + RETURN( TRUE); + +CLEANUP: + DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); + UserLeave(); + END_CLEANUP; +} + + +int +STDCALL NtUserTranslateAccelerator( HWND hWnd, HACCEL hAccel, LPMSG Message) { - PWINSTATION_OBJECT WindowStation = NULL; PWINDOW_OBJECT Window = NULL; PACCELERATOR_TABLE Accel = NULL; - NTSTATUS Status; ULONG i; DECLARE_RETURN(int); @@ -501,17 +451,6 @@ RETURN( 0); } - Status = IntValidateWindowStationHandle(UserGetProcessWindowStation(), - UserMode, - 0, - &WindowStation); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(STATUS_ACCESS_DENIED); - RETURN( 0); - } - if (!(Accel = UserGetAccelObject(hAccel))) { RETURN( 0); @@ -548,15 +487,9 @@ RETURN( 0); CLEANUP: + if (Window) UserDerefObjectCo(Window); + if (Accel) UserDerefObjectCo(Accel); - if (Window) - UserDerefObjectCo(Window); - if (Accel) - UserDerefObjectCo(Accel); - - if (WindowStation) - ObDereferenceObject(WindowStation); - DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", hWnd, hAccel, Message, 0); UserLeave();

1 0

[hbirr] 17913: Revert my last changes.
by hbirr＠svn.reactos.com 18 Sep '05

18 Sep '05

Revert my last changes. Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-09-18 13:46:37 UTC (rev 17912) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-09-18 15:25:34 UTC (rev 17913) @@ -75,10 +75,7 @@ CcUninitializeCacheMap (FileObject, NULL, NULL); #endif pFcb->OpenHandleCount--; - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) - { - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); - } + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); } return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-09-18 13:46:37 UTC (rev 17912) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-09-18 15:25:34 UTC (rev 17913) @@ -612,8 +612,7 @@ pFcb = FileObject->FsContext; - if (pFcb->OpenHandleCount != 0 && - !(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + if (pFcb->OpenHandleCount != 0) { Status = IoCheckShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAcce ss, Stack->Parameters.Create.ShareAccess, @@ -709,8 +708,7 @@ } } - if (pFcb->OpenHandleCount == 0 && - !(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + if (pFcb->OpenHandleCount == 0) { IoSetShareAccess(Stack->Parameters.Create.SecurityContext->DesiredAccess , Stack->Parameters.Create.ShareAccess,

1 0

[hbirr] 17912: The share disposition isn't necessary for FILE_READ_ATTRIBUTES.
by hbirr＠svn.reactos.com 18 Sep '05

18 Sep '05

The share disposition isn't necessary for FILE_READ_ATTRIBUTES. Modified: trunk/reactos/lib/kernel32/file/file.c _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-09-18 13:36:29 UTC (rev 17911) +++ trunk/reactos/lib/kernel32/file/file.c 2005-09-18 13:46:37 UTC (rev 17912) @@ -873,7 +873,7 @@ SYNCHRONIZE | FILE_READ_ATTRIBUTES, &ObjectAttributes, &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + 0, FILE_SYNCHRONOUS_IO_NONALERT); RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status))

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
59
Older →

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 September 2005