Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[akhaldi] 55297: [PSTOREC] * Sync to Wine 1.3.37.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 22:24:35 2012 New Revision: 55297 URL: http://svn.reactos.org/svn/reactos?rev=55297&view=rev Log: [PSTOREC] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/pstorec/pstorec.rgs (with props) Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/dll/win32/pstorec/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -33,9 +33,14 @@ typedef struct { - const IPStoreVtbl *lpVtbl; + IPStore IPStore_iface; LONG ref; } PStore_impl; + +static inline PStore_impl *impl_from_IPStore(IPStore *iface) +{ + return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface); +} BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { @@ -62,7 +67,7 @@ REFIID riid, LPVOID *ppvObj) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %s\n",This,debugstr_guid(riid)); @@ -87,7 +92,7 @@ */ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); TRACE("%p %u\n", This, This->ref); @@ -99,7 +104,7 @@ */ static ULONG WINAPI PStore_fnRelease(IPStore* iface) { - PStore_impl *This = (PStore_impl *)iface; + PStore_impl *This = impl_from_IPStore(iface); LONG ref; TRACE("%p %u\n", This, This->ref); @@ -359,7 +364,7 @@ if( !ips ) return E_OUTOFMEMORY; - ips->lpVtbl = &pstores_vtbl; + ips->IPStore_iface.lpVtbl = &pstores_vtbl; ips->ref = 1; *ppProvider = (IPStore*) ips; Added: trunk/reactos/dll/win32/pstorec/pstorec.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.rgs (added) +++ trunk/reactos/dll/win32/pstorec/pstorec.rgs [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -1,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{5A6F1EBD-2DB1-11D0-8C39-00C04FD9126B}' + { + '1.0' = s 'PStore 1.0 Type Library' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/pstorec/pstorec.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/pstorec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -27,3 +27,5 @@ /* @makedep: pstorec_tlb.tlb */ 1 TYPELIB pstorec_tlb.tlb + +2 WINE_REGISTRY pstorec.rgs Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 22:24:35 2012 @@ -134,7 +134,7 @@ reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 -reactos/dll/win32/pstorec # Autosync +reactos/dll/win32/pstorec # Synced to Wine-1.3.37 reactos/dll/win32/query # Autosync reactos/dll/win32/rasapi32 # Autosync reactos/dll/win32/resutils # Autosync

12 years, 11 months

[akhaldi] 55296: [PRINTUI] * Sync to Wine 1.3.37.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 21:39:30 2012 New Revision: 55296 URL: http://svn.reactos.org/svn/reactos?rev=55296&view=rev Log: [PRINTUI] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/printui/printui.c trunk/reactos/dll/win32/printui/printui.rc trunk/reactos/dll/win32/printui/printui_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/printui/printui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(printui); -HINSTANCE PRINTUI_hInstance = NULL; +static HINSTANCE PRINTUI_hInstance = NULL; /* ################################# */ Modified: trunk/reactos/dll/win32/printui/printui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.rc [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "printui.dll" Modified: trunk/reactos/dll/win32/printui/printui_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui_… ============================================================================== --- trunk/reactos/dll/win32/printui/printui_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui_private.h [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -63,10 +63,4 @@ LPWSTR options[OPT_MAX]; BOOL flags[FLAG_MAX]; } context_t; - - -/* ## DLL-wide Globals ## */ -extern HINSTANCE PRINTUI_hInstance; - - #endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 21:39:30 2012 @@ -133,7 +133,7 @@ reactos/dll/win32/pdh # Autosync reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Autosync +reactos/dll/win32/printui # Synced to Wine-1.3.37 reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync reactos/dll/win32/rasapi32 # Autosync

12 years, 11 months

[akhaldi] 55295: [WTSAPI32] * Sync to Wine 1.3.37.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 29 21:29:40 2012 New Revision: 55295 URL: http://svn.reactos.org/svn/reactos?rev=55295&view=rev Log: [WTSAPI32] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -56,6 +56,24 @@ } /************************************************************ + * WTSConnectSessionA (WTSAPI32.@) + */ +BOOL WINAPI WTSConnectSessionA(ULONG LogonId, ULONG TargetLogonId, PSTR pPassword, BOOL bWait) +{ + FIXME("Stub %d %d (%s) %d\n", LogonId, TargetLogonId, debugstr_a(pPassword), bWait); + return TRUE; +} + +/************************************************************ + * WTSConnectSessionW (WTSAPI32.@) + */ +BOOL WINAPI WTSConnectSessionW(ULONG LogonId, ULONG TargetLogonId, PWSTR pPassword, BOOL bWait) +{ + FIXME("Stub %d %d (%s) %d\n", LogonId, TargetLogonId, debugstr_w(pPassword), bWait); + return TRUE; +} + +/************************************************************ * WTSDisconnectSession (WTSAPI32.@) */ BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) @@ -99,6 +117,25 @@ } /************************************************************ + * WTSEnumerateServersA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateServersA(LPSTR pDomainName, DWORD Reserved, DWORD Version, PWTS_SERVER_INFOA *ppServerInfo, DWORD *pCount) +{ + FIXME("Stub %s 0x%08x 0x%08x %p %p\n", debugstr_a(pDomainName), Reserved, Version, ppServerInfo, pCount); + return FALSE; +} + +/************************************************************ + * WTSEnumerateServersW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Version, PWTS_SERVER_INFOW *ppServerInfo, DWORD *pCount) +{ + FIXME("Stub %s 0x%08x 0x%08x %p %p\n", debugstr_w(pDomainName), Reserved, Version, ppServerInfo, pCount); + return FALSE; +} + + +/************************************************************ * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, @@ -138,7 +175,6 @@ void WINAPI WTSFreeMemory(PVOID pMemory) { FIXME("Stub %p\n", pMemory); - return; } /************************************************************ @@ -206,6 +242,230 @@ } /************************************************************ + * WTSQueryUserToken (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) +{ + FIXME("%u %p\n", session_id, token); + return FALSE; +} + +/************************************************************ + * WTSQueryUserConfigA (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserConfigA(LPSTR pServerName, LPSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPSTR *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %p\n", debugstr_a(pServerName), debugstr_a(pUserName), WTSConfigClass, + ppBuffer, pBytesReturned); + return FALSE; +} + +/************************************************************ + * WTSQueryUserConfigW (WTSAPI32.@) + */ +BOOL WINAPI WTSQueryUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPWSTR *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %p\n", debugstr_w(pServerName), debugstr_w(pUserName), WTSConfigClass, + ppBuffer, pBytesReturned); + return FALSE; +} + + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); + return TRUE; +} + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); + return FALSE; +} + + +/************************************************************ + * WTSSendMessageA (WTSAPI32.@) + */ +BOOL WINAPI WTSSendMessageA(HANDLE hServer, DWORD SessionId, LPSTR pTitle, DWORD TitleLength, LPSTR pMessage, + DWORD MessageLength, DWORD Style, DWORD Timeout, DWORD *pResponse, BOOL bWait) +{ + FIXME("Stub %p 0x%08x (%s) %d (%s) %d 0x%08x %d %p %d\n", hServer, SessionId, debugstr_a(pTitle), TitleLength, debugstr_a(pMessage), MessageLength, Style, Timeout, pResponse, bWait); + return FALSE; +} + +/************************************************************ + * WTSSendMessageW (WTSAPI32.@) + */ +BOOL WINAPI WTSSendMessageW(HANDLE hServer, DWORD SessionId, LPWSTR pTitle, DWORD TitleLength, LPWSTR pMessage, + DWORD MessageLength, DWORD Style, DWORD Timeout, DWORD *pResponse, BOOL bWait) +{ + FIXME("Stub %p 0x%08x (%s) %d (%s) %d 0x%08x %d %p %d\n", hServer, SessionId, debugstr_w(pTitle), TitleLength, debugstr_w(pMessage), MessageLength, Style, Timeout, pResponse, bWait); + return FALSE; +} + +/************************************************************ + * WTSSetUserConfigA (WTSAPI32.@) + */ +BOOL WINAPI WTSSetUserConfigA(LPSTR pServerName, LPSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPSTR pBuffer, DWORD DataLength) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %d\n", debugstr_a(pServerName), debugstr_a(pUserName), WTSConfigClass,pBuffer, DataLength); + return FALSE; +} + +/************************************************************ + * WTSSetUserConfigW (WTSAPI32.@) + */ +BOOL WINAPI WTSSetUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG_CLASS WTSConfigClass, LPWSTR pBuffer, DWORD DataLength) +{ + FIXME("Stub (%s) (%s) 0x%08x %p %d\n", debugstr_w(pServerName), debugstr_w(pUserName), WTSConfigClass,pBuffer, DataLength); + return FALSE; +} + +/************************************************************ + * WTSShutdownSystem (WTSAPI32.@) + */ +BOOL WINAPI WTSShutdownSystem(HANDLE hServer, DWORD ShutdownFlag) +{ + FIXME("Stub %p 0x%08x\n", hServer,ShutdownFlag); + return FALSE; +} + +/************************************************************ + * WTSStartRemoteControlSessionA (WTSAPI32.@) + */ +BOOL WINAPI WTSStartRemoteControlSessionA(LPSTR pTargetServerName, ULONG TargetLogonId, BYTE HotkeyVk, USHORT HotkeyModifiers) +{ + FIXME("Stub (%s) %d %d %d\n", debugstr_a(pTargetServerName), TargetLogonId, HotkeyVk, HotkeyModifiers); + return FALSE; +} + +/************************************************************ + * WTSStartRemoteControlSessionW (WTSAPI32.@) + */ +BOOL WINAPI WTSStartRemoteControlSessionW(LPWSTR pTargetServerName, ULONG TargetLogonId, BYTE HotkeyVk, USHORT HotkeyModifiers) +{ + FIXME("Stub (%s) %d %d %d\n", debugstr_w(pTargetServerName), TargetLogonId, HotkeyVk, HotkeyModifiers); + return FALSE; +} + +/************************************************************ + * WTSStopRemoteControlSession (WTSAPI32.@) + */ +BOOL WINAPI WTSStopRemoteControlSession(ULONG LogonId) +{ + FIXME("Stub %d\n", LogonId); + return FALSE; +} + +/************************************************************ + * WTSTerminateProcess (WTSAPI32.@) + */ +BOOL WINAPI WTSTerminateProcess(HANDLE hServer, DWORD ProcessId, DWORD ExitCode) +{ + FIXME("Stub %p %d %d\n", hServer, ProcessId, ExitCode); + return FALSE; +} + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) +{ + FIXME("Stub %p\n", hWnd); + return FALSE; +} + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd) +{ + FIXME("Stub %p %p\n", hServer, hWnd); + return FALSE; +} + + +/************************************************************ + * WTSVirtualChannelClose (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelClose(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelOpen (WTSAPI32.@) + */ +HANDLE WINAPI WTSVirtualChannelOpen(HANDLE hServer, DWORD SessionId, LPSTR pVirtualName) +{ + FIXME("Stub %p %d (%s)\n", hServer, SessionId, debugstr_a(pVirtualName)); + return NULL; +} + +/************************************************************ + * WTSVirtualChannelOpen (WTSAPI32.@) + */ +HANDLE WINAPI WTSVirtualChannelOpenEx(DWORD SessionId, LPSTR pVirtualName, DWORD flags) +{ + FIXME("Stub %d (%s) %d\n", SessionId, debugstr_a(pVirtualName), flags); + return NULL; +} + +/************************************************************ + * WTSVirtualChannelPurgeInput (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelPurgeInput(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelPurgeOutput (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelPurgeOutput(HANDLE hChannelHandle) +{ + FIXME("Stub %p\n", hChannelHandle); + return FALSE; +} + + +/************************************************************ + * WTSVirtualChannelQuery (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelQuery(HANDLE hChannelHandle, WTS_VIRTUAL_CLASS WtsVirtualClass, PVOID *ppBuffer, DWORD *pBytesReturned) +{ + FIXME("Stub %p %d %p %p\n", hChannelHandle, WtsVirtualClass, ppBuffer, pBytesReturned); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelRead (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelRead(HANDLE hChannelHandle, ULONG TimeOut, PCHAR Buffer, ULONG BufferSize, PULONG pBytesRead) +{ + FIXME("Stub %p %d %p %d %p\n", hChannelHandle, TimeOut, Buffer, BufferSize, pBytesRead); + return FALSE; +} + +/************************************************************ + * WTSVirtualChannelWrite (WTSAPI32.@) + */ +BOOL WINAPI WTSVirtualChannelWrite(HANDLE hChannelHandle, PCHAR Buffer, ULONG Length, PULONG pBytesWritten) +{ + FIXME("Stub %p %p %d %p\n", hChannelHandle, Buffer, Length, pBytesWritten); + return FALSE; +} + +/************************************************************ * WTSWaitSystemEvent (WTSAPI32.@) */ BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD Mask, DWORD* Flags) @@ -214,30 +474,3 @@ FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); return FALSE; } - -/************************************************************ - * WTSRegisterSessionNotification (WTSAPI32.@) - */ -BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) -{ - FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); - return FALSE; -} - -/************************************************************ - * WTSUnRegisterSessionNotification (WTSAPI32.@) - */ -BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) -{ - FIXME("Stub %p\n", hWnd); - return FALSE; -} - -/************************************************************ - * WTSQueryUserToken (WTSAPI32.@) - */ -BOOL WINAPI WTSQueryUserToken(ULONG session_id, PHANDLE token) -{ - FIXME("%u %p\n", session_id, token); - return FALSE; -} Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.spec [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -1,35 +1,43 @@ @ stdcall WTSCloseServer(long) +@ stdcall WTSConnectSessionA(long long ptr long) +@ stdcall WTSConnectSessionW(long long ptr long) @ stdcall WTSDisconnectSession(long long long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) -@ stub WTSEnumerateServersA -@ stub WTSEnumerateServersW +@ stdcall WTSEnumerateServersA(ptr long long ptr ptr) +@ stdcall WTSEnumerateServersW(ptr long long ptr ptr) @ stdcall WTSEnumerateSessionsA(long long long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) -@ stdcall WTSLogoffSession(ptr long long) +@ stdcall WTSLogoffSession(long long long) @ stdcall WTSOpenServerA(ptr) @ stdcall WTSOpenServerW(ptr) @ stdcall WTSQuerySessionInformationA(long long long ptr ptr) @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) -@ stub WTSQueryUserConfigA -@ stub WTSQueryUserConfigW +@ stdcall WTSQueryUserConfigA(ptr ptr long ptr ptr) +@ stdcall WTSQueryUserConfigW(ptr ptr long ptr ptr) @ stdcall WTSQueryUserToken(long ptr) @ stdcall WTSRegisterSessionNotification(long long) -@ stub WTSSendMessageA -@ stub WTSSendMessageW +@ stdcall WTSRegisterSessionNotificationEx(long long long) +@ stdcall WTSSendMessageA(long long ptr long ptr long long long ptr long) +@ stdcall WTSSendMessageW(long long ptr long ptr long long long ptr long) @ stub WTSSetSessionInformationA @ stub WTSSetSessionInformationW -@ stub WTSSetUserConfigA -@ stub WTSSetUserConfigW -@ stub WTSShutdownSystem -@ stub WTSTerminateProcess +@ stdcall WTSSetUserConfigA(ptr ptr long ptr long) +@ stdcall WTSSetUserConfigW(ptr ptr long ptr long) +@ stdcall WTSShutdownSystem(long long) +@ stdcall WTSStartRemoteControlSessionA(ptr long long long) +@ stdcall WTSStartRemoteControlSessionW(ptr long long long) +@ stdcall WTSStopRemoteControlSession(long) +@ stdcall WTSTerminateProcess(long long long) @ stdcall WTSUnRegisterSessionNotification(long) -@ stub WTSVirtualChannelClose -@ stub WTSVirtualChannelOpen -@ stub WTSVirtualChannelPurgeInput -@ stub WTSVirtualChannelPurgeOutput -@ stub WTSVirtualChannelQuery -@ stub WTSVirtualChannelRead -@ stub WTSVirtualChannelWrite +@ stdcall WTSUnRegisterSessionNotificationEx(long long) +@ stdcall WTSVirtualChannelClose(long) +@ stdcall WTSVirtualChannelOpen(long long ptr) +@ stdcall WTSVirtualChannelOpenEx(long ptr long) +@ stdcall WTSVirtualChannelPurgeInput(long) +@ stdcall WTSVirtualChannelPurgeOutput(long) +@ stdcall WTSVirtualChannelQuery(long long ptr ptr) +@ stdcall WTSVirtualChannelRead(long long ptr long ptr) +@ stdcall WTSVirtualChannelWrite(long ptr long ptr) @ stdcall WTSWaitSystemEvent(long long ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 21:29:40 2012 @@ -180,7 +180,7 @@ reactos/dll/win32/wintrust # Autosync reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Autosync -reactos/dll/win32/wtsapi32 # Forked +reactos/dll/win32/wtsapi32 # Synced to Wine-1.3.37 reactos/dll/win32/wuapi # Autosync reactos/dll/win32/xinput1_1 # Autosync reactos/dll/win32/xinput1_2 # Autosync

12 years, 11 months

[janderwald] 55294: [USBEHCI] - Enable device as pci bus master - Fixes hanging of Vmware USB EHCI controller - Revert changes from 55293 from usb_queue - Currently crashes when usbstor wants to re...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 29 20:34:46 2012 New Revision: 55294 URL: http://svn.reactos.org/svn/reactos?rev=55294&view=rev Log: [USBEHCI] - Enable device as pci bus master - Fixes hanging of Vmware USB EHCI controller - Revert changes from 55293 from usb_queue - Currently crashes when usbstor wants to receive descriptors Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -226,14 +226,42 @@ return STATUS_SUCCESS; } - if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) - { - DPRINT1("PCI Configuration shows this as a non Bus Mastering device!\n"); - } - m_VendorID = PciConfig.VendorID; m_DeviceID = PciConfig.DeviceID; + + if (PciConfig.Command & PCI_ENABLE_BUS_MASTER) + { + // + // master is enabled + // + return STATUS_SUCCESS; + } + + DPRINT1("PCI Configuration shows this as a non Bus Mastering device! Enabling...\n"); + + PciConfig.Command |= PCI_ENABLE_BUS_MASTER; + BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); + + BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT1("Failed to get pci config information!\n"); + ASSERT(FALSE); + return STATUS_SUCCESS; + } + + if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) + { + PciConfig.Command |= PCI_ENABLE_BUS_MASTER; + DPRINT1("Failed to enable master\n"); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -368,8 +368,6 @@ m_Hardware->GetCommandRegister(&UsbCmd); ASSERT(UsbCmd.AsyncEnable == TRUE); - m_Hardware->SetAsyncListRegister(QueueHead->PhysicalAddr); - } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sun Jan 29 20:34:46 2012 @@ -2,7 +2,7 @@ #define USBEHCI_H__ #include <ntddk.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <hubbusif.h> #include <usbbusif.h>

12 years, 11 months

[janderwald] 55293: [USBEHCI] - Update async address everytime a new queue head is added as specified in EHCI spec section 3.2 - Add more checks - Vmware EHCI not yet working

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 29 17:30:31 2012 New Revision: 55293 URL: http://svn.reactos.org/svn/reactos?rev=55293&view=rev Log: [USBEHCI] - Update async address everytime a new queue head is added as specified in EHCI spec section 3.2 - Add more checks - Vmware EHCI not yet working Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -301,6 +301,15 @@ // Description: releases the device lock virtual void ReleaseDeviceLock(KIRQL OldLevel) = 0; + + // set command + virtual void SetCommandRegister(struct _EHCI_USBCMD_CONTENT *UsbCmd) = 0; + + // get command + virtual void GetCommandRegister(struct _EHCI_USBCMD_CONTENT *UsbCmd) = 0; + + + }; typedef IUSBHardwareDevice *PUSBHARDWAREDEVICE; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -141,6 +141,11 @@ // Status = InitializeSyncSchedule(Hardware, MemManager); + // + // store hardware object + // + m_Hardware = Hardware; + return Status; } @@ -358,6 +363,13 @@ KeAcquireSpinLock(m_Lock, &OldLevel); LinkQueueHead(AsyncListQueueHead, QueueHead); KeReleaseSpinLock(m_Lock, OldLevel); + + EHCI_USBCMD_CONTENT UsbCmd; + m_Hardware->GetCommandRegister(&UsbCmd); + ASSERT(UsbCmd.AsyncEnable == TRUE); + + m_Hardware->SetAsyncListRegister(QueueHead->PhysicalAddr); + } @@ -419,6 +431,7 @@ // // Link the LIST_ENTRYs // + ASSERT(IsListEmpty(&HeadQueueHead->LinkedQueueHeads)); InsertTailList(&HeadQueueHead->LinkedQueueHeads, &NewQueueHead->LinkedQueueHeads); // @@ -426,6 +439,7 @@ // Entry = NewQueueHead->LinkedQueueHeads.Blink; LastQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + ASSERT(LastQueueHead == HeadQueueHead); LastQueueHead->HorizontalLinkPointer = (NewQueueHead->PhysicalAddr | QH_TYPE_QH); // @@ -435,6 +449,11 @@ NextQueueHead = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); ASSERT(NextQueueHead == HeadQueueHead); NewQueueHead->HorizontalLinkPointer = (NextQueueHead->PhysicalAddr | QH_TYPE_QH); + + // + // head queue head must be halted + // + PC_ASSERT(HeadQueueHead->Token.Bits.Halted == TRUE); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sun Jan 29 17:30:31 2012 @@ -767,7 +767,14 @@ // link transfer descriptors to queue head // QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; - +/* + if (m_TransferBufferMDL) + QueueHead->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; + else + QueueHead->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; + + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x0; +*/ // // store result //

12 years, 11 months

[janderwald] 55292: [EHCI] - EHCI controllers support 15 ports as specified

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 29 17:25:34 2012 New Revision: 55292 URL: http://svn.reactos.org/svn/reactos?rev=55292&view=rev Log: [EHCI] - EHCI controllers support 15 ports as specified Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sun Jan 29 17:25:34 2012 @@ -256,7 +256,7 @@ EHCI_HCC_CONTENT HCCParams; ULONG HCCParamsLong; }; - UCHAR PortRoute [8]; + UCHAR PortRoute [15]; } EHCI_CAPS, *PEHCI_CAPS;

12 years, 11 months

[janderwald] 55291: [USBEHCI] - Rewrite the init routine of EHCI controller - Implement PORT_POWER

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 29 17:24:41 2012 New Revision: 55291 URL: http://svn.reactos.org/svn/reactos?rev=55291&view=rev Log: [USBEHCI] - Rewrite the init routine of EHCI controller - Implement PORT_POWER Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sun Jan 29 17:24:41 2012 @@ -80,6 +80,13 @@ KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); + // set command + VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // get command + VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // local BOOLEAN InterruptService(); @@ -118,11 +125,6 @@ ULONG m_SyncFramePhysAddr; // periodic frame list physical address BOOLEAN m_ResetInProgress[16]; // set when a reset is in progress - // set command - VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); - - // get command - VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -336,8 +338,13 @@ m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4)); m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); + DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); + DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + + DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); if (m_Capabilities.HCSParams.PortRouteRules) { for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) @@ -518,22 +525,42 @@ ULONG UsbSts, FailSafe; // + // check caps + // + if (m_Capabilities.HCCParams.CurAddrBits) + { + // + // disable 64-bit addressing + // + EHCI_WRITE_REGISTER_ULONG(EHCI_CTRLDSSEGMENT, 0x0); + } + + +#if 1 + // // Stop the controller if its running // UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); if (!(UsbSts & EHCI_STS_HALT)) + { + DPRINT1("Stopping Controller %x\n", UsbSts); StopController(); + } +#endif // // Enable Interrupts and start execution // - EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR - /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); - - // - // Assign the AsyncList Register - // - EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, AsyncQueueHead->PhysicalAddr); + ULONG Mask = EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR | EHCI_USBINTR_PC; + EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, Mask); + + KeStallExecutionProcessor(10); + + ULONG Status = EHCI_READ_REGISTER_ULONG(EHCI_USBINTR); + + DPRINT1("Interrupt Mask %x\n", Status); + ASSERT((Status & Mask) == Mask); + // // Assign the SyncList Register @@ -543,13 +570,12 @@ // // Set Schedules to Enable and Interrupt Threshold to 1ms. // - GetCommandRegister(&UsbCmd); + RtlZeroMemory(&UsbCmd, sizeof(EHCI_USBCMD_CONTENT)); + UsbCmd.PeriodicEnable = TRUE; - UsbCmd.IntThreshold = 1; - SetCommandRegister(&UsbCmd); - - GetCommandRegister(&UsbCmd); + UsbCmd.IntThreshold = 0x8; //1ms UsbCmd.Run = TRUE; + UsbCmd.FrameListSize = 0x0; //1024 SetCommandRegister(&UsbCmd); // @@ -566,6 +592,7 @@ } } + if (UsbSts & EHCI_STS_HALT) { DPRINT1("Could not start execution on the controller\n"); @@ -573,17 +600,62 @@ } // + // Assign the AsyncList Register + // + EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, AsyncQueueHead->PhysicalAddr); + + // + // get command register + // + GetCommandRegister(&UsbCmd); + + // + // preserve bits + // + UsbCmd.AsyncEnable = TRUE; + + // + // enable async + // + SetCommandRegister(&UsbCmd); + + // + // Wait for execution to start + // + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(10); + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + + if ((UsbSts & EHCI_STS_ASS)) + { + break; + } + } + + if (!(UsbSts & EHCI_STS_ASS)) + { + DPRINT1("Failed to enable async schedule UsbSts %x\n", UsbSts); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("UsbSts %x\n", UsbSts); + GetCommandRegister(&UsbCmd); + + DPRINT1("UsbCmd.PeriodicEnable %x\n", UsbCmd.PeriodicEnable); + DPRINT1("UsbCmd.AsyncEnable %x\n", UsbCmd.AsyncEnable); + DPRINT1("UsbCmd.IntThreshold %x\n", UsbCmd.IntThreshold); + DPRINT1("UsbCmd.Run %x\n", UsbCmd.Run); + DPRINT1("UsbCmd.FrameListSize %x\n", UsbCmd.FrameListSize); + + // // Set port routing to EHCI controller // EHCI_WRITE_REGISTER_ULONG(EHCI_CONFIGFLAG, 1); - // - // Enable async - // - GetCommandRegister(&UsbCmd); - UsbCmd.AsyncEnable = TRUE; //FIXME: Need USB Memory Manager - // FIXME: Set framelistsize when periodic is implemented. - SetCommandRegister(&UsbCmd); + + DPRINT1("EHCI Started!\n"); return STATUS_SUCCESS; @@ -854,8 +926,16 @@ } if (Feature == PORT_POWER) - DPRINT1("PORT_POWER Not implemented\n"); - + { + if (m_Capabilities.HCSParams.PortPowerControl) + { + // + // enable port power + // + ULONG Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)) | EHCI_PRT_POWER; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC, Value); + } + } return STATUS_SUCCESS; } @@ -982,6 +1062,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + DPRINT1("CStatus %x\n", CStatus); // // check for completion of async schedule

12 years, 11 months

[ion] 55290: [SMSS]: Add a new header which precisely documents the SB and SM packet structure and protocol. These match the Server 2003 SP1 definitions and sizes and would allow a ReactOS SMSS to ...

by ion＠svn.reactos.org

Author: ion Date: Sun Jan 29 17:16:01 2012 New Revision: 55290 URL: http://svn.reactos.org/svn/reactos?rev=55290&view=rev Log: [SMSS]: Add a new header which precisely documents the SB and SM packet structure and protocol. These match the Server 2003 SP1 definitions and sizes and would allow a ReactOS SMSS to talk to a Windows CSRSS and vice-versa. Added: trunk/reactos/include/reactos/subsys/sm/smmsg.h (with props) Added: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h (added) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Sun Jan 29 17:16:01 2012 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: include/reactos/subsystems/sm/smmsg.h + * PURPOSE: SMSS (SB and SM) Message Format + * PROGRAMMERS: Alex Ionescu + */ + +// +// There are the APIs that a Client (such as CSRSS) can send to the SMSS Server. +// +// These are called "SM" APIs. +// +// The exact names are not known, but we are basing them on the SmpApiName array +// in the checked build of SMSS, which is probably a close approximation. We add +// "p" to use the similar nomenclature seen/leaked out in the Base CSRSS APIs. +// +// +typedef enum _SMSRV_API_NUMBER +{ + SmpCreateForeignSession, + SmpSessionComplete, + SmpTerminateForeignSession, + SmpExecPgm, + SmpLoadDeferedSubsystem, + SmpStartCsr, + SmpStopCsr, + SmpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... +} SMSRV_API_NUMBER; + +// +// These are the structures making up the SM_API_MSG packet structure defined +// below. Each one corresponds to an equivalent API from the list above. +// +typedef struct _SM_CREATE_FOREIGN_SESSION_MSG +{ + ULONG NotImplemented; +} SM_CREATE_FOREIGN_SESSION_MSG, *PSM_CREATE_FOREIGN_SESSION_MSG; + +typedef struct _SM_SESSION_COMPLETE_MSG +{ + ULONG SessionId; + NTSTATUS Status; +} SM_SESSION_COMPLETE_MSG, *PSM_SESSION_COMPLETE_MSG; + +typedef struct _SM_TERMINATE_FOREIGN_SESSION_MSG +{ + ULONG NotImplemented; +} SM_TERMINATE_FOREIGN_SESSION_MSG, *PSM_TERMINATE_FOREIGN_SESSION_MSG; + +typedef struct _SM_EXEC_PGM_MSG +{ + RTL_USER_PROCESS_INFORMATION ProcessInformation; + BOOLEAN DebugFlag; +} SM_EXEC_PGM_MSG, *PM_EXEC_PGM_MSG; + +typedef struct _SM_LOAD_DEFERED_SUBSYSTEM_MSG +{ + ULONG Length; + WCHAR Buffer[32]; +} SM_LOAD_DEFERED_SUBSYSTEM_MSG, *PSM_LOAD_DEFERED_SUBSYSTEM_MSG; + +typedef struct _SM_START_CSR_MSG +{ + ULONG MuSessionId; + ULONG Length; + WCHAR Buffer[128]; + HANDLE WindowsSubSysProcessId; + HANDLE SmpInitialCommandProcessId; +} SM_START_CSR_MSG, *PSM_START_CSR_MSG; + +typedef struct _SM_STOP_CSR_MSG +{ + ULONG MuSessionId; +} SM_STOP_CSR_MSG, *PSM_STOP_CSR_MSG; + +// +// This is the actual packet structure sent over LCP to the \SmApiPort +// +typedef struct _SM_API_MSG +{ + PORT_MESSAGE h; + SMSRV_API_NUMBER ApiNumber; + NTSTATUS ReturnValue; + union + { + SM_CREATE_FOREIGN_SESSION_MSG CreateForeignSession; + SM_SESSION_COMPLETE_MSG SessionComplete; + SM_TERMINATE_FOREIGN_SESSION_MSG TerminateForeignComplete; + SM_EXEC_PGM_MSG ExecPgm; + SM_LOAD_DEFERED_SUBSYSTEM_MSG LoadDefered; + SM_START_CSR_MSG StartCsr; + SM_STOP_CSR_MSG StopCsr; + } u; +} SM_API_MSG, *PSM_API_MSG; + +// +// This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. +// +C_ASSERT(sizeof(SM_API_MSG) == 0x130); + +// +// There are the APIs that the SMSS Serve can send to a client (such as CSRSS) +// +// These are called "SB" APIs. +// +// The exact names are unknown but we are basing them on the CsrServerSbApiName +// array in the checked build of CSRSRV which is probably a close approximation. +// We add "p" to use the similar nomenclature seen/leaked out in the Base CSRSS +// APIs. +// +// +typedef enum _SB_API_NUMBER +{ + SbpCreateSession, + SbpTerminateSession, + SbpForeignSessionComplete, + SbpCreateProcess, + SbpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... +} SB_API_NUMBER; + +// +// These are the structures making up the SB_API_MSG packet structure defined +// below. Each one corresponds to an equivalent API from the list above. +// +typedef struct _SB_CREATE_SESSION_MSG +{ + ULONG SessionId; + RTL_USER_PROCESS_INFORMATION ProcessInfo; +} SB_CREATE_SESSION_MSG, *PSB_CREATE_SESSION_MSG; + +typedef struct _SB_TERMINATE_SESSION_MSG +{ + ULONG SessionId; +} SB_TERMINATE_SESSION_MSG, *PSB_TERMINATE_SESSION_MSG; + +typedef struct _SB_FOREIGN_SESSION_COMPLETE_MSG +{ + ULONG SessionId; +} SB_FOREIGN_SESSION_COMPLETE_MSG, *PSB_FOREIGN_SESSION_COMPLETE_MSG; + +#define SB_PROCESS_FLAGS_DEBUG 0x1 +#define SB_PROCESS_FLAGS_WAIT_ON_THREAD 0x2 +#define SB_PROCESS_FLAGS_RESERVE_1MB 0x8 +#define SB_PROCESS_FLAGS_SKIP_CHECKS 0x20 +typedef struct _SB_CREATE_PROCESS_MSG +{ + union + { + struct + { + PUNICODE_STRING ImageName; + PUNICODE_STRING CurrentDirectory; + PUNICODE_STRING CommandLine; + PUNICODE_STRING DllPath; + ULONG Flags; + ULONG DebugFlags; + } In; + struct + { + HANDLE ProcessHandle; + HANDLE ThreadHandle; + ULONG SubsystemType; + CLIENT_ID ClientId; + } Out; + }; +} SB_CREATE_PROCESS_MSG, *PSB_CREATE_PROCESS_MSG; + +// +// When the server connects to a client, this structure is exchanged +// +typedef struct _SB_CONNECTION_INFO +{ + ULONG SubsystemType; + WCHAR SbApiPortName[120]; +} SB_CONNECTION_INFO, *PSB_CONNECTION_INFO; + +// +// This is the actual packet structure sent over LCP to the \SbApiPort +// +typedef struct _SB_API_MSG +{ + PORT_MESSAGE Header; + union + { + SB_CONNECTION_INFO ConnectionInfo; + struct + { + SB_API_NUMBER ApiNumber; + NTSTATUS ReturnValue; + union + { + SB_CREATE_SESSION_MSG CreateSession; + SB_TERMINATE_SESSION_MSG TerminateSession; + SB_FOREIGN_SESSION_COMPLETE_MSG ForeignSessionComplete; + SB_CREATE_PROCESS_MSG CreateProcess; + }; + }; + }; +} SB_API_MSG, *PSB_API_MSG; + +// +// This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. +// +C_ASSERT(sizeof(SB_CONNECTION_INFO) == 0xF4); +C_ASSERT(sizeof(SB_API_MSG) == 0x110); + Propchange: trunk/reactos/include/reactos/subsys/sm/smmsg.h ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 11 months

[gadamopoulos] 55289: [user32] - don't use DbgPrint for error messages

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Jan 29 11:13:07 2012 New Revision: 55289 URL: http://svn.reactos.org/svn/reactos?rev=55289&view=rev Log: [user32] - don't use DbgPrint for error messages Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jan 29 11:13:07 2012 @@ -2168,14 +2168,14 @@ ncm.cbSize = sizeof(ncm); if(!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) { - DbgPrint("MenuInit(): SystemParametersInfoW(SPI_GETNONCLIENTMETRICS) failed!\n"); + ERR("MenuInit(): SystemParametersInfoW(SPI_GETNONCLIENTMETRICS) failed!\n"); return FALSE; } hMenuFont = CreateFontIndirectW(&ncm.lfMenuFont); if(hMenuFont == NULL) { - DbgPrint("MenuInit(): CreateFontIndirectW(hMenuFont) failed!\n"); + ERR("MenuInit(): CreateFontIndirectW(hMenuFont) failed!\n"); return FALSE; } @@ -2183,7 +2183,7 @@ hMenuFontBold = CreateFontIndirectW(&ncm.lfMenuFont); if(hMenuFontBold == NULL) { - DbgPrint("MenuInit(): CreateFontIndirectW(hMenuFontBold) failed!\n"); + ERR("MenuInit(): CreateFontIndirectW(hMenuFontBold) failed!\n"); DeleteObject(hMenuFont); hMenuFont = NULL; return FALSE;

12 years, 11 months

[gadamopoulos] 55288: [win32k] - Show some error messages in case NtUserSystemParametersInfo fails

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Jan 29 10:32:59 2012 New Revision: 55288 URL: http://svn.reactos.org/svn/reactos?rev=55288&view=rev Log: [win32k] - Show some error messages in case NtUserSystemParametersInfo fails Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Jan 29 10:32:59 2012 @@ -27,6 +27,7 @@ #define REQ_INTERACTIVE_WINSTA(err) \ if (gpwinstaCurrent != InputWindowStation) \ { \ + ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ EngSetLastError(err); \ return 0; \ } @@ -422,7 +423,7 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - TRACE("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d, bToUser=%d\n", pvDst, pvSrc, bProtect, bToUser); + ERR("SpiMemCopy failed, pvDst=%p, pvSrc=%p, bProtect=%d, bToUser=%d\n", pvDst, pvSrc, bProtect, bToUser); } return NT_SUCCESS(Status); } @@ -1536,6 +1537,7 @@ if (!gbSpiInitialized) { KeRosDumpStackFrames(NULL, 20); + //ASSERT(FALSE); return FALSE; } @@ -1545,7 +1547,8 @@ if (!gpwinstaCurrent) { ERR("UserSystemParametersInfo called without active windowstation.\n"); - //KeRosDumpStackFrames(NULL, 0); + //ASSERT(FALSE); + //return FALSE; } /* Do the actual operation */

12 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
56
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 January 2012