Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[tfaber] 63102: [NTOS:IO] - Don't bugcheck if quota allocation fails in IoAllocateIrp

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 2 09:17:36 2014 New Revision: 63102 URL: http://svn.reactos.org/svn/reactos?rev=63102&view=rev Log: [NTOS:IO] - Don't bugcheck if quota allocation fails in IoAllocateIrp Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri May 2 09:17:36 2014 @@ -591,16 +591,18 @@ /* Check if we should charge quota */ if (ChargeQuota) { - Irp = ExAllocatePoolWithQuotaTag(NonPagedPool, Size, TAG_IRP); + Irp = ExAllocatePoolWithQuotaTag(NonPagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + Size, + TAG_IRP); } else { - /* Allocate the IRP With no Quota charge */ + /* Allocate the IRP with no quota charge */ Irp = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_IRP); } /* Make sure it was sucessful */ - if (!Irp) return(NULL); + if (!Irp) return NULL; } else {

10 years, 7 months

[hbelusca] 63101: [MSGINA][SHELL32] - Resize the logon graphics logo to windows standard size: 413x72. - Use this very same logo for ShellAbout. Adapted from a proposition by Lee Schroeder. The rea...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 2 02:52:15 2014 New Revision: 63101 URL: http://svn.reactos.org/svn/reactos?rev=63101&view=rev Log: [MSGINA][SHELL32] - Resize the logon graphics logo to windows standard size: 413x72. - Use this very same logo for ShellAbout. Adapted from a proposition by Lee Schroeder. The real fix for this would be to do like Windows, that means, since (you can double-check) shell32 takes the picture from msgina.dll . CORE-7940 #resolve #comment Fixed, thanks ;) Added: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp - copied, changed from r63095, trunk/reactos/dll/win32/msgina/resources/reactos.bmp Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_r… Copied: trunk/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp (from r63095, trunk/reactos/dll/win32/msgina/resources/reactos.bmp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

10 years, 7 months

[aandrejevic] 63100: [BASESRV] Fix the previous fix. It's not necessary to use a different status value from the one that was returned.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 01:20:40 2014 New Revision: 63100 URL: http://svn.reactos.org/svn/reactos?rev=63100&view=rev Log: [BASESRV] Fix the previous fix. It's not necessary to use a different status value from the one that was returned. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Fri May 2 01:20:40 2014 @@ -902,11 +902,7 @@ } /* Make sure we found the console record */ - if (!NT_SUCCESS(Status)) - { - Status = STATUS_INVALID_PARAMETER; - goto Cleanup; - } + if (!NT_SUCCESS(Status)) goto Cleanup; /* Return the session ID */ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId;

10 years, 7 months

[aandrejevic] 63099: [BASESRV] Make sure that the console record exists before continuing.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri May 2 01:18:46 2014 New Revision: 63099 URL: http://svn.reactos.org/svn/reactos?rev=63099&view=rev Log: [BASESRV] Make sure that the console record exists before continuing. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Fri May 2 01:18:46 2014 @@ -901,6 +901,13 @@ &ConsoleRecord); } + /* Make sure we found the console record */ + if (!NT_SUCCESS(Status)) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + /* Return the session ID */ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId; GetNextVdmCommandRequest->WaitObjectForVDM = NULL;

10 years, 7 months

[aandrejevic] 63098: [BASESRV][KERNEL32][NTVDM] Make our BaseSrvGetNextVDMCommand and GetNextVDMCommand a bit more Windows-compatible, and modify NTVDM accordingly.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu May 1 23:52:36 2014 New Revision: 63098 URL: http://svn.reactos.org/svn/reactos?rev=63098&view=rev Log: [BASESRV][KERNEL32][NTVDM] Make our BaseSrvGetNextVDMCommand and GetNextVDMCommand a bit more Windows-compatible, and modify NTVDM accordingly. Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/include/reactos/subsys/win/vdm.h branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/vdm.c [iso-8859-1] Thu May 1 23:52:36 2014 @@ -1281,6 +1281,10 @@ BaseSetLastNTError(Status); goto Cleanup; } + + /* Set the retry flag and clear the exit code */ + GetNextVdmCommand->VDMState |= VDM_FLAG_RETRY; + GetNextVdmCommand->ExitCode = 0; } } while (GetNextVdmCommand->WaitObjectForVDM != NULL); Modified: branches/ntvdm/include/reactos/subsys/win/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… ============================================================================== --- branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] Thu May 1 23:52:36 2014 @@ -48,11 +48,22 @@ #define VDM_READY 0x04 // -// VDM Magic Values +// VDM Flags // +#define VDM_FLAG_FIRST_TASK 0x01 #define VDM_FLAG_WOW 0x02 +#define VDM_FLAG_DOS 0x04 +#define VDM_FLAG_RETRY 0x08 #define VDM_INC_REENTER_COUNT 0x10 #define VDM_DEC_REENTER_COUNT 0x20 +#define VDM_FLAG_NESTED_TASK 0x40 +#define VDM_FLAG_DONT_WAIT 0x80 +#define VDM_GET_FIRST_COMMAND 0x100 +#define VDM_GET_ENVIRONMENT 0x400 +#define VDM_FLAG_SEPARATE_WOW 0x800 +#define VDM_LIST_WOW_PROCESSES 0x1000 +#define VDM_LIST_WOW_TASKS 0x4000 +#define VDM_ADD_WOW_TASK 0x8000 typedef struct { Modified: branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos3… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu May 1 23:52:36 2014 @@ -1336,7 +1336,7 @@ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); /* Initialize the structure members */ - CommandInfo.VDMState = VDM_NOT_READY; + CommandInfo.VDMState = VDM_FLAG_NESTED_TASK | VDM_FLAG_DONT_WAIT; CommandInfo.CmdLine = CmdLine; CommandInfo.CmdLen = sizeof(CmdLine); CommandInfo.AppName = AppName; @@ -1399,6 +1399,7 @@ PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); + VDM_COMMAND_INFO CommandInfo; DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X\n", Psp, @@ -1443,6 +1444,22 @@ { CurrentPsp = PspBlock->ParentPsp; if (CurrentPsp == SYSTEM_PSP) VdmRunning = FALSE; + } + + // FIXME: This is probably not the best way to do it + /* Check if this was a nested DOS task */ + if (VdmRunning) + { + /* Decrement the re-entry count */ + CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + + /* Clear the structure */ + ZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Update the VDM state of the task */ + CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; + GetNextVDMCommand(&CommandInfo); } /* Save the return code - Normal termination */ Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Thu May 1 23:52:36 2014 @@ -390,6 +390,7 @@ DWORD WINAPI CommandThreadProc(LPVOID Parameter) { + BOOLEAN First = TRUE; DWORD Result; VDM_COMMAND_INFO CommandInfo; CHAR CmdLine[MAX_PATH]; @@ -407,7 +408,7 @@ ZeroMemory(&CommandInfo, sizeof(CommandInfo)); /* Initialize the structure members */ - CommandInfo.VDMState = VDM_NOT_LOADED; + CommandInfo.VDMState = VDM_FLAG_DOS; CommandInfo.CmdLine = CmdLine; CommandInfo.CmdLen = sizeof(CmdLine); CommandInfo.AppName = AppName; @@ -421,6 +422,12 @@ CommandInfo.Env = Env; CommandInfo.EnvLen = sizeof(Env); + if (First) + { + CommandInfo.VDMState |= VDM_FLAG_FIRST_TASK; + First = FALSE; + } + /* Wait for the next available VDM */ if (!GetNextVDMCommand(&CommandInfo)) break; Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Thu May 1 23:52:36 2014 @@ -905,21 +905,58 @@ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId; GetNextVdmCommandRequest->WaitObjectForVDM = NULL; - if (!(GetNextVdmCommandRequest->VDMState & VDM_NOT_READY)) - { + if (GetNextVdmCommandRequest->VDMState & VDM_GET_FIRST_COMMAND) + { + /* Check if the DOS record list is empty */ + if (ConsoleRecord->DosListHead.Flink == &ConsoleRecord->DosListHead) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + + /* Get the first DOS record */ + DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, VDM_DOS_RECORD, Entry); + + /* Make sure its command information is still there */ + if (DosRecord->CommandInfo == NULL) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + + /* Fill the command information */ + Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest); + goto Cleanup; + } + + /* Check if we should set the state of a running DOS record to ready */ + if (!(GetNextVdmCommandRequest->VDMState + & (VDM_FLAG_FIRST_TASK | VDM_FLAG_RETRY | VDM_FLAG_NESTED_TASK))) + { + /* Search for a DOS record that is currently running */ for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) { DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); - if (DosRecord->State == VDM_NOT_READY) - { - /* If NTVDM is asking for a new command, it means these are done */ - DosRecord->State = VDM_READY; - - NtSetEvent(DosRecord->ServerEvent, NULL); - NtClose(DosRecord->ServerEvent); - DosRecord->ServerEvent = NULL; - } - } + if (DosRecord->State == VDM_NOT_READY) break; + } + + /* Check if we found any */ + if (i == &ConsoleRecord->DosListHead) + { + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; + } + + /* Set the exit code */ + DosRecord->ExitCode = GetNextVdmCommandRequest->ExitCode; + + /* Update the VDM state */ + DosRecord->State = VDM_READY; + + /* Notify all waiting threads that the task is finished */ + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + DosRecord->ServerEvent = NULL; } /* Search for a DOS record that isn't loaded yet */ @@ -931,16 +968,40 @@ if (i != &ConsoleRecord->DosListHead) { - /* Fill the command information */ - Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest); - if (!NT_SUCCESS(Status)) goto Cleanup; - - /* Free the command information, it's no longer needed */ - BaseSrvFreeVDMInfo(DosRecord->CommandInfo); - DosRecord->CommandInfo = NULL; - - /* Update the VDM state */ - DosRecord->State = VDM_NOT_READY; + /* DOS tasks which haven't been loaded yet should have a command info structure */ + ASSERT(DosRecord->CommandInfo != NULL); + + /* Check if the caller only wants environment data */ + if (GetNextVdmCommandRequest->VDMState & VDM_GET_ENVIRONMENT) + { + if (GetNextVdmCommandRequest->EnvLen < DosRecord->CommandInfo->EnvLen) + { + /* Not enough space was reserved */ + GetNextVdmCommandRequest->EnvLen = DosRecord->CommandInfo->EnvLen; + Status = STATUS_BUFFER_OVERFLOW; + goto Cleanup; + } + + /* Copy the environment data */ + RtlMoveMemory(GetNextVdmCommandRequest->Env, + DosRecord->CommandInfo->Env, + DosRecord->CommandInfo->EnvLen); + + /* Return the actual size to the caller */ + GetNextVdmCommandRequest->EnvLen = DosRecord->CommandInfo->EnvLen; + } + else + { + /* Fill the command information */ + Status = BaseSrvFillCommandInfo(DosRecord->CommandInfo, GetNextVdmCommandRequest); + + /* Free the command information, it's no longer needed */ + BaseSrvFreeVDMInfo(DosRecord->CommandInfo); + DosRecord->CommandInfo = NULL; + + /* Update the VDM state */ + GetNextVdmCommandRequest->VDMState = DosRecord->State = VDM_NOT_READY; + } Status = STATUS_SUCCESS; goto Cleanup; @@ -954,21 +1015,25 @@ } /* There is no command yet */ - if (ConsoleRecord->ServerEvent) - { - /* Reset the event */ - NtResetEvent(ConsoleRecord->ServerEvent, NULL); - } - else - { - /* Create a pair of wait handles */ - Status = BaseSrvCreatePairWaitHandles(&ConsoleRecord->ServerEvent, - &ConsoleRecord->ClientEvent); - if (!NT_SUCCESS(Status)) goto Cleanup; - } - - /* Return the client event handle */ - GetNextVdmCommandRequest->WaitObjectForVDM = ConsoleRecord->ClientEvent; + if ((GetNextVdmCommandRequest->VDMState & (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY)) + != (VDM_FLAG_DONT_WAIT | VDM_FLAG_RETRY)) + { + if (ConsoleRecord->ServerEvent) + { + /* Reset the event */ + NtResetEvent(ConsoleRecord->ServerEvent, NULL); + } + else + { + /* Create a pair of wait handles */ + Status = BaseSrvCreatePairWaitHandles(&ConsoleRecord->ServerEvent, + &ConsoleRecord->ClientEvent); + if (!NT_SUCCESS(Status)) goto Cleanup; + } + + /* Return the client event handle */ + GetNextVdmCommandRequest->WaitObjectForVDM = ConsoleRecord->ClientEvent; + } Cleanup: /* Leave the critical section */

10 years, 7 months

[tfaber] 63097: [QMGR][BOOTDATA] - Properly register qmgr classes and create the BITS service. See https://source.winehq.org/git/wine.git/commitdiff/c1fce745 CORE-8135 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 1 19:50:37 2014 New Revision: 63097 URL: http://svn.reactos.org/svn/reactos?rev=63097&view=rev Log: [QMGR][BOOTDATA] - Properly register qmgr classes and create the BITS service. See https://source.winehq.org/git/wine.git/commitdiff/c1fce745 CORE-8135 #resolve Added: trunk/reactos/dll/win32/qmgr/qmgr.rgs (with props) Removed: trunk/reactos/dll/win32/qmgr/qmgr.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/qmgr/CMakeLists.txt trunk/reactos/dll/win32/qmgr/qmgr_main.c trunk/reactos/dll/win32/qmgr/rsrc.rc Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Thu May 1 19:50:37 2014 @@ -1342,7 +1342,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"DHCP" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost", "netsvcs",0x00010000,"DHCP","BITS" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu May 1 19:50:37 2014 @@ -1304,6 +1304,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 +; Background Intelligent Transfer Service (BITS) +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,"BITS" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Description",0x00000000,"Background Intelligent Transfer Service (BITS)" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\qmgr.dll" + ; BlueScreen device driver HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Group",0x00000000,"Video Init" @@ -1392,13 +1402,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; Kernel-Mode Tests -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Thu May 1 19:50:37 2014 @@ -21,7 +21,7 @@ rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.rgs) add_idl_headers(qmgr_idlheader qmgr_local.idl) set_module_type(qmgr win32dll) target_link_libraries(qmgr uuid wine) Removed: trunk/reactos/dll/win32/qmgr/qmgr.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.inf?re… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr.inf (removed) @@ -1,16 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg = Qmgr.Reg - -[UnregisterDll] -DelReg = Qmgr.Reg - -[Qmgr.Reg] -HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%" -HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" -HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" - -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010008,"BITS" -HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll" Added: trunk/reactos/dll/win32/qmgr/qmgr.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr.rgs?re… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr.rgs (added) +++ trunk/reactos/dll/win32/qmgr/qmgr.rgs [iso-8859-1] Thu May 1 19:50:37 2014 @@ -0,0 +1,15 @@ +HKCR +{ + NoRemove AppID + { + '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' { val LocalService = s 'BITS' } + BITS { val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' } + } + NoRemove CLSID + { + '{4991D34B-80A1-4291-83B6-3328366B9097}' + { + val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' + } + } +} Propchange: trunk/reactos/dll/win32/qmgr/qmgr.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/qmgr/qmgr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/qmgr_main.c… ============================================================================== --- trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/qmgr_main.c [iso-8859-1] Thu May 1 19:50:37 2014 @@ -29,13 +29,11 @@ #include <winreg.h> #include <advpub.h> #include <olectl.h> +#include <rpcproxy.h> #include <initguid.h> /* Handle to the base address of this DLL */ static HINSTANCE hInst; - -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -55,81 +53,12 @@ return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); } Modified: trunk/reactos/dll/win32/qmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/qmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgr/rsrc.rc [iso-8859-1] Thu May 1 19:50:37 2014 @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: qmgr.inf */ -REGINST REGINST qmgr.inf +/* @makedep: qmgr.rgs */ +1 WINE_REGISTRY qmgr.rgs

10 years, 7 months

[tfaber] 63096: [USP10] - Fix buffer overflow in _ItemizeInternal CORE-8133 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 1 19:44:30 2014 New Revision: 63096 URL: http://svn.reactos.org/svn/reactos?rev=63096&view=rev Log: [USP10] - Fix buffer overflow in _ItemizeInternal CORE-8133 #resolve Modified: trunk/reactos/dll/win32/usp10/usp10.c Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu May 1 19:44:30 2014 @@ -1605,12 +1605,12 @@ * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */

10 years, 7 months

[hbelusca] 63095: [WINVER]: Remove wine'isms and add a resource file.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 1 17:49:23 2014 New Revision: 63095 URL: http://svn.reactos.org/svn/reactos?rev=63095&view=rev Log: [WINVER]: Remove wine'isms and add a resource file. Added: trunk/reactos/base/applications/winver/winver.rc (with props) Modified: trunk/reactos/base/applications/winver/CMakeLists.txt trunk/reactos/base/applications/winver/winver.c Modified: trunk/reactos/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/C… ============================================================================== --- trunk/reactos/base/applications/winver/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winver/CMakeLists.txt [iso-8859-1] Thu May 1 17:49:23 2014 @@ -1,6 +1,5 @@ - -add_executable(winver winver.c) +add_executable(winver winver.c winver.rc) set_module_type(winver win32gui UNICODE) add_importlibs(winver shell32 msvcrt kernel32) add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/w… ============================================================================== --- trunk/reactos/base/applications/winver/winver.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winver/winver.c [iso-8859-1] Thu May 1 17:49:23 2014 @@ -1,3 +1,9 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Version Program + * FILE: winver.c + */ + #include <stdarg.h> #include <windef.h> #include <winbase.h> @@ -5,11 +11,10 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) { - static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 }; - UNREFERENCED_PARAMETER(lpCmdLine); - UNREFERENCED_PARAMETER(nCmdShow); - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(hInstance); - ShellAboutW(0, szROS, 0, 0); - return 1; + UNREFERENCED_PARAMETER(hInstance); + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); + + return ShellAboutW(NULL, L"ReactOS", NULL, NULL); } Added: trunk/reactos/base/applications/winver/winver.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/w… ============================================================================== --- trunk/reactos/base/applications/winver/winver.rc (added) +++ trunk/reactos/base/applications/winver/winver.rc [iso-8859-1] Thu May 1 17:49:23 2014 @@ -0,0 +1,5 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Version Program" +#define REACTOS_STR_INTERNAL_NAME "winver" +#define REACTOS_STR_ORIGINAL_FILENAME "winver.exe" +#include <reactos/version.rc> Propchange: trunk/reactos/base/applications/winver/winver.rc ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 7 months

[tkreuzer] 63094: [FORMATTING] No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 1 13:37:08 2014 New Revision: 63094 URL: http://svn.reactos.org/svn/reactos?rev=63094&view=rev Log: [FORMATTING] No code change Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r…

10 years, 7 months

[tkreuzer] 63093: [WIN32K] Fix possible NULL pointer dereference in GreSetStretchBltMode. CID 1206825

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 1 10:51:19 2014 New Revision: 63093 URL: http://svn.reactos.org/svn/reactos?rev=63093&view=rev Log: [WIN32K] Fix possible NULL pointer dereference in GreSetStretchBltMode. CID 1206825 Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Thu May 1 10:51:19 2014 @@ -236,8 +236,8 @@ if ((iStretchMode <= 0) || (iStretchMode > MAXSTRETCHBLTMODE)) iStretchMode = WHITEONBLACK; pdcattr->jStretchBltMode = iStretchMode; - } - DC_UnlockDc(pdc); + DC_UnlockDc(pdc); + } return oSMode; }

10 years, 7 months

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 May 2014