Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 20377: USB 2.5.0 -> 2.6.14.3 upgrade: Adding information about bus number to which this HC is connected to (needed in further calls to read/write pci config space)
by fireball＠svn.reactos.com 27 Dec '05

27 Dec '05

USB 2.5.0 -> 2.6.14.3 upgrade: Adding information about bus number to which this HC is connected to (needed in further calls to read/write pci config space) Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h _____ Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h --- trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h 2005-12-27 18:59:13 UTC (rev 20376) +++ trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h 2005-12-27 21:00:19 UTC (rev 20377) @@ -26,7 +26,7 @@ ULONG BaseAddrLength; ULONG Flags; //ULONG AdapterInterfaceType; - //ULONG SystemIoBusNumber; + ULONG SystemIoBusNumber; ULONG SystemIoSlotNumber; //LIST_ENTRY AddressMappingListHead;

1 0

[gedmurphy] 20376: Fix a few msvc warnings
by gedmurphy＠svn.reactos.com 27 Dec '05

27 Dec '05

Fix a few msvc warnings Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Modified: trunk/reactos/apps/utils/net/tracert/tracert.h _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-12-27 18:47:11 UTC (rev 20375) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-12-27 18:59:13 UTC (rev 20376) @@ -69,21 +69,7 @@ INT iHostList; // -j @UNIMPLEMENTED@ INT iTimeOut = 2000; // -w time before packet times out -/* function definitions */ -static BOOL ParseCmdline(int argc, char* argv[]); -static INT Driver(void); -static INT Setup(INT ttl); -static VOID SetupTimingMethod(void); -static VOID ResolveHostname(void); -static VOID PreparePacket(INT packetSize, INT seqNum); -static INT SendPacket(INT datasize); -static INT ReceivePacket(INT datasize); -static INT DecodeResponse(INT packetSize, INT seqNum); -static LONG GetTime(void); -static WORD CheckSum(PUSHORT data, UINT size); -static VOID Usage(void); - /* * * Parse command line parameters and set any options @@ -137,7 +123,7 @@ { INT iHopCount = 1; // hop counter. default max is 30 - INT iSeqNum = 0; // initialise packet sequence number + USHORT iSeqNum = 0; // initialise packet sequence number INT iTTL = 1; // set initial packet TTL to 1 BOOL bFoundTarget = FALSE; // Have we reached our destination yet BOOL bAwaitPacket; // indicates whether we have recieved a good packet @@ -433,7 +419,7 @@ * Calculate the packet checksum * */ -static VOID PreparePacket(INT iPacketSize, INT iSeqNum) +static VOID PreparePacket(INT iPacketSize, USHORT iSeqNum) { /* assemble ICMP echo request packet */ sendpacket.icmpheader.type = ECHO_REQUEST; @@ -480,8 +466,8 @@ if (WSAGetLastError() == WSAEACCES) { _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); - exit(1); WSACleanup(); + exit(1); } else { @@ -584,7 +570,7 @@ * It all is well, print the time taken for the round trip. * */ -static INT DecodeResponse(INT iPacketSize, INT iSeqNum) +static INT DecodeResponse(INT iPacketSize, USHORT iSeqNum) { unsigned short header_len = recvpacket.h_len * 4; /* cast the recieved packet into an ECHO reply and a TTL Exceed so we can check the ID*/ @@ -645,7 +631,7 @@ * */ -static LONG GetTime(VOID) +static LONGLONG GetTime(VOID) { LARGE_INTEGER Time; _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.h --- trunk/reactos/apps/utils/net/tracert/tracert.h 2005-12-27 18:47:11 UTC (rev 20375) +++ trunk/reactos/apps/utils/net/tracert/tracert.h 2005-12-27 18:59:13 UTC (rev 20376) @@ -68,3 +68,16 @@ /* return to normal */ #include <poppack.h> +/* function definitions */ +static BOOL ParseCmdline(int argc, char* argv[]); +static INT Driver(void); +static INT Setup(INT ttl); +static VOID SetupTimingMethod(void); +static VOID ResolveHostname(void); +static VOID PreparePacket(INT packetSize, USHORT seqNum); +static INT SendPacket(INT datasize); +static INT ReceivePacket(INT datasize); +static INT DecodeResponse(INT packetSize, USHORT seqNum); +static LONGLONG GetTime(void); +static WORD CheckSum(PUSHORT data, UINT size); +static VOID Usage(void);

1 0

[gedmurphy] 20375: silence msvc warning
by gedmurphy＠svn.reactos.com 27 Dec '05

27 Dec '05

silence msvc warning Modified: trunk/reactos/subsys/system/userinit/userinit.c _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2005-12-27 18:05:53 UTC (rev 20374) +++ trunk/reactos/subsys/system/userinit/userinit.c 2005-12-27 18:47:11 UTC (rev 20375) @@ -142,6 +142,10 @@ } } +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif /* _MSC_VER */ + int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance,

1 0

[gedmurphy] 20374: Silence most of the msvc warnings
by gedmurphy＠svn.reactos.com 27 Dec '05

27 Dec '05

Silence most of the msvc warnings Modified: trunk/reactos/services/tcpsvcs/chargen.c Modified: trunk/reactos/services/tcpsvcs/daytime.c Modified: trunk/reactos/services/tcpsvcs/discard.c Modified: trunk/reactos/services/tcpsvcs/echo.c Modified: trunk/reactos/services/tcpsvcs/qotd.c Modified: trunk/reactos/services/tcpsvcs/skelserver.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h _____ Modified: trunk/reactos/services/tcpsvcs/chargen.c --- trunk/reactos/services/tcpsvcs/chargen.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/chargen.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -21,13 +21,13 @@ DWORD WINAPI ChargenHandler(VOID* Sock_) { - DWORD RetVal = 0; + INT RetVal = 0; SOCKET Sock = (SOCKET)Sock_; if (!GenerateChars(Sock)) { LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE); @@ -36,7 +36,7 @@ else { LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE); @@ -56,7 +56,7 @@ /* fill ring with printable characters */ for (charIndex=0, i=START; i<=END; charIndex++, i++) - ring[charIndex] = i; + ring[charIndex] = (char)i; /* save the address of the end character in the ring */ endring = &ring[charIndex]; _____ Modified: trunk/reactos/services/tcpsvcs/daytime.c --- trunk/reactos/services/tcpsvcs/daytime.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/daytime.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -38,7 +38,7 @@ else { LogEvent(_T("DayTime: Connection shutdown failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE); @@ -48,7 +48,7 @@ BOOL SendTime(SOCKET Sock, TCHAR *time) { - INT StringSize = strlen(time); + INT StringSize = (INT)_tcsclen(time); INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0); if (RetVal == SOCKET_ERROR) _____ Modified: trunk/reactos/services/tcpsvcs/discard.c --- trunk/reactos/services/tcpsvcs/discard.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/discard.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -24,7 +24,7 @@ if (!RecieveIncomingPackets(Sock)) { LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE); @@ -33,7 +33,7 @@ else { LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE); _____ Modified: trunk/reactos/services/tcpsvcs/echo.c --- trunk/reactos/services/tcpsvcs/echo.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/echo.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -23,7 +23,7 @@ if (!EchoIncomingPackets(Sock)) { LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE); @@ -33,7 +33,7 @@ else { LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE); - RetVal = -1; + RetVal = 1; } LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE); _____ Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/qotd.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -36,7 +36,7 @@ if(! GetSystemDirectory(Sys, MAX_PATH)) { LogEvent(_T("QOTD: Getting system path failed.\n"), 0, TRUE); - ExitThread(-1); + ExitThread(1); } _tcscat(Sys, FilePath); @@ -49,7 +49,7 @@ _stprintf(buf, _T("QOTD: Error opening quote file : %s\n"), Sys); LogEvent(buf, 0, TRUE); LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); - ExitThread(-1); + ExitThread(1); } /* read all quotes in the file into an array */ @@ -75,7 +75,7 @@ { LogEvent(_T("QOTD: Connection shutdown failed\n"), 0, FALSE); LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); - ExitThread(-1); + ExitThread(1); } LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); @@ -90,7 +90,7 @@ INT StringSize; INT RetVal; - StringSize = strlen(Quote); + StringSize = (INT)_tcsclen(Quote); RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0); if (RetVal == SOCKET_ERROR) _____ Modified: trunk/reactos/services/tcpsvcs/skelserver.c --- trunk/reactos/services/tcpsvcs/skelserver.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/skelserver.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -21,13 +21,12 @@ { SOCKET ListeningSocket; PSERVICES pServices; - const TCHAR* HostIP = "127.0.0.1"; TCHAR buf[256]; pServices = (PSERVICES)lpParam; //DebugBreak(); - ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); + ListeningSocket = SetUpListener(htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { LogEvent("Socket error when setting up listener\n", 0, TRUE); @@ -45,7 +44,7 @@ } -SOCKET SetUpListener(const char* ServAddr, int Port) +SOCKET SetUpListener(USHORT Port) { SOCKET Sock; SOCKADDR_IN Server; _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-12-27 18:05:53 UTC (rev 20374) @@ -52,7 +52,7 @@ int -main(int argc, char *argv[]) +main(void) { SERVICE_TABLE_ENTRY ServiceTable[] = { @@ -245,12 +245,10 @@ } -/* LogEvent is similar to the ReportError function used elsewhere - For a service, however, we ReportEvent rather than write to standard - error. Eventually, this function should go into the utility - library. */ +/* This is a temperary log system until our eventlog is in place */ + VOID -LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg) +LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg) { DWORD eMsgLen, ErrNum = GetLastError (); LPTSTR lpvSysMsg; @@ -265,7 +263,7 @@ ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpvSysMsg, 0, NULL); - _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %lu."), + _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %d."), UserMessage, lpvSysMsg, ErrNum, ExitCode); HeapFree(GetProcessHeap (), 0, lpvSysMsg); } _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h --- trunk/reactos/services/tcpsvcs/tcpsvcs.h 2005-12-27 17:15:51 UTC (rev 20373) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.h 2005-12-27 18:05:53 UTC (rev 20374) @@ -44,7 +44,7 @@ /* data structure to pass to threads */ typedef struct _Services { - INT Port; + USHORT Port; TCHAR *Name; LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; @@ -53,13 +53,13 @@ //static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); VOID WINAPI ServerCtrlHandler(DWORD control); INT CreateServers(VOID); -VOID LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg); +VOID LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg); void UpdateStatus (int NewStatus, int Check); /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); -SOCKET SetUpListener(const char* ServAddr, int Port); +SOCKET SetUpListener(USHORT Port); VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service, TCHAR *Name); BOOL EchoIncomingPackets(SOCKET sd);

1 0

[weiden] 20373: Display the driver provider, date and version. Based on a patch by Herve.
by weiden＠svn.reactos.com 27 Dec '05

27 Dec '05

Display the driver provider, date and version. Based on a patch by Herve. Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-27 16:19:07 UTC (rev 20372) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-27 17:15:51 UTC (rev 20373) @@ -79,6 +79,71 @@ #define PM_INITIALIZE (WM_APP + 0x101) +static VOID +UpdateDriverDlg(IN HWND hwndDlg, + IN PDEVADVPROP_INFO dap) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + /* set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* set the device name edit control text */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); + + /* query the driver provider */ + if (GetDriverProviderString(DeviceInfoSet, + DeviceInfoData, + dap->szTemp, + sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) + { + SetDlgItemText(hwndDlg, + IDC_DRVPROVIDER, + dap->szTemp); + } + + /* query the driver date */ + if (GetDriverDateString(DeviceInfoSet, + DeviceInfoData, + dap->szTemp, + sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) + { + SetDlgItemText(hwndDlg, + IDC_DRVDATE, + dap->szTemp); + } + + /* query the driver version */ + if (GetDriverVersionString(DeviceInfoSet, + DeviceInfoData, + dap->szTemp, + sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) + { + SetDlgItemText(hwndDlg, + IDC_DRVVERSION, + dap->szTemp); + } +} + + static INT_PTR CALLBACK AdvProcDriverDlgProc(IN HWND hwndDlg, @@ -116,17 +181,8 @@ DWL_USER, (DWORD_PTR)dap); - /* set the device image */ - SendDlgItemMessage(hwndDlg, - IDC_DEVICON, - STM_SETICON, - (WPARAM)dap->hDevIcon, - 0); - - /* set the device name edit control text */ - SetDlgItemText(hwndDlg, - IDC_DEVNAME, - dap->szDevName); + UpdateDriverDlg(hwndDlg, + dap); } Ret = TRUE; break; @@ -391,7 +447,7 @@ } else { - GetParentNode: +GetParentNode: /* get the parent node from the initial devinst */ CM_Get_Parent_Ex(&dap->ParentDevInst, dap->DeviceInfoData.DevInst, _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-27 16:19:07 UTC (rev 20372) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-27 17:15:51 UTC (rev 20373) @@ -449,10 +449,13 @@ else { GeneralMessage: - Ret = LoadString(hDllInstance, - MessageId, - szBuffer, - (int)BufferSize); + if (LoadString(hDllInstance, + MessageId, + szBuffer, + (int)BufferSize)) + { + Ret = TRUE; + } } return Ret; @@ -460,6 +463,189 @@ BOOL +GetDriverProviderString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize) +{ + HKEY hKey; + DWORD dwSize, dwType; + BOOL Ret = FALSE; + + szBuffer[0] = L'\0'; + + /* get driver provider, date and version */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + /* query the driver provider */ + dwSize = BufferSize; + if (RegQueryValueEx(hKey, + REGSTR_VAL_PROVIDER_NAME, + NULL, + &dwType, + (LPBYTE)szBuffer, + &dwSize) == ERROR_SUCCESS && + dwType == REG_SZ && + szBuffer[0] != L'\0') + { + Ret = TRUE; + } + else + { + szBuffer[0] = L'\0'; + } + + RegCloseKey(hKey); + } + + if (szBuffer[0] == L'\0') + { + /* unable to query the information */ + if (LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } + + return Ret; +} + + +BOOL +GetDriverVersionString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize) +{ + HKEY hKey; + DWORD dwSize, dwType; + BOOL Ret = FALSE; + + szBuffer[0] = L'\0'; + + /* get driver provider, date and version */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + /* query the driver provider */ + dwSize = BufferSize; + if (RegQueryValueEx(hKey, + L"DriverVersion", + NULL, + &dwType, + (LPBYTE)szBuffer, + &dwSize) == ERROR_SUCCESS && + dwType == REG_SZ && + szBuffer[0] != L'\0') + { + Ret = TRUE; + } + else + { + szBuffer[0] = L'\0'; + } + + RegCloseKey(hKey); + } + + if (szBuffer[0] == L'\0') + { + /* unable to query the information */ + if (LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } + + return Ret; +} + +BOOL +GetDriverDateString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize) +{ + HKEY hKey; + FILETIME DriverDate; + SYSTEMTIME SystemTime, LocalTime; + DWORD dwSize, dwType; + BOOL Ret = FALSE; + + szBuffer[0] = L'\0'; + + /* get driver provider, date and version */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + /* query the driver provider */ + dwSize = sizeof(FILETIME); + if (RegQueryValueEx(hKey, + L"DriverDateData", + NULL, + &dwType, + (LPBYTE)&DriverDate, + &dwSize) == ERROR_SUCCESS && + dwType == REG_BINARY && + dwSize == sizeof(FILETIME) && + FileTimeToSystemTime(&DriverDate, + &SystemTime) && + SystemTimeToTzSpecificLocalTime(NULL, + &SystemTime, + &LocalTime) && + GetDateFormat(LOCALE_USER_DEFAULT, + DATE_SHORTDATE, + &LocalTime, + NULL, + szBuffer, + BufferSize) != 0) + { + Ret = TRUE; + } + + RegCloseKey(hKey); + } + + if (!Ret) + { + /* unable to query the information */ + if (LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + } + + return Ret; +} + + + +BOOL IsDeviceHidden(IN DEVINST DevInst, IN HMACHINE hMachine, OUT BOOL *IsHidden) _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-27 16:19:07 UTC (rev 20372) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-27 17:15:51 UTC (rev 20373) @@ -2,6 +2,7 @@ #define __DEVMGR_H #include <windows.h> +#include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> @@ -257,6 +258,24 @@ IN DWORD BufferSize); BOOL +GetDriverProviderString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize); + +BOOL +GetDriverVersionString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize); + +BOOL +GetDriverDateString(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT LPWSTR szBuffer, + IN DWORD BufferSize); + +BOOL IsDeviceHidden(IN DEVINST DevInst, IN HMACHINE hMachine, OUT BOOL *IsHidden);

1 0

[weiden] 20372: properly read the cursor hotspots from the resource
by weiden＠svn.reactos.com 27 Dec '05

27 Dec '05

properly read the cursor hotspots from the resource Modified: trunk/reactos/lib/user32/windows/icon.c _____ Modified: trunk/reactos/lib/user32/windows/icon.c --- trunk/reactos/lib/user32/windows/icon.c 2005-12-27 15:33:31 UTC (rev 20371) +++ trunk/reactos/lib/user32/windows/icon.c 2005-12-27 16:19:07 UTC (rev 20372) @@ -246,11 +246,11 @@ if (! fIcon) { - wXHotspot = (WORD)*pbIconBits; - pbIconBits+=2; - wYHotspot = (WORD)*pbIconBits; - pbIconBits+=2; - cbIconBits-=4; + wXHotspot = *(WORD*)pbIconBits; + pbIconBits+=sizeof(WORD); + wYHotspot = *(WORD*)pbIconBits; + pbIconBits+=sizeof(WORD); + cbIconBits-=2*sizeof(WORD); } else {

1 0

[weiden] 20371: fixed difference in signedness warnings
by weiden＠svn.reactos.com 27 Dec '05

27 Dec '05

fixed difference in signedness warnings Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-27 15:19:45 UTC (rev 20370) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-27 15:33:31 UTC (rev 20371) @@ -7210,7 +7210,7 @@ LPWSTR InterfaceGuidString = NULL; LPWSTR ReferenceString = NULL; LPWSTR InterfaceSection = NULL; - UINT InterfaceFlags; + INT InterfaceFlags; GUID InterfaceGuid; BOOL Result; _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-12-27 15:19:45 UTC (rev 20370) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-12-27 15:33:31 UTC (rev 20371) @@ -1524,7 +1524,7 @@ res = IntCreateBitmapIndirect(&bm); if(res) { - char *buf; + PBYTE buf; buf = ExAllocatePoolWithTag (PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); NtGdiGetBitmapBits (hBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf);

1 0

[hpoussin] 20370: Handle more DIF codes in SetupDiCallClassInstaller. The list should now be complete
by hpoussin＠svn.reactos.com 27 Dec '05

27 Dec '05

Handle more DIF codes in SetupDiCallClassInstaller. The list should now be complete Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-27 11:39:43 UTC (rev 20369) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-27 15:19:45 UTC (rev 20370) @@ -3631,6 +3631,14 @@ return GetLastError(); } +static BOOL WINAPI +IntSetupDiRegisterDeviceInfo( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData) +{ + return SetupDiRegisterDeviceInfo(DeviceInfoSet, DeviceInfoData, 0, NULL, NULL, NULL); +} + /*********************************************************************** * SetupDiCallClassInstaller (SETUPAPI.@) */ @@ -3667,9 +3675,15 @@ case DIF_ADDPROPERTYPAGE_ADVANCED: CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; break; + case DIF_ADDREMOTEPROPERTYPAGE_ADVANCED: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + break; case DIF_ALLOW_INSTALL: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; break; + case DIF_DETECT: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; case DIF_DESTROYPRIVATEDATA: CanHandle = CLASS_INSTALLER; break; @@ -3694,6 +3708,15 @@ case DIF_NEWDEVICEWIZARD_PREANALYZE: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; break; + case DIF_NEWDEVICEWIZARD_PRESELECT: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_NEWDEVICEWIZARD_SELECT: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_POWERMESSAGEWAKE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + break; case DIF_PROPERTYCHANGE: CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; DefaultHandler = SetupDiChangeState; @@ -3702,10 +3725,29 @@ CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; DefaultHandler = SetupDiRegisterCoDeviceInstallers; break; + case DIF_REGISTERDEVICE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = IntSetupDiRegisterDeviceInfo; + break; + case DIF_REMOVE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiRemoveDevice; + break; case DIF_SELECTBESTCOMPATDRV: CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; DefaultHandler = SetupDiSelectBestCompatDrv; break; + case DIF_SELECTDEVICE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiSelectBestCompatDrv; + break; + case DIF_TROUBLESHOOTER: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_UNREMOVE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiUnremoveDevice; + break; default: ERR("Install function %u not supported\n", InstallFunction); SetLastError(ERROR_NOT_SUPPORTED); _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-12-27 11:39:43 UTC (rev 20369) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-12-27 15:19:45 UTC (rev 20370) @@ -368,8 +368,8 @@ @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) -@ stub SetupDiRegisterDeviceInfo -@ stub SetupDiRemoveDevice +@ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) +@ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @@ -385,7 +385,7 @@ @ stdcall SetupDiSetSelectedDevice(ptr ptr) @ stdcall SetupDiSetSelectedDriverA(ptr ptr ptr) @ stdcall SetupDiSetSelectedDriverW(ptr ptr ptr) -@ stub SetupDiUnremoveDevice +@ stdcall SetupDiUnremoveDevice(ptr ptr) @ stub SetupDuplicateDiskSpaceListA @ stub SetupDuplicateDiskSpaceListW @ stdcall SetupFindFirstLineA(long str str ptr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-12-27 11:39:43 UTC (rev 20369) +++ trunk/reactos/lib/setupapi/stubs.c 2005-12-27 15:19:45 UTC (rev 20370) @@ -178,3 +178,49 @@ return TRUE; } + +/********************************************************************** * + * SetupDiRegisterDeviceInfo(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiRegisterDeviceInfo( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Flags, + IN PSP_DETSIG_CMPPROC CompareProc OPTIONAL, + IN PVOID CompareContext OPTIONAL, + OUT PSP_DEVINFO_DATA DupDeviceInfoData OPTIONAL) +{ + FIXME ("Stub %p %p 0x%lx %p %p %p\n", DeviceInfoSet, DeviceInfoData, + Flags, CompareProc, CompareContext, DupDeviceInfoData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * + * SetupDiRemoveDevice(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiRemoveDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME ("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/********************************************************************** * + * SetupDiUnremoveDevice(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiUnremoveDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME ("Stub %p %p\n", DeviceInfoSet, DeviceInfoData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

[hpoussin] 20369: Revert code specific to Wine to enumerate serial ports, and allow generic enumeration of interfaces like in ReactOS.
by hpoussin＠svn.reactos.com 27 Dec '05

27 Dec '05

Revert code specific to Wine to enumerate serial ports, and allow generic enumeration of interfaces like in ReactOS. Serial ports will still be enumerated in Wine (using GUID_DEVINTERFACE_COMPORT or GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR) if the following registry entries are present: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{4d36e978-e325-11ce- bfc1-08002be10318}\COM1 DeviceInstance REG_SZ SERIAL\COM1 HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{4d36e978-e325-11ce- bfc1-08002be10318}\COM1\# SymbolicLink REG_SZ COM1: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{4d36e978-e325-11ce- bfc1-08002be10318}\COM1\#\Control Linked REG_DWORD 1 HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{86e0d1e0-8089-11d0- 9ce4-08003e301f73}\COM1 DeviceInstance REG_SZ COM1 HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{86e0d1e0-8089-11d0- 9ce4-08003e301f73}\COM1\# SymbolicLink REG_SZ COM1: HKLM\SYSTEM\CurrentControlSet\Control\DeviceClasses\{86e0d1e0-8089-11d0- 9ce4-08003e301f73}\COM1\#\Control Linked REG_DWORD 1 HKLM\SYSTEM\CurrentControlSet\Enum\SERIAL\COM1 ClassGUID REG_SZ {4D36E978-E325-11CE-BFC1-08002BE10318} Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-27 06:11:44 UTC (rev 20368) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-27 11:39:43 UTC (rev 20369) @@ -1586,85 +1586,6 @@ } } -#ifndef __REACTOS__ -static LONG SETUP_CreateSerialDeviceList( - struct DeviceInfoSet *list, - PCWSTR MachineName, - LPGUID InterfaceGuid, - PCWSTR DeviceInstanceW) -{ - static const size_t initialSize = 100; - size_t size; - WCHAR buf[initialSize]; - LPWSTR devices; - static const WCHAR devicePrefixW[] = { 'C','O','M',0 }; - LPWSTR ptr; - struct DeviceInfoElement *deviceInfo; - - if (MachineName) - WARN("'MachineName' is ignored on Wine!\n"); - if (DeviceInstanceW) - WARN("'DeviceInstanceW' can't be set on Wine!\n"); - - devices = buf; - size = initialSize; - while (TRUE) - { - if (QueryDosDeviceW(NULL, devices, size) != 0) - break; - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - size *= 2; - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - devices = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!devices) - return ERROR_NOT_ENOUGH_MEMORY; - *devices = '\0'; - } - else - { - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - return GetLastError(); - } - } - - /* 'devices' is a MULTI_SZ string */ - for (ptr = devices; *ptr; ptr += strlenW(ptr) + 1) - { - if (strncmpW(devicePrefixW, ptr, sizeof(devicePrefixW) / sizeof(devicePrefixW[0]) - 1) == 0) - { - /* We have found a device */ - struct DeviceInterface *interfaceInfo; - TRACE("Adding %s to list\n", debugstr_w(ptr)); - /* Step 1. Create a device info element */ - if (!CreateDeviceInfoElement(list, ptr, &GUID_SERENUM_BUS_ENUMERATOR, &deviceInfo)) - { - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - return GetLastError(); - } - InsertTailList(&list->ListHead, &deviceInfo->ListEntry); - - /* Step 2. Create an interface list for this element */ - if (!CreateDeviceInterface(deviceInfo, ptr, InterfaceGuid, &interfaceInfo)) - { - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - return GetLastError(); - } - interfaceInfo->Flags |= SPINT_ACTIVE | SPINT_DEFAULT; - InsertTailList(&deviceInfo->InterfaceListHead, &interfaceInfo->ListEntry); - } - } - if (devices != buf) - HeapFree(GetProcessHeap(), 0, devices); - return ERROR_SUCCESS; -} - -#else /* __REACTOS__ */ - static LONG SETUP_CreateInterfaceList( struct DeviceInfoSet *list, PCWSTR MachineName, @@ -1927,7 +1848,6 @@ RegCloseKey(hInterfaceKey); return ERROR_SUCCESS; } -#endif /* __REACTOS__ */ /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) @@ -2002,20 +1922,7 @@ return INVALID_HANDLE_VALUE; } -#ifndef __REACTOS__ - /* Special case: find serial ports by calling QueryDosDevice */ - if (IsEqualIID(class, &GUID_DEVINTERFACE_COMPORT)) - rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); - if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) - rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); - else - { - ERR("Wine can only enumerate serial devices at the moment!\n"); - rc = ERROR_INVALID_PARAMETER; - } -#else /* __REACTOS__ */ rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); -#endif /* __REACTOS__ */ if (rc != ERROR_SUCCESS) { SetLastError(rc);

1 0

[ion] 20368: Remove the evil build-breaker mark of the devil: 't'
by ion＠svn.reactos.com 27 Dec '05

27 Dec '05

Remove the evil build-breaker mark of the devil: 't' Modified: trunk/reactos/subsys/win32k/include/win32k.h _____ Modified: trunk/reactos/subsys/win32k/include/win32k.h --- trunk/reactos/subsys/win32k/include/win32k.h 2005-12-27 03:41:13 UTC (rev 20367) +++ trunk/reactos/subsys/win32k/include/win32k.h 2005-12-27 06:11:44 UTC (rev 20368) @@ -1,4 +1,4 @@ -t/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Graphics Subsystem * FILE: subsys/win32k/include/win32k.h

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs