Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[ion] 17691: - Add missing decoration to Zw*

by ion＠svn.reactos.com

- Add missing decoration to Zw* Modified: trunk/reactos/include/ndk/zwfuncs.h _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-06 06:30:49 UTC (rev 17690) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-06 06:44:34 UTC (rev 17691) @@ -28,6 +28,7 @@ PREMOTE_PORT_VIEW ClientView OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwAcceptConnectPort( @@ -52,6 +53,7 @@ OUT PNTSTATUS AccessStatus ); +NTSYSAPI NTSTATUS NTAPI ZwAccessCheck( @@ -90,6 +92,7 @@ IN OUT PRTL_ATOM Atom ); +NTSYSAPI NTSTATUS NTAPI ZwAddAtom( @@ -105,6 +108,7 @@ IN PUNICODE_STRING EntryValue ); +NTSYSAPI NTSTATUS NTAPI ZwAddBootEntry( @@ -124,6 +128,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwAdjustGroupsToken( @@ -147,6 +152,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwAdjustPrivilegesToken( @@ -165,6 +171,7 @@ OUT PULONG SuspendCount ); +NTSYSAPI NTSTATUS NTAPI ZwAlertResumeThread( @@ -178,6 +185,7 @@ IN HANDLE ThreadHandle ); +NTSYSAPI NTSTATUS NTAPI ZwAlertThread( @@ -190,6 +198,7 @@ OUT LUID *LocallyUniqueId ); +NTSYSAPI NTSTATUS NTAPI ZwAllocateLocallyUniqueId( @@ -205,6 +214,7 @@ PUCHAR Seed ); +NTSYSAPI NTSTATUS NTAPI ZwAllocateUuids( @@ -245,6 +255,7 @@ HANDLE ProcessHandle ); +NTSYSAPI NTSTATUS NTAPI ZwAssignProcessToJobObject( @@ -260,6 +271,7 @@ NTSTATUS Status ); +NTSYSAPI NTSTATUS NTAPI ZwCallbackReturn( @@ -275,6 +287,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); +NTSYSAPI NTSTATUS NTAPI ZwCancelIoFile( @@ -295,6 +308,7 @@ IN HANDLE EventHandle ); +NTSYSAPI NTSTATUS NTAPI ZwClearEvent( @@ -309,6 +323,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwCreateJobObject( @@ -340,6 +355,7 @@ IN BOOLEAN GenerateOnClose ); +NTSYSAPI NTSTATUS NTAPI ZwCloseObjectAuditAlarm( @@ -354,6 +370,7 @@ HANDLE PortHandle ); +NTSYSAPI NTSTATUS NTAPI ZwCompleteConnectPort( @@ -395,6 +412,7 @@ IN BOOLEAN TestAlert ); +NTSYSAPI NTSTATUS NTAPI ZwContinue( @@ -448,6 +466,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwCreateEventPair( @@ -499,6 +518,7 @@ IN ULONG NumberOfConcurrentThreads ); +NTSYSAPI NTSTATUS NTAPI ZwCreateIoCompletion( @@ -546,6 +566,7 @@ IN PLARGE_INTEGER TimeOut ); +NTSYSAPI NTSTATUS NTAPI ZwCreateMailslotFile( @@ -568,6 +589,7 @@ IN BOOLEAN InitialOwner ); +NTSYSAPI NTSTATUS NTAPI ZwCreateMutant( @@ -596,6 +618,7 @@ IN PLARGE_INTEGER DefaultTimeOut ); +NTSYSAPI NTSTATUS NTAPI ZwCreateNamedPipeFile( @@ -624,6 +647,7 @@ IN ULONG Reserved ); +NTSYSAPI NTSTATUS NTAPI ZwCreatePagingFile( @@ -643,6 +667,7 @@ ULONG MaxPoolUsage ); +NTSYSAPI NTSTATUS NTAPI ZwCreatePort( @@ -666,6 +691,7 @@ IN HANDLE ExceptionPort OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwCreateProcess( @@ -693,6 +719,7 @@ IN KAFFINITY ProcessorMask ); +NTSYSAPI NTSTATUS NTAPI ZwCreateProfile( @@ -743,6 +770,7 @@ IN LONG MaximumCount ); +NTSYSAPI NTSTATUS NTAPI ZwCreateSemaphore( @@ -762,6 +790,7 @@ IN PUNICODE_STRING Name ); +NTSYSAPI NTSTATUS NTAPI ZwCreateSymbolicLinkObject( @@ -784,6 +813,7 @@ IN BOOLEAN CreateSuspended ); +NTSYSAPI NTSTATUS NTAPI ZwCreateThread( @@ -807,6 +837,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwCreateTimer( @@ -835,6 +866,7 @@ IN PTOKEN_SOURCE TokenSource ); +NTSYSAPI NTSTATUS NTAPI ZwCreateToken( @@ -863,6 +895,7 @@ ULONG NPMessageQueueSize OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwCreateWaitablePort( @@ -880,6 +913,7 @@ IN LARGE_INTEGER *Interval ); +NTSYSAPI NTSTATUS NTAPI ZwDelayExecution( @@ -893,6 +927,7 @@ IN RTL_ATOM Atom ); +NTSYSAPI NTSTATUS NTAPI ZwDeleteAtom( @@ -906,6 +941,7 @@ IN PUNICODE_STRING EntryValue ); +NTSYSAPI NTSTATUS NTAPI ZwDeleteBootEntry( @@ -948,6 +984,7 @@ IN BOOLEAN GenerateOnClose ); +NTSYSAPI NTSTATUS NTAPI ZwDeleteObjectAuditAlarm( @@ -1009,6 +1046,7 @@ IN PUNICODE_STRING DisplayString ); +NTSYSAPI NTSTATUS NTAPI ZwDisplayString( @@ -1059,6 +1097,7 @@ IN ULONG Unknown2 ); +NTSYSAPI NTSTATUS NTAPI ZwEnumerateBootEntries( @@ -1119,6 +1158,7 @@ IN PLARGE_INTEGER NewMaximumSize ); +NTSYSAPI NTSTATUS NTAPI ZwExtendSection( @@ -1134,6 +1174,7 @@ OUT PRTL_ATOM Atom OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwFindAtom( @@ -1193,6 +1234,7 @@ NTAPI NtFlushWriteBuffer(VOID); +NTSYSAPI NTSTATUS NTAPI ZwFlushWriteBuffer(VOID); @@ -1256,6 +1298,7 @@ OUT PCONTEXT Context ); +NTSYSAPI NTSTATUS NTAPI ZwGetContextThread( @@ -1278,6 +1321,7 @@ VOID ); +NTSYSAPI ULONG NTAPI ZwGetTickCount( @@ -1291,6 +1335,7 @@ PPORT_MESSAGE ClientMessage ); +NTSYSAPI NTSTATUS NTAPI ZwImpersonateClientOfPort( @@ -1306,6 +1351,7 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService ); +NTSYSAPI NTSTATUS NTAPI ZwImpersonateThread( @@ -1324,6 +1370,7 @@ BOOLEAN Asynchronous ); +NTSYSAPI NTSTATUS NTAPI ZwInitiatePowerAction( @@ -1339,6 +1386,7 @@ BOOLEAN SetUpBoot ); +NTSYSAPI NTSTATUS NTAPI ZwInitializeRegistry( @@ -1352,6 +1400,7 @@ IN HANDLE JobHandle OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwIsProcessInJob( @@ -1365,6 +1414,7 @@ PPORT_MESSAGE ConnectionRequest ); +NTSYSAPI NTSTATUS NTAPI ZwListenPort(HANDLE PortHandle, @@ -1391,6 +1441,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwLoadKey( @@ -1406,6 +1457,7 @@ IN ULONG Flags ); +NTSYSAPI NTSTATUS NTAPI ZwLoadKey2( @@ -1456,6 +1508,7 @@ PULONG NumberOfBytesLocked ); +NTSYSAPI NTSTATUS NTAPI ZwLockVirtualMemory( @@ -1471,6 +1524,7 @@ IN HANDLE Object ); +NTSYSAPI NTSTATUS NTAPI ZwMakePermanentObject( @@ -1535,6 +1589,7 @@ IN BOOLEAN WatchTree ); +NTSYSAPI NTSTATUS NTAPI ZwNotifyChangeDirectoryFile( @@ -1605,6 +1660,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenEvent( @@ -1621,6 +1677,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenEventPair( @@ -1661,6 +1718,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenIoCompletion( @@ -1677,6 +1735,7 @@ POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenJobObject( @@ -1710,6 +1769,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenMutant( @@ -1736,6 +1796,7 @@ OUT PBOOLEAN GenerateOnClose ); +NTSYSAPI NTSTATUS NTAPI ZwOpenObjectAuditAlarm( @@ -1763,6 +1824,7 @@ IN PCLIENT_ID ClientId ); +NTSYSAPI NTSTATUS NTAPI ZwOpenProcess( @@ -1781,6 +1843,7 @@ OUT PHANDLE TokenHandle ); +NTSYSAPI NTSTATUS NTAPI ZwOpenProcessToken( @@ -1834,6 +1897,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwOpenSemaphore( @@ -1868,6 +1932,7 @@ IN PCLIENT_ID ClientId ); +NTSYSAPI NTSTATUS NTAPI ZwOpenThread( @@ -1887,6 +1952,7 @@ OUT PHANDLE TokenHandle ); +NTSYSAPI NTSTATUS NTAPI ZwOpenThreadToken( @@ -1927,6 +1993,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwOpenTimer( @@ -1955,6 +2022,7 @@ ULONG OutputBufferLength ); +NTSYSAPI NTSTATUS NTAPI ZwPowerInformation( @@ -1974,6 +2042,7 @@ IN PBOOLEAN Result ); +NTSYSAPI NTSTATUS NTAPI ZwPrivilegeCheck( @@ -1993,6 +2062,7 @@ IN BOOLEAN AccessGranted ); +NTSYSAPI NTSTATUS NTAPI ZwPrivilegedServiceAuditAlarm( @@ -2015,6 +2085,7 @@ IN BOOLEAN AccessGranted ); +NTSYSAPI NTSTATUS NTAPI ZwPrivilegeObjectAuditAlarm( @@ -2036,6 +2107,7 @@ OUT PULONG OldAccessProtection ); +NTSYSAPI NTSTATUS NTAPI ZwProtectVirtualMemory( @@ -2053,6 +2125,7 @@ IN PLONG PulseCount OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwPulseEvent( @@ -2067,6 +2140,7 @@ OUT PFILE_BASIC_INFORMATION FileInformation ); +NTSYSAPI NTSTATUS NTAPI ZwQueryAttributesFile( @@ -2082,6 +2156,7 @@ IN ULONG Unknown2 ); +NTSYSAPI NTSTATUS NTAPI ZwQueryBootEntryOrder( @@ -2096,12 +2171,14 @@ IN ULONG Unknown2 ); +NTSYSAPI NTSTATUS NTAPI ZwQueryBootOptions( IN ULONG Unknown1, IN ULONG Unknown2 ); + NTSTATUS NTAPI NtQueryDefaultLocale( @@ -2109,6 +2186,7 @@ OUT PLCID DefaultLocaleId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultLocale( @@ -2122,6 +2200,7 @@ PLANGID LanguageId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDefaultUILanguage( @@ -2174,6 +2253,7 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryDirectoryObject( @@ -2201,6 +2281,7 @@ ); #ifdef NTOS_MODE_USER +NTSYSAPI NTSTATUS NTAPI ZwQueryEaFile( @@ -2225,6 +2306,8 @@ IN ULONG EventInformationLength, OUT PULONG ReturnLength ); + +NTSYSAPI NTSTATUS NTAPI ZwQueryEvent( @@ -2242,6 +2325,7 @@ OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation ); +NTSYSAPI NTSTATUS NTAPI ZwQueryFullAttributesFile( @@ -2259,6 +2343,7 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationAtom( @@ -2301,6 +2386,7 @@ PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationJobObject( @@ -2321,6 +2407,7 @@ PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationPort( @@ -2342,6 +2429,7 @@ OUT PULONG ReturnLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationProcess( @@ -2363,6 +2451,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInformationThread( @@ -2401,6 +2490,7 @@ PLANGID LanguageId ); +NTSYSAPI NTSTATUS NTAPI ZwQueryInstallUILanguage( @@ -2414,6 +2504,7 @@ OUT PULONG Interval ); +NTSYSAPI NTSTATUS NTAPI ZwQueryIntervalProfile( @@ -2431,6 +2522,7 @@ OUT PULONG ResultLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryIoCompletion( @@ -2503,6 +2595,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryMultipleValueKey( @@ -2524,6 +2617,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryMutant( @@ -2544,6 +2638,7 @@ OUT PULONG ResultLength OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwQueryObject( @@ -2561,6 +2656,7 @@ IN PLARGE_INTEGER Frequency ); +NTSYSAPI NTSTATUS NTAPI ZwQueryPerformanceCounter( @@ -2578,6 +2674,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySection( @@ -2620,6 +2717,7 @@ OUT PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySemaphore( @@ -2656,6 +2754,7 @@ PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemEnvironmentValue( @@ -2674,6 +2773,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemInformation( @@ -2689,6 +2789,7 @@ OUT PLARGE_INTEGER CurrentTime ); +NTSYSAPI NTSTATUS NTAPI ZwQuerySystemTime( @@ -2705,6 +2806,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryTimer( @@ -2723,6 +2825,7 @@ OUT PULONG ActualResolution ); +NTSYSAPI NTSTATUS NTAPI ZwQueryTimerResolution( @@ -2765,6 +2868,7 @@ OUT PULONG ResultLength ); +NTSYSAPI NTSTATUS NTAPI ZwQueryVirtualMemory( @@ -2808,6 +2912,7 @@ PVOID SystemArgument2 ); +NTSYSAPI NTSTATUS NTAPI ZwQueueApcThread( @@ -2826,6 +2931,7 @@ IN BOOLEAN SearchFrames ); +NTSYSAPI NTSTATUS NTAPI ZwRaiseException( @@ -2845,6 +2951,7 @@ OUT PULONG Response ); +NTSYSAPI NTSTATUS NTAPI ZwRaiseHardError( @@ -2900,6 +3007,7 @@ IN PULONG Key OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwReadFileScatter( @@ -2925,6 +3033,7 @@ PULONG ReturnLength ); +NTSYSAPI NTSTATUS NTAPI ZwReadRequestData( @@ -2945,6 +3054,8 @@ IN ULONG NumberOfBytesToRead, OUT PULONG NumberOfBytesRead ); + +NTSYSAPI NTSTATUS NTAPI ZwReadVirtualMemory( @@ -2961,6 +3072,7 @@ HANDLE TerminationPort ); +NTSYSAPI NTSTATUS NTAPI ZwRegisterThreadTerminatePort( @@ -2974,6 +3086,7 @@ IN PLONG ReleaseCount OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwReleaseMutant( @@ -2989,6 +3102,7 @@ OUT PLONG PreviousCount ); +NTSYSAPI NTSTATUS NTAPI ZwReleaseSemaphore( @@ -3007,6 +3121,7 @@ IN PLARGE_INTEGER Timeout OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwRemoveIoCompletion( @@ -3025,6 +3140,7 @@ IN POBJECT_ATTRIBUTES ReplacedObjectAttributes ); +NTSYSAPI NTSTATUS NTAPI ZwReplaceKey( @@ -3040,6 +3156,7 @@ PPORT_MESSAGE LpcReply ); +NTSYSAPI NTSTATUS NTAPI ZwReplyPort( @@ -3056,6 +3173,7 @@ PPORT_MESSAGE ReceiveMessage ); +NTSYSAPI NTSTATUS NTAPI ZwReplyWaitReceivePort( @@ -3072,6 +3190,7 @@ PPORT_MESSAGE ReplyMessage ); +NTSYSAPI NTSTATUS NTAPI ZwReplyWaitReplyPort( @@ -3085,6 +3204,7 @@ HANDLE PortHandle, PPORT_MESSAGE LpcMessage); +NTSYSAPI NTSTATUS NTAPI ZwRequestPort( @@ -3117,6 +3237,7 @@ PLONG NumberOfWaitingThreads OPTIONAL ); +NTSYSAPI NTSTATUS NTAPI ZwResetEvent( @@ -3132,6 +3253,7 @@ ULONG RestoreFlags ); +NTSYSAPI NTSTATUS NTAPI ZwRestoreKey( @@ -3147,6 +3269,7 @@ OUT PULONG SuspendCount ); +NTSYSAPI NTSTATUS NTAPI ZwResumeThread( @@ -3160,6 +3283,7 @@ IN HANDLE ProcessHandle ); +NTSYSAPI NTSTATUS NTAPI ZwResumeProcess( @@ -3172,6 +3296,8 @@ IN HANDLE KeyHandle, IN HANDLE FileHandle ); + +NTSYSAPI NTSTATUS NTAPI ZwSaveKey( @@ -3187,6 +3313,7 @@ IN ULONG Flags ); +NTSYSAPI NTSTATUS NTAPI ZwSaveKeyEx( @@ -3202,6 +3329,7 @@ IN ULONG Unknown2 [truncated at 1000 lines; 342 more skipped]

19 years, 3 months

[ion] 17690: - Handle RtlYyyStringToZzzStringSize->RtlxYyyStringtoZzzStringSize correctly so that the MSDDK macros can work and be added to the NDK/gnu ifs

by ion＠svn.reactos.com

- Handle RtlYyyStringToZzzStringSize->RtlxYyyStringtoZzzStringSize correctly so that the MSDDK macros can work and be added to the NDK/gnu ifs Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-06 06:19:30 UTC (rev 17689) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-06 06:30:49 UTC (rev 17690) @@ -305,7 +305,7 @@ RtlAllocateHandle@8 RtlAllocateHeap@12 RtlAnsiCharToUnicodeChar@4 -RtlAnsiStringToUnicodeSize@4 +RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4 RtlAnsiStringToUnicodeString@12 RtlAppendAsciizToString@8 RtlAppendStringToString@8 @@ -569,7 +569,7 @@ RtlNumberGenericTableElementsAvl@4 RtlNumberOfClearBits@4 RtlNumberOfSetBits@4 -RtlOemStringToUnicodeSize@4 +RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4 RtlOemStringToUnicodeString@12 RtlOemToUnicodeN@20 RtlOpenCurrentUser@8 @@ -646,11 +646,11 @@ RtlTryEnterCriticalSection@4 @RtlUlongByteSwap@4 @RtlUlonglongByteSwap@8 -RtlUnicodeStringToAnsiSize@4 +RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4 RtlUnicodeStringToAnsiString@12 RtlUnicodeStringToCountedOemString@12 RtlUnicodeStringToInteger@12 -RtlUnicodeStringToOemSize@4 +RtlUnicodeStringToOemSize@4=RtlxUnicodeStringToOemSize@4 RtlUnicodeStringToOemString@12 RtlUnicodeToCustomCPN@24 RtlUnicodeToMultiByteN@20 _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-09-06 06:19:30 UTC (rev 17689) +++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 06:30:49 UTC (rev 17690) @@ -66,7 +66,7 @@ */ ULONG STDCALL -RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) +RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) { ULONG Size; @@ -883,7 +883,7 @@ */ ULONG STDCALL -RtlUnicodeStringToOemSize( +RtlxUnicodeStringToOemSize( IN PUNICODE_STRING UnicodeString) { ULONG Size; @@ -1830,7 +1830,7 @@ */ ULONG STDCALL -RtlOemStringToUnicodeSize(IN POEM_STRING OemString) +RtlxOemStringToUnicodeSize(IN POEM_STRING OemString) { ULONG Size; @@ -1893,7 +1893,7 @@ */ ULONG STDCALL -RtlUnicodeStringToAnsiSize( +RtlxUnicodeStringToAnsiSize( IN PUNICODE_STRING UnicodeString) { ULONG Size; @@ -2261,9 +2261,9 @@ * @implemented */ ULONG STDCALL -RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) +RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString) { - return RtlAnsiStringToUnicodeSize(AnsiString); + return RtlxAnsiStringToUnicodeSize(AnsiString); } @@ -2271,9 +2271,9 @@ * @implemented */ ULONG STDCALL -RtlxOemStringToUnicodeSize(IN POEM_STRING OemString) +RtlOemStringToUnicodeSize(IN POEM_STRING OemString) { - return RtlOemStringToUnicodeSize(OemString); + return RtlxOemStringToUnicodeSize(OemString); } @@ -2282,9 +2282,9 @@ * @implemented */ ULONG STDCALL -RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString) +RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) { - return RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UnicodeString); + return RtlxUnicodeStringToAnsiSize(UnicodeString); } @@ -2292,9 +2292,9 @@ * @implemented */ ULONG STDCALL -RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) +RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) { - return RtlUnicodeStringToOemSize(UnicodeString); + return RtlxUnicodeStringToOemSize(UnicodeString); } /* _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-06 06:19:30 UTC (rev 17689) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-06 06:30:49 UTC (rev 17690) @@ -962,7 +962,7 @@ ;RtlAllocateAndInitializeSid RtlAllocateHeap@12 RtlAnsiCharToUnicodeChar@4 -RtlAnsiStringToUnicodeSize@4 +RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4 RtlAnsiStringToUnicodeString@12 RtlAppendAsciizToString@8 RtlAppendStringToString@8 @@ -1149,7 +1149,7 @@ RtlNumberOfClearBits@4 RtlNumberOfSetBits@4 RtlOemStringToCountedUnicodeString@12 -RtlOemStringToUnicodeSize@4 +RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4 RtlOemStringToUnicodeString@12 RtlOemToUnicodeN@20 RtlPinAtomInAtomTable@8 @@ -1193,11 +1193,11 @@ RtlTimeToTimeFields@8 @RtlUlongByteSwap@4 @RtlUlonglongByteSwap@8 -RtlUnicodeStringToAnsiSize@4 +RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4 RtlUnicodeStringToAnsiString@12 RtlUnicodeStringToCountedOemString@12 RtlUnicodeStringToInteger@12 -RtlUnicodeStringToOemSize@4 +RtlUnicodeStringToOemSize@4=RtlxUnicodeStringToOemSize@4 RtlUnicodeStringToOemString@12 RtlUnicodeToCustomCPN@24 RtlUnicodeToMultiByteN@20

19 years, 3 months

[ion] 17689: A couple more fixes to prepare for the final patch

by ion＠svn.reactos.com

A couple more fixes to prepare for the final patch Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-09-06 05:58:48 UTC (rev 17688) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-09-06 06:19:30 UTC (rev 17689) @@ -12,7 +12,9 @@ /* DEPENDENCIES **************************************************************/ #include "ldrtypes.h" /* FIXME: this needs be implemented in the w32api ddk */ -//#include "ntimage.h" +#ifdef _MSC_VER +#include "ntimage.h" +#endif /* FUNCTION TYPES ************************************************************/ _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-06 05:58:48 UTC (rev 17688) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-06 06:19:30 UTC (rev 17689) @@ -240,8 +240,10 @@ #define RTL_ATOM_IS_PINNED 0x1 /* EXPORTED DATA *************************************************************/ +#ifdef NTOS_MODE_USER extern BOOLEAN NTSYSAPI NLS_MB_CODE_PAGE_TAG; extern BOOLEAN NTSYSAPI NLS_MB_OEM_CODE_PAGE_TAG; +#endif /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-09-06 05:58:48 UTC (rev 17688) +++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 06:19:30 UTC (rev 17689) @@ -2282,9 +2282,9 @@ * @implemented */ ULONG STDCALL -RtlxUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString) +RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString) { - return RtlUnicodeStringToAnsiSize(UnicodeString); + return RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UnicodeString); } _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 05:58:48 UTC (rev 17688) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 06:19:30 UTC (rev 17689) @@ -5207,12 +5207,17 @@ IN PCUNICODE_STRING String2, IN BOOLEAN CaseInSensitive); -NTOSAPI +static __inline LARGE_INTEGER -DDKAPI -RtlConvertLongToLargeInteger( - IN LONG SignedInteger); +NTAPI_INLINE +RtlConvertLongToLargeInteger(LONG SignedInteger) +{ + LARGE_INTEGER Result; + Result.QuadPart = SignedInteger; + return Result; +} + NTOSAPI LUID DDKAPI @@ -5822,7 +5827,7 @@ ULONG DDKAPI RtlxUnicodeStringToAnsiSize( - IN PUNICODE_STRING UnicodeString); + IN PCUNICODE_STRING UnicodeString); /* * VOID

19 years, 3 months

[ion] 17688: - Use inlined functions like MSDDK.

by ion＠svn.reactos.com

- Use inlined functions like MSDDK. Modified: trunk/reactos/include/ndk/rtlfuncs.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-06 05:30:39 UTC (rev 17687) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-06 05:58:48 UTC (rev 17688) @@ -906,6 +906,7 @@ /* * Ansi->Unicode String Functions */ +NTSYSAPI NTSTATUS NTAPI RtlAnsiStringToUnicodeString( @@ -975,6 +976,7 @@ PCWSTR SourceString ); +#ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS NTAPI @@ -983,6 +985,7 @@ IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString ); +#endif NTSYSAPI NTSTATUS @@ -1869,40 +1872,63 @@ /* * Misc conversion functions */ -/* FIXME: Use inline */ -NTSYSAPI +#if defined(NTOS_MODE_USER) && !defined(NO_RTL_INLINES) +static __inline LARGE_INTEGER -NTAPI -RtlConvertLongToLargeInteger(IN LONG SignedInteger); +NTAPI_INLINE +RtlConvertLongToLargeInteger(LONG SignedInteger) +{ + LARGE_INTEGER Result; -/* FIXME: Use inline */ -NTSYSAPI + Result.QuadPart = SignedInteger; + return Result; +} + +static __inline LARGE_INTEGER -NTAPI +NTAPI_INLINE RtlEnlargedIntegerMultiply( LONG Multiplicand, - LONG Multiplier -); + LONG Multiplier) +{ + LARGE_INTEGER Product; -/* FIXME: Use inline */ -NTSYSAPI + Product.QuadPart = (LONGLONG)Multiplicand * (ULONGLONG)Multiplier; + return Product; +} + +static __inline ULONG -NTAPI +NTAPI_INLINE RtlEnlargedUnsignedDivide( - ULARGE_INTEGER Dividend, - ULONG Divisor, - PULONG Remainder -); + IN ULARGE_INTEGER Dividend, + IN ULONG Divisor, + IN PULONG Remainder OPTIONAL) +{ + ULONG Quotient; -/* FIXME: Use inline */ -NTSYSAPI + Quotient = (ULONG)(Dividend.QuadPart / Divisor); + if (Remainder) { + *Remainder = (ULONG)(Dividend.QuadPart % Divisor); + } + + return Quotient; +} + +static __inline LARGE_INTEGER -NTAPI +NTAPI_INLINE RtlEnlargedUnsignedMultiply( ULONG Multiplicand, - ULONG Multiplier -); + ULONG Multiplier) +{ + LARGE_INTEGER Product; + Product.QuadPart = (ULONGLONG)Multiplicand * (ULONGLONG)Multiplier; + return Product; +} +#endif + NTSYSAPI ULONG NTAPI

19 years, 3 months

[ion] 17687: - Some more MSDDK/IFS compatibility fixes.

by ion＠svn.reactos.com

- Some more MSDDK/IFS compatibility fixes. Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -12,8 +12,6 @@ /* DEPENDENCIES **************************************************************/ #include "excpt.h" -/* EXPORTED DATA *************************************************************/ - /* CONSTANTS *****************************************************************/ #define MAXIMUM_LEADBYTES 12 @@ -104,6 +102,11 @@ #define RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE 1 #define RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING 2 +/* For Size conversion macros */ +#define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag +#define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag +#define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo + /* List Macros */ static __inline VOID @@ -236,6 +239,10 @@ /* RTL Atom Flags */ #define RTL_ATOM_IS_PINNED 0x1 +/* EXPORTED DATA *************************************************************/ +extern BOOLEAN NTSYSAPI NLS_MB_CODE_PAGE_TAG; +extern BOOLEAN NTSYSAPI NLS_MB_OEM_CODE_PAGE_TAG; + /* ENUMERATIONS **************************************************************/ #ifdef NTOS_MODE_USER _____ Modified: trunk/reactos/include/ndk/umtypes.h --- trunk/reactos/include/ndk/umtypes.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/include/ndk/umtypes.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -79,6 +79,11 @@ #define NTSYSCALLAPI DECLSPEC_ADDRSAFE #endif #endif +#if !defined(_M_CEE_PURE) +#define NTAPI_INLINE NTAPI +#else +#define NTAPI_INLINE +#endif /* Native API Return Value Macros */ #define NT_SUCCESS(x) ((x)>=0) _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -806,6 +806,7 @@ IN TIMER_TYPE TimerType ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwCreateTimer( @@ -814,6 +815,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN TIMER_TYPE TimerType ); +#endif NTSTATUS NTAPI @@ -1147,6 +1149,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock ); +#ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS NTAPI @@ -1154,6 +1157,7 @@ IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); +#endif NTSTATUS NTAPI @@ -1922,7 +1926,7 @@ IN POBJECT_ATTRIBUTES ObjectAttributes ); -NTSYSAPI +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwOpenTimer( @@ -1930,6 +1934,7 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes ); +#endif NTSTATUS NTAPI @@ -2195,7 +2200,7 @@ IN BOOLEAN RestartScan ); -NTSYSAPI +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwQueryEaFile( @@ -2209,6 +2214,7 @@ IN PULONG EaIndex OPTIONAL, IN BOOLEAN RestartScan ); +#endif NTSTATUS NTAPI @@ -3275,7 +3281,7 @@ ULONG EaBufferSize ); -NTSYSAPI +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwSetEaFile( @@ -3284,6 +3290,7 @@ PVOID EaBuffer, ULONG EaBufferSize ); +#endif NTSTATUS NTAPI _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-09-06 05:30:39 UTC (rev 17687) @@ -15,6 +15,15 @@ /* GLOBALS ******************************************************************/ +/* GCC s^H can't handle static initializers to APIs, so we have to hack this */ +NTSTATUS +NTAPI +RtlAnsiStringToUnicodeString( + PUNICODE_STRING DestinationString, + PCANSI_STRING SourceString, + BOOLEAN AllocateDestinationString +); + PRTL_CONVERT_STRING Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/lib/rtl/largeint.c --- trunk/reactos/lib/rtl/largeint.c 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/lib/rtl/largeint.c 2005-09-06 05:30:39 UTC (rev 17687) @@ -11,6 +11,7 @@ /* INCLUDES *****************************************************************/ +#define NO_RTL_INLINES #include <rtl.h> #define NDEBUG _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -2540,12 +2540,8 @@ IN NTSTATUS Ntstatus ); -#define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag -#define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo -extern BOOLEAN NlsMbCodePageTag; -extern BOOLEAN NlsMbOemCodePageTag; extern PUSHORT NlsOemLeadByteInfo; #define FsRtlIsLeadDbcsCharacter(DBCS_CHAR) ( \ @@ -3697,6 +3693,15 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlDowncaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString +); + +NTSYSAPI BOOLEAN NTAPI RtlEqualSid ( @@ -4346,6 +4351,14 @@ IN ULONG FlushSize ); +NTSYSAPI +NTSTATUS +NTAPI +ZwFlushBuffersFile( + IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock +); + #if (VER_PRODUCTBUILD >= 2195) NTSYSAPI _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -4945,6 +4945,16 @@ #endif /* DBG */ +#ifdef _NTSYSTEM_ +#define NLS_MB_CODE_PAGE_TAG NlsMbCodePageTag +#define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag +#else +#define NLS_MB_CODE_PAGE_TAG (*NlsMbCodePageTag) +#define NLS_MB_OEM_CODE_PAGE_TAG (*NlsMbOemCodePageTag) +#endif /* _NT_SYSTEM */ + +extern BOOLEAN NTSYSAPI NLS_MB_CODE_PAGE_TAG; +extern BOOLEAN NTSYSAPI NLS_MB_OEM_CODE_PAGE_TAG; /* ** Driver support routines _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-09-06 00:34:23 UTC (rev 17686) +++ trunk/reactos/w32api/include/ntdef.h 2005-09-06 05:30:39 UTC (rev 17687) @@ -8,6 +8,11 @@ #define RESTRICTED_POINTER #define NTAPI __stdcall +#if !defined(_M_CEE_PURE) +#define NTAPI_INLINE NTAPI +#else +#define NTAPI_INLINE +#endif #define OBJ_INHERIT 0x00000002 #define OBJ_PERMANENT 0x00000010

19 years, 3 months

[gdalsnes] 17686: remove window update lock

by gdalsnes＠svn.reactos.com

remove window update lock Modified: trunk/reactos/subsys/win32k/include/painting.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/include/painting.h --- trunk/reactos/subsys/win32k/include/painting.h 2005-09-05 23:11:41 UTC (rev 17685) +++ trunk/reactos/subsys/win32k/include/painting.h 2005-09-06 00:34:23 UTC (rev 17686) @@ -12,13 +12,5 @@ BOOL FASTCALL IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, MSG *Message, BOOL Remove); -//BOOL STDCALL -//NtUserValidateRgn(HWND hWnd, HRGN hRgn); -#define IntLockWindowUpdate(Window) \ - ExAcquireFastMutex(&Window->UpdateLock) - -#define IntUnLockWindowUpdate(Window) \ - ExReleaseFastMutex(&Window->UpdateLock) - #endif /* _WIN32K_PAINTING_H */ _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-05 23:11:41 UTC (rev 17685) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-06 00:34:23 UTC (rev 17686) @@ -63,8 +63,6 @@ HANDLE NCUpdateRegion; /* Handle of the window region. */ HANDLE WindowRegion; - /* Lock to be held when manipulating (NC)UpdateRegion */ - FAST_MUTEX UpdateLock; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* FirstChild; _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-05 23:11:41 UTC (rev 17685) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-06 00:34:23 UTC (rev 17686) @@ -48,7 +48,6 @@ { if (!(ParentWindow->Style & WS_CLIPCHILDREN)) { - IntLockWindowUpdate(ParentWindow); if (ParentWindow->UpdateRegion != 0) { INT OffsetX, OffsetY; @@ -65,7 +64,6 @@ /* FIXME: If the resulting region is empty, remove fake posted paint message */ NtGdiOffsetRgn(ValidRegion, -OffsetX, -OffsetY); } - IntUnLockWindowUpdate(ParentWindow); } OldWindow = ParentWindow; ParentWindow = IntGetParentObject(ParentWindow); @@ -90,7 +88,6 @@ { if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) { - IntLockWindowUpdate(Window); if (Window->NCUpdateRegion) { IntValidateParent(Window, Window->NCUpdateRegion); @@ -103,7 +100,6 @@ Window->NCUpdateRegion = NULL; Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->MessageQueue); - IntUnLockWindowUpdate(Window); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); if ((HANDLE) 1 != TempRegion && NULL != TempRegion) { @@ -198,12 +194,10 @@ * Clip the given region with window rectangle (or region) */ - IntLockWindowUpdate(Window); if (!Window->WindowRegion || (Window->Style & WS_MINIMIZE)) { HRGN hRgnWindow; - IntUnLockWindowUpdate(Window); hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); NtGdiOffsetRgn(hRgnWindow, -Window->WindowRect.left, @@ -214,14 +208,12 @@ else { RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->WindowRegion, RGN_AND); - IntUnLockWindowUpdate(Window); } /* * Save current state of pending updates */ - IntLockWindowUpdate(Window); HadPaintMessage = Window->UpdateRegion != NULL || Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT; HadNCPaintMessage = Window->Flags & WINDOWOBJECT_NEED_NCPAINT; @@ -401,7 +393,6 @@ MsqIncPaintCountQueue(Window->MessageQueue); } - IntUnLockWindowUpdate(Window); } /* @@ -735,7 +726,6 @@ RETURN( NULL); } - IntLockWindowUpdate(Window); if (Window->UpdateRegion != NULL) { MsqDecPaintCountQueue(Window->MessageQueue); @@ -764,7 +754,6 @@ IntGetClientRect(Window, &Ps.rcPaint); } Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; - IntUnLockWindowUpdate(Window); if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) { @@ -910,7 +899,6 @@ return ERROR; } - IntLockWindowUpdate(Window); if (Window->UpdateRegion == NULL) { RegionType = (NtGdiSetRectRgn(hRgn, 0, 0, 0, 0) ? NULLREGION : ERROR); @@ -923,7 +911,6 @@ Window->WindowRect.left - Window->ClientRect.left, Window->WindowRect.top - Window->ClientRect.top); } - IntUnLockWindowUpdate(Window); if (bErase && RegionType != NULLREGION && RegionType != ERROR) { @@ -984,7 +971,6 @@ RETURN( ERROR); } - IntLockWindowUpdate(Window); if (Window->UpdateRegion == NULL) { Rect.left = Rect.top = Rect.right = Rect.bottom = 0; @@ -999,7 +985,6 @@ } AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); - IntUnLockWindowUpdate(Window); if (bErase && Rect.left < Rect.right && Rect.top < Rect.bottom) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-05 23:11:41 UTC (rev 17685) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-06 00:34:23 UTC (rev 17686) @@ -1578,7 +1578,6 @@ } InitializeListHead(&WindowObject->PropListHead); - ExInitializeFastMutex(&WindowObject->UpdateLock); InitializeListHead(&WindowObject->WndObjListHead); ExInitializeFastMutex(&WindowObject->WndObjListLock);

19 years, 3 months

[gdalsnes] 17685: remove user handle table lock, cursor locks, message queue locks, hook lock

by gdalsnes＠svn.reactos.com

remove user handle table lock, cursor locks, message queue locks, hook lock Modified: trunk/reactos/subsys/win32k/include/cursoricon.h Modified: trunk/reactos/subsys/win32k/include/hook.h Modified: trunk/reactos/subsys/win32k/include/msgqueue.h Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/misc/object.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: trunk/reactos/subsys/win32k/include/cursoricon.h --- trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/include/cursoricon.h 2005-09-05 23:11:41 UTC (rev 17685) @@ -13,7 +13,6 @@ { LIST_ENTRY ListEntry; HANDLE Self; - FAST_MUTEX Lock; LIST_ENTRY ProcessList; HMODULE hModule; HRSRC hRsrc; @@ -37,7 +36,6 @@ BOOL Enabled; BOOL SwapButtons; UINT ButtonsDown; - FAST_MUTEX CursorMutex; CURSORCLIP_INFO CursorClipInfo; PCURICON_OBJECT CurrentCursorObject; BYTE ShowingCursor; @@ -64,12 +62,6 @@ #define IntReleaseCurIconObject(CurIconObj) \ ObmDereferenceObject(CurIconObj) -#define IntLockProcessCursorIcons(W32Process) \ - ExAcquireFastMutex(&W32Process->CursorIconListLock) - -#define IntUnLockProcessCursorIcons(W32Process) \ - ExReleaseFastMutex(&W32Process->CursorIconListLock) - #endif /* _WIN32K_CURSORICON_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/hook.h --- trunk/reactos/subsys/win32k/include/hook.h 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/include/hook.h 2005-09-05 23:11:41 UTC (rev 17685) @@ -19,7 +19,6 @@ typedef struct tagHOOKTABLE { - FAST_MUTEX Lock; LIST_ENTRY Hooks[NB_HOOKS]; /* array of hook chains */ UINT Counts[NB_HOOKS]; /* use counts for each hook chain */ } HOOKTABLE, *PHOOKTABLE; @@ -27,12 +26,6 @@ LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); -#define IntLockHookTable(HookTable) \ - ExAcquireFastMutex(&HookTable->Lock) - -#define IntUnLockHookTable(HookTable) \ - ExReleaseFastMutex(&HookTable->Lock) - #endif /* _WIN32K_HOOK_H */ /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/include/msgqueue.h --- trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/include/msgqueue.h 2005-09-05 23:11:41 UTC (rev 17685) @@ -67,8 +67,6 @@ LIST_ENTRY TimerListHead; /* Lock for the hardware message list. */ KMUTEX HardwareLock; - /* Lock for the queue. */ - FAST_MUTEX Lock; /* Pointer to the current WM_MOUSEMOVE message */ PUSER_MESSAGE MouseMoveMsg; /* True if a WM_QUIT message is pending. */ @@ -216,12 +214,6 @@ LPARAM FASTCALL MsqGetMessageExtraInfo(VOID); VOID STDCALL MsqRemoveWindowMessagesFromQueue(PVOID pWindow); /* F*(&$ headers, will be gone in the rewrite! */ -#define IntLockMessageQueue(MsgQueue) \ - ExAcquireFastMutex(&(MsgQueue)->Lock) - -#define IntUnLockMessageQueue(MsgQueue) \ - ExReleaseFastMutex(&(MsgQueue)->Lock) - #define IntLockHardwareMessageQueue(MsgQueue) \ KeWaitForMutexObject(&(MsgQueue)->HardwareLock, UserRequest, KernelMode, FALSE, NULL) _____ Modified: trunk/reactos/subsys/win32k/include/object.h --- trunk/reactos/subsys/win32k/include/object.h 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/include/object.h 2005-09-05 23:11:41 UTC (rev 17685) @@ -43,16 +43,9 @@ typedef struct _USER_HANDLE_TABLE { LIST_ENTRY ListHead; - FAST_MUTEX ListLock; } USER_HANDLE_TABLE, *PUSER_HANDLE_TABLE; -#define ObmpLockHandleTable(HandleTable) \ - ExAcquireFastMutex(&HandleTable->ListLock) - -#define ObmpUnlockHandleTable(HandleTable) \ - ExReleaseFastMutex(&HandleTable->ListLock) - ULONG FASTCALL ObmGetReferenceCount( PVOID ObjectBody); _____ Modified: trunk/reactos/subsys/win32k/misc/object.c --- trunk/reactos/subsys/win32k/misc/object.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/misc/object.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -111,8 +111,6 @@ PVOID ObjectBody; ULONG i; - ObmpLockHandleTable(HandleTable); - CurrentEntry = HandleTable->ListHead.Flink; while (CurrentEntry != &HandleTable->ListHead) @@ -131,11 +129,8 @@ ObjectHeader->HandleCount--; Current->Handles[i].ObjectBody = NULL; - ObmpUnlockHandleTable(HandleTable); - ObmDereferenceObject(ObjectBody); - ObmpLockHandleTable(HandleTable); CurrentEntry = &HandleTable->ListHead; break; } @@ -144,7 +139,6 @@ CurrentEntry = CurrentEntry->Flink; } - ObmpUnlockHandleTable(HandleTable); } VOID FASTCALL @@ -177,13 +171,10 @@ PUSER_HANDLE Entry; PVOID ObjectBody; - ObmpLockHandleTable(HandleTable); - Entry = ObmpGetObjectByHandle(HandleTable, Handle); if (Entry == NULL) { DPRINT1("Invalid handle\n"); - ObmpUnlockHandleTable(HandleTable); return NULL; } @@ -197,8 +188,6 @@ Entry->ObjectBody = NULL; } - ObmpUnlockHandleTable(HandleTable); - return ObjectBody; } @@ -372,8 +361,6 @@ USER_BODY_TO_HEADER(ObjectBody)->HandleCount++; } - ObmpLockHandleTable(HandleTable); - Handle = 1; Current = HandleTable->ListHead.Flink; /* @@ -390,7 +377,6 @@ if (!Block->Handles[i].ObjectBody) { Block->Handles[i].ObjectBody = ObjectBody; - ObmpUnlockHandleTable(HandleTable); *HandleReturn = (HANDLE)((Handle + i) << 2); return STATUS_SUCCESS; } @@ -415,7 +401,6 @@ RtlZeroMemory(NewBlock, sizeof(USER_HANDLE_BLOCK)); NewBlock->Handles[0].ObjectBody = ObjectBody; InsertTailList(&HandleTable->ListHead, &NewBlock->ListEntry); - ObmpUnlockHandleTable(HandleTable); *HandleReturn = (HANDLE)(Handle << 2); return STATUS_SUCCESS; @@ -441,21 +426,16 @@ PUSER_HANDLE UserHandle; PVOID ObjectBody; - ObmpLockHandleTable(HandleTable); - UserHandle = ObmpGetObjectByHandle(HandleTable, Handle); if ((UserHandle == NULL) || (UserHandle->ObjectBody == NULL)) { - ObmpUnlockHandleTable(HandleTable); return STATUS_UNSUCCESSFUL; } ObjectBody = UserHandle->ObjectBody; ObmReferenceObjectByPointer(ObjectBody, ObjectType); - ObmpUnlockHandleTable(HandleTable); - ObjectHeader = USER_BODY_TO_HEADER(ObjectBody); if ((ObjectType != otUnknown) && (ObjectHeader->Type != ObjectType)) @@ -491,7 +471,6 @@ ObmInitializeHandleTable(PUSER_HANDLE_TABLE HandleTable) { InitializeListHead(&HandleTable->ListHead); - ExInitializeFastMutex(&HandleTable->ListLock); } VOID FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -43,7 +43,6 @@ static PAGED_LOOKASIDE_LIST ProcessLookasideList; static LIST_ENTRY CurIconList; -static FAST_MUTEX CurIconListLock; /* Look up the location of the cursor in the GDIDEVICE structure * when all we know is the window station object @@ -305,7 +304,6 @@ 0, 128); InitializeListHead(&CurIconList); - ExInitializeFastMutex(&CurIconListLock); return TRUE; } @@ -328,7 +326,6 @@ Win32Process = PsGetWin32Process(); - ExAcquireFastMutex(&Object->Lock); Search = Object->ProcessList.Flink; while (Search != &Object->ProcessList) { @@ -336,7 +333,6 @@ if (Current->Process == Win32Process) { /* Already registered for this process */ - ExReleaseFastMutex(&Object->Lock); return TRUE; } Search = Search->Flink; @@ -351,7 +347,6 @@ InsertHeadList(&Object->ProcessList, &Current->ListEntry); Current->Process = Win32Process; - ExReleaseFastMutex(&Object->Lock); return TRUE; } @@ -362,8 +357,6 @@ PLIST_ENTRY CurrentEntry; PCURICON_OBJECT Object; - ExAcquireFastMutex(&CurIconListLock); - CurrentEntry = CurIconList.Flink; while (CurrentEntry != &CurIconList) { @@ -380,18 +373,15 @@ } if (! ReferenceCurIconByProcess(Object)) { - ExReleaseFastMutex(&CurIconListLock); return NULL; } - ExReleaseFastMutex(&CurIconListLock); + return Object; } } ObmDereferenceObject(Object); } - ExReleaseFastMutex(&CurIconListLock); - return NULL; } @@ -410,7 +400,6 @@ } Object->Self = Handle; - ExInitializeFastMutex(&Object->Lock); InitializeListHead(&Object->ProcessList); if (! ReferenceCurIconByProcess(Object)) @@ -421,9 +410,7 @@ return NULL; } - ExAcquireFastMutex(&CurIconListLock); InsertHeadList(&CurIconList, &Object->ListEntry); - ExReleaseFastMutex(&CurIconListLock); ObmDereferenceObject(Object); @@ -440,8 +427,6 @@ PCURICON_PROCESS Current = NULL; PW32PROCESS W32Process = PsGetWin32Process(); - ExAcquireFastMutex(&Object->Lock); - /* Private objects can only be destroyed by their own process */ if (NULL == Object->hModule) { @@ -449,14 +434,12 @@ Current = CONTAINING_RECORD(Object->ProcessList.Flink, CURICON_PROCESS, ListEntry); if (Current->Process != W32Process) { - ExReleaseFastMutex(&Object->Lock); DPRINT1("Trying to destroy private icon/cursor of another process\n"); return FALSE; } } else if (! ProcessCleanup) { - ExReleaseFastMutex(&Object->Lock); DPRINT("Trying to destroy shared icon/cursor\n"); return FALSE; } @@ -480,17 +463,13 @@ /* If there are still processes referencing this object we can't destroy it yet */ if (! IsListEmpty(&Object->ProcessList)) { - ExReleaseFastMutex(&Object->Lock); return TRUE; } - ExReleaseFastMutex(&Object->Lock); if (! ProcessCleanup) { - ExAcquireFastMutex(&CurIconListLock); RemoveEntryList(&Object->ListEntry); - ExReleaseFastMutex(&CurIconListLock); } CurInfo = IntGetSysCursorInfo(WinStaObject); @@ -536,8 +515,6 @@ return; } - ExAcquireFastMutex(&CurIconListLock); - CurrentEntry = CurIconList.Flink; while (CurrentEntry != &CurIconList) { @@ -545,29 +522,23 @@ CurrentEntry = CurrentEntry->Flink; if(NT_SUCCESS(ObmReferenceObjectByPointer(Object, otCursorIcon))) { - ExAcquireFastMutex(&Object->Lock); ProcessEntry = Object->ProcessList.Flink; while (ProcessEntry != &Object->ProcessList) { ProcessData = CONTAINING_RECORD(ProcessEntry, CURICON_PROCESS, ListEntry); if (Win32Process == ProcessData->Process) { - ExReleaseFastMutex(&Object->Lock); RemoveEntryList(&Object->ListEntry); IntDestroyCurIconObject(WinStaObject, Object, TRUE); break; } ProcessEntry = ProcessEntry->Flink; } - if (ProcessEntry == &Object->ProcessList) - { - ExReleaseFastMutex(&Object->Lock); - } + ObmDereferenceObject(Object); } } - ExReleaseFastMutex(&CurIconListLock); ObDereferenceObject(WinStaObject); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -190,18 +190,15 @@ co_IntSendKillFocusMessages(hWndFocusPrev, hWndFocus); IntSetFocusMessageQueue(Window->MessageQueue); - IntLockMessageQueue(Window->MessageQueue); if (Window->MessageQueue) { Window->MessageQueue->ActiveWindow = hWnd; } - IntUnLockMessageQueue(Window->MessageQueue); - IntLockMessageQueue(FocusWindow->MessageQueue); + if (FocusWindow->MessageQueue) { FocusWindow->MessageQueue->FocusWindow = hWndFocus; } - IntUnLockMessageQueue(FocusWindow->MessageQueue); if (PrevForegroundQueue != Window->MessageQueue) { @@ -299,9 +296,7 @@ /* FIXME: Call hooks. */ - IntLockMessageQueue(ThreadQueue); ThreadQueue->ActiveWindow = hWnd; - IntUnLockMessageQueue(ThreadQueue); co_IntSendDeactivateMessages(hWndPrev, hWnd); co_IntSendActivateMessages(hWndPrev, hWnd, FALSE); @@ -326,9 +321,7 @@ return hWndPrev; } - IntLockMessageQueue(ThreadQueue); ThreadQueue->FocusWindow = hWnd; - IntUnLockMessageQueue(ThreadQueue); co_IntSendKillFocusMessages(hWndPrev, hWnd); co_IntSendSetFocusMessages(hWndPrev, hWnd); @@ -499,9 +492,7 @@ } co_IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); - IntLockMessageQueue(ThreadQueue); ThreadQueue->CaptureWindow = hWnd; - IntUnLockMessageQueue(ThreadQueue); RETURN( hWndPrev); _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -48,7 +48,6 @@ Table = ExAllocatePoolWithTag(PagedPool, sizeof(HOOKTABLE), TAG_HOOK); if (NULL != Table) { - ExInitializeFastMutex(&Table->Lock); for (i = 0; i < NB_HOOKS; i++) { InitializeListHead(&Table->Hooks[i]); @@ -96,9 +95,7 @@ Hook->HookId = HookId; RtlInitUnicodeString(&Hook->ModuleName, NULL); - IntLockHookTable(Table); InsertHeadList(&Table->Hooks[HOOKID_TO_INDEX(HookId)], &Hook->Chain); - IntUnLockHookTable(Table); return Hook; } @@ -132,7 +129,6 @@ PHOOK Hook; PLIST_ENTRY Elem; - IntLockHookTable(Table); Hook = IntGetFirstHook(Table, HookId); while (NULL != Hook && NULL == Hook->Proc) { @@ -140,7 +136,6 @@ Hook = (Elem == &Table->Hooks[HOOKID_TO_INDEX(HookId)] ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain)); } - IntUnLockHookTable(Table); return Hook; } @@ -153,18 +148,15 @@ int HookId = Hook->HookId; PLIST_ENTRY Elem; - IntLockHookTable(Table); Elem = Hook->Chain.Flink; while (Elem != &Table->Hooks[HOOKID_TO_INDEX(HookId)]) { Hook = CONTAINING_RECORD(Elem, HOOK, Chain); if (NULL != Hook->Proc) { - IntUnLockHookTable(Table); return Hook; } } - IntUnLockHookTable(Table); if (NULL != GlobalHooks && Table != GlobalHooks) /* now search through the global table */ { @@ -203,10 +195,6 @@ return; } - if (! TableAlreadyLocked) - { - IntLockHookTable(Table); - } if (0 != Table->Counts[HOOKID_TO_INDEX(Hook->HookId)]) { Hook->Proc = NULL; /* chain is in use, just mark it and return */ @@ -215,10 +203,6 @@ { IntFreeHook(Table, Hook, WinStaObj); } - if (! TableAlreadyLocked) - { - IntUnLockHookTable(Table); - } } /* release a hook chain, removing deleted hooks if the use count drops to 0 */ @@ -233,12 +217,10 @@ return; } - IntLockHookTable(Table); /* use count shouldn't already be 0 */ ASSERT(0 != Table->Counts[HOOKID_TO_INDEX(HookId)]); if (0 == Table->Counts[HOOKID_TO_INDEX(HookId)]) { - IntUnLockHookTable(Table); return; } if (0 == --Table->Counts[HOOKID_TO_INDEX(HookId)]) @@ -254,7 +236,6 @@ } } } - IntUnLockHookTable(Table); } static LRESULT FASTCALL @@ -316,14 +297,10 @@ return 0; } - IntLockHookTable(Table); Table->Counts[HOOKID_TO_INDEX(HookId)]++; - IntUnLockHookTable(Table); if (Table != GlobalHooks && GlobalHooks != NULL) { - IntLockHookTable(GlobalHooks); GlobalHooks->Counts[HOOKID_TO_INDEX(HookId)]++; - IntUnLockHookTable(GlobalHooks); } Result = co_IntCallHookProc(HookId, Code, wParam, lParam, Hook->Proc, @@ -369,7 +346,7 @@ DPRINT1("Invalid window station????\n"); return; } - IntLockHookTable(GlobalHooks); + for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) { /* only low-level keyboard/mouse global hooks can be owned by a thread */ @@ -390,7 +367,7 @@ break; } } - IntUnLockHookTable(GlobalHooks); + ObDereferenceObject(WinStaObj); } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -930,7 +930,6 @@ SwapButtons = CurInfo->SwapButtons; DoMove = FALSE; - ExAcquireFastMutex(&CurInfo->CursorMutex); IntGetCursorLocation(WinSta, &MousePos); OrgPos.x = MousePos.x; OrgPos.y = MousePos.y; @@ -981,8 +980,6 @@ DoMove = (MousePos.x != OrgPos.x || MousePos.y != OrgPos.y); } - ExReleaseFastMutex(&CurInfo->CursorMutex); - if (DoMove) { dc = DC_LockDc(hDC); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -1745,16 +1745,12 @@ Queue = PsGetWin32Thread()->MessageQueue; - IntLockMessageQueue(Queue); - Result = MAKELONG(Queue->QueueBits, Queue->ChangedBits); if (ClearChanges) { Queue->ChangedBits = 0; } - IntUnLockMessageQueue(Queue); - RETURN( Result); CLEANUP: _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-05 22:39:29 UTC (rev 17684) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-05 23:11:41 UTC (rev 17685) @@ -77,10 +77,8 @@ return 0; MessageQueue = Win32Thread->MessageQueue; - IntLockMessageQueue(MessageQueue); MessageQueue->WakeMask = WakeMask; MessageEventHandle = MessageQueue->NewMessagesHandle; - IntUnLockMessageQueue(MessageQueue); return MessageEventHandle; } @@ -96,9 +94,7 @@ return FALSE; MessageQueue = Win32Thread->MessageQueue; - IntLockMessageQueue(MessageQueue); MessageQueue->WakeMask = ~0; - IntUnLockMessageQueue(MessageQueue); return TRUE; } @@ -106,26 +102,22 @@ VOID FASTCALL MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) { - IntLockMessageQueue(Queue); Queue->PaintCount++; Queue->PaintPosted = TRUE; Queue->QueueBits |= QS_PAINT; Queue->ChangedBits |= QS_PAINT; if (Queue->WakeMask & QS_PAINT) KeSetEvent(Queue->NewMessages, IO_NO_INCREMENT, FALSE); - IntUnLockMessageQueue(Queue); } VOID FASTCALL MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) { - IntLockMessageQueue(Queue); Queue->PaintCount--; if (Queue->PaintCount == 0) { Queue->PaintPosted = FALSE; } - IntUnLockMessageQueue(Queue); } @@ -760,12 +752,9 @@ ObmDereferenceObject(Window); ObDereferenceObject (Thread); -// IntLockMessageQueue(pThread->MessageQueue); // InsertHeadList(&pThread->MessageQueue->PostedMessagesListHead, // &Message->ListEntry); // KeSetEvent(pThread->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); -// IntUnLockMessageQueue(pThread->MessageQueue); - } PUSER_MESSAGE FASTCALL @@ -797,13 +786,11 @@ PLIST_ENTRY ListEntry; PUSER_SENT_MESSAGE_NOTIFY Message; - IntLockMessageQueue(MessageQueue); while (!IsListEmpty(&MessageQueue->SentMessagesListHead)) { ListEntry = RemoveHeadList(&MessageQueue->SentMessagesListHead); Message = CONTAINING_RECORD(ListEntry, USER_SENT_MESSAGE_NOTIFY, ListEntry); - IntUnLockMessageQueue(MessageQueue); co_IntCallSentMessageCallback(Message->CompletionCallback, Message->hWnd, @@ -811,9 +798,8 @@ Message->CompletionCallbackContext, Message->Result); - IntLockMessageQueue(MessageQueue); } - IntUnLockMessageQueue(MessageQueue); + } BOOLEAN FASTCALL @@ -831,10 +817,8 @@ BOOL SenderReturned; PUSER_SENT_MESSAGE_NOTIFY NotifyMessage; - IntLockMessageQueue(MessageQueue); if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { - IntUnLockMessageQueue(MessageQueue); return(FALSE); } @@ -847,8 +831,6 @@ InsertTailList(&MessageQueue->LocalDispatchingMessagesHead, &Message->ListEntry); - IntUnLockMessageQueue(MessageQueue); - if (Message->HookMessage) { Result = co_HOOK_CallHooks(Message->Msg.message, @@ -867,13 +849,9 @@ /* remove the message from the local dispatching list, because it doesn't need to be cleaned up on thread termination anymore */ - IntLockMessageQueue(MessageQueue); RemoveEntryList(&Message->ListEntry); - IntUnLockMessageQueue(MessageQueue); /* remove the message from the dispatching list, so lock the sender's message queue */ - IntLockMessageQueue(Message->SenderQueue); - SenderReturned = (Message->DispatchingListEntry.Flink == NULL); if(!SenderReturned) { @@ -895,9 +873,6 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* unlock the sender's message queue, the safe operation is done */ - IntUnLockMessageQueue(Message->SenderQueue); - /* Notify the sender if they specified a callback. */ if (!SenderReturned && Message->CompletionCallback != NULL) { @@ -942,8 +917,6 @@ MessageQueue = Window->MessageQueue; ASSERT(MessageQueue); - IntLockMessageQueue(MessageQueue); - /* remove the posted messages for this window */ CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; @@ -973,7 +946,6 @@ ListEntry); if(SentMessage->Msg.hwnd == Window->Self) { - IntLockMessageQueue(SentMessage->SenderQueue); DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* remove the message from the dispatching list */ @@ -987,7 +959,6 @@ { KeSetEvent(SentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - IntUnLockMessageQueue(SentMessage->SenderQueue); /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1003,21 +974,18 @@ CurrentEntry = CurrentEntry->Flink; } } - IntUnLockMessageQueue(MessageQueue); } VOID FASTCALL MsqSendNotifyMessage(PUSER_MESSAGE_QUEUE MessageQueue, PUSER_SENT_MESSAGE_NOTIFY NotifyMessage) { - IntLockMessageQueue(MessageQueue); InsertTailList(&MessageQueue->NotifyMessagesListHead, &NotifyMessage->ListEntry); MessageQueue->QueueBits |= QS_SENDMESSAGE; MessageQueue->ChangedBits |= QS_SENDMESSAGE; if (MessageQueue->WakeMask & QS_SENDMESSAGE) KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); - IntUnLockMessageQueue(MessageQueue); } NTSTATUS FASTCALL @@ -1064,14 +1032,10 @@ IntReferenceMessageQueue(MessageQueue); /* add it to the list of pending messages */ - IntLockMessageQueue(ThreadQueue); InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); - IntUnLockMessageQueue(ThreadQueue); /* queue it in the destination's message queue */ - IntLockMessageQueue(MessageQueue); InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); - IntUnLockMessageQueue(MessageQueue); MessageQueue->QueueBits |= QS_SENDMESSAGE; MessageQueue->ChangedBits |= QS_SENDMESSAGE; @@ -1095,7 +1059,6 @@ { /* look up if the message has not yet dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ - IntLockMessageQueue(MessageQueue); Entry = MessageQueue->SentMessagesListHead.Flink; while (Entry != &MessageQueue->SentMessagesListHead) { @@ -1110,11 +1073,9 @@ } Entry = Entry->Flink; } - IntUnLockMessageQueue(MessageQueue); /* remove from the local dispatching list so the other thread knows, it can't pass a result and it must not set the completion event anymore */ - IntLockMessageQueue(ThreadQueue); Entry = ThreadQueue->DispatchingMessagesHead.Flink; while (Entry != &ThreadQueue->DispatchingMessagesHead) { @@ -1133,7 +1094,6 @@ } Entry = Entry->Flink; } - IntUnLockMessageQueue(ThreadQueue); DPRINT("MsqSendMessage (blocked) timed out\n"); } @@ -1159,7 +1119,6 @@ { /* look up if the message has not yet been dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ - IntLockMessageQueue(MessageQueue); Entry = MessageQueue->SentMessagesListHead.Flink; while (Entry != &MessageQueue->SentMessagesListHead) { @@ -1174,11 +1133,9 @@ } Entry = Entry->Flink; } - IntUnLockMessageQueue(MessageQueue); /* remove from the local dispatching list so the other thread knows, it can't pass a result and it must not set the completion event anymore */ - IntLockMessageQueue(ThreadQueue); Entry = ThreadQueue->DispatchingMessagesHead.Flink; while (Entry != &ThreadQueue->DispatchingMessagesHead) { @@ -1197,7 +1154,6 @@ } Entry = Entry->Flink; } - IntUnLockMessageQueue(ThreadQueue); DPRINT("MsqSendMessage timed out\n"); break; @@ -1223,27 +1179,23 @@ { return; } - IntLockMessageQueue(MessageQueue); InsertTailList(&MessageQueue->PostedMessagesListHead, &Message->ListEntry); MessageQueue->QueueBits |= MessageBits; MessageQueue->ChangedBits |= MessageBits; if (MessageQueue->WakeMask & MessageBits) KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); - IntUnLockMessageQueue(MessageQueue); } VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode) { - IntLockMessageQueue(MessageQueue); MessageQueue->QuitPosted = TRUE; MessageQueue->QuitExitCode = ExitCode; MessageQueue->QueueBits |= QS_POSTMESSAGE; MessageQueue->ChangedBits |= QS_POSTMESSAGE; if (MessageQueue->WakeMask & QS_POSTMESSAGE) KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); - IntUnLockMessageQueue(MessageQueue); } BOOLEAN STDCALL @@ -1266,7 +1218,6 @@ Remove, Message)); } - IntLockMessageQueue(MessageQueue); CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; while (CurrentEntry != ListHead) @@ -1282,13 +1233,13 @@ { RemoveEntryList(&CurrentMessage->ListEntry); } - IntUnLockMessageQueue(MessageQueue); + *Message = CurrentMessage; return(TRUE); } CurrentEntry = CurrentEntry->Flink; } - IntUnLockMessageQueue(MessageQueue); + return(FALSE); } @@ -1350,7 +1301,6 @@ InitializeListHead(&MessageQueue->DispatchingMessagesHead); InitializeListHead(&MessageQueue->LocalDispatchingMessagesHead); KeInitializeMutex(&MessageQueue->HardwareLock, 0); - ExInitializeFastMutex(&MessageQueue->Lock); MessageQueue->QuitPosted = FALSE; MessageQueue->QuitExitCode = 0; KeQueryTickCount(&LargeTickCount); @@ -1389,8 +1339,6 @@ PTIMER_ENTRY CurrentTimer; PUSER_SENT_MESSAGE CurrentSentMessage; - IntLockMessageQueue(MessageQueue); - /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->PostedMessagesListHead)) { @@ -1407,7 +1355,6 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); - IntLockMessageQueue(CurrentSentMessage->SenderQueue); DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* remove the message from the dispatching list */ @@ -1421,7 +1368,6 @@ { KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - IntUnLockMessageQueue(CurrentSentMessage->SenderQueue); /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1447,7 +1393,6 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); - IntLockMessageQueue(CurrentSentMessage->SenderQueue); /* remove the message from the dispatching list */ if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) { @@ -1461,7 +1406,6 @@ { KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); } - IntUnLockMessageQueue(CurrentSentMessage->SenderQueue); /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1484,7 +1428,6 @@ locked later */ } - IntUnLockMessageQueue(MessageQueue); } PUSER_MESSAGE_QUEUE FASTCALL @@ -1698,14 +1641,12 @@ DPRINT("MsqSetTimer queue %p wnd %x id %p period %u timerproc %p msg %d\n", MessageQueue, Wnd, IDEvent, Period, TimerFunc, Msg); - IntLockMessageQueue(MessageQueue); Timer = RemoveTimer(MessageQueue, Wnd, IDEvent, Msg); if (NULL == Timer) { Timer = ExAllocateFromPagedLookasideList(&TimerLookasideList); if (NULL == Timer) { - IntUnLockMessageQueue(MessageQueue); DPRINT1("Failed to allocate timer entry\n"); return FALSE; } @@ -1733,8 +1674,6 @@ DumpTimerList(MessageQueue); #endif /* ! defined(NDEBUG) */ - IntUnLockMessageQueue(MessageQueue); - [truncated at 1000 lines; 131 more skipped]

19 years, 3 months

[gdalsnes] 17684: remove relatives lock, window props lock, classes locks, thread window lock, menu locks

by gdalsnes＠svn.reactos.com

remove relatives lock, window props lock, classes locks, thread window lock, menu locks Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/include/menu.h Modified: trunk/reactos/subsys/win32k/include/prop.h Modified: trunk/reactos/subsys/win32k/include/win32.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/prop.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/include/class.h --- trunk/reactos/subsys/win32k/include/class.h 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/include/class.h 2005-09-05 22:39:29 UTC (rev 17684) @@ -24,7 +24,6 @@ LIST_ENTRY ListEntry; PCHAR ExtraData; /* list of windows */ - FAST_MUTEX ClassWindowsListLock; LIST_ENTRY ClassWindowsListHead; } WNDCLASS_OBJECT, *PWNDCLASS_OBJECT; @@ -34,18 +33,6 @@ NTSTATUS FASTCALL CleanupClassImpl(VOID); -#define IntLockProcessClasses(W32Process) \ - ExAcquireFastMutex(&(W32Process)->ClassListLock) - -#define IntUnLockProcessClasses(W32Process) \ - ExReleaseFastMutex(&(W32Process)->ClassListLock) - -#define IntLockClassWindows(ClassObj) \ - ExAcquireFastMutex(&(ClassObj)->ClassWindowsListLock) - -#define IntUnLockClassWindows(ClassObj) \ - ExReleaseFastMutex(&(ClassObj)->ClassWindowsListLock) - #define ClassDereferenceObject(ClassObj) \ ObmDereferenceObject(ClassObj) _____ Modified: trunk/reactos/subsys/win32k/include/menu.h --- trunk/reactos/subsys/win32k/include/menu.h 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/include/menu.h 2005-09-05 22:39:29 UTC (rev 17684) @@ -33,7 +33,6 @@ { PEPROCESS Process; LIST_ENTRY ListEntry; - FAST_MUTEX MenuItemsLock; PMENU_ITEM MenuItemList; ROSMENUINFO MenuInfo; BOOL RtoL; @@ -42,18 +41,6 @@ PMENU_OBJECT FASTCALL IntGetMenuObject(HMENU hMenu); -#define IntLockMenuItems(MenuObj) \ - ExAcquireFastMutex(&(MenuObj)->MenuItemsLock) - -#define IntUnLockMenuItems(MenuObj) \ - ExReleaseFastMutex(&(MenuObj)->MenuItemsLock) - -#define IntLockProcessMenus(W32Process) \ - ExAcquireFastMutex(&(W32Process)->MenuListLock) - -#define IntUnLockProcessMenus(W32Process) \ - ExReleaseFastMutex(&(W32Process)->MenuListLock) - #define IntReleaseMenuObject(MenuObj) \ ObmDereferenceObject(MenuObj) _____ Modified: trunk/reactos/subsys/win32k/include/prop.h --- trunk/reactos/subsys/win32k/include/prop.h 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/include/prop.h 2005-09-05 22:39:29 UTC (rev 17684) @@ -14,11 +14,5 @@ PPROPERTY FASTCALL IntGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom); -#define IntLockWindowProperties(Window) \ - ExAcquireFastMutex(&Window->PropListLock) - -#define IntUnLockWindowProperties(Window) \ - ExReleaseFastMutex(&Window->PropListLock) - #endif /* _WIN32K_PROP_H */ _____ Modified: trunk/reactos/subsys/win32k/include/win32.h --- trunk/reactos/subsys/win32k/include/win32.h 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/include/win32.h 2005-09-05 22:39:29 UTC (rev 17684) @@ -6,7 +6,6 @@ typedef struct _W32THREAD { struct _USER_MESSAGE_QUEUE* MessageQueue; - FAST_MUTEX WindowListLock; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; struct _KBDTABLES* KeyboardLayout; @@ -21,9 +20,7 @@ typedef struct _W32PROCESS { - FAST_MUTEX ClassListLock; LIST_ENTRY ClassListHead; - FAST_MUTEX MenuListLock; LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock; LIST_ENTRY PrivateFontListHead; _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-05 22:39:29 UTC (rev 17684) @@ -67,8 +67,6 @@ FAST_MUTEX UpdateLock; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; - /* Lock for the list of child windows. */ - FAST_MUTEX RelativesLock; struct _WINDOW_OBJECT* FirstChild; struct _WINDOW_OBJECT* LastChild; struct _WINDOW_OBJECT* NextSibling; @@ -83,7 +81,6 @@ PDCE Dce; /* Property list head.*/ LIST_ENTRY PropListHead; - FAST_MUTEX PropListLock; ULONG PropListItems; /* Scrollbar info */ PWINDOW_SCROLLINFO Scroll; @@ -148,19 +145,7 @@ #define IntGetWndProcessId(WndObj) \ WndObj->OwnerThread->ThreadsProcess->UniqueProcessId -#define IntLockRelatives(WndObj) \ - ExAcquireFastMutex(&WndObj->RelativesLock) -#define IntUnLockRelatives(WndObj) \ - ExReleaseFastMutex(&WndObj->RelativesLock) - -#define IntLockThreadWindows(Thread) \ - ExAcquireFastMutex(&Thread->WindowListLock) - -#define IntUnLockThreadWindows(Thread) \ - ExReleaseFastMutex(&Thread->WindowListLock) - - PWINDOW_OBJECT FASTCALL IntGetProcessWindowObject(PW32THREAD Thread, HWND hWnd); _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -71,10 +71,8 @@ DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); InitializeListHead(&Win32Process->ClassListHead); - ExInitializeFastMutex(&Win32Process->ClassListLock); InitializeListHead(&Win32Process->MenuListHead); - ExInitializeFastMutex(&Win32Process->MenuListLock); InitializeListHead(&Win32Process->PrivateFontListHead); ExInitializeFastMutex(&Win32Process->PrivateFontListLock); @@ -217,7 +215,6 @@ Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); Win32Thread->MessagePumpHookValue = 0; InitializeListHead(&Win32Thread->WindowListHead); - ExInitializeFastMutex(&Win32Thread->WindowListLock); InitializeListHead(&Win32Thread->W32CallbackListHead); } else _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -57,7 +57,6 @@ PLIST_ENTRY CurrentEntry; PW32PROCESS Process = PsGetWin32Process(); - IntLockProcessClasses(Process); CurrentEntry = Process->ClassListHead.Flink; while (CurrentEntry != &Process->ClassListHead) { @@ -67,7 +66,6 @@ { *Class = Current; ObmReferenceObject(Current); - IntUnLockProcessClasses(Process); return TRUE; } @@ -76,7 +74,6 @@ CurrentEntry = CurrentEntry->Flink; } - IntUnLockProcessClasses(Process); if (BestMatch != NULL) { @@ -369,7 +366,6 @@ } InitializeListHead(&ClassObject->ClassWindowsListHead); - ExInitializeFastMutex(&ClassObject->ClassWindowsListLock); return(ClassObject); } @@ -463,9 +459,8 @@ DPRINT("Failed creating window class object\n"); RETURN((RTL_ATOM)0); } - IntLockProcessClasses(PsGetWin32Process()); + InsertTailList(&PsGetWin32Process()->ClassListHead, &ClassObject->ListEntry); - IntUnLockProcessClasses(PsGetWin32Process()); RETURN(Atom); @@ -734,16 +729,13 @@ RETURN( FALSE); } - IntLockClassWindows(Class); if (!IsListEmpty(&Class->ClassWindowsListHead)) { - IntUnLockClassWindows(Class); /* Dereference the ClassReferenceClassByNameOrAtom() call */ ObmDereferenceObject(Class); SetLastWin32Error(ERROR_CLASS_HAS_WINDOWS); RETURN( FALSE); } - IntUnLockClassWindows(Class); /* Dereference the ClassReferenceClassByNameOrAtom() call */ ClassDereferenceObject(Class); _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -126,19 +126,15 @@ { HWND Ret; PWINDOW_OBJECT Child, OwnerWnd; - IntLockRelatives(Root); for(Child = Root->FirstChild; Child; Child = Child->NextSibling) { - IntLockRelatives(Child); OwnerWnd = IntGetWindowObject(Child->Owner); - IntUnLockRelatives(Child); if(!OwnerWnd) continue; if(OwnerWnd == Owner) { - IntUnLockRelatives(Root); Ret = Child->Self; IntReleaseWindowObject(OwnerWnd); return Ret; @@ -146,7 +142,6 @@ IntReleaseWindowObject(OwnerWnd); } - IntUnLockRelatives(Root); return NULL; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -228,15 +228,11 @@ NTSTATUS Status; /* remove all menu items */ - IntLockMenuItems(MenuObject); IntDeleteMenuItems(MenuObject, bRecurse); /* do not destroy submenus */ - IntUnLockMenuItems(MenuObject); if(RemoveFromProcess) { - IntLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); RemoveEntryList(&MenuObject->ListEntry); - IntUnLockProcessMenus((PW32PROCESS)MenuObject->Process->Win32Process); } Status = ObReferenceObjectByHandle(MenuObject->Process->Win32WindowStation, @@ -292,12 +288,9 @@ MenuObject->MenuInfo.MenuItemCount = 0; MenuObject->MenuItemList = NULL; - ExInitializeFastMutex(&MenuObject->MenuItemsLock); /* Insert menu item into process menu handle list */ - IntLockProcessMenus(PsGetWin32Process()); InsertTailList(&PsGetWin32Process()->MenuListHead, &MenuObject->ListEntry); - IntUnLockProcessMenus(PsGetWin32Process()); return MenuObject; } @@ -311,9 +304,6 @@ if(!Source->MenuInfo.MenuItemCount) return FALSE; - IntLockMenuItems(Destination); - IntLockMenuItems(Source); - MenuItem = Source->MenuItemList; while(MenuItem) { @@ -364,8 +354,6 @@ MenuItem = MenuItem->Next; } - IntUnLockMenuItems(Source); - IntUnLockMenuItems(Destination); return TRUE; } @@ -403,12 +391,9 @@ MenuObject->MenuInfo.MenuItemCount = 0; MenuObject->MenuItemList = NULL; - ExInitializeFastMutex(&MenuObject->MenuItemsLock); /* Insert menu item into process menu handle list */ - IntLockProcessMenus(PsGetWin32Process()); InsertTailList(&PsGetWin32Process()->MenuListHead, &MenuObject->ListEntry); - IntUnLockProcessMenus(PsGetWin32Process()); IntCloneMenuItems(MenuObject, Source); @@ -1156,15 +1141,10 @@ if(!SubMenuObject || (SubMenuObject == MenuObject)) break; - IntLockMenuItems(SubMenuObject); - IntUnLockMenuItems(MenuObject); - (*gismc)++; sres = IntGetMenuDefaultItem(SubMenuObject, fByPos, gmdiFlags, gismc); (*gismc)--; - IntUnLockMenuItems(SubMenuObject); - IntLockMenuItems(MenuObject); IntReleaseMenuObject(SubMenuObject); if(sres > (UINT)-1) @@ -1253,18 +1233,14 @@ KeAttachProcess(&Process->Pcb); } - IntLockProcessMenus(Win32Process); while (Win32Process->MenuListHead.Flink != &(Win32Process->MenuListHead) && Win32Process->MenuListHead.Flink != LastHead) { LastHead = Win32Process->MenuListHead.Flink; MenuObject = CONTAINING_RECORD(Win32Process->MenuListHead.Flink, MENU_OBJECT, ListEntry); - IntUnLockProcessMenus(Win32Process); IntDestroyMenuObject(MenuObject, FALSE, TRUE); - IntLockProcessMenus(Win32Process); } - IntUnLockProcessMenus(Win32Process); if (CurrentProcess != Process) { @@ -1303,9 +1279,7 @@ if(Buffer) { - IntLockMenuItems(MenuObject); res = IntBuildMenuItemList(MenuObject, Buffer, nBufSize); - IntUnLockMenuItems(MenuObject); } else { @@ -1345,9 +1319,9 @@ SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); RETURN( (DWORD)-1); } - IntLockMenuItems(MenuObject); + res = IntCheckMenuItem(MenuObject, uIDCheckItem, uCheck); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); RETURN( res); @@ -1524,9 +1498,9 @@ SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); RETURN( res); } - IntLockMenuItems(MenuObject); + res = IntEnableMenuItem(MenuObject, uIDEnableItem, uEnable); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); RETURN( res); @@ -1578,9 +1552,8 @@ RETURN( FALSE); } - IntLockMenuItems(MenuObject); Res = IntInsertMenuItem(MenuObject, uItem, fByPosition, &ItemInfo); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); RETURN( Res); @@ -1627,9 +1600,9 @@ SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); RETURN( res); } - IntLockMenuItems(MenuObject); + res = IntGetMenuDefaultItem(MenuObject, fByPos, gmdiFlags, &gismc); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); RETURN(res); @@ -1769,9 +1742,7 @@ } if(WindowObject->IDMenu == (UINT)hmenu) { - IntLockMenuItems(MenuObject); res = IntHiliteMenuItem(WindowObject, MenuObject, uItemHilite, uHilite); - IntUnLockMenuItems(MenuObject); } IntReleaseMenuObject(MenuObject); IntReleaseWindowObject(WindowObject); @@ -1914,7 +1885,6 @@ Y -= WindowObject->WindowRect.top; IntReleaseWindowObject(WindowObject); - IntLockMenuItems(MenuObject); mi = MenuObject->MenuItemList; for (i = 0; NULL != mi; i++) { @@ -1924,7 +1894,6 @@ } mi = mi->Next; } - IntUnLockMenuItems(MenuObject); IntReleaseMenuObject(MenuObject); @@ -2145,9 +2114,9 @@ SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); return( FALSE); } - IntLockMenuItems(MenuObject); + res = IntSetMenuDefaultItem(MenuObject, uItem, fByPos); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); return( res); @@ -2176,9 +2145,9 @@ SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); RETURN( FALSE); } - IntLockMenuItems(MenuObject); + res = IntSetMenuDefaultItem(MenuObject, uItem, fByPos); - IntUnLockMenuItems(MenuObject); + IntReleaseMenuObject(MenuObject); RETURN( res); _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -559,7 +559,6 @@ return hWnd; } - IntLockRelatives(Window); for (Child = Window->FirstChild; Child; Child = Child->NextSibling) { if (IntIsWindowDirty(Child) && @@ -569,7 +568,6 @@ break; } } - IntUnLockRelatives(Window); if (hFoundWnd == NULL) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/prop.c --- trunk/reactos/subsys/win32k/ntuser/prop.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/prop.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -91,8 +91,6 @@ } /* copy list */ - IntLockWindowProperties(WindowObject); - li = (PROPLISTITEM *)Buffer; ListEntry = WindowObject->PropListHead.Flink; while((BufferSize >= sizeof(PROPLISTITEM)) && (ListEntry != &WindowObject->PropListHead)) @@ -104,7 +102,6 @@ Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); if(!NT_SUCCESS(Status)) { - IntUnLockWindowProperties(WindowObject); IntReleaseWindowObject(WindowObject); RETURN( Status); } @@ -115,13 +112,10 @@ ListEntry = ListEntry->Flink; } - IntUnLockWindowProperties(WindowObject); } else { - IntLockWindowProperties(WindowObject); Cnt = WindowObject->PropListItems * sizeof(PROPLISTITEM); - IntUnLockWindowProperties(WindowObject); } IntReleaseWindowObject(WindowObject); @@ -160,12 +154,10 @@ RETURN( NULL); } - IntLockWindowProperties(WindowObject); Prop = IntGetProp(WindowObject, Atom); if (Prop == NULL) { - IntUnLockWindowProperties(WindowObject); IntReleaseWindowObject(WindowObject); RETURN(NULL); } @@ -173,7 +165,6 @@ RemoveEntryList(&Prop->PropListEntry); ExFreePool(Prop); WindowObject->PropListItems--; - IntUnLockWindowProperties(WindowObject); IntReleaseWindowObject(WindowObject); RETURN(Data); @@ -200,13 +191,11 @@ RETURN( FALSE); } - IntLockWindowProperties(WindowObject); Prop = IntGetProp(WindowObject, Atom); if (Prop != NULL) { Data = Prop->Data; } - IntUnLockWindowProperties(WindowObject); IntReleaseWindowObject(WindowObject); RETURN(Data); @@ -256,9 +245,7 @@ RETURN( FALSE); } - IntLockWindowProperties(WindowObject); ret = IntSetProp(WindowObject, Atom, Data); - IntUnLockWindowProperties(WindowObject); IntReleaseWindowObject(WindowObject); RETURN( ret); _____ Modified: trunk/reactos/subsys/win32k/ntuser/vis.c --- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -92,7 +92,6 @@ if ((PreviousWindow->Style & WS_CLIPSIBLINGS) || (PreviousWindow == Window && ClipSiblings)) { - IntLockRelatives(CurrentWindow); CurrentSibling = CurrentWindow->FirstChild; while (CurrentSibling != NULL && CurrentSibling != PreviousWindow) { @@ -111,7 +110,6 @@ } CurrentSibling = CurrentSibling->NextSibling; } - IntUnLockRelatives(CurrentWindow); } PreviousWindow = CurrentWindow; @@ -121,7 +119,6 @@ if (ClipChildren) { - IntLockRelatives(Window); CurrentWindow = Window->FirstChild; while (CurrentWindow) { @@ -140,7 +137,6 @@ } CurrentWindow = CurrentWindow->NextSibling; } - IntUnLockRelatives(Window); } if(Window->WindowRegion && !(Window->Style & WS_MINIMIZE)) _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-05 22:20:04 UTC (rev 17683) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-09-05 22:39:29 UTC (rev 17684) @@ -135,16 +135,12 @@ if (Wnd->Style & WS_POPUP) { - IntLockRelatives(Wnd); hWnd = Wnd->Owner; - IntUnLockRelatives(Wnd); return IntGetWindowObject(hWnd); } else if (Wnd->Style & WS_CHILD) { - IntLockRelatives(Wnd); hWnd = Wnd->Parent; - IntUnLockRelatives(Wnd); return IntGetWindowObject(hWnd); } @@ -156,9 +152,7 @@ { HWND hWnd; - IntLockRelatives(Wnd); hWnd = Wnd->Owner; - IntUnLockRelatives(Wnd); return IntGetWindowObject(hWnd); } @@ -168,9 +162,7 @@ { HWND hParent; - IntLockRelatives(Wnd); hParent = Wnd->Parent; - IntUnLockRelatives(Wnd); return IntGetWindowObject(hParent); } @@ -191,8 +183,6 @@ HWND *List; UINT Index, NumChildren = 0; - IntLockRelatives(Window); - for (Child = Window->FirstChild; Child; Child = Child->NextSibling) ++NumChildren; @@ -200,7 +190,6 @@ if(!List) { DPRINT1("Failed to allocate memory for children array\n"); - IntUnLockRelatives(Window); SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -210,8 +199,6 @@ List[Index] = Child->Self; List[Index] = NULL; - IntUnLockRelatives(Window); - return List; } @@ -304,10 +291,8 @@ ASSERT(Window); - IntLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); if(Window->Status & WINDOWSTATUS_DESTROYING) { - IntUnLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); DPRINT("Tried to call IntDestroyWindow() twice\n"); return 0; } @@ -317,7 +302,6 @@ don't get into trouble when destroying the thread windows while we're still in IntDestroyWindow() */ RemoveEntryList(&Window->ThreadListEntry); - IntUnLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); @@ -368,10 +352,8 @@ MsqRemoveWindowMessagesFromQueue(Window); /* from now on no messages can be sent to this window anymore */ - IntLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); Window->Status |= WINDOWSTATUS_DESTROYED; /* don't remove the WINDOWSTATUS_DESTROYING bit */ - IntUnLockThreadWindows(Window->OwnerThread->Tcb.Win32Thread); /* reset shell window handles */ if(ThreadData->Desktop) @@ -429,9 +411,7 @@ IntDestroyScrollBars(Window); /* remove the window from the class object */ - IntLockClassWindows(Window->Class); RemoveEntryList(&Window->ClassListEntry); - IntUnLockClassWindows(Window->Class); /* dereference the class */ ClassDereferenceObject(Window->Class); @@ -577,7 +557,6 @@ Win32Thread = Thread->Tcb.Win32Thread; Win32Process = (PW32PROCESS)Thread->ThreadsProcess->Win32Process; - IntLockThreadWindows(Win32Thread); Current = Win32Thread->WindowListHead.Flink; while (Current != &(Win32Thread->WindowListHead)) { @@ -591,7 +570,6 @@ if(!List) { DPRINT("Not enough memory to allocate window handle list\n"); - IntUnLockThreadWindows(Win32Thread); return; } pWnd = List; @@ -603,7 +581,6 @@ pWnd++; Current = Current->Flink; } - IntUnLockThreadWindows(Win32Thread); *pWnd = NULL; for(pWnd = List; *pWnd; pWnd++) @@ -615,7 +592,6 @@ return; } - IntUnLockThreadWindows(Win32Thread); } @@ -861,7 +837,6 @@ { PWINDOW_OBJECT Parent; - IntLockRelatives(Wnd); Wnd->Parent = WndParent->Self; if ((Wnd->PrevSibling = WndPrevSibling)) { @@ -870,10 +845,8 @@ Wnd->NextSibling->PrevSibling = Wnd; else if ((Parent = IntGetWindowObject(Wnd->Parent))) { - IntLockRelatives(Parent); if(Parent->LastChild == WndPrevSibling) Parent->LastChild = Wnd; - IntUnLockRelatives(Parent); IntReleaseWindowObject(Parent); } Wnd->PrevSibling->NextSibling = Wnd; @@ -886,23 +859,18 @@ Wnd->NextSibling->PrevSibling = Wnd; else if (Parent) { - IntLockRelatives(Parent); Parent->LastChild = Wnd; Parent->FirstChild = Wnd; - IntUnLockRelatives(Parent); IntReleaseWindowObject(Parent); - IntUnLockRelatives(Wnd); return; } if(Parent) { - IntLockRelatives(Parent); Parent->FirstChild = Wnd; - IntUnLockRelatives(Parent); IntReleaseWindowObject(Parent); } } - IntUnLockRelatives(Wnd); + } HWND FASTCALL @@ -915,7 +883,6 @@ if(!Wnd) return NULL; - IntLockRelatives(Wnd); WndOldOwner = IntGetWindowObject(Wnd->Owner); if (WndOldOwner) { @@ -935,7 +902,6 @@ else Wnd->Owner = NULL; - IntUnLockRelatives(Wnd); IntReleaseWindowObject(Wnd); return ret; } @@ -978,14 +944,12 @@ if (0 == (Wnd->ExStyle & WS_EX_TOPMOST)) { /* Not a TOPMOST window, put after TOPMOSTs of new parent */ - IntLockRelatives(WndNewParent); Sibling = WndNewParent->FirstChild; while (NULL != Sibling && 0 != (Sibling->ExStyle & WS_EX_TOPMOST)) { InsertAfter = Sibling; Sibling = Sibling->NextSibling; } - IntUnLockRelatives(WndNewParent); } if (NULL == InsertAfter) { @@ -1074,10 +1038,9 @@ { PWINDOW_OBJECT WndParent; - IntLockRelatives(Wnd); if((WndParent = IntGetWindowObject(Wnd->Parent))) { - IntLockRelatives(WndParent); + } if (Wnd->NextSibling) Wnd->NextSibling->PrevSibling = Wnd->PrevSibling; @@ -1088,11 +1051,9 @@ if(WndParent) { - IntUnLockRelatives(WndParent); IntReleaseWindowObject(WndParent); } Wnd->PrevSibling = Wnd->NextSibling = Wnd->Parent = NULL; - IntUnLockRelatives(Wnd); } BOOL FASTCALL @@ -1106,7 +1067,6 @@ return FALSE; } - IntLockRelatives(Window); for(Child = Window->FirstChild; Child; Child = Child->NextSibling) { if(Child->Owner && Child->Style & WS_VISIBLE) @@ -1115,12 +1075,11 @@ * The desktop has a popup window if one of them has * an owner window and is visible */ - IntUnLockRelatives(Window); IntReleaseWindowObject(Window); return TRUE; } } - IntUnLockRelatives(Window); + IntReleaseWindowObject(Window); return FALSE; } @@ -1183,7 +1142,6 @@ return 0; } - IntLockRelatives(Window); for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) { if(dwCount++ < nBufSize && pWnd) @@ -1196,7 +1154,6 @@ } } } - IntUnLockRelatives(Window); IntReleaseWindowObject(Window); } @@ -1221,7 +1178,6 @@ return 0; } - IntLockThreadWindows(W32Thread); Current = W32Thread->WindowListHead.Flink; while(Current != &(W32Thread->WindowListHead)) { @@ -1240,7 +1196,6 @@ dwCount++; Current = Current->Flink; } - IntUnLockThreadWindows(W32Thread); ObDereferenceObject(Thread); } @@ -1275,7 +1230,6 @@ return 0; } - IntLockRelatives(Window); for(Child = Window->FirstChild; Child != NULL; Child = Child->NextSibling) { if(dwCount++ < nBufSize && pWnd) @@ -1288,7 +1242,6 @@ } } } - IntUnLockRelatives(Window); IntReleaseWindowObject(Window); if(hDesktop) @@ -1561,9 +1514,8 @@ * Fill out the structure describing it. */ WindowObject->Class = ClassObject; - IntLockClassWindows(ClassObject); + InsertTailList(&ClassObject->ClassWindowsListHead, &WindowObject->ClassListEntry); - IntUnLockClassWindows(ClassObject); WindowObject->ExStyle = dwExStyle; WindowObject->Style = dwStyle & ~WS_VISIBLE; @@ -1626,8 +1578,6 @@ } InitializeListHead(&WindowObject->PropListHead); - ExInitializeFastMutex(&WindowObject->PropListLock); - ExInitializeFastMutex(&WindowObject->RelativesLock); ExInitializeFastMutex(&WindowObject->UpdateLock); InitializeListHead(&WindowObject->WndObjListHead); ExInitializeFastMutex(&WindowObject->WndObjListLock); @@ -1690,10 +1640,8 @@ } /* Insert the window into the thread's window list. */ - IntLockThreadWindows(PsGetWin32Thread()); InsertTailList (&PsGetWin32Thread()->WindowListHead, &WindowObject->ThreadListEntry); - IntUnLockThreadWindows(PsGetWin32Thread()); /* Allocate a DCE for this window. */ if (dwStyle & CS_OWNDC) @@ -1899,10 +1847,8 @@ if ((dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) { PWINDOW_OBJECT PrevSibling; - IntLockRelatives(ParentWindow); if((PrevSibling = ParentWindow->LastChild)) IntReferenceWindowObject(PrevSibling); - IntUnLockRelatives(ParentWindow); /* link window as bottom sibling */ IntLinkWindow(WindowObject, ParentWindow, PrevSibling /*prev sibling*/); if(PrevSibling) @@ -1914,7 +1860,6 @@ PWINDOW_OBJECT InsertAfter, Sibling; if (0 == (dwExStyle & WS_EX_TOPMOST)) { - IntLockRelatives(ParentWindow); InsertAfter = NULL; Sibling = ParentWindow->FirstChild; while (NULL != Sibling && 0 != (Sibling->ExStyle & WS_EX_TOPMOST)) @@ -1922,7 +1867,6 @@ InsertAfter = Sibling; Sibling = Sibling->NextSibling; } - IntUnLockRelatives(ParentWindow); } else { @@ -2239,14 +2183,12 @@ Child = IntGetWindowObject(*ChildHandle); if (Child == NULL) continue; - IntLockRelatives(Child); if (Child->Owner != Window->Self) { - IntUnLockRelatives(Child); IntReleaseWindowObject(Child); continue; } - IntUnLockRelatives(Child); + if (IntWndBelongsToThread(Child, PsGetWin32Thread())) { co_UserDestroyWindow(Child); @@ -2254,12 +2196,12 @@ GotOne = TRUE; continue; } - IntLockRelatives(Child); + if (Child->Owner != NULL) { Child->Owner = NULL; } - IntUnLockRelatives(Child); + IntReleaseWindowObject(Child); } ExFreePool(Children); [truncated at 1000 lines; 129 more skipped]

19 years, 3 months

[gvg] 17683: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Robert Shearman <rob(a)codeweavers.com> - Don't free previous buffer in NdrGetBuffer. - Add stubs for NdrMapCommAndFaultStatus, conformant string marshaling and context handle functions. Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllCanUnloadNow, DllGetClassObject and Dll(Un)RegisterServer with the dll name so that the compiler can check the prototypes. Mike McCormack <mike(a)codeweavers.com> - Fix some gcc 4.0 warnings. Deleted: trunk/reactos/lib/rpcrt4/Makefile.in Modified: trunk/reactos/lib/rpcrt4/cpsf.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c Modified: trunk/reactos/lib/rpcrt4/rpc_epmap.c Modified: trunk/reactos/lib/rpcrt4/rpc_message.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Deleted: trunk/reactos/lib/rpcrt4/Makefile.in --- trunk/reactos/lib/rpcrt4/Makefile.in 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/Makefile.in 2005-09-05 22:20:04 UTC (rev 17683) @@ -1,30 +0,0 @@ -EXTRADEFS = -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = rpcrt4.dll -IMPORTLIB = librpcrt4.$(IMPLIBEXT) -IMPORTS = iphlpapi advapi32 kernel32 ntdll -EXTRALIBS = -luuid - -C_SRCS = \ - cproxy.c \ - cpsf.c \ - cstub.c \ - ndr_marshall.c \ - ndr_midl.c \ - ndr_ole.c \ - ndr_stubless.c \ - rpc_binding.c \ - rpc_epmap.c \ - rpc_message.c \ - rpc_server.c \ - rpcrt4_main.c \ - rpcss_np_client.c - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Modified: trunk/reactos/lib/rpcrt4/cpsf.c --- trunk/reactos/lib/rpcrt4/cpsf.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/cpsf.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -183,11 +183,11 @@ if (RegCreateKeyExA(HKEY_CLASSES_ROOT, keyname, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { if (name) - RegSetValueExA(key, NULL, 0, REG_SZ, name, strlen(name)); + RegSetValueExA(key, NULL, 0, REG_SZ, (LPBYTE)name, strlen(name)); if (RegCreateKeyExA(key, "ProxyStubClsid32", 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { snprintf(module, sizeof(module), "{%s}", clsid); - RegSetValueExA(subkey, NULL, 0, REG_SZ, module, strlen(module)); + RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); RegCloseKey(subkey); } RegCloseKey(key); @@ -205,7 +205,7 @@ KEY_WRITE, NULL, &key, NULL) == ERROR_SUCCESS) { if (RegCreateKeyExA(key, "InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &subkey, NULL) == ERROR_SUCCESS) { - RegSetValueExA(subkey, NULL, 0, REG_SZ, module, strlen(module)); + RegSetValueExA(subkey, NULL, 0, REG_SZ, (LPBYTE)module, strlen(module)); RegCloseKey(subkey); } RegCloseKey(key); _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -125,7 +125,8 @@ NdrComplexArrayMarshall, /* 0x22 */ NdrConformantStringMarshall, 0, 0, - NdrConformantStringMarshall, 0, 0, 0, 0, + NdrConformantStringMarshall, + NdrNonConformantStringMarshall, 0, 0, 0, /* 0x2a */ NdrEncapsulatedUnionMarshall, NdrNonEncapsulatedUnionMarshall, @@ -158,7 +159,8 @@ NdrComplexArrayUnmarshall, /* 0x22 */ NdrConformantStringUnmarshall, 0, 0, - NdrConformantStringUnmarshall, 0, 0, 0, 0, + NdrConformantStringUnmarshall, + NdrNonConformantStringUnmarshall, 0, 0, 0, /* 0x2a */ NdrEncapsulatedUnionUnmarshall, NdrNonEncapsulatedUnionUnmarshall, @@ -191,7 +193,8 @@ NdrComplexArrayBufferSize, /* 0x22 */ NdrConformantStringBufferSize, 0, 0, - NdrConformantStringBufferSize, 0, 0, 0, 0, + NdrConformantStringBufferSize, + NdrNonConformantStringBufferSize, 0, 0, 0, /* 0x2a */ NdrEncapsulatedUnionBufferSize, NdrNonEncapsulatedUnionBufferSize, @@ -220,7 +223,8 @@ NdrComplexArrayMemorySize, /* 0x22 */ NdrConformantStringMemorySize, 0, 0, - NdrConformantStringMemorySize, 0, 0, 0, 0, + NdrConformantStringMemorySize, + NdrNonConformantStringMemorySize, 0, 0, 0, /* 0x2a */ 0, 0, 0, 0, 0, /* 0x2f */ @@ -478,8 +482,8 @@ } else if (*pFormat == RPC_FC_C_CSTRING) { /* we need 12 octets for the [maxlen, offset, len] DWORDS, + 1 octet for '\0' */ - TRACE("string=%s\n", debugstr_a(pMemory)); - pStubMsg->BufferLength += strlen(pMemory) + 13 + BUFFER_PARANOIA; + TRACE("string=%s\n", debugstr_a((char*)pMemory)); + pStubMsg->BufferLength += strlen((char*)pMemory) + 13 + BUFFER_PARANOIA; } else if (*pFormat == RPC_FC_C_WSTRING) { /* we need 12 octets for the [maxlen, offset, len] DWORDS, + 2 octets for L'\0' */ @@ -582,7 +586,7 @@ pStubMsg->Buffer += len*esize; if (*pFormat == RPC_FC_C_CSTRING) { - TRACE("string=%s\n", debugstr_a(pMem)); + TRACE("string=%s\n", debugstr_a((char*)pMem)); } else if (*pFormat == RPC_FC_C_WSTRING) { TRACE("string=%s\n", debugstr_w((LPWSTR)pMem)); @@ -591,6 +595,49 @@ return NULL; /* FIXME: is this always right? */ } +/********************************************************************** * + * NdrNonConformantStringMarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrNonConformantStringUnmarshall [RPCRT4.@] + */ +unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + FIXME("stub\n"); + return NULL; +} + +/********************************************************************** * + * NdrNonConformantStringBufferSize [RPCRT4.@] + */ +void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); +} + +/********************************************************************** * + * NdrNonConformantStringMemorySize [RPCRT4.@] + */ +unsigned long WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("stub\n"); + return 0; +} + static inline void dump_pointer_attr(unsigned char attr) { if (attr & RPC_FC_P_ALLOCALLNODES) @@ -2659,8 +2706,56 @@ * NdrClientContextUnmarshall */ void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, - NDR_CCONTEXT * pContextHandle, - RPC_BINDING_HANDLE BindHandle) + NDR_CCONTEXT * pContextHandle, + RPC_BINDING_HANDLE BindHandle) { FIXME("(%p, %p, %p): stub\n", pStubMsg, pContextHandle, BindHandle); } + +void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_SCONTEXT ContextHandle, + NDR_RUNDOWN RundownRoutine ) +{ + FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); +} + +NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); + return NULL; +} + +void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char* pMemory, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p, %p): stub\n", pStubMsg, pMemory, pFormat); +} + +NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p): stub\n", pStubMsg, pFormat); + return NULL; +} + +void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, + NDR_SCONTEXT ContextHandle, + NDR_RUNDOWN RundownRoutine, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); +} + +NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + FIXME("(%p, %p): stub\n", pStubMsg, pFormat); + return NULL; +} + +RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) +{ + FIXME("(%p): stub\n", CContext); + return NULL; +} _____ Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c --- trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -292,3 +292,19 @@ /* FIXME: is this the right return value? */ return NULL; } + +/********************************************************************** ** + * NdrMapCommAndFaultStatus [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg, + unsigned long *pCommStatus, + unsigned long *pFaultStatus, + RPC_STATUS Status ) +{ + FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status); + + *pCommStatus = 0; + *pFaultStatus = 0; + + return RPC_S_OK; +} _____ Modified: trunk/reactos/lib/rpcrt4/rpc_epmap.c --- trunk/reactos/lib/rpcrt4/rpc_epmap.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/rpc_epmap.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -76,7 +76,7 @@ unsigned long c; RPC_STATUS rslt = RPC_S_OK; - TRACE("(%p,%p,%p,%s)\n", IfSpec, BindingVector, UuidVector, debugstr_a(Annotation)); + TRACE("(%p,%p,%p,%s)\n", IfSpec, BindingVector, UuidVector, debugstr_a((char*)Annotation)); TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); for (c=0; c<BindingVector->Count; c++) { RpcBinding* bind = (RpcBinding*)(BindingVector->BindingH[c]); _____ Modified: trunk/reactos/lib/rpcrt4/rpc_message.c --- trunk/reactos/lib/rpcrt4/rpc_message.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/rpc_message.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -483,19 +483,10 @@ */ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { - RpcBinding* bind = (RpcBinding*)pMsg->Handle; - TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); /* FIXME: pfnAllocate? */ - if (bind->server) { - /* it turns out that the original buffer data must still be available - * while the RPC server is marshalling a reply, so we should not deallocate - * it, we'll leave deallocating the original buffer to the RPC server */ - pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); - } else { - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); - pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); - } + pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); + TRACE("Buffer=%p\n", pMsg->Buffer); /* FIXME: which errors to return? */ return pMsg->Buffer ? S_OK : E_OUTOFMEMORY; _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-09-05 22:20:04 UTC (rev 17683) @@ -739,14 +739,14 @@ { RpcServerProtseq* ps; - TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a( Protseq ), MaxCalls, - debugstr_a( Endpoint ), SecurityDescriptor, + TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a( (char*)Protseq ), MaxCalls, + debugstr_a( (char*)Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); ps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerProtseq)); ps->MaxCalls = MaxCalls; - ps->Protseq = RPCRT4_strdupA(Protseq); - ps->Endpoint = RPCRT4_strdupA(Endpoint); + ps->Protseq = RPCRT4_strdupA((char*)Protseq); + ps->Endpoint = RPCRT4_strdupA((char*)Endpoint); return RPCRT4_use_protseq(ps); } @@ -776,7 +776,7 @@ */ RPC_STATUS WINAPI RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { - TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a(Protseq), MaxCalls, SecurityDescriptor); + TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor); } _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec --- trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-09-05 22:09:45 UTC (rev 17682) +++ trunk/reactos/lib/rpcrt4/rpcrt4.spec 2005-09-05 22:20:04 UTC (rev 17683) @@ -1,565 +1,565 @@ -@ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr) -@ stub CreateStubFromTypeInfo -@ stdcall CStdStubBuffer_AddRef(ptr) -@ stdcall CStdStubBuffer_Connect(ptr ptr) -@ stdcall CStdStubBuffer_CountRefs(ptr) -@ stdcall CStdStubBuffer_DebugServerQueryInterface(ptr ptr) -@ stdcall CStdStubBuffer_DebugServerRelease(ptr ptr) -@ stdcall CStdStubBuffer_Disconnect(ptr) -@ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) -@ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) -@ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stub CreateServerInterfaceFromStub # wxp -@ stdcall DceErrorInqTextA (long ptr) -@ stdcall DceErrorInqTextW (long ptr) -@ stdcall -private DllRegisterServer() RPCRT4_DllRegisterServer -@ stub GlobalMutexClearExternal -@ stub GlobalMutexRequestExternal -@ stdcall IUnknown_AddRef_Proxy(ptr) -@ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) -@ stdcall IUnknown_Release_Proxy(ptr) -@ stub I_RpcAbortAsyncCall -@ stub I_RpcAllocate -@ stub I_RpcAsyncAbortCall -@ stub I_RpcAsyncSendReceive # NT4 -@ stub I_RpcAsyncSetHandle -@ stub I_RpcBCacheAllocate -@ stub I_RpcBCacheFree -@ stub I_RpcBindingCopy -@ stub I_RpcBindingInqConnId -@ stub I_RpcBindingInqDynamicEndPoint -@ stub I_RpcBindingInqDynamicEndPointA -@ stub I_RpcBindingInqDynamicEndPointW -@ stub I_RpcBindingInqLocalClientPID # wxp -@ stub I_RpcBindingInqSecurityContext -@ stub I_RpcBindingInqTransportType -@ stub I_RpcBindingInqWireIdForSnego -@ stub I_RpcBindingIsClientLocal -# 9x version of I_RpcBindingSetAsync has 3 arguments, not 2 -@ stdcall I_RpcBindingSetAsync(ptr ptr) -@ stub I_RpcBindingToStaticStringBindingW -@ stub I_RpcClearMutex -@ stub I_RpcConnectionInqSockBuffSize2 -@ stub I_RpcConnectionInqSockBuffSize -@ stub I_RpcConnectionSetSockBuffSize -@ stub I_RpcDeleteMutex -@ stub I_RpcEnableWmiTrace # wxp -@ stub I_RpcExceptionFilter # wxp -@ stub I_RpcFree -@ stdcall I_RpcFreeBuffer(ptr) -@ stub I_RpcFreePipeBuffer -@ stub I_RpcGetAssociationContext -@ stdcall I_RpcGetBuffer(ptr) -@ stub I_RpcGetBufferWithObject -@ stub I_RpcGetCurrentCallHandle -@ stub I_RpcGetExtendedError -@ stub I_RpcGetServerContextList -@ stub I_RpcGetThreadEvent # win9x -@ stub I_RpcGetThreadWindowHandle # win9x -@ stub I_RpcIfInqTransferSyntaxes -@ stub I_RpcLaunchDatagramReceiveThread # win9x -@ stub I_RpcLogEvent -@ stub I_RpcMapWin32Status -@ stub I_RpcMonitorAssociation -@ stub I_RpcNegotiateTransferSyntax # wxp -@ stub I_RpcNsBindingSetEntryName -@ stub I_RpcNsBindingSetEntryNameA -@ stub I_RpcNsBindingSetEntryNameW -@ stub I_RpcNsInterfaceExported -@ stub I_RpcNsInterfaceUnexported -@ stub I_RpcParseSecurity -@ stub I_RpcPauseExecution -@ stub I_RpcProxyNewConnection # wxp -@ stub I_RpcReallocPipeBuffer -@ stdcall I_RpcReceive(ptr) -@ stub I_RpcRequestMutex -@ stdcall I_RpcSend(ptr) -@ stdcall I_RpcSendReceive(ptr) -@ stub I_RpcServerAllocateIpPort -@ stub I_RpcServerInqAddressChangeFn -@ stub I_RpcServerInqLocalConnAddress # wxp -@ stub I_RpcServerInqTransportType -@ stub I_RpcServerRegisterForwardFunction -@ stub I_RpcServerSetAddressChangeFn -@ stdcall I_RpcServerStartListening(ptr) # win9x -@ stdcall I_RpcServerStopListening() # win9x -@ stub I_RpcServerUnregisterEndpointA # win9x -@ stub I_RpcServerUnregisterEndpointW # win9x -@ stub I_RpcServerUseProtseq2A -@ stub I_RpcServerUseProtseq2W -@ stub I_RpcServerUseProtseqEp2A -@ stub I_RpcServerUseProtseqEp2W -@ stub I_RpcSetAssociationContext # win9x -@ stub I_RpcSetAsyncHandle -@ stub I_RpcSetServerContextList -@ stub I_RpcSetThreadParams # win9x -@ stub I_RpcSetWMsgEndpoint # NT4 -@ stub I_RpcSsDontSerializeContext -@ stub I_RpcStopMonitorAssociation -@ stub I_RpcSystemFunction001 # wxp (oh, brother!) -@ stub I_RpcTransCancelMigration # win9x -@ stub I_RpcTransClientMaxFrag # win9x -@ stub I_RpcTransClientReallocBuffer # win9x -@ stub I_RpcTransConnectionAllocatePacket -@ stub I_RpcTransConnectionFreePacket -@ stub I_RpcTransConnectionReallocPacket -@ stub I_RpcTransDatagramAllocate2 -@ stub I_RpcTransDatagramAllocate -@ stub I_RpcTransDatagramFree -@ stub I_RpcTransGetAddressList -@ stub I_RpcTransGetThreadEvent -@ stub I_RpcTransIoCancelled -@ stub I_RpcTransMaybeMakeReceiveAny # win9x -@ stub I_RpcTransMaybeMakeReceiveDirect # win9x -@ stub I_RpcTransPingServer # win9x -@ stub I_RpcTransServerFindConnection # win9x -@ stub I_RpcTransServerFreeBuffer # win9x -@ stub I_RpcTransServerMaxFrag # win9x -@ stub I_RpcTransServerNewConnection -@ stub I_RpcTransServerProtectThread # win9x -@ stub I_RpcTransServerReallocBuffer # win9x -@ stub I_RpcTransServerReceiveDirectReady # win9x -@ stub I_RpcTransServerUnprotectThread # win9x -@ stub I_RpcTurnOnEEInfoPropagation # wxp -@ stdcall I_RpcWindowProc(ptr long long long) # win9x -@ stub I_RpcltDebugSetPDUFilter -@ stub I_UuidCreate -@ stub MIDL_wchar_strcpy -@ stub MIDL_wchar_strlen -@ stub MesBufferHandleReset -@ stub MesDecodeBufferHandleCreate -@ stub MesDecodeIncrementalHandleCreate -@ stub MesEncodeDynBufferHandleCreate -@ stub MesEncodeFixedBufferHandleCreate -@ stub MesEncodeIncrementalHandleCreate -@ stub MesHandleFree -@ stub MesIncrementalHandleReset -@ stub MesInqProcEncodingId -@ stub MqGetContext # win9x -@ stub MqRegisterQueue # win9x -@ stub NDRCContextBinding -@ stub NDRCContextMarshall -@ stub NDRCContextUnmarshall -@ stub NDRSContextMarshall2 -@ stub NDRSContextMarshall -@ stub NDRSContextMarshallEx -@ stub NDRSContextUnmarshall2 -@ stub NDRSContextUnmarshall -@ stub NDRSContextUnmarshallEx -@ stub NDRcopy -@ stdcall NdrAllocate(ptr long) -@ stub NdrAsyncClientCall -@ stub NdrAsyncServerCall -@ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) -@ stdcall NdrByteCountPointerFree(ptr ptr ptr) -@ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) -@ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long) -@ stub NdrCStdStubBuffer2_Release -@ stdcall NdrCStdStubBuffer_Release(ptr ptr) -@ stdcall NdrClearOutParameters(ptr ptr ptr) -@ varargs NdrClientCall2(ptr ptr) -@ stub NdrClientCall -@ stdcall NdrClientContextMarshall(ptr ptr long) -@ stdcall NdrClientContextUnmarshall(ptr ptr ptr) -@ stub NdrClientInitialize -@ stdcall NdrClientInitializeNew(ptr ptr ptr long) -@ stdcall NdrComplexArrayBufferSize(ptr ptr ptr) -@ stdcall NdrComplexArrayFree(ptr ptr ptr) -@ stdcall NdrComplexArrayMarshall(ptr ptr ptr) -@ stdcall NdrComplexArrayMemorySize(ptr ptr) -@ stdcall NdrComplexArrayUnmarshall(ptr ptr ptr long) -@ stdcall NdrComplexStructBufferSize(ptr ptr ptr) -@ stdcall NdrComplexStructFree(ptr ptr ptr) -@ stdcall NdrComplexStructMarshall(ptr ptr ptr) -@ stdcall NdrComplexStructMemorySize(ptr ptr) -@ stdcall NdrComplexStructUnmarshall(ptr ptr ptr long) -@ stdcall NdrConformantArrayBufferSize(ptr ptr ptr) -@ stdcall NdrConformantArrayFree(ptr ptr ptr) -@ stdcall NdrConformantArrayMarshall(ptr ptr ptr) -@ stdcall NdrConformantArrayMemorySize(ptr ptr) -@ stdcall NdrConformantArrayUnmarshall(ptr ptr ptr long) -@ stdcall NdrConformantStringBufferSize(ptr ptr ptr) -@ stdcall NdrConformantStringMarshall(ptr ptr ptr) -@ stdcall NdrConformantStringMemorySize(ptr ptr) -@ stdcall NdrConformantStringUnmarshall(ptr ptr ptr long) -@ stdcall NdrConformantStructBufferSize(ptr ptr ptr) -@ stdcall NdrConformantStructFree(ptr ptr ptr) -@ stdcall NdrConformantStructMarshall(ptr ptr ptr) -@ stdcall NdrConformantStructMemorySize(ptr ptr) -@ stdcall NdrConformantStructUnmarshall(ptr ptr ptr long) -@ stdcall NdrConformantVaryingArrayBufferSize(ptr ptr ptr) -@ stdcall NdrConformantVaryingArrayFree(ptr ptr ptr) -@ stdcall NdrConformantVaryingArrayMarshall(ptr ptr ptr) -@ stdcall NdrConformantVaryingArrayMemorySize(ptr ptr) -@ stdcall NdrConformantVaryingArrayUnmarshall(ptr ptr ptr long) -@ stdcall NdrConformantVaryingStructBufferSize(ptr ptr ptr) -@ stdcall NdrConformantVaryingStructFree(ptr ptr ptr) -@ stdcall NdrConformantVaryingStructMarshall(ptr ptr ptr) -@ stdcall NdrConformantVaryingStructMemorySize(ptr ptr) -@ stdcall NdrConformantVaryingStructUnmarshall(ptr ptr ptr long) -@ stub NdrContextHandleInitialize -@ stub NdrContextHandleSize -@ stdcall NdrConvert2(ptr ptr long) -@ stdcall NdrConvert(ptr ptr) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass -@ stub NdrDcomAsyncClientCall -@ stub NdrDcomAsyncStubCall -@ stdcall NdrDllCanUnloadNow(ptr) -@ stdcall NdrDllGetClassObject(ptr ptr ptr ptr ptr ptr) -@ stdcall NdrDllRegisterProxy(long ptr ptr) -@ stdcall NdrDllUnregisterProxy(long ptr ptr) -@ stdcall NdrEncapsulatedUnionBufferSize(ptr ptr ptr) -@ stdcall NdrEncapsulatedUnionFree(ptr ptr ptr) -@ stdcall NdrEncapsulatedUnionMarshall(ptr ptr ptr) -@ stdcall NdrEncapsulatedUnionMemorySize(ptr ptr) -@ stdcall NdrEncapsulatedUnionUnmarshall(ptr ptr ptr long) -@ stdcall NdrFixedArrayBufferSize(ptr ptr ptr) -@ stdcall NdrFixedArrayFree(ptr ptr ptr) -@ stdcall NdrFixedArrayMarshall(ptr ptr ptr) -@ stdcall NdrFixedArrayMemorySize(ptr ptr) -@ stdcall NdrFixedArrayUnmarshall(ptr ptr ptr long) -@ stdcall NdrFreeBuffer(ptr) -@ stub NdrFullPointerFree -@ stub NdrFullPointerInsertRefId -@ stub NdrFullPointerQueryPointer -@ stub NdrFullPointerQueryRefId -@ stub NdrFullPointerXlatFree -@ stub NdrFullPointerXlatInit -@ stdcall NdrGetBuffer(ptr long ptr) -@ stub NdrGetDcomProtocolVersion -@ stub NdrGetPartialBuffer -@ stub NdrGetPipeBuffer -@ stub NdrGetSimpleTypeBufferAlignment # wxp -@ stub NdrGetSimpleTypeBufferSize # wxp -@ stub NdrGetSimpleTypeMemorySize # wxp -@ stub NdrGetTypeFlags # wxp -@ stub NdrGetUserMarshallInfo -@ stub NdrHardStructBufferSize #(ptr ptr ptr) -@ stub NdrHardStructFree #(ptr ptr ptr) -@ stub NdrHardStructMarshall #(ptr ptr ptr) -@ stub NdrHardStructMemorySize #(ptr ptr) -@ stub NdrHardStructUnmarshall #(ptr ptr ptr long) -@ stdcall NdrInterfacePointerBufferSize(ptr ptr ptr) -@ stdcall NdrInterfacePointerFree(ptr ptr ptr) -@ stdcall NdrInterfacePointerMarshall(ptr ptr ptr) -@ stdcall NdrInterfacePointerMemorySize(ptr ptr) -@ stdcall NdrInterfacePointerUnmarshall(ptr ptr ptr long) -@ stub NdrIsAppDoneWithPipes -@ stub NdrMapCommAndFaultStatus -@ stub NdrMarkNextActivePipe -@ stub NdrMesProcEncodeDecode2 -@ stub NdrMesProcEncodeDecode -@ stub NdrMesSimpleTypeAlignSize -@ stub NdrMesSimpleTypeDecode -@ stub NdrMesSimpleTypeEncode -@ stub NdrMesTypeAlignSize2 -@ stub NdrMesTypeAlignSize -@ stub NdrMesTypeDecode2 -@ stub NdrMesTypeDecode -@ stub NdrMesTypeEncode2 -@ stub NdrMesTypeEncode -@ stub NdrMesTypeFree2 -@ stub NdrNonConformantStringBufferSize #(ptr ptr ptr) -@ stub NdrNonConformantStringMarshall #(ptr ptr ptr) -@ stub NdrNonConformantStringMemorySize #(ptr ptr) -@ stub NdrNonConformantStringUnmarshall #(ptr ptr ptr long) -@ stdcall NdrNonEncapsulatedUnionBufferSize(ptr ptr ptr) -@ stdcall NdrNonEncapsulatedUnionFree(ptr ptr ptr) -@ stdcall NdrNonEncapsulatedUnionMarshall(ptr ptr ptr) -@ stdcall NdrNonEncapsulatedUnionMemorySize(ptr ptr) -@ stdcall NdrNonEncapsulatedUnionUnmarshall(ptr ptr ptr long) -@ stub NdrNsGetBuffer -@ stub NdrNsSendReceive -@ stdcall NdrOleAllocate(long) -@ stdcall NdrOleFree(ptr) -@ stub NdrOutInit # wxp -@ stub NdrPartialIgnoreClientBufferSize # wxp -@ stub NdrPartialIgnoreClientMarshall # wxp -@ stub NdrPartialIgnoreServerInitialize # wxp -@ stub NdrPartialIgnoreServerUnmarshall # wxp -@ stub NdrPipePull -@ stub NdrPipePush -@ stub NdrPipeSendReceive -@ stub NdrPipesDone -@ stub NdrPipesInitialize -@ stdcall NdrPointerBufferSize(ptr ptr ptr) -@ stdcall NdrPointerFree(ptr ptr ptr) -@ stdcall NdrPointerMarshall(ptr ptr ptr) -@ stdcall NdrPointerMemorySize(ptr ptr) -@ stdcall NdrPointerUnmarshall(ptr ptr ptr long) -@ stdcall NdrProxyErrorHandler(long) -@ stdcall NdrProxyFreeBuffer(ptr ptr) -@ stdcall NdrProxyGetBuffer(ptr ptr) -@ stdcall NdrProxyInitialize(ptr ptr ptr ptr long) -@ stdcall NdrProxySendReceive(ptr ptr) -@ stub NdrRangeUnmarshall -@ stub NdrRpcSmClientAllocate -@ stub NdrRpcSmClientFree -@ stub NdrRpcSmSetClientToOsf -@ stub NdrRpcSsDefaultAllocate -@ stub NdrRpcSsDefaultFree -@ stub NdrRpcSsDisableAllocate -@ stub NdrRpcSsEnableAllocate -@ stdcall NdrSendReceive(ptr ptr) -@ stub NdrServerCall2 -@ stub NdrServerCall -@ stub NdrServerContextMarshall -@ stub NdrServerContextNewMarshall # wxp -@ stub NdrServerContextNewUnmarshall # wxp -@ stub NdrServerContextUnmarshall -@ stub NdrServerInitialize -@ stub NdrServerInitializeMarshall -@ stdcall NdrServerInitializeNew(ptr ptr ptr) -@ stub NdrServerInitializePartial # wxp -@ stub NdrServerInitializeUnmarshall -@ stub NdrServerMarshall -@ stub NdrServerUnmarshall -@ stdcall NdrSimpleStructBufferSize(ptr ptr ptr) -@ stdcall NdrSimpleStructFree(ptr ptr ptr) -@ stdcall NdrSimpleStructMarshall(ptr ptr ptr) -@ stdcall NdrSimpleStructMemorySize(ptr ptr) -@ stdcall NdrSimpleStructUnmarshall(ptr ptr ptr long) -@ stdcall NdrSimpleTypeMarshall(ptr ptr long) -@ stdcall NdrSimpleTypeUnmarshall(ptr ptr long) -@ stub NdrStubCall2 -@ stub NdrStubCall -@ stub NdrStubForwardingFunction -@ stdcall NdrStubGetBuffer(ptr ptr ptr) -@ stdcall NdrStubInitialize(ptr ptr ptr ptr) -@ stub NdrStubInitializeMarshall -@ stub NdrTypeFlags # wxp -@ stub NdrTypeFree # wxp -@ stub NdrTypeMarshall # wxp -@ stub NdrTypeSize # wxp -@ stub NdrTypeUnmarshall # wxp -@ stub NdrUnmarshallBasetypeInline # wxp -@ stdcall NdrUserMarshalBufferSize(ptr ptr ptr) -@ stdcall NdrUserMarshalFree(ptr ptr ptr) -@ stdcall NdrUserMarshalMarshall(ptr ptr ptr) -@ stdcall NdrUserMarshalMemorySize(ptr ptr) -@ stub NdrUserMarshalSimpleTypeConvert -@ stdcall NdrUserMarshalUnmarshall(ptr ptr ptr long) -@ stdcall NdrVaryingArrayBufferSize(ptr ptr ptr) -@ stdcall NdrVaryingArrayFree(ptr ptr ptr) -@ stdcall NdrVaryingArrayMarshall(ptr ptr ptr) -@ stdcall NdrVaryingArrayMemorySize(ptr ptr) -@ stdcall NdrVaryingArrayUnmarshall(ptr ptr ptr long) -@ stdcall NdrXmitOrRepAsBufferSize(ptr ptr ptr) -@ stdcall NdrXmitOrRepAsFree(ptr ptr ptr) -@ stdcall NdrXmitOrRepAsMarshall(ptr ptr ptr) -@ stdcall NdrXmitOrRepAsMemorySize(ptr ptr) -@ stdcall NdrXmitOrRepAsUnmarshall(ptr ptr ptr long) -@ stub NdrpCreateProxy # wxp -@ stub NdrpCreateStub # wxp -@ stub NdrpGetProcFormatString # wxp -@ stub NdrpGetTypeFormatString # wxp -@ stub NdrpGetTypeGenCookie # wxp -@ stub NdrpMemoryIncrement # wxp -@ stub NdrpReleaseTypeFormatString # wxp -@ stub NdrpReleaseTypeGenCookie # wxp -@ stub NdrpSetRpcSsDefaults -@ stub NdrpVarVtOfTypeDesc # wxp -@ stub PerformRpcInitialization -@ stub RpcAbortAsyncCall -@ stub RpcAsyncAbortCall -@ stub RpcAsyncCancelCall -@ stub RpcAsyncCompleteCall -@ stub RpcAsyncGetCallStatus -@ stub RpcAsyncInitializeHandle -@ stub RpcAsyncRegisterInfo -@ stub RpcBindingCopy -@ stdcall RpcBindingFree(ptr) -@ stdcall RpcBindingFromStringBindingA(str ptr) -@ stdcall RpcBindingFromStringBindingW(wstr ptr) -@ stub RpcBindingInqAuthClientA -@ stub RpcBindingInqAuthClientExA -@ stub RpcBindingInqAuthClientExW -@ stub RpcBindingInqAuthClientW -@ stub RpcBindingInqAuthInfoA -@ stub RpcBindingInqAuthInfoExA -@ stub RpcBindingInqAuthInfoExW -@ stub RpcBindingInqAuthInfoW -@ stdcall RpcBindingInqObject(ptr ptr) -@ stub RpcBindingInqOption -@ stub RpcBindingReset -@ stub RpcBindingServerFromClient -@ stub RpcBindingSetAuthInfoA -@ stub RpcBindingSetAuthInfoExA -@ stub RpcBindingSetAuthInfoExW -@ stub RpcBindingSetAuthInfoW -@ stdcall RpcBindingSetObject(ptr ptr) -@ stub RpcBindingSetOption -@ stdcall RpcBindingToStringBindingA(ptr ptr) -@ stdcall RpcBindingToStringBindingW(ptr ptr) -@ stdcall RpcBindingVectorFree(ptr) -@ stub RpcCancelAsyncCall -@ stub RpcCancelThread -@ stub RpcCancelThreadEx -@ stub RpcCertGeneratePrincipalNameA -@ stub RpcCertGeneratePrincipalNameW -@ stub RpcCompleteAsyncCall -@ stdcall RpcEpRegisterA(ptr ptr ptr str) -@ stub RpcEpRegisterNoReplaceA -@ stub RpcEpRegisterNoReplaceW -@ stub RpcEpRegisterW -@ stdcall RpcEpResolveBinding(ptr ptr) -@ stdcall RpcEpUnregister(ptr ptr ptr) -@ stub RpcErrorAddRecord # wxp -@ stub RpcErrorClearInformation # wxp -@ stub RpcErrorEndEnumeration # wxp -@ stub RpcErrorGetNextRecord # wxp -@ stub RpcErrorLoadErrorInfo # wxp -@ stub RpcErrorNumberOfRecords # wxp -@ stub RpcErrorResetEnumeration # wxp -@ stub RpcErrorSaveErrorInfo # wxp -@ stub RpcErrorStartEnumeration # wxp -@ stub RpcFreeAuthorizationContext # wxp -@ stub RpcGetAsyncCallStatus -@ stub RpcIfIdVectorFree -@ stub RpcIfInqId -@ stdcall RpcImpersonateClient(ptr) -@ stub RpcInitializeAsyncHandle -@ stub RpcMgmtBindingInqParameter # win9x -@ stub RpcMgmtBindingSetParameter # win9x -@ stub RpcMgmtEnableIdleCleanup -@ stub RpcMgmtEpEltInqBegin -@ stub RpcMgmtEpEltInqDone -@ stub RpcMgmtEpEltInqNextA -@ stub RpcMgmtEpEltInqNextW -@ stub RpcMgmtEpUnregister -@ stub RpcMgmtInqComTimeout -@ stub RpcMgmtInqDefaultProtectLevel -@ stub RpcMgmtInqIfIds -@ stub RpcMgmtInqParameter # win9x -@ stub RpcMgmtInqServerPrincNameA -@ stub RpcMgmtInqServerPrincNameW -@ stub RpcMgmtInqStats -@ stub RpcMgmtIsServerListening -@ stub RpcMgmtSetAuthorizationFn -@ stub RpcMgmtSetCancelTimeout -@ stub RpcMgmtSetComTimeout -@ stub RpcMgmtSetParameter # win9x -@ stub RpcMgmtSetServerStackSize -@ stub RpcMgmtStatsVectorFree -@ stdcall RpcMgmtStopServerListening(ptr) -@ stdcall RpcMgmtWaitServerListen() -@ stub RpcNetworkInqProtseqsA -@ stub RpcNetworkInqProtseqsW -@ stdcall RpcNetworkIsProtseqValidA(ptr) -@ stdcall RpcNetworkIsProtseqValidW(ptr) -@ stub RpcNsBindingInqEntryNameA -@ stub RpcNsBindingInqEntryNameW -@ stub RpcObjectInqType -@ stub RpcObjectSetInqFn -@ stdcall RpcObjectSetType(ptr ptr) -@ stub RpcProtseqVectorFreeA -@ stub RpcProtseqVectorFreeW -@ stdcall RpcRaiseException(long) -@ stub RpcRegisterAsyncInfo -@ stub RpcRevertToSelf -@ stdcall RpcRevertToSelfEx(ptr) -@ stdcall RpcServerInqBindings(ptr) -@ stub RpcServerInqCallAttributesA # wxp -@ stub RpcServerInqCallAttributesW # wxp -@ stub RpcServerInqDefaultPrincNameA -@ stub RpcServerInqDefaultPrincNameW -@ stub RpcServerInqIf -@ stdcall RpcServerListen(long long long) -@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) -@ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) -@ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) -@ stdcall RpcServerRegisterIf(ptr ptr ptr) -@ stdcall RpcServerRegisterIfEx(ptr ptr ptr long long ptr) -@ stub RpcServerTestCancel -@ stdcall RpcServerUnregisterIf(ptr ptr long) -@ stdcall RpcServerUnregisterIfEx(ptr ptr long) -@ stub RpcServerUseAllProtseqs -@ stub RpcServerUseAllProtseqsEx -@ stub RpcServerUseAllProtseqsIf -@ stub RpcServerUseAllProtseqsIfEx -@ stdcall RpcServerUseProtseqA(str long ptr) -@ stdcall RpcServerUseProtseqEpA(str long str ptr) -@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) -@ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr) -@ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) -@ stub RpcServerUseProtseqExA -@ stub RpcServerUseProtseqExW -@ stub RpcServerUseProtseqIfA -@ stub RpcServerUseProtseqIfExA -@ stub RpcServerUseProtseqIfExW -@ stub RpcServerUseProtseqIfW -@ stdcall RpcServerUseProtseqW(wstr long ptr) -@ stub RpcServerYield -@ stub RpcSmAllocate -@ stub RpcSmClientFree -@ stub RpcSmDestroyClientContext -@ stub RpcSmDisableAllocate -@ stub RpcSmEnableAllocate -@ stub RpcSmFree -@ stub RpcSmGetThreadHandle -@ stub RpcSmSetClientAllocFree -@ stub RpcSmSetThreadHandle -@ stub RpcSmSwapClientAllocFree -@ stub RpcSsAllocate -@ stub RpcSsContextLockExclusive # wxp -@ stub RpcSsContextLockShared # wxp -@ stub RpcSsDestroyClientContext -@ stub RpcSsDisableAllocate -@ stub RpcSsDontSerializeContext -@ stub RpcSsEnableAllocate -@ stub RpcSsFree -@ stub RpcSsGetContextBinding -@ stub RpcSsGetThreadHandle -@ stub RpcSsSetClientAllocFree -@ stub RpcSsSetThreadHandle -@ stub RpcSsSwapClientAllocFree -@ stdcall RpcStringBindingComposeA(str str str str str ptr) -@ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr) -@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) -@ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr) -@ stdcall RpcStringFreeA(ptr) -@ stdcall RpcStringFreeW(ptr) -@ stub RpcTestCancel -@ stub RpcUserFree # wxp -@ stub SimpleTypeAlignment # wxp -@ stub SimpleTypeBufferSize # wxp -@ stub SimpleTypeMemorySize # wxp -@ stub StartServiceIfNecessary # win9x -@ stub TowerConstruct -@ stub TowerExplode -@ stdcall UuidCompare(ptr ptr ptr) -@ stdcall UuidCreate(ptr) -@ stdcall UuidCreateNil(ptr) -@ stdcall UuidCreateSequential(ptr) # win 2000 -@ stdcall UuidEqual(ptr ptr ptr) -@ stdcall UuidFromStringA(str ptr) -@ stdcall UuidFromStringW(wstr ptr) -@ stdcall UuidHash(ptr ptr) -@ stdcall UuidIsNil(ptr ptr) -@ stdcall UuidToStringA(ptr ptr) -@ stdcall UuidToStringW(ptr ptr) -@ stub char_array_from_ndr -@ stub char_from_ndr -@ stub data_from_ndr -@ stub data_into_ndr -@ stub data_size_ndr -@ stub double_array_from_ndr -@ stub double_from_ndr -@ stub enum_from_ndr -@ stub float_array_from_ndr -@ stub float_from_ndr -@ stub long_array_from_ndr -@ stub long_from_ndr -@ stub long_from_ndr_temp -@ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp -@ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp -@ stub short_array_from_ndr -@ stub short_from_ndr -@ stub short_from_ndr_temp -@ stub tree_into_ndr -@ stub tree_peek_ndr -@ stub tree_size_ndr +@ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr) +@ stub CreateStubFromTypeInfo +@ stdcall CStdStubBuffer_AddRef(ptr) +@ stdcall CStdStubBuffer_Connect(ptr ptr) +@ stdcall CStdStubBuffer_CountRefs(ptr) +@ stdcall CStdStubBuffer_DebugServerQueryInterface(ptr ptr) +@ stdcall CStdStubBuffer_DebugServerRelease(ptr ptr) +@ stdcall CStdStubBuffer_Disconnect(ptr) +@ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) +@ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) +@ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) +@ stub CreateServerInterfaceFromStub # wxp +@ stdcall DceErrorInqTextA (long ptr) +@ stdcall DceErrorInqTextW (long ptr) +@ stdcall -private DllRegisterServer() +@ stub GlobalMutexClearExternal +@ stub GlobalMutexRequestExternal +@ stdcall IUnknown_AddRef_Proxy(ptr) +@ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) +@ stdcall IUnknown_Release_Proxy(ptr) +@ stub I_RpcAbortAsyncCall +@ stub I_RpcAllocate +@ stub I_RpcAsyncAbortCall +@ stub I_RpcAsyncSendReceive # NT4 +@ stub I_RpcAsyncSetHandle +@ stub I_RpcBCacheAllocate +@ stub I_RpcBCacheFree +@ stub I_RpcBindingCopy +@ stub I_RpcBindingInqConnId +@ stub I_RpcBindingInqDynamicEndPoint +@ stub I_RpcBindingInqDynamicEndPointA +@ stub I_RpcBindingInqDynamicEndPointW +@ stub I_RpcBindingInqLocalClientPID # wxp +@ stub I_RpcBindingInqSecurityContext +@ stub I_RpcBindingInqTransportType +@ stub I_RpcBindingInqWireIdForSnego +@ stub I_RpcBindingIsClientLocal +# 9x version of I_RpcBindingSetAsync has 3 arguments, not 2 +@ stdcall I_RpcBindingSetAsync(ptr ptr) +@ stub I_RpcBindingToStaticStringBindingW +@ stub I_RpcClearMutex +@ stub I_RpcConnectionInqSockBuffSize2 +@ stub I_RpcConnectionInqSockBuffSize +@ stub I_RpcConnectionSetSockBuffSize +@ stub I_RpcDeleteMutex +@ stub I_RpcEnableWmiTrace # wxp +@ stub I_RpcExceptionFilter # wxp +@ stub I_RpcFree +@ stdcall I_RpcFreeBuffer(ptr) +@ stub I_RpcFreePipeBuffer +@ stub I_RpcGetAssociationContext +@ stdcall I_RpcGetBuffer(ptr) +@ stub I_RpcGetBufferWithObject +@ stub I_RpcGetCurrentCallHandle +@ stub I_RpcGetExtendedError +@ stub I_RpcGetServerContextList +@ stub I_RpcGetThreadEvent # win9x +@ stub I_RpcGetThreadWindowHandle # win9x +@ stub I_RpcIfInqTransferSyntaxes +@ stub I_RpcLaunchDatagramReceiveThread # win9x +@ stub I_RpcLogEvent +@ stub I_RpcMapWin32Status +@ stub I_RpcMonitorAssociation +@ stub I_RpcNegotiateTransferSyntax # wxp +@ stub I_RpcNsBindingSetEntryName +@ stub I_RpcNsBindingSetEntryNameA +@ stub I_RpcNsBindingSetEntryNameW +@ stub I_RpcNsInterfaceExported +@ stub I_RpcNsInterfaceUnexported +@ stub I_RpcParseSecurity +@ stub I_RpcPauseExecution +@ stub I_RpcProxyNewConnection # wxp +@ stub I_RpcReallocPipeBuffer +@ stdcall I_RpcReceive(ptr) +@ stub I_RpcRequestMutex +@ stdcall I_RpcSend(ptr) +@ stdcall I_RpcSendReceive(ptr) +@ stub I_RpcServerAllocateIpPort +@ stub I_RpcServerInqAddressChangeFn +@ stub I_RpcServerInqLocalConnAddress # wxp +@ stub I_RpcServerInqTransportType +@ stub I_RpcServerRegisterForwardFunction +@ stub I_RpcServerSetAddressChangeFn +@ stdcall I_RpcServerStartListening(ptr) # win9x +@ stdcall I_RpcServerStopListening() # win9x +@ stub I_RpcServerUnregisterEndpointA # win9x +@ stub I_RpcServerUnregisterEndpointW # win9x +@ stub I_RpcServerUseProtseq2A +@ stub I_RpcServerUseProtseq2W +@ stub I_RpcServerUseProtseqEp2A +@ stub I_RpcServerUseProtseqEp2W +@ stub I_RpcSetAssociationContext # win9x +@ stub I_RpcSetAsyncHandle +@ stub I_RpcSetServerContextList +@ stub I_RpcSetThreadParams # win9x +@ stub I_RpcSetWMsgEndpoint # NT4 +@ stub I_RpcSsDontSerializeContext +@ stub I_RpcStopMonitorAssociation +@ stub I_RpcSystemFunction001 # wxp (oh, brother!) +@ stub I_RpcTransCancelMigration # win9x [truncated at 1000 lines; 517 more skipped]

19 years, 3 months

[gvg] 17682: Sync to Wine-20050830:

by gvg＠svn.reactos.com

Sync to Wine-20050830: Alexandre Julliard <julliard(a)winehq.org> - Don't prefix the functions DllInstall and DllGetVersion with the dll name so that the compiler can check the prototypes. - riched32 doesn't need an import library. Deleted: trunk/reactos/lib/richedit/Makefile.in Modified: trunk/reactos/lib/richedit/riched32.spec Modified: trunk/reactos/lib/richedit/richedit.c _____ Deleted: trunk/reactos/lib/richedit/Makefile.in --- trunk/reactos/lib/richedit/Makefile.in 2005-09-05 22:07:52 UTC (rev 17681) +++ trunk/reactos/lib/richedit/Makefile.in 2005-09-05 22:09:45 UTC (rev 17682) @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = riched32.dll -IMPORTLIB = libriched32.$(IMPLIBEXT) -IMPORTS = riched20 user32 kernel32 - -C_SRCS = \ - richedit.c - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Modified: trunk/reactos/lib/richedit/riched32.spec --- trunk/reactos/lib/richedit/riched32.spec 2005-09-05 22:07:52 UTC (rev 17681) +++ trunk/reactos/lib/richedit/riched32.spec 2005-09-05 22:09:45 UTC (rev 17682) @@ -1 +1 @@ -2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion +2 stdcall -private DllGetVersion (ptr) Property changes on: trunk/reactos/lib/richedit/riched32.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/richedit/richedit.c --- trunk/reactos/lib/richedit/richedit.c 2005-09-05 22:07:52 UTC (rev 17681) +++ trunk/reactos/lib/richedit/richedit.c 2005-09-05 22:09:45 UTC (rev 17682) @@ -90,7 +90,7 @@ * * Retrieves version information */ -HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi) +HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) { TRACE("\n");

19 years, 3 months

← Newer
1
...
47
48
49
50
51
52
53
...
59
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 September 2005