Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 6 05:07:03 2012 New Revision: 57048 URL: http://svn.reactos.org/svn/reactos?rev=57048&view=rev Log: [NtUser] - Fix note. Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Aug 6 05:07:03 2012 @@ -430,7 +430,7 @@ return FALSE; /* MSDN Note: - Keyboard and mouse events received by both threads are processed by the thread specifie + Keyboard and mouse events received by both threads are processed by the thread specifieby the idAttachTo. */ /* If Attach set, allocate and link. */

12 years, 4 months

[jimtabor] 57047: [NtUser] - Fix empty list error and add a note.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 6 05:04:15 2012 New Revision: 57047 URL: http://svn.reactos.org/svn/reactos?rev=57047&view=rev Log: [NtUser] - Fix empty list error and add a note. Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Aug 6 05:04:15 2012 @@ -429,6 +429,10 @@ ptiFrom->rpdesk != ptiTo->rpdesk) return FALSE; + /* MSDN Note: + Keyboard and mouse events received by both threads are processed by the thread specifie + */ + /* If Attach set, allocate and link. */ if (fAttach) { @@ -475,6 +479,7 @@ if (!pai) return FALSE; if (paiprev) paiprev->paiNext = pai->paiNext; + else if (!pai->paiNext) gpai = NULL; ExFreePoolWithTag(pai, USERTAG_ATTACHINFO); ERR("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo);

12 years, 4 months

[jimtabor] 57046: [NtUser] - Stop spurious window handle errors.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 6 03:25:29 2012 New Revision: 57046 URL: http://svn.reactos.org/svn/reactos?rev=57046&view=rev Log: [NtUser] - Stop spurious window handle errors. Modified: trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Mon Aug 6 03:25:29 2012 @@ -619,12 +619,12 @@ TIMERPROC lpTimerFunc ) { - PWND Window; + PWND Window = NULL; DECLARE_RETURN(UINT_PTR); TRACE("Enter NtUserSetTimer\n"); UserEnterExclusive(); - Window = UserGetWindowObject(hWnd); + if (hWnd) Window = UserGetWindowObject(hWnd); UserLeave(); RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); @@ -644,12 +644,12 @@ UINT_PTR uIDEvent ) { - PWND Window; + PWND Window = NULL; DECLARE_RETURN(BOOL); TRACE("Enter NtUserKillTimer\n"); UserEnterExclusive(); - Window = UserGetWindowObject(hWnd); + if (hWnd) Window = UserGetWindowObject(hWnd); UserLeave(); RETURN(IntKillTimer(Window, uIDEvent, FALSE));

12 years, 4 months

[jimtabor] 57045: [NtUser] - Fixed crash, see bug 7226. - AttachThreadInput is new to ReactOS, it passes the wine tests, help is needed, white papers are welcome.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 6 03:13:27 2012 New Revision: 57045 URL: http://svn.reactos.org/svn/reactos?rev=57045&view=rev Log: [NtUser] - Fixed crash, see bug 7226. - AttachThreadInput is new to ReactOS, it passes the wine tests, help is needed, white papers are welcome. Modified: trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/input.h trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Aug 6 03:13:27 2012 @@ -394,6 +394,26 @@ return ret; } +PTHREADINFO FASTCALL +IsThreadAttach(PTHREADINFO ptiTo) +{ + PATTACHINFO pai; + + if (!gpai) return NULL; + + pai = gpai; + do + { + if (pai->pti2 == ptiTo) break; + pai = pai->paiNext; + } while (pai); + + if (!pai) return NULL; + + // Return ptiFrom. + return pai->pti1; +} + BOOL FASTCALL UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach) { @@ -419,7 +439,7 @@ pai->pti1 = ptiFrom; pai->pti2 = ptiTo; gpai = pai; - TRACE("Attach Allocated! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + ERR("Attach Allocated! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; ptiFrom->pqAttach = ptiFrom->MessageQueue; @@ -457,7 +477,7 @@ if (paiprev) paiprev->paiNext = pai->paiNext; ExFreePoolWithTag(pai, USERTAG_ATTACHINFO); - TRACE("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + ERR("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); ptiFrom->MessageQueue = ptiFrom->pqAttach; // FIXME: conditions? Modified: trunk/reactos/win32ss/user/ntuser/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Mon Aug 6 03:13:27 2012 @@ -63,6 +63,7 @@ BOOL FASTCALL IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt); DWORD NTAPI CreateSystemThreads(UINT Type); BOOL FASTCALL UserAttachThreadInput(PTHREADINFO,PTHREADINFO,BOOL); +PTHREADINFO FASTCALL IsThreadAttach(PTHREADINFO); VOID FASTCALL DoTheScreenSaver(VOID); #define ThreadHasInputAccess(W32Thread) (TRUE) Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Aug 6 03:13:27 2012 @@ -247,6 +247,8 @@ return STATUS_NO_MEMORY; } + TRACE_CH(UserThread,"Create pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); + RtlZeroMemory(ptiCurrent, sizeof(THREADINFO)); PsSetThreadWin32Thread(Thread, ptiCurrent); @@ -391,7 +393,7 @@ ASSERT(ptiCurrent); - TRACE_CH(UserThread,"Destroying pti 0x%p\n", ptiCurrent); + TRACE_CH(UserThread,"Destroying pti 0x%p eThread 0x%p\n", ptiCurrent, Thread); ptiCurrent->TIF_flags |= TIF_INCLEANUP; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; @@ -470,11 +472,20 @@ } } + // ptiTo + if (IsThreadAttach(ptiCurrent)) + { + PTHREADINFO ptiFrom = IsThreadAttach(ptiCurrent); + TRACE_CH(UserThread,"Attached Thread ptiTo is getting switched!\n"); + UserAttachThreadInput(ptiFrom, ptiCurrent, FALSE); + } + + // ptiFrom if (ptiCurrent->pqAttach && ptiCurrent->MessageQueue) { PTHREADINFO ptiTo; ptiTo = PsGetThreadWin32Thread(ptiCurrent->MessageQueue->Thread); - TRACE_CH(UserThread,"Attached Thread is getting switched!\n"); + TRACE_CH(UserThread,"Attached Thread ptiFrom is getting switched!\n"); UserAttachThreadInput( ptiCurrent, ptiTo, FALSE); }

12 years, 4 months

[tfaber] 57044: [LIBTIFF] - Fix a warning

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Aug 4 18:19:19 2012 New Revision: 57044 URL: http://svn.reactos.org/svn/reactos?rev=57044&view=rev Log: [LIBTIFF] - Fix a warning Modified: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch trunk/reactos/dll/3rdparty/libtiff/tif_open.c Modified: trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/rosdi… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch [iso-8859-1] Sat Aug 4 18:19:19 2012 @@ -7,7 +7,7 @@ { thandle_t m = tif->tif_clientdata; +#ifdef USE_WIN32_FILEIO -+ newvalue = (thandle_t) _get_osfhandle(newvalue); ++ newvalue = (thandle_t)_get_osfhandle((int)newvalue); +#endif /* USE_WIN32_FILEIO */ tif->tif_clientdata = newvalue; return m; Modified: trunk/reactos/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libtiff/tif_o… ============================================================================== --- trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] Sat Aug 4 18:19:19 2012 @@ -517,7 +517,7 @@ { thandle_t m = tif->tif_clientdata; #ifdef USE_WIN32_FILEIO - newvalue = (thandle_t) _get_osfhandle(newvalue); + newvalue = (thandle_t)_get_osfhandle((int)newvalue); #endif /* USE_WIN32_FILEIO */ tif->tif_clientdata = newvalue; return m;

12 years, 4 months

[tkreuzer] 57043: [NTOSKRNL] Add a systemcall table for all x64 NT versions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 4 17:38:56 2012 New Revision: 57043 URL: http://svn.reactos.org/svn/reactos?rev=57043&view=rev Log: [NTOSKRNL] Add a systemcall table for all x64 NT versions Added: trunk/reactos/ntoskrnl/include/sysfuncs64.h (with props) Added: trunk/reactos/ntoskrnl/include/sysfuncs64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/sysfuncs6… ============================================================================== --- trunk/reactos/ntoskrnl/include/sysfuncs64.h (added) +++ trunk/reactos/ntoskrnl/include/sysfuncs64.h [iso-8859-1] Sat Aug 4 17:38:56 2012 @@ -1,0 +1,645 @@ +SVC_(MapUserPhysicalPagesScatter, 3) +SVC_(WaitForSingleObject, 4) +SVC_(CallbackReturn, 3) +SVC_(ReadFile, 9) +SVC_(DeviceIoControlFile, 10) +SVC_(WriteFile, 9) +SVC_(RemoveIoCompletion, 5) +SVC_(ReleaseSemaphore, 3) +SVC_(ReplyWaitReceivePort, 4) +SVC_(ReplyPort, 2) +SVC_(SetInformationThread, 4) +SVC_(SetEvent, 2) +SVC_(Close, 1) +SVC_(QueryObject, 5) +SVC_(QueryInformationFile, 5) +SVC_(OpenKey, 3) +SVC_(EnumerateValueKey, 6) +SVC_(FindAtom, 3) +SVC_(QueryDefaultLocale, 2) +SVC_(QueryKey, 5) +SVC_(QueryValueKey, 6) +SVC_(AllocateVirtualMemory, 6) +SVC_(QueryInformationProcess, 5) +SVC_(WaitForMultipleObjects32, 5) +SVC_(WriteFileGather, 9) +SVC_(SetInformationProcess, 4) +SVC_(CreateKey, 7) +SVC_(FreeVirtualMemory, 4) +SVC_(ImpersonateClientOfPort, 2) +SVC_(ReleaseMutant, 2) +SVC_(QueryInformationToken, 5) +SVC_(RequestWaitReplyPort, 3) +SVC_(QueryVirtualMemory, 6) +SVC_(OpenThreadToken, 4) +SVC_(QueryInformationThread +SVC_(OpenProcess, 5) +SVC_(SetInformationFile, 5) +SVC_(MapViewOfSection, 10) +SVC_(AccessCheckAndAuditAlarm, 11) +SVC_(UnmapViewOfSection, 2) +SVC_(ReplyWaitReceivePortEx, 5) +SVC_(TerminateProcess, 2) +SVC_(SetEventBoostPriority, 1) +SVC_(ReadFileScatter, 9) +SVC_(OpenThreadTokenEx, 5) +SVC_(OpenProcessTokenEx, 4) +SVC_(QueryPerformanceCounter +SVC_(EnumerateKey, 2) +SVC_(OpenFile, 6) +SVC_(DelayExecution, 2) +SVC_(QueryDirectoryFile, 11) +SVC_(QuerySystemInformation, 4) +SVC_(OpenSection, 3) +SVC_(QueryTimer, 5) +SVC_(FsControlFile, 10) +SVC_(WriteVirtualMemory, 5) +SVC_(CloseObjectAuditAlarm, 3) +SVC_(DuplicateObject, 7) +SVC_(QueryAttributesFile, 2) +SVC_(ClearEvent, 1) +SVC_(ReadVirtualMemory, 5) +SVC_(OpenEvent, 3) +SVC_(AdjustPrivilegesToken, 6) +SVC_(DuplicateToken, 6) +SVC_(Continue, 2) +SVC_(QueryDefaultUILanguage, 1) +SVC_(QueueApcThread, 5) +SVC_(YieldExecution, 0) +SVC_(AddAtom, 3) +SVC_(CreateEvent, 5) +SVC_(QueryVolumeInformationFile, 5) +SVC_(CreateSection, 7) +SVC_(FlushBuffersFile, 2) +SVC2_(ApphelpCacheControl, 2) +SVC_(CreateProcessEx, 9) +SVC_(CreateThread, 8) +SVC_(IsProcessInJob, 2) +SVC_(ProtectVirtualMemory, 5) +SVC_(QuerySection, 5) +SVC_(ResumeThread, 2) +SVC_(TerminateThread, 2) +SVC_(ReadRequestData, 6) +SVC_(CreateFile, 11) +SVC_(QueryEvent, 5) +SVC_(WriteRequestData, 6) +SVC_(OpenDirectoryObject, 3) +SVC_(AccessCheckByTypeAndAuditAlarm, 16) +SVC_(QuerySystemTime, 1) +SVC_(WaitForMultipleObjects, 5) +SVC_(SetInformationObject, 4) +SVC_(CancelIoFile, 2) +SVC_(TraceEvent, 4) +SVC_(PowerInformation, 5) +SVC_(SetValueKey, 6) +SVC_(CancelTimer, 2) +SVC_(SetTimer, 7) +SVC_(AcceptConnectPort, 6) +SVC_(AccessCheck, 8) +SVC_(AccessCheckByType, 11) +SVC_(AccessCheckByTypeResultList, 11) +SVC_(AccessCheckByTypeResultListAndAuditAlarm, 16) +SVC_(AccessCheckByTypeResultListAndAuditAlarmByHandle, 17) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(AddAtomEx, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION < NTDDI_WIN7) +SVC_(AcquireCMFViewOwnership, 3) +#endif +SVC_(AddBootEntry, 2) +SVC_(AddDriverEntry, 2) +#endif +SVC_(AdjustGroupsToken, 6) +SVC_(AlertResumeThread, 2) +SVC_(AlertThread, 1) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(AlertThreadByThreadId, 0) // FIXME +#endif +SVC_(AllocateLocallyUniqueId, 1) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(AllocateReserveObject, 3) +#endif +SVC_(AllocateUserPhysicalPages, 3) +SVC_(AllocateUuids, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(AlpcAcceptConnectPort, 9) +SVC_(AlpcCancelMessage, 3) +SVC_(AlpcConnectPort, 11) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(AlpcConnectPortEx, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(AlpcCreatePort, 3) +SVC_(AlpcCreatePortSection, 6) +SVC_(AlpcCreateResourceReserve, 4) +SVC_(AlpcCreateSectionView, 3) +SVC_(AlpcCreateSecurityContext, 3) +SVC_(AlpcDeletePortSection,3) +SVC_(AlpcDeleteResourceReserve, 3) +SVC_(AlpcDeleteSectionView, 3) +SVC_(AlpcDeleteSecurityContext, 3) +SVC_(AlpcDisconnectPort, 2) +SVC_(AlpcImpersonateClientOfPort, 3) +SVC_(AlpcOpenSenderProcess, 6) +SVC_(AlpcOpenSenderThread, 6) +SVC_(AlpcQueryInformation, 5) +SVC_(AlpcQueryInformationMessage, 6) +SVC_(AlpcRevokeSecurityContext, 3) +SVC_(AlpcSendWaitReceivePort, 8) +SVC_(AlpcSetInformation, 4) +#endif // (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(AreMappedFilesTheSame, 2) +SVC_(AssignProcessToJobObject, 2) +#if (NTDDI_VERSION >= NTDDI_SERVER08 && NTDDI_VERSION < NTDDI_WIN7) +SVC_(RequestDeviceWakeup, 0) // FIXME +#endif +#if (NTDDI_VERSION == NTDDI_VISTA) +SVC_(SavepointTransaction, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(AssociateWaitCompletionPacket, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_VISTASP1 && NTDDI_VERSION <= NTDDI_VISTASP2) +SVC2_(xHalPostMicrocodeUpdate, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CancelIoFileEx, 3) +SVC_(CancelSynchronousIoFile, 3) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CancelWaitCompletionPacket, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CommitComplete, 2) +SVC_(CommitEnlistment, 2) +SVC_(CommitTransaction, 2) +#endif // (NTDDI_VERSION == NTDDI_VISTA) +SVC_(CompactKeys, 2) +SVC_(CompareTokens, 3) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC2_(xHalGetInterruptTranslator, 7) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTASP1 && NTDDI_VERSION <= NTDDI_VISTASP2) +SVC2_(ArbPreprocessEntry, 0) // FIXME +#elif (NTDDI_VERSION < NTDDI_WIN7) +SVC_(CompleteConnectPort, 1) +#endif +SVC_(CompressKey, 1) +SVC_(ConnectPort, 8) +SVC_(CreateDebugObject, 4) +SVC_(CreateDirectoryObject, 3) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateDirectoryObjectEx, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateEnlistment +#endif // (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateEventPair, 3) +SVC_(CreateIoCompletion, 4) +SVC_(CreateJobObject, 3) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC2_(xHalAllocatePmcCounterSet, 0) // FIXME +#else +SVC_(CreateJobSet, 3) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateKeyTransacted, 8) +#endif +SVC_(CreateKeyedEvent, 4) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateLowBoxToken, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateMailslotFile, 8) +SVC_(CreateMutant, 4) +SVC_(CreateNamedPipeFile, 14) +SVC_(CreatePagingFile 4) +SVC_(CreatePort, 5) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreatePrivateNamespace, 4) +#endif // (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateProcess, 8) +SVC_(CreateProfile, 9) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(CreateProfileEx, 10) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateResourceManager, 7) +#endif +SVC_(CreateSemaphore, 5) +SVC_(CreateSymbolicLinkObject, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateThreadEx, 11) +#endif +SVC_(CreateTimer, 4) +SVC_(CreateToken, 13) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateTokenEx, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateTransaction, 10) +SVC_(CreateTransactionManager, 6) +SVC_(CreateUserProcess, 11) +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateWaitCompletionPacket, 0) // FIXME +#endif +SVC_(CreateWaitablePort, 5) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(CreateWnfStateName, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(CreateWorkerFactory, 10) +#endif +SVC_(DebugActiveProcess, 2) +SVC_(DebugContinue, 3) +SVC_(DeleteAtom, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(DeleteBootEntry, 1) +SVC_(DeleteDriverEntry, 1) +#endif +SVC_(DeleteFile, 1) +SVC_(DeleteKey, 1) +SVC_(DeleteObjectAuditAlarm, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(DeletePrivateNamespace, 1) +#endif +SVC_(DeleteValueKey, 2) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(DeleteWnfStateData, 0) // FIXME +SVC_(DeleteWnfStateName, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(DisableLastKnownGood, 0) +#endif +SVC_(DisplayString, 1) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(DrawText, 1) +SVC_(EnableLastKnownGood, 0) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(EnumerateBootEntries, 2) +SVC_(EnumerateDriverEntries, 2) +SVC_(EnumerateSystemEnvironmentValuesEx, 3) +SVC_(EnumerateTransactionObject, 5) +#endif +SVC_(ExtendSection, 2) +SVC_(FilterToken, 6) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(FlushBuffersFileEx, 3) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(FlushInstallUILanguage, 2) +#endif +#if (NTDDI_VERSION < NTDDI_WIN8) +SVC_(FlushInstructionCache, 3) +#endif +SVC_(FlushKey, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(FlushProcessWriteBuffers, 0) +#endif +SVC_(FlushVirtualMemory, 4) +SVC_(FlushWriteBuffer, 0) +SVC_(FreeUserPhysicalPages, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(FreezeRegistry +SVC_(FreezeTransactions, 2) +#endif +SVC_(GetContextThread, 2) +SVC_(GetCurrentProcessorNumber, 0) +SVC_(GetDevicePowerState +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(GetMUIRegistryInfo, 3) +SVC_(GetNextProcess, 5) +SVC_(GetNextThread, 6) +SVC_(GetNlsSectionPtr, 5) +SVC_(GetNotificationResourceManager, 7) +#endif +#if (NTDDI_VERSION < NTDDI_WIN8) +SVC_(GetPlugPlayEvent, 4) +#endif +SVC_(GetWriteWatch, 7) +SVC_(ImpersonateAnonymousToken, 1) +SVC_(ImpersonateThread, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(InitializeNlsFiles +#endif +SVC_(InitializeRegistry, 1) +SVC_(InitiatePowerAction, 4) +SVC_(IsSystemResumeAutomatic, 0) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(IsUILanguageComitted, 0) +#endif +SVC_(ListenPort, 2) +SVC_(LoadDriver, 1) +SVC_(LoadKey, 2) +SVC_(LoadKey2, 3) +SVC_(LoadKeyEx, 4) +SVC_(LockFile, 10) +SVC_(LockProductActivationKeys, 2) +SVC_(LockRegistryKey, 1) +SVC_(LockVirtualMemory, 4) +SVC_(MakePermanentObject, 1) +SVC_(MakeTemporaryObject, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(MapCMFModule +#endif +SVC_(MapUserPhysicalPages, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(ModifyBootEntry, 1) +SVC_(ModifyDriverEntry, 1) +#endif +SVC_(NotifyChangeDirectoryFile, 9) +SVC_(NotifyChangeKey, 10) +SVC_(NotifyChangeMultipleKeys, 12) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(NotifyChangeSession, 8) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenEnlistment, 5) +#endif +SVC_(OpenEventPair, 3) +SVC_(OpenIoCompletion, 3) +SVC_(OpenJobObject, 3) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(OpenKeyEx, 4) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenKeyTransacted, 4) +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(OpenKeyTransactedEx, 5) +#endif +SVC_(OpenKeyedEvent, 3) +SVC_(OpenMutant, 3) +SVC_(OpenObjectAuditAlarm, 12) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenPrivateNamespace, 4) +#endif +SVC_(OpenProcessToken, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenResourceManager, 5) +#endif +SVC_(OpenSemaphore, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenSession, 3) +#endif +SVC_(OpenSymbolicLinkObject, 3) +SVC_(OpenThread, 4) +SVC_(OpenTimer, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(OpenTransaction, 5) +SVC_(OpenTransactionManager, 6) +#endif +SVC_(PlugPlayControl, 3) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(PrePrepareComplete, 2) +SVC_(PrePrepareEnlistment, 2) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(PrefetchVirtualMemory, 0) // FIXME +#endif // (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(PrepareComplete, 2) +SVC_(PrepareEnlistment, 2) +#endif // (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(PrivilegeCheck, 3) +SVC_(PrivilegeObjectAuditAlarm, 6) +SVC_(PrivilegedServiceAuditAlarm, 5) +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +SVC_(PropagationComplete, 4) +SVC_(PropagationFailed, 3) +#endif +SVC_(PulseEvent, 2) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryBootEntryOrder, 2) +#endif +SVC_(QueryBootOptions, 2) +SVC_(QueryDebugFilterState, 2) +SVC_(QueryDirectoryObject, 7) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryDriverEntryOrder, 2) +#endif +SVC_(QueryEaFile, 9) +SVC_(QueryFullAttributesFile, 2) +SVC_(QueryInformationAtom, 5) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryInformationEnlistment, 5) +#endif +SVC_(QueryInformationJobObject, 5) +SVC_(QueryInformationPort, 5) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryInformationResourceManager, 5) +SVC_(QueryInformationTransaction, 5) +SVC_(QueryInformationTransactionManager, 5) +SVC_(QueryInformationWorkerFactory, 5) +#endif +SVC_(QueryInstallUILanguage, 1) +SVC_(QueryIntervalProfile, 2) +SVC_(QueryIoCompletion, 5) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryLicenseValue, 5) +#endif +SVC_(QueryMultipleValueKey, 6) +SVC_(QueryMutant, 5) +SVC_(QueryOpenSubKeys, 2) +SVC_(QueryOpenSubKeysEx, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QueryPortInformationProcess, 0) +#endif +#if (NTDDI_VERSION < NTDDI_VISTA) +SVC2_(ShimExceptionHandler, 0) // FIXME +#endif +SVC_(QueryQuotaInformationFile, 9) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(QuerySecurityAttributesToken, 6) +#endif +SVC_(QuerySecurityObject, 5) +SVC_(QuerySemaphore, 5) +SVC_(QuerySymbolicLinkObject, 3) +SVC_(QuerySystemEnvironmentValue, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(QuerySystemEnvironmentValueEx, 5) +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(QuerySystemInformationEx, 6) +#endif +SVC_(QueryTimerResolution, 3) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(QueryWnfStateData, 0) // FIXME +SVC_(QueryWnfStateNameInformation, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(QueueApcThreadEx, 6) +#endif +SVC_(RaiseException, 3) +SVC_(RaiseHardError, 6) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(ReadOnlyEnlistment, 2) +SVC_(RecoverEnlistment, 2) +SVC_(RecoverResourceManager, 1) +SVC_(RecoverTransactionManager, 1) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +SVC_(RegisterProtocolAddressInformation, 5) +#endif +#if (NTDDI_VERSION == NTDDI_VISTA) +SVC_(KeRestoreFloatingPointState, 0) // FIXME +#endif +SVC_(RegisterThreadTerminatePort, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(ReleaseCMFViewOwnership, 0) +#endif +SVC_(ReleaseKeyedEvent, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(ReleaseWorkerFactoryWorker, 1) +SVC_(RemoveIoCompletionEx, 6) +#endif +SVC_(RemoveProcessDebug, 2) +SVC_(RenameKey, 2) +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +SVC_(RenameTransactionManager, 2) +#endif +SVC_(ReplaceKey, 3) +#if (NTDDI_VERSION >= NTDDI_VISTASP1) +SVC_(ReplacePartitionUnit, 3) +#endif +SVC_(ReplyWaitReplyPort, 2) +SVC_(RequestPort, 2) +#if (NTDDI_VERSION < NTDDI_WIN7) +SVC_(RequestWakeupLatency, 1) +#endif +SVC_(ResetEvent, 2) +SVC_(ResetWriteWatch, 3) +SVC_(RestoreKey, 3) +SVC_(ResumeProcess, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(RollbackComplete, 2) +SVC_(RollbackEnlistment, 2) +SVC_(RollbackTransaction, 2) +SVC_(RollforwardTransactionManager, 2) +#endif +SVC_(SaveKey, 2) +SVC_(SaveKeyEx, 3) +SVC_(SaveMergedKeys, 3) +SVC_(SecureConnectPort, 9) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(SerializeBoot, 0) +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetBootEntryOrder, 2) +SVC_(SetBootOptions, 2) +#endif +SVC_(SetContextThread, 2) +SVC_(SetDebugFilterState, 3) +SVC_(SetDefaultHardErrorPort, 1) +SVC_(SetDefaultLocale, 2) +SVC_(SetDefaultUILanguage, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetDriverEntryOrder, 2) +#endif +SVC_(SetEaFile, 4) +SVC_(SetHighEventPair, 1) +SVC_(SetHighWaitLowEventPair, 1) +SVC_(SetInformationDebugObject, 5) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetInformationEnlistment, 4) +#endif +SVC_(SetInformationJobObject, 4) +SVC_(SetInformationKey, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetInformationResourceManager, 4) +#endif +SVC_(SetInformationToken, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetInformationTransaction, 4) +SVC_(SetInformationTransactionManager, 4) +SVC_(SetInformationWorkerFactory, 4) +#endif +SVC_(SetIntervalProfile, 2) +SVC_(SetIoCompletion, 5) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(SetIoCompletionEx, 6) +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC2_(xKdReleaseIntegratedDeviceForDebugging, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_SERVER08 && NTDDI_VERSION < NTDDI_WIN7) +SVC_(SetLdtEntries, 6) +#elif (NTDDI_VERSION < NTDDI_WIN8) +SVC2_(xKdSetupPciDeviceForDebugging, 2) +#endif +SVC_(SetLowEventPair, 1) +SVC_(SetLowWaitHighEventPair, 1) +SVC_(SetQuotaInformationFile, 4) +SVC_(SetSecurityObject, 3) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(SetSystemCodeIntegrityRoots, 0) // FIXME +#endif +SVC_(SetSystemEnvironmentValue, 2) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SetSystemEnvironmentValueEx, 2) +#endif +SVC_(SetSystemInformation, 3) +SVC_(SetSystemPowerState, 3) +SVC_(SetSystemTime, 2) +SVC_(SetThreadExecutionState, 2) +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(SetTimerEx +#endif +SVC_(SetTimerResolution, 3) +SVC_(SetUuidSeed, 1) +SVC_(SetVolumeInformationFile, 5) +SVC_(ShutdownSystem, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(ShutdownWorkerFactory, 2) +#endif +SVC_(SignalAndWaitForSingleObject, 4) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(SinglePhaseReject, 2) +#endif +SVC_(StartProfile, 1) +#if (NTDDI_VERSION == NTDDI_VISTA) +SVC2_(xHalGetInterruptTranslator, 0) // FIXME +#endif +SVC_(StopProfile, 1) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(SubscribeWnfStateChange, 0) // FIXME +#endif +SVC_(SuspendProcess, 1) +SVC_(SuspendThread, 2) +SVC_(SystemDebugControl, 6) +SVC_(TerminateJobObject, 2) +SVC_(TestAlert, 0) +#if (NTDDI_VERSION == NTDDI_VISTA) +SVC_(ThawRegistry, 0) +SVC_(ThawTransactions, 0) +SVC_(TraceControl, 6) +SVC_(TranslateFilePath, 4) +#endif +#if (NTDDI_VERSION >= NTDDI_WIN7) +SVC_(UmsThreadYield, 1) +#endif +SVC_(UnloadDriver, 1) +SVC_(UnloadKey, 1) +SVC_(UnloadKey2, 2) +SVC_(UnloadKeyEx, 2) +SVC_(UnlockFile, 5) +SVC_(UnlockVirtualMemory, 4) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(UnmapViewOfSectionEx, 0) // FIXME +SVC_(UnsubscribeWnfStateChange, 0) // FIXME +SVC_(UpdateWnfStateData, 0) // FIXME +SVC_(WaitForAlertByThreadId, 0) // FIXME +#endif +SVC_(VdmControl, 2) +SVC_(WaitForDebugEvent, 4) +SVC_(WaitForKeyedEvent, 4) +#if (NTDDI_VERSION >= NTDDI_WIN8) +SVC_(WaitForWnfNotifications, 0) // FIXME +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(WaitForWorkViaWorkerFactory, 2) +#endif +SVC_(WaitHighEventPair, 1) +SVC_(WaitLowEventPair, 1) +#if (NTDDI_VERSION >= NTDDI_VISTA) +SVC_(WorkerFactoryWorkerReady, 1) +#endif + + Propchange: trunk/reactos/ntoskrnl/include/sysfuncs64.h ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 4 months

[tfaber] 57042: [LIBPNG] - Sync to 1.5.12. Patch by Vincenzo Cotugno. See issue #7202 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Aug 4 13:07:05 2012 New Revision: 57042 URL: http://svn.reactos.org/svn/reactos?rev=57042&view=rev Log: [LIBPNG] - Sync to 1.5.12. Patch by Vincenzo Cotugno. See issue #7202 for more details. Removed: trunk/reactos/dll/3rdparty/libpng/docs/libpng-1.4.3.txt Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE trunk/reactos/dll/3rdparty/libpng/docs/CHANGES trunk/reactos/dll/3rdparty/libpng/docs/INSTALL trunk/reactos/dll/3rdparty/libpng/docs/LICENSE trunk/reactos/dll/3rdparty/libpng/docs/README trunk/reactos/dll/3rdparty/libpng/docs/example.c trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt trunk/reactos/dll/3rdparty/libpng/png.c trunk/reactos/dll/3rdparty/libpng/pngerror.c trunk/reactos/dll/3rdparty/libpng/pngpread.c trunk/reactos/dll/3rdparty/libpng/pngpriv.h trunk/reactos/dll/3rdparty/libpng/pngread.c trunk/reactos/dll/3rdparty/libpng/pngrtran.c trunk/reactos/dll/3rdparty/libpng/pngrutil.c trunk/reactos/dll/3rdparty/libpng/pngset.c trunk/reactos/dll/3rdparty/libpng/pngstruct.h trunk/reactos/dll/3rdparty/libpng/pngtest.c trunk/reactos/dll/3rdparty/libpng/pngtrans.c trunk/reactos/dll/3rdparty/libpng/pngwrite.c trunk/reactos/dll/3rdparty/libpng/pngwutil.c trunk/reactos/include/reactos/libs/libpng/png.h trunk/reactos/include/reactos/libs/libpng/pngconf.h trunk/reactos/include/reactos/libs/libpng/pnglibconf.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/A… Modified: trunk/reactos/dll/3rdparty/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/C… Modified: trunk/reactos/dll/3rdparty/libpng/docs/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/I… Modified: trunk/reactos/dll/3rdparty/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/L… Modified: trunk/reactos/dll/3rdparty/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/R… Modified: trunk/reactos/dll/3rdparty/libpng/docs/example.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/e… Removed: trunk/reactos/dll/3rdparty/libpng/docs/libpng-1.4.3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/l… Modified: trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/l… Modified: trunk/reactos/dll/3rdparty/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/png.c?… Modified: trunk/reactos/dll/3rdparty/libpng/pngerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngerr… Modified: trunk/reactos/dll/3rdparty/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpre… Modified: trunk/reactos/dll/3rdparty/libpng/pngpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpri… Modified: trunk/reactos/dll/3rdparty/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrea… Modified: trunk/reactos/dll/3rdparty/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrtr… Modified: trunk/reactos/dll/3rdparty/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrut… Modified: trunk/reactos/dll/3rdparty/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngset… Modified: trunk/reactos/dll/3rdparty/libpng/pngstruct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngstr… Modified: trunk/reactos/dll/3rdparty/libpng/pngtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngtes… Modified: trunk/reactos/dll/3rdparty/libpng/pngtrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngtra… Modified: trunk/reactos/dll/3rdparty/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwri… Modified: trunk/reactos/dll/3rdparty/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwut… Modified: trunk/reactos/include/reactos/libs/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pnglibconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn…

12 years, 4 months

[tfaber] 57041: [WINDOWSCODECS] - Type safety for MSVC compat layer

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Aug 4 12:44:04 2012 New Revision: 57041 URL: http://svn.reactos.org/svn/reactos?rev=57041&view=rev Log: [WINDOWSCODECS] - Type safety for MSVC compat layer Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/typeof.h Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Aug 4 12:44:04 2012 @@ -10,7 +10,6 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) -set_rc_compiler() if(MSVC) add_compile_flags("/FItypeof.h") @@ -42,12 +41,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) add_library(windowscodecs SHARED ${SOURCE}) - set_module_type(windowscodecs win32dll) - target_link_libraries(windowscodecs wine uuid) - add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/typeof.h [iso-8859-1] Sat Aug 4 12:44:04 2012 @@ -26,49 +26,56 @@ typedef unsigned char (__cdecl typeof(jpeg_resync_to_restart))(struct jpeg_decompress_struct *, int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); -typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void*, png_error_ptr_1, png_error_ptr_1); +typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, unsigned int); +typedef void (*png_flush_ptr_1)(struct png_struct_def *); typedef struct png_info_def* (__cdecl typeof(png_create_info_struct))(struct png_struct_def *); +typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); +typedef struct png_struct_def *(__cdecl typeof(png_create_write_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); +typedef void (__cdecl typeof(png_destroy_info_struct))(struct png_struct_def *, struct png_info_def **); +typedef void (__cdecl typeof(png_destroy_read_struct))(struct png_struct_def **, struct png_info_def **, struct png_info_def **); +typedef void (__cdecl typeof(png_destroy_write_struct))(struct png_struct_def **, struct png_info_def **); +typedef void (__cdecl typeof(png_error))(struct png_struct_def *, const char *); +typedef unsigned char (__cdecl typeof(png_get_bit_depth))(const struct png_struct_def *, const struct png_info_def *); +typedef unsigned char (__cdecl typeof(png_get_color_type))(const struct png_struct_def *, const struct png_info_def *); +typedef void *(__cdecl typeof(png_get_error_ptr))(const struct png_struct_def *); +typedef unsigned int (__cdecl typeof(png_get_image_height))(const struct png_struct_def *, const struct png_info_def *); +typedef unsigned int (__cdecl typeof(png_get_image_width))(const struct png_struct_def *, const struct png_info_def *); +typedef void *(__cdecl typeof(png_get_io_ptr))(struct png_struct_def *); +typedef unsigned int (__cdecl typeof(png_get_pHYs))(const struct png_struct_def *, const struct png_info_def *, unsigned int *, unsigned int *, int *); +typedef unsigned int (__cdecl typeof(png_get_PLTE))(const struct png_struct_def *, const struct png_info_def *, struct png_color_struct **, int *); +typedef unsigned int (__cdecl typeof(png_get_tRNS))(const struct png_struct_def *, struct png_info_def *, unsigned char **, int *, struct png_color_16_struct **); +typedef void (__cdecl typeof(png_set_bgr))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_error_fn))(struct png_struct_def *, void *, png_error_ptr_1, png_error_ptr_1); +typedef void (__cdecl typeof(png_set_expand_gray_1_2_4_to_8))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_filler))(struct png_struct_def *, unsigned int, int); +typedef void (__cdecl typeof(png_set_gray_to_rgb))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_IHDR))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int, int, int, int, int); +typedef void (__cdecl typeof(png_set_pHYs))(struct png_struct_def *, struct png_info_def *, unsigned int, unsigned int, int); +typedef void (__cdecl typeof(png_set_read_fn))(struct png_struct_def *, void *, png_rw_ptr_1); +typedef void (__cdecl typeof(png_set_strip_16))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_tRNS_to_alpha))(struct png_struct_def *); +typedef void (__cdecl typeof(png_set_write_fn))(struct png_struct_def *, void *, png_rw_ptr_1, png_flush_ptr_1); +typedef void (__cdecl typeof(png_read_end))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_read_image))(struct png_struct_def *, unsigned char **); +typedef void (__cdecl typeof(png_read_info))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_end))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_info))(struct png_struct_def *, struct png_info_def *); +typedef void (__cdecl typeof(png_write_rows))(struct png_struct_def *, unsigned char **row, unsigned int); -// FIXME the following types are not correct, but they help to compile -typedef void* (__cdecl typeof(png_create_write_struct))(void*); -typedef void* (__cdecl typeof(png_destroy_read_struct))(void*, void*, void*); -typedef void* (__cdecl typeof(png_destroy_write_struct))(void*); -typedef void* (__cdecl typeof(png_destroy_write_struct))(void*); -typedef void* (__cdecl typeof(png_error))(void*); -typedef void* (__cdecl typeof(png_get_bit_depth))(void *); -typedef void* (__cdecl typeof(png_get_color_type))(void *); -typedef void* (__cdecl typeof(png_get_error_ptr))(void *); -typedef void* (__cdecl typeof(png_get_image_height))(void *); -typedef void* (__cdecl typeof(png_get_image_width))(void *); -typedef void* (__cdecl typeof(png_get_io_ptr))(void *); -typedef void* (__cdecl typeof(png_get_pHYs))(void *); -typedef void* (__cdecl typeof(png_get_PLTE))(void *); -typedef void* (__cdecl typeof(png_get_tRNS))(void *); -typedef void* (__cdecl typeof(png_set_bgr))(void *); -typedef void* (__cdecl typeof(png_set_error_fn))(void *); -typedef void* (__cdecl typeof(png_set_expand_gray_1_2_4_to_8))(void *); -typedef void* (__cdecl typeof(png_set_filler))(void *); -typedef void* (__cdecl typeof(png_set_gray_to_rgb))(void *); -typedef void* (__cdecl typeof(png_set_IHDR))(void *); -typedef void* (__cdecl typeof(png_set_pHYs))(void *); -typedef void* (__cdecl typeof(png_set_read_fn))(void *); -typedef void* (__cdecl typeof(png_set_strip_16))(void *); -typedef void* (__cdecl typeof(png_set_tRNS_to_alpha))(void *); -typedef void* (__cdecl typeof(png_set_write_fn))(void *); -typedef void* (__cdecl typeof(png_read_end))(void *); -typedef void* (__cdecl typeof(png_read_image))(void *); -typedef void* (__cdecl typeof(png_read_info))(void *); -typedef void* (__cdecl typeof(png_write_end))(void *); -typedef void* (__cdecl typeof(png_write_info))(void *); -typedef void* (__cdecl typeof(png_write_rows))(void *); - -typedef void* (__cdecl typeof(TIFFClientOpen))(void *); -typedef void* (__cdecl typeof(TIFFClose))(void *); -typedef char* (__cdecl typeof(TIFFCurrentDirectory))(void *); -typedef void* (__cdecl typeof(TIFFGetField))(void *); -typedef void* (__cdecl typeof(TIFFReadDirectory))(void *); -typedef void* (__cdecl typeof(TIFFReadEncodedStrip))(void *); -typedef void* (__cdecl typeof(TIFFSetDirectory))(void *); +typedef void *thandle_t_1; +typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, int); +typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); +typedef int (*TIFFCloseProc_1)(thandle_t_1); +typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1); +typedef int (*TIFFMapFileProc_1)(thandle_t_1, void **, unsigned int *); +typedef void (*TIFFUnmapFileProc_1)(thandle_t_1, void *, unsigned int); +typedef struct tiff *(__cdecl typeof(TIFFClientOpen))(const char *, const char *, thandle_t_1, TIFFReadWriteProc_1, TIFFReadWriteProc_1, TIFFSeekProc_1, TIFFCloseProc_1, TIFFSizeProc_1, TIFFMapFileProc_1, TIFFUnmapFileProc_1); +typedef void (__cdecl typeof(TIFFClose))(struct tiff *); +typedef unsigned short (__cdecl typeof(TIFFCurrentDirectory))(struct tiff *); +typedef int (__cdecl typeof(TIFFGetField))(struct tiff *, unsigned int, ...); +typedef int (__cdecl typeof(TIFFReadDirectory))(struct tiff *); +typedef int (__cdecl typeof(TIFFReadEncodedStrip))(struct tiff *, unsigned int, void *, int); +typedef int (__cdecl typeof(TIFFSetDirectory))(struct tiff *, unsigned short); #undef __typeof_intptr #undef __typeof_longptr

12 years, 4 months

[jimtabor] 57040: [WineTest|User32|Msg] - Sync wine 1.5.10.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Aug 4 02:05:59 2012 New Revision: 57040 URL: http://svn.reactos.org/svn/reactos?rev=57040&view=rev Log: [WineTest|User32|Msg] - Sync wine 1.5.10. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sat Aug 4 02:05:59 2012 @@ -5720,6 +5720,21 @@ { 0 } }; +static const struct message WmSetPosComboSeq[] = +{ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_CHILDACTIVATE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { WM_WINDOWPOSCHANGING, sent|defwinproc }, + { WM_NCCALCSIZE, sent|defwinproc|wparam, TRUE }, + { WM_WINDOWPOSCHANGED, sent|defwinproc }, + { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, + { 0 } +}; + static WNDPROC old_combobox_proc; static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -5806,6 +5821,10 @@ SendMessage(combo, WM_KEYUP, VK_DOWN, 0); log_all_parent_messages--; ok_sequence(WmKeyDownComboSeq, "WM_KEYDOWN/VK_DOWN on a ComboBox", FALSE); + + flush_sequence(); + SetWindowPos(combo, 0, 10, 10, 120, 130, SWP_NOZORDER); + ok_sequence(WmSetPosComboSeq, "repositioning messages on a ComboBox", FALSE); DestroyWindow(combo); DestroyWindow(parent);

12 years, 4 months

[jimtabor] 57039: [User32] - Combo port sync wine 1.5.10.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Aug 4 02:05:01 2012 New Revision: 57039 URL: http://svn.reactos.org/svn/reactos?rev=57039&view=rev Log: [User32] - Combo port sync wine 1.5.10. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/controls/combo.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Aug 4 02:05:01 2012 @@ -258,7 +258,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_39 - reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_39 + reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1.5.10 reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_40 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_39 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_39 Modified: trunk/reactos/win32ss/user/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/combo.c [iso-8859-1] Sat Aug 4 02:05:01 2012 @@ -448,50 +448,6 @@ lpRect->right = lpRect->left + lphc->droppedRect.right - lphc->droppedRect.left; lpRect->bottom = lpRect->top + lphc->droppedRect.bottom - lphc->droppedRect.top; -} - -/*********************************************************************** - * COMBO_WindowPosChanging - */ -static LRESULT COMBO_WindowPosChanging( - HWND hwnd, - LPHEADCOMBO lphc, - WINDOWPOS* posChanging) -{ - /* - * We need to override the WM_WINDOWPOSCHANGING method to handle all - * the non-simple comboboxes. The problem is that those controls are - * always the same height. We have to make sure they are not resized - * to another value. - */ - if ( ( CB_GETTYPE(lphc) != CBS_SIMPLE ) && - ((posChanging->flags & SWP_NOSIZE) == 0) ) - { - int newComboHeight; - - newComboHeight = CBGetTextAreaHeight(hwnd,lphc) + - 2*COMBO_YBORDERSIZE(); - - /* - * Resizing a combobox has another side effect, it resizes the dropped - * rectangle as well. However, it does it only if the new height for the - * combobox is more than the height it should have. In other words, - * if the application resizing the combobox only had the intention to resize - * the actual control, for example, to do the layout of a dialog that is - * resized, the height of the dropdown is not changed. - */ - if (posChanging->cy > newComboHeight) - { - TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", - posChanging->cy, newComboHeight, lphc->droppedRect.bottom, - lphc->droppedRect.top); - lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; - - } - posChanging->cy = newComboHeight; - } - - return 0; } /*********************************************************************** @@ -1550,15 +1506,48 @@ /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc, BOOL bRedraw ) +static void COMBO_Size( LPHEADCOMBO lphc, LPARAM lParam ) +{ + /* + * Those controls are always the same height. So we have to make sure + * they are not resized to another value. + */ + if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { + int newComboHeight; + + newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); + + /* + * Resizing a combobox has another side effect, it resizes the dropped + * rectangle as well. However, it does it only if the new height for the + * combobox is more than the height it should have. In other words, + * if the application resizing the combobox only had the intention to resize + * the actual control, for example, to do the layout of a dialog that is + * resized, the height of the dropdown is not changed. + */ + if( HIWORD(lParam) > newComboHeight ) + { + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + HIWORD(lParam), newComboHeight, lphc->droppedRect.bottom, + lphc->droppedRect.top); + lphc->droppedRect.bottom = lphc->droppedRect.top + HIWORD(lParam) - newComboHeight; + } + /* + * Restore original height + */ + if( HIWORD(lParam) != newComboHeight ) + SetWindowPos(lphc->self, 0, 0, 0, LOWORD(lParam), newComboHeight, + SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); + } + CBCalcPlacement(lphc->self, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, bRedraw ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1894,21 +1883,9 @@ } return result; } - case WM_WINDOWPOSCHANGING: - return COMBO_WindowPosChanging(hwnd, lphc, (LPWINDOWPOS)lParam); - case WM_WINDOWPOSCHANGED: - /* SetWindowPos can be called on a Combobox to resize its Listbox. - * In that case, the Combobox itself will not be resized, so we won't - * get a WM_SIZE. Since we still want to update the Listbox, we have to - * do it here. - */ - /* we should not force repainting on WM_WINDOWPOSCHANGED, it breaks - * Z-order based painting. - */ - /* fall through */ case WM_SIZE: if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, message == WM_SIZE ); + !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc, lParam ); return TRUE; case WM_SETFONT: COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam );

12 years, 4 months

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 August 2012