Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[spetreolle] 43995: Report spoolsv service status at startup. this fixes 1 advapi32:service test.
by spetreolle＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: spetreolle Date: Sat Nov 7 12:43:06 2009 New Revision: 43995 URL: http://svn.reactos.org/svn/reactos?rev=43995&view=rev Log: Report spoolsv service status at startup. this fixes 1 advapi32:service test. Modified: trunk/reactos/base/services/spoolsv/spoolsv.c Modified: trunk/reactos/base/services/spoolsv/spoolsv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] (original) +++ trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] Sat Nov 7 12:43:06 2009 @@ -19,6 +19,7 @@ #define SERVICE_NAME TEXT("Spooler") SERVICE_STATUS_HANDLE ServiceStatusHandle; +SERVICE_STATUS ServiceStatus; /* FUNCTIONS *****************************************************************/ @@ -55,8 +56,16 @@ ServiceControlHandler, NULL); - - + /* Service is now running */ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwWin32ExitCode = NO_ERROR; + ServiceStatus.dwWaitHint = 0; + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP; + ServiceStatus.dwCheckPoint = 0; + ServiceStatus.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(ServiceStatusHandle, &ServiceStatus); + DPRINT("ServiceMain() done\n"); }

1 0

[janderwald] 43994: [DSOUND_NEW] - Implement stereo to mono channel conversion - Create a thread which performs the mixing - Fixes messed up voice recording in Skype 3.6
by janderwald＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: janderwald Date: Sat Nov 7 04:43:56 2009 New Revision: 43994 URL: http://svn.reactos.org/svn/reactos?rev=43994&view=rev Log: [DSOUND_NEW] - Implement stereo to mono channel conversion - Create a thread which performs the mixing - Fixes messed up voice recording in Skype 3.6 Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c trunk/reactos/dll/directx/dsound_new/misc.c trunk/reactos/dll/directx/dsound_new/precomp.h Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] Sat Nov 7 04:43:56 2009 @@ -30,8 +30,101 @@ BOOL bMix; BOOL bLoop; KSSTATE State; + PUCHAR MixBuffer; + ULONG MixBufferSize; + HANDLE hStopEvent; + volatile LONG StopMixerThread; + volatile LONG CurrentMixPosition; }CDirectSoundCaptureBufferImpl, *LPCDirectSoundCaptureBufferImpl; + +DWORD +WINAPI +MixerThreadRoutine( + LPVOID lpParameter) +{ + KSPROPERTY Request; + KSAUDIO_POSITION Position; + DWORD Result, MixPosition, BufferPosition, BytesWritten, BytesRead, MixLength, BufferLength; + LPCDirectSoundCaptureBufferImpl This = (LPCDirectSoundCaptureBufferImpl)lpParameter; + + /* setup audio position property request */ + Request.Id = KSPROPERTY_AUDIO_POSITION; + Request.Set = KSPROPSETID_Audio; + Request.Flags = KSPROPERTY_TYPE_GET; + + MixPosition = 0; + BufferPosition = 0; + do + { + /* query current position */ + Result = SyncOverlappedDeviceIoControl(This->hPin, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSPROPERTY), (PVOID)&Position, sizeof(KSAUDIO_POSITION), NULL); + + /* sanity check */ + ASSERT(Result == ERROR_SUCCESS); + + /* FIXME implement samplerate conversion */ + ASSERT(This->MixFormat.nSamplesPerSec == This->Format->nSamplesPerSec); + + /* FIXME implement bitrate conversion */ + ASSERT(This->MixFormat.wBitsPerSample == This->Format->wBitsPerSample); + + /* sanity check */ + ASSERT(BufferPosition <= This->BufferSize); + ASSERT(MixPosition <= This->MixBufferSize); + + if (BufferPosition == This->BufferSize) + { + /* restart from front */ + BufferPosition = 0; + } + + if (MixPosition == This->MixBufferSize) + { + /* restart from front */ + MixPosition = 0; + } + + if (This->MixFormat.nChannels != This->Format->nChannels) + { + if ((DWORD)Position.PlayOffset >= MixPosition) + { + /* calculate buffer position difference */ + MixLength = Position.PlayOffset - MixPosition; + } + else + { + /* buffer overlap */ + MixLength = This->MixBufferSize - MixPosition; + } + + BufferLength = This->BufferSize - BufferPosition; + + /* convert the format */ + PerformChannelConversion(&This->MixBuffer[MixPosition], MixLength, &BytesRead, This->MixFormat.nChannels, This->Format->nChannels, This->Format->wBitsPerSample, &This->Buffer[BufferPosition], BufferLength, &BytesWritten); + + /* update buffer offsets */ + MixPosition += BytesRead; + BufferPosition += BytesWritten; + DPRINT("MixPosition %u BufferPosition %u BytesRead %u BytesWritten %u MixLength %u BufferLength %u\n", MixPosition, BufferPosition, BytesRead, BytesWritten, MixLength, BufferLength); + } + /* update offset */ + InterlockedExchange(&This->CurrentMixPosition, (LONG)BufferPosition); + + /* FIXME use timer */ + Sleep(10); + + }while(InterlockedCompareExchange(&This->StopMixerThread, 0, 0) == 0); + + + /* signal stop event */ + SetEvent(This->hStopEvent); + + /* done */ + return 0; +} + + HRESULT WINAPI @@ -94,6 +187,18 @@ { /* close pin handle */ CloseHandle(This->hPin); + } + + if (This->hStopEvent) + { + /* close stop event handle */ + CloseHandle(This->hStopEvent); + } + + if (This->MixBuffer) + { + /* free mix buffer */ + HeapFree(GetProcessHeap(), 0, This->MixBuffer); } /* free capture buffer */ @@ -145,6 +250,7 @@ KSAUDIO_POSITION Position; KSPROPERTY Request; DWORD Result; + DWORD Value; LPCDirectSoundCaptureBufferImpl This = (LPCDirectSoundCaptureBufferImpl)CONTAINING_RECORD(iface, CDirectSoundCaptureBufferImpl, lpVtbl); @@ -157,6 +263,20 @@ *lpdwReadPosition = 0; DPRINT("No Audio Pin\n"); + return DS_OK; + } + + if (This->bMix) + { + /* read current position */ + Value = InterlockedCompareExchange(&This->CurrentMixPosition, 0, 0); + + if (lpdwCapturePosition) + *lpdwCapturePosition = (DWORD)Value; + + if (lpdwReadPosition) + *lpdwReadPosition = (DWORD)Value; + return DS_OK; } @@ -326,6 +446,8 @@ DWORD Result, BytesTransferred; OVERLAPPED Overlapped; KSSTATE State; + HANDLE hThread; + LPCDirectSoundCaptureBufferImpl This = (LPCDirectSoundCaptureBufferImpl)CONTAINING_RECORD(iface, CDirectSoundCaptureBufferImpl, lpVtbl); DPRINT("IDirectSoundCaptureBufferImpl_Start Flags %x\n", dwFlags); @@ -367,7 +489,7 @@ /* initialize stream header */ Header.FrameExtent = This->BufferSize; Header.DataUsed = 0; - Header.Data = This->Buffer; + Header.Data = (This->bMix ? This->MixBuffer : This->Buffer); Header.Size = sizeof(KSSTREAM_HEADER); Header.PresentationTime.Numerator = 1; Header.PresentationTime.Denominator = 1; @@ -379,6 +501,34 @@ DPRINT("Failed submit buffer with %lx\n", Result); return DSERR_GENERIC; } + + if (This->bMix) + { + if (!This->hStopEvent) + { + /* create stop event */ + This->hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + if (!This->hStopEvent) + { + DPRINT1("Failed to create event object with %x\n", GetLastError()); + return DSERR_GENERIC; + } + } + + /* set state to stop false */ + This->StopMixerThread = FALSE; + + hThread = CreateThread(NULL, 0, MixerThreadRoutine, (PVOID)This, 0, NULL); + if (!hThread) + { + DPRINT1("Failed to create thread with %x\n", GetLastError()); + return DSERR_GENERIC; + } + + /* close thread handle */ + CloseHandle(hThread); + } + return DS_OK; } @@ -413,6 +563,20 @@ Result = SyncOverlappedDeviceIoControl(This->hPin, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&State, sizeof(KSSTATE), NULL); ASSERT(Result == ERROR_SUCCESS); + + + if (This->bMix) + { + /* sanity check */ + ASSERT(This->hStopEvent); + /* reset event */ + ResetEvent(This->hStopEvent); + /* signal event to stop */ + This->StopMixerThread = TRUE; + /* Wait for the event to stop */ + WaitForSingleObject(This->hStopEvent, INFINITE); + } + if (Result == ERROR_SUCCESS) { @@ -492,7 +656,7 @@ LPFILTERINFO Filter, LPCDSCBUFFERDESC lpcDSBufferDesc) { - DWORD FormatSize; + DWORD FormatSize, MixBufferSize; ULONG DeviceId = 0, PinId; DWORD Result = ERROR_SUCCESS; WAVEFORMATEX MixFormat; @@ -580,11 +744,33 @@ { /* FIXME should not happen */ DPRINT("failed to compute a compatible format\n"); + HeapFree(GetProcessHeap(), 0, This->MixBuffer); HeapFree(GetProcessHeap(), 0, This->Buffer); HeapFree(GetProcessHeap(), 0, This->Format); HeapFree(GetProcessHeap(), 0, This); return DSERR_GENERIC; } + + MixBufferSize = lpcDSBufferDesc->dwBufferBytes; + MixBufferSize /= lpcDSBufferDesc->lpwfxFormat->nChannels; + MixBufferSize /= (lpcDSBufferDesc->lpwfxFormat->wBitsPerSample/8); + + MixBufferSize *= This->MixFormat.nChannels; + MixBufferSize *= (This->MixFormat.wBitsPerSample/8); + + /* allocate buffer for mixing */ + This->MixBuffer = HeapAlloc(GetProcessHeap(), 0, MixBufferSize); + if (!This->Buffer) + { + /* not enough memory */ + CloseHandle(This->hPin); + HeapFree(GetProcessHeap(), 0, This->Buffer); + HeapFree(GetProcessHeap(), 0, This->Format); + HeapFree(GetProcessHeap(), 0, This); + return DSERR_OUTOFMEMORY; + } + This->MixBufferSize = MixBufferSize; + DPRINT1("MixBufferSize %u BufferSize %u\n", MixBufferSize, This->BufferSize); } /* initialize capture buffer */ Modified: trunk/reactos/dll/directx/dsound_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/mis… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/misc.c [iso-8859-1] Sat Nov 7 04:43:56 2009 @@ -12,6 +12,69 @@ const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; + + +VOID +PerformChannelConversion( + PUCHAR Buffer, + ULONG BufferLength, + PULONG BytesRead, + ULONG OldChannels, + ULONG NewChannels, + ULONG BitsPerSample, + PUCHAR Result, + ULONG ResultLength, + PULONG BytesWritten) +{ + DWORD Samples; + DWORD NewIndex, OldIndex; + DWORD NewLength, Skip; + + Samples = BufferLength / (BitsPerSample / 8) / OldChannels; + + if (NewChannels > OldChannels) + { + UNIMPLEMENTED + ASSERT(0); + } + + /* setup index */ + NewIndex = 0; + OldIndex = 0; + + /* calculate offsets */ + NewLength = NewChannels * (BitsPerSample/8); + Skip = OldChannels * (BitsPerSample/8); + + do + { + if (NewIndex + NewLength>= ResultLength) + { + NewIndex = ResultLength; + break; + } + + if (OldIndex + Skip >= BufferLength) + { + OldIndex = BufferLength; + break; + } + + /* copy first channel */ + RtlMoveMemory(&Result[NewIndex], &Buffer[OldIndex], NewLength); + + /* skip other channels */ + OldIndex += Skip; + + /* increment offset */ + NewIndex += NewLength; + + }while(TRUE); + + *BytesRead = OldIndex; + *BytesWritten = NewIndex; +} + BOOL SetPinFormat( @@ -498,20 +561,21 @@ else if (WaveFormatOut->wBitsPerSample > AudioRange->MaximumBitsPerSample) WaveFormatOut->wBitsPerSample = AudioRange->MaximumBitsPerSample; - DPRINT1("MinimumBitsPerSample %u MaximumBitsPerSample %u MinimumSampleFrequency %u MaximumSampleFrequency %u\n", + DPRINT("MinimumBitsPerSample %u MaximumBitsPerSample %u MinimumSampleFrequency %u MaximumSampleFrequency %u\n", AudioRange->MinimumBitsPerSample, AudioRange->MaximumBitsPerSample, AudioRange->MinimumSampleFrequency, AudioRange->MaximumSampleFrequency); for(nChannels = 1; nChannels <= AudioRange->MaximumChannels; nChannels++) { WaveFormatOut->nChannels = nChannels; + dwResult = OpenPin(hFilter, PinId, WaveFormatOut, hPin, TRUE); + if (dwResult == ERROR_SUCCESS) + { DPRINT("InFormat nChannels %u wBitsPerSample %u nSamplesPerSec %u\nOutFormat nChannels %u nBitsPerSample %u nSamplesPerSec %u\n", WaveFormatEx->nChannels, WaveFormatEx->wBitsPerSample, WaveFormatEx->nSamplesPerSec, WaveFormatOut->nChannels, WaveFormatOut->wBitsPerSample, WaveFormatOut->nSamplesPerSec); - dwResult = OpenPin(hFilter, PinId, WaveFormatOut, hPin, TRUE); - if (dwResult == ERROR_SUCCESS) - { + /* free buffer */ HeapFree(GetProcessHeap(), 0, Item); return TRUE; Modified: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Sat Nov 7 04:43:56 2009 @@ -110,6 +110,18 @@ /* misc.c */ +VOID +PerformChannelConversion( + PUCHAR Buffer, + ULONG BufferLength, + PULONG BytesRead, + ULONG OldChannels, + ULONG NewChannels, + ULONG BitsPerSample, + PUCHAR Result, + ULONG ResultLength, + PULONG BytesWritten); + BOOL SetPinFormat( IN HANDLE hPin,

1 0

[tkreuzer] 43993: [RTL] Simplify RtlLookupFunctionTable
by tkreuzer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: tkreuzer Date: Sat Nov 7 04:33:00 2009 New Revision: 43993 URL: http://svn.reactos.org/svn/reactos?rev=43993&view=rev Log: [RTL] Simplify RtlLookupFunctionTable Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Sat Nov 7 04:33:00 2009 @@ -60,6 +60,17 @@ /* FUNCTIONS *****************************************************************/ +/*! RtlLookupFunctionTable + * \brief Locates the table of RUNTIME_FUNCTION entries for a code address. + * \param ControlPc + * Address of the code, for which the table should be searched. + * \param ImageBase + * Pointer to a DWORD64 that receives the base address of the + * corresponding executable image. + * \param Length + * Pointer to an ULONG that receives the number of table entries + * present in the table. + */ PRUNTIME_FUNCTION NTAPI RtlLookupFunctionTable( @@ -67,34 +78,27 @@ OUT PDWORD64 ImageBase, OUT PULONG Length) { - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_DATA_DIRECTORY Directory; - - /* Find ModuleBase */ - if (!RtlPcToFileHeader((PVOID)ControlPc, (PVOID*)&DosHeader)) - { + PVOID Table; + ULONG Size; + + /* Find corresponding file header from code address */ + if (!RtlPcToFileHeader((PVOID)ControlPc, (PVOID*)ImageBase)) + { + /* Nothing found */ return NULL; } - /* Locate NT header and check number of directories */ - NtHeader = (PVOID)((ULONG64)DosHeader + DosHeader->e_lfanew); - if (NtHeader->OptionalHeader.NumberOfRvaAndSizes - < IMAGE_DIRECTORY_ENTRY_EXCEPTION) - { - return NULL; - } - /* Locate the exception directory */ - Directory = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION]; - *Length = Directory->Size / sizeof(RUNTIME_FUNCTION); - *ImageBase = (ULONG64)DosHeader; - if (!Directory->VirtualAddress) - { - return NULL; - } - - return (PVOID)((ULONG64)DosHeader + Directory->VirtualAddress); + Table = RtlImageDirectoryEntryToData((PVOID)*ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXCEPTION, + &Size); + + /* Return the number of entries */ + *Length = Size / sizeof(RUNTIME_FUNCTION); + + /* Return the address of the table */ + return Table; } /*! RtlLookupFunctionEntry @@ -119,7 +123,7 @@ /* Fail, if no table is found */ if (!FunctionTable) { - return (PVOID)1; + return NULL; } /* Use relative virtual address */

1 0

[sserapion] 43992: Fix user32 build mostly tested in trunk. Some local changes still not committed.
by sserapion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: sserapion Date: Sat Nov 7 01:10:56 2009 New Revision: 43992 URL: http://svn.reactos.org/svn/reactos?rev=43992&view=rev Log: Fix user32 build mostly tested in trunk. Some local changes still not committed. Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dialog.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/messagebox.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/prop.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/spy.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -65,5 +65,5 @@ BOOL Unicode); HWND* WIN_ListChildren (HWND hWndparent); -ULONG_PTR FASTCALL IntGetWndProc(PWND, BOOL); +WNDPROC FASTCALL IntGetWndProc(PWND, BOOL); DWORD WINAPI GetRealWindowOwner(HWND); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -266,11 +266,11 @@ // // Based on IntGetClsWndProc // -ULONG_PTR FASTCALL +WNDPROC FASTCALL IntGetWndProc(PWND pWnd, BOOL Ansi) { INT i; - ULONG_PTR gcpd, Ret = 0; + WNDPROC gcpd, Ret = 0; PCLS Class = DesktopPtrToUser(pWnd->pcls); if (!Class) return Ret; @@ -282,9 +282,9 @@ if (GETPFNSERVER(i) == pWnd->lpfnWndProc) { if (Ansi) - Ret = (ULONG_PTR)GETPFNCLIENTA(i); + Ret = GETPFNCLIENTA(i); else - Ret = (ULONG_PTR)GETPFNCLIENTW(i); + Ret = GETPFNCLIENTW(i); } } return Ret; @@ -296,36 +296,36 @@ is treated specially. */ if (Class->fnid == FNID_EDIT) - Ret = (ULONG_PTR)pWnd->lpfnWndProc; + Ret = pWnd->lpfnWndProc; else { // Set return proc. - Ret = (ULONG_PTR)pWnd->lpfnWndProc; + Ret = pWnd->lpfnWndProc; if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON) { if (Ansi) { if (GETPFNCLIENTW(Class->fnid) == pWnd->lpfnWndProc) - Ret = (ULONG_PTR)GETPFNCLIENTA(Class->fnid); + Ret = GETPFNCLIENTA(Class->fnid); } else { if (GETPFNCLIENTA(Class->fnid) == pWnd->lpfnWndProc) - Ret = (ULONG_PTR)GETPFNCLIENTW(Class->fnid); + Ret = GETPFNCLIENTW(Class->fnid); } } // Return on the change. - if ( Ret != (ULONG_PTR)pWnd->lpfnWndProc) + if ( Ret != pWnd->lpfnWndProc) return Ret; } if ( Ansi == !!(pWnd->state & WNDS_ANSIWINDOWPROC) ) return Ret; - gcpd = NtUserGetCPD( UserHMGetHandle(pWnd), - (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow, - Ret); + gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd), + (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow, + (ULONG_PTR)&Ret); return (gcpd ? gcpd : Ret); } @@ -658,7 +658,7 @@ } -LONG_PTR Internal_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) +LONG_PTR IntGetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) { LONG_PTR retvalue = 0; WND *wndPtr; @@ -724,7 +724,7 @@ WINAPI GetWindowLongA ( HWND hWnd, int nIndex ) { - return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG), FALSE ); + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG), FALSE ); } /* @@ -734,30 +734,30 @@ WINAPI GetWindowLongW(HWND hWnd, int nIndex) { - return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG), TRUE ); + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG), TRUE ); } #ifdef _WIN64 /* - * @unimplemented + * @implemented */ LONG_PTR WINAPI GetWindowLongPtrA(HWND hWnd, INT nIndex) { - return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), FALSE ); -} - -/* - * @unimplemented + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), FALSE ); +} + +/* + * @implemented */ LONG_PTR WINAPI GetWindowLongPtrW(HWND hWnd, INT nIndex) { - return Internal_GetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), TRUE ); + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), TRUE ); } #endif // _WIN64 @@ -784,17 +784,7 @@ } break; } - return Internal_GetWindowLong( hWnd, nIndex, sizeof(WORD), FALSE ); -} - -/* - * @implemented - */ -WORD -WINAPI -SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) -{ - return (WORD)NtUserSetWindowLong ( hWnd, nIndex, (LONG)wNewWord, TRUE ); + return IntGetWindowLong( hWnd, nIndex, sizeof(WORD), FALSE ); } /* @@ -1200,7 +1190,7 @@ int nIndex, LONG dwNewLong) { - PSTR lpStr = (PSTR)dwNewLong; + PSTR lpStr = (PSTR)(ULONG_PTR)dwNewLong; UNICODE_STRING Value = {0}; BOOL Allocated = FALSE; DWORD Ret; @@ -1223,7 +1213,7 @@ else Value.Buffer = (PWSTR)lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } else if (nIndex == GCW_ATOM && lpStr != NULL) { @@ -1241,7 +1231,7 @@ else Value.Buffer = (PWSTR)lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } Ret = (DWORD)NtUserSetClassLong(hWnd, @@ -1267,7 +1257,7 @@ int nIndex, LONG dwNewLong) { - PWSTR lpStr = (PWSTR)dwNewLong; + PWSTR lpStr = (PWSTR)(ULONG_PTR)dwNewLong; UNICODE_STRING Value = {0}; TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); @@ -1284,7 +1274,7 @@ else Value.Buffer = lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } else if (nIndex == GCW_ATOM && lpStr != NULL) { @@ -1296,7 +1286,7 @@ else Value.Buffer = lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } return (DWORD)NtUserSetClassLong(hWnd, @@ -1352,6 +1342,30 @@ return (WORD) SetClassLongW ( hWnd, nIndex, wNewWord ); } +/* + * @implemented + */ +WORD +WINAPI +SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) +{ + switch(nIndex) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + break; + default: + if (nIndex < 0) + { + WARN("Invalid offset %d\n", nIndex ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + break; + } + return NtUserSetWindowLong( hWnd, nIndex, wNewWord, FALSE ); +} /* * @implemented @@ -1366,7 +1380,6 @@ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, TRUE); } - /* * @implemented */ @@ -1382,7 +1395,7 @@ #ifdef _WIN64 /* - * @unimplemented + * @implemented */ LONG_PTR WINAPI @@ -1390,12 +1403,11 @@ INT nIndex, LONG_PTR dwNewLong) { - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); +} + +/* + * @implemented */ LONG_PTR WINAPI @@ -1403,8 +1415,7 @@ INT nIndex, LONG_PTR dwNewLong) { - UNIMPLEMENTED; - return 0; + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); } #endif Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -54,26 +54,26 @@ { HGLOBAL hGlobal = NULL; PVOID pGlobal = NULL; - DWORD size = 0; + DWORD_PTR size = 0; /* dealing with bitmap object */ if (uFormat != CF_BITMAP) { - size = (DWORD)NtUserGetClipboardData(uFormat, NULL); + size = NtUserGetClipboardData(uFormat, NULL); if (size) { hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, size); pGlobal = GlobalLock(hGlobal); - size = (DWORD)NtUserGetClipboardData(uFormat, pGlobal); + size = NtUserGetClipboardData(uFormat, pGlobal); GlobalUnlock(hGlobal); } } else { - hGlobal = NtUserGetClipboardData(CF_BITMAP, NULL); + hGlobal = (HANDLE)NtUserGetClipboardData(CF_BITMAP, NULL); } return hGlobal; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -159,7 +159,7 @@ SETDLGINFO( hWnd, dlgInfo ); - NtUserCallHwndParam( hWnd, (DWORD)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); + NtUserCallHwndParam( hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); } else { @@ -342,7 +342,7 @@ MulDiv(info.y, dlgInfo->yBaseUnit, 8), MulDiv(info.cx, dlgInfo->xBaseUnit, 4), MulDiv(info.cy, dlgInfo->yBaseUnit, 8), - hwnd, (HMENU)info.id, + hwnd, (HMENU)(ULONG_PTR)info.id, hInst, (LPVOID)info.data ); } else @@ -373,7 +373,7 @@ MulDiv(info.y, dlgInfo->yBaseUnit, 8), MulDiv(info.cx, dlgInfo->xBaseUnit, 4), MulDiv(info.cy, dlgInfo->yBaseUnit, 8), - hwnd, (HMENU)info.id, + hwnd, (HMENU)(ULONG_PTR)info.id, hInst, (LPVOID)info.data ); } else @@ -612,7 +612,7 @@ p++; break; case 0xffff: - result->menuName = (LPCWSTR)(UINT)GET_WORD( p + 1 ); + result->menuName = (LPCWSTR)(UINT_PTR)GET_WORD( p + 1 ); p += 2; break; default: @@ -630,7 +630,7 @@ p++; break; case 0xffff: - result->className = (LPCWSTR)(UINT)GET_WORD( p + 1 ); + result->className = (LPCWSTR)(UINT_PTR)GET_WORD( p + 1 ); p += 2; break; default: Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -441,12 +441,12 @@ if (NULL != CbtCreatewndExtra->Cs.lpszName) { Csw.lpszName = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + (ULONG) CbtCreatewndExtra->Cs.lpszName); + + (ULONG_PTR) CbtCreatewndExtra->Cs.lpszName); } if (0 != HIWORD(CbtCreatewndExtra->Cs.lpszClass)) { Csw.lpszClass = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + LOWORD((ULONG) CbtCreatewndExtra->Cs.lpszClass)); + + LOWORD((ULONG_PTR) CbtCreatewndExtra->Cs.lpszClass)); } wParam = Common->wParam; if (Common->Ansi) Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -330,7 +330,7 @@ case (INT_PTR) HBMMENU_SYSTEM: if (0 != lpitem->dwItemData) { - Bmp = (HBITMAP) lpitem->dwItemData; + Bmp = (HBITMAP)(ULONG_PTR) lpitem->dwItemData; break; } /* fall through */ @@ -982,7 +982,7 @@ case WM_CREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *) lParam; - SetWindowLongPtrA(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrA(Wnd, 0, (LONG_PTR)cs->lpCreateParams); return 0; } @@ -1054,7 +1054,7 @@ case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam; - SetWindowLongPtrW(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrW(Wnd, 0, (LONG_PTR)cs->lpCreateParams); return 0; } @@ -1144,11 +1144,11 @@ resinfo = GET_WORD(res); res += sizeof(WORD); /* Align the text on a word boundary. */ - res += (~((int)res - 1)) & 1; + res += (~((UINT_PTR)res - 1)) & 1; mii.dwTypeData = (LPWSTR) res; res += (1 + strlenW(mii.dwTypeData)) * sizeof(WCHAR); /* Align the following fields on a dword boundary. */ - res += (~((int)res - 1)) & 3; + res += (~((UINT_PTR)res - 1)) & 3; if (resinfo & 1) /* Pop-up? */ { @@ -1164,7 +1164,7 @@ } mii.fMask |= MIIM_SUBMENU; mii.fType |= MF_POPUP; - mii.wID = (UINT) mii.hSubMenu; + mii.wID = (UINT_PTR) mii.hSubMenu; } else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR)) { @@ -1218,9 +1218,9 @@ if(!(res = MENU_ParseResource(res, hSubMenu, unicode))) return NULL; if(!unicode) - AppendMenuA(hMenu, flags, (UINT)hSubMenu, str); + AppendMenuA(hMenu, flags, (UINT_PTR)hSubMenu, str); else - AppendMenuW(hMenu, flags, (UINT)hSubMenu, (LPCWSTR)str); + AppendMenuW(hMenu, flags, (UINT_PTR)hSubMenu, (LPCWSTR)str); } else /* Not a popup */ { @@ -3868,7 +3868,7 @@ { mii->fType |= MFT_OWNERDRAW; mii->fMask |= MIIM_DATA; - mii->dwItemData = (DWORD) NewItem; + mii->dwItemData = (DWORD_PTR) NewItem; } else if (Flags & MF_SEPARATOR) { @@ -4245,12 +4245,9 @@ HMENU WINAPI GetMenu(HWND hWnd) { - PWND Wnd = ValidateHwnd(hWnd); - - if (!Wnd) - return NULL; - - return (HMENU)Wnd->IDMenu; + HMENU retvalue = (HMENU)GetWindowLongPtrW( hWnd, GWLP_ID ); + TRACE("for %p returning %p\n", hWnd, retvalue); + return retvalue; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -163,19 +163,19 @@ { DdeLparam->Packed = TRUE; if (! UnpackDDElParam(UMMsg->message, UMMsg->lParam, - &DdeLparam->Value.Packed.uiLo, - &DdeLparam->Value.Packed.uiHi)) + (PUINT_PTR)&DdeLparam->Value.Packed.uiLo, + (PUINT_PTR)&DdeLparam->Value.Packed.uiHi)) { return FALSE; } if (0 != HIWORD(DdeLparam->Value.Packed.uiHi)) { /* uiHi should contain a hMem from WM_DDE_EXECUTE */ - HGLOBAL h = DdeGetPair((HGLOBAL) DdeLparam->Value.Packed.uiHi); + HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->Value.Packed.uiHi); if (NULL != h) { - GlobalFree((HGLOBAL) DdeLparam->Value.Packed.uiHi); - DdeLparam->Value.Packed.uiHi = (UINT) h; + GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->Value.Packed.uiHi); + DdeLparam->Value.Packed.uiHi = (UINT_PTR) h; } } FreeDDElParam(UMMsg->message, UMMsg->lParam); @@ -685,7 +685,7 @@ return FALSE; } CsA->lpszName = AnsiString.Buffer; - if (HIWORD((ULONG)CsW->lpszClass) != 0) + if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) { RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); @@ -849,7 +849,7 @@ Cs = (CREATESTRUCTA*) AnsiMsg->lParam; RtlInitAnsiString(&AnsiString, Cs->lpszName); RtlFreeAnsiString(&AnsiString); - if (HIWORD((ULONG)Cs->lpszClass) != 0) + if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) { RtlInitAnsiString(&AnsiString, Cs->lpszClass); RtlFreeAnsiString(&AnsiString); @@ -946,7 +946,7 @@ MSG UnicodeMsg; MSG AnsiMsg; PMSG FinalMsg; - ULONG LParamSize; + SIZE_T LParamSize; } MSGCONVERSION, *PMSGCONVERSION; static PMSGCONVERSION MsgConversions = NULL; @@ -2397,7 +2397,7 @@ * @implemented */ BOOL WINAPI -TranslateMessageEx(CONST MSG *lpMsg, DWORD unk) +TranslateMessageEx(CONST MSG *lpMsg, UINT Flags) { switch (lpMsg->message) { @@ -2405,7 +2405,7 @@ case WM_KEYUP: case WM_SYSKEYDOWN: case WM_SYSKEYUP: - return(NtUserTranslateMessage((LPMSG)lpMsg, (HKL)unk)); + return(NtUserTranslateMessage((LPMSG)lpMsg, Flags)); default: if ( lpMsg->message & ~WM_MAXIMUM ) Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -423,7 +423,7 @@ } /* create static for text */ - dest = (BYTE*)(((DWORD)dest + 3) & ~3); + dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); itxt = (DLGITEMTEMPLATE *)dest; itxt->style = WS_CHILD | WS_VISIBLE | SS_NOPREFIX; if(lpMsgBoxParams->dwStyle & MB_RIGHT) @@ -450,7 +450,7 @@ btnrect.left = btnrect.top = 0; for(i = 0; i < nButtons; i++) { - dest = (BYTE*)(((DWORD)dest + 3) & ~3); + dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); ibtn[i] = (DLGITEMTEMPLATE *)dest; ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; if(!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) @@ -699,7 +699,7 @@ UNICODE_STRING textW, captionW, iconW; int ret; - if (HIWORD((UINT)lpMsgBoxParams->lpszText)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) { RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpMsgBoxParams->lpszText); /* @@ -711,7 +711,7 @@ else textW.Buffer = (LPWSTR)lpMsgBoxParams->lpszText; - if (HIWORD((UINT)lpMsgBoxParams->lpszCaption)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) { RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpMsgBoxParams->lpszCaption); /* @@ -725,7 +725,7 @@ if(lpMsgBoxParams->dwStyle & MB_USERICON) { - if (HIWORD((UINT)lpMsgBoxParams->lpszIcon)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszIcon)) { RtlCreateUnicodeStringFromAsciiz(&iconW, (PCSZ)lpMsgBoxParams->lpszIcon); /* @@ -753,13 +753,13 @@ ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)-1); - if (HIWORD((UINT)lpMsgBoxParams->lpszText)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) RtlFreeUnicodeString(&textW); - if (HIWORD((UINT)lpMsgBoxParams->lpszCaption)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) RtlFreeUnicodeString(&captionW); - if ((lpMsgBoxParams->dwStyle & MB_USERICON) && HIWORD((UINT)iconW.Buffer)) + if ((lpMsgBoxParams->dwStyle & MB_USERICON) && HIWORD((UINT_PTR)iconW.Buffer)) RtlFreeUnicodeString(&iconW); return ret; @@ -809,12 +809,12 @@ UNICODE_STRING textW, captionW; int ret; - if (HIWORD((UINT)lpText)) + if (HIWORD((UINT_PTR)lpText)) RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpText); else textW.Buffer = (LPWSTR)lpText; - if (HIWORD((UINT)lpCaption)) + if (HIWORD((UINT_PTR)lpCaption)) RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpCaption); else captionW.Buffer = (LPWSTR)lpCaption; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -123,13 +123,13 @@ { HICON hIcon = 0; - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -377,7 +377,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } Prop = IntGetProp(hWnd, Atom); if (Prop != NULL) Data = Prop->Data; @@ -428,7 +428,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } return(NtUserRemoveProp(hWnd, Atom)); } @@ -476,7 +476,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } return(NtUserSetProp(hWnd, Atom, hData)); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -2010,7 +2010,7 @@ /* save and restore error code over the next call */ save_error = GetLastError(); /* special code to detect a property sheet dialog */ - if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (LONG)WC_DIALOG) && + if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (ULONG_PTR)WC_DIALOG) && (GetPropW(sp_e->msg_hwnd, PropSheetInfoStr))) { strcpyW(sp_e->wnd_class, WC_PROPSHEETW); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Nov 7 01:10:56 2009 @@ -145,7 +145,7 @@ { SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); - return (BOOL)(hWnd); + return HandleToUlong(hWnd); } @@ -346,7 +346,7 @@ MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + if (!(dwStyle & WS_POPUP)) hMenu = UlongToHandle(id); if (dwStyle & (WS_CHILD | WS_POPUP)) { @@ -458,7 +458,7 @@ MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + if (!(dwStyle & WS_POPUP)) hMenu = UlongToHandle(id); if (dwStyle & (WS_CHILD | WS_POPUP)) { @@ -618,7 +618,7 @@ * Once that's fixed, we shouldn't have to check for a NULL HWND * here */ - if (!(ULONG)pHwnd[i]) /* don't enumerate a NULL HWND */ + if (!pHwnd[i]) /* don't enumerate a NULL HWND */ continue; if (!(*lpfn)(pHwnd[i], lParam)) { @@ -1343,8 +1343,8 @@ { // We are current. //FIXME("Current!\n"); if (lpdwProcessId) - *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; + *lpdwProcessId = (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueThread; } else { // Ask kernel for info.

1 0

[sginsberg] 43991: - Refactor stubbed HAL resource report slightly. - Move the resource routines to their own file instead of sysinfo.c. - Add missing members to PCIPBUSDATA. - Kill old, unused generic.rbuild.
by sginsberg＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: sginsberg Date: Sat Nov 7 00:55:08 2009 New Revision: 43991 URL: http://svn.reactos.org/svn/reactos?rev=43991&view=rev Log: - Refactor stubbed HAL resource report slightly. - Move the resource routines to their own file instead of sysinfo.c. - Add missing members to PCIPBUSDATA. - Kill old, unused generic.rbuild. Added: trunk/reactos/hal/halx86/generic/usage.c (with props) Removed: trunk/reactos/hal/halx86/generic/generic.rbuild Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/sysinfo.c trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -1026,10 +1026,5 @@ NTAPI HalpInitializePciBus(VOID) { - /* Initialize the stubs */ - HalpInitializePciStubs(); - /* FIXME: Initialize NMI Crash Flag */ } - -/* EOF */ Removed: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild (removed) @@ -1,40 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic" type="objectlibrary"> - <include base="hal_generic">../include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <file>beep.c</file> - <file>bios.c</file> - <file>bus.c</file> - <file>cmos.c</file> - <file>dma.c</file> - <file>drive.c</file> - <file>display.c</file> - <file>halinit.c</file> - <file>misc.c</file> - <file>portio.c</file> - <file>profil.c</file> - <file>reboot.c</file> - <file>sysinfo.c</file> - <file>timer.c</file> - <file>systimer.S</file> - <file>v86.s</file> - <pch>../include/hal.h</pch> - </module> - <module name="hal_generic_up" type="objectlibrary"> - <include base="hal_generic_up">../include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <file>irq.S</file> - <file>processor.c</file> - <file>spinlock.c</file> - </module> - <module name="hal_generic_pc" type="objectlibrary"> - <include base="hal_generic_pc">../include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <file>pci.c</file> - </module> -</group> Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/halinit.c [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -168,21 +168,3 @@ /* All done, return */ return TRUE; } - -/* - * @unimplemented - */ -VOID -NTAPI -HalReportResourceUsage(VOID) -{ - /* Initialize PCI bus. */ - HalpInitializePciBus(); - - /* FIXME: This is done in ReactOS MP HAL only*/ - //HaliReconfigurePciInterrupts(); - - /* FIXME: Report HAL Usage to kernel */ -} - -/* EOF */ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/sysinfo… ============================================================================== --- trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -1,42 +1,18 @@ /* - * PROJECT: ReactOS HA: + * PROJECT: ReactOS HAL * LICENSE: GPL - See COPYING in the top level directory * FILE: hal/halx86/generic/sysinfo.c * PURPOSE: HAL Information Routines * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> -PUCHAR KdComPortInUse; -PADDRESS_USAGE HalpAddressUsageList; -IDTUsageFlags HalpIDTUsageFlags[MAXIMUM_IDTVECTOR]; -IDTUsage HalpIDTUsage[MAXIMUM_IDTVECTOR]; - -ADDRESS_USAGE HalpDefaultIoSpace = -{ - NULL, CmResourceTypePort, IDT_INTERNAL, - { - {0x2000, 0xC000}, /* PIC?? */ - {0xC000, 0x1000}, /* DMA 2 */ - {0x8000, 0x1000}, /* DMA 1 */ - {0x2000, 0x200}, /* PIC 1 */ - {0xA000, 0x200}, /* PIC 2 */ - {0x4000, 0x400}, /* PIT 1 */ - {0x4800, 0x400}, /* PIT 2 */ - {0x9200, 0x100}, /* ????? */ - {0x7000, 0x200}, /* CMOS */ - {0xF000, 0x1000}, /* ????? */ - {0xCF800, 0x800}, /* PCI 0 */ - {0,0}, - } -}; - -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI @@ -89,45 +65,3 @@ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -VOID -NTAPI -HalpRegisterVector(IN UCHAR Flags, - IN ULONG BusVector, - IN ULONG SystemVector, - IN KIRQL Irql) -{ - /* Save the vector flags */ - HalpIDTUsageFlags[SystemVector].Flags = Flags; - - /* Save the vector data */ - HalpIDTUsage[SystemVector].Irql = Irql; - HalpIDTUsage[SystemVector].BusReleativeVector = BusVector; -} - -VOID -NTAPI -HalpEnableInterruptHandler(IN UCHAR Flags, - IN ULONG BusVector, - IN ULONG SystemVector, - IN KIRQL Irql, - IN PVOID Handler, - IN KINTERRUPT_MODE Mode) -{ - UCHAR Entry; - - /* Convert the vector into the IDT entry */ - Entry = HalVectorToIDTEntry(SystemVector); - - /* Register the vector */ - HalpRegisterVector(Flags, BusVector, SystemVector, Irql); - - /* Connect the interrupt */ - ((PKIPCR)KeGetPcr())->IDT[Entry].ExtendedOffset = (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[Entry].Offset = (USHORT)((ULONG_PTR)Handler); - - /* Enable the interrupt */ - HalEnableSystemInterrupt(SystemVector, Irql, Mode); -} - -/* EOF */ Added: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c (added) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -1,0 +1,140 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/generic/usage.c + * PURPOSE: HAL Resource Report Routines + * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <hal.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PUCHAR KdComPortInUse; +PADDRESS_USAGE HalpAddressUsageList; +IDTUsageFlags HalpIDTUsageFlags[MAXIMUM_IDTVECTOR]; +IDTUsage HalpIDTUsage[MAXIMUM_IDTVECTOR]; + +ADDRESS_USAGE HalpDefaultIoSpace = +{ + NULL, CmResourceTypePort, IDT_INTERNAL, + { + {0x2000, 0xC000}, /* PIC?? */ + {0xC000, 0x1000}, /* DMA 2 */ + {0x8000, 0x1000}, /* DMA 1 */ + {0x2000, 0x200}, /* PIC 1 */ + {0xA000, 0x200}, /* PIC 2 */ + {0x4000, 0x400}, /* PIT 1 */ + {0x4800, 0x400}, /* PIT 2 */ + {0x9200, 0x100}, /* ????? */ + {0x7000, 0x200}, /* CMOS */ + {0xF000, 0x1000}, /* ????? */ + {0xCF800, 0x800}, /* PCI 0 */ + {0,0}, + } +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +HalpReportResourceUsage(IN PUNICODE_STRING HalName, + IN INTERFACE_TYPE InterfaceType) +{ + DbgPrint("%wZ has been initialized\n", HalName); +} + +VOID +NTAPI +HalpRegisterVector(IN UCHAR Flags, + IN ULONG BusVector, + IN ULONG SystemVector, + IN KIRQL Irql) +{ + /* Save the vector flags */ + HalpIDTUsageFlags[SystemVector].Flags = Flags; + + /* Save the vector data */ + HalpIDTUsage[SystemVector].Irql = Irql; + HalpIDTUsage[SystemVector].BusReleativeVector = BusVector; +} + +VOID +NTAPI +HalpEnableInterruptHandler(IN UCHAR Flags, + IN ULONG BusVector, + IN ULONG SystemVector, + IN KIRQL Irql, + IN PVOID Handler, + IN KINTERRUPT_MODE Mode) +{ + UCHAR Entry; + + /* Convert the vector into the IDT entry */ + Entry = HalVectorToIDTEntry(SystemVector); + + /* Register the vector */ + HalpRegisterVector(Flags, BusVector, SystemVector, Irql); + + /* Connect the interrupt */ + ((PKIPCR)KeGetPcr())->IDT[Entry].ExtendedOffset = (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[Entry].Offset = (USHORT)((ULONG_PTR)Handler); + + /* Enable the interrupt */ + HalEnableSystemInterrupt(SystemVector, Irql, Mode); +} + +/* + * @unimplemented + */ +VOID +NTAPI +HalReportResourceUsage(VOID) +{ + INTERFACE_TYPE InterfaceType; + UNICODE_STRING HalString; + + /* FIXME: Initialize DMA 64-bit support */ + + /* FIXME: Initialize MCA bus */ + + /* Initialize PCI bus. */ + HalpInitializePciBus(); + + /* Initialize the stubs */ + HalpInitializePciStubs(); + + /* What kind of bus is this? */ + switch (HalpBusType) + { + /* ISA Machine */ + case MACHINE_TYPE_ISA: + InterfaceType = Isa; + break; + + /* EISA Machine */ + case MACHINE_TYPE_EISA: + InterfaceType = Eisa; + break; + + /* MCA Machine */ + case MACHINE_TYPE_MCA: + InterfaceType = MicroChannel; + break; + + /* Unknown */ + default: + InterfaceType = Internal; + break; + } + + /* Build HAL usage */ + RtlInitUnicodeString(&HalString, L"PC Compatible Eisa/Isa HAL"); + HalpReportResourceUsage(&HalString, InterfaceType); + + /* FIXME: Setup PCI debugging and Hibernation */ +} Propchange: trunk/reactos/hal/halx86/generic/usage.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -24,8 +24,9 @@ <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> + <file>systimer.S</file> <file>timer.c</file> - <file>systimer.S</file> + <file>usage.c</file> <file>v86.s</file> </directory> <directory name="include"> Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Sat Nov 7 00:55:08 2009 @@ -80,6 +80,14 @@ WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT, \ *((POINTER_TO_(y))Buffer)); \ TYPE2_END(y) + +typedef NTSTATUS +(NTAPI *PciIrqRange)( + IN PBUS_HANDLER BusHandler, + IN PBUS_HANDLER RootHandler, + IN PCI_SLOT_NUMBER PciSlot, + OUT PSUPPORTED_RANGE *Interrupt +); typedef struct _PCIPBUSDATA { @@ -99,6 +107,14 @@ } Type2; } Config; ULONG MaxDevice; + PciIrqRange GetIrqRange; + BOOLEAN BridgeConfigRead; + UCHAR ParentBus; + UCHAR Subtractive; + UCHAR reserved[1]; + UCHAR SwizzleIn[4]; + RTL_BITMAP DeviceConfigured; + ULONG ConfiguredBits[PCI_MAX_DEVICES * PCI_MAX_FUNCTION / 32]; } PCIPBUSDATA, *PPCIPBUSDATA; typedef ULONG @@ -284,6 +300,12 @@ VOID ); +VOID +NTAPI +HalpInitializePciStubs( + VOID +); + extern ULONG HalpBusType; extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler;

1 0

[ablackmann] 43990: Whiners...
by ablackmann＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: ablackmann Date: Sat Nov 7 00:35:28 2009 New Revision: 43990 URL: http://svn.reactos.org/svn/reactos?rev=43990&view=rev Log: Whiners... Modified: trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Sat Nov 7 00:35:28 2009 @@ -1003,7 +1003,7 @@ /* Print out the WCH_ name */ fprintf(FileHandle, ",%-9s", - WChName(Layout->Entry[j].CharData[k])); + WChName(Layout->Entry[j].CharData[k], 0)); /* If we have something on the line buffer by now, add WCH_NONE */ if (*LineBuffer != '\0') strcpy(LineBuffer, "WCH_NONE ");

1 0

[ablackmann] 43989: Implement printout the the state tables. It seems to work fine, but the tool doesn't yet generate the modified keys (shift+, ctrl+, etc) for each virtual key. This is the last thing that remains.
by ablackmann＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: ablackmann Date: Fri Nov 6 23:42:26 2009 New Revision: 43989 URL: http://svn.reactos.org/svn/reactos?rev=43989&view=rev Log: Implement printout the the state tables. It seems to work fine, but the tool doesn't yet generate the modified keys (shift+, ctrl+, etc) for each virtual key. This is the last thing that remains. Modified: trunk/reactos/tools/kbdtool/kbdtool.h trunk/reactos/tools/kbdtool/output.c Modified: trunk/reactos/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/kbdtool.h?re… ============================================================================== --- trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/kbdtool.h [iso-8859-1] Fri Nov 6 23:42:26 2009 @@ -54,6 +54,7 @@ ULONG StateCount; ULONG CharData[8]; ULONG DeadCharData[8]; + UCHAR LigatureCharData[8]; ULONG OtherCharData[8]; struct LAYOUTENTRY* CapData; PCHAR Name; Modified: trunk/reactos/tools/kbdtool/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/output.c?rev… ============================================================================== --- trunk/reactos/tools/kbdtool/output.c [iso-8859-1] (original) +++ trunk/reactos/tools/kbdtool/output.c [iso-8859-1] Fri Nov 6 23:42:26 2009 @@ -17,8 +17,75 @@ ULONG gStringIdForLocaleName = 1200; time_t Clock; struct tm *Now; +CHAR gCharName[32]; /* FUNCTIONS ******************************************************************/ + +PCHAR +WChName(IN ULONG Char, + IN BOOLEAN AddZero) +{ + PCHAR p; + + /* Check for invalid character */ + if (Char == -1) + { + /* No name */ + strcpy(gCharName, "WCH_NONE"); + } + else if ((Char > 31) && (Char < 128)) + { + /* Use our global buffer */ + p = gCharName; + + /* Add the first quote unless this was a zero-string */ + if (!AddZero) *p++ = '\''; + + /* Now replace any other quote or comment character with a slash */ + if ((Char == '\"') || (Char == '\'') || (Char == '\\')) *p++ = '\\'; + + /* Now plug in the character */ + *p++ = Char; + + /* And add the terminating quote, unless this was a zero-string */ + if (!AddZero) *p++ = '\''; + + /* Terminate the buffer */ + *p = '\0'; + } + else + { + /* Handle special cases */ + if (Char == '\b') + { + /* Bell */ + strcpy(gCharName, "'\\b'"); + } + else if (Char == '\n') + { + /* New line */ + strcpy(gCharName, "'\\n'"); + } + else if (Char == '\r') + { + /* Return */ + strcpy(gCharName, "'\\r'"); + } + else if (!AddZero) + { + /* Char value, in hex */ + sprintf(gCharName, "0x%04x", Char); + } + else + { + /* Char value, C-style */ + sprintf(gCharName, "\\x%04x", Char); + } + } + + /* Return the name */ + return gCharName; +} VOID PrintNameTable(FILE* FileHandle, @@ -871,9 +938,12 @@ /* Check if this something else than state 2 */ if (i != 2) { - /* Not yet supported */ - printf("Extra states not yet supported!\n"); - break;//exit(1); + /* Loop all the scan codes */ + for (j = 0; j < 110; j++) + { + /* Check if this is the state for the entry */ + if (i == Layout->Entry[j].StateCount) break; + } } /* Print the table header */ @@ -911,7 +981,33 @@ /* Initialize the buffer for this line */ *LineBuffer = '\0'; - /* FIXME: Loop for states */ + /* Loop states */ + for (k = 0; k < i; k++) + { + /* Check for dead key data */ + if (DeadKeyData) + { + /* Not yet supported */ + printf("Dead key data not supported!\n"); + exit(1); + } + + /* Check if it's a ligature key */ + if (Layout->Entry[j].LigatureCharData[k]) + { + /* Not yet supported */ + printf("Ligature key data not supported!\n"); + exit(1); + } + + /* Print out the WCH_ name */ + fprintf(FileHandle, + ",%-9s", + WChName(Layout->Entry[j].CharData[k])); + + /* If we have something on the line buffer by now, add WCH_NONE */ + if (*LineBuffer != '\0') strcpy(LineBuffer, "WCH_NONE "); + } /* Finish the line */ fprintf(FileHandle, "},\n");

1 0

[janderwald] 43988: - Fix check
by janderwald＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: janderwald Date: Fri Nov 6 18:00:20 2009 New Revision: 43988 URL: http://svn.reactos.org/svn/reactos?rev=43988&view=rev Log: - Fix check Modified: trunk/reactos/dll/directx/dsound_new/capture.c Modified: trunk/reactos/dll/directx/dsound_new/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capture.c [iso-8859-1] Fri Nov 6 18:00:20 2009 @@ -105,7 +105,7 @@ } /* check buffer description */ - if ((lpcDSBufferDesc->dwSize != sizeof(DSBUFFERDESC) && lpcDSBufferDesc->dwSize != sizeof(DSBUFFERDESC1)) || lpcDSBufferDesc->dwReserved != 0) + if ((lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC) && lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC1)) || lpcDSBufferDesc->dwReserved != 0) { DPRINT("Invalid buffer description size %u expected %u or %u dwReserved %u\n", lpcDSBufferDesc->dwSize, sizeof(DSBUFFERDESC1), sizeof(DSBUFFERDESC), lpcDSBufferDesc->dwReserved); return DSERR_INVALIDPARAM;

1 0

[khornicek] 43987: - opengl support for arwinss
by khornicek＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: khornicek Date: Fri Nov 6 15:52:27 2009 New Revision: 43987 URL: http://svn.reactos.org/svn/reactos?rev=43987&view=rev Log: - opengl support for arwinss Added: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Fri Nov 6 15:52:27 2009 @@ -77,13 +77,6 @@ return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); -} - -int CDECL RosDrv_ChoosePixelFormat(NTDRV_PDEVICE *physDev, - const PIXELFORMATDESCRIPTOR *ppfd) -{ - UNIMPLEMENTED; - return 0; } BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, @@ -205,15 +198,6 @@ /* Return result */ return res; -} - -int CDECL RosDrv_DescribePixelFormat(NTDRV_PDEVICE *physDev, - int iPixelFormat, - UINT nBytes, - PIXELFORMATDESCRIPTOR *ppfd) -{ - UNIMPLEMENTED; - return 0; } BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) @@ -352,12 +336,6 @@ return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); } -int CDECL RosDrv_GetPixelFormat(NTDRV_PDEVICE *physDev) -{ - UNIMPLEMENTED; - return 0; -} - UINT CDECL RosDrv_GetSystemPaletteEntries( NTDRV_PDEVICE *physDev, UINT start, UINT count, LPPALETTEENTRY entries ) { @@ -726,14 +704,6 @@ LPtoDP(physDev->hUserDC, &ptPixel, 1); return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); -} - -BOOL CDECL RosDrv_SetPixelFormat(NTDRV_PDEVICE *physDev, - int iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd) -{ - UNIMPLEMENTED; - return FALSE; } COLORREF CDECL RosDrv_SetTextColor( NTDRV_PDEVICE *physDev, COLORREF color ) @@ -782,12 +752,6 @@ physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } -BOOL CDECL RosDrv_SwapBuffers(NTDRV_PDEVICE *physDev) -{ - UNIMPLEMENTED; - return FALSE; -} - BOOL CDECL RosDrv_UnrealizePalette( HPALETTE hpal ) { UNIMPLEMENTED; Added: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c (added) +++ branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] Fri Nov 6 15:52:27 2009 @@ -1,0 +1,110 @@ +/* + * PROJECT: ReactOS + * LICENSE: LGPL + * FILE: dll/win32/winent.drv/ogldrv.c + * PURPOSE: OpenGL driver for ReactOS/Windows + * PROGRAMMERS: Kamil Hornicek + */ + +/* INCLUDES ***************************************************************/ + +#include "windows.h" +#include "wingdi.h" +#include "ntrosgdi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rosogldrv); + +typedef INT (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); +typedef INT (WINAPI *DESCRIBEPIXELFMT) (HDC, INT, UINT, PIXELFORMATDESCRIPTOR *); +typedef INT (WINAPI *GETPIXELFMT) (HDC); +typedef BOOL (WINAPI *SETPIXELFMT) (HDC, INT, CONST PIXELFORMATDESCRIPTOR *); +typedef BOOL (WINAPI *SWAPBUFFERS) (HDC); + +static CHOOSEPIXELFMT glChoosePixelFormat = NULL; +static DESCRIBEPIXELFMT glDescribePixelFormat = NULL; +static GETPIXELFMT glGetPixelFormat = NULL; +static SETPIXELFMT glSetPixelFormat = NULL; +static SWAPBUFFERS glSwapBuffers = NULL; + +/* FUNCTIONS **************************************************************/ + +BOOL InitOGL(VOID) +{ + HMODULE hOGL; + + hOGL = LoadLibraryW(L"OPENGL32.DLL"); + + if (!hOGL) + return FALSE; + + glChoosePixelFormat = GetProcAddress(hOGL, "wglChoosePixelFormat"); + glDescribePixelFormat = GetProcAddress(hOGL, "wglDescribePixelFormat"); + glGetPixelFormat = GetProcAddress(hOGL, "wglGetPixelFormat"); + glSetPixelFormat = GetProcAddress(hOGL, "wglSetPixelFormat"); + glSwapBuffers = GetProcAddress(hOGL, "wglSwapBuffers"); + + if (!glChoosePixelFormat || !glDescribePixelFormat || !glGetPixelFormat || + !glSetPixelFormat || !glSwapBuffers) + { + FreeLibrary(hOGL); + ERR("Failed to load required wgl* functions from opengl32\n"); + return FALSE; + } + + return TRUE; +} + +INT CDECL RosDrv_ChoosePixelFormat(NTDRV_PDEVICE *physDev, + CONST PIXELFORMATDESCRIPTOR *ppfd) +{ + if (!glChoosePixelFormat) + if (!InitOGL()) + return 0; + + return glChoosePixelFormat(physDev->hUserDC, ppfd); +} + +INT CDECL RosDrv_GetPixelFormat(NTDRV_PDEVICE *physDev) +{ + if (!glGetPixelFormat) + if (!InitOGL()) + return 0; + + return glGetPixelFormat(physDev->hUserDC); +} + +INT CDECL RosDrv_DescribePixelFormat(NTDRV_PDEVICE *physDev, + INT iPixelFormat, + UINT nBytes, + PIXELFORMATDESCRIPTOR *ppfd) +{ + if (!glDescribePixelFormat) + if (!InitOGL()) + return 0; + + return glDescribePixelFormat(physDev->hUserDC, iPixelFormat, nBytes, ppfd); +} + +BOOL CDECL RosDrv_SetPixelFormat(NTDRV_PDEVICE *physDev, + INT iPixelFormat, + CONST PIXELFORMATDESCRIPTOR *ppfd) +{ + if (!glSetPixelFormat) + if (!InitOGL()) + return 0; + + return glSetPixelFormat(physDev->hUserDC, iPixelFormat, ppfd); +} + + +BOOL CDECL RosDrv_SwapBuffers(NTDRV_PDEVICE *physDev) +{ + if (!glSwapBuffers) + if (!InitOGL()) + return 0; + + return glSwapBuffers(physDev->hUserDC); +} + +/* EOF */ Propchange: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Fri Nov 6 15:52:27 2009 @@ -12,6 +12,7 @@ <file>userdrv.c</file> <file>mouse.c</file> <file>wnd.c</file> + <file>ogldrv.c</file> <file>winent.rc</file>

1 0

[cfinck] 43986: Fix updated tools in Changelog :-)
by cfinck＠svn.reactos.org 06 Nov '09

06 Nov '09

Author: cfinck Date: Fri Nov 6 13:08:27 2009 New Revision: 43986 URL: http://svn.reactos.org/svn/reactos?rev=43986&view=rev Log: Fix updated tools in Changelog :-) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Fri Nov 6 13:08:27 2009 @@ -1,10 +1,9 @@ *** Nov XXth, 2009 - RosBE 1.5 Released -- Same Version like RosBE 1.4.5, only with the new GCC 4.4.2 (Dmitry Gorbachev, Colin Finck) -- Updated BinUtils to 2.20.51 20090915 - (with delay import feature from Timo Kreuzer) +- Updated Binutils to 2.20.51-20091017 (snapshot) +- Updated GCC to 4.4.2 (including backported GCC r153606) +- Updated MinGW Runtime to 3.16 - Updated w32api to 3.13 -- Updated mingwrt to 3.16 *** Oct 26th, 2009 - RosBE 1.4.5 Released

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
45
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009