Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[zguo] 58696: Fix build due to one of the previous merged versions depending on another post-branch revision that I do not want as part of the release.

by zguo＠svn.reactos.org

Author: zguo Date: Sat Apr 6 21:09:00 2013 New Revision: 58696 URL: http://svn.reactos.org/svn/reactos?rev=58696&view=rev Log: Fix build due to one of the previous merged versions depending on another post-branch revision that I do not want as part of the release. Modified: branches/ReactOS-0.3.15/base/system/services/services.c Modified: branches/ReactOS-0.3.15/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/system/serv… ============================================================================== --- branches/ReactOS-0.3.15/base/system/services/services.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/system/services/services.c [iso-8859-1] Sat Apr 6 21:09:00 2013 @@ -23,7 +23,7 @@ #define PIPE_TIMEOUT 1000 /* Defined in include/reactos/services/services.h */ -// #define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" +#define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" #define SCM_AUTOSTARTCOMPLETE_EVENT L"SC_AutoStartComplete" #define LSA_RPC_SERVER_ACTIVE L"LSA_RPC_SERVER_ACTIVE"

11 years, 8 months

[zguo] 58695: Merge in 58534, 58627, and 58628 from trunk. After this, the 0.3.15 code is frozen.

by zguo＠svn.reactos.org

Author: zguo Date: Sat Apr 6 19:56:09 2013 New Revision: 58695 URL: http://svn.reactos.org/svn/reactos?rev=58695&view=rev Log: Merge in 58534, 58627, and 58628 from trunk. After this, the 0.3.15 code is frozen. Modified: branches/ReactOS-0.3.15/ (props changed) branches/ReactOS-0.3.15/base/system/services/database.c branches/ReactOS-0.3.15/base/system/services/rpcserver.c branches/ReactOS-0.3.15/base/system/services/services.c branches/ReactOS-0.3.15/base/system/services/services.h branches/ReactOS-0.3.15/drivers/usb/usbehci/ (props changed) branches/ReactOS-0.3.15/drivers/usb/usbehci/hardware.cpp branches/ReactOS-0.3.15/drivers/usb/usbohci/ (props changed) branches/ReactOS-0.3.15/drivers/usb/usbohci/hardware.cpp branches/ReactOS-0.3.15/drivers/usb/usbuhci/hardware.cpp branches/ReactOS-0.3.15/lib/drivers/libusb/common_interfaces.h (contents, props changed) branches/ReactOS-0.3.15/lib/drivers/libusb/hcd_controller.cpp (contents, props changed) branches/ReactOS-0.3.15/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ReactOS-0.3.15/lib/drivers/libusb/usb_device.cpp (contents, props changed) Propchange: branches/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:58553,58561,58614 +/trunk/reactos:58534,58553,58561,58614,58627-58628 Modified: branches/ReactOS-0.3.15/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/system/serv… ============================================================================== --- branches/ReactOS-0.3.15/base/system/services/database.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/system/services/database.c [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -19,9 +19,9 @@ /* * Uncomment the line below to start services - * using the SERVICE_START_PENDING state + * using the SERVICE_START_PENDING state. */ -// #define USE_SERVICE_START_PENDING +#define USE_SERVICE_START_PENDING /* * Uncomment the line below to use asynchronous IO operations @@ -38,6 +38,7 @@ static RTL_RESOURCE DatabaseLock; static DWORD ResumeCount = 1; +/* The critical section synchronizes service controls commands */ static CRITICAL_SECTION ControlServiceCriticalSection; static DWORD PipeTimeout = 30000; /* 30 Seconds */ @@ -359,7 +360,7 @@ DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, - PSERVICE *lpServiceRecord) + PSERVICE* lpServiceRecord) { PSERVICE lpService = NULL; @@ -772,13 +773,11 @@ if (Service->Status.dwServiceType == SERVICE_KERNEL_DRIVER) { - RtlInitUnicodeString(&DirName, - L"\\Driver"); - } - else - { - RtlInitUnicodeString(&DirName, - L"\\FileSystem"); + RtlInitUnicodeString(&DirName, L"\\Driver"); + } + else // if (Service->Status.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) + { + RtlInitUnicodeString(&DirName, L"\\FileSystem"); } InitializeObjectAttributes(&ObjectAttributes, @@ -796,7 +795,7 @@ } BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + - 2 * MAX_PATH * sizeof(WCHAR); + 2 * MAX_PATH * sizeof(WCHAR); DirInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferLength); @@ -1096,7 +1095,7 @@ static DWORD ScmSendStartCommand(PSERVICE Service, DWORD argc, - LPWSTR *argv) + LPWSTR* argv) { PSCM_CONTROL_PACKET ControlPacket; SCM_REPLY_PACKET ReplyPacket; @@ -1496,7 +1495,7 @@ static DWORD ScmStartUserModeService(PSERVICE Service, DWORD argc, - LPWSTR *argv) + LPWSTR* argv) { PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; @@ -1512,6 +1511,7 @@ return ScmSendStartCommand(Service, argc, argv); } + /* Otherwise start its process */ ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); @@ -1551,9 +1551,7 @@ if (dwError == ERROR_SUCCESS) { /* Send start command */ - dwError = ScmSendStartCommand(Service, - argc, - argv); + dwError = ScmSendStartCommand(Service, argc, argv); } else { @@ -1569,24 +1567,22 @@ } -DWORD -ScmStartService(PSERVICE Service, DWORD argc, LPWSTR *argv) +static DWORD +ScmLoadService(PSERVICE Service, + DWORD argc, + LPWSTR* argv) { PSERVICE_GROUP Group = Service->lpGroup; DWORD dwError = ERROR_SUCCESS; LPCWSTR ErrorLogStrings[2]; WCHAR szErrorBuffer[32]; - DPRINT("ScmStartService() called\n"); - + DPRINT("ScmLoadService() called\n"); DPRINT("Start Service %p (%S)\n", Service, Service->lpServiceName); - EnterCriticalSection(&ControlServiceCriticalSection); - if (Service->Status.dwCurrentState != SERVICE_STOPPED) { DPRINT("Service %S is already running!\n", Service->lpServiceName); - LeaveCriticalSection(&ControlServiceCriticalSection); return ERROR_SERVICE_ALREADY_RUNNING; } @@ -1602,7 +1598,7 @@ Service->Status.dwCurrentState = SERVICE_RUNNING; } } - else + else // if (Service->Status.dwServiceType & (SERVICE_WIN32 | SERVICE_INTERACTIVE_PROCESS)) { /* Start user-mode service */ dwError = ScmCreateOrReferenceServiceImage(Service); @@ -1625,9 +1621,7 @@ } } - LeaveCriticalSection(&ControlServiceCriticalSection); - - DPRINT("ScmStartService() done (Error %lu)\n", dwError); + DPRINT("ScmLoadService() done (Error %lu)\n", dwError); if (dwError == ERROR_SUCCESS) { @@ -1677,17 +1671,80 @@ } +DWORD +ScmStartService(PSERVICE Service, + DWORD argc, + LPWSTR* argv) +{ + DWORD dwError = ERROR_SUCCESS; + SC_RPC_LOCK Lock = NULL; + + DPRINT("ScmStartService() called\n"); + DPRINT("Start Service %p (%S)\n", Service, Service->lpServiceName); + + /* Acquire the service control critical section, to synchronize starts */ + EnterCriticalSection(&ControlServiceCriticalSection); + + /* + * Acquire the user service start lock while the service is starting, if + * needed (i.e. if we are not starting it during the initialization phase). + * If we don't success, bail out. + */ + if (!ScmInitialize) + { + dwError = ScmAcquireServiceStartLock(TRUE, &Lock); + if (dwError != ERROR_SUCCESS) goto done; + } + + /* Really start the service */ + dwError = ScmLoadService(Service, argc, argv); + + /* Release the service start lock, if needed, and the critical section */ + if (Lock) ScmReleaseServiceStartLock(&Lock); + +done: + LeaveCriticalSection(&ControlServiceCriticalSection); + + DPRINT("ScmStartService() done (Error %lu)\n", dwError); + + return dwError; +} + + VOID ScmAutoStartServices(VOID) { + DWORD dwError = ERROR_SUCCESS; + SC_RPC_LOCK Lock = NULL; + PLIST_ENTRY GroupEntry; PLIST_ENTRY ServiceEntry; PSERVICE_GROUP CurrentGroup; PSERVICE CurrentService; WCHAR szSafeBootServicePath[MAX_PATH]; - DWORD dwError; HKEY hKey; ULONG i; + + /* Acquire the service control critical section, to synchronize starts */ + EnterCriticalSection(&ControlServiceCriticalSection); + + /* + * Acquire the user service start lock while the service is starting, if + * needed (i.e. if we are not starting it during the initialization phase). + * If we don't success, bail out. + */ + if (!ScmInitialize) + { + /* + * Actually this code is never executed since we are called + * at initialization time, so that ScmInitialize == TRUE. + * But keep the code here if someday we are called later on + * for whatever reason... + */ + dwError = ScmAcquireServiceStartLock(TRUE, &Lock); + if (dwError != ERROR_SUCCESS) goto done; + } + /* Clear 'ServiceVisited' flag (or set if not to start in Safe Mode) */ ServiceEntry = ServiceListHead.Flink; @@ -1779,7 +1836,7 @@ (CurrentService->dwTag == CurrentGroup->TagArray[i])) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, 0, NULL); + ScmLoadService(CurrentService, 0, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -1797,7 +1854,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, 0, NULL); + ScmLoadService(CurrentService, 0, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -1817,7 +1874,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, 0, NULL); + ScmLoadService(CurrentService, 0, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -1834,7 +1891,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, 0, NULL); + ScmLoadService(CurrentService, 0, NULL); } ServiceEntry = ServiceEntry->Flink; @@ -1848,6 +1905,13 @@ CurrentService->ServiceVisited = FALSE; ServiceEntry = ServiceEntry->Flink; } + + + /* Release the service start lock, if needed, and the critical section */ + if (Lock) ScmReleaseServiceStartLock(&Lock); + +done: + LeaveCriticalSection(&ControlServiceCriticalSection); } Modified: branches/ReactOS-0.3.15/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/system/serv… ============================================================================== --- branches/ReactOS-0.3.15/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/system/services/rpcserver.c [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -2895,7 +2895,6 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - SC_RPC_LOCK Lock = NULL; #ifndef NDEBUG DWORD i; @@ -2941,16 +2940,8 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - /* Acquire the service start lock until the service has been started */ - dwError = ScmAcquireServiceStartLock(TRUE, &Lock); - if (dwError != ERROR_SUCCESS) - return dwError; - /* Start the service */ dwError = ScmStartService(lpService, argc, (LPWSTR*)argv); - - /* Release the service start lock */ - ScmReleaseServiceStartLock(&Lock); return dwError; } @@ -4171,7 +4162,6 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - SC_RPC_LOCK Lock = NULL; LPWSTR *lpVector = NULL; DWORD i; DWORD dwLength; @@ -4244,16 +4234,8 @@ } } - /* Acquire the service start lock until the service has been started */ - dwError = ScmAcquireServiceStartLock(TRUE, &Lock); - if (dwError != ERROR_SUCCESS) - goto done; - /* Start the service */ dwError = ScmStartService(lpService, argc, lpVector); - - /* Release the service start lock */ - ScmReleaseServiceStartLock(&Lock); done: /* Free the Unicode argument vector */ Modified: branches/ReactOS-0.3.15/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/system/serv… ============================================================================== --- branches/ReactOS-0.3.15/base/system/services/services.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/system/services/services.c [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -22,6 +22,12 @@ #define PIPE_BUFSIZE 1024 #define PIPE_TIMEOUT 1000 +/* Defined in include/reactos/services/services.h */ +// #define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" +#define SCM_AUTOSTARTCOMPLETE_EVENT L"SC_AutoStartComplete" +#define LSA_RPC_SERVER_ACTIVE L"LSA_RPC_SERVER_ACTIVE" + +BOOL ScmInitialize = FALSE; BOOL ScmShutdown = FALSE; static HANDLE hScmShutdownEvent = NULL; @@ -77,35 +83,38 @@ BOOL -ScmCreateStartEvent(PHANDLE StartEvent) -{ +ScmCreateControlEvent(PHANDLE Event, + LPCWSTR Name, + DWORD dwDesiredAccess) +{ + /* + * This function creates a generic non-inheritable event + * and return a handle to the caller. The caller must + * close this handle afterwards. + */ + HANDLE hEvent; - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - L"SvcctrlStartEvent_A3752DX"); + hEvent = CreateEventW(NULL, TRUE, FALSE, Name); if (hEvent == NULL) { if (GetLastError() == ERROR_ALREADY_EXISTS) { - hEvent = OpenEventW(EVENT_ALL_ACCESS, - FALSE, - L"SvcctrlStartEvent_A3752DX"); - if (hEvent == NULL) - { - return FALSE; - } + hEvent = OpenEventW(dwDesiredAccess, FALSE, Name); } - else - { - return FALSE; - } - } - - *StartEvent = hEvent; - - return TRUE; + } + + if (hEvent) + { + DPRINT("SERVICES: Created event %S with handle %x\n", Name, hEvent); + *Event = hEvent; + return TRUE; + } + else + { + DPRINT1("SERVICES: Failed to create event %S (Error %lu)\n", Name, GetLastError()); + return FALSE; + } } @@ -113,35 +122,21 @@ ScmWaitForLsa(VOID) { HANDLE hEvent; - DWORD dwError; - - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - L"LSA_RPC_SERVER_ACTIVE"); - if (hEvent == NULL) - { - dwError = GetLastError(); - DPRINT1("Failed to create the notication event (Error %lu)\n", dwError); - - if (dwError == ERROR_ALREADY_EXISTS) - { - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - L"LSA_RPC_SERVER_ACTIVE"); - if (hEvent == NULL) - { - DPRINT1("Could not open the notification event (Error %lu)\n", GetLastError()); - return; - } - } - } - - DPRINT("Wait for the LSA server!\n"); - WaitForSingleObject(hEvent, INFINITE); - DPRINT("LSA server running!\n"); - - CloseHandle(hEvent); + + if (!ScmCreateControlEvent(&hEvent, + LSA_RPC_SERVER_ACTIVE, + SYNCHRONIZE)) + { + DPRINT1("Failed to create the notification event (Error %lu)\n", GetLastError()); + } + else + { + DPRINT("Wait for the LSA server!\n"); + WaitForSingleObject(hEvent, INFINITE); + DPRINT("LSA server running!\n"); + + CloseHandle(hEvent); + } DPRINT("ScmWaitForLsa() done\n"); } @@ -351,23 +346,38 @@ int nShowCmd) { HANDLE hScmStartEvent = NULL; + HANDLE hScmAutoStartCompleteEvent = NULL; SC_RPC_LOCK Lock = NULL; BOOL bCanDeleteNamedPipeCriticalSection = FALSE; DWORD dwError; DPRINT("SERVICES: Service Control Manager\n"); - /* Create start event */ - if (!ScmCreateStartEvent(&hScmStartEvent)) - { - DPRINT1("SERVICES: Failed to create start event\n"); - goto done; - } - - DPRINT("SERVICES: created start event with handle %p.\n", hScmStartEvent); + /* We are initializing ourselves */ + ScmInitialize = TRUE; + + /* Create the start event */ + if (!ScmCreateControlEvent(&hScmStartEvent, + SCM_START_EVENT, + EVENT_ALL_ACCESS)) + { + DPRINT1("SERVICES: Failed to create the start event\n"); + goto done; + } + DPRINT("SERVICES: Created start event with handle %p.\n", hScmStartEvent); + + /* Create the auto-start complete event */ + if (!ScmCreateControlEvent(&hScmAutoStartCompleteEvent, + SCM_AUTOSTARTCOMPLETE_EVENT, + EVENT_ALL_ACCESS)) + { + DPRINT1("SERVICES: Failed to create the auto-start complete event\n"); + goto done; + } + DPRINT("SERVICES: created auto-start complete event with handle %p.\n", hScmAutoStartCompleteEvent); /* Create the shutdown event */ - hScmShutdownEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + hScmShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (hScmShutdownEvent == NULL) { DPRINT1("SERVICES: Failed to create shutdown event\n"); @@ -385,7 +395,7 @@ /* Read the control set values */ if (!ScmGetControlSetValues()) { - DPRINT1("SERVICES: failed to read the control set values\n"); + DPRINT1("SERVICES: Failed to read the control set values\n"); goto done; } @@ -393,49 +403,58 @@ dwError = ScmCreateServiceDatabase(); if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: failed to create SCM database (Error %lu)\n", dwError); - goto done; - } + DPRINT1("SERVICES: Failed to create SCM database (Error %lu)\n", dwError); + goto done; + } + + /* Wait for the LSA server */ + ScmWaitForLsa(); /* Update the services database */ ScmGetBootAndSystemDriverState(); - /* Register the Service Control Manager process with CSRSS */ + /* Register the Service Control Manager process with the ReactOS Subsystem */ if (!RegisterServicesProcess(GetCurrentProcessId())) { DPRINT1("SERVICES: Could not register SCM process\n"); goto done; } - /* Acquire the service start lock until autostart services have been started */ + /* + * Acquire the user service start lock until + * auto-start services have been started. + */ dwError = ScmAcquireServiceStartLock(TRUE, &Lock); if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: failed to acquire the service start lock (Error %lu)\n", dwError); + DPRINT1("SERVICES: Failed to acquire the service start lock (Error %lu)\n", dwError); goto done; } /* Start the RPC server */ ScmStartRpcServer(); - DPRINT("SERVICES: Initialized.\n"); - /* Signal start event */ SetEvent(hScmStartEvent); + DPRINT("SERVICES: Initialized.\n"); + /* Register event handler (used for system shutdown) */ SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE); - /* Wait for the LSA server */ - ScmWaitForLsa(); - /* Start auto-start services */ ScmAutoStartServices(); + /* Signal auto-start complete event */ + SetEvent(hScmAutoStartCompleteEvent); + /* FIXME: more to do ? */ /* Release the service start lock */ ScmReleaseServiceStartLock(&Lock); + + /* Initialization finished */ + ScmInitialize = FALSE; DPRINT("SERVICES: Running.\n"); @@ -451,6 +470,10 @@ if (hScmShutdownEvent != NULL) CloseHandle(hScmShutdownEvent); + /* Close the auto-start complete event */ + if (hScmAutoStartCompleteEvent != NULL) + CloseHandle(hScmAutoStartCompleteEvent); + /* Close the start event */ if (hScmStartEvent != NULL) CloseHandle(hScmStartEvent); @@ -458,7 +481,6 @@ DPRINT("SERVICES: Finished.\n"); ExitThread(0); - return 0; } Modified: branches/ReactOS-0.3.15/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/system/serv… ============================================================================== --- branches/ReactOS-0.3.15/base/system/services/services.h [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/system/services/services.h [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -86,6 +86,7 @@ extern LIST_ENTRY ServiceListHead; extern LIST_ENTRY GroupListHead; extern LIST_ENTRY ImageListHead; +extern BOOL ScmInitialize; extern BOOL ScmShutdown; Propchange: branches/ReactOS-0.3.15/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -27,3 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 +/trunk/reactos/drivers/usb/usbehci:58627-58628 Modified: branches/ReactOS-0.3.15/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/drivers/usb/usbe… ============================================================================== --- branches/ReactOS-0.3.15/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -127,11 +127,11 @@ return STATUS_UNSUCCESSFUL; } -LPCWSTR +LPCSTR STDMETHODCALLTYPE CUSBHardwareDevice::GetUSBType() { - return L"USBEHCI"; + return "USBEHCI"; } NTSTATUS Propchange: branches/ReactOS-0.3.15/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -19,3 +19,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbohci:55019-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbohci:54809-54998 /trunk/reactos/drivers/usb/usbehci_new:48236-51323 +/trunk/reactos/drivers/usb/usbohci:58627-58628 Modified: branches/ReactOS-0.3.15/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/drivers/usb/usbo… ============================================================================== --- branches/ReactOS-0.3.15/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -124,11 +124,11 @@ return STATUS_UNSUCCESSFUL; } -LPCWSTR +LPCSTR STDMETHODCALLTYPE CUSBHardwareDevice::GetUSBType() { - return L"USBOHCI"; + return "USBOHCI"; } Modified: branches/ReactOS-0.3.15/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/drivers/usb/usbu… ============================================================================== --- branches/ReactOS-0.3.15/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -145,11 +145,11 @@ return STATUS_UNSUCCESSFUL; } -LPCWSTR +LPCSTR STDMETHODCALLTYPE CUSBHardwareDevice::GetUSBType() { - return L"USBUHCI"; + return "USBUHCI"; } Modified: branches/ReactOS-0.3.15/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/lib/drivers/libu… ============================================================================== --- branches/ReactOS-0.3.15/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -184,7 +184,7 @@ IN PVOID CallBack, \ IN PVOID Context) PURE; \ \ - STDMETHOD_(LPCWSTR, GetUSBType)(THIS) PURE; + STDMETHOD_(LPCSTR, GetUSBType)(THIS) PURE; #define IMP_IUSBHARDWAREDEVICE \ @@ -232,7 +232,7 @@ IN PVOID CallBack, \ IN PVOID Context); \ \ - STDMETHODIMP_(LPCWSTR) GetUSBType(); + STDMETHODIMP_(LPCSTR) GetUSBType(); DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown) { Propchange: branches/ReactOS-0.3.15/lib/drivers/libusb/common_interfaces.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -27,3 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/interfaces.h:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/interfaces.h:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/interfaces.h:54809-54998 +/trunk/reactos/lib/drivers/libusb/common_interfaces.h:58627-58628 Modified: branches/ReactOS-0.3.15/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/lib/drivers/libu… ============================================================================== --- branches/ReactOS-0.3.15/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -60,7 +60,7 @@ PUSBHARDWAREDEVICE m_Hardware; PHUBCONTROLLER m_HubController; ULONG m_FDODeviceNumber; - LPCWSTR m_USBType; + LPCSTR m_USBType; }; //================================================================================================= @@ -138,7 +138,7 @@ Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] Failed to initialize hardware object %x\n", m_Hardware->GetUSBType(), Status); + DPRINT1("[%s] Failed to initialize hardware object %x\n", m_Hardware->GetUSBType(), Status); // // failed to initialize hardware object, detach from device stack @@ -240,7 +240,7 @@ // PC_ASSERT(DeviceExtension->IsFDO); - DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", m_USBType, + DPRINT1("[%s] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -285,7 +285,7 @@ // // informal debug print // - DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); + DPRINT1("[%s] Result %S\n", m_USBType, DriverKey->DriverKeyName); } } @@ -337,7 +337,7 @@ PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG) - sizeof(WCHAR) >= ResultLength); DriverKey->DriverKeyName[ResultLength / sizeof(WCHAR)] = L'\0'; - DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); + DPRINT1("[%s] Result %S\n", m_USBType, DriverKey->DriverKeyName); } // @@ -400,7 +400,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_START FDO\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_START FDO\n", m_USBType); // // first start lower device object @@ -429,12 +429,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT("[%S] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType ,Status); + DPRINT("[%s] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType ,Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -514,7 +514,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); if (m_Hardware) { @@ -555,7 +555,7 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); #else - DPRINT1("[%S] Denying controller removal due to reinitialization bugs\n", m_USBType); + DPRINT1("[%s] Denying controller removal due to reinitialization bugs\n", m_USBType); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -563,7 +563,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType); // // delete the symbolic link @@ -676,7 +676,7 @@ // if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] CreateFDO: Failed to create %wZ, Status %x\n", m_USBType, &DeviceName, Status); + DPRINT1("[%s] CreateFDO: Failed to create %wZ, Status %x\n", m_USBType, &DeviceName, Status); return Status; } } @@ -686,7 +686,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT("[%S] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName); + DPRINT("[%s] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName); /* done */ return Status; Propchange: branches/ReactOS-0.3.15/lib/drivers/libusb/hcd_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -27,3 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hcd_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hcd_controller.cpp:54809-54998 +/trunk/reactos/lib/drivers/libusb/hcd_controller.cpp:58627-58628 Modified: branches/ReactOS-0.3.15/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/lib/drivers/libu… ============================================================================== --- branches/ReactOS-0.3.15/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -105,7 +105,7 @@ PULONG m_DeviceAddressBitmapBuffer; LIST_ENTRY m_UsbDeviceList; PIRP m_PendingSCEIrp; - LPCWSTR m_USBType; + LPCSTR m_USBType; //Internal Functions @@ -310,7 +310,7 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("[%S] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT1("[%s] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; @@ -321,7 +321,7 @@ { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - DPRINT1("[%S] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange); + DPRINT1("[%s] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange); // @@ -329,7 +329,7 @@ // if (PortChange != 0) { - DPRINT1("[%S] Change state on port %d\n", m_USBType, PortId); + DPRINT1("[%s] Change state on port %d\n", m_USBType, PortId); // Set the value for the port number *TransferBuffer = 1 << ((PortId + 1) & 7); Changed = TRUE; @@ -432,7 +432,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_START_DEVICE\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_START_DEVICE\n", m_USBType); // // register device interface // @@ -450,7 +450,7 @@ } case IRP_MN_QUERY_ID: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType, IoStack->Parameters.QueryId.IdType); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType, IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -525,7 +525,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] HandlePnp> failed to get hardware id %x\n", m_USBType, Status); + DPRINT1("[%s] HandlePnp> failed to get hardware id %x\n", m_USBType, Status); VendorID = 0x8086; DeviceID = 0x3A37; } @@ -553,7 +553,7 @@ Index++; - DPRINT1("[%S] Name %S\n", m_USBType, Buffer); + DPRINT1("[%s] Name %S\n", m_USBType, Buffer); // // allocate buffer @@ -587,7 +587,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -619,7 +619,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType); // // handle device interface requests @@ -629,7 +629,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType); // // deactivate device interface for BUS PDO @@ -659,7 +659,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -700,7 +700,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT("[%S] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n", m_USBType); // // allocate buffer for bus information @@ -733,7 +733,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); // // stop device // @@ -742,7 +742,7 @@ } case IRP_MN_SURPRISE_REMOVAL: { - DPRINT("[%S] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType); + DPRINT("[%s] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType); Status = STATUS_SUCCESS; break; } @@ -796,7 +796,7 @@ if (!EndPointDesc) { - DPRINT1("[%S] Error No EndpointDesc\n", m_USBType); + DPRINT1("[%s] Error No EndpointDesc\n", m_USBType); Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE; return STATUS_INVALID_PARAMETER; } @@ -805,7 +805,7 @@ // sanity checks // ASSERT(EndPointDesc); - DPRINT("[%S] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); + DPRINT("[%s] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); // @@ -813,7 +813,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleIsochronousTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleIsochronousTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -856,7 +856,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT("[%S] Pending SCE Irp\n", m_USBType); + DPRINT("[%s] Pending SCE Irp\n", m_USBType); m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -878,7 +878,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleBulkOrInterruptTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleBulkOrInterruptTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -905,7 +905,7 @@ ULONG NumPort; ULONG PortId; - DPRINT("[%S] HandleClassOther> Request %x Value %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%s] HandleClassOther> Request %x Value %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); // // get number of ports available @@ -947,7 +947,7 @@ // // request contains buffer of 2 ushort which are used from submitting port status and port change status // - DPRINT("[%S] PortId %x PortStatus %x PortChange %x\n", m_USBType, PortId, PortStatus, PortChange); + DPRINT("[%s] PortId %x PortStatus %x PortChange %x\n", m_USBType, PortId, PortStatus, PortChange); Buffer = (PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer; // @@ -974,7 +974,7 @@ Status = m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); break; default: - DPRINT("[%S] Unknown Value for Clear Feature %x \n", m_USBType, Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%s] Unknown Value for Clear Feature %x \n", m_USBType, Urb->UrbControlVendorClassRequest.Value); break; } @@ -1023,13 +1023,13 @@ break; } default: - DPRINT1("[%S] Unsupported request id %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Value); + DPRINT1("[%s] Unsupported request id %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Value); PC_ASSERT(FALSE); } break; } default: - DPRINT1("[%S] HandleClassOther Unknown request code %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request); + DPRINT1("[%s] HandleClassOther Unknown request code %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request); PC_ASSERT(0); Status = STATUS_INVALID_DEVICE_REQUEST; } @@ -1095,7 +1095,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleSelectConfiguration invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleSelectConfiguration invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1151,7 +1151,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleSelectInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleSelectInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1208,7 +1208,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleGetStatusFromDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleGetStatusFromDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1252,7 +1252,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); ASSERT(Status == STATUS_SUCCESS); - DPRINT1("[%S] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); + DPRINT1("[%s] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done @@ -1273,7 +1273,7 @@ PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; - DPRINT("[%S] HandleClassDevice Request %x Class %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT("[%s] HandleClassDevice Request %x Class %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); // // check class request type @@ -1287,7 +1287,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1371,7 +1371,7 @@ { if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle // @@ -1387,7 +1387,7 @@ break; } default: - DPRINT1("[%S] HandleClassDevice Class %x not implemented\n", m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT1("[%s] HandleClassDevice Class %x not implemented\n", m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8); break; } break; @@ -1399,7 +1399,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1465,7 +1465,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleGetDescriptorFromInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleGetDescriptorFromInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1494,7 +1494,7 @@ Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] HandleGetDescriptorFromInterface failed with %x\n", m_USBType, Status); + DPRINT1("[%s] HandleGetDescriptorFromInterface failed with %x\n", m_USBType, Status); } // @@ -1515,7 +1515,7 @@ PUSBDEVICE UsbDevice; ULONG Length, BufferLength; - DPRINT("[%S] HandleGetDescriptor Type %x\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT("[%s] HandleGetDescriptor Type %x\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); // // check descriptor type @@ -1547,7 +1547,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleGetDescriptor invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleGetDescriptor invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1654,7 +1654,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1719,7 +1719,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1749,7 +1749,7 @@ break; } default: - DPRINT1("[%S] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT1("[%s] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); break; } @@ -1781,7 +1781,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClassEndpoint invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClassEndpoint invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1862,7 +1862,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleVendorDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleVendorDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1930,7 +1930,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleSyncResetAndClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleSyncResetAndClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1947,7 +1947,7 @@ // // failed // - DPRINT1("[%S] failed to reset pipe %x\n", m_USBType, Status); + DPRINT1("[%s] failed to reset pipe %x\n", m_USBType, Status); } @@ -1967,7 +1967,7 @@ // Status = HandleClearStall(Irp, Urb); } - DPRINT1("[%S] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", m_USBType, Status); + DPRINT1("[%s] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", m_USBType, Status); // // reset data toggle @@ -2003,7 +2003,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleAbortPipe invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleAbortPipe invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2026,7 +2026,7 @@ // issue request // Status = UsbDevice->AbortPipe(EndpointDescriptor); - DPRINT1("[%S] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status); + DPRINT1("[%s] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status); // // done @@ -2059,7 +2059,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2076,7 +2076,7 @@ // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - DPRINT1("[%S] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType); + DPRINT1("[%s] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType); // // initialize setup packet @@ -2093,7 +2093,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); - DPRINT1("[%S] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status); + DPRINT1("[%s] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status); // // done @@ -2124,7 +2124,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[%S] HandleClassInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%s] HandleClassInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2178,7 +2178,7 @@ // // display error // - DPRINT1("[%S] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", m_USBType, Urb->UrbHeader.Status); + DPRINT1("[%s] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", m_USBType, Urb->UrbHeader.Status); } // @@ -2272,7 +2272,7 @@ Status = HandleVendorDevice(Irp, Urb); break; default: - DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function); + DPRINT1("[%s] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function); break; } // @@ -2282,7 +2282,7 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("[%S] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType, this); + DPRINT("[%s] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType, this); if (IoStack->Parameters.Others.Argument1) { @@ -2307,7 +2307,7 @@ } case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: { - DPRINT("[%S] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType); + DPRINT("[%s] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType); // // this is the first request send, it delivers the PDO to the caller @@ -2336,7 +2336,7 @@ } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT("[%S] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType); + DPRINT("[%s] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType); // // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver @@ -2359,13 +2359,13 @@ } case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: { - DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n", m_USBType); + DPRINT1("[%s] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n", m_USBType); Status = STATUS_SUCCESS; break; } default: { - DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType, + DPRINT1("[%s] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); Propchange: branches/ReactOS-0.3.15/lib/drivers/libusb/hub_controller.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -27,3 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/hub_controller.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/hub_controller.cpp:54809-54998 +/trunk/reactos/lib/drivers/libusb/hub_controller.cpp:58627-58628 Modified: branches/ReactOS-0.3.15/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/lib/drivers/libu… ============================================================================== --- branches/ReactOS-0.3.15/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sat Apr 6 19:56:09 2013 @@ -86,7 +86,7 @@ ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; - LPCWSTR m_USBType; + LPCSTR m_USBType; PUSB_CONFIGURATION m_ConfigurationDescriptors; }; @@ -141,7 +141,7 @@ // // failed to get usb queue // - DPRINT1("[%S] GetUsbQueue failed with %x\n", m_USBType, Status); + DPRINT1("[%s] GetUsbQueue failed with %x\n", m_USBType, Status); return Status; } @@ -154,7 +154,7 @@ // // failed to get dma manager // - DPRINT1("[%S] GetDMA failed with %x\n", m_USBType, Status); + DPRINT1("[%s] GetDMA failed with %x\n", m_USBType, Status); return Status; } @@ -172,7 +172,7 @@ // // failed to get device descriptor // - DPRINT1("[%S] Failed to get device descriptor with %x\n", m_USBType, Status); + DPRINT1("[%s] Failed to get device descriptor with %x\n", m_USBType, Status); return Status; } @@ -276,7 +276,7 @@ return Usb20Device; } - DPRINT1("[%S] GetType Unknown bcdUSB Type %x\n", m_USBType, m_DeviceDescriptor.bcdUSB); + DPRINT1("[%s] GetType Unknown bcdUSB Type %x\n", m_USBType, m_DeviceDescriptor.bcdUSB); //PC_ASSERT(FALSE); return Usb11Device; @@ -311,7 +311,7 @@ UCHAR OldAddress; UCHAR Index; - DPRINT1("[%S] SetDeviceAddress> Address %x\n", m_USBType, DeviceAddress); + DPRINT1("[%s] SetDeviceAddress> Address %x\n", m_USBType, DeviceAddress); CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBLIB); if (!CtrlSetup) @@ -334,7 +334,7 @@ if (!NT_SUCCESS(Status)) { // failed to set device address - DPRINT1("[%S] SetDeviceAddress> failed to set device address with %lx Address %x\n", m_USBType, Status, DeviceAddress); + DPRINT1("[%s] SetDeviceAddress> failed to set device address with %lx Address %x\n", m_USBType, Status, DeviceAddress); return Status; } @@ -351,7 +351,7 @@ Status = CreateDeviceDescriptor(); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] SetDeviceAddress failed to retrieve device descriptor with device address set Error %lx\n", m_USBType, Status); + DPRINT1("[%s] SetDeviceAddress failed to retrieve device descriptor with device address set Error %lx\n", m_USBType, Status); // return error status return Status; } @@ -362,7 +362,7 @@ m_DeviceDescriptor.bNumConfigurations == 0) { // failed to retrieve device descriptor - DPRINT1("[%S] SetDeviceAddress> device returned bogus device descriptor\n", m_USBType); + DPRINT1("[%s] SetDeviceAddress> device returned bogus device descriptor\n", m_USBType); DumpDeviceDescriptor(&m_DeviceDescriptor); // return error status @@ -388,7 +388,7 @@ Status = CreateConfigurationDescriptor(Index); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] SetDeviceAddress> failed to retrieve configuration %lu\n", m_USBType, Index); + DPRINT1("[%s] SetDeviceAddress> failed to retrieve configuration %lu\n", m_USBType, Index); break; } } @@ -431,7 +431,7 @@ // // no queue, wtf? // - DPRINT1("[%S] CommitIrp> no queue / dma !!!\n", m_USBType); + DPRINT1("[%s] CommitIrp> no queue / dma !!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -444,7 +444,7 @@ // // failed to build request // - DPRINT1("[%S] CommitIrp> CreateUSBRequest failed with %lx\n", m_USBType, Status); + DPRINT1("[%s] CommitIrp> CreateUSBRequest failed with %lx\n", m_USBType, Status); return Status; } @@ -467,7 +467,7 @@ // // failed to add request // - DPRINT1("[%S] failed add request to queue with %lx\n", m_USBType, Status); + DPRINT1("[%s] failed add request to queue with %lx\n", m_USBType, Status); Request->Release(); return Status; } @@ -520,7 +520,7 @@ // // no queue, wtf? // - DPRINT1("[%S] CommitSetupPacket> no queue!!!\n", m_USBType); + DPRINT1("[%s] CommitSetupPacket> no queue!!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -533,7 +533,7 @@ // // failed to build request // - DPRINT1("[%S] CommitSetupPacket> CreateUSBRequest failed with %x\n", m_USBType, Status); + DPRINT1("[%s] CommitSetupPacket> CreateUSBRequest failed with %x\n", m_USBType, Status); return Status; } @@ -546,7 +546,7 @@ // // failed to initialize request // - DPRINT1("[%S] CommitSetupPacket failed to initialize usb request with %x\n", m_USBType, Status); + DPRINT1("[%s] CommitSetupPacket failed to initialize usb request with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -560,7 +560,7 @@ // // failed to add request // - DPRINT1("[%S] CommitSetupPacket> failed add request to queue with %x\n", m_USBType, Status); + DPRINT1("[%s] CommitSetupPacket> failed add request to queue with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -761,7 +761,7 @@ // // failed to get partial configuration descriptor // - DPRINT1("[%S] Failed to get partial configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); + DPRINT1("[%s] Failed to get partial configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -775,7 +775,7 @@ // // failed to get full configuration descriptor // - DPRINT1("[%S] Failed to get full configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); + DPRINT1("[%s] Failed to get full configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -970,7 +970,7 @@ if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { // bogus configuration descriptor - DPRINT1("[%S] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, + DPRINT1("[%s] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); // failed @@ -1042,7 +1042,7 @@ if (!Found) { - DPRINT1("[%S] invalid configuration value %u\n", m_USBType, ConfigurationDescriptor->bConfigurationValue); + DPRINT1("[%s] invalid configuration value %u\n", m_USBType, ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } @@ -1064,13 +1064,13 @@ if (!ConfigurationDescriptor) { // unconfigure request - DPRINT1("[%S] SelectConfiguration Unconfigure Request Status %lx\n", m_USBType, Status); + DPRINT1("[%s] SelectConfiguration Unconfigure Request Status %lx\n", m_USBType, Status); m_ConfigurationIndex = 0; return Status; } // informal debug print - DPRINT1("[%S] SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status); + DPRINT1("[%s] SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status); if (!NT_SUCCESS(Status)) { // @@ -1125,7 +1125,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[%S] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); + DPRINT1("[%s] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); break; } @@ -1167,7 +1167,7 @@ if (!Found) { // invalid handle passed - DPRINT1("[%S] Invalid configuration handle passed %p\n", m_USBType, ConfigurationHandle); + DPRINT1("[%s] Invalid configuration handle passed %p\n", m_USBType, ConfigurationHandle); return STATUS_INVALID_PARAMETER; } @@ -1182,7 +1182,7 @@ Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); // informal debug print - DPRINT1("[%S] SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); + DPRINT1("[%s] SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); #if 0 if (!NT_SUCCESS(Status)) { @@ -1218,7 +1218,7 @@ InterfaceDescriptor = USBD_ParseConfigurationDescriptor(m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); if (!InterfaceDescriptor) { - DPRINT1("[%S] No such interface Alternate %x InterfaceNumber %x\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); + DPRINT1("[%s] No such interface Alternate %x InterfaceNumber %x\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); return STATUS_UNSUCCESSFUL; } @@ -1227,7 +1227,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[%S] Failed to build interface descriptor Status %x\n", m_USBType, Status); + DPRINT1("[%s] Failed to build interface descriptor Status %x\n", m_USBType, Status); return Status; } } Propchange: branches/ReactOS-0.3.15/lib/drivers/libusb/usb_device.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Apr 6 19:56:09 2013 @@ -27,3 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci/usb_device.cpp:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new/usb_device.cpp:54809-54998 +/trunk/reactos/lib/drivers/libusb/usb_device.cpp:58627-58628

11 years, 8 months

[jgardou] 58694: [KERNEL32_APITEST] - Invoke some black voodoo for fixing linux builder

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 6 19:34:54 2013 New Revision: 58694 URL: http://svn.reactos.org/svn/reactos?rev=58694&view=rev Log: [KERNEL32_APITEST] - Invoke some black voodoo for fixing linux builder Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Sat Apr 6 19:34:54 2013 @@ -156,6 +156,7 @@ /* Clean up */ "addl $16, %%esp\n" + : ); #endif /* _MSC_VER */

11 years, 8 months

[jgardou] 58693: [KERNEL32_APITEST] - Try to fix linux builder

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 6 19:26:35 2013 New Revision: 58693 URL: http://svn.reactos.org/svn/reactos?rev=58693&view=rev Log: [KERNEL32_APITEST] - Try to fix linux builder Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Sat Apr 6 19:26:35 2013 @@ -108,8 +108,6 @@ "xorps %%xmm0, %%xmm0\n" "movl $1, %0\n" : "=r"(supportsSSE) - : - : ); #endif /* _MSC_VER */ if(!supportsSSE) @@ -158,7 +156,7 @@ /* Clean up */ "addl $16, %%esp\n" - : : :); + ); #endif /* _MSC_VER */ /* Restore mxcsr */

11 years, 8 months

[jgardou] 58692: [KERNEL32_APITEST] - Add a test verifying that the filter set with SetUnhandledExceptionFilter is called. Take this as an occasion to demonstrate a bug with SSE exceptions in ReactOS

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 6 19:15:11 2013 New Revision: 58692 URL: http://svn.reactos.org/svn/reactos?rev=58692&view=rev Log: [KERNEL32_APITEST] - Add a test verifying that the filter set with SetUnhandledExceptionFilter is called. Take this as an occasion to demonstrate a bug with SSE exceptions in ReactOS Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Sat Apr 6 19:15:11 2013 @@ -9,6 +9,7 @@ #include <stdio.h> #include <wine/test.h> #include <ndk/rtltypes.h> +#include <xmmintrin.h> /* * Keep these returning different values, to prevent compiler folding @@ -33,9 +34,144 @@ ok(p2 != Filter2, "SetUnhandledExceptionFilter returned what was set, not prev\n"); ok(p2 == Filter1, "SetUnhandledExceptionFilter didn't return previous filter\n"); ok(p1 != p2, "SetUnhandledExceptionFilter seems to return random stuff\n"); + + p1 = SetUnhandledExceptionFilter(NULL); + ok(p1 == Filter2, "SetUnhandledExceptionFilter didn't return previous filter\n"); +} + +static LONG WINAPI ExceptionFilterSSESupport(LPEXCEPTION_POINTERS exp) +{ + PEXCEPTION_RECORD rec = exp->ExceptionRecord; + PCONTEXT ctx = exp->ContextRecord; + + trace("Exception raised while using SSE instructions.\n"); + + ok(rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); + + if(rec->ExceptionCode != EXCEPTION_ILLEGAL_INSTRUCTION) + { + trace("Unexpected exception code, terminating!\n"); + return EXCEPTION_EXECUTE_HANDLER; + } + + ok((ctx->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL, "Context does not contain control register.\n"); + + ctx->Eip += 3; + + return EXCEPTION_CONTINUE_EXECUTION; +} + +static BOOL ExceptionCaught = FALSE; + +static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) +{ + PEXCEPTION_RECORD rec = exp->ExceptionRecord; + PCONTEXT ctx = exp->ContextRecord; + + trace("Exception raised while dividing by 0.\n"); + + ok(rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, "Exception code is 0x%08x.\n", (unsigned int)rec->ExceptionCode); + + if(rec->ExceptionCode != STATUS_FLOAT_MULTIPLE_TRAPS) + { + trace("Unexpected exception code, terminating!\n"); + return EXCEPTION_EXECUTE_HANDLER; + } + + ok((ctx->ContextFlags & CONTEXT_CONTROL) == CONTEXT_CONTROL, "Context does not contain control register.\n"); + + ExceptionCaught = TRUE; + + ctx->Eip += 3; + + return EXCEPTION_CONTINUE_EXECUTION; +} + +static +VOID TestSSEExceptions(VOID) +{ + LPTOP_LEVEL_EXCEPTION_FILTER p; + BOOL supportsSSE = FALSE; + unsigned int csr; + + /* Test SSE support for the CPU */ + p = SetUnhandledExceptionFilter(ExceptionFilterSSESupport); + ok(p == NULL, "Previous filter should be NULL\n"); +#ifdef _MSC_VER + __asm + { + xorps xmm0, xmm0 + mov supportsSSE, 0x1 + } +#else + __asm__( + "xorps %%xmm0, %%xmm0\n" + "movl $1, %0\n" + : "=r"(supportsSSE) + : + : + ); +#endif /* _MSC_VER */ + if(!supportsSSE) + { + skip("CPU doesn't support SSE instructions.\n"); + SetUnhandledExceptionFilter(NULL); + return; + } + /* Deliberately throw a divide by 0 exception */ + p = SetUnhandledExceptionFilter(ExceptionFilterSSEException); + ok(p == ExceptionFilterSSESupport, "Unexpected old filter : 0x%p", p); + + /* Unmask divide by 0 exception */ + csr = _mm_getcsr(); + _mm_setcsr(csr & 0xFFFFFDFF); + + /* We can't use _mm_div_ps, as it masks the exception before performing anything*/ +#if defined(_MSC_VER) + __asm + { + xorps xmm0, xmm0 + push 0x3f800000 + push 0x3f800000 + push 0x3f800000 + push 0x3f800000 + + movups xmm1, [esp] + + /* Divide by 0 */ + divps xmm1, xmm0 + + /* Clean up */ + add esp, 16 + } +#else + __asm__ ( + "xorps %%xmm0, %%xmm0\n" + "pushl $0x3f800000\n" + "pushl $0x3f800000\n" + "pushl $0x3f800000\n" + "pushl $0x3f800000\n" + "movups (%%esp), %%xmm1\n" + + /* Divide by 0 */ + "divps %%xmm0, %%xmm1\n" + + /* Clean up */ + "addl $16, %%esp\n" + : : :); +#endif /* _MSC_VER */ + + /* Restore mxcsr */ + _mm_setcsr(csr); + + ok(ExceptionCaught, "The exception was not caught.\n"); + + p = SetUnhandledExceptionFilter(NULL); + ok(p == ExceptionFilterSSEException, "Unexpected old filter : 0x%p", p); } START_TEST(SetUnhandledExceptionFilter) { TestSetUnhandledExceptionFilter(); + TestSSEExceptions(); }

11 years, 8 months

[jgardou] 58691: [CRT] - Add definition and GCC implementation of _mm_setcsr and _mm_getcsr

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 6 19:13:01 2013 New Revision: 58691 URL: http://svn.reactos.org/svn/reactos?rev=58691&view=rev Log: [CRT] - Add definition and GCC implementation of _mm_setcsr and _mm_getcsr Modified: trunk/reactos/include/crt/xmmintrin.h Modified: trunk/reactos/include/crt/xmmintrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/xmmintrin.h?re… ============================================================================== --- trunk/reactos/include/crt/xmmintrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/xmmintrin.h [iso-8859-1] Sat Apr 6 19:13:01 2013 @@ -28,6 +28,29 @@ extern __m128 _mm_load_ss(float const*); extern int _mm_cvt_ss2si(__m128); +#ifdef _MSC_VER +unsigned int _mm_getcsr(void); +#pragma intrinsic(_mm_getcsr) +void _mm_setcsr(unsigned int); +#pragma intrinsic(_mm_setcsr) +#else +/* + * We can't use __builtin_ia32_* functions, + * are they are only available with the -msse2 compiler switch + */ +__INTRIN_INLINE unsigned int _mm_getcsr(void) +{ + unsigned int retval; + __asm__ __volatile__("stmxcsr %0" : "=m"(retval)); + return retval; +} + +__INTRIN_INLINE void _mm_setcsr(unsigned int val) +{ + __asm__ __volatile__("ldmxcsr %0" : : "m"(val)); +} +#endif + /* Alternate names */ #define _mm_cvtss_si32 _mm_cvt_ss2si

11 years, 8 months

[hbelusca] 58690: Sync with trunk r58687.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Apr 6 15:28:22 2013 New Revision: 58690 URL: http://svn.reactos.org/svn/reactos?rev=58690&view=rev Log: Sync with trunk r58687. Added: branches/ros-csrss/dll/win32/jscript/compile.c - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/compile.c branches/ros-csrss/dll/win32/jscript/decode.c - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/decode.c branches/ros-csrss/dll/win32/jscript/jscript.rc - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jscript.rc branches/ros-csrss/dll/win32/jscript/jscript.rgs - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jscript.rgs branches/ros-csrss/dll/win32/jscript/jscript_classes.idl - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jscript_classes.idl branches/ros-csrss/dll/win32/jscript/jscript_classes.rgs - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jscript_classes.rgs branches/ros-csrss/dll/win32/jscript/jsregexp.c - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jsregexp.c branches/ros-csrss/dll/win32/jscript/jsstr.c - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jsstr.c branches/ros-csrss/dll/win32/jscript/jsstr.h - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jsstr.h branches/ros-csrss/dll/win32/jscript/jsval.h - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/jsval.h branches/ros-csrss/dll/win32/jscript/regexp.h - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/regexp.h branches/ros-csrss/dll/win32/jscript/vbarray.c - copied unchanged from r58689, trunk/reactos/dll/win32/jscript/vbarray.c branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt - copied unchanged from r58689, trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt - copied unchanged from r58689, trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt - copied unchanged from r58689, trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/drivers/CMakeLists.txt - copied unchanged from r58689, trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt branches/ros-csrss/lib/drivers/sound/stdunk/ (props changed) - copied from r58689, trunk/reactos/lib/drivers/sound/stdunk/ Removed: branches/ros-csrss/dll/win32/jscript/jscript.inf branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/makefile branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/sources branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/makefile branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/sources branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/installer/ Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/atactl/atactl.cpp branches/ros-csrss/base/applications/calc/lang/el-GR.rc branches/ros-csrss/base/applications/calc/lang/ko-KR.rc branches/ros-csrss/base/applications/calc/lang/th-TH.rc branches/ros-csrss/base/applications/network/wlanconf/lang/it-IT.rc branches/ros-csrss/base/applications/rapps/lang/fr-FR.rc branches/ros-csrss/base/applications/sndrec32/audio_resampler_acm.cpp branches/ros-csrss/base/applications/sndrec32/audio_wavein.hpp branches/ros-csrss/base/applications/sndrec32/audio_waveout.cpp branches/ros-csrss/base/applications/sndrec32/lang/de-DE.rc branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc branches/ros-csrss/base/applications/sndrec32/lang/es-ES.rc branches/ros-csrss/base/services/eventlog/file.c branches/ros-csrss/base/shell/cmd/copy.c branches/ros-csrss/base/shell/cmd/del.c branches/ros-csrss/base/shell/cmd/readme2.txt branches/ros-csrss/base/shell/cmd/ren.c branches/ros-csrss/base/shell/cmd/ren.txt branches/ros-csrss/base/shell/cmd/todo.txt branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c branches/ros-csrss/boot/freeldr/freeldr/arch/i386/winldr.c branches/ros-csrss/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/ros-csrss/boot/freeldr/freeldr/include/fs/ext2.h branches/ros-csrss/boot/freeldr/freeldr/include/keycodes.h branches/ros-csrss/boot/freeldr/freeldr/include/ui.h branches/ros-csrss/boot/freeldr/freeldr/include/ui/gui.h branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c branches/ros-csrss/boot/freeldr/freeldr/ui/gui.c branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c branches/ros-csrss/cmake/CMakeMacros.cmake branches/ros-csrss/cmake/Platform/Windows-MSVC.cmake branches/ros-csrss/cmake/gcc.cmake branches/ros-csrss/cmake/msvc.cmake branches/ros-csrss/dll/directx/ksproxy/clockforward.cpp branches/ros-csrss/dll/directx/ksproxy/input_pin.cpp branches/ros-csrss/dll/directx/ksproxy/ksproxy.cpp branches/ros-csrss/dll/directx/ksproxy/proxy.cpp branches/ros-csrss/dll/directx/ksproxy/qualityforward.cpp branches/ros-csrss/dll/directx/wine/wined3d/directx.c branches/ros-csrss/dll/opengl/mesa/src/mesa/CMakeLists.txt branches/ros-csrss/dll/win32/crypt32/CMakeLists.txt branches/ros-csrss/dll/win32/crypt32/base64.c branches/ros-csrss/dll/win32/crypt32/cert.c branches/ros-csrss/dll/win32/crypt32/chain.c branches/ros-csrss/dll/win32/crypt32/decode.c branches/ros-csrss/dll/win32/crypt32/message.c branches/ros-csrss/dll/win32/crypt32/msg.c branches/ros-csrss/dll/win32/crypt32/object.c branches/ros-csrss/dll/win32/crypt32/oid.c branches/ros-csrss/dll/win32/crypt32/rootstore.c branches/ros-csrss/dll/win32/crypt32/serialize.c branches/ros-csrss/dll/win32/crypt32/sip.c branches/ros-csrss/dll/win32/crypt32/store.c branches/ros-csrss/dll/win32/jscript/CMakeLists.txt branches/ros-csrss/dll/win32/jscript/activex.c branches/ros-csrss/dll/win32/jscript/array.c branches/ros-csrss/dll/win32/jscript/bool.c branches/ros-csrss/dll/win32/jscript/date.c branches/ros-csrss/dll/win32/jscript/dispex.c branches/ros-csrss/dll/win32/jscript/engine.c branches/ros-csrss/dll/win32/jscript/engine.h branches/ros-csrss/dll/win32/jscript/error.c branches/ros-csrss/dll/win32/jscript/function.c branches/ros-csrss/dll/win32/jscript/global.c branches/ros-csrss/dll/win32/jscript/jscript.c branches/ros-csrss/dll/win32/jscript/jscript.h branches/ros-csrss/dll/win32/jscript/jscript_main.c branches/ros-csrss/dll/win32/jscript/jsutils.c branches/ros-csrss/dll/win32/jscript/lex.c branches/ros-csrss/dll/win32/jscript/math.c branches/ros-csrss/dll/win32/jscript/number.c branches/ros-csrss/dll/win32/jscript/object.c branches/ros-csrss/dll/win32/jscript/parser.tab.c branches/ros-csrss/dll/win32/jscript/parser.tab.h branches/ros-csrss/dll/win32/jscript/parser.y branches/ros-csrss/dll/win32/jscript/regexp.c branches/ros-csrss/dll/win32/jscript/resource.h branches/ros-csrss/dll/win32/jscript/rsrc.rc branches/ros-csrss/dll/win32/jscript/string.c branches/ros-csrss/dll/win32/kernel32/client/path.c branches/ros-csrss/dll/win32/kernel32/winnls/lang/de-DE.mc branches/ros-csrss/dll/win32/msi/action.c branches/ros-csrss/dll/win32/msi/automation.c branches/ros-csrss/dll/win32/msi/custom.c branches/ros-csrss/dll/win32/msi/dialog.c branches/ros-csrss/dll/win32/msi/files.c branches/ros-csrss/dll/win32/msi/msi.c branches/ros-csrss/dll/win32/msi/msi.spec branches/ros-csrss/dll/win32/msi/msipriv.h branches/ros-csrss/dll/win32/msi/package.c branches/ros-csrss/dll/win32/msi/record.c branches/ros-csrss/dll/win32/msi/registry.c branches/ros-csrss/dll/win32/msi/streams.c branches/ros-csrss/dll/win32/msi/suminfo.c branches/ros-csrss/dll/win32/msi/where.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/samsrv.h branches/ros-csrss/dll/win32/samsrv/setup.c branches/ros-csrss/dll/win32/samsrv/user.c branches/ros-csrss/dll/win32/shell32/dde.cpp branches/ros-csrss/dll/win32/shell32/shellitem.cpp branches/ros-csrss/dll/win32/shell32/shellitem.h branches/ros-csrss/dll/win32/usp10/bidi.c branches/ros-csrss/dll/win32/usp10/shape.c branches/ros-csrss/dll/win32/usp10/usp10.c branches/ros-csrss/dll/win32/xmllite/reader.c branches/ros-csrss/dll/win32/xmllite/xmllite_main.c branches/ros-csrss/drivers/filesystems/cdfs/cdfs.c branches/ros-csrss/drivers/filesystems/fastfat/fastio.c branches/ros-csrss/drivers/filesystems/fastfat_new/fastio.c branches/ros-csrss/drivers/filesystems/mup/mup.c branches/ros-csrss/drivers/filesystems/ntfs/ntfs.c branches/ros-csrss/drivers/ksfilter/ks/api.c branches/ros-csrss/drivers/multimedia/audio/mpu401_nt4/mpu401.c branches/ros-csrss/drivers/multimedia/audio/sndblst.old/sndblst.c branches/ros-csrss/drivers/multimedia/audio/sound/sb16.c branches/ros-csrss/drivers/multimedia/audio/sound/sound.c branches/ros-csrss/drivers/network/tcpip/datalink/lan.c branches/ros-csrss/drivers/parallel/parallel/parallel.c branches/ros-csrss/drivers/storage/class/cdrom/cdrom.c branches/ros-csrss/drivers/storage/class/class2/class2.c branches/ros-csrss/drivers/storage/classpnp/obsolete.c branches/ros-csrss/drivers/storage/classpnp/power.c branches/ros-csrss/drivers/storage/ide/uniata/atapi.h branches/ros-csrss/drivers/storage/ide/uniata/bm_devs.h branches/ros-csrss/drivers/storage/ide/uniata/id_ata.cpp branches/ros-csrss/drivers/storage/ide/uniata/id_init.cpp branches/ros-csrss/drivers/storage/ide/uniata/id_probe.cpp branches/ros-csrss/drivers/storage/ide/uniata/id_sata.cpp branches/ros-csrss/drivers/storage/ide/uniata/uniata_ver.h branches/ros-csrss/drivers/usb/usbehci/ (props changed) branches/ros-csrss/drivers/usb/usbehci/hardware.cpp branches/ros-csrss/drivers/usb/usbohci/ (props changed) branches/ros-csrss/drivers/usb/usbohci/hardware.cpp branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp branches/ros-csrss/drivers/wdm/audio/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/ros-csrss/drivers/wdm/audio/backpln/portcls/guids.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/resource.h branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.rc branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmipci.rc branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/common.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/common.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/resource.h branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/debug.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/property.h branches/ros-csrss/hal/halppc/generic/display.c branches/ros-csrss/hal/halppc/generic/dma.c branches/ros-csrss/hal/halppc/up/halinit_up.c branches/ros-csrss/hal/halx86/apic/apic.c branches/ros-csrss/hal/halx86/apic/halinit_apic.c branches/ros-csrss/hal/halx86/generic/dma.c branches/ros-csrss/hal/halx86/mp/halinit_mp.c branches/ros-csrss/hal/halx86/up/halinit_mini.c branches/ros-csrss/hal/halx86/up/halinit_up.c branches/ros-csrss/hal/halx86/xbox/halinit_xbox.c branches/ros-csrss/include/ddk/dmusicks.h branches/ros-csrss/include/ddk/dmusprop.h branches/ros-csrss/include/ddk/portcls.h branches/ros-csrss/include/ndk/iofuncs.h branches/ros-csrss/include/psdk/dsound.h branches/ros-csrss/include/psdk/kcom.h branches/ros-csrss/include/psdk/ks.h branches/ros-csrss/include/psdk/ksmedia.h branches/ros-csrss/include/psdk/ksproxy.h branches/ros-csrss/include/psdk/msi.h branches/ros-csrss/include/psdk/ntdef.h branches/ros-csrss/include/psdk/winioctl.h branches/ros-csrss/include/psdk/winnt.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/lib/cmlib/hiveinit.c branches/ros-csrss/lib/drivers/libusb/common_interfaces.h (contents, props changed) branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ros-csrss/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ros-csrss/lib/drivers/lwip/src/core/snmp/msg_out.c branches/ros-csrss/lib/drivers/lwip/src/core/tcp_in.c branches/ros-csrss/lib/drivers/sound/CMakeLists.txt branches/ros-csrss/lib/sdk/crt/include/internal/locale.h branches/ros-csrss/lib/sdk/crt/include/internal/wine/msvcrt.h branches/ros-csrss/lib/sdk/crt/locale/locale.c branches/ros-csrss/lib/sdk/crt/mbstring/_setmbcp.c branches/ros-csrss/lib/sdk/crt/misc/environ.c branches/ros-csrss/lib/sdk/crt/stdio/stat.c branches/ros-csrss/lib/smlib/smclient.c branches/ros-csrss/media/doc/README.WINE branches/ros-csrss/media/inf/syssetup.inf (contents, props changed) branches/ros-csrss/ntoskrnl/ex/event.c branches/ros-csrss/ntoskrnl/ex/evtpair.c branches/ros-csrss/ntoskrnl/ex/mutant.c branches/ros-csrss/ntoskrnl/ex/zone.c branches/ros-csrss/ntoskrnl/io/iomgr/driver.c branches/ros-csrss/ntoskrnl/io/iomgr/util.c branches/ros-csrss/ntoskrnl/io/pnpmgr/pnputil.c branches/ros-csrss/ntoskrnl/kd/kdio.c branches/ros-csrss/ntoskrnl/ke/amd64/krnlinit.c branches/ros-csrss/ntoskrnl/ke/i386/usercall_asm.S branches/ros-csrss/ntoskrnl/ke/thrdobj.c branches/ros-csrss/ntoskrnl/ke/timerobj.c branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c branches/ros-csrss/ntoskrnl/se/semgr.c branches/ros-csrss/tools/mkhive/registry.c branches/ros-csrss/win32ss/drivers/font/ftfd/font.c branches/ros-csrss/win32ss/user/ntuser/focus.c branches/ros-csrss/win32ss/user/ntuser/winsta.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/ata… Modified: branches/ros-csrss/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cal… Modified: branches/ros-csrss/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cal… Modified: branches/ros-csrss/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cal… Modified: branches/ros-csrss/base/applications/network/wlanconf/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/net… Modified: branches/ros-csrss/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/audio_waveout.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/snd… Modified: branches/ros-csrss/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/services/eventlo… Modified: branches/ros-csrss/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/copy.c… Modified: branches/ros-csrss/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/del.c?… Modified: branches/ros-csrss/base/shell/cmd/readme2.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/readme… Modified: branches/ros-csrss/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/ren.c?… Modified: branches/ros-csrss/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/ren.tx… Modified: branches/ros-csrss/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/shell/cmd/todo.t… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/fs/ext2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/keycodes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/gui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/noui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/gui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/CMakeMacros.cma… Modified: branches/ros-csrss/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/Platform/Window… Modified: branches/ros-csrss/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/gcc.cmake?rev=5… Modified: branches/ros-csrss/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/cmake/msvc.cmake?rev=… Modified: branches/ros-csrss/dll/directx/ksproxy/clockforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/c… Modified: branches/ros-csrss/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/i… Modified: branches/ros-csrss/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/k… Modified: branches/ros-csrss/dll/directx/ksproxy/proxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/p… Modified: branches/ros-csrss/dll/directx/ksproxy/qualityforward.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/ksproxy/q… Modified: branches/ros-csrss/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/directx/wine/wine… Modified: branches/ros-csrss/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/opengl/mesa/src/m… Modified: branches/ros-csrss/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/CMa… Modified: branches/ros-csrss/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/bas… Modified: branches/ros-csrss/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/cer… Modified: branches/ros-csrss/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/cha… Modified: branches/ros-csrss/dll/win32/crypt32/decode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/dec… Modified: branches/ros-csrss/dll/win32/crypt32/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/mes… Modified: branches/ros-csrss/dll/win32/crypt32/msg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/msg… Modified: branches/ros-csrss/dll/win32/crypt32/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/obj… Modified: branches/ros-csrss/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/oid… Modified: branches/ros-csrss/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/roo… Modified: branches/ros-csrss/dll/win32/crypt32/serialize.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/ser… Modified: branches/ros-csrss/dll/win32/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/sip… Modified: branches/ros-csrss/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/crypt32/sto… Modified: branches/ros-csrss/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/CMa… Modified: branches/ros-csrss/dll/win32/jscript/activex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/act… Modified: branches/ros-csrss/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/arr… Modified: branches/ros-csrss/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/boo… Modified: branches/ros-csrss/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/dat… Modified: branches/ros-csrss/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/dis… Modified: branches/ros-csrss/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/eng… Modified: branches/ros-csrss/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/eng… Modified: branches/ros-csrss/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/err… Modified: branches/ros-csrss/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/fun… Modified: branches/ros-csrss/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/glo… Modified: branches/ros-csrss/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/jsc… Modified: branches/ros-csrss/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/jsc… Removed: branches/ros-csrss/dll/win32/jscript/jscript.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/jsc… Modified: branches/ros-csrss/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/jsc… Modified: branches/ros-csrss/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/jsu… Modified: branches/ros-csrss/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/lex… Modified: branches/ros-csrss/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/mat… Modified: branches/ros-csrss/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/num… Modified: branches/ros-csrss/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/obj… Modified: branches/ros-csrss/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/par… Modified: branches/ros-csrss/dll/win32/jscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/par… Modified: branches/ros-csrss/dll/win32/jscript/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/par… Modified: branches/ros-csrss/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/reg… Modified: branches/ros-csrss/dll/win32/jscript/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/res… Modified: branches/ros-csrss/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/rsr… Modified: branches/ros-csrss/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/jscript/str… Modified: branches/ros-csrss/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/winnls/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/wi… Modified: branches/ros-csrss/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/action.… Modified: branches/ros-csrss/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/automat… Modified: branches/ros-csrss/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/custom.… Modified: branches/ros-csrss/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/dialog.… Modified: branches/ros-csrss/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/files.c… Modified: branches/ros-csrss/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi.c?r… Modified: branches/ros-csrss/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msi.spe… Modified: branches/ros-csrss/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/msipriv… Modified: branches/ros-csrss/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/package… Modified: branches/ros-csrss/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/record.… Modified: branches/ros-csrss/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/registr… Modified: branches/ros-csrss/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/streams… Modified: branches/ros-csrss/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/suminfo… Modified: branches/ros-csrss/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msi/where.c… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/setu… Modified: branches/ros-csrss/dll/win32/samsrv/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/user… Modified: branches/ros-csrss/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/dde… Modified: branches/ros-csrss/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… Modified: branches/ros-csrss/dll/win32/shell32/shellitem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/shell32/she… Modified: branches/ros-csrss/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/usp10/bidi.… Modified: branches/ros-csrss/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/usp10/shape… Modified: branches/ros-csrss/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/usp10/usp10… Modified: branches/ros-csrss/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/xmllite/rea… Modified: branches/ros-csrss/dll/win32/xmllite/xmllite_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/xmllite/xml… Modified: branches/ros-csrss/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/c… Modified: branches/ros-csrss/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/filesystems/fastfat_new/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/f… Modified: branches/ros-csrss/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/m… Modified: branches/ros-csrss/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/filesystems/n… Modified: branches/ros-csrss/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/ksfilter/ks/a… Modified: branches/ros-csrss/drivers/multimedia/audio/mpu401_nt4/mpu401.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/multimedia/au… Modified: branches/ros-csrss/drivers/multimedia/audio/sndblst.old/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/multimedia/au… Modified: branches/ros-csrss/drivers/multimedia/audio/sound/sb16.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/multimedia/au… Modified: branches/ros-csrss/drivers/multimedia/audio/sound/sound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/multimedia/au… Modified: branches/ros-csrss/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/network/tcpip… Modified: branches/ros-csrss/drivers/parallel/parallel/parallel.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/parallel/para… Modified: branches/ros-csrss/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/storage/classpnp/power.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/class… Modified: branches/ros-csrss/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/storage/ide/u… Modified: branches/ros-csrss/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbehci/h… Modified: branches/ros-csrss/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbohci/h… Modified: branches/ros-csrss/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/usb/usbuhci/h… Modified: branches/ros-csrss/drivers/wdm/audio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/CMa… Modified: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Modified: branches/ros-csrss/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/bac… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Removed: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Removed: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmipci.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/common.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/common.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Removed: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/makefile URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Removed: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/cpl/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/debug.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/drivers/wdm/audio/drivers/CMIDriver/property.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/wdm/audio/dri… Modified: branches/ros-csrss/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halppc/generic/di… Modified: branches/ros-csrss/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halppc/generic/dm… Modified: branches/ros-csrss/hal/halppc/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halppc/up/halinit… Modified: branches/ros-csrss/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/apic/apic.… Modified: branches/ros-csrss/hal/halx86/apic/halinit_apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/apic/halin… Modified: branches/ros-csrss/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/generic/dm… Modified: branches/ros-csrss/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/mp/halinit… Modified: branches/ros-csrss/hal/halx86/up/halinit_mini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/up/halinit… Modified: branches/ros-csrss/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/up/halinit… Modified: branches/ros-csrss/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/hal/halx86/xbox/halin… Modified: branches/ros-csrss/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/dmusicks.… Modified: branches/ros-csrss/include/ddk/dmusprop.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/dmusprop.… Modified: branches/ros-csrss/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/portcls.h… Modified: branches/ros-csrss/include/ndk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ndk/iofuncs.h… Modified: branches/ros-csrss/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/dsound.h… Modified: branches/ros-csrss/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/kcom.h?r… Modified: branches/ros-csrss/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ks.h?rev… Modified: branches/ros-csrss/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ksmedia.… Modified: branches/ros-csrss/include/psdk/ksproxy.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ksproxy.… Modified: branches/ros-csrss/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/msi.h?re… Modified: branches/ros-csrss/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ntdef.h?… Modified: branches/ros-csrss/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winioctl… Modified: branches/ros-csrss/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winnt.h?… Modified: branches/ros-csrss/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/cmlib/hiveinit.c?… Modified: branches/ros-csrss/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/co… Modified: branches/ros-csrss/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hc… Modified: branches/ros-csrss/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/hu… Modified: branches/ros-csrss/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/libusb/us… Modified: branches/ros-csrss/lib/drivers/lwip/src/core/snmp/msg_out.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/lwip/src/… Modified: branches/ros-csrss/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/lwip/src/… Modified: branches/ros-csrss/lib/drivers/sound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/drivers/sound/CMa… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/locale.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/include/i… Modified: branches/ros-csrss/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/locale/lo… Modified: branches/ros-csrss/lib/sdk/crt/mbstring/_setmbcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/mbstring/… Modified: branches/ros-csrss/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/misc/envi… Modified: branches/ros-csrss/lib/sdk/crt/stdio/stat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/stdio/sta… Modified: branches/ros-csrss/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/smlib/smclient.c?… Modified: branches/ros-csrss/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/doc/README.WINE… Modified: branches/ros-csrss/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/inf/syssetup.in… Modified: branches/ros-csrss/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ex/event.c?r… Modified: branches/ros-csrss/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ex/evtpair.c… Modified: branches/ros-csrss/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ex/mutant.c?… Modified: branches/ros-csrss/ntoskrnl/ex/zone.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ex/zone.c?re… Modified: branches/ros-csrss/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/iomgr/dri… Modified: branches/ros-csrss/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/iomgr/uti… Modified: branches/ros-csrss/ntoskrnl/io/pnpmgr/pnputil.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/io/pnpmgr/pn… Modified: branches/ros-csrss/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd/kdio.c?re… Modified: branches/ros-csrss/ntoskrnl/ke/amd64/krnlinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/amd64/krn… Modified: branches/ros-csrss/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/i386/user… Modified: branches/ros-csrss/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/thrdobj.c… Modified: branches/ros-csrss/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/ke/timerobj.… Modified: branches/ros-csrss/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/mm/ARM3/virt… Modified: branches/ros-csrss/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/se/semgr.c?r… Modified: branches/ros-csrss/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/mkhive/registry… Modified: branches/ros-csrss/win32ss/drivers/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/font/… Modified: branches/ros-csrss/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/f… Modified: branches/ros-csrss/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w… Modified: branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w…

11 years, 8 months

[hbelusca] 58689: [CONSRV] Shut-up almost all the dprints.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Apr 6 13:40:34 2013 New Revision: 58689 URL: http://svn.reactos.org/svn/reactos?rev=58689&view=rev Log: [CONSRV] Shut-up almost all the dprints. Modified: branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/handle.c branches/ros-csrss/win32ss/user/consrv/init.c Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Apr 6 13:40:34 2013 @@ -544,15 +544,15 @@ } } - DPRINT1("Terminal initialized\n"); + DPRINT("Terminal initialized\n"); /* All went right, so add the console to the list */ ConSrvLockConsoleListExclusive(); - DPRINT1("Insert in the list\n"); + DPRINT("Insert in the list\n"); InsertTailList(&ConsoleList, &Console->Entry); /* The initialization is finished */ - DPRINT1("Change state\n"); + DPRINT("Change state\n"); Console->State = CONSOLE_RUNNING; /* Unlock the console */ @@ -563,7 +563,7 @@ /* Copy buffer contents to screen */ ConioDrawConsole(Console); - DPRINT1("Console drawn\n"); + DPRINT("Console drawn\n"); /* Return the newly created console to the caller and a success code too */ *NewConsole = Console; @@ -576,7 +576,7 @@ PLIST_ENTRY CurrentEntry; ConsoleInput* Event; - DPRINT1("ConSrvDeleteConsole\n"); + DPRINT("ConSrvDeleteConsole\n"); /* * Forbid validation of any console by other threads @@ -683,14 +683,14 @@ RtlFreeUnicodeString(&Console->Title); IntDeleteAllAliases(Console->Aliases); - DPRINT1("ConSrvDeleteConsole - Unlocking\n"); + DPRINT("ConSrvDeleteConsole - Unlocking\n"); LeaveCriticalSection(&Console->Lock); - DPRINT1("ConSrvDeleteConsole - Destroying lock\n"); + DPRINT("ConSrvDeleteConsole - Destroying lock\n"); DeleteCriticalSection(&Console->Lock); - DPRINT1("ConSrvDeleteConsole - Lock destroyed ; freeing console\n"); + DPRINT("ConSrvDeleteConsole - Lock destroyed ; freeing console\n"); RtlFreeHeap(ConSrvHeap, 0, Console); - DPRINT1("ConSrvDeleteConsole - Console freed\n"); + DPRINT("ConSrvDeleteConsole - Console freed\n"); /* Unlock the console list and return */ ConSrvUnlockConsoleList(); Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Apr 6 13:40:34 2013 @@ -375,7 +375,7 @@ TEXTMETRICW Metrics; SIZE CharSize; - DPRINT1("GuiConsoleHandleNcCreate\n"); + DPRINT("GuiConsoleHandleNcCreate\n"); if (NULL == GuiData) { @@ -459,7 +459,7 @@ SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL); GuiConsoleCreateSysMenu(GuiData->hWindow); - DPRINT1("GuiConsoleHandleNcCreate - setting start event\n"); + DPRINT("GuiConsoleHandleNcCreate - setting start event\n"); SetEvent(GuiData->hGuiInitEvent); return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create); @@ -1767,16 +1767,16 @@ WindowCount++; SetWindowLongW(hWnd, GWL_USERDATA, WindowCount); - DPRINT1("Set icons via PM_CREATE_CONSOLE\n"); + DPRINT("Set icons via PM_CREATE_CONSOLE\n"); if (GuiData->hIcon == NULL) { - DPRINT1("Not really /o\\...\n"); + DPRINT("Not really /o\\...\n"); GuiData->hIcon = ghDefaultIcon; GuiData->hIconSm = ghDefaultIconSm; } else if (GuiData->hIcon != ghDefaultIcon) { - DPRINT1("Yes \\o/\n"); + DPRINT("Yes \\o/\n"); SendMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); } @@ -1790,7 +1790,7 @@ // ShowWindow(NewWindow, (int)wParam); ShowWindowAsync(NewWindow, (int)wParam); - DPRINT1("Window showed\n"); + DPRINT("Window showed\n"); } return (LRESULT)NewWindow; @@ -1824,7 +1824,7 @@ { NotifyWnd = NULL; DestroyWindow(hWnd); - DPRINT1("CONSRV: Going to quit the Gui Thread!!\n"); + DPRINT("CONSRV: Going to quit the Gui Thread!!\n"); PostQuitMessage(0); } } @@ -1876,7 +1876,7 @@ DispatchMessageW(&msg); } - DPRINT1("CONSRV: Quit the Gui Thread!!\n"); + DPRINT("CONSRV: Quit the Gui Thread!!\n"); PrivateCsrssManualGuiCheck(-1); return 1; @@ -2004,16 +2004,16 @@ SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData); - DPRINT1("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", + DPRINT("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ; GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n", GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm); if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon) { - DPRINT1("Destroy hIcon\n"); + DPRINT("Destroy hIcon\n"); DestroyIcon(GuiData->hIcon); } if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm) { - DPRINT1("Destroy hIconSm\n"); + DPRINT("Destroy hIconSm\n"); DestroyIcon(GuiData->hIconSm); } @@ -2021,7 +2021,7 @@ DeleteCriticalSection(&GuiData->Lock); RtlFreeHeap(ConSrvHeap, 0, GuiData); - DPRINT1("Quit GuiCleanupConsole\n"); + DPRINT("Quit GuiCleanupConsole\n"); } static VOID WINAPI @@ -2306,7 +2306,7 @@ GuiData->hIcon = hIcon; GuiData->hIconSm = hIconSm; - DPRINT1("Set icons in GuiChangeIcon\n"); + DPRINT("Set icons in GuiChangeIcon\n"); PostMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG, (LPARAM)GuiData->hIcon); PostMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL, (LPARAM)GuiData->hIconSm); } @@ -2439,7 +2439,7 @@ IconPath = ConsoleStartInfo->AppPath; IconIndex = 0; } - DPRINT1("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath : L"n/a"), IconIndex); + DPRINT("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath : L"n/a"), IconIndex); if (IconPath) { HICON hIcon = NULL, hIconSm = NULL; @@ -2448,10 +2448,10 @@ &hIcon, &hIconSm, 1); - DPRINT1("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm); + DPRINT("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm); if (hIcon != NULL) { - DPRINT1("Effectively set the icons\n"); + DPRINT("Effectively set the icons\n"); GuiData->hIcon = hIcon; GuiData->hIconSm = hIconSm; } @@ -2470,14 +2470,14 @@ /* Wait until initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT1("OK we created the console window\n"); + DPRINT("OK we created the console window\n"); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; /* Check whether we really succeeded in initializing the terminal window */ if (GuiData->hWindow == NULL) { - DPRINT1("GuiInitConsole - We failed at creating a new terminal window\n"); + DPRINT("GuiInitConsole - We failed at creating a new terminal window\n"); // ConioCleanupConsole(Console); GuiCleanupConsole(Console); return STATUS_UNSUCCESSFUL; Modified: branches/ros-csrss/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Apr 6 13:40:34 2013 @@ -94,7 +94,7 @@ } else if (Object->Type == CONIO_INPUT_BUFFER_MAGIC) { - DPRINT1("Closing the input buffer\n"); + DPRINT("Closing the input buffer\n"); } } @@ -533,14 +533,14 @@ { PCONSOLE Console = ProcessData->Console; - DPRINT1("ConSrvRemoveConsole\n"); + DPRINT("ConSrvRemoveConsole\n"); RtlEnterCriticalSection(&ProcessData->HandleTableLock); /* Validate and lock the console */ if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) { - DPRINT1("ConSrvRemoveConsole - Locking OK\n"); + DPRINT("ConSrvRemoveConsole - Locking OK\n"); /* Close all console handles and free the handles table */ ConSrvFreeHandlesTable(ProcessData); @@ -555,7 +555,7 @@ ConioRefreshInternalInfo(Console); /* Release the console */ - DPRINT1("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); + DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount = %lu\n", Console->ReferenceCount); ConSrvReleaseConsole(Console, TRUE); //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Sat Apr 6 13:40:34 2013 @@ -398,7 +398,7 @@ if (!ConnectInfo->Console || ConnectInfo->Console != ProcessData->ParentConsole) { - DPRINT1("ConSrvConnect - Allocate a new console\n"); + DPRINT("ConSrvConnect - Allocate a new console\n"); /* * We are about to create a new console. However when ConSrvNewProcess @@ -426,7 +426,7 @@ } else /* We inherit it from the parent */ { - DPRINT1("ConSrvConnect - Reuse current (parent's) console\n"); + DPRINT("ConSrvConnect - Reuse current (parent's) console\n"); /* Reuse our current console */ Status = ConSrvInheritConsole(ProcessData, @@ -470,7 +470,7 @@ if ( ProcessData->Console != NULL || ProcessData->HandleTable != NULL ) { - DPRINT1("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); + DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n"); ConSrvRemoveConsole(ProcessData); }

11 years, 8 months

[hbelusca] 58688: [CSRSRV] Mispelling fix only. [CONSRV] Improve selection, implement "Marking", i.e. selection with keyboard, and implement transition "Marking" --> "Selection" (selection with mou...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Apr 6 13:18:19 2013 New Revision: 58688 URL: http://svn.reactos.org/svn/reactos?rev=58688&view=rev Log: [CSRSRV] Mispelling fix only. [CONSRV] Improve selection, implement "Marking", i.e. selection with keyboard, and implement transition "Marking" --> "Selection" (selection with mouse). Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/win32ss/user/consrv/conio.h branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Apr 6 13:18:19 2013 @@ -734,7 +734,7 @@ } /* - * Our Root Process was never officially initalized, + * Our Root Process was never officially initialized, * so write the data for each Server DLL manually. */ Modified: branches/ros-csrss/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sat Apr 6 13:18:19 2013 @@ -190,7 +190,8 @@ UINT CodePage; UINT OutputCodePage; - CONSOLE_SELECTION_INFO Selection; + CONSOLE_SELECTION_INFO Selection; /* Contains information about the selection */ + COORD dwSelectionCursor; /* Selection cursor position, most of the time different from Selection.dwSelectionAnchor */ /******************************* Screen buffers *******************************/ LIST_ENTRY BufferList; /* List of all screen buffers for this console */ Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Apr 6 13:18:19 2013 @@ -227,8 +227,24 @@ switch (wParam) { case ID_SYSTEM_EDIT_MARK: - DPRINT1("Marking not handled yet\n"); - break; + { + LPWSTR WindowTitle = NULL; + SIZE_T Length = 0; + + Console->dwSelectionCursor = (COORD){0, 0}; + Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; + Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; + GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); + + Length = Console->Title.Length + sizeof(L"Mark - ")/sizeof(WCHAR) + 1; + WindowTitle = RtlAllocateHeap(ConSrvHeap, 0, Length * sizeof(WCHAR)); + wcscpy(WindowTitle, L"Mark - "); + wcscat(WindowTitle, Console->Title.Buffer); + SetWindowText(GuiData->hWindow, WindowTitle); + RtlFreeHeap(ConSrvHeap, 0, WindowTitle); + + break; + } case ID_SYSTEM_EDIT_COPY: GuiConsoleCopy(GuiData); @@ -240,11 +256,10 @@ case ID_SYSTEM_EDIT_SELECTALL: { - COORD bottomRight = { 0, 0 }; - - bottomRight.X = Console->ConsoleSize.X - 1; - bottomRight.Y = Console->ConsoleSize.Y - 1; - GuiConsoleUpdateSelection(Console, &bottomRight); + Console->Selection.dwSelectionAnchor = (COORD){0, 0}; + Console->dwSelectionCursor.X = Console->ConsoleSize.X - 1; + Console->dwSelectionCursor.Y = Console->ConsoleSize.Y - 1; + GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); break; } @@ -470,7 +485,7 @@ SmallRectToRect(GuiData, &oldRect, &Console->Selection.srSelection); - if(coord != NULL) + if (coord != NULL) { SMALL_RECT rc; /* exchange left/top with right/bottom if required */ @@ -488,15 +503,14 @@ HRGN rgn1, rgn2; /* calculate the region that needs to be updated */ - if((rgn1 = CreateRectRgnIndirect(&oldRect))) + if ((rgn1 = CreateRectRgnIndirect(&oldRect))) { - if((rgn2 = CreateRectRgnIndirect(&newRect))) + if ((rgn2 = CreateRectRgnIndirect(&newRect))) { if(CombineRgn(rgn1, rgn2, rgn1, RGN_XOR) != ERROR) { InvalidateRgn(GuiData->hWindow, rgn1, FALSE); } - DeleteObject(rgn2); } DeleteObject(rgn1); @@ -509,6 +523,7 @@ } Console->Selection.dwFlags |= CONSOLE_SELECTION_NOT_EMPTY; Console->Selection.srSelection = rc; + Console->dwSelectionCursor = *coord; ConioPause(Console, PAUSED_FROM_SELECTION); } else @@ -706,18 +721,118 @@ if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; - Message.hwnd = GuiData->hWindow; - Message.message = msg; - Message.wParam = wParam; - Message.lParam = lParam; - - if(msg == WM_CHAR || msg == WM_SYSKEYDOWN) - { - /* clear the selection */ - GuiConsoleUpdateSelection(Console, NULL); - } - - ConioProcessKey(Console, &Message); + if ( (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && + ((Console->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) == 0) && + (Console->ActiveBuffer) ) + { + BOOL Interpreted = FALSE; + + /* Selection with keyboard */ + if (msg == WM_KEYDOWN) + { + BOOL MajPressed = (GetKeyState(VK_SHIFT) & 0x8000); + + switch (wParam) + { + case VK_LEFT: + { + Interpreted = TRUE; + if (Console->dwSelectionCursor.X > 0) + Console->dwSelectionCursor.X--; + + break; + } + + case VK_RIGHT: + { + Interpreted = TRUE; + if (Console->dwSelectionCursor.X < Console->ActiveBuffer->ScreenBufferSize.X - 1) + Console->dwSelectionCursor.X++; + + break; + } + + case VK_UP: + { + Interpreted = TRUE; + if (Console->dwSelectionCursor.Y > 0) + Console->dwSelectionCursor.Y--; + + break; + } + + case VK_DOWN: + { + Interpreted = TRUE; + if (Console->dwSelectionCursor.Y < Console->ActiveBuffer->ScreenBufferSize.Y - 1) + Console->dwSelectionCursor.Y++; + + break; + } + + case VK_HOME: + { + Interpreted = TRUE; + Console->dwSelectionCursor = (COORD){0, 0}; + break; + } + + case VK_END: + { + Interpreted = TRUE; + Console->dwSelectionCursor.Y = Console->ActiveBuffer->ScreenBufferSize.Y - 1; + break; + } + + case VK_PRIOR: + { + Interpreted = TRUE; + Console->dwSelectionCursor.Y -= Console->ConsoleSize.Y; + if (Console->dwSelectionCursor.Y < 0) + Console->dwSelectionCursor.Y = 0; + + break; + } + + case VK_NEXT: + { + Interpreted = TRUE; + Console->dwSelectionCursor.Y += Console->ConsoleSize.Y; + if (Console->dwSelectionCursor.Y >= Console->ActiveBuffer->ScreenBufferSize.Y) + Console->dwSelectionCursor.Y = Console->ActiveBuffer->ScreenBufferSize.Y - 1; + + break; + } + + default: + break; + } + + if (Interpreted) + { + if (!MajPressed) + Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; + + GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); + } + } + } + else + { + Message.hwnd = GuiData->hWindow; + Message.message = msg; + Message.wParam = wParam; + Message.lParam = lParam; + + if (msg == WM_KEYDOWN) + { + /* If we are in selection mode (with mouse), clear the selection */ + GuiConsoleUpdateSelection(Console, NULL); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); + } + + ConioProcessKey(Console, &Message); + } LeaveCriticalSection(&Console->Lock); } @@ -887,16 +1002,28 @@ goto Quit; } - if (Console->QuickEdit) + if ( (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) || + (Console->QuickEdit) ) { switch (msg) { case WM_LBUTTONDOWN: { + LPWSTR WindowTitle = NULL; + SIZE_T Length = 0; + Console->Selection.dwSelectionAnchor = PointToCoord(GuiData, lParam); SetCapture(GuiData->hWindow); Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS | CONSOLE_MOUSE_SELECTION | CONSOLE_MOUSE_DOWN; GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); + + Length = Console->Title.Length + sizeof(L"Selection - ")/sizeof(WCHAR) + 1; + WindowTitle = RtlAllocateHeap(ConSrvHeap, 0, Length * sizeof(WCHAR)); + wcscpy(WindowTitle, L"Selection - "); + wcscat(WindowTitle, Console->Title.Buffer); + SetWindowText(GuiData->hWindow, WindowTitle); + RtlFreeHeap(ConSrvHeap, 0, WindowTitle); + break; } @@ -926,6 +1053,7 @@ /* Clear the selection */ GuiConsoleUpdateSelection(Console, NULL); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); } break;

11 years, 8 months

[tfaber] 58687: [SHELL32] - Improve IShellItem implementation. Patch by Katayama Hirofumi MZ. CORE-7063 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Apr 6 12:12:43 2013 New Revision: 58687 URL: http://svn.reactos.org/svn/reactos?rev=58687&view=rev Log: [SHELL32] - Improve IShellItem implementation. Patch by Katayama Hirofumi MZ. CORE-7063 #resolve Modified: trunk/reactos/dll/win32/shell32/shellitem.cpp trunk/reactos/dll/win32/shell32/shellitem.h Modified: trunk/reactos/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellitem.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellitem.cpp [iso-8859-1] Sat Apr 6 12:12:43 2013 @@ -3,6 +3,7 @@ * * Copyright 2008 Vincent Povirk for CodeWeavers * Copyright 2009 Andrew Hill + * Copyright 2013 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,17 +29,17 @@ CShellItem::CShellItem() { - pidl = NULL; + m_pidl = NULL; } CShellItem::~CShellItem() { - ILFree(pidl); + ILFree(m_pidl); } HRESULT CShellItem::get_parent_pidl(LPITEMIDLIST *parent_pidl) { - *parent_pidl = ILClone(pidl); + *parent_pidl = ILClone(m_pidl); if (*parent_pidl) { if (ILRemoveLastID(*parent_pidl)) @@ -61,18 +62,18 @@ { LPITEMIDLIST parent_pidl; CComPtr<IShellFolder> desktop; - HRESULT ret; - - ret = get_parent_pidl(&parent_pidl); - if (SUCCEEDED(ret)) - { - ret = SHGetDesktopFolder(&desktop); - if (SUCCEEDED(ret)) - ret = desktop->BindToObject(parent_pidl, NULL, IID_IShellFolder, (void**)ppsf); + HRESULT hr; + + hr = get_parent_pidl(&parent_pidl); + if (SUCCEEDED(hr)) + { + hr = SHGetDesktopFolder(&desktop); + if (SUCCEEDED(hr)) + hr = desktop->BindToObject(parent_pidl, NULL, IID_IShellFolder, (void**)ppsf); ILFree(parent_pidl); } - return ret; + return hr; } HRESULT WINAPI CShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) @@ -87,53 +88,116 @@ HRESULT WINAPI CShellItem::GetParent(IShellItem **ppsi) { LPITEMIDLIST parent_pidl; - HRESULT ret; + HRESULT hr; TRACE("(%p,%p)\n", this, ppsi); - ret = get_parent_pidl(&parent_pidl); - if (SUCCEEDED(ret)) - { - ret = SHCreateShellItem(NULL, NULL, parent_pidl, ppsi); + hr = get_parent_pidl(&parent_pidl); + if (SUCCEEDED(hr)) + { + hr = SHCreateShellItem(NULL, NULL, parent_pidl, ppsi); ILFree(parent_pidl); } - return ret; + return hr; } HRESULT WINAPI CShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName) { - FIXME("(%p,%x,%p)\n", this, sigdnName, ppszName); + CComPtr<IShellFolder> parent_folder; + HRESULT hr; + STRRET name; + DWORD uFlags; + + TRACE("(%p,%x,%p)\n", this, sigdnName, ppszName); + + if (sigdnName & SIGDN_URL) + return E_NOTIMPL; + + if (ppszName == NULL) + return E_POINTER; *ppszName = NULL; - return E_NOTIMPL; + hr = get_parent_shellfolder(&parent_folder); + if (SUCCEEDED(hr)) + { + if (sigdnName == SIGDN_PARENTRELATIVEEDITING) + uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER; + else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING) + uFlags = SHGDN_FOREDITING; + else if (sigdnName == SIGDN_PARENTRELATIVEEDITING) + uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER; + else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING) + uFlags = SHGDN_FOREDITING; + else if (sigdnName == SIGDN_PARENTRELATIVEPARSING) + uFlags = SHGDN_FORPARSING | SHGDN_INFOLDER; + else if (sigdnName == SIGDN_DESKTOPABSOLUTEPARSING) + uFlags = SHGDN_FORPARSING; + else + uFlags = SHGDN_NORMAL; + + hr = parent_folder->GetDisplayNameOf(m_pidl, uFlags, &name); + if (SUCCEEDED(hr)) + { + StrRetToStrW(&name, m_pidl, ppszName); + return S_OK; + } + } + + return hr; } HRESULT WINAPI CShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) { CComPtr<IShellFolder> parent_folder; LPITEMIDLIST child_pidl; - HRESULT ret; + HRESULT hr; TRACE("(%p,%x,%p)\n", this, sfgaoMask, psfgaoAttribs); - ret = get_parent_shellfolder(&parent_folder); - if (SUCCEEDED(ret)) - { - child_pidl = ILFindLastID(pidl); + hr = get_parent_shellfolder(&parent_folder); + if (SUCCEEDED(hr)) + { + child_pidl = ILFindLastID(m_pidl); *psfgaoAttribs = sfgaoMask; - ret = parent_folder->GetAttributesOf(1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); - } - - return ret; + hr = parent_folder->GetAttributesOf(1, (LPCITEMIDLIST*)&child_pidl, psfgaoAttribs); + } + + return hr; } HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) { - FIXME("(%p,%p,%x,%p)\n", this, oth, hint, piOrder); - - return E_NOTIMPL; + CComPtr<IShellFolder> parent_folder; + CComPtr<IPersistIDList> pIDList; + HRESULT hr; + LPITEMIDLIST pidl; + + TRACE("(%p,%p,%x,%p)\n", this, oth, hint, piOrder); + + if (piOrder == NULL || oth == NULL) + return E_POINTER; + + hr = oth->QueryInterface(IID_IPersistIDList, (void **)&pIDList); + if (SUCCEEDED(hr)) + { + hr = pIDList->GetIDList(&pidl); + if (SUCCEEDED(hr)) + { + hr = get_parent_shellfolder(&parent_folder); + if (SUCCEEDED(hr)) + { + hr = parent_folder->CompareIDs(hint, m_pidl, pidl); + *piOrder = (int)SCODE_CODE(hr); + } + ILFree(pidl); + } + } + + if (SUCCEEDED(hr)) + return S_OK; + return hr; } HRESULT WINAPI CShellItem::GetClassID(CLSID *pClassID) @@ -144,7 +208,6 @@ return S_OK; } - HRESULT WINAPI CShellItem::SetIDList(LPCITEMIDLIST pidlx) { LPITEMIDLIST new_pidl; @@ -152,11 +215,10 @@ TRACE("(%p,%p)\n", this, pidlx); new_pidl = ILClone(pidlx); - if (new_pidl) { - ILFree(pidl); - pidl = new_pidl; + ILFree(m_pidl); + m_pidl = new_pidl; return S_OK; } else @@ -167,7 +229,7 @@ { TRACE("(%p,%p)\n", this, ppidl); - *ppidl = ILClone(pidl); + *ppidl = ILClone(m_pidl); if (*ppidl) return S_OK; else @@ -180,7 +242,7 @@ IShellItem *newShellItem; LPITEMIDLIST new_pidl; CComPtr<IPersistIDList> newPersistIDList; - HRESULT ret; + HRESULT hr; TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); @@ -223,26 +285,26 @@ return E_OUTOFMEMORY; } - ret = CShellItem::_CreatorClass::CreateInstance(NULL, IID_IShellItem, (void**)&newShellItem); - if (FAILED(ret)) + hr = CShellItem::_CreatorClass::CreateInstance(NULL, IID_IShellItem, (void**)&newShellItem); + if (FAILED(hr)) { *ppsi = NULL; ILFree(new_pidl); - return ret; - } - ret = newShellItem->QueryInterface(IID_IPersistIDList, (void **)&newPersistIDList); - if (FAILED(ret)) + return hr; + } + hr = newShellItem->QueryInterface(IID_IPersistIDList, (void **)&newPersistIDList); + if (FAILED(hr)) { ILFree(new_pidl); - return ret; - } - ret = newPersistIDList->SetIDList(new_pidl); - if (FAILED(ret)) + return hr; + } + hr = newPersistIDList->SetIDList(new_pidl); + if (FAILED(hr)) { ILFree(new_pidl); - return ret; + return hr; } ILFree(new_pidl); *ppsi = newShellItem; - return ret; -} + return hr; +} Modified: trunk/reactos/dll/win32/shell32/shellitem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellite… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellitem.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellitem.h [iso-8859-1] Sat Apr 6 12:12:43 2013 @@ -29,7 +29,7 @@ public IPersistIDList { private: - LPITEMIDLIST pidl; + LPITEMIDLIST m_pidl; public: CShellItem(); ~CShellItem();

11 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013