From: Timo Kreuzer Date: Sat, 19 Sep 2009 22:16:27 +0000 (+0000) Subject: Merge from amd64 branch: X-Git-Tag: ReactOS-0.3.11~832 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4dfeddc69f2831f3994beb8d30cf27d2743485ff Merge from amd64 branch: 35746 sserapion Convert crtdll to WINE's spec file. 35789 sserapion re-add missing api, remove unneded file 36614 sserapion convert d3d8 to spec 36930 sserapion Fix more rbuild files and fix up gdi32 and glu32 spec files. 38148 tkreuzer convert d3d8thk to spec 38151 tkreuzer convert ddraw to spec 38265 sserapion devcpux:- Fix ProcessorDlgProc definition - Convert to spec. slayer:- Convert to spec. 38268 sserapion devcpux:- Fix ProcessorDlgProc definition 39333 tkreuzer hid: convert to spec (taken from wine) 39345 tkreuzer ksuser: convert to spec, don't allow warnings 40991 tkreuzer msafd: convert to spec / fix 64bit build 41000 tkreuzer mswsock: convert to spec, taken from wine 41050 tkreuzer sndblast: convert to spec 43080 tkreuzer winsta: convert to spec and fix duplicate definition 41082 tkreuzer twaain_32: convert to spec 41083 tkreuzer uext: convert to spec 41084 tkreuzer ufat: convert to spec 41085 tkreuzer ufatx: convert to spec 41086 tkreuzer untfs: convert to spec 41549 tkreuzer winfax: covert to spec svn path=/trunk/; revision=43085 --- 4dfeddc69f2831f3994beb8d30cf27d2743485ff diff --cc reactos/dll/directx/d3d8/d3d8.rbuild index 30b7aab2e52,274ccb7c1b4,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,0bf477d53b2,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8,bbcbf25c3b8..ee82042391c --- a/reactos/dll/directx/d3d8/d3d8.rbuild +++ b/reactos/dll/directx/d3d8/d3d8.rbuild @@@@@@@@@@@@@@@ -1,7 -1,8 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,8 @@@@@@@@@@@@@@@ - - - - - - - - - - d3d8.c - - d3d8.rc - d3d8.spec - - + + + + + + - ---- ------- ++++++++++++++ + + d3d8.c + + d3d8.rc ++++++++++++++ d3d8.spec + + diff --cc reactos/dll/win32/msafd/msafd.rbuild index 6e8b186d8b5,6e8b186d8b5,0f1fce57183,0f1fce57183,0f1fce57183,0f1fce57183,6e8b186d8b5,0f1fce57183,b0d8fc36dbe,b0d8fc36dbe,b0d8fc36dbe,b0d8fc36dbe,b0d8fc36dbe,b0d8fc36dbe..0ffb98e6672 --- a/reactos/dll/win32/msafd/msafd.rbuild +++ b/reactos/dll/win32/msafd/msafd.rbuild @@@@@@@@@@@@@@@ -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 -1,5 +1,5 @@@@@@@@@@@@@@@ ---- ------- ---- - ++++ +++++++ -- - ++++++++ . include include/reactos/drivers diff --cc reactos/dll/win32/winsta/winsta.spec index 00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,00000000000,bc35066c763..b41c693b980 mode 000000,000000,000000,000000,000000,000000,000000,000000,000000,000000,000000,000000,000000,100644..100644 --- a/reactos/dll/win32/winsta/winsta.spec +++ b/reactos/dll/win32/winsta/winsta.spec @@@@@@@@@@@@@@@ -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,0 -1,122 +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 _WinStationCheckForApplicationName(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr 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() +++++++++++++