Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[tkreuzer] 53760: [NTDLL] Fix CsrProbeForRead and CsrProbeForWrite to actually access the memory, by using volatile. The compiler optimized the access away previously.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 19 16:24:18 2011 New Revision: 53760 URL: http://svn.reactos.org/svn/reactos?rev=53760&view=rev Log: [NTDLL] Fix CsrProbeForRead and CsrProbeForWrite to actually access the memory, by using volatile. The compiler optimized the access away previously. Modified: trunk/reactos/dll/ntdll/csr/capture.c Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Mon Sep 19 16:24:18 2011 @@ -26,7 +26,7 @@ IN ULONG Length, IN ULONG Alignment) { - PUCHAR Pointer; + volatile UCHAR *Pointer; UCHAR Data; /* Validate length */ @@ -39,10 +39,12 @@ RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); } - /* Do the probe */ - Pointer = (PUCHAR)Address; + /* Probe first byte */ + Pointer = Address; Data = *Pointer; - Pointer = (PUCHAR)((ULONG)Address + Length -1); + + /* Probe last byte */ + Pointer = (PUCHAR)Address + Length - 1; Data = *Pointer; (void)Data; } @@ -56,8 +58,7 @@ IN ULONG Length, IN ULONG Alignment) { - PUCHAR Pointer; - UCHAR Data; + volatile UCHAR *Pointer; /* Validate length */ if (Length == 0) return; @@ -69,13 +70,13 @@ RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); } - /* Do the probe */ - Pointer = (PUCHAR)Address; - Data = *Pointer; - *Pointer = Data; - Pointer = (PUCHAR)((ULONG)Address + Length -1); - Data = *Pointer; - *Pointer = Data; + /* Probe first byte */ + Pointer = Address; + *Pointer = *Pointer; + + /* Probe last byte */ + Pointer = (PUCHAR)Address + Length - 1; + *Pointer = *Pointer; } /* @@ -217,7 +218,7 @@ if (!String) { CapturedString->Length = 0; - CapturedString->MaximumLength = MaximumLength; + CapturedString->MaximumLength = (USHORT)MaximumLength; /* Allocate a pointer for it */ CsrAllocateMessagePointer(CaptureBuffer, @@ -227,13 +228,13 @@ } /* Initialize this string */ - CapturedString->Length = StringLength; - + CapturedString->Length = (USHORT)StringLength; + /* Allocate a buffer and get its size */ ReturnedLength = CsrAllocateMessagePointer(CaptureBuffer, MaximumLength, (PVOID*)&CapturedString->Buffer); - CapturedString->MaximumLength = ReturnedLength; + CapturedString->MaximumLength = (USHORT)ReturnedLength; /* If the string had data */ if (StringLength)

13 years

[dgorbachev] 53759: Fix more unused-but-set warnings.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Sep 19 14:41:04 2011 New Revision: 53759 URL: http://svn.reactos.org/svn/reactos?rev=53759&view=rev Log: Fix more unused-but-set warnings. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/orders.c trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp trunk/reactos/include/reactos/libs/sound/mmebuddy.h trunk/reactos/lib/pseh/framebased.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -1089,9 +1089,9 @@ case WM_NOTIFY: { - INT idctrl; + //INT idctrl; LPNMHDR pnmh; - idctrl = (int)wParam; + //idctrl = (int)wParam; pnmh = (LPNMHDR)lParam; if (//(pnmh->hwndFrom == pInfo->hSelf) && (pnmh->idFrom == IDC_TAB) && Modified: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… ============================================================================== --- trunk/reactos/base/applications/mstsc/orders.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/orders.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -943,6 +943,7 @@ in_uint8p(s, data, size); DEBUG(("BMPCACHE(cx=%d,cy=%d,id=%d,idx=%d,bpp=%d,size=%d,pad1=%d,bufsize=%d,pad2=%d,rs=%d,fs=%d)\n", width, height, cache_id, cache_idx, bpp, size, pad1, bufsize, pad2, row_size, final_size)); + (void)pad1; (void)pad2; bmpdata = (uint8 *) xmalloc(width * height * Bpp); Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -169,14 +169,16 @@ static BOOL IsVMwareCDInDrive(WCHAR *Drv) { +#if CHECKDRIVETYPE static WCHAR Drive[4] = L"X:\\"; +#endif WCHAR Current; *Drv = L'\0'; for(Current = 'C'; Current <= 'Z'; Current++) { +#if CHECKDRIVETYPE Drive[0] = Current; -#if CHECKDRIVETYPE if(GetDriveType(Drive) == DRIVE_CDROM) { #endif Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -44,6 +44,7 @@ Data = *Pointer; Pointer = (PUCHAR)((ULONG)Address + Length -1); Data = *Pointer; + (void)Data; } /* Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -45,6 +45,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) add_library(browseui SHARED ${SOURCE}) +allow_warnings(browseui) set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -74,7 +74,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) add_library(shell32 SHARED ${SOURCE}) - +allow_warnings(shell32) set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -783,10 +783,10 @@ LPVOID lpParameter) { DWORD Length; - MMRESULT Result; + //MMRESULT Result; LPIO_PACKET Packet = (LPIO_PACKET)lpParameter; - Result = SyncOverlappedDeviceIoControl(Packet->hDevice, + /*Result = */ SyncOverlappedDeviceIoControl(Packet->hDevice, Packet->IoCtl, NULL, 0, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -878,13 +878,13 @@ ASSERT(context->BytesRead); PUCHAR pChar = PUCHAR(context->BufferAddress); - NTSTATUS ntStatus,readStatus; + NTSTATUS ntStatus; // , readStatus ntStatus = STATUS_SUCCESS; // // while we're not there yet, and // while we don't have to wait on an aligned byte (including 0) // (we never wait on a byte. Better to come back later) - readStatus = DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport)); + /*readStatus = */ DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport)); while ( (*(context->BytesRead) < context->Length) && ( TryMPU(context->PortBase) || (*(context->BytesRead)%3) @@ -903,7 +903,7 @@ break; } } - readStatus = DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport)); + /*readStatus = */ DMusMPUInterruptServiceRoutine(InterruptSync,PVOID(context->Miniport)); return ntStatus; } Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -79,7 +79,7 @@ #define SND_ERR(...) do {} while ( 0 ) #define SND_WARN(...) do {} while ( 0 ) #define SND_TRACE(...) do {} while ( 0 ) - #define SND_ASSERT(condition) do {} while ( 0 ) + #define SND_ASSERT(condition) do {(void)(condition);} while ( 0 ) #define DUMP_WAVEHDR_QUEUE(condition) do {} while ( 0 ) #endif Modified: trunk/reactos/lib/pseh/framebased.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/framebased.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased.c [iso-8859-1] Mon Sep 19 14:41:04 2011 @@ -470,6 +470,23 @@ void _SEH_FASTCALL _SEHLeaveFrame_f(void) { + /* _SEHPortableFrame_t * frame; + + frame = _SEH_CONTAINING_RECORD + ( + _SEHCurrentRegistration(), + _SEHPortableFrame_t, + SPF_Registration + ); */ + + /* ASSERT(frame); */ + /* ASSERT(frame->SPF_TopTryLevel == NULL) */ + + _SEHUnregisterFrame(); +} + +void _SEH_FASTCALL _SEHReturn_f(void) +{ _SEHPortableFrame_t * frame; frame = _SEH_CONTAINING_RECORD @@ -479,23 +496,6 @@ SPF_Registration ); - /* ASSERT(frame); */ - /* ASSERT(frame->SPF_TopTryLevel == NULL) */ - - _SEHUnregisterFrame(); -} - -void _SEH_FASTCALL _SEHReturn_f(void) -{ - _SEHPortableFrame_t * frame; - - frame = _SEH_CONTAINING_RECORD - ( - _SEHCurrentRegistration(), - _SEHPortableFrame_t, - SPF_Registration - ); - _SEHLocalUnwind(frame, NULL); _SEHUnregisterFrame(); }

13 years