Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31692: - Fix a typo, spotted by Johannes Anderwald.
by fireball＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: fireball Date: Thu Jan 10 01:03:42 2008 New Revision: 31692 URL: http://svn.reactos.org/svn/reactos?rev=31692&view=rev Log: - Fix a typo, spotted by Johannes Anderwald. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Thu Jan 10 01:03:42 2008 @@ -419,7 +419,7 @@ } /* In both cases, we do have a timeout */ - WaitPipeInfo->TimeoutSpecified = FALSE; + WaitPipeInfo->TimeoutSpecified = TRUE; } /* Set the length and copy the name */ @@ -520,7 +520,7 @@ } /* In both cases, we do have a timeout */ - WaitPipe.TimeoutSpecified = FALSE; + WaitPipe.TimeoutSpecified = TRUE; } Status = NtFsControlFile(FileHandle,

1 0

[fireball] 31691: - Make WaitNamedPipe (copied from the new implementation #ifdef USING_PROPER_NPFS_WAIT_SEMANTICS) and corresponding part in npfs.sys actually respect the timeout.
by fireball＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: fireball Date: Wed Jan 9 23:38:52 2008 New Revision: 31691 URL: http://svn.reactos.org/svn/reactos?rev=31691&view=rev Log: - Make WaitNamedPipe (copied from the new implementation #ifdef USING_PROPER_NPFS_WAIT_SEMANTICS) and corresponding part in npfs.sys actually respect the timeout. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Wed Jan 9 23:38:52 2008 @@ -498,7 +498,30 @@ return FALSE; } - WaitPipe.Timeout.QuadPart = nTimeOut * -10000LL; + /* Check what timeout we got */ + if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) + { + /* Don't use a timeout */ + WaitPipe.TimeoutSpecified = FALSE; + } + else + { + /* Check if we should wait forever */ + if (nTimeOut == NMPWAIT_WAIT_FOREVER) + { + /* Set the max */ + WaitPipe.Timeout.LowPart = 0; + WaitPipe.Timeout.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + WaitPipe.Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); + } + + /* In both cases, we do have a timeout */ + WaitPipe.TimeoutSpecified = FALSE; + } Status = NtFsControlFile(FileHandle, NULL, Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c Wed Jan 9 23:38:52 2008 @@ -289,6 +289,7 @@ PNPFS_CCB ServerCcb; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; NTSTATUS Status; + LARGE_INTEGER TimeOut; DPRINT("NpfsWaitPipe\n"); @@ -320,12 +321,20 @@ current_entry = current_entry->Flink; } - /* no listening server fcb found -- wait for one */ + /* No listening server fcb found */ + + /* If no timeout specified, use the default one */ + if (WaitPipe->TimeoutSpecified) + TimeOut = WaitPipe->Timeout; + else + TimeOut = Fcb->TimeOut; + + /* Wait for one */ Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, KernelMode, FALSE, - &WaitPipe->Timeout); + &TimeOut); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status);

1 0

[cfinck] 31690: If W32kGetDefaultKeyLayout() is called before a user logged on, fall back to the layout set in HKU\.DEFAULT instead of falling back to US English. This enables the layout set in 1st stage setup also in 2nd stage setup and half-fixes bug 2952. (win32csr will only use the HKU\.DEFAULT setting as it's loaded before a user logged on. Currently, we don't change the keyboard layout for win32csr, when a user logs on).
by cfinck＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: cfinck Date: Wed Jan 9 20:46:36 2008 New Revision: 31690 URL: http://svn.reactos.org/svn/reactos?rev=31690&view=rev Log: If W32kGetDefaultKeyLayout() is called before a user logged on, fall back to the layout set in HKU\.DEFAULT instead of falling back to US English. This enables the layout set in 1st stage setup also in 2nd stage setup and half-fixes bug 2952. (win32csr will only use the HKU\.DEFAULT setting as it's loaded before a user logged on. Currently, we don't change the keyboard layout for win32csr, when a user logs on). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Jan 9 20:46:36 2008 @@ -272,6 +272,7 @@ PKBL W32kGetDefaultKeyLayout(VOID) { const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; + const WCHAR szDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; HANDLE KeyHandle; LCID LayoutLocaleId = 0; @@ -290,41 +291,42 @@ if( NT_SUCCESS(Status) ) { // FIXME: Is this 100% correct? - // We're called very early, so \\REGISTRY\\USER might not be available yet. Check this first. + // We're called very early, so HKEY_CURRENT_USER might not be available yet. Check this first. InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); if(Status == STATUS_OBJECT_NAME_NOT_FOUND) { - // Fall back to US English without any debug message - LayoutLocaleId = 0x409; + // It is not available, so read it from HKEY_USERS\.DEFAULT + RtlCopyMemory(wszBuffer, szDefaultUserPath, sizeof(szDefaultUserPath)); } else { - // The path is available, so build the full path to HKEY_CURRENT_USER\Keyboard Layout\Preload + // The path is available ZwClose(KeyHandle); - RtlCopyMemory(wszBuffer, CurrentUserPath.Buffer, CurrentUserPath.MaximumLength); - RtlInitUnicodeString(&FullKeyboardLayoutPath, wszBuffer); - FullKeyboardLayoutPath.MaximumLength = MAX_PATH; - - Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + } + + // Build the full path + RtlInitUnicodeString(&FullKeyboardLayoutPath, wszBuffer); + FullKeyboardLayoutPath.MaximumLength = MAX_PATH; + + Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + + if( NT_SUCCESS(Status) ) + { + // Return the first keyboard layout listed there + RtlInitUnicodeString(&LayoutValueName, L"1"); + + Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); if( NT_SUCCESS(Status) ) - { - // Return the first keyboard layout listed there - RtlInitUnicodeString(&LayoutValueName, L"1"); - - Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); - - if( NT_SUCCESS(Status) ) - RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); - else - DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); - } + RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); else - DPRINT1("RtlAppendUnicodeToString failed! (%08lx)\n", Status); - } + DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); + } + else + DPRINT1("RtlAppendUnicodeToString failed! (%08lx)\n", Status); RtlFreeUnicodeString(&CurrentUserPath); }

1 0

[gedmurphy] 31689: add a temp debug output whilst we're still walking on egg shells
by gedmurphy＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: gedmurphy Date: Wed Jan 9 19:44:39 2008 New Revision: 31689 URL: http://svn.reactos.org/svn/reactos?rev=31689&view=rev Log: add a temp debug output whilst we're still walking on egg shells Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Jan 9 19:44:39 2008 @@ -247,6 +247,8 @@ { return hIcon; } + else + FIXME("Didn't find the shared icon!!\n"); } hResource = LoadResource(hinst, hResInfo);

1 0

[gedmurphy] 31688: forgot to remove the assert
by gedmurphy＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: gedmurphy Date: Wed Jan 9 19:07:48 2008 New Revision: 31688 URL: http://svn.reactos.org/svn/reactos?rev=31688&view=rev Log: forgot to remove the assert Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Wed Jan 9 19:07:48 2008 @@ -108,8 +108,6 @@ } DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); - - ASSERT(FALSE); //#endif return NULL; #if 0

1 0

[gedmurphy] 31687: - Fall back onto some of the previous win32k icon handling code, and fix user32 to suit. - This fixes the handle problem we were seeing which was caused by a failing NtUserFindExistingCursorIcon call in user32. It was incompatible with the new code and thus, creating a new icon for all LR_SHARED resources. - The new code is correct, and will be re-enabled once I've finished the cursoricon object rewrite (which will make it compatible with windows) - You'll probably need to 'ma
by gedmurphy＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: gedmurphy Date: Wed Jan 9 19:04:34 2008 New Revision: 31687 URL: http://svn.reactos.org/svn/reactos?rev=31687&view=rev Log: - Fall back onto some of the previous win32k icon handling code, and fix user32 to suit. - This fixes the handle problem we were seeing which was caused by a failing NtUserFindExistingCursorIcon call in user32. It was incompatible with the new code and thus, creating a new icon for all LR_SHARED resources. - The new code is correct, and will be re-enabled once I've finished the cursoricon object rewrite (which will make it compatible with windows) - You'll probably need to 'make win32k_clean' before building Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Jan 9 19:04:34 2008 @@ -268,7 +268,7 @@ if (hIcon && 0 != (fuLoad & LR_SHARED)) { -#if 0 +#if 1 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); #else @@ -762,7 +762,7 @@ return pbi->bmiHeader.biBitCount; } - +#if 0 static BOOL SetCursorIconData( HANDLE Handle, @@ -770,6 +770,7 @@ LPWSTR lpResName, PICONINFO pIconInfo) { + UNICODE_STRING Res; if (!Handle || !pIconInfo) @@ -778,6 +779,7 @@ RtlInitUnicodeString(&Res, lpResName); return NtUserSetCursorIconData(Handle, hMod, &Res, pIconInfo); + } @@ -840,7 +842,7 @@ return hNewIcon; } - +#endif /* * @unimplemented @@ -873,7 +875,8 @@ return CopyBmp(hnd, type, desiredx, desiredy, flags); case IMAGE_ICON: - return CopyIcoCur(hnd, type, desiredx, desiredy, flags); + //return CopyIcoCur(hnd, type, desiredx, desiredy, flags); + return CopyIcon(hnd); case IMAGE_CURSOR: { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Jan 9 19:04:34 2008 @@ -2067,9 +2067,11 @@ NTAPI NtUserSetCursorIconData( HANDLE Handle, + PBOOL fIcon, + POINT *Hotspot, HMODULE hModule, - PUNICODE_STRING pstrResName, - PICONINFO pIconInfo); + HRSRC hRsrc, + HRSRC hGroupRsrc); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Wed Jan 9 19:04:34 2008 @@ -1187,6 +1187,7 @@ /* * @implemented */ +#if 0 BOOL NTAPI NtUserSetCursorIconData( @@ -1272,7 +1273,89 @@ UserLeave(); END_CLEANUP; } - +#else +BOOL +STDCALL +NtUserSetCursorIconData( + HANDLE hCurIcon, + PBOOL fIcon, + POINT *Hotspot, + HMODULE hModule, + HRSRC hRsrc, + HRSRC hGroupRsrc) +{ + PCURICON_OBJECT CurIcon; + PWINSTATION_OBJECT WinSta; + NTSTATUS Status; + POINT SafeHotspot; + BOOL Ret = FALSE; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserSetCursorIconData\n"); + UserEnterExclusive(); + + WinSta = IntGetWinStaObj(); + if(WinSta == NULL) + { + RETURN( FALSE); + } + + if(!(CurIcon = UserGetCurIconObject(hCurIcon))) + { + ObDereferenceObject(WinSta); + RETURN(FALSE); + } + + CurIcon->hModule = hModule; + CurIcon->hRsrc = hRsrc; + CurIcon->hGroupRsrc = hGroupRsrc; + + /* Copy fields */ + if(fIcon) + { + Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + goto done; + } + } + else + { + if(!Hotspot) + Ret = TRUE; + } + + if(Hotspot) + { + Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); + if(NT_SUCCESS(Status)) + { + CurIcon->IconInfo.xHotspot = SafeHotspot.x; + CurIcon->IconInfo.yHotspot = SafeHotspot.y; + + Ret = TRUE; + } + else + SetLastNtError(Status); + } + + if(!fIcon && !Hotspot) + { + Ret = TRUE; + } + +done: + ObDereferenceObject(WinSta); + RETURN( Ret); + + +CLEANUP: + DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} +#endif /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c Wed Jan 9 19:04:34 2008 @@ -108,6 +108,8 @@ } DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d\n", iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor ); + + ASSERT(FALSE); //#endif return NULL; #if 0 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 19:04:34 2008 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 4 +NtUserSetCursorIconData 6 #4 NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5

1 0

[cwittich] 31686: add Internet Explorer registry entries (now Visio 2003 installer doesn't complain about missing IE anymore)
by cwittich＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: cwittich Date: Wed Jan 9 17:21:39 2008 New Revision: 31686 URL: http://svn.reactos.org/svn/reactos?rev=31686&view=rev Log: add Internet Explorer registry entries (now Visio 2003 installer doesn't complain about missing IE anymore) Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Wed Jan 9 17:21:39 2008 @@ -190,7 +190,7 @@ HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" -System-Files +; System-Files HKCR,".sys","",0x00000000,"sysfile" HKCR,"sysfile","",0x00000000,"System File" HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" @@ -666,4 +666,107 @@ HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}",,,"Internet Explorer(Ver 1.0)" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\LocalServer32",,,"iexplore.exe" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\ProgID",,,"InternetExplorer.Application.1" +HKCR,"CLSID\{FBF23B42-E3F0-101B-8488-00AA003E56F8}\VersionIndependentProgID",,,"InternetExplorer.Application" +HKCR,"InternetExplorer.Application",,,"Internet Explorer(Ver 1.0)" +HKCR,"InternetExplorer.Application\CLSID",,,"{FBF23B42-E3F0-101B-8488-00AA003E56F8}" +HKCR,"InternetExplorer.Application\CurVer",,,"InternetExplorer.Application.1" +HKCR,"InternetExplorer.Application.1",,,"Internet Explorer(Ver 1.0)" +HKCR,"InternetExplorer.Application.1\CLSID",,,"{FBF23B42-E3F0-101B-8488-00AA003E56F8}" + +;HKCR,"CLSID\%CLSID_SearchAssistantOC%",,,"SearchAssistantOC" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\ProgID",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"CLSID\%CLSID_SearchAssistantOC%\VersionIndependentProgID",,,"SearchAssistantOC.SearchAssistantOC" +;HKCR,"SearchAssistantOC.SearchAssistantOC",,,"" +;HKCR,"SearchAssistantOC.SearchAssistantOC\CLSID",,,"%CLSID_SearchAssistantOC%" +;HKCR,"SearchAssistantOC.SearchAssistantOC\CurVer",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"SearchAssistantOC.SearchAssistantOC.1",,,"" +;HKCR,"SearchAssistantOC.SearchAssistantOC.1\CLSID",,,"%CLSID_SearchAssistantOC%" + +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}",,,"Shell Name Space" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\ProgID",,,"ShellNameSpace.ShellNameSpace.1" +HKCR,"CLSID\{55136805-B2DE-11D1-B9F2-00A0C98BC547}\VersionIndependentProgID",,,"ShellNameSpace.ShellNameSpace" + +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}",,,"Microsoft Url History Service" +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{3C374A40-BAE4-11CF-BF7D-00AA006946EE}\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_MruLongList%",,,"MruLongList" +;HKCR,"CLSID\%CLSID_MruLongList%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_MruLongList%\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%",,,"Shell Name Space" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\ProgID",,,"ShellNameSpace.ShellNameSpace.1" +;HKCR,"CLSID\%CLSID_ShellShellNameSpace%\VersionIndependentProgID",,,"ShellNameSpace.ShellNameSpace" + +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}",,,"Microsoft Shell UI Helper" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}\ProgID",,,"Shell.UIHelper.1" +HKCR,"Shell.UIHelper",,,"Microsoft Shell UI Helper" +HKCR,"Shell.UIHelper\CLSID",,,"{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}" +HKCR,"Shell.UIHelper\CurVer",,,"Shell.UIHelper.2" +HKCR,"Shell.UIHelper.1",,,"" +HKCR,"Shell.UIHelper.1\CLSID",,,"{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}" + +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}",,,"Internet Explorer" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{871C5380-42A0-1069-A2EA-08002B30309D}\ShellFolder",,2,"0x24" + +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}",,,"Microsoft Web Browser" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\ProgID",,,"Shell.Explorer.2" +HKCR,"CLSID\{8856F961-340A-11D0-A96B-00C04FD705A2}\VersionIndependentProgID",,,"Shell.Explorer" +HKCR,"Shell.Explorer",,,"Microsoft Web Browser" +HKCR,"Shell.Explorer\CLSID",,,"{8856F961-340A-11D0-A96B-00C04FD705A2}" +HKCR,"Shell.Explorer\CurVer",,,"Shell.Explorer.2" +HKCR,"Shell.Explorer.2",,,"" +HKCR,"Shell.Explorer.2\CLSID",,,"{8856F961-340A-11D0-A96B-00C04FD705A2}" + +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}",,,"ShellWindows" +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{9BA05972-F6A8-11CF-A442-00A0C90A8F39}\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%",,,"Microsoft Browser Architecture" +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_MicrosoftBrowserArchitecture%\InProcServer32","ThreadingModel",,"Apartment" + +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%",,,"SearchAssistantOC" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\InProcServer32",,,"shdocvw.dll" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\InProcServer32","ThreadingModel",,"Apartment" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\ProgID",,,"SearchAssistantOC.SearchAssistantOC.1" +;HKCR,"CLSID\%CLSID_ShellSearchAssistantOC%\VersionIndependentProgID",,,"SearchAssistantOC.SearchAssistantOC" + +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}",,,"Microsoft Web Browser Version 1" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\ProgID",,,"Shell.Explorer.1" +HKCR,"CLSID\{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}\VersionIndependentProgID",,,"Shell.Explorer" +HKCR,"Shell.Explorer.1",,,"" +HKCR,"Shell.Explorer.1\CLSID",,,"{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B0}" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}",,,"Internet Shortcut" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\InProcServer32",,,"shdocvw.dll" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\InProcServer32","ThreadingModel",,"Apartment" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\ProgID",,,"InternetShortcut" +HKCR,"CLSID\{FBF23B40-E3F0-101B-8488-00AA003E56F8}\shellex\MayChangeDefaultMenu",,, +HKCR,"InternetShortcut",,,"Internet Shortcut" +HKCR,"InternetShortcut","EditFlags",2,"2" +HKCR,"InternetShortcut","IsShortcut",, +HKCR,"InternetShortcut","NeverShowExt",, +;HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" +HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" +HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" +HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\"" +HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML \"%1\" \"%2\" \"%3\" \"%4\"" + ; EOF Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Wed Jan 9 17:21:39 2008 @@ -122,4 +122,10 @@ 75,00,20,00,53,00,61,00,6e,00,73,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +; Internet Explorer + +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",,"http://www.reactos.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.google.com" + + ; EOF 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 (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Wed Jan 9 17:21:39 2008 @@ -2,6 +2,9 @@ Signature="$ReactOS$ [AddReg] + +; Internet Explorer +HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180" ; DirectX HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904"

1 0

[gedmurphy] 31685: sorry, I deleted the wrong entry
by gedmurphy＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: gedmurphy Date: Wed Jan 9 17:03:13 2008 New Revision: 31685 URL: http://svn.reactos.org/svn/reactos?rev=31685&view=rev Log: sorry, I deleted the wrong entry Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 17:03:13 2008 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 6 +NtUserSetCursorIconData 4 NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5

1 0

[cwittich] 31684: add missing forwarders
by cwittich＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: cwittich Date: Wed Jan 9 15:59:36 2008 New Revision: 31684 URL: http://svn.reactos.org/svn/reactos?rev=31684&view=rev Log: add missing forwarders Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Wed Jan 9 15:59:36 2008 @@ -19,12 +19,12 @@ ; LIBRARY CFGMGR32.DLL EXPORTS -CMP_Init_Detection = SETUPAPI.CMP_Init_Detection -;CMP_RegisterNotification -CMP_Report_LogOn = SETUPAPI.CMP_Report_LogOn -;CMP_UnregisterNotification -;CMP_WaitNoPendingInstallEvents -;CMP_WaitServices +CMP_Init_Detection=SETUPAPI.CMP_Init_Detection +CMP_RegisterNotification=SETUPAPI.CMP_RegisterNotification +CMP_Report_LogOn=SETUPAPI.CMP_Report_LogOn +CMP_UnregisterNotification=SETUPAPI.CMP_UnregisterNotification +CMP_WaitNoPendingInstallEvents=SETUPAPI.CMP_WaitNoPendingInstallEvents +CMP_WaitServicesAvailable=SETUPAPI.CMP_WaitServicesAvailable CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA @@ -35,27 +35,27 @@ CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -;CM_Add_Range -;CM_Add_Res_Des -;CM_Add_Res_Des_Ex +CM_Add_Range=SETUPAPI.CM_Add_Range +CM_Add_Res_Des=SETUPAPI.CM_Add_Res_Des +CM_Add_Res_Des_Ex=SETUPAPI.CM_Add_Res_Des_Ex CM_Connect_MachineA=SETUPAPI.CM_Connect_MachineA CM_Connect_MachineW=SETUPAPI.CM_Connect_MachineW CM_Create_DevNodeA=SETUPAPI.CM_Create_DevNodeA CM_Create_DevNodeW=SETUPAPI.CM_Create_DevNodeW CM_Create_DevNode_ExA=SETUPAPI.CM_Create_DevNode_ExA CM_Create_DevNode_ExW=SETUPAPI.CM_Create_DevNode_ExW -;CM_Create_Range_List +CM_Create_Range_List=SETUPAPI.CM_Create_Range_List CM_Delete_Class_Key=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key_Ex=SETUPAPI.CM_Delete_Class_Key_Ex CM_Delete_DevNode_Key=SETUPAPI.CM_Delete_DevNode_Key CM_Delete_DevNode_Key_Ex=SETUPAPI.CM_Delete_DevNode_Key_Ex -;CM_Delete_Range -;CM_Detect_Resource_Conflict -;CM_Detect_Resource_Conflict_Ex +CM_Delete_Range=SETUPAPI.CM_Delete_Range +CM_Detect_Resource_Conflict=SETUPAPI.CM_Detect_Resource_Conflict +CM_Detect_Resource_Conflict_Ex=SETUPAPI.CM_Detect_Resource_Conflict_Ex CM_Disable_DevNode=SETUPAPI.CM_Disable_DevNode CM_Disable_DevNode_Ex=SETUPAPI.CM_Disable_DevNode_Ex CM_Disconnect_Machine=SETUPAPI.CM_Disconnect_Machine -;CM_Dup_Range_List +CM_Dup_Range_List=SETUPAPI.CM_Dup_Range_List CM_Enable_DevNode=SETUPAPI.CM_Enable_DevNode CM_Enable_DevNode_Ex=SETUPAPI.CM_Enable_DevNode_Ex CM_Enumerate_Classes=SETUPAPI.CM_Enumerate_Classes @@ -64,17 +64,17 @@ CM_Enumerate_EnumeratorsW=SETUPAPI.CM_Enumerate_EnumeratorsW CM_Enumerate_Enumerators_ExA=SETUPAPI.CM_Enumerate_Enumerators_ExA CM_Enumerate_Enumerators_ExW=SETUPAPI.CM_Enumerate_Enumerators_ExW -;CM_Find_Range -;CM_First_Range +CM_Find_Range=SETUPAPI.CM_Find_Range +CM_First_Range=SETUPAPI.CM_First_Range CM_Free_Log_Conf=SETUPAPI.CM_Free_Log_Conf CM_Free_Log_Conf_Ex=SETUPAPI.CM_Free_Log_Conf_Ex CM_Free_Log_Conf_Handle=SETUPAPI.CM_Free_Log_Conf_Handle -;CM_Free_Range_List -;CM_Free_Res_Des -;CM_Free_Res_Des_Ex -;CM_Free_Res_Des_Handle -CM_Get_Child = SETUPAPI.CM_Get_Child -CM_Get_Child_Ex = SETUPAPI.CM_Get_Child_Ex +CM_Free_Range_List=SETUPAPI.CM_Free_Range_List +CM_Free_Res_Des=SETUPAPI.CM_Free_Res_Des +CM_Free_Res_Des_Ex=SETUPAPI.CM_Free_Res_Des_Ex +CM_Free_Res_Des_Handle=SETUPAPI.CM_Free_Res_Des_Handle +CM_Get_Child=SETUPAPI.CM_Get_Child +CM_Get_Child_Ex=SETUPAPI.CM_Get_Child_Ex CM_Get_Class_Key_NameA=SETUPAPI.CM_Get_Class_Key_NameA CM_Get_Class_Key_NameW=SETUPAPI.CM_Get_Class_Key_NameW CM_Get_Class_Key_Name_ExA=SETUPAPI.CM_Get_Class_Key_Name_ExA @@ -105,18 +105,18 @@ CM_Get_Device_ID_List_Size_ExW=SETUPAPI.CM_Get_Device_ID_List_Size_ExA CM_Get_Device_ID_Size=SETUPAPI.CM_Get_Device_ID_Size CM_Get_Device_ID_Size_Ex=SETUPAPI.CM_Get_Device_ID_Size_Ex -;CM_Get_Device_Interface_AliasA -;CM_Get_Device_Interface_AliasW -;CM_Get_Device_Interface_Alias_ExA -;CM_Get_Device_Interface_Alias_ExW -;CM_Get_Device_Interface_ListA -;CM_Get_Device_Interface_ListW -;CM_Get_Device_Interface_List_ExA -;CM_Get_Device_Interface_List_ExW -;CM_Get_Device_Interface_List_SizeA -;CM_Get_Device_Interface_List_SizeW -;CM_Get_Device_Interface_List_Size_ExA -;CM_Get_Device_Interface_List_Size_ExW +CM_Get_Device_Interface_AliasA=SETUPAPI.CM_Get_Device_Interface_AliasA +CM_Get_Device_Interface_AliasW=SETUPAPI.CM_Get_Device_Interface_AliasW +CM_Get_Device_Interface_Alias_ExA=SETUPAPI.CM_Get_Device_Interface_Alias_ExA +CM_Get_Device_Interface_Alias_ExW=SETUPAPI.CM_Get_Device_Interface_Alias_ExW +CM_Get_Device_Interface_ListA=SETUPAPI.CM_Get_Device_Interface_ListA +CM_Get_Device_Interface_ListW=SETUPAPI.CM_Get_Device_Interface_ListW +CM_Get_Device_Interface_List_ExA=SETUPAPI.CM_Get_Device_Interface_List_ExA +CM_Get_Device_Interface_List_ExW=SETUPAPI.CM_Get_Device_Interface_List_ExW +CM_Get_Device_Interface_List_SizeA=SETUPAPI.CM_Get_Device_Interface_List_SizeA +CM_Get_Device_Interface_List_SizeW=SETUPAPI.CM_Get_Device_Interface_List_SizeW +CM_Get_Device_Interface_List_Size_ExA=SETUPAPI.CM_Get_Device_Interface_List_Size_ExA +CM_Get_Device_Interface_List_Size_ExW=SETUPAPI.CM_Get_Device_Interface_List_Size_ExW CM_Get_First_Log_Conf=SETUPAPI.CM_Get_First_Log_Conf CM_Get_First_Log_Conf_Ex=SETUPAPI.CM_Get_First_Log_Conf_Ex CM_Get_Global_State=SETUPAPI.CM_Get_Global_State @@ -125,70 +125,70 @@ CM_Get_HW_Prof_FlagsW=SETUPAPI.CM_Get_HW_Prof_FlagsW CM_Get_HW_Prof_Flags_ExA=SETUPAPI.CM_Get_HW_Prof_Flags_ExA CM_Get_HW_Prof_Flags_ExW=SETUPAPI.CM_Get_HW_Prof_Flags_ExW -;CM_Get_Hardware_Profile_InfoA -;CM_Get_Hardware_Profile_InfoW -;CM_Get_Hardware_Profile_Info_ExA -;CM_Get_Hardware_Profile_Info_ExW +CM_Get_Hardware_Profile_InfoA=SETUPAPI.CM_Get_Hardware_Profile_InfoA +CM_Get_Hardware_Profile_InfoW=SETUPAPI.CM_Get_Hardware_Profile_InfoW +CM_Get_Hardware_Profile_Info_ExA=SETUPAPI.CM_Get_Hardware_Profile_Info_ExA +CM_Get_Hardware_Profile_Info_ExW=SETUPAPI.CM_Get_Hardware_Profile_Info_ExW CM_Get_Log_Conf_Priority=SETUPAPI.CM_Get_Log_Conf_Priority CM_Get_Log_Conf_Priority_Ex=SETUPAPI.CM_Get_Log_Conf_Priority_Ex CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex -;CM_Get_Next_Res_Des -;CM_Get_Next_Res_Des_Ex +CM_Get_Next_Res_Des=SETUPAPI.CM_Get_Next_Res_Des +CM_Get_Next_Res_Des_Ex=SETUPAPI.CM_Get_Next_Res_Des_Ex CM_Get_Parent=SETUPAPI.CM_Get_Parent CM_Get_Parent_Ex=SETUPAPI.CM_Get_Parent_Ex -;CM_Get_Res_Des_Data -;CM_Get_Res_Des_Data_Ex -;CM_Get_Res_Des_Data_Size -;CM_Get_Res_Des_Data_Size_Ex +CM_Get_Res_Des_Data=SETUPAPI.CM_Get_Res_Des_Data +CM_Get_Res_Des_Data_Ex=SETUPAPI.CM_Get_Res_Des_Data_Ex +CM_Get_Res_Des_Data_Size=SETUPAPI.CM_Get_Res_Des_Data_Size +CM_Get_Res_Des_Data_Size_Ex=SETUPAPI.CM_Get_Res_Des_Data_Size_Ex CM_Get_Sibling=SETUPAPI.CM_Get_Sibling CM_Get_Sibling_Ex=SETUPAPI.CM_Get_Sibling_Ex CM_Get_Version=SETUPAPI.CM_Get_Version CM_Get_Version_Ex=SETUPAPI.CM_Get_Version_Ex -;CM_Intersect_Range_List -;CM_Invert_Range_List +CM_Intersect_Range_List=SETUPAPI.CM_Intersect_Range_List +CM_Invert_Range_List=SETUPAPI.CM_Invert_Range_List CM_Is_Dock_Station_Present=SETUPAPI.CM_Is_Dock_Station_Present CM_Is_Dock_Station_Present_Ex=SETUPAPI.CM_Is_Dock_Station_Present_Ex CM_Locate_DevNodeA=SETUPAPI.CM_Locate_DevNodeA CM_Locate_DevNodeW=SETUPAPI.CM_Locate_DevNodeW CM_Locate_DevNode_ExA=SETUPAPI.CM_Locate_DevNode_ExA CM_Locate_DevNode_ExW=SETUPAPI.CM_Locate_DevNode_ExW -;CM_Merge_Range_List -;CM_Modify_Res_Des -;CM_Modify_Res_Des_Ex +CM_Merge_Range_List=SETUPAPI.CM_Merge_Range_List +CM_Modify_Res_Des=SETUPAPI.CM_Modify_Res_Des +CM_Modify_Res_Des_Ex=SETUPAPI.CM_Modify_Res_Des_Ex CM_Move_DevNode=SETUPAPI.CM_Move_DevNode CM_Move_DevNode_Ex=SETUPAPI.CM_Move_DevNode_Ex -;CM_Next_Range +CM_Next_Range=SETUPAPI.CM_Next_Range CM_Open_Class_KeyA=SETUPAPI.CM_Open_Class_KeyA CM_Open_Class_KeyW=SETUPAPI.CM_Open_Class_KeyW CM_Open_Class_Key_ExA=SETUPAPI.CM_Open_Class_Key_ExA CM_Open_Class_Key_ExW=SETUPAPI.CM_Open_Class_Key_ExW CM_Open_DevNode_Key=SETUPAPI.CM_Open_DevNode_Key CM_Open_DevNode_Key_Ex=SETUPAPI.CM_Open_DevNode_Key_Ex -;CM_Query_Arbitrator_Free_Data -;CM_Query_Arbitrator_Free_Data_Ex -;CM_Query_Arbitrator_Free_Size -;CM_Query_Arbitrator_Free_Size_Ex -;CM_Query_Remove_SubTree -;CM_Query_Remove_SubTree_Ex +CM_Query_Arbitrator_Free_Data=SETUPAPI.CM_Query_Arbitrator_Free_Data +CM_Query_Arbitrator_Free_Data_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Data_Ex +CM_Query_Arbitrator_Free_Size=SETUPAPI.CM_Query_Arbitrator_Free_Size +CM_Query_Arbitrator_Free_Size_Ex=SETUPAPI.CM_Query_Arbitrator_Free_Size_Ex +CM_Query_Remove_SubTree=SETUPAPI.CM_Query_Remove_SubTree +CM_Query_Remove_SubTree_Ex=SETUPAPI.CM_Query_Remove_SubTree_Ex CM_Reenumerate_DevNode=SETUPAPI.CM_Reenumerate_DevNode CM_Reenumerate_DevNode_Ex=SETUAPI.CM_Reenumerate_DevNode_Ex -;CM_Register_Device_Driver -;CM_Register_Device_Driver_Ex -;CM_Register_Device_InterfaceA -;CM_Register_Device_InterfaceW -;CM_Register_Device_Interface_ExA -;CM_Register_Device_Interface_ExW -;CM_Remove_SubTree -;CM_Remove_SubTree_Ex -;CM_Remove_Unmarked_Children -;CM_Remove_Unmarked_Children_Ex -;CM_Request_Device_EjectA -;CM_Request_Device_EjectW +CM_Register_Device_Driver=SETUAPI.CM_Register_Device_Driver +CM_Register_Device_Driver_Ex=SETUAPI.CM_Register_Device_Driver_Ex +CM_Register_Device_InterfaceA=SETUAPI.CM_Register_Device_InterfaceA +CM_Register_Device_InterfaceW=SETUAPI.CM_Register_Device_InterfaceW +CM_Register_Device_Interface_ExA=SETUAPI.CM_Register_Device_Interface_ExA +CM_Register_Device_Interface_ExW=SETUAPI.CM_Register_Device_Interface_ExW +CM_Remove_SubTree=SETUAPI.CM_Remove_SubTree +CM_Remove_SubTree_Ex=SETUAPI.CM_Remove_SubTree_Ex +CM_Remove_Unmarked_Children=SETUAPI.CM_Remove_Unmarked_Children +CM_Remove_Unmarked_Children_Ex=SETUAPI.CM_Remove_Unmarked_Children_Ex +CM_Request_Device_EjectA=SETUAPI.CM_Request_Device_EjectA +CM_Request_Device_EjectW=SETUAPI.CM_Request_Device_EjectW CM_Request_Eject_PC=SETUPAPI.CM_Request_Eject_PC CM_Request_Eject_PC_Ex=SETUPAPI.CM_Request_Eject_PC_Ex -;CM_Reset_Children_Marks -;CM_Reset_Children_Marks_Ex +CM_Reset_Children_Marks=SETUPAPI.CM_Reset_Children_Marks +CM_Reset_Children_Marks_Ex=SETUPAPI.CM_Reset_Children_Marks_Ex CM_Run_Detection=SETUPAPI.CM_Run_Detection CM_Run_Detection_Ex=SETUPAPI.CM_Run_Detection_Ex CM_Set_DevNode_Problem=SETUPAPI.CM_Set_DevNode_Problem @@ -197,18 +197,18 @@ CM_Set_DevNode_Registry_PropertyW=SETUPAPI.CM_Set_DevNode_Registry_PropertyW CM_Set_DevNode_Registry_Property_ExA=SETUPAPI.CM_Set_DevNode_Registry_Property_ExA CM_Set_DevNode_Registry_Property_ExW=SETUPAPI.CM_Set_DevNode_Registry_Property_ExW -;CM_Set_HW_Prof -;CM_Set_HW_Prof_Ex +CM_Set_HW_Prof=SETUPAPI.CM_Set_HW_Prof +CM_Set_HW_Prof_Ex=SETUPAPI.CM_Set_HW_Prof_Ex CM_Set_HW_Prof_FlagsA=SETUPAPI.CM_Set_HW_Prof_FlagsA CM_Set_HW_Prof_FlagsW=SETUPAPI.CM_Set_HW_Prof_FlagsW CM_Set_HW_Prof_Flags_ExA=SETUPAPI.CM_Set_HW_Prof_Flags_ExA CM_Set_HW_Prof_Flags_ExW=SETUPAPI.CM_Set_HW_Prof_Flags_ExW CM_Setup_DevNode=SETUPAPI.CM_Setup_DevNode CM_Setup_DevNode_Ex=SETUPAPI.CM_Setup_DevNode_Ex -;CM_Test_Range_Available +CM_Test_Range_Available=SETUPAPI.CM_Test_Range_Available CM_Uninstall_DevNode=SETUPAPI.CM_Uninstall_DevNode CM_Uninstall_DevNode_Ex=SETUPAPI.CM_Uninstall_DevNode_Ex -;CM_Unregister_Device_InterfaceA -;CM_Unregister_Device_InterfaceW -;CM_Unregister_Device_Interface_ExA -;CM_Unregister_Device_Interface_ExW +CM_Unregister_Device_InterfaceA=SETUPAPI.CM_Unregister_Device_InterfaceA +CM_Unregister_Device_InterfaceW=SETUPAPI.CM_Unregister_Device_InterfaceW +CM_Unregister_Device_Interface_ExA=SETUPAPI.CM_Unregister_Device_Interface_ExA +CM_Unregister_Device_Interface_ExW=SETUPAPI.CM_Unregister_Device_Interface_ExW

1 0

[gedmurphy] 31683: remove duplicate entry
by gedmurphy＠svn.reactos.org 09 Jan '08

09 Jan '08

Author: gedmurphy Date: Wed Jan 9 15:42:21 2008 New Revision: 31683 URL: http://svn.reactos.org/svn/reactos?rev=31683&view=rev Log: remove duplicate entry Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Jan 9 15:42:21 2008 @@ -519,7 +519,6 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -NtUserSetCursorIconData 4 NtUserSetCursorIconData 6 NtUserSetDbgTag 2 NtUserSetFocus 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs