Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 50852: [KERNEL32] Forgotten changes to .pspec. Why is there still a .def?
by pschweitzer＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: pschweitzer Date: Mon Feb 21 07:23:18 2011 New Revision: 50852 URL: http://svn.reactos.org/svn/reactos?rev=50852&view=rev Log: [KERNEL32] Forgotten changes to .pspec. Why is there still a .def? Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Mon Feb 21 07:23:18 2011 @@ -46,7 +46,7 @@ @ stdcall BaseProcessInitPostImport() ; missing in Win 7 @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check ;@ stdcall BaseThreadInitThunk ; Win 7 -;@ stdcall BaseSetLastNTError ; Win 7, not 64 bit +;@ stdcall BaseSetLastNTError ; Win 7, not 64 bit (present on w2k3 but not exported) @ stdcall BaseUpdateAppcompatCache(long long long) ;@ stdcall BaseVerifyUnicodeString ; Win 7 ;@ stdcall Basep8BitStringToDynamicUnicodeString ; Win 7 @@ -1210,7 +1210,7 @@ @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) @ stub SetLastConsoleEventActive ; missing in XP SP3 -@ stdcall SetLastError(long) ntdll.RtlSetLastWin32Error +@ stdcall SetLastError(long) @ stub SetLocalPrimaryComputerNameA ; missing in XP SP3 @ stub SetLocalPrimaryComputerNameW ; missing in XP SP3 @ stdcall SetLocalTime(ptr)

1 0

[janderwald] 50851: [MMEBUDDY] - Check if there is a reset request in progress while the wave thread is active. In that case exit the wave buffer commiting activity - In the reset routine, perform ...
by janderwald＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: janderwald Date: Mon Feb 21 04:22:45 2011 New Revision: 50851 URL: http://svn.reactos.org/svn/reactos?rev=50851&view=rev Log: [MMEBUDDY] - Check if there is a reset request in progress while the wave thread is active. In that case exit the wave buffer commiting activity - In the reset routine, perform an alertable wait in order to make the apc io completion complete [PORTCLS] - Only perform copying audio bytes to dma buffer while the adapter is reset state is KSREST_END - Set the reset state indicator before canceling the audio buffers - Should fix the audio hang experienced in Winamp when skipping audio bytes Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Mon Feb 21 04:22:45 2011 @@ -823,7 +823,7 @@ PC_ASSERT_IRQL(DISPATCH_LEVEL); - if (m_State == KSSTATE_RUN) + if (m_State == KSSTATE_RUN && m_ResetState == KSRESET_END) { Status = m_Stream->GetPosition(&Position); @@ -904,13 +904,19 @@ /* check for success */ if (NT_SUCCESS(Status)) { + //determine state of reset request if (ResetValue == KSRESET_BEGIN) { + // start reset procress + // incoming read/write requests will be rejected + m_ResetState = KSRESET_BEGIN; + + // cancel existing buffers m_IrpQueue->CancelBuffers(); - m_ResetState = KSRESET_BEGIN; } else if (ResetValue == KSRESET_END) { + // end of reset process m_ResetState = KSRESET_END; } } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Mon Feb 21 04:22:45 2011 @@ -60,7 +60,7 @@ } while ( ( SoundDeviceInstance->OutstandingBuffers < SoundDeviceInstance->BufferCount ) && - ( Header ) ) + ( Header ) && SoundDeviceInstance->ResetInProgress == FALSE) { HeaderExtension = (PWAVEHDR_EXTENSION) Header->reserved; SND_ASSERT( HeaderExtension ); @@ -176,8 +176,6 @@ WaveHdr = (PWAVEHDR) SoundOverlapped->Header; SND_ASSERT( WaveHdr ); - SND_ASSERT( ERROR_SUCCESS == dwErrorCode ); - HdrExtension = (PWAVEHDR_EXTENSION) WaveHdr->reserved; SND_ASSERT( HdrExtension ); @@ -305,6 +303,12 @@ /* cancel all current audio buffers */ FunctionTable->ResetStream(SoundDeviceInstance, DeviceType, TRUE); } + while(SoundDeviceInstance->OutstandingBuffers) + { + SND_TRACE(L"StopStreamingInSoundThread OutStandingBufferCount %lu\n", SoundDeviceInstance->OutstandingBuffers); + /* wait until pending i/o has completed */ + SleepEx(10, TRUE); + } /* complete all current headers */ while( SoundDeviceInstance->HeadWaveHeader ) @@ -316,12 +320,6 @@ /* there should be no oustanding buffers now */ SND_ASSERT(SoundDeviceInstance->OutstandingBuffers == 0); - while(SoundDeviceInstance->OutstandingBuffers) - { - SND_ERR("StopStreamingInSoundThread OutStandingBufferCount %lu\n", SoundDeviceInstance->OutstandingBuffers); - /* my hack of doom */ - Sleep(10); - } /* Check if reset function is supported */ if (FunctionTable->ResetStream)

1 0

[janderwald] 50850: [PORTCLS] - Remove the oldest hack in portcls - Please report any regression(s)
by janderwald＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: janderwald Date: Sun Feb 20 23:01:14 2011 New Revision: 50850 URL: http://svn.reactos.org/svn/reactos?rev=50850&view=rev Log: [PORTCLS] - Remove the oldest hack in portcls - Please report any regression(s) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Sun Feb 20 23:01:14 2011 @@ -196,17 +196,13 @@ PHYSICAL_ADDRESS NTAPI -CDmaChannelInit::PhysicalAddress( - PPHYSICAL_ADDRESS Address) +CDmaChannelInit::PhysicalAddress() { DPRINT("CDmaChannelInit_PhysicalAdress: this %p Virtuell %p Physical High %x Low %x%\n", this, m_Buffer, m_Address.HighPart, m_Address.LowPart); - PHYSICAL_ADDRESS Result; - - Address->QuadPart = m_Address.QuadPart; - Result.QuadPart = (PtrToUlong(Address)); - return Result; -} + return m_Address; +} + VOID NTAPI Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Sun Feb 20 23:01:14 2011 @@ -903,8 +903,7 @@ IN ULONG BufferSize); \ \ STDMETHODIMP_(PVOID) SystemAddress(void); \ - STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress( \ - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(); \ STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ \ STDMETHODIMP_(void) CopyTo( \ @@ -950,8 +949,7 @@ IN ULONG BufferSize) PURE; \ \ STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ - STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS_ \ - IN PPHYSICAL_ADDRESS Address) PURE; \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS) PURE; \ STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ \ STDMETHOD_(void, CopyTo)( THIS_ \

1 0

[pschweitzer] 50849: [KERNEL32] Don't mix tab index and memory length... This fixes several bugs in GetTempFileNameW() and prevents memory corruption ~ Winetest regression is gone :)
by pschweitzer＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: pschweitzer Date: Sun Feb 20 22:57:31 2011 New Revision: 50849 URL: http://svn.reactos.org/svn/reactos?rev=50849&view=rev Log: [KERNEL32] Don't mix tab index and memory length... This fixes several bugs in GetTempFileNameW() and prevents memory corruption ~ Winetest regression is gone :) Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sun Feb 20 22:57:31 2011 @@ -1287,7 +1287,7 @@ static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL }; RtlInitUnicodeString(&PathNameString, lpPathName); - if (PathNameString.Length == 0 || PathNameString.Buffer[PathNameString.Length - sizeof(WCHAR)] != L'\\') + if (PathNameString.Length == 0 || PathNameString.Buffer[(PathNameString.Length / sizeof(WCHAR)) - 1] != L'\\') { PathNameString.Length += sizeof(WCHAR); } @@ -1306,15 +1306,15 @@ { memmove(lpTempFileName, PathNameString.Buffer, PathNameString.Length); } - + /* PathName MUST BE a path. Check it */ - lpTempFileName[PathNameString.Length - sizeof(WCHAR)] = UNICODE_NULL; + lpTempFileName[(PathNameString.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; FileAttributes = GetFileAttributesW(lpTempFileName); if (FileAttributes == INVALID_FILE_ATTRIBUTES) { /* Append a '\' if necessary */ - lpTempFileName[PathNameString.Length - sizeof(WCHAR)] = L'\\'; - lpTempFileName[PathNameString.Length] = UNICODE_NULL; + lpTempFileName[(PathNameString.Length / sizeof(WCHAR)) - 1] = L'\\'; + lpTempFileName[PathNameString.Length / sizeof(WCHAR)] = UNICODE_NULL; FileAttributes = GetFileAttributesW(lpTempFileName); if (FileAttributes == INVALID_FILE_ATTRIBUTES) { @@ -1329,7 +1329,7 @@ } /* Make sure not to mix path & prefix */ - lpTempFileName[PathNameString.Length - sizeof(WCHAR)] = L'\\'; + lpTempFileName[(PathNameString.Length / sizeof(WCHAR)) - 1] = L'\\'; RtlInitUnicodeString(&PrefixString, lpPrefixString); if (PrefixString.Length > 3 * sizeof(WCHAR)) { @@ -1337,7 +1337,7 @@ } /* Append prefix to path */ - TempFileName = lpTempFileName + PathNameString.Length / sizeof(WCHAR) - 1; + TempFileName = lpTempFileName + PathNameString.Length / sizeof(WCHAR); memmove(TempFileName, PrefixString.Buffer, PrefixString.Length); TempFileName += PrefixString.Length / sizeof(WCHAR); @@ -1364,8 +1364,8 @@ /* Convert that ID to wchar */ RtlIntegerToChar(ID, 0x10, sizeof(IDString), IDString); Let = IDString; - do - { + do + { *(TempFileName++) = RtlAnsiCharToUnicodeChar(&Let); } while (*Let != 0);

1 0

[tkreuzer] 50848: [HAL] Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl>: - Fix Port numbers and ranges in HalpDefaultIoSpace (divide by 0x100) By me: - Fix DMA 1 port range and fix comment See i...
by tkreuzer＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: tkreuzer Date: Sun Feb 20 22:30:50 2011 New Revision: 50848 URL: http://svn.reactos.org/svn/reactos?rev=50848&view=rev Log: [HAL] Patch by Rafal Harabien, <rafalh1992 AT o2 DOT pl>: - Fix Port numbers and ranges in HalpDefaultIoSpace (divide by 0x100) By me: - Fix DMA 1 port range and fix comment See issue #5925 for more details. Modified: trunk/reactos/hal/halx86/generic/usage.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Sun Feb 20 22:30:50 2011 @@ -43,17 +43,17 @@ { NULL, CmResourceTypePort, IDT_INTERNAL, { - {0x2000, 0xC000}, /* Everything */ - {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}, /* System Control Port A */ - {0x7000, 0x200}, /* CMOS */ - {0xF000, 0x1000}, /* x87 Coprocessor */ - {0xCF800, 0x800}, /* PCI 0 */ + {0x00, 0x20}, /* DMA 1 */ + {0xC0, 0x20}, /* DMA 2 */ + {0x80, 0x10}, /* DMA EPAR */ + {0x20, 0x2}, /* PIC 1 */ + {0xA0, 0x2}, /* PIC 2 */ + {0x40, 0x4}, /* PIT 1 */ + {0x48, 0x4}, /* PIT 2 */ + {0x92, 0x1}, /* System Control Port A */ + {0x70, 0x2}, /* CMOS */ + {0xF0, 0x10}, /* x87 Coprocessor */ + {0xCF8, 0x8}, /* PCI 0 */ {0,0}, } };

1 0

[jimtabor] 50847: [Win32k|User32] - WM_MDICREATE originates from user space so treat it as it should, fixes bug 5903.
by jimtabor＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: jimtabor Date: Sun Feb 20 22:20:51 2011 New Revision: 50847 URL: http://svn.reactos.org/svn/reactos?rev=50847&view=rev Log: [Win32k|User32] - WM_MDICREATE originates from user space so treat it as it should, fixes bug 5903. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sun Feb 20 22:20:51 2011 @@ -296,26 +296,6 @@ } break; - case WM_MDICREATE: - { - MDICREATESTRUCTW *mCs = (MDICREATESTRUCTW *) KMMsg->lParam; - PCHAR Class; - mCs->szTitle = (LPCWSTR) ((PCHAR) mCs + (DWORD_PTR) mCs->szTitle); - Class = (PCHAR) mCs + (DWORD_PTR) mCs->szClass; - if (L'A' == *((WCHAR *) Class)) - { - Class += sizeof(WCHAR); - mCs->szClass = (LPCWSTR)(DWORD_PTR) (*((ATOM *) Class)); - } - else - { - ASSERT(L'S' == *((WCHAR *) Class)); - Class += sizeof(WCHAR); - mCs->szClass = (LPCWSTR) Class; - } - } - break; - case WM_DDE_ACK: { PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Feb 20 22:20:51 2011 @@ -139,7 +139,6 @@ { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ }, { WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE }, - { WM_MDICREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, }; static PMSGMEMORY FASTCALL @@ -165,7 +164,6 @@ MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam) { CREATESTRUCTW *Cs; - MDICREATESTRUCTW *mCs; PUNICODE_STRING WindowName; PUNICODE_STRING ClassName; UINT Size = 0; @@ -204,21 +202,6 @@ } break; - case WM_MDICREATE: - mCs = (MDICREATESTRUCTW *)lParam; - WindowName = (PUNICODE_STRING) mCs->szTitle; - ClassName = (PUNICODE_STRING) mCs->szClass; - Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR); - if (IS_ATOM(ClassName->Buffer)) - { - Size += sizeof(WCHAR) + sizeof(ATOM); - } - else - { - Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); - } - break; - case WM_NCCALCSIZE: Size = wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) : sizeof(RECT); break; @@ -254,7 +237,6 @@ NCCALCSIZE_PARAMS *PackedNcCalcsize; CREATESTRUCTW *UnpackedCs; CREATESTRUCTW *PackedCs; - MDICREATESTRUCTW *UnpackedmCs, *PackedmCs; PLARGE_STRING WindowName; PUNICODE_STRING ClassName; POOL_TYPE PoolType; @@ -333,53 +315,6 @@ ASSERT(CsData == (PCHAR) PackedCs + Size); *lParamPacked = (LPARAM) PackedCs; } - else if (WM_MDICREATE == Msg) - { - UnpackedmCs = (MDICREATESTRUCTW *) lParam; - WindowName = (PLARGE_STRING) UnpackedmCs->szTitle; - ClassName = (PUNICODE_STRING) UnpackedmCs->szClass; - Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR); - if (IS_ATOM(ClassName->Buffer)) - { - Size += sizeof(WCHAR) + sizeof(ATOM); - } - else - { - Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR); - } - PackedmCs = ExAllocatePoolWithTag(PoolType, Size, TAG_MSG); - if (NULL == PackedmCs) - { - DPRINT1("Not enough memory to pack lParam\n"); - return STATUS_NO_MEMORY; - } - RtlCopyMemory(PackedmCs, UnpackedmCs, sizeof(MDICREATESTRUCTW)); - CsData = (PCHAR) (PackedmCs + 1); - PackedmCs->szTitle = (LPCWSTR) (CsData - (PCHAR) PackedmCs); - RtlCopyMemory(CsData, WindowName->Buffer, WindowName->Length); - CsData += WindowName->Length; - *((WCHAR *) CsData) = L'\0'; - CsData += sizeof(WCHAR); - PackedmCs->szClass = (LPCWSTR) (CsData - (PCHAR) PackedmCs); - if (IS_ATOM(ClassName->Buffer)) - { - *((WCHAR *) CsData) = L'A'; - CsData += sizeof(WCHAR); - *((ATOM *) CsData) = (ATOM)(DWORD_PTR) ClassName->Buffer; - CsData += sizeof(ATOM); - } - else - { - *((WCHAR *) CsData) = L'S'; - CsData += sizeof(WCHAR); - RtlCopyMemory(CsData, ClassName->Buffer, ClassName->Length); - CsData += ClassName->Length; - *((WCHAR *) CsData) = L'\0'; - CsData += sizeof(WCHAR); - } - ASSERT(CsData == (PCHAR) PackedmCs + Size); - *lParamPacked = (LPARAM) PackedmCs; - } else if (PoolType == NonPagedPool) { PMSGMEMORY MsgMemoryEntry; @@ -428,11 +363,6 @@ { ExFreePool((PVOID) lParamPacked); - return STATUS_SUCCESS; - } - else if (WM_MDICREATE == Msg) - { - ExFreePool((PVOID) lParamPacked); return STATUS_SUCCESS; } else if (NonPagedPoolUsed)

1 0

[jimtabor] 50846: [Win32k] - Restore original patch 50154.
by jimtabor＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: jimtabor Date: Sun Feb 20 22:20:42 2011 New Revision: 50846 URL: http://svn.reactos.org/svn/reactos?rev=50846&view=rev Log: [Win32k] - Restore original patch 50154. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Feb 20 22:20:42 2011 @@ -193,6 +193,7 @@ UINT uTimeout, ULONG_PTR *uResult); +BOOL FASTCALL UserSendNotifyMessage( HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam ); LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, UINT Msg, WPARAM wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Sun Feb 20 22:20:42 2011 @@ -601,7 +601,7 @@ if (ret && ClipboardOwnerWindow) { DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->head.h); - co_IntSendMessage( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); + co_IntSendMessageNoWait( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); } UserLeave(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Sun Feb 20 22:20:42 2011 @@ -79,10 +79,10 @@ /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { - UserPostMessage( HWND_BROADCAST, - WM_PALETTEISCHANGING, - (WPARAM)hWnd, - 0); + UserSendNotifyMessage( HWND_BROADCAST, + WM_PALETTEISCHANGING, + (WPARAM)hWnd, + 0); } if (Window->spwndPrev != NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sun Feb 20 22:20:42 2011 @@ -564,7 +564,7 @@ } if (Ret) { - UserPostMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); } UserLeave(); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Feb 20 22:20:42 2011 @@ -1957,7 +1957,7 @@ hWnd = IntWindowFromDC(hdc); if (hWnd) // Send broadcast if dc is associated with a window. { // FYI: Thread locked in CallOneParam. - co_IntSendMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); + UserSendNotifyMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); } } return Ret;

1 0

[jimtabor] 50845: [Win32k] - Remove unused class list pointer and clear the class registered flag.
by jimtabor＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: jimtabor Date: Sun Feb 20 22:20:23 2011 New Revision: 50845 URL: http://svn.reactos.org/svn/reactos?rev=50845&view=rev Log: [Win32k] - Remove unused class list pointer and clear the class registered flag. Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Feb 20 22:20:23 2011 @@ -178,7 +178,6 @@ DWORD dwLayout; DWORD dwRegisteredClasses; /* ReactOS */ - LIST_ENTRY ClassList; LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock; LIST_ENTRY PrivateFontListHead; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sun Feb 20 22:20:23 2011 @@ -89,8 +89,6 @@ Win32Process->HeapMappings.UserMapping = UserBase; Win32Process->HeapMappings.Count = 1; - InitializeListHead(&Win32Process->ClassList); - InitializeListHead(&Win32Process->MenuListHead); InitializeListHead(&Win32Process->GDIBrushAttrFreeList); @@ -133,6 +131,7 @@ /* no process windows should exist at this point, or the function will assert! */ DestroyProcessClasses(Win32Process); + Win32Process->W32PF_flags &= ~W32PF_CLASSESREGISTERED; GDI_CleanupForProcess(Process);

1 0

[ekohl] 50844: [SETUPAPI] - Add 'pSetup'-Prefix to the string table functions according to the new naming convention. - Remove the obsolete function StringTableTrim.
by ekohl＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: ekohl Date: Sun Feb 20 22:13:59 2011 New Revision: 50844 URL: http://svn.reactos.org/svn/reactos?rev=50844&view=rev Log: [SETUPAPI] - Add 'pSetup'-Prefix to the string table functions according to the new naming convention. - Remove the obsolete function StringTableTrim. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/rpc.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stringtable.c trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -268,7 +268,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -392,7 +392,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -508,18 +508,18 @@ } lstrcpyW(pMachine->szMachineName, UNCServerName); - pMachine->StringTable = StringTableInitialize(); + pMachine->StringTable = pSetupStringTableInitialize(); if (pMachine->StringTable == NULL) { HeapFree(GetProcessHeap(), 0, pMachine); return CR_FAILURE; } - StringTableAddString(pMachine->StringTable, L"PLT", 1); + pSetupStringTableAddString(pMachine->StringTable, L"PLT", 1); if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) { - StringTableDestroy(pMachine->StringTable); + pSetupStringTableDestroy(pMachine->StringTable); HeapFree(GetProcessHeap(), 0, pMachine); return CR_INVALID_MACHINENAME; } @@ -630,7 +630,7 @@ return CR_FAILURE; } - lpParentDevInst = StringTableStringFromId(StringTable, dnParent); + lpParentDevInst = pSetupStringTableStringFromId(StringTable, dnParent); if (lpParentDevInst == NULL) return CR_INVALID_DEVNODE; @@ -650,7 +650,7 @@ if (ret == CR_SUCCESS) { - *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1); + *pdnDevInst = pSetupStringTableAddString(StringTable, pDeviceID, 1); if (*pdnDevInst == 0) ret = CR_NO_SUCH_DEVNODE; } @@ -794,7 +794,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -832,7 +832,7 @@ if (pMachine->bLocal == FALSE) { if (pMachine->StringTable != NULL) - StringTableDestroy(pMachine->StringTable); + pSetupStringTableDestroy(pMachine->StringTable); if (!PnpUnbindRpc(pMachine->BindingHandle)) return CR_ACCESS_DENIED; @@ -893,7 +893,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1161,7 +1161,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1289,7 +1289,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1313,7 +1313,7 @@ TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst)); - dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1); + dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1); if (dwIndex == -1) return CR_FAILURE; @@ -1596,7 +1596,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1773,7 +1773,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1861,7 +1861,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -1978,10 +1978,10 @@ return CR_FAILURE; } - if (!StringTableStringFromIdEx(StringTable, - dnDevInst, - Buffer, - &BufferLen)) + if (!pSetupStringTableStringFromIdEx(StringTable, + dnDevInst, + Buffer, + &BufferLen)) return CR_FAILURE; return CR_SUCCESS; @@ -2271,7 +2271,7 @@ return CR_FAILURE; } - DeviceId = StringTableStringFromId(StringTable, dnDevInst); + DeviceId = pSetupStringTableStringFromId(StringTable, dnDevInst); if (DeviceId == NULL) { *pulLen = 0; @@ -2438,7 +2438,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -2798,7 +2798,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -2875,7 +2875,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -2996,7 +2996,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -3020,7 +3020,7 @@ TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst)); - dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1); + dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1); if (dwIndex == -1) return CR_FAILURE; @@ -3128,7 +3128,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -3152,7 +3152,7 @@ TRACE("szRelatedDevInst: %s\n", debugstr_w(szRelatedDevInst)); - dwIndex = StringTableAddString(StringTable, szRelatedDevInst, 1); + dwIndex = pSetupStringTableAddString(StringTable, szRelatedDevInst, 1); if (dwIndex == -1) return CR_FAILURE; @@ -3443,7 +3443,7 @@ if (ret == CR_SUCCESS) { - *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1); + *pdnDevInst = pSetupStringTableAddString(StringTable, DeviceIdBuffer, 1); if (*pdnDevInst == -1) ret = CR_FAILURE; } @@ -3531,11 +3531,11 @@ return CR_FAILURE; } - lpFromDevInst = StringTableStringFromId(StringTable, dnFromDevInst); + lpFromDevInst = pSetupStringTableStringFromId(StringTable, dnFromDevInst); if (lpFromDevInst == NULL) return CR_INVALID_DEVNODE; - lpToDevInst = StringTableStringFromId(StringTable, dnToDevInst); + lpToDevInst = pSetupStringTableStringFromId(StringTable, dnToDevInst); if (lpToDevInst == NULL) return CR_INVALID_DEVNODE; @@ -3856,7 +3856,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnAncestor); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnAncestor); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -3952,7 +3952,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -4109,7 +4109,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -4280,7 +4280,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -4508,7 +4508,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -4798,7 +4798,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; @@ -4866,7 +4866,7 @@ return CR_FAILURE; } - lpDevInst = StringTableStringFromId(StringTable, dnPhantom); + lpDevInst = pSetupStringTableStringFromId(StringTable, dnPhantom); if (lpDevInst == NULL) return CR_INVALID_DEVNODE; Modified: trunk/reactos/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/rpc.c?r… ============================================================================== --- trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/rpc.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -79,17 +79,17 @@ return TRUE; } - LocalStringTable = StringTableInitialize(); + LocalStringTable = pSetupStringTableInitialize(); if (LocalStringTable == NULL) return FALSE; if (PnpBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) { - StringTableDestroy(LocalStringTable); + pSetupStringTableDestroy(LocalStringTable); return FALSE; } - StringTableAddString(LocalStringTable, L"PLT", 1); + pSetupStringTableAddString(LocalStringTable, L"PLT", 1); if (BindingHandle != NULL) *BindingHandle = LocalBindingHandle; @@ -104,7 +104,7 @@ RPC_STATUS PnpUnbindLocalBindingHandle(VOID) { - StringTableDestroy(LocalStringTable); + pSetupStringTableDestroy(LocalStringTable); LocalStringTable = NULL; return PnpUnbindRpc(&LocalBindingHandle); } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -584,19 +584,19 @@ @ stub pSetupSetSystemSourcePath @ stub pSetupShouldDeviceBeExcluded @ stdcall pSetupStringFromGuid(ptr wstr long) -@ stdcall pSetupStringTableAddString(ptr wstr long) StringTableAddString -@ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long) StringTableAddStringEx -@ stdcall pSetupStringTableDestroy(ptr) StringTableDestroy -@ stdcall pSetupStringTableDuplicate(ptr) StringTableDuplicate +@ stdcall pSetupStringTableAddString(ptr wstr long) +@ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long) +@ stdcall pSetupStringTableDestroy(ptr) +@ stdcall pSetupStringTableDuplicate(ptr) @ stub pSetupStringTableEnum -@ stdcall pSetupStringTableGetExtraData(ptr long ptr long) StringTableGetExtraData -@ stdcall pSetupStringTableInitialize() StringTableInitialize -@ stdcall pSetupStringTableInitializeEx(long long) StringTableInitializeEx -@ stdcall pSetupStringTableLookUpString(ptr wstr long) StringTableLookUpString -@ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) StringTableLookUpStringEx -@ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData -@ stdcall pSetupStringTableStringFromId(ptr long) StringTableStringFromId -@ stdcall pSetupStringTableStringFromIdEx(ptr long ptr ptr) StringTableStringFromIdEx +@ stdcall pSetupStringTableGetExtraData(ptr long ptr long) +@ stdcall pSetupStringTableInitialize() +@ stdcall pSetupStringTableInitializeEx(long long) +@ stdcall pSetupStringTableLookUpString(ptr wstr long) +@ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) +@ stdcall pSetupStringTableSetExtraData(ptr long ptr long) +@ stdcall pSetupStringTableStringFromId(ptr long) +@ stdcall pSetupStringTableStringFromIdEx(ptr long ptr ptr) @ stdcall pSetupUnicodeToMultiByte(wstr long) UnicodeToMultiByte @ stdcall pSetupUnmapAndCloseFile(long long ptr) UnmapAndCloseFile @ stub pSetupVerifyCatalogFile @@ -627,7 +627,6 @@ @ stdcall RetreiveFileSecurity(wstr ptr) @ stub SearchForInfFile @ stdcall StampFileSecurity(wstr ptr) -@ stdcall StringTableTrim(ptr) @ stdcall TakeOwnershipOfFile(wstr) @ stub pSetupDirectoryIdToPath @ stub pSetupGetOsLoaderDriveAndPath Modified: trunk/reactos/dll/win32/setupapi/stringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stringt… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stringtable.c [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -41,7 +41,7 @@ /************************************************************************** - * StringTableInitialize [SETUPAPI.@] + * pSetupStringTableInitialize [SETUPAPI.@] * * Creates a new string table and initializes it. * @@ -53,7 +53,7 @@ * Failure: NULL */ HSTRING_TABLE WINAPI -StringTableInitialize(VOID) +pSetupStringTableInitialize(VOID) { PSTRING_TABLE pStringTable; @@ -88,7 +88,7 @@ /************************************************************************** - * StringTableInitializeEx [SETUPAPI.@] + * pSetupStringTableInitializeEx [SETUPAPI.@] * * Creates a new string table and initializes it. * @@ -101,8 +101,8 @@ * Failure: NULL */ HSTRING_TABLE WINAPI -StringTableInitializeEx(DWORD dwMaxExtraDataSize, - DWORD dwReserved) +pSetupStringTableInitializeEx(DWORD dwMaxExtraDataSize, + DWORD dwReserved) { PSTRING_TABLE pStringTable; @@ -133,7 +133,7 @@ /************************************************************************** - * StringTableDestroy [SETUPAPI.@] + * pSetupStringTableDestroy [SETUPAPI.@] * * Destroys a string table. * @@ -144,7 +144,7 @@ * None */ VOID WINAPI -StringTableDestroy(HSTRING_TABLE hStringTable) +pSetupStringTableDestroy(HSTRING_TABLE hStringTable) { PSTRING_TABLE pStringTable; DWORD i; @@ -175,7 +175,7 @@ /************************************************************************** - * StringTableAddString [SETUPAPI.@] + * pSetupStringTableAddString [SETUPAPI.@] * * Adds a new string to the string table. * @@ -195,9 +195,9 @@ * this case. */ DWORD WINAPI -StringTableAddString(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags) +pSetupStringTableAddString(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags) { PSTRING_TABLE pStringTable; DWORD i; @@ -250,7 +250,7 @@ MyFree(pNewSlots); pStringTable->dwMaxSlots = dwNewMaxSlots; - return StringTableAddString(hStringTable, lpString, dwFlags); + return pSetupStringTableAddString(hStringTable, lpString, dwFlags); } /* Search for an empty slot */ @@ -280,7 +280,7 @@ /************************************************************************** - * StringTableAddStringEx [SETUPAPI.@] + * pSetupStringTableAddStringEx [SETUPAPI.@] * * Adds a new string plus extra data to the string table. * @@ -302,11 +302,11 @@ * this case. */ DWORD WINAPI -StringTableAddStringEx(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags, - LPVOID lpExtraData, - DWORD dwExtraDataSize) +pSetupStringTableAddStringEx(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags, + LPVOID lpExtraData, + DWORD dwExtraDataSize) { PSTRING_TABLE pStringTable; DWORD i; @@ -390,7 +390,7 @@ /************************************************************************** - * StringTableDuplicate [SETUPAPI.@] + * pSetupStringTableDuplicate [SETUPAPI.@] * * Duplicates a given string table. * @@ -403,7 +403,7 @@ * */ HSTRING_TABLE WINAPI -StringTableDuplicate(HSTRING_TABLE hStringTable) +pSetupStringTableDuplicate(HSTRING_TABLE hStringTable) { PSTRING_TABLE pSourceTable; PSTRING_TABLE pDestinationTable; @@ -474,7 +474,7 @@ /************************************************************************** - * StringTableGetExtraData [SETUPAPI.@] + * pSetupStringTableGetExtraData [SETUPAPI.@] * * Retrieves extra data from a given string table entry. * @@ -489,10 +489,10 @@ * Failure: FALSE */ BOOL WINAPI -StringTableGetExtraData(HSTRING_TABLE hStringTable, - DWORD dwId, - LPVOID lpExtraData, - DWORD dwExtraDataSize) +pSetupStringTableGetExtraData(HSTRING_TABLE hStringTable, + DWORD dwId, + LPVOID lpExtraData, + DWORD dwExtraDataSize) { PSTRING_TABLE pStringTable; @@ -527,7 +527,7 @@ /************************************************************************** - * StringTableLookUpString [SETUPAPI.@] + * pSetupStringTableLookUpString [SETUPAPI.@] * * Searches a string table for a given string. * @@ -542,9 +542,9 @@ * Failure: -1 */ DWORD WINAPI -StringTableLookUpString(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags) +pSetupStringTableLookUpString(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags) { PSTRING_TABLE pStringTable; DWORD i; @@ -581,7 +581,7 @@ /************************************************************************** - * StringTableLookUpStringEx [SETUPAPI.@] + * pSetupStringTableLookUpStringEx [SETUPAPI.@] * * Searches a string table and extra data for a given string. * @@ -598,11 +598,11 @@ * Failure: -1 */ DWORD WINAPI -StringTableLookUpStringEx(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags, - LPVOID lpExtraData, - DWORD dwReserved) +pSetupStringTableLookUpStringEx(HSTRING_TABLE hStringTable, + LPWSTR lpString, + DWORD dwFlags, + LPVOID lpExtraData, + DWORD dwReserved) { PSTRING_TABLE pStringTable; DWORD i; @@ -647,7 +647,7 @@ /************************************************************************** - * StringTableSetExtraData [SETUPAPI.@] + * pSetupStringTableSetExtraData [SETUPAPI.@] * * Sets extra data for a given string table entry. * @@ -662,10 +662,10 @@ * Failure: FALSE */ BOOL WINAPI -StringTableSetExtraData(HSTRING_TABLE hStringTable, - DWORD dwId, - LPVOID lpExtraData, - DWORD dwExtraDataSize) +pSetupStringTableSetExtraData(HSTRING_TABLE hStringTable, + DWORD dwId, + LPVOID lpExtraData, + DWORD dwExtraDataSize) { PSTRING_TABLE pStringTable; @@ -708,7 +708,7 @@ /************************************************************************** - * StringTableStringFromId [SETUPAPI.@] + * pSetupStringTableStringFromId [SETUPAPI.@] * * Returns a pointer to a string for the given string ID. * @@ -721,8 +721,8 @@ * Failure: NULL */ LPWSTR WINAPI -StringTableStringFromId(HSTRING_TABLE hStringTable, - DWORD dwId) +pSetupStringTableStringFromId(HSTRING_TABLE hStringTable, + DWORD dwId) { PSTRING_TABLE pStringTable; static WCHAR empty[] = {0}; @@ -744,7 +744,7 @@ /************************************************************************** - * StringTableStringFromIdEx [SETUPAPI.@] + * pSetupStringTableStringFromIdEx [SETUPAPI.@] * * Returns a string for the given string ID. * @@ -759,10 +759,10 @@ * Failure: FALSE */ BOOL WINAPI -StringTableStringFromIdEx(HSTRING_TABLE hStringTable, - DWORD dwId, - LPWSTR lpBuffer, - LPDWORD lpBufferLength) +pSetupStringTableStringFromIdEx(HSTRING_TABLE hStringTable, + DWORD dwId, + LPWSTR lpBuffer, + LPDWORD lpBufferLength) { PSTRING_TABLE pStringTable; DWORD dwLength; @@ -797,21 +797,3 @@ return bResult; } - - -/************************************************************************** - * StringTableTrim [SETUPAPI.@] - * - * ... - * - * PARAMS - * hStringTable [I] Handle to the string table - * - * RETURNS - * None - */ -VOID WINAPI -StringTableTrim(HSTRING_TABLE hStringTable) -{ - FIXME("%p\n", hStringTable); -} Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sun Feb 20 22:13:59 2011 @@ -1430,19 +1430,18 @@ WINSETUPAPI DWORD WINAPI StampFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR); -WINSETUPAPI DWORD WINAPI StringTableAddString(HSTRING_TABLE, LPWSTR, DWORD); -WINSETUPAPI DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); -WINSETUPAPI VOID WINAPI StringTableDestroy(HSTRING_TABLE); -WINSETUPAPI HSTRING_TABLE WINAPI StringTableDuplicate(HSTRING_TABLE); -WINSETUPAPI BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); -WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitialize(VOID); -WINSETUPAPI HSTRING_TABLE WINAPI StringTableInitializeEx(DWORD, DWORD); -WINSETUPAPI DWORD WINAPI StringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); -WINSETUPAPI DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); -WINSETUPAPI BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); -WINSETUPAPI LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE, DWORD); -WINSETUPAPI BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); -WINSETUPAPI VOID WINAPI StringTableTrim(HSTRING_TABLE); +WINSETUPAPI DWORD WINAPI pSetupStringTableAddString(HSTRING_TABLE, LPWSTR, DWORD); +WINSETUPAPI DWORD WINAPI pSetupStringTableAddStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); +WINSETUPAPI VOID WINAPI pSetupStringTableDestroy(HSTRING_TABLE); +WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableDuplicate(HSTRING_TABLE); +WINSETUPAPI BOOL WINAPI pSetupStringTableGetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); +WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableInitialize(VOID); +WINSETUPAPI HSTRING_TABLE WINAPI pSetupStringTableInitializeEx(DWORD, DWORD); +WINSETUPAPI DWORD WINAPI pSetupStringTableLookUpString(HSTRING_TABLE, LPWSTR, DWORD); +WINSETUPAPI DWORD WINAPI pSetupStringTableLookUpStringEx(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); +WINSETUPAPI BOOL WINAPI pSetupStringTableSetExtraData(HSTRING_TABLE, DWORD, LPVOID, DWORD); +WINSETUPAPI LPWSTR WINAPI pSetupStringTableStringFromId(HSTRING_TABLE, DWORD); +WINSETUPAPI BOOL WINAPI pSetupStringTableStringFromIdEx(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); WINSETUPAPI DWORD WINAPI TakeOwnershipOfFile(PCWSTR); WINSETUPAPI PSTR WINAPI UnicodeToMultiByte(PCWSTR lpUnicodeStr, UINT uCodePage);

1 0

[pschweitzer] 50843: [WIN32CSR] Silence CsrGetTempFile() debug
by pschweitzer＠svn.reactos.org 20 Feb '11

20 Feb '11

Author: pschweitzer Date: Sun Feb 20 21:47:41 2011 New Revision: 50843 URL: http://svn.reactos.org/svn/reactos?rev=50843&view=rev Log: [WIN32CSR] Silence CsrGetTempFile() debug Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/file.c [iso-8859-1] Sun Feb 20 21:47:41 2011 @@ -22,12 +22,12 @@ CSR_API(CsrGetTempFile) { - DPRINT1("CsrGetTempFile entered\n"); + DPRINT("CsrGetTempFile entered\n"); /* Return 16-bits ID */ Request->Data.GetTempFile.UniqueID = (++CsrGetTempFileUnique & 0xFFFF); - DPRINT1("Returning: %u\n", Request->Data.GetTempFile.UniqueID); + DPRINT("Returning: %u\n", Request->Data.GetTempFile.UniqueID); return STATUS_SUCCESS; }

1 0

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