Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[arty] 50856: [NEWCC] delete to rebranch
by arty＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: arty Date: Mon Feb 21 20:11:08 2011 New Revision: 50856 URL: http://svn.reactos.org/svn/reactos?rev=50856&view=rev Log: [NEWCC] delete to rebranch Removed: branches/arty-newcc/

1 0

[fireball] 50855: [RTL/AVL] - Zero out contents of a newly allocated AVL table node.
by fireball＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: fireball Date: Mon Feb 21 13:33:13 2011 New Revision: 50855 URL: http://svn.reactos.org/svn/reactos?rev=50855&view=rev Log: [RTL/AVL] - Zero out contents of a newly allocated AVL table node. Modified: trunk/reactos/lib/rtl/avltable.c Modified: trunk/reactos/lib/rtl/avltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avltable.c?rev=508… ============================================================================== --- trunk/reactos/lib/rtl/avltable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avltable.c [iso-8859-1] Mon Feb 21 13:33:13 2011 @@ -70,11 +70,12 @@ if (NewElement) *NewElement = FALSE; return NULL; } - + /* Data to return to user */ UserData = &((PTABLE_ENTRY_HEADER)NewNode)->UserData; /* Insert the node in the tree */ + RtlZeroMemory(NewNode, sizeof(RTL_BALANCED_LINKS)); RtlpInsertAvlTreeNode(Table, NewNode, NodeOrParent, SearchResult); /* Copy user buffer */

1 0

[akhaldi] 50854: [RTL] - Silence this dprint. It's flooding the debug log.
by akhaldi＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: akhaldi Date: Mon Feb 21 09:12:43 2011 New Revision: 50854 URL: http://svn.reactos.org/svn/reactos?rev=50854&view=rev Log: [RTL] - Silence this dprint. It's flooding the debug log. Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5085… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Mon Feb 21 09:12:43 2011 @@ -47,7 +47,7 @@ } else { - DPRINT1("HACK::Shouldn't have happened! Consider fixing Usetup and registry entries it creates on install\n"); + DPRINT("HACK::Shouldn't have happened! Consider fixing Usetup and registry entries it creates on install\n"); Size = 1; }

1 0

[jimtabor] 50853: [Win32k] - Fix crash with win wine test. Win test works on my tree here and hardware as well.
by jimtabor＠svn.reactos.org 21 Feb '11

21 Feb '11

Author: jimtabor Date: Mon Feb 21 09:01:07 2011 New Revision: 50853 URL: http://svn.reactos.org/svn/reactos?rev=50853&view=rev Log: [Win32k] - Fix crash with win wine test. Win test works on my tree here and hardware as well. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c 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] Mon Feb 21 09:01:07 2011 @@ -1624,11 +1624,6 @@ for (i = 0; List[i]; i++) { Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); - if (!Ret) - { - DPRINT1("SendNotifyMessage: Failed in Broadcast!\n"); - break; - } } ExFreePool(List); }

1 0

[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

← Newer
1
...
6
7
8
9
10
11
12
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2011