Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[hbelusca] 60541: [CSRSRV] - Do not associate the newly created wait block to the waiting thread (in CsrInitializeWait) in case this one is going to terminate, but do it instead in CsrCreateWait, w...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 5 20:06:47 2013 New Revision: 60541 URL: http://svn.reactos.org/svn/reactos?rev=60541&view=rev Log: [CSRSRV] - Do not associate the newly created wait block to the waiting thread (in CsrInitializeWait) in case this one is going to terminate, but do it instead in CsrCreateWait, where the check actually takes place. - Avoid PPORT_MESSAGE casts. - Fix a list insertion problem in CsrMoveSatisfiedWait. - Fix some descriptions / comments. Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win32/csrsrv/wait.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Oct 5 20:06:47 2013 @@ -343,7 +343,7 @@ VOID NTAPI -CsrMoveSatisfiedWait(IN PLIST_ENTRY NewEntry, +CsrMoveSatisfiedWait(IN PLIST_ENTRY DestinationList, IN PLIST_ENTRY WaitList); BOOLEAN Modified: trunk/reactos/subsystems/win32/csrsrv/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/wa… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/wait.c [iso-8859-1] Sat Oct 5 20:06:47 2013 @@ -71,11 +71,10 @@ } /* Initialize it */ - WaitBlock->Size = Size; - WaitBlock->WaitThread = CsrWaitThread; - CsrWaitThread->WaitBlock = WaitBlock; - WaitBlock->WaitContext = WaitContext; - WaitBlock->WaitFunction = WaitFunction; + WaitBlock->Size = Size; + WaitBlock->WaitThread = CsrWaitThread; + WaitBlock->WaitContext = WaitContext; + WaitBlock->WaitFunction = WaitFunction; WaitBlock->WaitList.Flink = NULL; WaitBlock->WaitList.Blink = NULL; @@ -96,7 +95,7 @@ * CSR Wait Block, and replies to the attached CSR API Message, if any. * * @param WaitBlock - * Pointer to the CSR Wait Block + * Pointer to the CSR Wait Block. * * @param WaitList * Pointer to the wait list for this wait. @@ -146,7 +145,7 @@ /* Reply to the port */ NtReplyPort(WaitBlock->WaitThread->Process->ClientPort, - (PPORT_MESSAGE)&WaitBlock->WaitApiMessage); + &WaitBlock->WaitApiMessage.Header); /* Check if we should dereference the thread */ if (DereferenceThread) @@ -186,7 +185,7 @@ * The CsrCreateWait routine creates a CSR Wait. * * @param WaitList - * Pointer to a list entry of the waits to associate. + * Pointer to a wait list in which the wait will be added. * * @param WaitFunction * Pointer to the function that will handle this wait. @@ -232,11 +231,13 @@ if (CsrWaitThread->Flags & CsrThreadTerminated) { /* Fail the wait */ - CsrWaitThread->WaitBlock = NULL; RtlFreeHeap(CsrHeap, 0, WaitBlock); CsrReleaseWaitLock(); return FALSE; } + + /* Associate the newly created wait to the waiting thread */ + CsrWaitThread->WaitBlock = WaitBlock; /* Insert the wait in the queue */ InsertTailList(WaitList, &WaitBlock->WaitList); @@ -309,14 +310,15 @@ * @name CsrMoveSatisfiedWait * @implemented NT5 * - * The CsrMoveSatisfiedWait routine moves satisfied waits from a wait list - * to another list entry. - * - * @param NewEntry - * Pointer to a list entry where the satisfied waits will be added. + * The CsrMoveSatisfiedWait routine moves satisfied waits from + * a wait list to another list. + * + * @param DestinationList + * Pointer to a list in which the satisfied waits will be added. * * @param WaitList - * Pointer to a list entry to analyze for satisfied waits. + * Pointer to the wait list whose satisfied wait blocks + * will be moved away. * * @return None. * @@ -325,7 +327,7 @@ *--*/ VOID NTAPI -CsrMoveSatisfiedWait(IN PLIST_ENTRY NewEntry, +CsrMoveSatisfiedWait(IN PLIST_ENTRY DestinationList, IN PLIST_ENTRY WaitList) { PLIST_ENTRY NextEntry; @@ -352,8 +354,8 @@ /* Remove it from the Wait Block Queue */ RemoveEntryList(&WaitBlock->WaitList); - /* Insert the new entry */ - InsertTailList(&WaitBlock->WaitList, NewEntry); + /* Insert the wait into the destination list */ + InsertTailList(DestinationList, &WaitBlock->WaitList); } } @@ -365,10 +367,10 @@ * @name CsrNotifyWait * @implemented NT4 * - * The CsrNotifyWait notifies a CSR Wait Block. + * The CsrNotifyWait notifies CSR Wait Blocks. * * @param WaitList - * Pointer to the list entry for this wait. + * Pointer to the wait list whose wait blocks will be notified. * * @param WaitType * Type of the wait to perform, either WaitAny or WaitAll.

11 years, 2 months

[aandrejevic] 60540: [SOFT386] Halfplement INS and OUTS.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Oct 5 20:06:19 2013 New Revision: 60540 URL: http://svn.reactos.org/svn/reactos?rev=60540&view=rev Log: [SOFT386] Halfplement INS and OUTS. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Oct 5 20:06:19 2013 @@ -6017,3 +6017,142 @@ /* Return success */ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeIns) +{ + ULONG Data = 0; + ULONG DataSize; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0x6C); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0x6C) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Read from the I/O port */ + State->IoReadCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + &Data, + DataSize); + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement EDI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + + /* Return success */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeOuts) +{ + ULONG Data = 0; + ULONG DataSize; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0x6E); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0x6E) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to the I/O port */ + State->IoWriteCallback(State, + State->GeneralRegs[SOFT386_REG_EDX].LowWord, + &Data, + DataSize); + + /* Increment/decrement ESI */ + if (OperandSize) + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + } + else + { + if (State->Flags.Df) State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + else State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + } + + /* Return success */ + return TRUE; +}

11 years, 2 months

[jimtabor] 60539: [Win32ss] - Add support for loading hook modules.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 5 19:57:22 2013 New Revision: 60539 URL: http://svn.reactos.org/svn/reactos?rev=60539&view=rev Log: [Win32ss] - Add support for loading hook modules. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -49,7 +49,10 @@ WPARAM wParam; LPARAM lParam; HOOKPROC Proc; + INT Mod; + ULONG_PTR offPfn; BOOLEAN Ansi; + WCHAR ModuleName[512]; } HOOKPROC_CALLBACK_ARGUMENTS, *PHOOKPROC_CALLBACK_ARGUMENTS; typedef struct _HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -448,6 +448,8 @@ WPARAM wParam, LPARAM lParam, HOOKPROC Proc, + INT Mod, + ULONG_PTR offPfn, BOOLEAN Ansi, PUNICODE_STRING ModuleName) { @@ -575,7 +577,11 @@ Common->wParam = wParam; Common->lParam = lParam; Common->Proc = Proc; + Common->Mod = Mod; + Common->offPfn = offPfn; Common->Ansi = Ansi; + RtlZeroMemory(&Common->ModuleName, sizeof(Common->ModuleName)); + RtlCopyMemory(&Common->ModuleName, ModuleName->Buffer, ModuleName->Length); Extra = (PCHAR) Common + sizeof(HOOKPROC_CALLBACK_ARGUMENTS); switch(HookId) Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -29,6 +29,8 @@ WPARAM wParam, LPARAM lParam, HOOKPROC Proc, + INT Mod, + ULONG_PTR offPfn, BOOLEAN Ansi, PUNICODE_STRING ModuleName); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -349,6 +349,8 @@ wParam, lParam, phk->Proc, + phk->ihmod, + phk->offPfn, phk->Ansi, &phk->ModuleName); @@ -373,6 +375,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } @@ -1233,6 +1237,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); if (ClientInfo) @@ -1309,6 +1315,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -2698,6 +2698,8 @@ ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), (LPARAM)&CWP, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } @@ -2715,6 +2717,8 @@ ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), (LPARAM)&CWPR, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -567,12 +567,33 @@ CWPRETSTRUCT *pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; + HOOKPROC Proc; WPARAM wParam = 0; LPARAM lParam = 0; LRESULT Result = 0; BOOL Hit = FALSE; + HMODULE mod = NULL; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; + + Proc = Common->Proc; + // HookProc Justin Case module is from another process. + if (Common->offPfn && Common->Mod) + { + if (!(mod = GetModuleHandleW((LPCWSTR)Common->ModuleName))) + { + TRACE("Reloading Hook Module.\n"); + if (!(mod = LoadLibraryExW((LPCWSTR)Common->ModuleName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) + { + ERR("Failed to load Hook Module.\n"); + } + } + if (mod) + { + TRACE("Loading Hook Module.\n"); + Proc = (HOOKPROC)((char *)mod + Common->offPfn); + } + } switch(Common->HookId) { @@ -613,15 +634,16 @@ lParam = Common->lParam; break; default: + if (mod) FreeLibrary(mod); ERR("HCBT_ not supported = %d\n", Common->Code); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } - if (Common->Proc) + if (Proc) { _SEH2_TRY { - Result = Common->Proc(Common->Code, wParam, lParam); + Result = Proc(Common->Code, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -631,7 +653,7 @@ } else { - ERR("Null Proc! Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); + ERR("Null Proc! Common = 0x%x, Proc = 0x%x\n",Common,Proc); } switch(Common->Code) { @@ -649,19 +671,19 @@ //ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); + Result = Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); break; case WH_MOUSE_LL: //ERR("WH_MOUSE_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); + Result = Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); break; case WH_MOUSE: /* SEH support */ pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMHook); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pMHook); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -683,7 +705,7 @@ pCWP->lParam); pCWP->lParam = (LPARAM)((PCHAR)pCWP + sizeof(CWPSTRUCT)); } - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWP); HeapFree(GetProcessHeap(), 0, pCWP); break; case WH_CALLWNDPROCRET: @@ -697,7 +719,7 @@ pCWPR->lParam); pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT)); } - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); HeapFree(GetProcessHeap(), 0, pCWPR); break; case WH_MSGFILTER: /* All SEH support */ @@ -709,7 +731,7 @@ // ERR("pMsg %d pcMsg %d\n",pMsg->message, pcMsg->message); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pcMsg); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pcMsg); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -722,12 +744,12 @@ break; case WH_KEYBOARD: case WH_SHELL: - Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); + Result = Proc(Common->Code, Common->wParam, Common->lParam); break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); + Result = Proc(Common->Code, Common->wParam, Common->lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -736,12 +758,14 @@ _SEH2_END; break; default: + if (mod) FreeLibrary(mod); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } if (Hit) { - ERR("Hook Exception! Id: %d, Code %d, Proc 0x%x\n",Common->HookId,Common->Code,Common->Proc); - } + ERR("Hook Exception! Id: %d, Code %d, Proc 0x%x\n",Common->HookId,Common->Code,Proc); + } + if (mod) FreeLibrary(mod); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); }

11 years, 2 months

[hbelusca] 60538: [CSRSRV] - Hardcoded_value--; - Be sure SizeOfProcessData is initialized to zero before doing anything later on.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 5 17:29:27 2013 New Revision: 60538 URL: http://svn.reactos.org/svn/reactos?rev=60538&view=rev Log: [CSRSRV] - Hardcoded_value--; - Be sure SizeOfProcessData is initialized to zero before doing anything later on. Modified: trunk/reactos/subsystems/win32/csrsrv/server.c Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Sat Oct 5 17:29:27 2013 @@ -69,7 +69,7 @@ CSR_SERVER_DLL_INIT(CsrServerDllInitialization) { /* Setup the DLL Object */ - LoadedServerDll->ApiBase = 0; + LoadedServerDll->ApiBase = CSRSRV_FIRST_API_NUMBER; LoadedServerDll->HighestApiSupported = CsrpMaxApiNumber; LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; LoadedServerDll->ValidTable = CsrServerApiServerValidTable; @@ -167,6 +167,7 @@ /* Set up the Object */ ServerDll->Length = Size; + ServerDll->SizeOfProcessData = 0; ServerDll->SharedSection = CsrSrvSharedSectionHeap; // Send to the server dll our shared heap pointer. ServerDll->Name.Length = DllName.Length; ServerDll->Name.MaximumLength = DllName.MaximumLength;

11 years, 2 months

[hbelusca] 60537: [CSRSRV]: Fix two DPRINTs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 5 17:24:31 2013 New Revision: 60537 URL: http://svn.reactos.org/svn/reactos?rev=60537&view=rev Log: [CSRSRV]: Fix two DPRINTs. Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Sat Oct 5 17:24:31 2013 @@ -740,7 +740,7 @@ CsrDebugProcess(IN PCSR_PROCESS CsrProcess) { /* CSR does not handle debugging anymore */ - DPRINT("CSRSRV: %s(%08lx) called\n", __FUNCTION__, CsrProcess); + DPRINT("CSRSRV: %s(0x%p) called\n", __FUNCTION__, CsrProcess); return STATUS_UNSUCCESSFUL; } @@ -764,7 +764,7 @@ CsrDebugProcessStop(IN PCSR_PROCESS CsrProcess) { /* CSR does not handle debugging anymore */ - DPRINT("CSRSRV: %s(%08lx) called\n", __FUNCTION__, CsrProcess); + DPRINT("CSRSRV: %s(0x%p) called\n", __FUNCTION__, CsrProcess); return STATUS_UNSUCCESSFUL; }

11 years, 2 months

[akhaldi] 60536: [PSDK] * Update commdlg.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 16:43:32 2013 New Revision: 60536 URL: http://svn.reactos.org/svn/reactos?rev=60536&view=rev Log: [PSDK] * Update commdlg.h. Modified: trunk/reactos/include/psdk/commdlg.h Modified: trunk/reactos/include/psdk/commdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commdlg.h?rev… ============================================================================== --- trunk/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commdlg.h [iso-8859-1] Sat Oct 5 16:43:32 2013 @@ -195,6 +195,12 @@ #define CD_LBSELADD 2 #define DN_DEFAULTPRN 1 +#define PD_RESULT_CANCEL 0 +#define PD_RESULT_PRINT 1 +#define PD_RESULT_APPLY 2 + +#define START_PAGE_GENERAL 0xffffffff + #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage @@ -378,6 +384,21 @@ DWORD FlagsEx; #endif } OPENFILENAMEW,*LPOPENFILENAMEW; + + +#ifndef CDSIZEOF_STRUCT +#define CDSIZEOF_STRUCT(type,field) ((INT_PTR)&(((type *)0)->field) + sizeof(((type*)0)->field)) +#endif + +#define OPENFILENAME_SIZE_VERSION_400A CDSIZEOF_STRUCT(OPENFILENAMEA,lpTemplateName) +#define OPENFILENAME_SIZE_VERSION_400W CDSIZEOF_STRUCT(OPENFILENAMEW,lpTemplateName) + +#ifdef UNICODE +#define OPENFILENAME_SIZE_VERSION_400 OPENFILENAME_SIZE_VERSION_400W +#else +#define OPENFILENAME_SIZE_VERSION_400 OPENFILENAME_SIZE_VERSION_400A +#endif + typedef struct _OFNOTIFYA { NMHDR hdr; LPOPENFILENAMEA lpOFN; @@ -533,6 +554,40 @@ } PRINTDLGEXW, *LPPRINTDLGEXW; #endif /* WINVER >= 0x0500 */ +#ifdef STDMETHOD + +DEFINE_GUID(IID_IPrintDialogCallback, 0x5852a2c3,0x6530,0x11d1,0xb6,0xa3,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogCallback +DECLARE_INTERFACE_(IPrintDialogCallback,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogCallback methods ***/ + STDMETHOD(InitDone)(THIS) PURE; + STDMETHOD(SelectionChange)(THIS) PURE; + STDMETHOD(HandleMessage)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT *) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_IPrintDialogServices, 0x509aaeda,0x5639,0x11d1,0xb6,0xa1,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogServices +DECLARE_INTERFACE_(IPrintDialogServices,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogServices methods ***/ + STDMETHOD(GetCurrentDevMode)(THIS_ LPDEVMODEW,UINT *) PURE; + STDMETHOD(GetCurrentPrinterName)(THIS_ LPWSTR,UINT *) PURE; + STDMETHOD(GetCurrentPortName)(THIS_ LPWSTR,UINT *) PURE; +}; +#undef INTERFACE + +#endif /* STDMETHOD */ + BOOL WINAPI ChooseColorA(LPCHOOSECOLORA); BOOL WINAPI ChooseColorW(LPCHOOSECOLORW); BOOL WINAPI ChooseFontA(LPCHOOSEFONTA);

11 years, 2 months

[ekohl] 60535: [MSV1_0] Add the password check to the logon routine.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 5 15:27:26 2013 New Revision: 60535 URL: http://svn.reactos.org/svn/reactos?rev=60535&view=rev Log: [MSV1_0] Add the password check to the logon routine. Modified: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msv1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/CMakeLists.txt [iso-8859-1] Sat Oct 5 15:27:26 2013 @@ -14,7 +14,7 @@ set_module_type(msv1_0 win32dll UNICODE ENTRYPOINT 0) target_link_libraries(msv1_0 wine ${PSEH_LIB}) add_delay_importlibs(msv1_0 samsrv lsasrv) -add_importlibs(msv1_0 kernel32 ntdll) +add_importlibs(msv1_0 advapi32 kernel32 ntdll) add_pch(msv1_0 msv1_0.h) add_dependencies(msv1_0 psdk) add_cd_file(TARGET msv1_0 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sat Oct 5 15:27:26 2013 @@ -764,6 +764,83 @@ } +static +NTSTATUS +MsvpCheckPassword(PUNICODE_STRING UserPassword, + PSAMPR_USER_INFO_BUFFER UserInfo) +{ + ENCRYPTED_NT_OWF_PASSWORD UserNtPassword; + ENCRYPTED_LM_OWF_PASSWORD UserLmPassword; + BOOLEAN UserLmPasswordPresent = FALSE; + BOOLEAN UserNtPasswordPresent = FALSE; + OEM_STRING LmPwdString; + CHAR LmPwdBuffer[15]; + NTSTATUS Status; + + TRACE("(%p %p)\n", UserPassword, UserInfo); + + /* Calculate the LM password and hash for the users password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + UserPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the users password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&UserLmPassword); + if (NT_SUCCESS(Status)) + { + UserLmPasswordPresent = TRUE; + } + } + + /* Calculate the NT hash of the users password */ + Status = SystemFunction007(UserPassword, + (LPBYTE)&UserNtPassword); + if (NT_SUCCESS(Status)) + { + UserNtPasswordPresent = TRUE; + } + + Status = STATUS_SUCCESS; + + if (UserNtPasswordPresent && UserInfo->All.NtPasswordPresent) + { + TRACE("Check NT password hashes:\n"); + if (!RtlEqualMemory(&UserNtPassword, + UserInfo->All.NtOwfPassword.Buffer, + sizeof(ENCRYPTED_NT_OWF_PASSWORD))) + { + TRACE(" failed!\n"); + Status = STATUS_WRONG_PASSWORD; + } + } + else if (UserLmPasswordPresent && UserInfo->All.LmPasswordPresent) + { + TRACE("Check LM password hashes:\n"); + if (!RtlEqualMemory(&UserLmPassword, + UserInfo->All.LmOwfPassword.Buffer, + sizeof(ENCRYPTED_LM_OWF_PASSWORD))) + { + TRACE(" failed!\n"); + Status = STATUS_WRONG_PASSWORD; + } + } + else + { + TRACE("No matching hashes available!\n"); + Status = STATUS_WRONG_PASSWORD; + } + + return Status; +} + + /* * @unimplemented */ @@ -1077,11 +1154,16 @@ /* FIXME: Check restrictions */ - /* FIXME: Check the password */ + /* Check the password */ if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0) { - FIXME("Must check the password!\n"); - + Status = MsvpCheckPassword(&(LogonInfo->Password), + UserInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("MsvpCheckPassword failed (Status %08lx)\n", Status); + goto done; + } } /* Return logon information */ @@ -1129,8 +1211,6 @@ TRACE("BuildTokenInformationBuffer failed (Status %08lx)\n", Status); goto done; } - - *SubStatus = STATUS_SUCCESS; done: /* Return the account name */ @@ -1176,6 +1256,13 @@ if (AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + + if (Status == STATUS_NO_SUCH_USER || + Status == STATUS_WRONG_PASSWORD) + { + *SubStatus = Status; + Status = STATUS_LOGON_FAILURE; + } TRACE("LsaApLogonUser done (Status %08lx)\n", Status); Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Sat Oct 5 15:27:26 2013 @@ -297,4 +297,14 @@ IN POLICY_INFORMATION_CLASS InformationClass, OUT PLSAPR_POLICY_INFORMATION *PolicyInformation); +NTSTATUS +WINAPI +SystemFunction006(LPCSTR password, + LPSTR hash); + +NTSTATUS +WINAPI +SystemFunction007(PUNICODE_STRING string, + LPBYTE hash); + /* EOF */

11 years, 2 months

[akhaldi] 60534: [BROWSEUI_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 5 12:32:51 2013 New Revision: 60534 URL: http://svn.reactos.org/svn/reactos?rev=60534&view=rev Log: [BROWSEUI_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/browseui/CMakeLists.txt trunk/rostests/winetests/browseui/autocomplete.c trunk/rostests/winetests/browseui/progressdlg.c trunk/rostests/winetests/browseui/testlist.c Modified: trunk/rostests/winetests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/CMakeL… ============================================================================== --- trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] Sat Oct 5 12:32:51 2013 @@ -1,11 +1,6 @@ -add_definitions(-D__ROS_LONG64__) - -add_executable(browseui_winetest - autocomplete.c - progressdlg.c - testlist.c) -target_link_libraries(browseui_winetest wine uuid) +add_executable(browseui_winetest autocomplete.c progressdlg.c testlist.c) +target_link_libraries(browseui_winetest uuid) set_module_type(browseui_winetest win32cui) -add_importlibs(browseui_winetest user32 ole32 msvcrt kernel32 ntdll) +add_importlibs(browseui_winetest ole32 msvcrt kernel32) add_cd_file(TARGET browseui_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Sat Oct 5 12:32:51 2013 @@ -17,26 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include <initguid.h> -#include <windows.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS + +#include <wine/test.h> + +//#include <stdarg.h> +#include <winnls.h> +//#include <initguid.h> #include <shlobj.h> -#include <shldisp.h> -#include <shlwapi.h> -#include <shlguid.h> - -#include "wine/test.h" - -#define stop_on_error(exp) \ -{ \ - HRESULT res = (exp); \ - if (FAILED(res)) \ - { \ - ok(FALSE, #exp " failed: %x\n", res); \ - return; \ - } \ -} +//#include <shldisp.h> +//#include <shlwapi.h> +//#include <shlguid.h> + + #define ole_ok(exp) \ { \ @@ -123,7 +119,7 @@ if (*ppvOut) { - iface->lpVtbl->AddRef(iface); + IEnumString_AddRef(iface); return S_OK; } @@ -222,14 +218,14 @@ #define expect_str(obj, str) \ { \ - ole_ok(obj->lpVtbl->Next(obj, 1, &wstr, &i)); \ + ole_ok(IEnumString_Next(obj, 1, &wstr, &i)); \ ok(i == 1, "Expected i == 1, got %d\n", i); \ ok(str[0] == wstr[0], "String mismatch\n"); \ CoTaskMemFree(wstr); \ } #define expect_end(obj) \ - ok(obj->lpVtbl->Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); + ok(IEnumString_Next(obj, 1, &wstr, &i) == S_FALSE, "Unexpected return from Next\n"); static void test_ACLMulti(void) { @@ -245,36 +241,51 @@ LPWSTR wstr; LPWSTR wstrtab[15]; LPVOID tmp; + ULONG ref; UINT i; - stop_on_error(CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (LPVOID *)&obj)); - stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IACList, (LPVOID *)&acl)); - ok(obj->lpVtbl->QueryInterface(obj, &IID_IACList2, &tmp) == E_NOINTERFACE, - "Unexpected interface IACList2 in ACLMulti\n"); - stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); - - hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); + hr = CoCreateInstance(&CLSID_ACLMulti, NULL, CLSCTX_INPROC, &IID_IEnumString, (void**)&obj); + ok(hr == S_OK, "failed to create ACLMulti instance, 0x%08x\n", hr); + if (hr != S_OK) return; + + hr = IEnumString_QueryInterface(obj, &IID_IACList, (void**)&acl); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumString_QueryInterface(obj, &IID_IACList2, &tmp); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IEnumString_QueryInterface(obj, &IID_IObjMgr, (void**)&mgr); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumString_QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); if (hr == E_NOINTERFACE) todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); else { ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); if (unk != NULL) - unk->lpVtbl->Release(unk); - } - - ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); + IEnumACString_Release(unk); + } + + i = -1; + hr = IEnumString_Next(obj, 1, (LPOLESTR *)&tmp, &i); + ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(i == 0, "Unexpected fetched value %d\n", i); - ok(obj->lpVtbl->Next(obj, 44, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); - ok(obj->lpVtbl->Skip(obj, 1) == E_NOTIMPL, "Unexpected return from Skip\n"); - ok(obj->lpVtbl->Clone(obj, (IEnumString **)&tmp) == E_OUTOFMEMORY, "Unexpected return from Clone\n"); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IEnumString_Next(obj, 44, (LPOLESTR *)&tmp, &i); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + hr = IEnumString_Skip(obj, 1); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); + hr = IEnumString_Clone(obj, (IEnumString **)&tmp); + ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl1->IACList_iface)); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl2->IACList_iface)); - ok(mgr->lpVtbl->Append(mgr, NULL) == E_FAIL, "Unexpected return from Append\n"); + hr = IObjMgr_Append(mgr, (IUnknown *)&acl1->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IObjMgr_Append(mgr, (IUnknown *)&acl2->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IObjMgr_Append(mgr, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); expect_str(obj, "a"); expect_str(obj, "c"); expect_str(obj, "e"); @@ -283,55 +294,73 @@ expect_str(obj, "d"); expect_end(obj); - ole_ok(obj->lpVtbl->Reset(obj)); + hr = IEnumString_Reset(obj); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->pos == 0, "acl1 not reset\n"); ok(acl2->pos == 0, "acl2 not reset\n"); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 1, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 1 /* Vista */, "expcount - expected 0 or 1, got %d\n", acl2->expcount); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(i == 1, "Expected i == 1, got %d\n", i); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + + hr = IEnumString_Next(obj, 15, wstrtab, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); CoTaskMemFree(wstrtab[0]); - ole_ok(acl->lpVtbl->Expand(acl, exp)); + + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */, "expcount - expected 0 or 2, got %d\n", acl2->expcount); acl1->expret = S_FALSE; - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 3, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 1 /* XP */ || acl2->expcount == 3 /* Vista */, "expcount - expected 0 or 3, got %d\n", acl2->expcount); acl1->expret = E_NOTIMPL; - ole_ok(acl->lpVtbl->Expand(acl, exp)); + hr = IACList_Expand(acl, exp); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(acl1->expcount == 4, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 2 /* XP */ || acl2->expcount == 4 /* Vista */, "expcount - expected 0 or 4, got %d\n", acl2->expcount); acl2->expret = E_OUTOFMEMORY; - ok(acl->lpVtbl->Expand(acl, exp) == E_OUTOFMEMORY, "Unexpected Expand return\n"); + hr = IACList_Expand(acl, exp); + ok(hr == E_OUTOFMEMORY, "got 0x%08x\n", hr); acl2->expret = E_FAIL; - ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n"); - - stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)&acl1->IACList_iface)); + hr = IACList_Expand(acl, exp); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + hr = IObjMgr_Remove(mgr, (IUnknown *)&acl1->IACList_iface); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(acl1->ref == 1, "acl1 not released\n"); expect_end(obj); - obj->lpVtbl->Reset(obj); + IEnumString_Reset(obj); expect_str(obj, "a"); expect_str(obj, "b"); expect_str(obj, "d"); expect_end(obj); - obj->lpVtbl->Release(obj); - acl->lpVtbl->Release(acl); - ok(mgr->lpVtbl->Release(mgr) == 0, "Unexpected references\n"); + IEnumString_Release(obj); + IACList_Release(acl); + ref = IObjMgr_Release(mgr); + ok(ref == 0, "Unexpected references\n"); ok(acl1->ref == 1, "acl1 not released\n"); ok(acl2->ref == 1, "acl2 not released\n"); Modified: trunk/rostests/winetests/browseui/progressdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/progre… ============================================================================== --- trunk/rostests/winetests/browseui/progressdlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/progressdlg.c [iso-8859-1] Sat Oct 5 12:32:51 2013 @@ -17,13 +17,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include <stdarg.h> +#include <wine/test.h> + +//#include <stdarg.h> #include <shlobj.h> - -#include "wine/test.h" - static void test_IProgressDialog_QueryInterface(void) { Modified: trunk/rostests/winetests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/testli… ============================================================================== --- trunk/rostests/winetests/browseui/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/testlist.c [iso-8859-1] Sat Oct 5 12:32:51 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_autocomplete(void); extern void func_progressdlg(void);

11 years, 2 months

[ekohl] 60533: [SAMRPC] SampQueryUserAll: Implement the retrieval of LM and NT passwords by trusted callers.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 5 12:26:33 2013 New Revision: 60533 URL: http://svn.reactos.org/svn/reactos?rev=60533&view=rev Log: [SAMRPC] SampQueryUserAll: Implement the retrieval of LM and NT passwords by trusted callers. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Oct 5 12:26:33 2013 @@ -6706,14 +6706,70 @@ InfoBuffer->All.CodePage = FixedData.CodePage; } - if (InfoBuffer->All.WhichFields & USER_ALL_NTPASSWORDPRESENT) - { - /* FIXME */ - } - - if (InfoBuffer->All.WhichFields & USER_ALL_LMPASSWORDPRESENT) - { - /* FIXME */ + /* Get the LmPassword and NtPassword attributes */ + if (InfoBuffer->All.WhichFields & (USER_ALL_NTPASSWORDPRESENT | USER_ALL_LMPASSWORDPRESENT)) + { + /* Get the NT password */ + Length = 0; + SampGetObjectAttribute(UserObject, + L"NTPwd", + NULL, + NULL, + &Length); + + InfoBuffer->All.NtPasswordPresent = (Length == sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + + if (Length == sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + { + InfoBuffer->All.NtOwfPassword.Buffer = midl_user_allocate(sizeof(ENCRYPTED_NT_OWF_PASSWORD)); + if (InfoBuffer->All.NtOwfPassword.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + InfoBuffer->All.NtOwfPassword.Length = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + InfoBuffer->All.NtOwfPassword.MaximumLength = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + + Status = SampGetObjectAttribute(UserObject, + L"NTPwd", + NULL, + (PVOID)InfoBuffer->All.NtOwfPassword.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } + + /* Get the LM password */ + Length = 0; + SampGetObjectAttribute(UserObject, + L"LMPwd", + NULL, + NULL, + &Length); + + InfoBuffer->All.LmPasswordPresent = (Length == sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + + if (Length == sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + { + InfoBuffer->All.LmOwfPassword.Buffer = midl_user_allocate(sizeof(ENCRYPTED_LM_OWF_PASSWORD)); + if (InfoBuffer->All.LmOwfPassword.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + InfoBuffer->All.LmOwfPassword.Length = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + InfoBuffer->All.LmOwfPassword.MaximumLength = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + + Status = SampGetObjectAttribute(UserObject, + L"LMPwd", + NULL, + (PVOID)InfoBuffer->All.LmOwfPassword.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + } } if (InfoBuffer->All.WhichFields & USER_ALL_PRIVATEDATA) @@ -6770,6 +6826,12 @@ if (InfoBuffer->All.Parameters.Buffer != NULL) midl_user_free(InfoBuffer->All.Parameters.Buffer); + + if (InfoBuffer->All.LmOwfPassword.Buffer != NULL) + midl_user_free(InfoBuffer->All.LmOwfPassword.Buffer); + + if (InfoBuffer->All.NtOwfPassword.Buffer != NULL) + midl_user_free(InfoBuffer->All.NtOwfPassword.Buffer); midl_user_free(InfoBuffer); }

11 years, 2 months

[hbelusca] 60532: [NTDLL]: Stubplement and export LdrFlushAlternateResourceModules needed for Windows 2k3 user32.dll and winsrv.dll . [RTL]: Stubplement and export RtlConsoleMultiByteToUnicodeN (an...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 5 12:06:59 2013 New Revision: 60532 URL: http://svn.reactos.org/svn/reactos?rev=60532&view=rev Log: [NTDLL]: Stubplement and export LdrFlushAlternateResourceModules needed for Windows 2k3 user32.dll and winsrv.dll . [RTL]: Stubplement and export RtlConsoleMultiByteToUnicodeN (and fallback to RtlMultiByteToUnicodeN) needed for WIndows 2k3 winsrv.dll CORE-7481 #comment LdrFlushAlternateResourceModules and RtlConsoleMultiByteToUnicodeN stubplemented in revision 60532. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/lib/rtl/nls.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Oct 5 12:06:59 2013 @@ -56,7 +56,7 @@ @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) ;@ stdcall LdrFindResourceEx_U ; 5.1 and higher @ stdcall LdrFindResource_U(long ptr long ptr) -;@ stdcall LdrFlushAlternateResourceModules +@ stdcall LdrFlushAlternateResourceModules() @ stdcall LdrGetDllHandle(wstr long ptr ptr) @ stdcall LdrGetDllHandleEx(long wstr long ptr ptr) @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) @@ -451,7 +451,7 @@ @ stdcall RtlComputeCrc32(long ptr long) @ stdcall RtlComputeImportTableHash(ptr ptr long) @ stdcall RtlComputePrivatizedDllName_U(ptr ptr ptr) -;@ stdcall RtlConsoleMultiByteToUnicodeN +@ stdcall RtlConsoleMultiByteToUnicodeN(ptr long ptr ptr long ptr) @ stdcall RtlConvertExclusiveToShared(ptr) @ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) ;@ stdcall RtlConvertPropertyToVariant Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Oct 5 12:06:59 2013 @@ -1582,6 +1582,24 @@ return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta); } +/* FIXME: Add to ntstatus.mc */ +#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001L) + +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrLoadAlternateResourceModule(IN PVOID Module, + IN PWSTR Buffer) +{ + /* Is MUI Support enabled? */ + if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; + + UNIMPLEMENTED; + return STATUS_MUI_FILE_NOT_FOUND; +} + /* * @implemented */ @@ -1607,22 +1625,15 @@ return TRUE; } -/* FIXME: Add to ntstatus.mc */ -#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001L) - -/* - * @implemented - */ -NTSTATUS -NTAPI -LdrLoadAlternateResourceModule(IN PVOID Module, - IN PWSTR Buffer) -{ - /* Is MUI Support enabled? */ - if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; - +/* + * @unimplemented + */ +BOOLEAN +NTAPI +LdrFlushAlternateResourceModules(VOID) +{ UNIMPLEMENTED; - return STATUS_MUI_FILE_NOT_FOUND; + return FALSE; } /* EOF */ Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=60532&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/nls.c [iso-8859-1] Sat Oct 5 12:06:59 2013 @@ -285,6 +285,32 @@ } return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +RtlConsoleMultiByteToUnicodeN( + OUT PWCHAR UnicodeString, + IN ULONG UnicodeSize, + OUT PULONG ResultSize, + IN PCSTR MbString, + IN ULONG MbSize, + OUT PULONG Unknown) +{ + PAGED_CODE_RTL(); + + UNIMPLEMENTED; + DPRINT1("RtlConsoleMultiByteToUnicodeN calling RtlMultiByteToUnicodeN\n"); + *Unknown = 1; + return RtlMultiByteToUnicodeN(UnicodeString, + UnicodeSize, + ResultSize, + MbString, + MbSize); }

11 years, 2 months

← Newer
1
...
25
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013