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

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/w…
==============================================================================
--- 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@12
-LogonIdFromWinStationNameW@12
-RemoteAssistancePrepareSystemRestore@4
-ServerGetInternetConnectorStatus@12
-ServerLicensingClose@4
-ServerLicensingDeactivateCurrentPolicy@4
-ServerLicensingFreePolicyInformation@4
-ServerLicensingGetAvailablePolicyIds@12
-ServerLicensingGetPolicy@8
-ServerLicensingGetPolicyInformationA@16
-ServerLicensingGetPolicyInformationW@16
-ServerLicensingLoadPolicy@8
-ServerLicensingOpenA@4
-ServerLicensingOpenW@4
-ServerLicensingSetPolicy@12
-ServerLicensingUnloadPolicy@8
-ServerQueryInetConnectorInformationA@16
-ServerQueryInetConnectorInformationW@16
-ServerSetInternetConnectorStatus@12
-WinStationActivateLicense@16
-WinStationAutoReconnect@4
-WinStationBroadcastSystemMessage@40
-WinStationCheckAccess@12
-WinStationCheckLoopBack@16
-WinStationCloseServer@16
-WinStationConnectA@4
-WinStationConnectCallback@20
-WinStationConnectEx@8
-WinStationConnectW@20
-WinStationDisconnect@12
-WinStationDynVirtualChanRead@20
-WinStationDynVirtualChanWrite@16
-WinStationEnumerateA@12
-WinStationEnumerateLicenses@12
-WinStationEnumerateProcesses@8
-WinStationEnumerateW@12
-WinStationEnumerate_IndexedA@20
-WinStationEnumerate_IndexedW@20
-WinStationFreeGAPMemory@12
-WinStationFreeMemory@4
-WinStationFreeUserCertificates@4
-WinStationFreeUserCredentials@4
-WinStationGenerateLicense@16
-WinStationGetAllProcesses@16
-WinStationGetConnectionProperty@12
-WinStationGetInitialApplication@20
-WinStationGetLanAdapterNameA@24
-WinStationGetLanAdapterNameW@24
-WinStationGetLoggedOnCount@8
-WinStationGetMachinePolicy@8
-WinStationGetProcessSid@24
-WinStationGetTermSrvCountersValue@12
-WinStationGetUserCertificates@4
-WinStationGetUserCredentials@4
-WinStationGetUserProfile@16
-WinStationInstallLicense@12
-WinStationIsHelpAssistantSession@8
-WinStationIsSessionPermitted@0
-WinStationNameFromLogonIdA@12
-WinStationNameFromLogonIdW@12
-WinStationNtsdDebug@20
-WinStationOpenServerA@4
-WinStationOpenServerW@4
-WinStationQueryAllowConcurrentConnections@0
-WinStationQueryEnforcementCore@24
-WinStationQueryInformationA@24
-WinStationQueryInformationW@24
-WinStationQueryLicense@12
-WinStationQueryLogonCredentialsW@4
-WinStationQueryUpdateRequired@8
-WinStationRegisterConsoleNotification@12
-WinStationRegisterConsoleNotificationEx@16
-WinStationRegisterNotificationEvent@16
-WinStationRemoveLicense@12
-WinStationRenameA@12
-WinStationRenameW@12
-WinStationRequestSessionsList@12
-WinStationReset@12
-WinStationSendMessageA@40
-WinStationSendMessageW@40
-WinStationSendWindowMessage@32
-WinStationServerPing@4
-WinStationSetInformationA@20
-WinStationSetInformationW@20
-WinStationSetPoolCount@12
-WinStationShadow@20
-WinStationShadowStop@12
-WinStationShutdownSystem@8
-WinStationSwitchToServicesSession@0
-WinStationSystemShutdownStarted@0
-WinStationSystemShutdownWait@8
-WinStationTerminateProcess@12
-WinStationUnRegisterConsoleNotification@8
-WinStationUnRegisterNotificationEvent@4
-WinStationUserLoginAccessCheck@16
-WinStationVirtualOpen@12
-WinStationVirtualOpenEx@16
-WinStationWaitSystemEvent@12
-_NWLogonQueryAdmin@12
-_NWLogonSetAdmin@12
-_WinStationAnnoyancePopup@8
-_WinStationBeepOpen@12
-_WinStationBreakPoint@12
-_WinStationCallback@12
-_WinStationCheckForApplicationName@48
-_WinStationFUSCanRemoteUserDisconnect@12
-_WinStationGetApplicationInfo@16
-_WinStationNotifyDisconnectPipe@0
-_WinStationNotifyLogoff@0
-_WinStationNotifyLogon@32
-_WinStationNotifyNewSession@8
-_WinStationReInitializeSecurity@4
-_WinStationReadRegistry@4
-_WinStationSessionInitialized@0
-_WinStationShadowTarget@40
-_WinStationShadowTargetSetup@8
-_WinStationUpdateClientCachedCredentials@28
-_WinStationUpdateSettings@12
-_WinStationUpdateUserConfig@4
-_WinStationWaitForConnect@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/w…
==============================================================================
--- 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/w…
==============================================================================
--- 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/w…
==============================================================================
--- 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;
 }