[ros-diffs] [tkreuzer] 43080: convert to spec and fix duplicate definition

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sat Sep 19 16:06:47 CEST 2009


Author: tkreuzer
Date: Sat Sep 19 16:06:47 2009
New Revision: 43080

URL: http://svn.reactos.org/svn/reactos?rev=43080&view=rev
Log:
convert to spec and fix duplicate definition

Added:
    branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec   (with props)
Removed:
    branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.def
Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.rbuild
    branches/ros-amd64-bringup/reactos/dll/win32/winsta/ws.c

Removed: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.def?rev=43079&view=auto
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.def (removed)
@@ -1,123 +1,0 @@
-LIBRARY winsta.dll
-EXPORTS
-LogonIdFromWinStationNameA at 12
-LogonIdFromWinStationNameW at 12
-RemoteAssistancePrepareSystemRestore at 4
-ServerGetInternetConnectorStatus at 12
-ServerLicensingClose at 4
-ServerLicensingDeactivateCurrentPolicy at 4
-ServerLicensingFreePolicyInformation at 4
-ServerLicensingGetAvailablePolicyIds at 12
-ServerLicensingGetPolicy at 8
-ServerLicensingGetPolicyInformationA at 16
-ServerLicensingGetPolicyInformationW at 16
-ServerLicensingLoadPolicy at 8
-ServerLicensingOpenA at 4
-ServerLicensingOpenW at 4
-ServerLicensingSetPolicy at 12
-ServerLicensingUnloadPolicy at 8
-ServerQueryInetConnectorInformationA at 16
-ServerQueryInetConnectorInformationW at 16
-ServerSetInternetConnectorStatus at 12
-WinStationActivateLicense at 16
-WinStationAutoReconnect at 4
-WinStationBroadcastSystemMessage at 40
-WinStationCheckAccess at 12
-WinStationCheckLoopBack at 16
-WinStationCloseServer at 16
-WinStationConnectA at 4
-WinStationConnectCallback at 20
-WinStationConnectEx at 8
-WinStationConnectW at 20
-WinStationDisconnect at 12
-WinStationDynVirtualChanRead at 20
-WinStationDynVirtualChanWrite at 16
-WinStationEnumerateA at 12
-WinStationEnumerateLicenses at 12
-WinStationEnumerateProcesses at 8
-WinStationEnumerateW at 12
-WinStationEnumerate_IndexedA at 20
-WinStationEnumerate_IndexedW at 20
-WinStationFreeGAPMemory at 12
-WinStationFreeMemory at 4
-WinStationFreeUserCertificates at 4
-WinStationFreeUserCredentials at 4
-WinStationGenerateLicense at 16
-WinStationGetAllProcesses at 16
-WinStationGetConnectionProperty at 12
-WinStationGetInitialApplication at 20
-WinStationGetLanAdapterNameA at 24
-WinStationGetLanAdapterNameW at 24
-WinStationGetLoggedOnCount at 8
-WinStationGetMachinePolicy at 8
-WinStationGetProcessSid at 24
-WinStationGetTermSrvCountersValue at 12
-WinStationGetUserCertificates at 4
-WinStationGetUserCredentials at 4
-WinStationGetUserProfile at 16
-WinStationInstallLicense at 12
-WinStationIsHelpAssistantSession at 8
-WinStationIsSessionPermitted at 0
-WinStationNameFromLogonIdA at 12
-WinStationNameFromLogonIdW at 12
-WinStationNtsdDebug at 20
-WinStationOpenServerA at 4
-WinStationOpenServerW at 4
-WinStationQueryAllowConcurrentConnections at 0
-WinStationQueryEnforcementCore at 24
-WinStationQueryInformationA at 24
-WinStationQueryInformationW at 24
-WinStationQueryLicense at 12
-WinStationQueryLogonCredentialsW at 4
-WinStationQueryUpdateRequired at 8
-WinStationRegisterConsoleNotification at 12
-WinStationRegisterConsoleNotificationEx at 16
-WinStationRegisterNotificationEvent at 16
-WinStationRemoveLicense at 12
-WinStationRenameA at 12
-WinStationRenameW at 12
-WinStationRequestSessionsList at 12
-WinStationReset at 12
-WinStationSendMessageA at 40
-WinStationSendMessageW at 40
-WinStationSendWindowMessage at 32
-WinStationServerPing at 4
-WinStationSetInformationA at 20
-WinStationSetInformationW at 20
-WinStationSetPoolCount at 12
-WinStationShadow at 20
-WinStationShadowStop at 12
-WinStationShutdownSystem at 8
-WinStationSwitchToServicesSession at 0
-WinStationSystemShutdownStarted at 0
-WinStationSystemShutdownWait at 8
-WinStationTerminateProcess at 12
-WinStationUnRegisterConsoleNotification at 8
-WinStationUnRegisterNotificationEvent at 4
-WinStationUserLoginAccessCheck at 16
-WinStationVirtualOpen at 12
-WinStationVirtualOpenEx at 16
-WinStationWaitSystemEvent at 12
-_NWLogonQueryAdmin at 12
-_NWLogonSetAdmin at 12
-_WinStationAnnoyancePopup at 8
-_WinStationBeepOpen at 12
-_WinStationBreakPoint at 12
-_WinStationCallback at 12
-_WinStationCheckForApplicationName at 48
-_WinStationFUSCanRemoteUserDisconnect at 12
-_WinStationGetApplicationInfo at 16
-_WinStationNotifyDisconnectPipe at 0
-_WinStationNotifyLogoff at 0
-_WinStationNotifyLogon at 32
-_WinStationNotifyNewSession at 8
-_WinStationReInitializeSecurity at 4
-_WinStationReadRegistry at 4
-_WinStationSessionInitialized at 0
-_WinStationShadowTarget at 40
-_WinStationShadowTargetSetup at 8
-_WinStationUpdateClientCachedCredentials at 28
-_WinStationUpdateSettings at 12
-_WinStationUpdateUserConfig at 4
-_WinStationWaitForConnect at 0
-; EOF

Modified: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.rbuild?rev=43080&r1=43079&r2=43080&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] Sat Sep 19 16:06:47 2009
@@ -1,5 +1,5 @@
 <module name="winsta" type="win32dll" baseaddress="${BASEADDRESS_WINSTA}" installbase="system32" installname="winsta.dll">
-	<importlibrary definition="winsta.def" />
+	<importlibrary definition="winsta.spec" />
 	<include base="winsta">.</include>
 	<library>wine</library>
 	<library>kernel32</library>

Added: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec?rev=43080&view=auto
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec (added)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec [iso-8859-1] Sat Sep 19 16:06:47 2009
@@ -1,0 +1,122 @@
+
+@ stdcall LogonIdFromWinStationNameA(ptr ptr ptr)
+@ stdcall LogonIdFromWinStationNameW(ptr ptr ptr)
+@ stdcall RemoteAssistancePrepareSystemRestore(ptr)
+@ stdcall ServerGetInternetConnectorStatus(ptr ptr ptr)
+@ stdcall ServerLicensingClose(ptr)
+@ stdcall ServerLicensingDeactivateCurrentPolicy(ptr)
+@ stdcall ServerLicensingFreePolicyInformation(ptr)
+@ stdcall ServerLicensingGetAvailablePolicyIds(ptr ptr ptr)
+@ stdcall ServerLicensingGetPolicy(ptr ptr)
+@ stdcall ServerLicensingGetPolicyInformationA(ptr ptr ptr ptr)
+@ stdcall ServerLicensingGetPolicyInformationW(ptr ptr ptr ptr)
+@ stdcall ServerLicensingLoadPolicy(ptr ptr)
+@ stdcall ServerLicensingOpenA(ptr)
+@ stdcall ServerLicensingOpenW(ptr)
+@ stdcall ServerLicensingSetPolicy(ptr ptr ptr)
+@ stdcall ServerLicensingUnloadPolicy(ptr ptr)
+@ stdcall ServerQueryInetConnectorInformationA(ptr ptr ptr ptr)
+@ stdcall ServerQueryInetConnectorInformationW(ptr ptr ptr ptr)
+@ stdcall ServerSetInternetConnectorStatus(ptr ptr ptr)
+@ stdcall WinStationActivateLicense(ptr ptr ptr ptr)
+@ stdcall WinStationAutoReconnect(ptr)
+@ stdcall WinStationBroadcastSystemMessage(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationCheckAccess(ptr ptr ptr)
+@ stdcall WinStationCheckLoopBack(ptr ptr ptr ptr)
+@ stdcall WinStationCloseServer(ptr ptr ptr ptr)
+@ stdcall WinStationConnectA(ptr)
+@ stdcall WinStationConnectCallback(ptr ptr ptr ptr ptr)
+@ stdcall WinStationConnectEx(ptr ptr)
+@ stdcall WinStationConnectW(ptr ptr ptr ptr ptr)
+@ stdcall WinStationDisconnect(ptr ptr ptr)
+@ stdcall WinStationDynVirtualChanRead(ptr ptr ptr ptr ptr)
+@ stdcall WinStationDynVirtualChanWrite(ptr ptr ptr ptr)
+@ stdcall WinStationEnumerateA(ptr ptr ptr)
+@ stdcall WinStationEnumerateLicenses(ptr ptr ptr)
+@ stdcall WinStationEnumerateProcesses(ptr ptr)
+@ stdcall WinStationEnumerateW(ptr ptr ptr)
+@ stdcall WinStationEnumerate_IndexedA(ptr ptr ptr ptr ptr)
+@ stdcall WinStationEnumerate_IndexedW(ptr ptr ptr ptr ptr)
+@ stdcall WinStationFreeGAPMemory(ptr ptr ptr)
+@ stdcall WinStationFreeMemory(ptr)
+@ stdcall WinStationFreeUserCertificates(ptr)
+@ stdcall WinStationFreeUserCredentials(ptr)
+@ stdcall WinStationGenerateLicense(ptr ptr ptr ptr)
+@ stdcall WinStationGetAllProcesses(ptr ptr ptr ptr)
+@ stdcall WinStationGetConnectionProperty(ptr ptr ptr)
+@ stdcall WinStationGetInitialApplication(ptr ptr ptr ptr ptr)
+@ stdcall WinStationGetLanAdapterNameA(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationGetLanAdapterNameW(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationGetLoggedOnCount(ptr ptr)
+@ stdcall WinStationGetMachinePolicy(ptr ptr)
+@ stdcall WinStationGetProcessSid(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationGetTermSrvCountersValue(ptr ptr ptr)
+@ stdcall WinStationGetUserCertificates(ptr)
+@ stdcall WinStationGetUserCredentials(ptr)
+@ stdcall WinStationGetUserProfile(ptr ptr ptr ptr)
+@ stdcall WinStationInstallLicense(ptr ptr ptr)
+@ stdcall WinStationIsHelpAssistantSession(ptr ptr)
+@ stdcall WinStationIsSessionPermitted()
+@ stdcall WinStationNameFromLogonIdA(ptr ptr ptr)
+@ stdcall WinStationNameFromLogonIdW(ptr ptr ptr)
+@ stdcall WinStationNtsdDebug(ptr ptr ptr ptr ptr)
+@ stdcall WinStationOpenServerA(ptr)
+@ stdcall WinStationOpenServerW(ptr)
+@ stdcall WinStationQueryAllowConcurrentConnections()
+@ stdcall WinStationQueryEnforcementCore(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationQueryInformationA(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationQueryInformationW(ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationQueryLicense(ptr ptr ptr)
+@ stdcall WinStationQueryLogonCredentialsW(ptr)
+@ stdcall WinStationQueryUpdateRequired(ptr ptr)
+@ stdcall WinStationRegisterConsoleNotification(ptr ptr ptr)
+@ stdcall WinStationRegisterConsoleNotificationEx(ptr ptr ptr ptr)
+@ stdcall WinStationRegisterNotificationEvent(ptr ptr ptr ptr)
+@ stdcall WinStationRemoveLicense(ptr ptr ptr)
+@ stdcall WinStationRenameA(ptr ptr ptr)
+@ stdcall WinStationRenameW(ptr ptr ptr)
+@ stdcall WinStationRequestSessionsList(ptr ptr ptr)
+@ stdcall WinStationReset(ptr ptr ptr)
+@ stdcall WinStationSendMessageA(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationSendMessageW(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationSendWindowMessage(ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall WinStationServerPing(ptr)
+@ stdcall WinStationSetInformationA(ptr ptr ptr ptr ptr)
+@ stdcall WinStationSetInformationW(ptr ptr ptr ptr ptr)
+@ stdcall WinStationSetPoolCount(ptr ptr ptr)
+@ stdcall WinStationShadow(ptr ptr ptr ptr ptr)
+@ stdcall WinStationShadowStop(ptr ptr ptr)
+@ stdcall WinStationShutdownSystem(ptr ptr)
+@ stdcall WinStationSwitchToServicesSession()
+@ stdcall WinStationSystemShutdownStarted()
+@ stdcall WinStationSystemShutdownWait(ptr ptr)
+@ stdcall WinStationTerminateProcess(ptr ptr ptr)
+@ stdcall WinStationUnRegisterConsoleNotification(ptr ptr)
+@ stdcall WinStationUnRegisterNotificationEvent(ptr)
+@ stdcall WinStationUserLoginAccessCheck(ptr ptr ptr ptr)
+@ stdcall WinStationVirtualOpen(ptr ptr ptr)
+@ stdcall WinStationVirtualOpenEx(ptr ptr ptr ptr)
+@ stdcall WinStationWaitSystemEvent(ptr ptr ptr)
+@ stdcall _NWLogonQueryAdmin(ptr ptr ptr)
+@ stdcall _NWLogonSetAdmin(ptr ptr ptr)
+@ stdcall _WinStationAnnoyancePopup(ptr ptr)
+@ stdcall _WinStationBeepOpen(ptr ptr ptr)
+@ stdcall _WinStationBreakPoint(ptr ptr ptr)
+@ stdcall _WinStationCallback(ptr ptr ptr)
+@ stdcall _WinStationCheckForApplicationName(ptr)
+@ stdcall _WinStationFUSCanRemoteUserDisconnect(ptr ptr ptr)
+@ stdcall _WinStationGetApplicationInfo(ptr ptr ptr ptr)
+@ stdcall _WinStationNotifyDisconnectPipe()
+@ stdcall _WinStationNotifyLogoff()
+@ stdcall _WinStationNotifyLogon(ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall _WinStationNotifyNewSession(ptr ptr)
+@ stdcall _WinStationReInitializeSecurity(ptr)
+@ stdcall _WinStationReadRegistry(ptr)
+@ stdcall _WinStationSessionInitialized()
+@ stdcall _WinStationShadowTarget(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall _WinStationShadowTargetSetup(ptr ptr)
+@ stdcall _WinStationUpdateClientCachedCredentials(ptr ptr ptr ptr ptr ptr ptr)
+@ stdcall _WinStationUpdateSettings(ptr ptr ptr)
+@ stdcall _WinStationUpdateUserConfig(ptr)
+@ stdcall _WinStationWaitForConnect()
+

Propchange: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/ros-amd64-bringup/reactos/dll/win32/winsta/ws.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/winsta/ws.c?rev=43080&r1=43079&r2=43080&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/winsta/ws.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/winsta/ws.c [iso-8859-1] Sat Sep 19 16:06:47 2009
@@ -89,18 +89,6 @@
 WINSTAAPI WinStationFreeGAPMemory(PVOID A,
                                   PVOID B,
                                   PVOID C)
-{
-    UNIMPLEMENTED;
-}
-
-VOID
-WINSTAAPI WinStationGetProcessSid(PVOID A,
-                                  PVOID B,
-                                  PVOID C,
-                                  PVOID D,
-                                  PVOID E,
-                                  PVOID F,
-                                  PVOID G)
 {
     UNIMPLEMENTED;
 }




More information about the Ros-diffs mailing list