Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[akhaldi] 50606: [FREELDR] - Don't apply gcc only flags to msvc.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Feb 4 22:43:36 2011 New Revision: 50606 URL: http://svn.reactos.org/svn/reactos?rev=50606&view=rev Log: [FREELDR] - Don't apply gcc only flags to msvc. Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Feb 4 22:43:36 2011 @@ -199,7 +199,9 @@ list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) endif() -set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") +if(NOT MSVC) + set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") +endif() list(APPEND SETUPLDR_SOURCE ${FREELDR_STARTUP_SOURCE}

13 years, 8 months

[tkreuzer] 50605: [WIN32K] Fix a bug in calculation of the background color for 32bpp -> 1bpp color translations. Fixes bug 2372

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 4 13:53:49 2011 New Revision: 50605 URL: http://svn.reactos.org/svn/reactos?rev=50605&view=rev Log: [WIN32K] Fix a bug in calculation of the background color for 32bpp -> 1bpp color translations. Fixes bug 2372 Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Fri Feb 4 13:53:49 2011 @@ -91,7 +91,7 @@ iColor >>= 13; iNewColor |= iColor & 0x3E0; - /* Copy green */ + /* Copy blue */ iColor >>= 13; iNewColor |= iColor & 0x1F; @@ -417,11 +417,11 @@ pexlo->aulXlate[0] = PALETTE_ulGetNearestPaletteIndex(ppalSrc, crSrcBackColor); } + else if (ppalSrc->flFlags & PAL_RGB) + { + pexlo->aulXlate[0] = crSrcBackColor; + } else if (ppalSrc->flFlags & PAL_BGR) - { - pexlo->aulXlate[0] = crSrcBackColor; - } - else if (ppalSrc->flFlags & PAL_RGB) { pexlo->aulXlate[0] = RGB(GetBValue(crSrcBackColor), GetGValue(crSrcBackColor),

13 years, 8 months

[tkreuzer] 50604: [WIN32K] Fix buggy mechanism of pushing and popping free gdi handle slots. The old mechanism unneccessarily locked the entry and it was prone to the ABA problem as it didn't use a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 3 19:25:09 2011 New Revision: 50604 URL: http://svn.reactos.org/svn/reactos?rev=50604&view=rev Log: [WIN32K] Fix buggy mechanism of pushing and popping free gdi handle slots. The old mechanism unneccessarily locked the entry and it was prone to the ABA problem as it didn't use a sequence number. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu Feb 3 19:25:09 2011 @@ -272,64 +272,51 @@ FASTCALL InterlockedPopFreeEntry(VOID) { - ULONG idxFirst, idxNext, idxPrev; + ULONG iFirst, iNext, iPrev; PGDI_TABLE_ENTRY pEntry; - DWORD PrevProcId; DPRINT("Enter InterLockedPopFreeEntry\n"); - while (TRUE) - { - idxFirst = GdiHandleTable->FirstFree; - - if (!idxFirst) + do + { + /* Get the index and sequence number of the first free entry */ + iFirst = GdiHandleTable->FirstFree; + + /* Check if we have a free entry */ + if (!(iFirst & GDI_HANDLE_INDEX_MASK)) { /* Increment FirstUnused and get the new index */ - idxFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; - - /* Check if we have entries left */ - if (idxFirst >= GDI_HANDLE_COUNT) + iFirst = InterlockedIncrement((LONG*)&GdiHandleTable->FirstUnused) - 1; + + /* Check if we have unused entries left */ + if (iFirst >= GDI_HANDLE_COUNT) { DPRINT1("No more gdi handles left!\n"); return 0; } /* Return the old index */ - return idxFirst; + return iFirst; } /* Get a pointer to the first free entry */ - pEntry = GdiHandleTable->Entries + idxFirst; - - /* Try to lock the entry */ - PrevProcId = InterlockedCompareExchange((LONG*)&pEntry->ProcessId, 1, 0); - if (PrevProcId != 0) - { - /* The entry was locked or not free, wait and start over */ - DelayExecution(); - continue; - } - - /* Sanity check: is entry really free? */ - ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + pEntry = GdiHandleTable->Entries + (iFirst & GDI_HANDLE_INDEX_MASK); + + /* Create a new value with an increased sequence number */ + iNext = (USHORT)(ULONG_PTR)pEntry->KernelData; + iNext |= (iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000; /* Try to exchange the FirstFree value */ - idxNext = (ULONG_PTR)pEntry->KernelData; - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxNext, - idxFirst); - - /* Unlock the free entry */ - (void)InterlockedExchange((LONG*)&pEntry->ProcessId, 0); - - /* If we succeeded, break out of the loop */ - if (idxPrev == idxFirst) - { - break; - } - } - - return idxFirst; + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iNext, + iFirst); + } + while (iPrev != iFirst); + + /* Sanity check: is entry really free? */ + ASSERT(((ULONG_PTR)pEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + + return iFirst & GDI_HANDLE_INDEX_MASK; } /* Pushes an entry of the handle table to the free list, @@ -338,7 +325,7 @@ FASTCALL InterlockedPushFreeEntry(ULONG idxToFree) { - ULONG idxFirstFree, idxPrev; + ULONG iToFree, iFirst, iPrev; PGDI_TABLE_ENTRY pFreeEntry; DPRINT("Enter InterlockedPushFreeEntry\n"); @@ -346,18 +333,26 @@ pFreeEntry = GdiHandleTable->Entries + idxToFree; ASSERT((pFreeEntry->Type & GDI_ENTRY_BASETYPE_MASK) == 0); ASSERT(pFreeEntry->ProcessId == 0); - pFreeEntry->UserData = NULL; + pFreeEntry->UserData = NULL; // FIXME + ASSERT(pFreeEntry->UserData == NULL); do { - idxFirstFree = GdiHandleTable->FirstFree; - pFreeEntry->KernelData = (PVOID)(ULONG_PTR)idxFirstFree; - - idxPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, - idxToFree, - idxFirstFree); - } - while (idxPrev != idxFirstFree); + /* Get the current first free index and sequence number */ + iFirst = GdiHandleTable->FirstFree; + + /* Set the KernelData member to the index of the first free entry */ + pFreeEntry->KernelData = UlongToPtr(iFirst & GDI_HANDLE_INDEX_MASK); + + /* Combine new index and increased sequence number in iToFree */ + iToFree = idxToFree | ((iFirst & ~GDI_HANDLE_INDEX_MASK) + 0x10000); + + /* Try to atomically update the first free entry */ + iPrev = InterlockedCompareExchange((LONG*)&GdiHandleTable->FirstFree, + iToFree, + iFirst); + } + while (iPrev != iFirst); }

13 years, 8 months

[akhaldi] 50603: [PORTCLS] - Merge 50601 and 50602 from trunk. Portcls now compiles and links with msvc.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 3 18:26:08 2011 New Revision: 50603 URL: http://svn.reactos.org/svn/reactos?rev=50603&view=rev Log: [PORTCLS] - Merge 50601 and 50602 from trunk. Portcls now compiles and links with msvc. Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Propchange: branches/cmake-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Feb 3 18:26:08 2011 @@ -3,4 +3,4 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:48236-50570 +/trunk/reactos:48236-50570,50601-50602 Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Thu Feb 3 18:26:08 2011 @@ -181,9 +181,9 @@ * Friends */ friend class CMiniportDMusUARTStream; - friend NTSTATUS + friend NTSTATUS NTAPI DMusMPUInterruptServiceRoutine(PINTERRUPTSYNC InterruptSync,PVOID DynamicContext); - friend NTSTATUS + friend NTSTATUS NTAPI SynchronizedDMusMPUWrite(PINTERRUPTSYNC InterruptSync,PVOID syncWriteContext); friend VOID NTAPI DMusUARTTimerDPC(PKDPC Dpc,PVOID DeferredContext,PVOID SystemArgument1,PVOID SystemArgument2); @@ -278,7 +278,7 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2 ); - friend NTSTATUS PropertyHandler_Synth(IN PPCPROPERTY_REQUEST); + friend NTSTATUS NTAPI PropertyHandler_Synth(IN PPCPROPERTY_REQUEST); friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream); }; @@ -692,6 +692,7 @@ * Synchronized routine to initialize the MPU401. */ NTSTATUS +NTAPI InitMPU ( IN PINTERRUPTSYNC InterruptSync, @@ -861,6 +862,7 @@ * Writes outgoing MIDI data. */ NTSTATUS +NTAPI SynchronizedDMusMPUWrite ( IN PINTERRUPTSYNC InterruptSync, @@ -1132,6 +1134,7 @@ * ISR. */ NTSTATUS +NTAPI DMusMPUInterruptServiceRoutine ( IN PINTERRUPTSYNC InterruptSync, @@ -2458,7 +2461,9 @@ const WCHAR wszDescOut[] = L"DMusic MPU-401 Out "; const WCHAR wszDescIn[] = L"DMusic MPU-401 In "; -NTSTATUS PropertyHandler_Synth +NTSTATUS +NTAPI +PropertyHandler_Synth ( IN PPCPROPERTY_REQUEST pRequest )

13 years, 8 months

[akhaldi] 50602: [PORTCLS] - Fix more msvc issues.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 3 18:21:19 2011 New Revision: 50602 URL: http://svn.reactos.org/svn/reactos?rev=50602&view=rev Log: [PORTCLS] - Fix more msvc issues. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Thu Feb 3 18:21:19 2011 @@ -278,7 +278,7 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2 ); - friend NTSTATUS PropertyHandler_Synth(IN PPCPROPERTY_REQUEST); + friend NTSTATUS NTAPI PropertyHandler_Synth(IN PPCPROPERTY_REQUEST); friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream); }; @@ -692,6 +692,7 @@ * Synchronized routine to initialize the MPU401. */ NTSTATUS +NTAPI InitMPU ( IN PINTERRUPTSYNC InterruptSync,

13 years, 8 months

[janderwald] 50601: [PORTCLS] - Try fix msvc issues for cmake branch

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 3 17:17:18 2011 New Revision: 50601 URL: http://svn.reactos.org/svn/reactos?rev=50601&view=rev Log: [PORTCLS] - Try fix msvc issues for cmake branch Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Thu Feb 3 17:17:18 2011 @@ -181,9 +181,9 @@ * Friends */ friend class CMiniportDMusUARTStream; - friend NTSTATUS + friend NTSTATUS NTAPI DMusMPUInterruptServiceRoutine(PINTERRUPTSYNC InterruptSync,PVOID DynamicContext); - friend NTSTATUS + friend NTSTATUS NTAPI SynchronizedDMusMPUWrite(PINTERRUPTSYNC InterruptSync,PVOID syncWriteContext); friend VOID NTAPI DMusUARTTimerDPC(PKDPC Dpc,PVOID DeferredContext,PVOID SystemArgument1,PVOID SystemArgument2); @@ -861,6 +861,7 @@ * Writes outgoing MIDI data. */ NTSTATUS +NTAPI SynchronizedDMusMPUWrite ( IN PINTERRUPTSYNC InterruptSync, @@ -1132,6 +1133,7 @@ * ISR. */ NTSTATUS +NTAPI DMusMPUInterruptServiceRoutine ( IN PINTERRUPTSYNC InterruptSync, @@ -2458,7 +2460,9 @@ const WCHAR wszDescOut[] = L"DMusic MPU-401 Out "; const WCHAR wszDescIn[] = L"DMusic MPU-401 In "; -NTSTATUS PropertyHandler_Synth +NTSTATUS +NTAPI +PropertyHandler_Synth ( IN PPCPROPERTY_REQUEST pRequest )

13 years, 8 months

[janderwald] 50600: [AUDIO] - Add i/o completion routine, which delivers the number of bytes written / read - Close event handle, after the overlapped request has been handled. - Audio stack no lon...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 3 09:34:59 2011 New Revision: 50600 URL: http://svn.reactos.org/svn/reactos?rev=50600&view=rev Log: [AUDIO] - Add i/o completion routine, which delivers the number of bytes written / read - Close event handle, after the overlapped request has been handled. - Audio stack no longer leaks ~ 50 event handles per second Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/include/reactos/libs/sound/mmebuddy.h Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Thu Feb 3 09:34:59 2011 @@ -544,6 +544,25 @@ return MMSYSERR_NOERROR; } +VOID +CALLBACK +LegacyCompletionRoutine( + IN DWORD dwErrorCode, + IN DWORD dwNumberOfBytesTransferred, + IN LPOVERLAPPED lpOverlapped) +{ + PSOUND_OVERLAPPED Overlap; + PWDMAUD_DEVICE_INFO DeviceInfo; + + Overlap = (PSOUND_OVERLAPPED)lpOverlapped; + DeviceInfo = (PWDMAUD_DEVICE_INFO)Overlap->CompletionContext; + + /* Call mmebuddy overlap routine */ + Overlap->OriginalCompletionRoutine(dwErrorCode, DeviceInfo->Header.DataUsed, lpOverlapped); + + HeapFree(GetProcessHeap(), 0, DeviceInfo); +} + MMRESULT WdmAudCommitWaveBufferByLegacy( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -554,7 +573,7 @@ { HANDLE Handle; MMRESULT Result; - WDMAUD_DEVICE_INFO DeviceInfo; + PWDMAUD_DEVICE_INFO DeviceInfo; PSOUND_DEVICE SoundDevice; MMDEVICE_TYPE DeviceType; BOOL Ret; @@ -577,36 +596,52 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO)); - - DeviceInfo.Header.FrameExtent = Length; + DeviceInfo = (PWDMAUD_DEVICE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WDMAUD_DEVICE_INFO)); + if (!DeviceInfo) + { + // no memory + return MMSYSERR_NOMEM; + } + + DeviceInfo->Header.FrameExtent = Length; if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - DeviceInfo.Header.DataUsed = Length; - } - DeviceInfo.Header.Data = OffsetPtr; - DeviceInfo.Header.Size = sizeof(WDMAUD_DEVICE_INFO); - DeviceInfo.Header.PresentationTime.Numerator = 1; - DeviceInfo.Header.PresentationTime.Denominator = 1; - DeviceInfo.hDevice = Handle; - DeviceInfo.DeviceType = DeviceType; - - - + DeviceInfo->Header.DataUsed = Length; + } + DeviceInfo->Header.Data = OffsetPtr; + DeviceInfo->Header.Size = sizeof(WDMAUD_DEVICE_INFO); + DeviceInfo->Header.PresentationTime.Numerator = 1; + DeviceInfo->Header.PresentationTime.Denominator = 1; + DeviceInfo->hDevice = Handle; + DeviceInfo->DeviceType = DeviceType; + + + // create completion event Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (Overlap->Standard.hEvent == NULL) + { + // no memory + return MMSYSERR_NOMEM; + } + + Overlap->OriginalCompletionRoutine = CompletionRoutine; + Overlap->CompletionContext = (PVOID)DeviceInfo; if (DeviceType == WAVE_OUT_DEVICE_TYPE) { - Ret = WriteFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); + Ret = WriteFileEx(KernelHandle, DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, LegacyCompletionRoutine); if (Ret) WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); } else if (DeviceType == WAVE_IN_DEVICE_TYPE) { - Ret = ReadFileEx(KernelHandle, &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, CompletionRoutine); - //if (Ret) - // WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); - } + Ret = ReadFileEx(KernelHandle, DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPOVERLAPPED)Overlap, LegacyCompletionRoutine); + if (Ret) + WaitForSingleObjectEx (KernelHandle, INFINITE, TRUE); + } + + // close event handle + CloseHandle(Overlap->Standard.hEvent); return MMSYSERR_NOERROR; } Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Thu Feb 3 09:34:59 2011 @@ -421,7 +421,7 @@ PSOUND_OVERLAPPED Overlap = (PSOUND_OVERLAPPED)lpOverlapped; /* Call mmebuddy overlap routine */ - Overlap->OriginalCompletionRoutine(dwErrorCode, Overlap->OriginalBufferSize, lpOverlapped); + Overlap->OriginalCompletionRoutine(dwErrorCode, PtrToUlong(Overlap->CompletionContext), lpOverlapped); } MMRESULT @@ -527,7 +527,7 @@ DeviceInfo.Header.PresentationTime.Numerator = 1; DeviceInfo.Header.PresentationTime.Denominator = 1; - Overlap->OriginalBufferSize = Length; + Overlap->CompletionContext = UlongToPtr(Length); Overlap->OriginalCompletionRoutine = CompletionRoutine; Overlap->Standard.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Thu Feb 3 09:34:59 2011 @@ -185,8 +185,8 @@ PWAVEHDR Header; BOOL PerformCompletion; - DWORD OriginalBufferSize; LPOVERLAPPED_COMPLETION_ROUTINE OriginalCompletionRoutine; + PVOID CompletionContext; } SOUND_OVERLAPPED, *PSOUND_OVERLAPPED;

13 years, 8 months

[tkreuzer] 50599: [CMAKE] -Define HAVE_ALLOCA_H for dbghelp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 2 17:40:25 2011 New Revision: 50599 URL: http://svn.reactos.org/svn/reactos?rev=50599&view=rev Log: [CMAKE] -Define HAVE_ALLOCA_H for dbghelp Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Wed Feb 2 17:40:25 2011 @@ -5,6 +5,7 @@ -D__USE_CRTIMP -D_WINE -DHAVE_REGEX_H + -DHAVE_ALLOCA_H -D_IMAGEHLP_SOURCE_) if(ARCH MATCHES amd64)

13 years, 8 months

[tkreuzer] 50598: [WINE] Add alloca.h, which includes malloc.h. This is neccessary for MSVC builds of dbghelp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 2 17:39:22 2011 New Revision: 50598 URL: http://svn.reactos.org/svn/reactos?rev=50598&view=rev Log: [WINE] Add alloca.h, which includes malloc.h. This is neccessary for MSVC builds of dbghelp Added: branches/cmake-bringup/include/reactos/wine/alloca.h (with props) Added: branches/cmake-bringup/include/reactos/wine/alloca.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/alloca.h (added) +++ branches/cmake-bringup/include/reactos/wine/alloca.h [iso-8859-1] Wed Feb 2 17:39:22 2011 @@ -1,0 +1,2 @@ + +#include <malloc.h> Propchange: branches/cmake-bringup/include/reactos/wine/alloca.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 8 months

[tkreuzer] 50597: [SECUR32] - Sort exports like on Windows - Implement some functions as proper stubs [SECURITY] - Cleanup exports (remove 31 of 77 functions) - properly forward all exports - Link ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 2 17:06:20 2011 New Revision: 50597 URL: http://svn.reactos.org/svn/reactos?rev=50597&view=rev Log: [SECUR32] - Sort exports like on Windows - Implement some functions as proper stubs [SECURITY] - Cleanup exports (remove 31 of 77 functions) - properly forward all exports - Link to secur32 for forwarded exports Added: branches/cmake-bringup/dll/win32/secur32/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt branches/cmake-bringup/dll/win32/secur32/secur32.spec branches/cmake-bringup/dll/win32/security/CMakeLists.txt branches/cmake-bringup/dll/win32/security/security.spec Modified: branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Wed Feb 2 17:06:20 2011 @@ -9,6 +9,7 @@ secext.c sspi.c secur32.rc + stubs.c ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/secur32.def ) Modified: branches/cmake-bringup/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/secur32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/secur32/secur32.spec [iso-8859-1] Wed Feb 2 17:06:20 2011 @@ -1,17 +1,10 @@ -@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) -@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall LsaDeregisterLogonProcess(long) -@ stdcall LsaConnectUntrusted(long) -@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) -@ stdcall LsaFreeReturnBuffer(ptr) -@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) @ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) +@ stdcall AddSecurityPackageW(wstr ptr) @ stdcall ApplyControlTokenA(ptr ptr) @ stdcall ApplyControlToken(ptr ptr) ApplyControlTokenW @ stdcall CompleteAuthToken(ptr ptr) @@ -19,8 +12,8 @@ @ stub CredUnmarshalTargetInfo @ stdcall DecryptMessage(ptr ptr long ptr) @ stdcall DeleteSecurityContext(ptr) -@ stub DeleteSecurityPackageA -@ stub DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) +@ stdcall DeleteSecurityPackageW(wstr) @ stdcall EncryptMessage(ptr long ptr long) @ stdcall EnumerateSecurityPackagesA(ptr ptr) @ stdcall EnumerateSecurityPackagesW(ptr ptr) @@ -29,7 +22,7 @@ @ stdcall FreeCredentialsHandle(ptr) @ stdcall GetComputerObjectNameA(long ptr ptr) @ stdcall GetComputerObjectNameW(long ptr ptr) -@ stub GetSecurityUserInfo +@ stdcall GetSecurityUserInfo(ptr long ptr) @ stdcall GetUserNameExA(long ptr ptr) @ stdcall GetUserNameExW(long ptr ptr) @ stdcall ImpersonateSecurityContext(ptr) @@ -39,8 +32,15 @@ @ stdcall InitSecurityInterfaceW() @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) +@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) +@ stdcall LsaFreeReturnBuffer(ptr) @ stdcall LsaGetLogonSessionData(ptr ptr) +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) @ stdcall LsaRegisterPolicyChangeNotification(long ptr) @ stdcall LsaUnregisterPolicyChangeNotification(long ptr) @ stdcall MakeSignature(ptr long ptr long) @@ -64,7 +64,7 @@ @ stdcall SealMessage(ptr long ptr long) EncryptMessage @ stub SecCacheSspiPackages @ stub SecDeleteUserModeContext -@ stub SecGetLocaleSpecificEncryptionRules +@ stub SecGetLocaleSpecificEncryptionRules # not on win32k3 x64 @ stub SecInitUserModeContext @ stub SecpFreeMemory @ stub SecpTranslateName Added: branches/cmake-bringup/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/secur32… ============================================================================== --- branches/cmake-bringup/dll/win32/secur32/stubs.c (added) +++ branches/cmake-bringup/dll/win32/secur32/stubs.c [iso-8859-1] Wed Feb 2 17:06:20 2011 @@ -1,0 +1,56 @@ + + +#include <windows.h> + +#define NDEBUG +#include <reactos/debug.h> + +#define SEC_ENTRY WINAPI +#define STATUS_UNSUCCESSFUL ((SECURITY_STATUS)0x80000001) + +typedef LONG SECURITY_STATUS; +typedef PVOID PSECURITY_PACKAGE_OPTIONS, PSecurityUserData; + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityPackageA(LPSTR pszPackageName) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityPackageW(LPWSTR pszPackageName) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +AddSecurityPackageA(LPSTR pszPackageName, PSECURITY_PACKAGE_OPTIONS pOptions) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +AddSecurityPackageW(LPWSTR pszPackageName, PSECURITY_PACKAGE_OPTIONS pOptions) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +GetSecurityUserInfo( + PLUID LogonId, + ULONG Flags, + PSecurityUserData *UserInformation) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Propchange: branches/cmake-bringup/dll/win32/secur32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/securit… ============================================================================== --- branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] Wed Feb 2 17:06:20 2011 @@ -6,12 +6,11 @@ list(APPEND SOURCE security.rc - ${CMAKE_CURRENT_BINARY_DIR}/security_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/security.def) add_library(security SHARED ${SOURCE}) set_entrypoint(security 0) -add_importlibs(security advapi32 ntdll kernel32) +add_importlibs(security secur32 advapi32 ntdll kernel32) add_cab_target(security 1) Modified: branches/cmake-bringup/dll/win32/security/security.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/securit… ============================================================================== --- branches/cmake-bringup/dll/win32/security/security.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/security/security.spec [iso-8859-1] Wed Feb 2 17:06:20 2011 @@ -1,48 +1,27 @@ -@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess -@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser -@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess -@ stdcall LsaConnectUntrusted(long) secur32.LsaConnectUntrusted -@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) SECUR32.LsaLookupAuthenticationPackage -@ stdcall LsaFreeReturnBuffer(ptr) SECUR32.LsaFreeReturnBuffer -@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) SECUR32.LsaCallAuthenticationPackage @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) SECUR32.AcceptSecurityContext @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleA @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleW -@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) SECUR32.AddCredentialsA -@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) SECUR32.AddCredentialsW -@ stub AddSecurityPackageA # SECUR32.AddSecurityPackageA -@ stub AddSecurityPackageW # SECUR32.AddSecurityPackageW -@ stdcall ApplyControlTokenA(ptr ptr) SECUR32.ApplyControlTokenA -@ stdcall ApplyControlTokenW(ptr ptr) SECUR32.ApplyControlTokenW +@ stdcall AddSecurityPackageA(str ptr) SECUR32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) SECUR32.AddSecurityPackageW +@ stdcall ApplyControlToken(ptr ptr) SECUR32.ApplyControlToken @ stdcall CompleteAuthToken(ptr ptr) SECUR32.CompleteAuthToken -@ stub CredMarshalTargetInfo # SECUR32.CredMarshalTargetInfo -@ stub CredUnmarshalTargetInfo # SECUR32.CredUnmarshalTargetInfo @ stdcall DecryptMessage(ptr ptr long ptr) SECUR32.DecryptMessage @ stdcall DeleteSecurityContext(ptr) SECUR32.DeleteSecurityContext -@ stub DeleteSecurityPackageA # SECUR32.DeleteSecurityPackageA -@ stub DeleteSecurityPackageW # SECUR32.DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) SECUR32.DeleteSecurityPackageA +@ stdcall DeleteSecurityPackageW(wstr) SECUR32.DeleteSecurityPackageW @ stdcall EncryptMessage(ptr long ptr long) SECUR32.EncryptMessage @ stdcall EnumerateSecurityPackagesA(ptr ptr) SECUR32.EnumerateSecurityPackagesA @ stdcall EnumerateSecurityPackagesW(ptr ptr) SECUR32.EnumerateSecurityPackagesW @ stdcall ExportSecurityContext(ptr long ptr ptr) SECUR32.ExportSecurityContext @ stdcall FreeContextBuffer(ptr) SECUR32.FreeContextBuffer @ stdcall FreeCredentialsHandle(ptr) SECUR32.FreeCredentialsHandle -@ stdcall GetComputerObjectNameA(long ptr ptr) SECUR32.GetComputerObjectNameA -@ stdcall GetComputerObjectNameW(long ptr ptr) SECUR32.GetComputerObjectNameW -@ stub GetSecurityUserInfo # SECUR32.GetSecurityUserInfo -@ stdcall GetUserNameExA(long ptr ptr) SECUR32.GetUserNameExA -@ stdcall GetUserNameExW(long ptr ptr) SECUR32.GetUserNameExW @ stdcall ImpersonateSecurityContext(ptr) SECUR32.ImpersonateSecurityContext @ stdcall ImportSecurityContextA(str ptr ptr ptr) SECUR32.ImportSecurityContextA @ stdcall ImportSecurityContextW(wstr ptr ptr ptr) SECUR32.ImportSecurityContextW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW @ stdcall InitSecurityInterfaceA() SECUR32.InitSecurityInterfaceA @ stdcall InitSecurityInterfaceW() SECUR32.InitSecurityInterfaceW -@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA -@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW -@ stdcall LsaEnumerateLogonSessions(ptr ptr) SECUR32.LsaEnumerateLogonSessions -@ stdcall LsaGetLogonSessionData(ptr ptr) SECUR32.LsaGetLogonSessionData -@ stdcall LsaRegisterPolicyChangeNotification(long ptr) SECUR32.LsaRegisterPolicyChangeNotification -@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) SECUR32.LsaUnregisterPolicyChangeNotification @ stdcall MakeSignature(ptr long ptr long) SECUR32.MakeSignature @ stdcall QueryContextAttributesA(ptr long ptr) SECUR32.QueryContextAttributesA @ stdcall QueryContextAttributesW(ptr long ptr) SECUR32.QueryContextAttributesW @@ -52,26 +31,7 @@ @ stdcall QuerySecurityPackageInfoA(str ptr) SECUR32.QuerySecurityPackageInfoA @ stdcall QuerySecurityPackageInfoW(wstr ptr) SECUR32.QuerySecurityPackageInfoW @ stdcall RevertSecurityContext(ptr) SECUR32.RevertSecurityContext -@ stub SaslAcceptSecurityContext # SECUR32.SaslAcceptSecurityContext -@ stub SaslEnumerateProfilesA # SECUR32.SaslEnumerateProfilesA -@ stub SaslEnumerateProfilesW # SECUR32.SaslEnumerateProfilesW -@ stub SaslGetProfilePackageA # SECUR32.SaslGetProfilePackageA -@ stub SaslGetProfilePackageW # SECUR32.SaslGetProfilePackageW -@ stub SaslIdentifyPackageA # SECUR32.SaslIdentifyPackageA -@ stub SaslIdentifyPackageW # SECUR32.SaslIdentifyPackageW -@ stub SaslInitializeSecurityContextA # SECUR32.SaslInitializeSecurityContextA -@ stub SaslInitializeSecurityContextW # SECUR32.SaslInitializeSecurityContextW @ stdcall SealMessage(ptr long ptr long) SECUR32.EncryptMessage -@ stub SecCacheSspiPackages # SECUR32.SecCacheSspiPackages -@ stub SecDeleteUserModeContext # SECUR32.SecDeleteUserModeContext -@ stub SecGetLocaleSpecificEncryptionRules # SECUR32.SecGetLocaleSpecificEncryptionRules -@ stub SecInitUserModeContext # SECUR32.SecInitUserModeContext -@ stub SecpFreeMemory # SECUR32.SecpFreeMemory -@ stub SecpTranslateName # SECUR32.SecpTranslateName -@ stub SecpTranslateNameEx # SECUR32.SecpTranslateNameEx -@ stub SetContextAttributesA # SECUR32.SetContextAttributesA -@ stub SetContextAttributesW #SECUR32.SetContextAttributesW -@ stdcall TranslateNameA(str long long ptr ptr) SECUR32.TranslateNameA -@ stdcall TranslateNameW(wstr long long ptr ptr) SECUR32.TranslateNameW @ stdcall UnsealMessage(ptr ptr long ptr) SECUR32.DecryptMessage @ stdcall VerifySignature(ptr ptr long ptr) SECUR32.VerifySignature +

13 years, 8 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 February 2011