Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[tkreuzer] 29660: revert my useless hack.
by tkreuzer＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: tkreuzer Date: Thu Oct 18 13:44:58 2007 New Revision: 29660 URL: http://svn.reactos.org/svn/reactos?rev=29660&view=rev Log: revert my useless hack. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Oct 18 13:44:58 2007 @@ -1603,53 +1603,6 @@ } #endif -void -InitTitle() -{ - STARTUPINFOW StartupInfo; - LPWSTR lpFileName; - WCHAR szTitle[MAX_PATH+1]; - - GetStartupInfoW(&StartupInfo); - - if (StartupInfo.lpTitle) - { - /* Are we started from a shortcut? */ - if (StartupInfo.dwFlags & 0x800) - { - UINT len; - - /* We are started from a shortcut, use the file name only */ - lpFileName = wcsrchr(StartupInfo.lpTitle, '\\'); - if (lpFileName == NULL) - { - lpFileName = StartupInfo.lpTitle; - } - - /* Drop file extension, we simply assume 3 chars extension */ - len = wcslen(lpFileName) - 4; - if (len > 0) - { - len = min(len, MAX_PATH); - wcsncpy(szTitle, lpFileName, len); - szTitle[len] = 0; - SetConsoleTitleW(szTitle); - return; - } - } - - /* Use lpTitle member of STARTUPINFO */ - SetConsoleTitleW(StartupInfo.lpTitle); - return; - } - - /* Set executable path as window title */ - GetModuleFileNameW(NULL, szTitle, MAX_PATH); - SetConsoleTitleW(szTitle); - return; -} - - /* * set up global initializations and process parameters * @@ -1672,11 +1625,6 @@ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx (&osvi); - /* FIXME: Doesn't work in ros yet, because of missing functionality of ShellExecute. - See bug 2743. Please unif as soon as it get's fixed. */ -#if 0 - InitTitle(); -#endif /* Some people like to run ReactOS cmd.exe on Win98, it helps in the * build process. So don't link implicitly against ntdll.dll, load it * dynamically instead */

1 0

[hpoussin] 29659: Export GetDefaultPrinterA/W also by ordinal
by hpoussin＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: hpoussin Date: Thu Oct 18 12:44:46 2007 New Revision: 29659 URL: http://svn.reactos.org/svn/reactos?rev=29659&view=rev Log: Export GetDefaultPrinterA/W also by ordinal Modified: trunk/reactos/dll/win32/winspool/winspool.def Modified: trunk/reactos/dll/win32/winspool/winspool.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.def (original) +++ trunk/reactos/dll/win32/winspool/winspool.def Thu Oct 18 12:44:46 2007 @@ -76,8 +76,8 @@ FindFirstPrinterChangeNotification@16 FindNextPrinterChangeNotification@16 FreePrinterNotifyInfo@4 -GetDefaultPrinterA@8 -GetDefaultPrinterW@8 +GetDefaultPrinterA@8 @201 +GetDefaultPrinterW@8 @203 GetFormA@24 GetFormW@24 GetJobA@24

1 0

[arty] 29658: Break in at will. Fix trap handler a bit, allowing setting of MSR. Make packet code work properly when serial output is interrupted by a packet from gdb.
by arty＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: arty Date: Thu Oct 18 12:12:28 2007 New Revision: 29658 URL: http://svn.reactos.org/svn/reactos?rev=29658&view=rev Log: Break in at will. Fix trap handler a bit, allowing setting of MSR. Make packet code work properly when serial output is interrupted by a packet from gdb. Modified: trunk/reactos/lib/ppcmmu/devint.s trunk/reactos/lib/ppcmmu/gdblib.c trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/lib/ppcmmu/devint.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/devint.s?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/devint.s (original) +++ trunk/reactos/lib/ppcmmu/devint.s Thu Oct 18 12:12:28 2007 @@ -5,61 +5,60 @@ mmumain: mr 0,1 lis 1,2 - subi 1,1,432 - stw 0,4(1) - stw 2,8(1) - stw 3,12(1) - stw 4,16(1) - stw 5,20(1) - stw 6,24(1) - stw 7,28(1) - stw 8,32(1) - stw 9,36(1) - stw 10,40(1) - stw 11,44(1) - stw 12,48(1) - stw 13,52(1) - stw 14,56(1) - stw 15,60(1) - stw 16,64(1) - stw 17,68(1) - stw 18,72(1) - stw 19,76(1) - stw 20,80(1) - stw 21,84(1) - stw 22,88(1) - stw 23,92(1) - stw 24,96(1) - stw 25,100(1) - stw 26,104(1) - stw 27,108(1) - stw 28,112(1) - stw 29,116(1) - stw 30,120(1) - stw 31,124(1) + subi 1,1,448 + stw 0,20(1) + stw 2,24(1) + stw 3,28(1) + stw 4,32(1) + stw 5,36(1) + stw 6,40(1) + stw 7,44(1) + stw 8,48(1) + stw 9,52(1) + stw 10,56(1) + stw 11,60(1) + stw 12,64(1) + stw 13,68(1) + stw 14,72(1) + stw 15,76(1) + stw 16,80(1) + stw 17,84(1) + stw 18,88(1) + stw 19,92(1) + stw 20,96(1) + stw 21,100(1) + stw 22,104(1) + stw 23,108(1) + stw 24,112(1) + stw 25,116(1) + stw 26,120(1) + stw 27,124(1) + stw 28,128(1) + stw 29,132(1) + stw 30,136(1) + stw 31,140(1) + mfsrr0 0 + stw 0,400(1) + mfmsr 0 + stw 0,404(1) + mfcr 0 + stw 0,408(1) mflr 0 - stw 0,384(1) - mfmsr 0 - stw 0,388(1) - mfcr 0 - stw 0,392(1) - mflr 0 - stw 0,396(1) + stw 0,412(1) mfctr 0 - stw 0,400(1) + stw 0,416(1) mfxer 0 - stw 0,404(1) - xor 0,0,0 - stw 0,408(1) + stw 0,420(1) + /* xor 0,0,0 -- We can omit this since PPC doesn't have MQ */ + stw 0,424(1) mfdsisr 0 - stw 0,412(1) + stw 0,428(1) mfdar 0 - stw 0,416(1) - mr 7,1 + stw 0,432(1) + addi 7,1,16 lis 8,_mmumain@ha addi 8,8,_mmumain@l mtctr 8 - subi 1,1,16 bctrl addi 1,1,16 lwz 2,8(1) @@ -98,7 +97,9 @@ mtlr 0 lwz 0,400(1) mtctr 0 + lwz 0,388(1) /* Copy out new MSR bits if needed */ lwz 1,4(1) + mtmsr 0 blr .globl trap_start @@ -106,68 +107,67 @@ trap_start: mtsprg1 1 lis 1,2 - subi 1,1,432 - stw 0,0(1) + subi 1,1,448 + stw 0,16(1) mfsprg1 0 - stw 0,4(1) - stw 2,8(1) - stw 3,12(1) - stw 4,16(1) - stw 5,20(1) - stw 6,24(1) - stw 7,28(1) - stw 8,32(1) - stw 9,36(1) - stw 10,40(1) - stw 11,44(1) - stw 12,48(1) - stw 13,52(1) - stw 14,56(1) - stw 15,60(1) - stw 16,64(1) - stw 17,68(1) - stw 18,72(1) - stw 19,76(1) - stw 20,80(1) - stw 21,84(1) - stw 22,88(1) - stw 23,92(1) - stw 24,96(1) - stw 25,100(1) - stw 26,104(1) - stw 27,108(1) - stw 28,112(1) - stw 29,116(1) - stw 30,120(1) - stw 31,124(1) + stw 0,20(1) + stw 2,24(1) + stw 3,28(1) + stw 4,32(1) + stw 5,36(1) + stw 6,40(1) + stw 7,44(1) + stw 8,48(1) + stw 9,52(1) + stw 10,56(1) + stw 11,60(1) + stw 12,64(1) + stw 13,68(1) + stw 14,72(1) + stw 15,76(1) + stw 16,80(1) + stw 17,84(1) + stw 18,88(1) + stw 19,92(1) + stw 20,96(1) + stw 21,100(1) + stw 22,104(1) + stw 23,108(1) + stw 24,112(1) + stw 25,116(1) + stw 26,120(1) + stw 27,124(1) + stw 28,128(1) + stw 29,132(1) + stw 30,136(1) + stw 31,140(1) mfsrr0 0 - stw 0,384(1) + stw 0,400(1) mfsrr1 0 - stw 0,388(1) + stw 0,404(1) mfcr 0 - stw 0,392(1) + stw 0,408(1) mflr 0 - stw 0,396(1) + stw 0,412(1) mfctr 0 - stw 0,400(1) + stw 0,416(1) mfxer 0 - stw 0,404(1) - xor 0,0,0 - stw 0,408(1) + stw 0,420(1) + /* xor 0,0,0 -- We can omit this since PPC doesn't have MQ */ + stw 0,424(1) mfdsisr 0 - stw 0,412(1) + stw 0,428(1) mfdar 0 - stw 0,416(1) + stw 0,432(1) bl 1f 1: mflr 5 - mr 4,1 + addi 4,1,16 rlwinm 3,5,24,0xff lwz 5,36(5) mtctr 5 lis 5,trap_finish_start@ha addi 5,5,trap_finish_start@l mtlr 5 - subi 1,1,16 bctr trap_end: .space 4 Modified: trunk/reactos/lib/ppcmmu/gdblib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/gdblib.c?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/gdblib.c (original) +++ trunk/reactos/lib/ppcmmu/gdblib.c Thu Oct 18 12:12:28 2007 @@ -31,6 +31,7 @@ * * Modified for 386 by Jim Kingdon, Cygnus Support. * Modified for ReactOS by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * Modified heavily for PowerPC ReactOS by arty * * To enable debugger support, two things need to happen. One, setting * up a routine so that it is in the exception path, is necessary in order @@ -127,12 +128,12 @@ (ch >= '0' && ch <= '9'); } -void sync() { +inline void sync() { __asm__("eieio\n\t" "sync"); } -void send(char *serport, char c) { +inline void send(char *serport, char c) { /* Wait for Clear to Send */ while( !(serport[LSR] & 0x20) ) sync(); @@ -140,16 +141,22 @@ sync(); } -int rdy(char *serport) +inline int rdy(char *serport) { sync(); return (serport[LSR] & 0x20); } -char recv(char *serport) { +inline int chr(char *serport) +{ + sync(); + return serport[LSR] & 1; +} + +inline char recv(char *serport) { char c; - while( !(serport[LSR] & 1) ) sync(); + while( !chr(serport) ) sync(); c = serport[RCV]; sync(); @@ -167,8 +174,6 @@ sync(); serport[LCR] = 3; sync(); - serport[IER] = 1; - sync(); } void SerialSetUp(int deviceType, void *deviceAddr, int baud) @@ -178,11 +183,11 @@ setup(serport, baud); } -extern void SerialInterrupt(); - -void Wait() -{ - while(!Continue) if (rdy(serport)) SerialInterrupt(); +extern int SerialInterrupt(int signal, ppc_trap_frame_t *tf); + +void IntEnable() +{ + serport[IER] |= 1; } void SerialWrite(int ch) @@ -240,22 +245,44 @@ void PacketFinish() { - int i, ch; + int i, ch, count = 0; PacketSent = 0; do { - SerialWrite('$'); - for (i = 0; i < DataOutAddr; i++) - { - SerialWrite(DataOutBuffer[i]); - } - SerialWrite('#'); - SerialWrite(hex[(DataOutCsum >> 4) & 15]); - SerialWrite(hex[DataOutCsum & 15]); - - while(!rdy(serport)); - if (SerialRead() == '+') break; + if (!count) + { + SerialWrite('$'); + for (i = 0; i < DataOutAddr; i++) + { + SerialWrite(DataOutBuffer[i]); + } + SerialWrite('#'); + SerialWrite(hex[(DataOutCsum >> 4) & 15]); + SerialWrite(hex[DataOutCsum & 15]); + } + while(count-- != 0) + { + if (chr(serport)) + { + ch = SerialRead(); + break; + } + } + + switch (ch) + { + default: + break; + + case '-': + count = 0; + break; + + case '+': + PacketSent = 1; + break; + } } while(PacketSent != 1); } @@ -293,10 +320,13 @@ PacketFinish(); } +void marker() { } + void GotPacket() { int i, memaddr, memsize; - + + Continue = 0; switch (DataInBuffer[DataInAddr++]) { case 'g': @@ -349,10 +379,16 @@ Continue = 1; break; + case 'S': + PacketOk(); + Continue = 0; + break; + case 's': - RegisterSaveArea->srr1 |= 16; + RegisterSaveArea->srr1 |= 0x400; PacketOk(); Continue = 1; + marker(); break; case 'q': @@ -374,59 +410,74 @@ } } -void SerialInterrupt() -{ - int ch = SerialRead(); - - if (ch == '+') +int SerialInterrupt(int signal, ppc_trap_frame_t *tf) +{ + int ch; + + if (!chr(serport)) return 0; + + Signal = signal; + RegisterSaveArea = tf; + + do { - PacketSent = 1; - } - else if (ch == '-') - { - PacketSent = -1; - } - else if (ch == '$') - { - DataInAddr = 0; - ParseState = 0; - ComputedCsum = 0; - ActualCsum = 0; - } - else if (ch == '#' && ParseState == 0) - { - ParseState = 2; - } - else if (ParseState == 0) - { - ComputedCsum += ch; - DataInBuffer[DataInAddr++] = ch; - } - else if (ParseState == 2) - { - ActualCsum = ch; - ParseState++; - } - else if (ParseState == 3) - { - ActualCsum = hex2int(ch) | (hex2int(ActualCsum) << 4); - ComputedCsum &= 255; - ParseState = -1; - if (ComputedCsum == ActualCsum) - { + ch = SerialRead(); + + if (ch == 3) /* Break in - tehe */ + { + Continue = 0; + PacketWriteSignal(3); + } + else if (ch == '-' || ch == '+') + { + /* Nothing */ + } + else if (ch == '$') + { + DataInAddr = 0; + ParseState = 0; ComputedCsum = 0; - DataInBuffer[DataInAddr] = 0; - DataInAddr = 0; - Continue = 0; - SerialWrite('+'); - GotPacket(); - } - else + ActualCsum = 0; + } + else if (ch == '#' && ParseState == 0) + { + ParseState = 2; + } + else if (ParseState == 0) + { + ComputedCsum += ch; + DataInBuffer[DataInAddr++] = ch; + } + else if (ParseState == 2) + { + ActualCsum = ch; + ParseState++; + } + else if (ParseState == 3) + { + ActualCsum = hex2int(ch) | (hex2int(ActualCsum) << 4); + ComputedCsum &= 255; + ParseState = -1; + if (ComputedCsum == ActualCsum) + { + ComputedCsum = 0; + DataInBuffer[DataInAddr] = 0; + DataInAddr = 0; + Continue = 0; + SerialWrite('+'); + GotPacket(); + } + else + SerialWrite('-'); + } + else if (ParseState == -1) SerialWrite('-'); } -} - -void TakeException(int n, int *tf) + while (!Continue); + return 1; +} + +int TakeException(int n, ppc_trap_frame_t *tf) { Signal = n; RegisterSaveArea = tf; @@ -434,7 +485,8 @@ PacketWriteSignal(Signal); SendSignal = 0; Continue = 0; - Wait(); + while(!Continue) SerialInterrupt(n, tf); + return 1; } /* EOF */ Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Thu Oct 18 12:12:28 2007 @@ -68,7 +68,8 @@ extern void fmtout(const char *fmt, ...); int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr); void SerialSetUp(int deviceType, void *deviceAddr, int baud); -void TakeException(int n, int *tf); +int SerialInterrupt(int n, ppc_trap_frame_t *tf); +void TakeException(int n, ppc_trap_frame_t *tf); int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) { @@ -83,36 +84,42 @@ if(!ptegreload(trap_frame, trap_frame->dar)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,tf)) hang(action, tf); + if (!callback[action](action,trap_frame)) hang(action, trap_frame); } break; case 4: if(!ptegreload(trap_frame, trap_frame->srr0)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,tf)) hang(action, tf); - } - break; - + if (!callback[action](action,trap_frame)) hang(action, trap_frame); + } + break; + + case 5: + /* EE -- Try to get a serial interrupt if debugging enabled, then fall + * back to primary handler + */ + if (!SerialInterrupt(action, trap_frame)) + callback[action](action, trap_frame); + else + trap_frame->srr1 |= 0x8000; + break; case 0: case 2: - case 5: case 6: case 7: case 8: case 9: case 0xa: - if (!callback[action](action,tf)) hang(action, tf); - break; - + case 0xc: case 0x20: - // Single step - TakeException(action, tf); + if (!callback[action](action,trap_frame)) hang(action, trap_frame); break; /* MMU Functions */ case 0x100: initme(); + trap_frame->srr1 |= 0x8000; break; case 0x101: ret = mmuaddpage(arg1, (int)arg2); @@ -161,7 +168,7 @@ SerialSetUp((int)arg1, arg2, 9600); break; case 0x201: - TakeException((int)arg1, (int *)trap_frame); + TakeException((int)arg1, trap_frame); break; default: @@ -251,7 +258,7 @@ GdbAttach = 1; SerialSetUp(0, (void *)0x800003f8, 9600); } - TakeException(trapCode, (int *)trap); + while(1) SerialInterrupt(trapCode, trap); return 1; } @@ -294,11 +301,17 @@ copy_trap_handler(i); } + /* Serial Interrupt */ + callback[5] = SerialInterrupt; + /* Floating point exception */ callback[8] = fpenable; /* Ignore decrementer and EE */ callback[9] = ignore; + + /* Single Step */ + callback[0x20] = TakeException; } ppc_map_t *allocpage()

1 0

[mnordell] 29657: Move variable definition to before first code statement. GCC did not catch this due to its language extensions.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 12:11:32 2007 New Revision: 29657 URL: http://svn.reactos.org/svn/reactos?rev=29657&view=rev Log: Move variable definition to before first code statement. GCC did not catch this due to its language extensions. Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Thu Oct 18 12:11:32 2007 @@ -46,8 +46,8 @@ // us it expected a single byte back. We therefore guess it expects // a BOOLEAN, and we dream up the value TRUE to (we think) tell it // "Sure, the framebuffer is cached". + BOOLEAN ToReturn = TRUE; DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize); - BOOLEAN ToReturn = TRUE; ASSERT(sizeof(BOOLEAN) == 1); *ReturnedLength = sizeof(BOOLEAN); RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN));

1 0

[mnordell] 29656: Feeble attempt at getting NT4 vga.sys working by implementing HalFrameBufferCachingInformation case for HaliQuerySystemInformation.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 12:00:59 2007 New Revision: 29656 URL: http://svn.reactos.org/svn/reactos?rev=29656&view=rev Log: Feeble attempt at getting NT4 vga.sys working by implementing HalFrameBufferCachingInformation case for HaliQuerySystemInformation. Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c Thu Oct 18 12:00:59 2007 @@ -23,13 +23,54 @@ NTSTATUS NTAPI -HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, - IN ULONG BufferSize, - IN OUT PVOID Buffer, - OUT PULONG ReturnedLength) +HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +#define REPORT_THIS_CASE(X) case X: DPRINT1("Unhandled case: %s\n", #X); break + switch (InformationClass) + { + REPORT_THIS_CASE(HalInstalledBusInformation); + REPORT_THIS_CASE(HalProfileSourceInformation); + REPORT_THIS_CASE(HalInformationClassUnused1); + REPORT_THIS_CASE(HalPowerInformation); + REPORT_THIS_CASE(HalProcessorSpeedInformation); + REPORT_THIS_CASE(HalCallbackInformation); + REPORT_THIS_CASE(HalMapRegisterInformation); + REPORT_THIS_CASE(HalMcaLogInformation); + case HalFrameBufferCachingInformation: + if (BufferSize >= 1) + { + // The only caller that has been seen calling this function told + // us it expected a single byte back. We therefore guess it expects + // a BOOLEAN, and we dream up the value TRUE to (we think) tell it + // "Sure, the framebuffer is cached". + DPRINT("%s: caller expects %u bytes (should be 1)\n", "HalFrameBufferCachingInformation", BufferSize); + BOOLEAN ToReturn = TRUE; + ASSERT(sizeof(BOOLEAN) == 1); + *ReturnedLength = sizeof(BOOLEAN); + RtlCopyMemory(Buffer, &ToReturn, sizeof(BOOLEAN)); + return STATUS_SUCCESS; + } + break; + REPORT_THIS_CASE(HalDisplayBiosInformation); + REPORT_THIS_CASE(HalProcessorFeatureInformation); + REPORT_THIS_CASE(HalNumaTopologyInterface); + REPORT_THIS_CASE(HalErrorInformation); + REPORT_THIS_CASE(HalCmcLogInformation); + REPORT_THIS_CASE(HalCpeLogInformation); + REPORT_THIS_CASE(HalQueryMcaInterface); + REPORT_THIS_CASE(HalQueryAMLIIllegalIOPortAddresses); + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); + REPORT_THIS_CASE(HalPartitionIpiInterface); + REPORT_THIS_CASE(HalPlatformInformation); + REPORT_THIS_CASE(HalQueryProfileSourceList); + } +#undef REPORT_THIS_CASE + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS

1 0

[weiden] 29655: Fix status output
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Thu Oct 18 10:28:02 2007 New Revision: 29655 URL: http://svn.reactos.org/svn/reactos?rev=29655&view=rev Log: Fix status output Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c Thu Oct 18 10:28:02 2007 @@ -39,6 +39,27 @@ } static void +write_status(LPCTSTR lpFmt, ...) +{ + va_list args; + + /* FIXME: Determine line length! */ + TCHAR szTxt[80]; + int c; + + va_start(args, lpFmt); + _vstprintf(szTxt, lpFmt, args); + va_end(args); + + c = _tcslen(szTxt); + while (c < (sizeof(szTxt) / sizeof(szTxt[0])) - 1) + szTxt[c++] = _T(' '); + szTxt[c] = _T('\0'); + + _tprintf(_T("\r%.79s"), szTxt); +} + +static void CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) { /* FIXME: better output */ @@ -50,12 +71,12 @@ if (Percentage > 99) Percentage = 99; - _tprintf(_T("\r%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); + write_status(_T("%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); } else { /* Unknown size */ - _tprintf(_T("\r%I64u bytes downloaded"), This->Progress); + write_status(_T("%I64u bytes downloaded"), This->Progress); } } @@ -214,7 +235,8 @@ break; case BINDSTATUS_ENDDOWNLOADDATA: - _tprintf(_T("\rFile saved.\n")); + write_status(_T("File saved.")); + _tprintf(_T("\n")); break; case BINDSTATUS_DOWNLOADINGDATA: @@ -415,6 +437,8 @@ static int print_err(int iErr) { + write_status(_T("")); + if (iErr == DWNL_E_LASTERROR) { if (GetLastError() == ERROR_SUCCESS)

1 0

[weiden] 29654: Display basic download status
by weiden＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: weiden Date: Thu Oct 18 10:00:17 2007 New Revision: 29654 URL: http://svn.reactos.org/svn/reactos?rev=29654&view=rev Log: Display basic download status Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c trunk/reactos/base/applications/network/dwnl/dwnl.rbuild Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c Thu Oct 18 10:00:17 2007 @@ -1,5 +1,7 @@ #include <stdio.h> +#define COBJMACROS #include <urlmon.h> +#include <wininet.h> #include <tchar.h> /* FIXME: add correct definitions to urlmon.idl */ @@ -9,39 +11,453 @@ #define URLDownloadToFile URLDownloadToFileA #endif +#define DWNL_E_LASTERROR 0 +#define DWNL_E_NEEDTARGETFILENAME -1 +#define DWNL_E_UNSUPPORTEDSCHEME -2 + +typedef struct +{ + const IBindStatusCallbackVtbl* lpIBindStatusCallbackVtbl; + LONG ref; + TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + TCHAR szMimeType[128]; + UINT64 Size; + UINT64 Progress; + UINT bResolving : 1; + UINT bConnecting : 1; + UINT bSendingReq : 1; + UINT bBeginTransfer : 1; +} CBindStatusCallback; + +#define impl_to_interface(impl,iface) (struct iface *)(&(impl)->lp##iface##Vtbl) +#define interface_to_impl(instance,iface) ((CBindStatusCallback*)((ULONG_PTR)instance - FIELD_OFFSET(CBindStatusCallback,lp##iface##Vtbl))) + +static void +CBindStatusCallback_Destroy(CBindStatusCallback *This) +{ + return; +} + +static void +CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) +{ + /* FIXME: better output */ + if (This->Size != 0) + { + UINT Percentage; + + Percentage = (UINT)((This->Progress * 100) / This->Size); + if (Percentage > 99) + Percentage = 99; + + _tprintf(_T("\r%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); + } + else + { + /* Unknown size */ + _tprintf(_T("\r%I64u bytes downloaded"), This->Progress); + } +} + +static ULONG STDMETHODCALLTYPE +CBindStatusCallback_AddRef(IBindStatusCallback *iface) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + ULONG ret; + + ret = InterlockedIncrement((PLONG)&This->ref); + return ret; +} + +static ULONG STDMETHODCALLTYPE +CBindStatusCallback_Release(IBindStatusCallback *iface) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + ULONG ret; + + ret = InterlockedDecrement((PLONG)&This->ref); + if (ret == 0) + { + CBindStatusCallback_Destroy(This); + + HeapFree(GetProcessHeap(), + 0, + This); + } + + return ret; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_QueryInterface(IBindStatusCallback *iface, + REFIID iid, + PVOID *pvObject) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + + *pvObject = NULL; + + if (IsEqualIID(iid, + &IID_IBindStatusCallback) || + IsEqualIID(iid, + &IID_IUnknown)) + { + *pvObject = impl_to_interface(This, IBindStatusCallback); + } + else + return E_NOINTERFACE; + + CBindStatusCallback_AddRef(iface); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, + IBinding* pib) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_GetPriority(IBindStatusCallback *iface, + LONG* pnPriority) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnLowResource(IBindStatusCallback *iface, + DWORD reserved) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnProgress(IBindStatusCallback *iface, + ULONG ulProgress, + ULONG ulProgressMax, + ULONG ulStatusCode, + LPCWSTR szStatusText) +{ + CBindStatusCallback *This = interface_to_impl(iface, IBindStatusCallback); + + switch (ulStatusCode) + { + case BINDSTATUS_FINDINGRESOURCE: + if (!This->bResolving) + { + _tcscpy(This->szHostName, szStatusText); + This->bResolving = TRUE; + + _tprintf(_T("Resolving %s... "), This->szHostName); + } + break; + + case BINDSTATUS_CONNECTING: + This->bConnecting = TRUE; + This->bSendingReq = FALSE; + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + if (This->bResolving) + { + _tprintf(_T("done.\n")); + _tprintf(_T("Connecting to %s[%s]... "), This->szHostName, szStatusText); + } + else + _tprintf(_T("Connecting to %s... "), szStatusText); + break; + + case BINDSTATUS_REDIRECTING: + This->bResolving = FALSE; + This->bConnecting = FALSE; + This->bSendingReq = FALSE; + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + _tprintf(_T("Redirecting to %s... "), szStatusText); + break; + + case BINDSTATUS_SENDINGREQUEST: + This->bBeginTransfer = FALSE; + This->szMimeType[0] = _T('\0'); + if (This->bResolving || This->bConnecting) + _tprintf(_T("done.\n")); + + if (!This->bSendingReq) + _tprintf(_T("Sending request... ")); + + This->bSendingReq = TRUE; + break; + + case BINDSTATUS_MIMETYPEAVAILABLE: + _tcscpy(This->szMimeType, szStatusText); + break; + + case BINDSTATUS_BEGINDOWNLOADDATA: + This->Progress = (UINT64)ulProgress; + This->Size = (UINT64)ulProgressMax; + + if (This->bSendingReq) + _tprintf(_T("done.\n")); + + if (!This->bBeginTransfer && This->Size != 0) + { + if (This->szMimeType[0] != _T('\0')) + _tprintf(_T("Length: %I64u [%s]\n"), This->Size, This->szMimeType); + else + _tprintf(_T("Length: %ull\n"), This->Size); + } + + _tprintf(_T("\n")); + + This->bBeginTransfer = TRUE; + break; + + case BINDSTATUS_ENDDOWNLOADDATA: + _tprintf(_T("\rFile saved.\n")); + break; + + case BINDSTATUS_DOWNLOADINGDATA: + This->Progress = (UINT64)ulProgress; + This->Size = (UINT64)ulProgressMax; + + CBindStatusCallback_UpdateProgress(This); + break; + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnStopBinding(IBindStatusCallback *iface, + HRESULT hresult, + LPCWSTR szError) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, + BINDINFO* pbindinfo) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnDataAvailable(IBindStatusCallback *iface, + DWORD grfBSCF, + DWORD dwSize, + FORMATETC* pformatetc, + STGMEDIUM* pstgmed) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CBindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, + IUnknown* punk) +{ + return E_NOTIMPL; +} + +static const struct IBindStatusCallbackVtbl vtblIBindStatusCallback = +{ + CBindStatusCallback_QueryInterface, + CBindStatusCallback_AddRef, + CBindStatusCallback_Release, + CBindStatusCallback_OnStartBinding, + CBindStatusCallback_GetPriority, + CBindStatusCallback_OnLowResource, + CBindStatusCallback_OnProgress, + CBindStatusCallback_OnStopBinding, + CBindStatusCallback_GetBindInfo, + CBindStatusCallback_OnDataAvailable, + CBindStatusCallback_OnObjectAvailable, +}; + +static IBindStatusCallback * +CreateBindStatusCallback(void) +{ + CBindStatusCallback *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (This == NULL) + return NULL; + + ZeroMemory(This, sizeof(*This)); + + This->lpIBindStatusCallbackVtbl = &vtblIBindStatusCallback; + This->ref = 1; + + return impl_to_interface(This, IBindStatusCallback); +} + + // ToDo: Show status, get file name from webserver, better error reporting +static int +get_display_url(IN LPURL_COMPONENTS purl, + OUT TCHAR *szBuffer, + IN PDWORD pdwBufferSize) +{ + URL_COMPONENTS urlc; + + /* Hide the password */ + urlc = *purl; + urlc.lpszPassword = NULL; + urlc.dwPasswordLength = 0; + + if (!InternetCreateUrl(&urlc, ICU_ESCAPE, szBuffer, pdwBufferSize)) + return DWNL_E_LASTERROR; + + return 1; +} + +static int +download_file(IN LPCTSTR pszUrl, + IN LPCTSTR pszFile OPTIONAL) +{ + TCHAR szScheme[INTERNET_MAX_SCHEME_LENGTH + 1]; + TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + TCHAR szUserName[INTERNET_MAX_USER_NAME_LENGTH + 1]; + TCHAR szPassWord[INTERNET_MAX_PASSWORD_LENGTH + 1]; + TCHAR szUrlPath[INTERNET_MAX_PATH_LENGTH + 1]; + TCHAR szExtraInfo[INTERNET_MAX_PATH_LENGTH + 1]; + TCHAR szUrl[INTERNET_MAX_URL_LENGTH + 1]; + DWORD dwUrlLen; + LPTSTR pszFilePart; + URL_COMPONENTS urlc; + IBindStatusCallback *pbsc; + int iRet; + + if (pszFile != NULL && pszFile[0] == _T('\0')) + pszFile = NULL; + + urlc.dwStructSize = sizeof(urlc); + urlc.lpszScheme = szScheme; + urlc.dwSchemeLength = sizeof(szScheme) / sizeof(szScheme[0]); + urlc.lpszHostName = szHostName; + urlc.dwHostNameLength = sizeof(szHostName) / sizeof(szHostName[0]); + urlc.lpszUserName = szUserName; + urlc.dwUserNameLength = sizeof(szUserName) / sizeof(szUserName[0]); + urlc.lpszPassword = szPassWord; + urlc.dwPasswordLength = sizeof(szPassWord) / sizeof(szPassWord[0]); + urlc.lpszUrlPath = szUrlPath; + urlc.dwUrlPathLength = sizeof(szUrlPath) / sizeof(szUrlPath[0]); + urlc.lpszExtraInfo = szExtraInfo; + urlc.dwExtraInfoLength = sizeof(szExtraInfo) / sizeof(szExtraInfo[0]); + if (!InternetCrackUrl(pszUrl, _tcslen(pszUrl), ICU_ESCAPE, &urlc)) + return DWNL_E_LASTERROR; + + if (urlc.nScheme != INTERNET_SCHEME_FTP && + urlc.nScheme != INTERNET_SCHEME_GOPHER && + urlc.nScheme != INTERNET_SCHEME_HTTP && + urlc.nScheme != INTERNET_SCHEME_HTTPS) + { + return DWNL_E_UNSUPPORTEDSCHEME; + } + + if (urlc.nScheme == INTERNET_SCHEME_FTP && urlc.dwUserNameLength == 0 && urlc.dwPasswordLength == 0) + { + _tcscpy(szUserName, _T("anonymous")); + urlc.dwUserNameLength = _tcslen(szUserName); + } + + /* FIXME: Get file name from server */ + if (urlc.dwUrlPathLength == 0 && pszFile == NULL) + return DWNL_E_NEEDTARGETFILENAME; + + pszFilePart = _tcsrchr(szUrlPath, _T('/')); + if (pszFilePart != NULL) + pszFilePart++; + + if (pszFilePart == NULL && pszFile == NULL) + return DWNL_E_NEEDTARGETFILENAME; + + if (pszFile == NULL) + pszFile = pszFilePart; + + if (urlc.dwUserNameLength == 0) + urlc.lpszUserName = NULL; + + if (urlc.dwPasswordLength == 0) + urlc.lpszPassword = NULL; + + /* Generate the URL to be displayed (without a password) */ + dwUrlLen = sizeof(szUrl) / sizeof(szUrl[0]); + iRet = get_display_url(&urlc, szUrl, &dwUrlLen); + if (iRet <= 0) + return iRet; + + _tprintf(_T("Download `%s\'\n\t=> `%s\'\n"), szUrl, pszFile); + + /* Generate the URL to download */ + dwUrlLen = sizeof(szUrl) / sizeof(szUrl[0]); + if (!InternetCreateUrl(&urlc, ICU_ESCAPE, szUrl, &dwUrlLen)) + return DWNL_E_LASTERROR; + + pbsc = CreateBindStatusCallback(); + if (pbsc == NULL) + return DWNL_E_LASTERROR; + + if(!SUCCEEDED(URLDownloadToFile(NULL, szUrl, pszFile, 0, pbsc))) + { + IBindStatusCallback_Release(pbsc); + return DWNL_E_LASTERROR; /* FIXME */ + } + + IBindStatusCallback_Release(pbsc); + return 1; +} + +static int +print_err(int iErr) +{ + if (iErr == DWNL_E_LASTERROR) + { + if (GetLastError() == ERROR_SUCCESS) + { + /* File not found */ + _ftprintf(stderr, _T("\nERROR: Download failed.\n")); + } + else + { + /* Display last error code */ + _ftprintf(stderr, _T("\nERROR: %u\n"), GetLastError()); + } + } + else + { + switch (iErr) + { + case DWNL_E_NEEDTARGETFILENAME: + _ftprintf(stderr, _T("\nERROR: Cannot determine filename, please specify a destination file name.\n")); + break; + + case DWNL_E_UNSUPPORTEDSCHEME: + _ftprintf(stderr, _T("\nERROR: Unsupported protocol.\n")); + break; + } + } + + return 1; +} + int _tmain(int argc, TCHAR **argv) { - TCHAR* filename = argv[1]; - int i; - - if(argc != 2) - { - _tprintf(_T("Usage: dwnl <url>")); - return 2; - } - - for(i=_tcslen(filename);i>0 - &&filename[i]!=_T('/') - &&filename[i]!=_T('\\') - &&filename[i]!=_T('?') - &&filename[i]!=_T('*') - &&filename[i]!=_T(':') - &&filename[i]!=_T('\"') - &&filename[i]!=_T('<') - &&filename[i]!=_T('>') - &&filename[i]!=_T('|');i--); - filename = &argv[1][i+1]; - - _tprintf(_T("Downloading %s... "), filename); - - if(URLDownloadToFile(NULL, argv[1], filename, 0, NULL) != S_OK) - { - _tprintf(_T("Failed.\n")); - return 1; - } - - _tprintf(_T("Finished.\n")); - return 0; -} + int iErr, iRet = 0; + + if(argc != 2 && argc != 3) + { + _tprintf(_T("Usage: dwnl URL [DESTINATION]")); + return 2; + } + + iErr = download_file(argv[1], argc == 3 ? argv[2] : NULL); + if (iErr <= 0) + iRet = print_err(iErr); + + return iRet; +} Modified: trunk/reactos/base/applications/network/dwnl/dwnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.rbuild (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.rbuild Thu Oct 18 10:00:17 2007 @@ -4,6 +4,8 @@ <include base="dwnl">.</include> <library>kernel32</library> <library>urlmon</library> + <library>wininet</library> + <library>uuid</library> <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE">0x0600</define>

1 0

[mnordell] 29653: Patch from aicommander. Actually copy uniata.sys from the installation media, and disable VGA resolution selection as VGA is broken.
by mnordell＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: mnordell Date: Thu Oct 18 08:01:53 2007 New Revision: 29653 URL: http://svn.reactos.org/svn/reactos?rev=29653&view=rev Log: Patch from aicommander. Actually copy uniata.sys from the installation media, and disable VGA resolution selection as VGA is broken. Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Thu Oct 18 08:01:53 2007 @@ -32,6 +32,7 @@ ntfs.sys = 3 ntoskrnl.exe = 2 scsiport.sys = 3 +uniata.sys = 3 vfatfs.sys = 3 [Cabinets] @@ -69,7 +70,7 @@ [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp> -vga = "VGA Display (640x480x4)",,Vga,640,480,4 +;vga = "VGA Display (640x480x4)",,Vga,640,480,4 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32

1 0

[peterw] 29652: - Add dwnl.exe utility to the bootcd, patch by Cameron Gutman (aicommander).
by peterw＠svn.reactos.org 18 Oct '07

18 Oct '07

Author: peterw Date: Thu Oct 18 06:40:12 2007 New Revision: 29652 URL: http://svn.reactos.org/svn/reactos?rev=29652&view=rev Log: - Add dwnl.exe utility to the bootcd, patch by Cameron Gutman (aicommander). Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Oct 18 06:40:12 2007 @@ -45,6 +45,7 @@ base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\network\arp\arp.exe 1 +base\applications\network\dwnl\dwnl.exe 1 base\applications\network\route\route.exe 1 base\applications\network\finger\finger.exe 1 base\applications\network\ftp\ftp.exe 1

1 0

[hpoussin] 29651: Better resource freeing Fix a bug introduced in r29644, when WM_CREATE was sometimes leaking to WM_DESTROY
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 23:35:41 2007 New Revision: 29651 URL: http://svn.reactos.org/svn/reactos?rev=29651&view=rev Log: Better resource freeing Fix a bug introduced in r29644, when WM_CREATE was sometimes leaking to WM_DESTROY Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Oct 17 23:35:41 2007 @@ -220,20 +220,20 @@ } /* FIXME: Append variables of Session->Profile->pszEnvironment */ - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); - /* FIXME: UpdatePerUserSystemParameters(0, TRUE); */ + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); + UpdatePerUserSystemParameters(0, TRUE); + + /* Set default language */ + if (!SetDefaultLanguage(TRUE)) + { + WARN("WL: SetDefaultLanguage() failed\n"); + goto cleanup; + } /* Get privilege */ /* FIXME: who should do it? winlogon or gina? */ /* FIXME: reverting to lower privileges after creating user shell? */ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); - - /* Set default language */ - if (!SetDefaultLanguage(TRUE)) - { - WARN("WL: SetDefaultLanguage() failed\n"); - goto cleanup; - } if (!Session->Gina.Functions.WlxActivateUserShell( Session->Gina.Context, @@ -255,7 +255,11 @@ ret = TRUE; cleanup: - HeapFree(GetProcessHeap(), 0, Session->Profile); + if (Session->Profile) + { + HeapFree(GetProcessHeap(), 0, Session->Profile->pszProfile); + HeapFree(GetProcessHeap(), 0, Session->Profile); + } Session->Profile = NULL; if (!ret && ProfileInfo.hProfile != INVALID_HANDLE_VALUE) @@ -487,9 +491,9 @@ return STATUS_UNSUCCESSFUL; } - //UnloadUserProfile(Session->UserToken, Session->hProfileInfo); - //CloseHandle(Session->UserToken); - //UpdatePerUserSystemParameters(0, FALSE); + UnloadUserProfile(Session->UserToken, Session->hProfileInfo); + CloseHandle(Session->UserToken); + UpdatePerUserSystemParameters(0, FALSE); Session->LogonStatus = WKSTA_IS_LOGGED_OFF; Session->UserToken = NULL; return STATUS_SUCCESS; @@ -869,10 +873,9 @@ /* Save the Session pointer */ SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); - if (!GetSetupType()) - { - return RegisterHotKeys(Session, hwndDlg); - } + if (GetSetupType() == 0) + return TRUE; + return RegisterHotKeys(Session, hwndDlg); } case WM_DESTROY: {

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007