Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[cwittich] 39530: fix formatting
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 07:13:03 2009 New Revision: 39530 URL: http://svn.reactos.org/svn/reactos?rev=39530&view=rev Log: fix formatting Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Tue Feb 10 07:13:03 2009 @@ -17,8 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * VMware is a registered trademark of VMware, Inc. - */ -/* +* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VMware(r) driver installation utility * FILE: subsys/system/vmwinst/vmwinst.c @@ -65,89 +64,89 @@ LONG CALLBACK VectoredExceptionHandler(PEXCEPTION_POINTERS ExceptionInfo) { - /* we're not running in VMware, just terminate the process */ - ExitProcess(ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION); - return EXCEPTION_CONTINUE_EXECUTION; + /* we're not running in VMware, just terminate the process */ + ExitProcess(ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION); + return EXCEPTION_CONTINUE_EXECUTION; } BOOL DetectVMware(int *Version) { - int magic, ver; - - magic = 0; - ver = 0; - - /* Try using a VMware I/O port. If not running in VMware this'll throw an - exception! */ + int magic, ver; + + magic = 0; + ver = 0; + + /* Try using a VMware I/O port. If not running in VMware this'll throw an + exception! */ #ifndef _MSC_VER - __asm__ __volatile__("inl %%dx, %%eax" - : "=a" (ver), "=b" (magic) - : "0" (0x564d5868), "d" (0x5658), "c" (0xa)); + __asm__ __volatile__("inl %%dx, %%eax" + : "=a" (ver), "=b" (magic) + : "0" (0x564d5868), "d" (0x5658), "c" (0xa)); #else #error PLEASE WRITE THIS IN ASSEMBLY #endif - if(magic == 0x564d5868) - { - *Version = ver; - return TRUE; - } - - return FALSE; + if(magic == 0x564d5868) + { + *Version = ver; + return TRUE; + } + + return FALSE; } /* try to open the file */ static BOOL FileExists(WCHAR *Path, WCHAR *File) { - WCHAR FileName[MAX_PATH + 1]; - HANDLE FileHandle; - - FileName[0] = L'\0'; - wcscat(FileName, Path); - wcscat(FileName, File); - - FileHandle = CreateFile(FileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if(FileHandle == INVALID_HANDLE_VALUE) - { - /* If it was a sharing violation the file must already exist */ - return GetLastError() == ERROR_SHARING_VIOLATION; - } - - if(GetFileSize(FileHandle, NULL) <= 0) - { + WCHAR FileName[MAX_PATH + 1]; + HANDLE FileHandle; + + FileName[0] = L'\0'; + wcscat(FileName, Path); + wcscat(FileName, File); + + FileHandle = CreateFile(FileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if(FileHandle == INVALID_HANDLE_VALUE) + { + /* If it was a sharing violation the file must already exist */ + return GetLastError() == ERROR_SHARING_VIOLATION; + } + + if(GetFileSize(FileHandle, NULL) <= 0) + { + CloseHandle(FileHandle); + return FALSE; + } + CloseHandle(FileHandle); - return FALSE; - } - - CloseHandle(FileHandle); - return TRUE; + return TRUE; } static VOID CenterWindow(HWND hWnd) { - HWND hWndParent; - RECT rcParent; - RECT rcWindow; - - hWndParent = GetParent(hWnd); - if (hWndParent == NULL) - hWndParent = GetDesktopWindow(); - - GetWindowRect(hWndParent, &rcParent); - GetWindowRect(hWnd, &rcWindow); - - SetWindowPos(hWnd, - HWND_TOP, - ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, - ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, - 0, - 0, - SWP_NOSIZE); + HWND hWndParent; + RECT rcParent; + RECT rcWindow; + + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); + + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); + + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); } @@ -155,121 +154,121 @@ static BOOL IsVMwareCDInDrive(WCHAR *Drv) { - static WCHAR Drive[4] = L"X:\\"; - WCHAR Current; - - *Drv = L'\0'; - for(Current = 'C'; Current <= 'Z'; Current++) - { - Drive[0] = Current; + static WCHAR Drive[4] = L"X:\\"; + WCHAR Current; + + *Drv = L'\0'; + for(Current = 'C'; Current <= 'Z'; Current++) + { + Drive[0] = Current; #if CHECKDRIVETYPE - if(GetDriveType(Drive) == DRIVE_CDROM) - { + if(GetDriveType(Drive) == DRIVE_CDROM) + { #endif - PathToVideoDrivers60[0] = Current; - PathToVideoDrivers55[0] = Current; - PathToVideoDrivers40[0] = Current; - PathToVideoDrivers45[0] = Current; - if(SetCurrentDirectory(PathToVideoDrivers60)) - SrcPath = PathToVideoDrivers60; - else if(SetCurrentDirectory(PathToVideoDrivers55)) - SrcPath = PathToVideoDrivers55; - else if(SetCurrentDirectory(PathToVideoDrivers45)) - SrcPath = PathToVideoDrivers45; - else if(SetCurrentDirectory(PathToVideoDrivers40)) - SrcPath = PathToVideoDrivers40; - else - { - SetCurrentDirectory(DestinationPath); - continue; - } - - if(FileExists(SrcPath, vmx_fb) && - (FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) && - FileExists(SrcPath, vmx_svga)) - { - *Drv = Current; - return TRUE; - } + PathToVideoDrivers60[0] = Current; + PathToVideoDrivers55[0] = Current; + PathToVideoDrivers40[0] = Current; + PathToVideoDrivers45[0] = Current; + if(SetCurrentDirectory(PathToVideoDrivers60)) + SrcPath = PathToVideoDrivers60; + else if(SetCurrentDirectory(PathToVideoDrivers55)) + SrcPath = PathToVideoDrivers55; + else if(SetCurrentDirectory(PathToVideoDrivers45)) + SrcPath = PathToVideoDrivers45; + else if(SetCurrentDirectory(PathToVideoDrivers40)) + SrcPath = PathToVideoDrivers40; + else + { + SetCurrentDirectory(DestinationPath); + continue; + } + + if(FileExists(SrcPath, vmx_fb) && + (FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) && + FileExists(SrcPath, vmx_svga)) + { + *Drv = Current; + return TRUE; + } #if CHECKDRIVETYPE - } + } #endif - } - - return FALSE; + } + + return FALSE; } static BOOL LoadResolutionSettings(DWORD *ResX, DWORD *ResY, DWORD *ColDepth) { - HKEY hReg; - DWORD Type, Size = sizeof(DWORD); - - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", - 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) - { - DEVMODE CurrentDevMode; - - /* If this key is absent, just get current settings */ - memset(&CurrentDevMode, 0, sizeof(CurrentDevMode)); - CurrentDevMode.dmSize = sizeof(CurrentDevMode); - if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &CurrentDevMode) == TRUE) - { - *ColDepth = CurrentDevMode.dmBitsPerPel; - *ResX = CurrentDevMode.dmPelsWidth; - *ResY = CurrentDevMode.dmPelsHeight; - - return TRUE; - } - } - - if(RegQueryValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, &Type, (BYTE*)ColDepth, &Size) != ERROR_SUCCESS || - Type != REG_DWORD) - { - *ColDepth = 8; - Size = sizeof(DWORD); - } - - if(RegQueryValueEx(hReg, L"DefaultSettings.XResolution", 0, &Type, (BYTE*)ResX, &Size) != ERROR_SUCCESS || - Type != REG_DWORD) - { - *ResX = 640; - Size = sizeof(DWORD); - } - - if(RegQueryValueEx(hReg, L"DefaultSettings.YResolution", 0, &Type, (BYTE*)ResY, &Size) != ERROR_SUCCESS || - Type != REG_DWORD) - { - *ResY = 480; - } - - RegCloseKey(hReg); - return TRUE; + HKEY hReg; + DWORD Type, Size = sizeof(DWORD); + + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) + { + DEVMODE CurrentDevMode; + + /* If this key is absent, just get current settings */ + memset(&CurrentDevMode, 0, sizeof(CurrentDevMode)); + CurrentDevMode.dmSize = sizeof(CurrentDevMode); + if (EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &CurrentDevMode) == TRUE) + { + *ColDepth = CurrentDevMode.dmBitsPerPel; + *ResX = CurrentDevMode.dmPelsWidth; + *ResY = CurrentDevMode.dmPelsHeight; + + return TRUE; + } + } + + if(RegQueryValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, &Type, (BYTE*)ColDepth, &Size) != ERROR_SUCCESS || + Type != REG_DWORD) + { + *ColDepth = 8; + Size = sizeof(DWORD); + } + + if(RegQueryValueEx(hReg, L"DefaultSettings.XResolution", 0, &Type, (BYTE*)ResX, &Size) != ERROR_SUCCESS || + Type != REG_DWORD) + { + *ResX = 640; + Size = sizeof(DWORD); + } + + if(RegQueryValueEx(hReg, L"DefaultSettings.YResolution", 0, &Type, (BYTE*)ResY, &Size) != ERROR_SUCCESS || + Type != REG_DWORD) + { + *ResY = 480; + } + + RegCloseKey(hReg); + return TRUE; } static BOOL IsVmwSVGAEnabled(VOID) { - HKEY hReg; - DWORD Type, Size, Value; - - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga", - 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) - { - return FALSE; - } - Size = sizeof(DWORD); - if(RegQueryValueEx(hReg, L"Start", 0, &Type, (BYTE*)&Value, &Size) != ERROR_SUCCESS || - Type != REG_DWORD) - { + HKEY hReg; + DWORD Type, Size, Value; + + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga", + 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) + { + return FALSE; + } + Size = sizeof(DWORD); + if(RegQueryValueEx(hReg, L"Start", 0, &Type, (BYTE*)&Value, &Size) != ERROR_SUCCESS || + Type != REG_DWORD) + { + RegCloseKey(hReg); + return FALSE; + } + RegCloseKey(hReg); - return FALSE; - } - - RegCloseKey(hReg); - return (Value == 1); + return (Value == 1); } @@ -277,83 +276,83 @@ static BOOL SaveResolutionSettings(DWORD ResX, DWORD ResY, DWORD ColDepth) { - HKEY hReg; - DWORD VFreq = 85; - - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", - 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) - { - return FALSE; - } - if(RegSetValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, REG_DWORD, (BYTE*)&ColDepth, sizeof(DWORD)) != ERROR_SUCCESS) - { + HKEY hReg; + DWORD VFreq = 85; + + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) + { + return FALSE; + } + if(RegSetValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, REG_DWORD, (BYTE*)&ColDepth, sizeof(DWORD)) != ERROR_SUCCESS) + { + RegCloseKey(hReg); + return FALSE; + } + + if(RegSetValueEx(hReg, L"DefaultSettings.XResolution", 0, REG_DWORD, (BYTE*)&ResX, sizeof(DWORD)) != ERROR_SUCCESS) + { + RegCloseKey(hReg); + return FALSE; + } + + if(RegSetValueEx(hReg, L"DefaultSettings.YResolution", 0, REG_DWORD, (BYTE*)&ResY, sizeof(DWORD)) != ERROR_SUCCESS) + { + RegCloseKey(hReg); + return FALSE; + } + + if(RegSetValueEx(hReg, L"DefaultSettings.VRefresh", 0, REG_DWORD, (BYTE*)&VFreq, sizeof(DWORD)) != ERROR_SUCCESS) + { + RegCloseKey(hReg); + return FALSE; + } + RegCloseKey(hReg); - return FALSE; - } - - if(RegSetValueEx(hReg, L"DefaultSettings.XResolution", 0, REG_DWORD, (BYTE*)&ResX, sizeof(DWORD)) != ERROR_SUCCESS) - { - RegCloseKey(hReg); - return FALSE; - } - - if(RegSetValueEx(hReg, L"DefaultSettings.YResolution", 0, REG_DWORD, (BYTE*)&ResY, sizeof(DWORD)) != ERROR_SUCCESS) - { - RegCloseKey(hReg); - return FALSE; - } - - if(RegSetValueEx(hReg, L"DefaultSettings.VRefresh", 0, REG_DWORD, (BYTE*)&VFreq, sizeof(DWORD)) != ERROR_SUCCESS) - { - RegCloseKey(hReg); - return FALSE; - } - - RegCloseKey(hReg); - return TRUE; + return TRUE; } static BOOL EnableDriver(WCHAR *Key, BOOL Enable) { - DWORD Value; - HKEY hReg; - - Value = (Enable ? 1 : 4); - - if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, Key, 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) - { - return FALSE; - } - if(RegSetValueEx(hReg, L"Start", 0, REG_DWORD, (BYTE*)&Value, sizeof(DWORD)) != ERROR_SUCCESS) - { + DWORD Value; + HKEY hReg; + + Value = (Enable ? 1 : 4); + + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, Key, 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) + { + return FALSE; + } + if(RegSetValueEx(hReg, L"Start", 0, REG_DWORD, (BYTE*)&Value, sizeof(DWORD)) != ERROR_SUCCESS) + { + RegCloseKey(hReg); + return FALSE; + } + RegCloseKey(hReg); - return FALSE; - } - - RegCloseKey(hReg); - return TRUE; + return TRUE; } /* Activate the vmware driver and deactivate the others */ static BOOL EnableVmwareDriver(BOOL VBE, BOOL VGA, BOOL VMX) { - if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\VBE", VBE)) - { - return FALSE; - } - if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\vga", VGA)) - { - return FALSE; - } - if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga", VMX)) - { - return FALSE; - } - - return TRUE; + if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\VBE", VBE)) + { + return FALSE; + } + if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\vga", VGA)) + { + return FALSE; + } + if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga", VMX)) + { + return FALSE; + } + + return TRUE; } /* GUI */ @@ -362,725 +361,725 @@ /* Property page dialog callback */ static INT_PTR CALLBACK PageWelcomeProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(uMsg) + { case WM_NOTIFY: - { - HWND hwndControl; - - /* Center the wizard window */ - hwndControl = GetParent(hwndDlg); - CenterWindow (hwndControl); - - switch(pnmh->code) - { - case PSN_SETACTIVE: - { - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - break; - } - case PSN_WIZNEXT: - { - if(DriverFilesFound) - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); - return TRUE; - } - break; - } - } - break; - } - } - return FALSE; + { + HWND hwndControl; + + /* Center the wizard window */ + hwndControl = GetParent(hwndDlg); + CenterWindow (hwndControl); + + switch(pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; + } + case PSN_WIZNEXT: + { + if(DriverFilesFound) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); + return TRUE; + } + break; + } + } + break; + } + } + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK PageInsertDiscProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - break; - case PSN_WIZNEXT: - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS); - break; - } - break; - } - } - return FALSE; + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + break; + case PSN_WIZNEXT: + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSTALLING_VMWARE_TOOLS); + break; + } + break; + } + } + return FALSE; } static VOID InstTerminateInstaller(BOOL Wait) { - if(hInstallationThread != NULL) - { - if(Wait) - { - InterlockedExchange((LONG*)&AbortInstall, 2); - WaitForSingleObject(hInstallationThread, INFINITE); - } - else - { - InterlockedExchange((LONG*)&AbortInstall, 1); - } - } + if(hInstallationThread != NULL) + { + if(Wait) + { + InterlockedExchange((LONG*)&AbortInstall, 2); + WaitForSingleObject(hInstallationThread, INFINITE); + } + else + { + InterlockedExchange((LONG*)&AbortInstall, 1); + } + } } static DWORD WINAPI InstInstallationThread(LPVOID lpParameter) { - HANDLE hThread; - WCHAR InfFileName[1024]; - BOOL DriveAvailable; - int DrivesTested = 0; - - if(AbortInstall != 0) goto done; - PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_SEARCHINGFORCDROM, 0); - - while(AbortInstall == 0) - { - Sleep(500); - DriveAvailable = IsVMwareCDInDrive(&CDDrive); - if(DriveAvailable) - break; - if(DrivesTested++ > 20) - { - PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOLOCATEDRIVERS, 0); - goto cleanup; - } - } - - if(AbortInstall != 0) goto done; - PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); - - wcscpy(InfFileName, SrcPath); - wcscat(InfFileName, L"vmx_svga.inf"); - DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); - if (!UpdateDriverForPlugAndPlayDevices( - hInstallationNotifyWnd, - L"PCI\\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00", - InfFileName, - 0, - NULL)) - { - AbortInstall = 1; - } - else - { - AbortInstall = 0; - } + HANDLE hThread; + WCHAR InfFileName[1024]; + BOOL DriveAvailable; + int DrivesTested = 0; + + if(AbortInstall != 0) goto done; + PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_SEARCHINGFORCDROM, 0); + + while(AbortInstall == 0) + { + Sleep(500); + DriveAvailable = IsVMwareCDInDrive(&CDDrive); + if(DriveAvailable) + break; + if(DrivesTested++ > 20) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOLOCATEDRIVERS, 0); + goto cleanup; + } + } + + if(AbortInstall != 0) goto done; + PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); + + wcscpy(InfFileName, SrcPath); + wcscat(InfFileName, L"vmx_svga.inf"); + DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); + if (!UpdateDriverForPlugAndPlayDevices( + hInstallationNotifyWnd, + L"PCI\\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00", + InfFileName, + 0, + NULL)) + { + AbortInstall = 1; + } + else + { + AbortInstall = 0; + } done: - switch(AbortInstall) - { + switch(AbortInstall) + { case 0: - SendMessage(hInstallationNotifyWnd, WM_INSTCOMPLETE, 0, 0); - break; + SendMessage(hInstallationNotifyWnd, WM_INSTCOMPLETE, 0, 0); + break; case 1: - SendMessage(hInstallationNotifyWnd, WM_INSTABORT, 0, 0); - break; - } + SendMessage(hInstallationNotifyWnd, WM_INSTABORT, 0, 0); + break; + } cleanup: - hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); - if(hThread != NULL) - { - CloseHandle(hThread); - } - return 0; + hThread = InterlockedExchangePointer((PVOID*)&hInstallationThread, 0); + if(hThread != NULL) + { + CloseHandle(hThread); + } + return 0; } static BOOL InstStartInstallationThread(HWND hwndNotify) { - if(hInstallationThread == NULL) - { - DWORD ThreadId; - hInstallationNotifyWnd = hwndNotify; - AbortInstall = 0; - hInstallationThread = CreateThread(NULL, - 0, - InstInstallationThread, - NULL, - CREATE_SUSPENDED, - &ThreadId); if(hInstallationThread == NULL) { - return FALSE; - } - - ResumeThread(hInstallationThread); - return TRUE; - } - - return FALSE; + DWORD ThreadId; + hInstallationNotifyWnd = hwndNotify; + AbortInstall = 0; + hInstallationThread = CreateThread(NULL, + 0, + InstInstallationThread, + NULL, + CREATE_SUSPENDED, + &ThreadId); + if(hInstallationThread == NULL) + { + return FALSE; + } + + ResumeThread(hInstallationThread); + return TRUE; + } + + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK PageInstallingProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, L""); - SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, TRUE, 50); - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); - InstStartInstallationThread(hwndDlg); - break; - case PSN_RESET: - InstTerminateInstaller(TRUE); - break; - case PSN_WIZBACK: - if(hInstallationThread != NULL) - { - PropSheet_SetWizButtons(GetParent(hwndDlg), 0); - InstTerminateInstaller(FALSE); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); - return -1; - } - else - { - SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS); - } - break; - } - break; - } + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) + { + case PSN_SETACTIVE: + SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, L""); + SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, TRUE, 50); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + InstStartInstallationThread(hwndDlg); + break; + case PSN_RESET: + InstTerminateInstaller(TRUE); + break; + case PSN_WIZBACK: + if(hInstallationThread != NULL) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + InstTerminateInstaller(FALSE); + SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + return -1; + } + else + { + SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_INSERT_VMWARE_TOOLS); + } + break; + } + break; + } case WM_INSTABORT: - /* go back in case we aborted the installation thread */ - SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSERT_VMWARE_TOOLS); - if(wParam != 0) - { - WCHAR Msg[1024]; - LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); - MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - } - break; + /* go back in case we aborted the installation thread */ + SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSERT_VMWARE_TOOLS); + if(wParam != 0) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + } + break; case WM_INSTCOMPLETE: - SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_CONFIG); - break; + SendDlgItemMessage(hwndDlg, IDC_INSTALLINGPROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_CONFIG); + break; case WM_INSTSTATUSUPDATE: - { - WCHAR Msg[1024]; - LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); - SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, Msg); - break; - } - } - return FALSE; + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + SetDlgItemText(hwndDlg, IDC_INSTALLINGSTATUS, Msg); + break; + } + } + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK PageInstallFailedProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); - break; - } - break; - } - } - return FALSE; + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + } + break; + } + } + return FALSE; } static void FillComboBox(HWND Dlg, int idComboBox, int From, int To) { - int i; - WCHAR Text[256]; - - for(i = From; i <= To; i++) - { - if(LoadString(hAppInstance, i, Text, 255) > 0) - { - SendDlgItemMessage(Dlg, idComboBox, CB_ADDSTRING, 0, (LPARAM)Text); - } - } + int i; + WCHAR Text[256]; + + for(i = From; i <= To; i++) + { + if(LoadString(hAppInstance, i, Text, 255) > 0) + { + SendDlgItemMessage(Dlg, idComboBox, CB_ADDSTRING, 0, (LPARAM)Text); + } + } } typedef struct { - int ControlID; - int ResX; - int ResY; + int ControlID; + int ResX; + int ResY; } MAPCTLRES; /* Property page dialog callback */ static INT_PTR CALLBACK PageConfigProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(uMsg) + { case WM_INITDIALOG: - { - DWORD ResX = 0, ResY = 0, ColDepth = 0; - int cbSel; - - FillComboBox(hwndDlg, IDC_COLORQUALITY, 10001, 10003); - if(LoadResolutionSettings(&ResX, &ResY, &ColDepth)) - { - SendDlgItemMessage(hwndDlg, ResX + ResY, BM_SETCHECK, BST_CHECKED, 0); - switch(ColDepth) - { - case 8: - cbSel = 0; + { + DWORD ResX = 0, ResY = 0, ColDepth = 0; + int cbSel; + + FillComboBox(hwndDlg, IDC_COLORQUALITY, 10001, 10003); + if(LoadResolutionSettings(&ResX, &ResY, &ColDepth)) + { + SendDlgItemMessage(hwndDlg, ResX + ResY, BM_SETCHECK, BST_CHECKED, 0); + switch(ColDepth) + { + case 8: + cbSel = 0; + break; + case 16: + cbSel = 1; + break; + case 32: + cbSel = 2; + break; + default: + cbSel = -1; + break; + } + SendDlgItemMessage(hwndDlg, IDC_COLORQUALITY, CB_SETCURSEL, cbSel, 0); + } break; - case 16: - cbSel = 1; + } + case WM_NOTIFY: + { + HWND hwndControl; + + /* Center the wizard window */ + hwndControl = GetParent(hwndDlg); + CenterWindow (hwndControl); + + switch(pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), ((StartVMwConfigWizard || DriverFilesFound) ? PSWIZB_FINISH | PSWIZB_BACK : PSWIZB_FINISH)); + break; + } + case PSN_WIZBACK: + { + if(StartVMwConfigWizard) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + return TRUE; + } + if(DriverFilesFound) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } + break; + } + case PSN_WIZFINISH: + { + DWORD rx = 800, ry = 600, cd = 32; + int i; + static MAPCTLRES Resolutions[11] = { + {540, 640, 480}, + {1400, 800, 600}, + {1792, 1024, 768}, + {2016, 1152, 864}, + {2240, 1280, 960}, + {2304, 1280, 1024}, + {2450, 1400, 1050}, + {2800, 1600, 1200}, + {3136, 1792, 1344}, + {3248, 1856, 1392}, + {3360, 1920, 1440} + }; + for(i = 0; i < 11; i++) + { + if(SendDlgItemMessage(hwndDlg, Resolutions[i].ControlID, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + rx = Resolutions[i].ResX; + ry = Resolutions[i].ResY; + break; + } + } + + switch(SendDlgItemMessage(hwndDlg, IDC_COLORQUALITY, CB_GETCURSEL, 0, 0)) + { + case 0: + cd = 8; + break; + case 1: + cd = 16; + break; + case 2: + cd = 32; + break; + } + + SaveResolutionSettings(rx, ry, cd); + break; + } + } break; - case 32: - cbSel = 2; - break; - default: - cbSel = -1; - break; - } - SendDlgItemMessage(hwndDlg, IDC_COLORQUALITY, CB_SETCURSEL, cbSel, 0); - } - break; - } - case WM_NOTIFY: - { - HWND hwndControl; - - /* Center the wizard window */ - hwndControl = GetParent(hwndDlg); - CenterWindow (hwndControl); - - switch(pnmh->code) - { - case PSN_SETACTIVE: - { - PropSheet_SetWizButtons(GetParent(hwndDlg), ((StartVMwConfigWizard || DriverFilesFound) ? PSWIZB_FINISH | PSWIZB_BACK : PSWIZB_FINISH)); - break; - } - case PSN_WIZBACK: - { - if(StartVMwConfigWizard) - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); - return TRUE; - } - if(DriverFilesFound) - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); - return TRUE; - } - break; - } - case PSN_WIZFINISH: - { - DWORD rx = 800, ry = 600, cd = 32; - int i; - static MAPCTLRES Resolutions[11] = { - {540, 640, 480}, - {1400, 800, 600}, - {1792, 1024, 768}, - {2016, 1152, 864}, - {2240, 1280, 960}, - {2304, 1280, 1024}, - {2450, 1400, 1050}, - {2800, 1600, 1200}, - {3136, 1792, 1344}, - {3248, 1856, 1392}, - {3360, 1920, 1440} - }; - for(i = 0; i < 11; i++) - { - if(SendDlgItemMessage(hwndDlg, Resolutions[i].ControlID, BM_GETCHECK, 0, 0) == BST_CHECKED) - { - rx = Resolutions[i].ResX; - ry = Resolutions[i].ResY; - break; - } - } - - switch(SendDlgItemMessage(hwndDlg, IDC_COLORQUALITY, CB_GETCURSEL, 0, 0)) - { - case 0: - cd = 8; - break; - case 1: - cd = 16; - break; - case 2: - cd = 32; - break; - } - - SaveResolutionSettings(rx, ry, cd); - break; - } - } - break; - } - } - return FALSE; + } + } + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK PageChooseActionProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_INITDIALOG: - SendDlgItemMessage(hwndDlg, IDC_CONFIGSETTINGS, BM_SETCHECK, BST_CHECKED, 0); - break; + SendDlgItemMessage(hwndDlg, IDC_CONFIGSETTINGS, BM_SETCHECK, BST_CHECKED, 0); + break; case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - break; - case PSN_WIZBACK: - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); - return TRUE; - } - case PSN_WIZNEXT: - { - static ULONG SelPage[4] = {IDD_CONFIG, IDD_SELECTDRIVER, IDD_SELECTDRIVER, IDD_CHOOSEACTION}; - int i; - - for(i = IDC_CONFIGSETTINGS; i <= IDC_UNINSTALL; i++) - { - if(SendDlgItemMessage(hwndDlg, i, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) { - break; + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; + case PSN_WIZBACK: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + return TRUE; + } + case PSN_WIZNEXT: + { + static ULONG SelPage[4] = {IDD_CONFIG, IDD_SELECTDRIVER, IDD_SELECTDRIVER, IDD_CHOOSEACTION}; + int i; + + for(i = IDC_CONFIGSETTINGS; i <= IDC_UNINSTALL; i++) + { + if(SendDlgItemMessage(hwndDlg, i, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + break; + } + } + + UninstallDriver = (i == IDC_UNINSTALL); + + SetWindowLong(hwndDlg, DWL_MSGRESULT, SelPage[i - IDC_CONFIGSETTINGS]); + return TRUE; + } } - } - - UninstallDriver = (i == IDC_UNINSTALL); - - SetWindowLong(hwndDlg, DWL_MSGRESULT, SelPage[i - IDC_CONFIGSETTINGS]); - return TRUE; - } - } - break; - } - } - return FALSE; + break; + } + } + return FALSE; } /* Property page dialog callback */ static INT_PTR CALLBACK PageSelectDriverProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_INITDIALOG: - SendDlgItemMessage(hwndDlg, IDC_VBE, BM_SETCHECK, BST_CHECKED, 0); - break; + SendDlgItemMessage(hwndDlg, IDC_VBE, BM_SETCHECK, BST_CHECKED, 0); + break; case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), (UninstallDriver ? PSWIZB_NEXT | PSWIZB_BACK : PSWIZB_BACK | PSWIZB_FINISH)); - break; - case PSN_WIZBACK: - { - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); - return TRUE; - } - case PSN_WIZNEXT: - { - ActivateVBE = (SendDlgItemMessage(hwndDlg, IDC_VBE, BM_GETCHECK, 0, 0) == BST_CHECKED); - - if(UninstallDriver) - { - return FALSE; - } - return TRUE; - } - case PSN_WIZFINISH: - { - if(UninstallDriver) - { - return FALSE; - } - ActivateVBE = (SendDlgItemMessage(hwndDlg, IDC_VBE, BM_GETCHECK, 0, 0) == BST_CHECKED); - if(!EnableVmwareDriver(ActivateVBE, - TRUE, - FALSE)) - { - WCHAR Msg[1024]; - LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); - MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); - return TRUE; - } - break; - } - } - break; - } - } - return FALSE; + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), (UninstallDriver ? PSWIZB_NEXT | PSWIZB_BACK : PSWIZB_BACK | PSWIZB_FINISH)); + break; + case PSN_WIZBACK: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CHOOSEACTION); + return TRUE; + } + case PSN_WIZNEXT: + { + ActivateVBE = (SendDlgItemMessage(hwndDlg, IDC_VBE, BM_GETCHECK, 0, 0) == BST_CHECKED); + + if(UninstallDriver) + { + return FALSE; + } + return TRUE; + } + case PSN_WIZFINISH: + { + if(UninstallDriver) + { + return FALSE; + } + ActivateVBE = (SendDlgItemMessage(hwndDlg, IDC_VBE, BM_GETCHECK, 0, 0) == BST_CHECKED); + if(!EnableVmwareDriver(ActivateVBE, + TRUE, + FALSE)) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); + return TRUE; + } + break; + } + } + break; + } + } + return FALSE; } static VOID ShowUninstNotice(HWND Owner) { - WCHAR Msg[1024]; - LoadString(hAppInstance, IDS_UNINSTNOTICE, Msg, sizeof(Msg) / sizeof(WCHAR)); - MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_UNINSTNOTICE, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); } static INT_PTR CALLBACK PageDoUninstallProc( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - switch(uMsg) - { + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam + ) +{ + switch(uMsg) + { case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) - { - case PSN_SETACTIVE: - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); - break; - case PSN_WIZFINISH: - { - if(UninstallDriver) - { - if(!EnableVmwareDriver(ActivateVBE, - TRUE, - FALSE)) + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch(pnmh->code) { - WCHAR Msg[1024]; - LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); - MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); - SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); - return TRUE; + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + break; + case PSN_WIZFINISH: + { + if(UninstallDriver) + { + if(!EnableVmwareDriver(ActivateVBE, + TRUE, + FALSE)) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, (ActivateVBE ? IDS_FAILEDTOSELVBEDRIVER : IDS_FAILEDTOSELVGADRIVER), Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SELECTDRIVER); + return TRUE; + } + ShowUninstNotice(GetParent(hwndDlg)); + } + return FALSE; + } } - ShowUninstNotice(GetParent(hwndDlg)); - } - return FALSE; - } - } - break; - } - } - return FALSE; + break; + } + } + return FALSE; } static LONG CreateWizard(VOID) { - PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[8]; - PROPSHEETPAGE psp; - WCHAR Caption[1024]; - - LoadString(hAppInstance, IDS_WIZARD_NAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - - /* Create the Welcome page */ - ZeroMemory (&psp, sizeof(PROPSHEETPAGE)); - psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; - psp.hInstance = hAppInstance; - psp.pfnDlgProc = PageWelcomeProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); - ahpsp[0] = CreatePropertySheetPage(&psp); - - /* Create the INSERT_VMWARE_TOOLS page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLSTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLSSUBTITLE); - psp.pszTemplate = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLS); - psp.pfnDlgProc = PageInsertDiscProc; - ahpsp[1] = CreatePropertySheetPage(&psp); - - /* Create the INSTALLING_VMWARE_TOOLS page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLSTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLSSUBTITLE); - psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLS); - psp.pfnDlgProc = PageInstallingProc; - ahpsp[2] = CreatePropertySheetPage(&psp); - - /* Create the CONFIG page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_CONFIGTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_CONFIGSUBTITLE); - psp.pfnDlgProc = PageConfigProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG); - ahpsp[3] = CreatePropertySheetPage(&psp); - - /* Create the INSTALLATION_FAILED page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSTALLATION_FAILEDTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSTALLATION_FAILEDSUBTITLE); - psp.pfnDlgProc = PageInstallFailedProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLATION_FAILED); - ahpsp[4] = CreatePropertySheetPage(&psp); - - /* Create the CHOOSEACTION page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_CHOOSEACTIONTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_CHOOSEACTIONSUBTITLE); - psp.pfnDlgProc = PageChooseActionProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_CHOOSEACTION); - ahpsp[5] = CreatePropertySheetPage(&psp); - - /* Create the SELECTDRIVER page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_SELECTDRIVERTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_SELECTDRIVERSUBTITLE); - psp.pfnDlgProc = PageSelectDriverProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_SELECTDRIVER); - ahpsp[6] = CreatePropertySheetPage(&psp); - - /* Create the DOUNINSTALL page */ - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_DOUNINSTALLTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_DOUNINSTALLSUBTITLE); - psp.pfnDlgProc = PageDoUninstallProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_DOUNINSTALL); - ahpsp[7] = CreatePropertySheetPage(&psp); - - /* Create the property sheet */ - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; - psh.hInstance = hAppInstance; - psh.hwndParent = NULL; - psh.nPages = 7; - psh.nStartPage = (StartVMwConfigWizard ? 5 : 0); - psh.phpage = ahpsp; - psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); - psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); - - /* Display the wizard */ - return (LONG)(PropertySheet(&psh) != -1); + PROPSHEETHEADER psh; + HPROPSHEETPAGE ahpsp[8]; + PROPSHEETPAGE psp; + WCHAR Caption[1024]; + + LoadString(hAppInstance, IDS_WIZARD_NAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + /* Create the Welcome page */ + ZeroMemory (&psp, sizeof(PROPSHEETPAGE)); + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hAppInstance; + psp.pfnDlgProc = PageWelcomeProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); + ahpsp[0] = CreatePropertySheetPage(&psp); + + /* Create the INSERT_VMWARE_TOOLS page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLSTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLSSUBTITLE); + psp.pszTemplate = MAKEINTRESOURCE(IDD_INSERT_VMWARE_TOOLS); + psp.pfnDlgProc = PageInsertDiscProc; + ahpsp[1] = CreatePropertySheetPage(&psp); + + /* Create the INSTALLING_VMWARE_TOOLS page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLSTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLSSUBTITLE); + psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLING_VMWARE_TOOLS); + psp.pfnDlgProc = PageInstallingProc; + ahpsp[2] = CreatePropertySheetPage(&psp); + + /* Create the CONFIG page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_CONFIGTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_CONFIGSUBTITLE); + psp.pfnDlgProc = PageConfigProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_CONFIG); + ahpsp[3] = CreatePropertySheetPage(&psp); + + /* Create the INSTALLATION_FAILED page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_INSTALLATION_FAILEDTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_INSTALLATION_FAILEDSUBTITLE); + psp.pfnDlgProc = PageInstallFailedProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLATION_FAILED); + ahpsp[4] = CreatePropertySheetPage(&psp); + + /* Create the CHOOSEACTION page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_CHOOSEACTIONTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_CHOOSEACTIONSUBTITLE); + psp.pfnDlgProc = PageChooseActionProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_CHOOSEACTION); + ahpsp[5] = CreatePropertySheetPage(&psp); + + /* Create the SELECTDRIVER page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_SELECTDRIVERTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_SELECTDRIVERSUBTITLE); + psp.pfnDlgProc = PageSelectDriverProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SELECTDRIVER); + ahpsp[6] = CreatePropertySheetPage(&psp); + + /* Create the DOUNINSTALL page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDD_DOUNINSTALLTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDD_DOUNINSTALLSUBTITLE); + psp.pfnDlgProc = PageDoUninstallProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_DOUNINSTALL); + ahpsp[7] = CreatePropertySheetPage(&psp); + + /* Create the property sheet */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hInstance = hAppInstance; + psh.hwndParent = NULL; + psh.nPages = 7; + psh.nStartPage = (StartVMwConfigWizard ? 5 : 0); + psh.phpage = ahpsp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + /* Display the wizard */ + return (LONG)(PropertySheet(&psh) != -1); } int WINAPI wWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPWSTR lpszCmdLine, - int nCmdShow) -{ - - PVOID ExceptionHandler; - int Version; - WCHAR *lc; - - hAppInstance = hInstance; - - /* Setup a vectored exception handler to protect the detection. Don't use SEH - here so we notice the next time someone removes support for vectored - exception handling from ros... */ - if (!(ExceptionHandler = AddVectoredExceptionHandler(0, - VectoredExceptionHandler))) - { - return 1; - } - - if(!DetectVMware(&Version)) - { - return 1; - } - - /* unregister the handler */ - RemoveVectoredExceptionHandler(ExceptionHandler); - - lc = DestinationPath; - lc += GetSystemDirectory(DestinationPath, MAX_PATH) - 1; - if(lc >= DestinationPath && *lc != L'\\') - { - wcscat(DestinationPath, L"\\"); - } - DestinationDriversPath[0] = L'\0'; - wcscat(DestinationDriversPath, DestinationPath); - wcscat(DestinationDriversPath, L"drivers\\"); - - SetCurrentDirectory(DestinationPath); - - DriverFilesFound = FileExists(DestinationPath, vmx_fb) && - FileExists(DestinationPath, vmx_mode) && - FileExists(DestinationDriversPath, vmx_svga); - - StartVMwConfigWizard = DriverFilesFound && IsVmwSVGAEnabled(); - - /* Show the wizard */ - CreateWizard(); - - return 2; -} - + HINSTANCE hPrevInstance, + LPWSTR lpszCmdLine, + int nCmdShow) +{ + + PVOID ExceptionHandler; + int Version; + WCHAR *lc; + + hAppInstance = hInstance; + + /* Setup a vectored exception handler to protect the detection. Don't use SEH + here so we notice the next time someone removes support for vectored + exception handling from ros... */ + if (!(ExceptionHandler = AddVectoredExceptionHandler(0, + VectoredExceptionHandler))) + { + return 1; + } + + if(!DetectVMware(&Version)) + { + return 1; + } + + /* unregister the handler */ + RemoveVectoredExceptionHandler(ExceptionHandler); + + lc = DestinationPath; + lc += GetSystemDirectory(DestinationPath, MAX_PATH) - 1; + if(lc >= DestinationPath && *lc != L'\\') + { + wcscat(DestinationPath, L"\\"); + } + DestinationDriversPath[0] = L'\0'; + wcscat(DestinationDriversPath, DestinationPath); + wcscat(DestinationDriversPath, L"drivers\\"); + + SetCurrentDirectory(DestinationPath); + + DriverFilesFound = FileExists(DestinationPath, vmx_fb) && + FileExists(DestinationPath, vmx_mode) && + FileExists(DestinationDriversPath, vmx_svga); + + StartVMwConfigWizard = DriverFilesFound && IsVmwSVGAEnabled(); + + /* Show the wizard */ + CreateWizard(); + + return 2; +} +

1 0

[cwittich] 39529: remove old mozilla url
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 06:34:23 2009 New Revision: 39529 URL: http://svn.reactos.org/svn/reactos?rev=39529&view=rev Log: remove old mozilla url Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Tue Feb 10 06:34:23 2009 @@ -1074,9 +1074,6 @@ ; deskmon.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Monitor CPL Extension","",0x00000000,"{42071713-76d4-11d1-8b24-00a0c9068ff3}" -; Where to download the Mozilla ActiveX control -HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" - ; Keyboard layout switcher ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Tue Feb 10 06:34:23 2009 @@ -1080,9 +1080,6 @@ ; deskmon.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Monitor CPL Extension","",0x00000000,"{42071713-76d4-11d1-8b24-00a0c9068ff3}" -; Where to download the Mozilla ActiveX control -HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" - ; Keyboard layout switcher ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch",0x00000000,"kbswitch.exe"

1 0

[cwittich] 39528: remove some more junk from hive files
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 06:32:29 2009 New Revision: 39528 URL: http://svn.reactos.org/svn/reactos?rev=39528&view=rev Log: remove some more junk from hive files Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Tue Feb 10 06:32:29 2009 @@ -336,15 +336,6 @@ ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\PropertySheetHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}","",0x00000000,"PSFactoryBuffer" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"ole32.dll" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Both" - -; StdGlobalInterfaceTable from winedefault.reg -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}","",0x00000000,"StdGlobalInterfaceTable" -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"ole32.dll" -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - ; deskadp.dll shell extension HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" @@ -354,11 +345,6 @@ HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Monitor CPL Extension" HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskmon.dll" HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - -; For comcat.dll -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}","",0x00000000,"StdComponentCategoriesMgr" -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"comcat.dll" -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Both" ; For TCPIP Protocol property page HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}","",0x00000000,"TCP/IP Configuration Notify Object" @@ -372,230 +358,6 @@ HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\ProgID","",0x00000000,"DxDiag.DxDiagProvider.1" HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\VersionIndependentProgID","",0x00000000,"DxDiag.DxDiagProvider" -HKCR,"Interface",,0x00000012 - -; For Ole32.dll -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}","",0x00000000,"IUnknown" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"3" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}","",0x00000000,"IClassFactory" -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000002-0000-0000-C000-000000000046}}","",0x00000000,"IMalloc" -HKCR,"Interface\{00000002-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000003-0000-0000-C000-000000000046}","",0x00000000,"IMarshal" -HKCR,"Interface\{00000003-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000004-0000-0000-C000-000000000046}","",0x00000000,"IRpcChannel" -HKCR,"Interface\{00000004-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" - -HKCR,"Interface\{00000005-0000-0000-C000-000000000046}","",0x00000000,"IRpcStub" -HKCR,"Interface\{00000005-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" - -HKCR,"Interface\{00000006-0000-0000-C000-000000000046}","",0x00000000,"IStubManager" - -HKCR,"Interface\{00000007-0000-0000-C000-000000000046}","",0x00000000,"IRpcProxy" -HKCR,"Interface\{00000007-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{00000008-0000-0000-C000-000000000046}","",0x00000000,"IProxyManager" - -HKCR,"Interface\{00000009-0000-0000-C000-000000000046}","",0x00000000,"IPSFactory" -HKCR,"Interface\{00000009-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}","",0x00000000,"ILockBytes" -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}","",0x00000000,"IStorage" -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"18" -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}","",0x00000000,"IStream" -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"14" -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}","",0x00000000,"IEnumSTATSTG" -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}","",0x00000000,"IBindCtx" -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"13" -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}","",0x00000000,"IMoniker" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000109-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"23" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}","",0x00000000,"IRunningObjectTable" -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000011-0000-0000-C000-000000000046}","",0x00000000,"IInternalMoniker" - -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}","",0x00000000,"IRootStorage" -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000013-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved1" - -HKCR,"Interface\{00000014-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved2" - -HKCR,"Interface\{00000015-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved3" - -HKCR,"Interface\{00000016-0000-0000-C000-000000000046}","",0x00000000,"IMessageFilter" -HKCR,"Interface\{00000016-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"6" - -HKCR,"Interface\{00000018-0000-0000-C000-000000000046}","",0x00000000,"IStdMarshalInfo" -HKCR,"Interface\{00000018-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" - -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}","",0x00000000,"IEnumUnknown" -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}","",0x00000000,"IEnumString" -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}","",0x00000000,"IEnumMoniker" -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}","",0x00000000,"IEnumFORMATETC" -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}","",0x00000000,"IEnumOLEVERB" -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}","",0x00000000,"IEnumSTATDATA" -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000106-0000-0000-C000-000000000046}","",0x00000000,"IEnumGeneric" - -HKCR,"Interface\{00000107-0000-0000-C000-000000000046}","",0x00000000,"IEnumHolder" - -HKCR,"Interface\{00000108-0000-0000-C000-000000000046}","",0x00000000,"IEnumCallback" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}","",0x00000000,"IPersistStream" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{7CE551EB-F85C-11CE-9059-080036F12502}" -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}","",0x00000000,"IPersistStorage" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}","",0x00000000,"IPersistFile" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\Distributor","",0x00000000,"{e436ebb7-524f-11ce-9f53-0020af0ba770}" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}","",0x00000000,"IPersist" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{7CE551EB-F85C-11CE-9059-080036F12502}" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}","",0x00000000,"IViewObject" -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}","",0x00000000,"IDataObject" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"12" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{28D8ABA0-4B78-11CE-B27D-00AA001F73C1}" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}","",0x00000000,"IAdviseSink" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\AsynchronousInterface","",0x00000000,"{00000150-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000110-0000-0000-C000-000000000046}","",0x00000000,"IDataAdviseHolder" -HKCR,"Interface\{00000110-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" - -HKCR,"Interface\{00000111-0000-0000-C000-000000000046}","",0x00000000,"IOleAdviseHolder" -HKCR,"Interface\{00000111-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}","",0x00000000,"IOleObject" -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"24" -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceObject" - -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}","",0x00000000,"IOleWindow" -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceUIWindow" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceFrame" -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"15" -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceActiveObject" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}","",0x00000000,"IOleClientSite" -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceSite" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"15" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}","",0x00000000,"IParseDisplayName" -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}","",0x00000000,"IOleContainer" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000011A-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"6" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}","",0x00000000,"IOleItemContainer" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000011B-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}","",0x00000000,"IOleLink" -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"14" -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}","",0x00000000,"IOleCache" -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011F-0000-0000-C000-000000000046}","",0x00000000,"IOleManager" - -HKCR,"Interface\{00000120-0000-0000-C000-000000000046}","",0x00000000,"IOlePresObj" - -HKCR,"Interface\{00000121-0000-0000-C000-000000000046}","",0x00000000,"IDropSource" -HKCR,"Interface\{00000121-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}","",0x00000000,"IDropTarget" -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Tue Feb 10 06:32:29 2009 @@ -261,10 +261,6 @@ ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" -HKCR,"InternetShortcut","NeverShowExt",0x00000000,"" -HKCR,"InternetShortcut","IsShortcut",0x00000000,"yes" -HKCR,"InternetShortcut\shell\open\command","",0x00000000,"rundll32.exe shdocvw.dll,OpenURL %l" -HKCR,"InternetShortcut\DefaultIcon","",0x00020000,"%SystemRoot%\system32\url.dll,0" ; Wave Sounds HKCR,".wav","",0x00000000,"SoundRec" @@ -336,15 +332,6 @@ ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\PropertySheetHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}","",0x00000000,"PSFactoryBuffer" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"ole32.dll" -HKCR,"CLSID\{00000320-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Both" - -; StdGlobalInterfaceTable from winedefault.reg -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}","",0x00000000,"StdGlobalInterfaceTable" -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"ole32.dll" -;HKCR,"CLSID\{00000323-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - ; deskadp.dll shell extension HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" @@ -354,11 +341,6 @@ HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Monitor CPL Extension" HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskmon.dll" HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - -; For comcat.dll -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}","",0x00000000,"StdComponentCategoriesMgr" -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"comcat.dll" -HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Both" ; For TCPIP Protocol property page HKCR,"CLSID\{A907657F-6FDF-11D0-8EFB-00C04FD912B2}","",0x00000000,"TCP/IP Configuration Notify Object" @@ -371,231 +353,6 @@ HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\InProcServer32","ThreadingModel",0x00000000,"Apartment" HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\ProgID","",0x00000000,"DxDiag.DxDiagProvider.1" HKCR,"CLSID\{A65B8071-3BFE-4213-9A5B-491DA4461CA7}\VersionIndependentProgID","",0x00000000,"DxDiag.DxDiagProvider" - -HKCR,"Interface",,0x00000012 - -; For Ole32.dll -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}","",0x00000000,"IUnknown" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"3" -HKCR,"Interface\{00000000-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}","",0x00000000,"IClassFactory" -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" -HKCR,"Interface\{00000001-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000002-0000-0000-C000-000000000046}}","",0x00000000,"IMalloc" -HKCR,"Interface\{00000002-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000003-0000-0000-C000-000000000046}","",0x00000000,"IMarshal" -HKCR,"Interface\{00000003-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000004-0000-0000-C000-000000000046}","",0x00000000,"IRpcChannel" -HKCR,"Interface\{00000004-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" - -HKCR,"Interface\{00000005-0000-0000-C000-000000000046}","",0x00000000,"IRpcStub" -HKCR,"Interface\{00000005-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" - -HKCR,"Interface\{00000006-0000-0000-C000-000000000046}","",0x00000000,"IStubManager" - -HKCR,"Interface\{00000007-0000-0000-C000-000000000046}","",0x00000000,"IRpcProxy" -HKCR,"Interface\{00000007-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{00000008-0000-0000-C000-000000000046}","",0x00000000,"IProxyManager" - -HKCR,"Interface\{00000009-0000-0000-C000-000000000046}","",0x00000000,"IPSFactory" -HKCR,"Interface\{00000009-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}","",0x00000000,"ILockBytes" -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{0000000A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}","",0x00000000,"IStorage" -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"18" -HKCR,"Interface\{0000000B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}","",0x00000000,"IStream" -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"14" -HKCR,"Interface\{0000000C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}","",0x00000000,"IEnumSTATSTG" -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{0000000D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}","",0x00000000,"IBindCtx" -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"13" -HKCR,"Interface\{0000000E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}","",0x00000000,"IMoniker" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000109-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"23" -HKCR,"Interface\{0000000F-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}","",0x00000000,"IRunningObjectTable" -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{00000010-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000011-0000-0000-C000-000000000046}","",0x00000000,"IInternalMoniker" - -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}","",0x00000000,"IRootStorage" -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{00000012-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000013-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved1" - -HKCR,"Interface\{00000014-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved2" - -HKCR,"Interface\{00000015-0000-0000-C000-000000000046}","",0x00000000,"IDfReserved3" - -HKCR,"Interface\{00000016-0000-0000-C000-000000000046}","",0x00000000,"IMessageFilter" -HKCR,"Interface\{00000016-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"6" - -HKCR,"Interface\{00000018-0000-0000-C000-000000000046}","",0x00000000,"IStdMarshalInfo" -HKCR,"Interface\{00000018-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" - -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}","",0x00000000,"IEnumUnknown" -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000100-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}","",0x00000000,"IEnumString" -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000101-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}","",0x00000000,"IEnumMoniker" -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000102-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}","",0x00000000,"IEnumFORMATETC" -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000103-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}","",0x00000000,"IEnumOLEVERB" -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000104-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}","",0x00000000,"IEnumSTATDATA" -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000105-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000106-0000-0000-C000-000000000046}","",0x00000000,"IEnumGeneric" - -HKCR,"Interface\{00000107-0000-0000-C000-000000000046}","",0x00000000,"IEnumHolder" - -HKCR,"Interface\{00000108-0000-0000-C000-000000000046}","",0x00000000,"IEnumCallback" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}","",0x00000000,"IPersistStream" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" - -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{7CE551EB-F85C-11CE-9059-080036F12502}" -HKCR,"Interface\{00000109-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}","",0x00000000,"IPersistStorage" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{0000010A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}","",0x00000000,"IPersistFile" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000010C-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\Distributor","",0x00000000,"{e436ebb7-524f-11ce-9f53-0020af0ba770}" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000010B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}","",0x00000000,"IPersist" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{7CE551EB-F85C-11CE-9059-080036F12502}" -HKCR,"Interface\{0000010C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}","",0x00000000,"IViewObject" -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000010D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}","",0x00000000,"IDataObject" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"12" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\OLEViewerIViewerCLSID","",0x00000000,"{28D8ABA0-4B78-11CE-B27D-00AA001F73C1}" -HKCR,"Interface\{0000010E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}","",0x00000000,"IAdviseSink" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\AsynchronousInterface","",0x00000000,"{00000150-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" -HKCR,"Interface\{0000010F-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000110-0000-0000-C000-000000000046}","",0x00000000,"IDataAdviseHolder" -HKCR,"Interface\{00000110-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" - -HKCR,"Interface\{00000111-0000-0000-C000-000000000046}","",0x00000000,"IOleAdviseHolder" -HKCR,"Interface\{00000111-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" - -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}","",0x00000000,"IOleObject" -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"24" -HKCR,"Interface\{00000112-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceObject" - -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000113-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}","",0x00000000,"IOleWindow" -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" -HKCR,"Interface\{00000114-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceUIWindow" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000115-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceFrame" -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"15" -HKCR,"Interface\{00000116-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceActiveObject" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"10" -HKCR,"Interface\{00000117-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}","",0x00000000,"IOleClientSite" -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{00000118-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}","",0x00000000,"IOleInPlaceSite" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{00000114-0000-0000-C000-000000000046}" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"15" -HKCR,"Interface\{00000119-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}","",0x00000000,"IParseDisplayName" -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"4" -HKCR,"Interface\{0000011A-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}","",0x00000000,"IOleContainer" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000011A-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"6" -HKCR,"Interface\{0000011B-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}","",0x00000000,"IOleItemContainer" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\BaseInterface","",0x00000000,"{0000011B-0000-0000-C000-000000000046}" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"9" -HKCR,"Interface\{0000011C-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}","",0x00000000,"IOleLink" -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"14" -HKCR,"Interface\{0000011D-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}","",0x00000000,"IOleCache" -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"8" -HKCR,"Interface\{0000011E-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" - -HKCR,"Interface\{0000011F-0000-0000-C000-000000000046}","",0x00000000,"IOleManager" - -HKCR,"Interface\{00000120-0000-0000-C000-000000000046}","",0x00000000,"IOlePresObj" - -HKCR,"Interface\{00000121-0000-0000-C000-000000000046}","",0x00000000,"IDropSource" -HKCR,"Interface\{00000121-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"5" - -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}","",0x00000000,"IDropTarget" -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}\NumMethods","",0x00000000,"7" -HKCR,"Interface\{00000122-0000-0000-C000-000000000046}\ProxyStubClsid32","",0x00000000,"{00000320-0000-0000-C000-000000000046}" HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}"

1 0

[cwittich] 39527: remove Internet Explorer StartPage as it is set in shdocvw.inf
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 06:18:56 2009 New Revision: 39527 URL: http://svn.reactos.org/svn/reactos?rev=39527&view=rev Log: remove Internet Explorer StartPage as it is set in shdocvw.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Tue Feb 10 06:18:56 2009 @@ -458,9 +458,6 @@ ; 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" - HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Tue Feb 10 06:18:56 2009 @@ -458,9 +458,6 @@ ; 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" - HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\"

1 0

[cwittich] 39526: add resource file to kernel32_winetest this fixes all kernel32 resource tests spotted by Giannis Adamopoulos
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 03:25:02 2009 New Revision: 39526 URL: http://svn.reactos.org/svn/reactos?rev=39526&view=rev Log: add resource file to kernel32_winetest this fixes all kernel32 resource tests spotted by Giannis Adamopoulos Modified: trunk/rostests/winetests/kernel32/kernel32.rbuild Modified: trunk/rostests/winetests/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/kernel… ============================================================================== --- trunk/rostests/winetests/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/kernel32.rbuild [iso-8859-1] Tue Feb 10 03:25:02 2009 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true"> - <compilerflag compiler="cc">-Wno-format</compilerflag> + <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="kernel32_winetest">.</include> <define name="__USE_W32API" /> <define name="__ROS_LONG64__" /> @@ -43,5 +43,6 @@ <file>virtual.c</file> <file>volume.c</file> <file>testlist.c</file> + <file>resource.rc</file> </module> </group>

1 0

[cwittich] 39525: remove entries which are added by registering shdocvw
by cwittich＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: cwittich Date: Tue Feb 10 02:50:33 2009 New Revision: 39525 URL: http://svn.reactos.org/svn/reactos?rev=39525&view=rev Log: remove entries which are added by registering shdocvw Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Tue Feb 10 02:50:33 2009 @@ -731,107 +731,4 @@ 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/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Tue Feb 10 02:50:33 2009 @@ -731,109 +731,6 @@ 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\"" - HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0,,,"OLE Automation" HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\0\win16,,,"stdole.tlb" HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\0\win32,,,"stdole32.tlb"

1 0

[janderwald] 39524: - Move includes to a common header- Implement IKsDevice interface stubs - Add a DriverEntry - Partly implement KsAllocateObjectHeader - Check for IID_IUnknown in KoCreateInstance
by janderwald＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: janderwald Date: Tue Feb 10 01:44:43 2009 New Revision: 39524 URL: http://svn.reactos.org/svn/reactos?rev=39524&view=rev Log: - Move includes to a common header- Implement IKsDevice interface stubs - Add a DriverEntry - Partly implement KsAllocateObjectHeader - Check for IID_IUnknown in KoCreateInstance Added: trunk/reactos/drivers/ksfilter/ks/kstypes.h (with props) trunk/reactos/drivers/ksfilter/ks/priv.h (with props) Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/events.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kcom.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/properties.c trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,10 +1,5 @@ -/* =============================================================== - Allocator Functions -*/ +#include "priv.h" -#include <ntddk.h> -#include <debug.h> -#include <ks.h> /* @unimplemented Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,6 +1,6 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" + + #if 0 typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,10 +1,4 @@ -/* =============================================================== - Clock Functions -*/ - -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" typedef struct { Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,14 +1,4 @@ -/* - KsCreatePin - KsValidateConnectRequest - KsPinPropertyHandler - KsPinDataIntersection - KsHandleSizedListQuery -*/ - -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" KSDDKAPI NTSTATUS NTAPI KsCreatePin( Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,32 +1,218 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> - -#include "ksiface.h" -#include "ksfunc.h" +#include "priv.h" typedef struct { IKsDeviceVtbl *lpVtbl; LONG ref; - + KSDEVICE KsDevice; }IKsDeviceImpl; NTSTATUS NTAPI +IKsDevice_fnQueryInterface( + IN IKsDevice * iface, + REFIID InterfaceId, + PVOID* Interface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnQueryInterface %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +ULONG +NTAPI +IKsDevice_fnAddRef( + IN IKsDevice * iface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IKsDevice_fnRelease( + IN IKsDevice * iface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_KSDEVICE); + return 0; + } + + return This->ref; +} + + + +KSDEVICE * +NTAPI +IKsDevice_fnGetStruct( + IN IKsDevice * iface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + return &This->KsDevice; +} + +NTSTATUS +NTAPI +IKsDevice_fnInitializeObjectBag( + IN IKsDevice * iface, + IN struct KSIOBJECTBAG *Bag, + IN KMUTANT * Mutant) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnInitializeObjectBag %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +IKsDevice_fnAcquireDevice( + IN IKsDevice * iface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnAcquireDevice %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +IKsDevice_fnReleaseDevice( + IN IKsDevice * iface) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnReleaseDevice %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +IKsDevice_fnGetAdapterObject( + IN IKsDevice * iface, + IN PADAPTER_OBJECT Object, + IN PULONG Unknown1, + IN PULONG Unknown2) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnGetAdapterObject %p\n", This); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +IKsDevice_fnAddPowerEntry( + IN IKsDevice * iface, + IN struct KSPOWER_ENTRY * Entry, + IN IKsPowerNotify* Notify) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnAddPowerEntry %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +IKsDevice_fnRemovePowerEntry( + IN IKsDevice * iface, + IN struct KSPOWER_ENTRY * Entry) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnRemovePowerEntry %p\n", This); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +IKsDevice_fnPinStateChange( + IN IKsDevice * iface, + IN KSPIN Pin, + IN PIRP Irp, + IN KSSTATE OldState, + IN KSSTATE NewState) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnPinStateChange %p\n", This); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +IKsDevice_fnArbitrateAdapterChannel( + IN IKsDevice * iface, + IN ULONG ControlCode, + IN IO_ALLOCATION_ACTION Action, + IN PVOID Context) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnArbitrateAdapterChannel %p\n", This); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +IKsDevice_fnCheckIoCapability( + IN IKsDevice * iface, + IN ULONG Unknown) +{ + IKsDeviceImpl * This = (IKsDeviceImpl*)iface; + + DPRINT1("IKsDevice_fnCheckIoCapability %p\n", This); + return STATUS_NOT_IMPLEMENTED; +} + +static IKsDeviceVtbl vt_IKsDevice = +{ + IKsDevice_fnQueryInterface, + IKsDevice_fnAddRef, + IKsDevice_fnRelease, + IKsDevice_fnGetStruct, + IKsDevice_fnInitializeObjectBag, + IKsDevice_fnAcquireDevice, + IKsDevice_fnReleaseDevice, + IKsDevice_fnGetAdapterObject, + IKsDevice_fnAddPowerEntry, + IKsDevice_fnRemovePowerEntry, + IKsDevice_fnPinStateChange, + IKsDevice_fnArbitrateAdapterChannel, + IKsDevice_fnCheckIoCapability +}; + + + +NTSTATUS +NTAPI NewIKsDevice(IKsDevice** OutDevice) { IKsDeviceImpl * This; - This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), 0x12345678); //FIX TAG + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), TAG_KSDEVICE); if (!This) return STATUS_INSUFFICIENT_RESOURCES; This->ref = 1; - //This->lpVtbl = &vt_IKsDevice; + This->lpVtbl = &vt_IKsDevice; *OutDevice = (IKsDevice*)This; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,9 +1,18 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" #include "ksfunc.h" + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT Driver, + IN PUNICODE_STRING Registry_path +) +{ + DPRINT1("ks.sys loaded\n"); + return STATUS_SUCCESS; +} /* @unimplemented Modified: trunk/reactos/drivers/ksfilter/ks/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,6 +1,4 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" /* =============================================================== Event Functions Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -3,11 +3,7 @@ IRP Helpers */ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> - -#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#include "priv.h" /* @unimplemented @@ -145,32 +141,31 @@ */ KSDDKAPI NTSTATUS NTAPI KsAllocateObjectHeader( - OUT PVOID Header, + OUT KSOBJECT_HEADER *Header, IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL, IN PIRP Irp, IN KSDISPATCH_TABLE* Table) { - /* NOTE: PKSOBJECT_HEADER is not defined yet */ -#if 0 - PKSOBJECT_HEADER object_header; - - /* TODO: Validate parameters */ - - object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), TAG('H','O','S','K')); - - if ( ! object_header ) + PKSIOBJECT_HEADER ObjectHeader; + + ObjectHeader = ExAllocatePoolWithTag(PagedPool, sizeof(KSIOBJECT_HEADER), TAG_KSOBJECT_TAG); + if (!ObjectHeader) { return STATUS_INSUFFICIENT_RESOURCES; } - (PVOID)(*Header) = object_header; - - /* TODO ... */ -#endif - - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + RtlZeroMemory(ObjectHeader, sizeof(KSIOBJECT_HEADER)); + + RtlCopyMemory(&ObjectHeader->DispatchTable, Table, sizeof(KSDISPATCH_TABLE)); + ObjectHeader->CreateItem = ItemsList; + + //FIXME + // copy itemlist + + *Header = ObjectHeader; + return STATUS_SUCCESS; + } /* @@ -584,11 +579,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PIO_STACK_LOCATION IoStack; + /* TODO - Nothing implemented really yet! */ - - DPRINT1("KS IRP dispatch function called\n"); - - //PKSDISPATCH_TABLE ks_dispatch_table = NULL; + IoStack = IoGetCurrentIrpStackLocation(Irp); + + + DPRINT1("KS IRP dispatch function called with func %x\n", IoStack->MajorFunction); /* ks_dispatch_table is the first element in a structure pointed to by FsContext */ Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -2,11 +2,9 @@ Kernel-mode COM */ -#include <ntddk.h> -#include <portcls.h> -#include <kcom.h> -#include <debug.h> +#include "priv.h" +const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */ COMDDKAPI NTSTATUS NTAPI @@ -24,9 +22,16 @@ if ( ClsContext != CLSCTX_KERNEL_SERVER ) { - DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n"); + DPRINT("KoCreateInstance: ClsContext must be CLSCTX_KERNEL_SERVER\n"); return STATUS_INVALID_PARAMETER_3; } + + if (IsEqualGUIDAligned(InterfaceId, &IID_IUnknown)) + { + DPRINT("KoCreateInstance: InterfaceId cannot be IID_IUnknown\n"); + return STATUS_INVALID_PARAMETER_4; + } + /* Find the desired interface and create an instance. Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -7,8 +7,9 @@ NTAPI NewIKsDevice(IKsDevice** OutDevice); - - +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_KSDEVICE TAG('K', 'S', 'E', 'D') +#define TAG_KSOBJECT_TAG TAG('K', 'S', 'O', 'H') Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -4,7 +4,15 @@ #include <ntddk.h> #include <ks.h> +#if !defined(DEFINE_ABSTRACT_UNKNOWN) +#define DEFINE_ABSTRACT_UNKNOWN() \ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ \ + REFIID InterfaceId, \ + PVOID* Interface)PURE; \ + STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ + STDMETHOD_(ULONG,Release)(THIS) PURE; +#endif /***************************************************************************** * IKsFilterFactory @@ -14,16 +22,13 @@ #undef INTERFACE #define INTERFACE IKsFilterFactory -struct KSFILTERFACTORY; - DECLARE_INTERFACE_(IKsFilterFactory, IUnknown) { - //DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_UNKNOWN() - STDMETHOD_(struct KSFILTERFACTORY*,GetStruct)(THIS) PURE; + STDMETHOD_(KSFILTERFACTORY*,GetStruct)(THIS) PURE; STDMETHOD_(NTSTATUS,SetDeviceClassesState)(THIS_ - IN ULONG Unknown1, IN BOOLEAN Enable)PURE; }; @@ -38,12 +43,12 @@ DECLARE_INTERFACE_(IKsPowerNotify, IUnknown) { - //DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_UNKNOWN() - STDMETHOD_(ULONG,Sleep)(THIS_ + STDMETHOD_(VOID,Sleep)(THIS_ IN DEVICE_POWER_STATE State) PURE; - STDMETHOD_(ULONG,Wake)(THIS) PURE; + STDMETHOD_(VOID,Wake)(THIS) PURE; }; @@ -60,27 +65,27 @@ DECLARE_INTERFACE_(IKsDevice, IUnknown) { - //DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_UNKNOWN() - STDMETHOD_(struct KSDEVICE*,GetStruct)(THIS) PURE; + STDMETHOD_(KSDEVICE*,GetStruct)(THIS) PURE; STDMETHOD_(NTSTATUS, InitializeObjectBag)(THIS_ IN struct KSIOBJECTBAG *Bag, IN KMUTANT * Mutant) PURE; - STDMETHOD_(ULONG,AcquireDevice)(THIS) PURE; - STDMETHOD_(ULONG,ReleaseDevice)(THIS) PURE; + STDMETHOD_(NTSTATUS,AcquireDevice)(THIS) PURE; + STDMETHOD_(NTSTATUS,ReleaseDevice)(THIS) PURE; - STDMETHOD_(VOID, GetAdapterObject)(THIS_ + STDMETHOD_(NTSTATUS, GetAdapterObject)(THIS_ IN PADAPTER_OBJECT Object, IN PULONG Unknown1, IN PULONG Unknown2) PURE; - STDMETHOD_(VOID, AddPowerEntry)(THIS_ + STDMETHOD_(NTSTATUS, AddPowerEntry)(THIS_ IN struct KSPOWER_ENTRY * Entry, - IN struct IKsPowerNotify* Notify)PURE; + IN IKsPowerNotify* Notify)PURE; - STDMETHOD_(VOID, RemovePowerEntry)(THIS_ + STDMETHOD_(NTSTATUS, RemovePowerEntry)(THIS_ IN struct KSPOWER_ENTRY * Entry)PURE; STDMETHOD_(NTSTATUS, PinStateChange)(THIS_ Added: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h (added) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,0 +1,18 @@ +#ifndef KSTYPES_H__ +#define KSTYPES_H__ + +typedef struct +{ + KSDISPATCH_TABLE DispatchTable; + LIST_ENTRY ListEntry; + ACCESS_MASK AccessMask; + PKSOBJECT_CREATE_ITEM CreateItem; + +}KSIOBJECT_HEADER, *PKSIOBJECT_HEADER; + + + + + + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/kstypes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,10 +1,8 @@ +#include "priv.h" + /* =============================================================== Method Functions */ - -#include <ntddk.h> -#include <debug.h> -#include <ks.h> /* @unimplemented Added: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h (added) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,0 +1,19 @@ +#ifndef PRIV_H__ +#define PRIV_H__ + +#include <ntddk.h> +#include <debug.h> +#include <ks.h> +#include <portcls.h> +#include <kcom.h> + +#include "ksfunc.h" +#include "kstypes.h" +#include "ksiface.h" + + + + + + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/priv.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/properties.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/properties.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,6 +1,4 @@ -#include <ntddk.h> -#include <debug.h> -#include <ks.h> +#include "priv.h" /* =============================================================== Property Functions Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Tue Feb 10 01:44:43 2009 @@ -1,11 +1,8 @@ +#include "priv.h" + /* =============================================================== Worker Management Functions */ - -#include <ntddk.h> -#include <debug.h> -#include <ks.h> - typedef struct {

1 0

[janderwald] 39523: - Fix include guard - Define PKNKSFREE type - Add KSFILTERFACTORY type - Fix definition of KsAllocateObjectHeader - Fix calling convention for lots of functions - Remove dummy stub implementations
by janderwald＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: janderwald Date: Tue Feb 10 01:44:14 2009 New Revision: 39523 URL: http://svn.reactos.org/svn/reactos?rev=39523&view=rev Log: - Fix include guard - Define PKNKSFREE type - Add KSFILTERFACTORY type - Fix definition of KsAllocateObjectHeader - Fix calling convention for lots of functions - Remove dummy stub implementations Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3952… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Feb 10 01:44:14 2009 @@ -27,9 +27,7 @@ &Overlapped); */ -#ifndef KS_H -#define KS_H - +#ifndef _KS_ #define _KS_ #ifdef __cplusplus @@ -1533,6 +1531,11 @@ KSPRIORITY Priority; } KSPIN_CONNECT, *PKSPIN_CONNECT; +typedef +void +(*PFNKSFREE)( + IN PVOID Data + ); /* =============================================================== Topology @@ -1825,6 +1828,13 @@ ULONG FilterDescriptorsCount; const KSFILTER_DESCRIPTOR*const* FilterDescriptors; }; + +struct _KSFILTERFACTORY { + const KSFILTER_DESCRIPTOR* FilterDescriptor; + KSOBJECT_BAG Bag; + PVOID Context; +}; + #endif /* =============================================================== Minidriver Callbacks @@ -2221,7 +2231,7 @@ KSDDKAPI NTSTATUS NTAPI KsAllocateObjectHeader( - OUT PVOID Header, + OUT KSOBJECT_HEADER *Header, IN ULONG ItemsCount, IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL, IN PIRP Irp, @@ -2578,19 +2588,23 @@ */ #if defined(_NTDDK_) -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsInitializeDriver( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath, IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL); -#endif - -#if 0 + +typedef struct _KSFILTERFACTORY KSFILTERFACTORY, *PKSFILTERFACTORY; //FIXME + typedef void (*PFNKSFILTERFACTORYPOWER)( IN PKSFILTERFACTORY FilterFactory, IN DEVICE_POWER_STATE State); -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI _KsEdit( IN KSOBJECT_BAG ObjectBag, IN OUT PVOID* PointerToPointerToItem, @@ -2598,71 +2612,73 @@ IN ULONG OldSize, IN ULONG Tag); +KSDDKAPI VOID +NTAPI KsAcquireControl( - IN PVOID Object) -{ -} - + IN PVOID Object); + +KSDDKAPI VOID +NTAPI KsAcquireDevice( - IN PKSDEVICE Device) -{ -} - + IN PKSDEVICE Device); + +KSDDKAPI NTSTATUS +NTAPI KsAddDevice( IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) -{ -} - + IN PDEVICE_OBJECT PhysicalDeviceObject); + +KSDDKAPI VOID +NTAPI KsAddEvent( IN PVOID Object, - IN PKSEVENT_ENTRY EventEntry) -{ -} - + IN PKSEVENT_ENTRY EventEntry); + +KSDDKAPI NTSTATUS +NTAPI KsAddItemToObjectBag( IN KSOBJECT_BAG ObjectBag, IN PVOID Item, - IN PFNKSFREE Free OPTIONAL) -{ -} - + IN PFNKSFREE Free OPTIONAL); + +KSDDKAPI NTSTATUS +NTAPI KsAllocateObjectBag( IN PKSDEVICE Device, - OUT KSOBJECT_BAG* ObjectBag) -{ -} - + OUT KSOBJECT_BAG* ObjectBag); + +KSDDKAPI VOID +NTAPI KsCompletePendingRequest( - IN PIRP Irp) -{ -} - + IN PIRP Irp); + +KSDDKAPI NTSTATUS +NTAPI KsCopyObjectBagItems( IN KSOBJECT_BAG ObjectBagDestination, - IN KSOBJECT_BAG ObjectBagSource) -{ -} - + IN KSOBJECT_BAG ObjectBagSource); + +KSDDKAPI NTSTATUS +NTAPI KsCreateDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject, IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, IN ULONG ExtensionSize OPTIONAL, - OUT PKSDEVICE* Device OPTIONAL) -{ -} - + OUT PKSDEVICE* Device OPTIONAL); + +KSDDKAPI NTSTATUS +NTAPI KsCreateFilterFactory( IN PDEVICE_OBJECT DeviceObject, IN const KSFILTER_DESCRIPTOR* Descriptor, @@ -2671,114 +2687,136 @@ IN ULONG CreateItemFlags, IN PFNKSFILTERFACTORYPOWER SleepCallback OPTIONAL, IN PFNKSFILTERFACTORYPOWER WakeCallback OPTIONAL, - OUT PKFSFILTERFACTORY FilterFactory OPTIONAL) -{ -} - + OUT PKSFILTERFACTORY FilterFactory OPTIONAL); + +KSDDKAPI NTSTATUS +NTAPI KsDefaultAddEventHandler( IN PIRP Irp, IN PKSEVENTDATA EventData, - IN OUT PKSEVENT_ENTRY EventEntry) -{ -} - -NTSTATUS -KsDeleteFilterFactory( - IN PKSFILTERFACTORY FilterFactory) -{ -} - + IN OUT PKSEVENT_ENTRY EventEntry); + + +#define KsDeleteFilterFactory(FilterFactory) \ + KsFreeObjectCreateItemsByContext( \ + *(KSDEVICE_HEADER *)( \ + KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject-> \ + DeviceExtension), \ + FilterFactory) + +KSDDKAPI ULONG +NTAPI KsDeviceGetBusData( IN PKSDEVICE Device, IN ULONG DataType, IN PVOID Buffer, IN ULONG Offset, - IN ULONG Length) -{ -} - + IN ULONG Length); + + +KSDDKAPI +PVOID +NTAPI +KsGetFirstChild( + IN PVOID Object + ); + +KSDDKAPI PKSFILTERFACTORY +NTAPI KsDeviceGetFirstChildFilterFactory( - IN PKSDEVICE Device) -{ -} + IN PKSDEVICE Device); + +#if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) PUNKNOWN +NTAPI KsDeviceGetOuterUnknown( IN PKSDEVICE Device) { + return KsGetOuterUnknown((PVOID) Device); } +KSDDKAPI +PUNKNOWN +NTAPI +KsDeviceRegisterAggregatedClientUnknown( + IN PKSDEVICE Device, + IN PUNKNOWN ClientUnknown); + +#endif + +KSDDKAPI VOID +NTAPI KsDeviceRegisterAdapterObject( IN PKSDEVICE Device, IN PADAPTER_OBJECT AdapterObject, IN ULONG MaxMappingByteCount, - IN ULONG MappingTableStride) -{ -} - -KSDDKAPI PUNKNOWN NTAPI -KsDeviceRegisterAggregatedClientUnknown( - IN PKSDEVICE Device, - IN PUNKNOWN ClientUnknown); - + IN ULONG MappingTableStride); + +KSDDKAPI ULONG +NTAPI KsDeviceSetBusData( IN PKSDEVICE Device, IN ULONG DataType, IN PVOID Buffer, IN ULONG Offset, - IN ULONG Length) -{ -} + IN ULONG Length); + #define KsDiscard(object, pointer) \ KsRemoveItemFromObjectBag(object->Bag, pointer, TRUE) +#define KsFilterAcquireControl(Filter) \ + KsAcquireControl((PVOID) Filter); + +#define KsFilterAddEvent(Filter, EventEntry) \ + KsAddEvent(Filter,EventEntry); + +KSDDKAPI VOID -KsFilterAcquireControl( - IN PKSFILTER Filter) -{ -} - -VOID +NTAPI KsFilterAcquireProcessingMutex( IN PKSFILTER Filter); -VOID -KsFilterAddEvent( - IN PKSFILTER Filter, - IN PKSEVENT_ENTRY EventEntry) -{ -} - -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsFilterAddTopologyConnections( IN PKSFILTER Filter, IN ULONG NewConnectionsCount, IN const KSTOPOLOGY_CONNECTION* NewTopologyConnections); +KSDDKAPI VOID +NTAPI KsFilterAttemptProcessing( IN PKSFILTER Filter, IN BOOLEAN Asynchronous); -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsFilterCreateNode( IN PKSFILTER Filter, IN const KSNODE_DESCRIPTOR* NodeDescriptor, OUT PULONG NodeID); -KSDDKAPI NTSTATUS NTAPI +KSDDKAPI +NTSTATUS +NTAPI KsFilterCreatePinFactory( IN PKSFILTER Filter, IN const KSPIN_DESCRIPTOR_EX* PinDescriptor, OUT PULONG PinID); -PKSDEVICE __inline +KSDDKAPI +PKSDEVICE +__inline KsFilterFactoryGetDevice( IN PKSFILTERFACTORY FilterFactory);

1 0

[tkreuzer] 39522: ExInitializeSystemlookasideList: Use InitializeSListHead instead of directly accessing the members ExpAllocateLocallyUniqueId: use InterlockedCompareExchange64 instead of non-portable ExfInterlockedCompareExchange64
by tkreuzer＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: tkreuzer Date: Mon Feb 9 23:27:36 2009 New Revision: 39522 URL: http://svn.reactos.org/svn/reactos?rev=39522&view=rev Log: ExInitializeSystemlookasideList: Use InitializeSListHead instead of directly accessing the members ExpAllocateLocallyUniqueId: use InterlockedCompareExchange64 instead of non-portable ExfInterlockedCompareExchange64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/lookas.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/uuid.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/lookas.c [iso-8859-1] Mon Feb 9 23:27:36 2009 @@ -47,9 +47,7 @@ List->Depth = 2; List->Allocate = ExAllocatePoolWithTag; List->Free = ExFreePool; - List->ListHead.Next.Next = NULL; - List->ListHead.Depth = 0; - List->ListHead.Sequence = 0; + InitializeSListHead(&List->ListHead); List->TotalAllocates = 0; List->AllocateHits = 0; List->TotalFrees = 0; @@ -75,6 +73,7 @@ /* Bind to PRCB */ #ifdef _M_AMD64 + DPRINT1("Something is missing here, Prcb = %p\n", Prcb); // FIXME #else Prcb->PPNPagedLookasideList[i].P = Entry; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/uuid.c [iso-8859-1] Mon Feb 9 23:27:36 2009 @@ -239,9 +239,9 @@ PrevLuid = LuidValue; NewLuid = RtlLargeIntegerAdd(PrevLuid, LuidIncrement); - } while(ExfInterlockedCompareExchange64(&LuidValue.QuadPart, - &NewLuid.QuadPart, - &PrevLuid.QuadPart) != PrevLuid.QuadPart); + } while(InterlockedCompareExchange64(&LuidValue.QuadPart, + NewLuid.QuadPart, + PrevLuid.QuadPart) != PrevLuid.QuadPart); LocallyUniqueId->LowPart = NewLuid.u.LowPart; LocallyUniqueId->HighPart = NewLuid.u.HighPart;

1 0

[tkreuzer] 39521: fix a typo
by tkreuzer＠svn.reactos.org 10 Feb '09

10 Feb '09

Author: tkreuzer Date: Mon Feb 9 21:10:33 2009 New Revision: 39521 URL: http://svn.reactos.org/svn/reactos?rev=39521&view=rev Log: fix a typo Modified: trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=3952… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Feb 9 21:10:33 2009 @@ -276,7 +276,7 @@ ULONGLONG HeaderType:1; ULONGLONG Init:1; ULONGLONG Reserved:2; - ULONGLONG Region:60; + ULONGLONG NextEntry:60; struct { } Header16; } SLIST_HEADER, *PSLIST_HEADER;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
56
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 February 2009