Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 54100: [SHELL32] Use COPYRIGHT_YEAR in the Authors dialog. See issue #6496 for more details.
by khornicek＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: khornicek Date: Wed Oct 12 21:54:10 2011 New Revision: 54100 URL: http://svn.reactos.org/svn/reactos?rev=54100&view=rev Log: [SHELL32] Use COPYRIGHT_YEAR in the Authors dialog. See issue #6496 for more details. Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Wed Oct 12 21:54:10 2011 @@ -21,10 +21,11 @@ #include <precomp.h> #include "version.h" +#include <reactos/version.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); -const char * const SHELL_Authors[] = { "Copyright 1993-2009 WINE team", "Copyright 1998-2009 ReactOS Team", 0 }; +const char * const SHELL_Authors[] = { "Copyright 1993-"COPYRIGHT_YEAR" WINE team", "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team", 0 }; #define MORE_DEBUG 1 /*************************************************************************

1 0

[khornicek] 54099: one .rbuild file ought to be enough for anybody
by khornicek＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: khornicek Date: Wed Oct 12 21:33:48 2011 New Revision: 54099 URL: http://svn.reactos.org/svn/reactos?rev=54099&view=rev Log: one .rbuild file ought to be enough for anybody Removed: trunk/reactos/dll/win32/shell32/shell32.rbuild.bak Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Wed Oct 12 21:33:48 2011 @@ -4,8 +4,8 @@ <importlibrary definition="shell32.spec" /> <include base="recyclebin">.</include> <include base="ReactOS">include/reactos/wine</include> - <include base="atlnew">.</include> - <define name="_SHELL32_" /> + <include base="atlnew">.</include> + <define name="_SHELL32_" /> <define name="COM_NO_WINDOWS_H" /> <define name="_WINE" /> <define name="UNICODE" /> Removed: trunk/reactos/dll/win32/shell32/shell32.rbuild.bak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild.bak [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild.bak (removed) @@ -1,90 +1,0 @@ -<group> -<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" crt="msvcrt"> - <autoregister infsection="OleControlDlls" type="Both" /> - <importlibrary definition="shell32.spec" /> - <include base="shell32">.</include> - <include base="recyclebin">.</include> - <include base="ReactOS">include/reactos/wine</include> - <include base="atlnew">.</include> - <define name="_SHELL32_" /> - <define name="COM_NO_WINDOWS_H" /> - <define name="_WINE" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <redefine name="_WIN32_WINNT">0x600</redefine> - <library>wine</library> - <library>uuid</library> - <library>recyclebin</library> - <library>ntdll</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>comdlg32</library> - <library>shlwapi</library> - <library>ole32</library> - <library>version</library> - <library>devmgr</library> - <library>winspool</library> - <library>winmm</library> - <library>msvcrt</library> - <library>atlnew</library> - <pch>precomp.h</pch> - <file>authors.cpp</file> - <file>autocomplete.cpp</file> - <file>brsfolder.cpp</file> - <file>changenotify.cpp</file> - <file>classes.cpp</file> - <file>clipboard.cpp</file> - <file>control.cpp</file> - <file>dataobject.cpp</file> - <file>dde.cpp</file> - <file>debughlp.cpp</file> - <file>desktop.cpp</file> - <file>dialogs.cpp</file> - <file>dragdrophelper.cpp</file> - <file>enumidlist.cpp</file> - <file>extracticon.cpp</file> - <file>folders.cpp</file> - <file>iconcache.cpp</file> - <file>pidl.cpp</file> - <file>shell32_main.cpp</file> - <file>shellitem.cpp</file> - <file>shelllink.cpp</file> - <file>shellole.cpp</file> - <file>shellord.cpp</file> - <file>shellpath.cpp</file> - <file>shellreg.cpp</file> - <file>shellstring.cpp</file> - <file>shfldr_desktop.cpp</file> - <file>shfldr_fs.cpp</file> - <file>shfldr_mycomp.cpp</file> - <file>shfldr_mydocuments.cpp</file> - <file>shfldr_printers.cpp</file> - <file>shfldr_admintools.cpp</file> - <file>shfldr_netplaces.cpp</file> - <file>shfldr_fonts.cpp</file> - <file>shfldr_cpanel.cpp</file> - <file>shfldr_recyclebin.cpp</file> - <file>shlexec.cpp</file> - <file>shlfileop.cpp</file> - <file>shlfolder.cpp</file> - <file>shlfsbind.cpp</file> - <file>shlmenu.cpp</file> - <file>shlview.cpp</file> - <file>shpolicy.cpp</file> - <file>shv_def_cmenu.cpp</file> - <file>startmenu.cpp</file> - <file>stubs.cpp</file> - <file>ros-systray.cpp</file> - <file>fprop.cpp</file> - <file>drive.cpp</file> - <file>she_ocmenu.cpp</file> - <file>shv_item_new.cpp</file> - <file>folder_options.cpp</file> - <file>shell32.rc</file> -</module> -<module name="shobjidl_local_interface" type="idlinterface"> - <file>shobjidl_local.idl</file> -</module> -</group>

1 0

[rharabien] 54098: [DESK] - Fix duplicated entries in screensaver selector. Patch by Carlo Bramix <carlo dot bramix at libero dot it>. See issue #6533 for more details.
by rharabien＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: rharabien Date: Wed Oct 12 21:30:50 2011 New Revision: 54098 URL: http://svn.reactos.org/svn/reactos?rev=54098&view=rev Log: [DESK] - Fix duplicated entries in screensaver selector. Patch by Carlo Bramix <carlo dot bramix at libero dot it>. See issue #6533 for more details. Modified: trunk/reactos/dll/cpl/desk/screensaver.c Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Wed Oct 12 21:30:50 2011 @@ -410,6 +410,7 @@ { HWND hwndScreenSavers = GetDlgItem(hwndDlg, IDC_SCREENS_LIST); TCHAR szSearchPath[MAX_PATH]; + TCHAR szLocalPath[MAX_PATH]; INT i; ScreenSaverItem *ScreenSaverItem = NULL; LPTSTR lpBackSlash; @@ -437,22 +438,24 @@ // Initialize number of items into the list pData->ScreenSaverCount = 1; + // Add all the screensavers where the applet is stored. + GetModuleFileName(hApplet, szLocalPath, MAX_PATH); + lpBackSlash = _tcsrchr(szLocalPath, _T('\\')); + if (lpBackSlash != NULL) + { + *lpBackSlash = '\0'; + SearchScreenSavers(hwndScreenSavers, szLocalPath, pData); + } + // Add all the screensavers in the C:\ReactOS\System32 directory. GetSystemDirectory(szSearchPath, MAX_PATH); - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); + if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) + SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); // Add all the screensavers in the C:\ReactOS directory. GetWindowsDirectory(szSearchPath, MAX_PATH); - SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); - - // Add all the screensavers where the applet is stored. - GetModuleFileName(hApplet, szSearchPath, MAX_PATH); - lpBackSlash = _tcsrchr(szSearchPath, _T('\\')); - if (lpBackSlash != NULL) - { - *lpBackSlash = '\0'; + if (lpBackSlash != NULL && _tcsicmp(szSearchPath, szLocalPath) != 0) SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); - } }

1 0

[tkreuzer] 54097: [RTL] On x86 builds use the asm versions of the byte swap functions. This is neccessary for RtlUlonglongByteswap, because the function breaks the calling convention on Windows, no...
by tkreuzer＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tkreuzer Date: Wed Oct 12 21:11:02 2011 New Revision: 54097 URL: http://svn.reactos.org/svn/reactos?rev=54097&view=rev Log: [RTL] On x86 builds use the asm versions of the byte swap functions. This is neccessary for RtlUlonglongByteswap, because the function breaks the calling convention on Windows, not cleaning up the stack. Make the asm compatible to ML and improve it a bit. Investigated by Thomas Faber. Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/byteswap.c trunk/reactos/lib/rtl/i386/rtlswap.S trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Wed Oct 12 21:11:02 2011 @@ -14,7 +14,6 @@ avltable.c bitmap.c bootdata.c - byteswap.c compress.c condvar.c crc32.c @@ -71,10 +70,12 @@ i386/except.c i386/interlck.S i386/rtlmem.s + i386/rtlswap.s i386/res_asm.s i386/thread.c) elseif(ARCH MATCHES amd64) list(APPEND SOURCE + byteswap.c amd64/debug_asm.S amd64/except_asm.S amd64/slist.S @@ -83,10 +84,12 @@ mem.c) elseif(ARCH MATCHES arm) list(APPEND SOURCE + byteswap.c arm/debug_asm.S mem.c) elseif(ARCH MATCHES powerpc) list(APPEND SOURCE + byteswap.c powerpc/debug.c powerpc/except.c powerpc/interlocked.c Modified: trunk/reactos/lib/rtl/byteswap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/byteswap.c?rev=540… ============================================================================== --- trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] Wed Oct 12 21:11:02 2011 @@ -11,6 +11,11 @@ #define NDEBUG #include <debug.h> + +#if defined(_M_IX86) +/* RtlUlonglongByteSwap is broken and cannot be done in C on x86 */ +#error "Use rtlswap.S!" +#endif #undef RtlUlonglongByteSwap #undef RtlUlongByteSwap @@ -31,7 +36,7 @@ RtlUshortByteSwap( IN USHORT Source) { -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_AMD64) return _byteswap_ushort(Source); #else return (Source >> 8) | (Source << 8); @@ -55,7 +60,7 @@ RtlUlongByteSwap( IN ULONG Source) { -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_AMD64) return _byteswap_ulong(Source); #else return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); @@ -80,7 +85,7 @@ RtlUlonglongByteSwap( IN ULONGLONG Source) { -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_AMD64) return _byteswap_uint64(Source); #else return ((ULONGLONG) RtlUlongByteSwap (Source) << 32) | RtlUlongByteSwap (Source>>32); Modified: trunk/reactos/lib/rtl/i386/rtlswap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlswap.S?rev… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlswap.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/rtlswap.S [iso-8859-1] Wed Oct 12 21:11:02 2011 @@ -4,50 +4,55 @@ * PURPOSE: Byte swap functions * FILE: lib/rtl/i386/rtlswap.S * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -.intel_syntax noprefix +#include <asm.inc> -.globl @RtlUshortByteSwap@4 -.globl @RtlUlongByteSwap@4 -.globl @RtlUlonglongByteSwap@8 +PUBLIC @RtlUshortByteSwap@4 +PUBLIC @RtlUlongByteSwap@4 +PUBLIC @RtlUlonglongByteSwap@8 /* FUNCTIONS ***************************************************************/ +.code -.func @RtlUshortByteSwap@4, @RtlUshortByteSwap@4 @RtlUshortByteSwap@4: +FUNC RtlUshortByteSwap + FPO 0, 0, 0, 0, 0, FRAME_FPO /* Swap high and low bits */ mov ah, cl mov al, ch ret -.endfunc +ENDFUNC RtlUshortByteSwap -.func @RtlUlongByteSwap@4, @RtlUlongByteSwap@4 @RtlUlongByteSwap@4: +FUNC RtlUlongByteSwap + FPO 0, 0, 0, 0, 0, FRAME_FPO /* Swap high and low bits */ mov eax, ecx bswap eax ret -.endfunc +ENDFUNC RtlUlongByteSwap -.func @RtlUlonglongByteSwap@8, @RtlUlonglongByteSwap@8 @RtlUlonglongByteSwap@8: +FUNC RtlUlonglongByteSwap + FPO 0, 2, 0, 0, 0, FRAME_FPO /* Get 64-bit integer */ - mov edx, [esp+8] - mov eax, [esp+4] + mov eax, [esp+8] + mov edx, [esp+4] /* Swap it */ bswap edx bswap eax - /* Return it */ - mov ecx, eax - mov eax, edx - mov edx, ecx + /* Return it (NOTE: this might look wrong, since fastcall functions + should clean up the stack, even if the first parameter is an ULONGLONG, + and therefore put on tthe stack instead of in ecx and edx, + but thats exactly how the function behaves on Windows! */ ret -.endfunc +ENDFUNC RtlUlonglongByteSwap - +END Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=540… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Oct 12 21:11:02 2011 @@ -20,6 +20,7 @@ </directory> </if> <if property="ARCH" value="powerpc"> + <file>byteswap.c</file> <directory name="powerpc"> <file>debug.c</file> <file>except.c</file> @@ -30,12 +31,14 @@ </directory> </if> <if property="ARCH" value="arm"> + <file>byteswap.c</file> <directory name="arm"> <file>debug_asm.S</file> </directory> <file>mem.c</file> </if> <if property="ARCH" value="amd64"> + <file>byteswap.c</file> <directory name="amd64"> <file>debug_asm.S</file> <file>except_asm.S</file> @@ -51,7 +54,6 @@ <file>assert.c</file> <file>atom.c</file> <file>avltable.c</file> - <file>byteswap.c</file> <file>bitmap.c</file> <file>bootdata.c</file> <file>compress.c</file>

1 0

[tkreuzer] 54096: [NTOSKRNL] Do not use image base addresses above MmHighestUserAddress in MmMapViewOfSection, because it would first succeed when checking for conflicting memory areas, and thus no...
by tkreuzer＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tkreuzer Date: Wed Oct 12 19:26:45 2011 New Revision: 54096 URL: http://svn.reactos.org/svn/reactos?rev=54096&view=rev Log: [NTOSKRNL] Do not use image base addresses above MmHighestUserAddress in MmMapViewOfSection, because it would first succeed when checking for conflicting memory areas, and thus not try to find a better address, but later fail in MmMapViewOfSegment, which cannot create a memory area in system space (only possible with MmKernelAddressSpace / PsIdleProcess). See issue #5680 for more details. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Oct 12 19:26:45 2011 @@ -87,7 +87,7 @@ IN SECTION_INHERIT InheritDisposition, IN ULONG AllocationType, IN ULONG Protect); - + // // PeFmtCreateSection depends on the following: // @@ -1633,7 +1633,7 @@ { DPRINT1("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); } - + } else { @@ -1819,7 +1819,7 @@ PMM_REGION Region; ULONG Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - + DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); /* @@ -4625,6 +4625,12 @@ } ImageSectionObject->ImageSize = (ULONG)ImageSize; + + /* Check for an illegal base address */ + if ((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) + { + ImageBase = PAGE_ROUND_DOWN((ULONG_PTR)MmHighestUserAddress - ImageSize); + } /* Check there is enough space to map the section at that point. */ if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase,

1 0

[tkreuzer] 54095: [SERVICES] - Do not keep the process handle of a started process open - when sending a STOP command to a process failed, then succeed and mark the process as stopped. Fixes ghost ...
by tkreuzer＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tkreuzer Date: Wed Oct 12 14:26:01 2011 New Revision: 54095 URL: http://svn.reactos.org/svn/reactos?rev=54095&view=rev Log: [SERVICES] - Do not keep the process handle of a started process open - when sending a STOP command to a process failed, then succeed and mark the process as stopped. Fixes ghost processes, when terminating a service with taskmgr and allows to restart services that got terminated or possibly crashed. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Wed Oct 12 14:26:01 2011 @@ -202,7 +202,6 @@ pServiceImage->dwImageRunCount = 1; pServiceImage->hControlPipe = INVALID_HANDLE_VALUE; - pServiceImage->hProcess = INVALID_HANDLE_VALUE; /* Set the image path */ wcscpy(pServiceImage->szImagePath, @@ -264,10 +263,6 @@ /* Close the control pipe */ if (pServiceImage->hControlPipe != INVALID_HANDLE_VALUE) CloseHandle(pServiceImage->hControlPipe); - - /* Close the process handle */ - if (pServiceImage->hProcess != INVALID_HANDLE_VALUE) - CloseHandle(pServiceImage->hProcess); /* Release the service image */ HeapFree(GetProcessHeap(), 0, pServiceImage); @@ -656,7 +651,7 @@ HeapFree(GetProcessHeap(), 0, CurrentService); } } - + if (dwError != ERROR_SUCCESS) DPRINT1("Delete service failed: %S\n", CurrentService->lpServiceName); } @@ -1085,6 +1080,16 @@ { dwError = GetLastError(); DPRINT("WriteFile() failed (Error %lu)\n", dwError); + + if ((dwError == ERROR_GEN_FAILURE) && + (dwControl == SERVICE_CONTROL_STOP)) + { + /* Service is already terminated */ + Service->Status.dwCurrentState = SERVICE_STOPPED; + Service->Status.dwControlsAccepted = 0; + Service->Status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE; + dwError = ERROR_SUCCESS; + } goto Done; } @@ -1572,7 +1577,6 @@ /* Get process handle and id */ Service->lpImage->dwProcessId = ProcessInformation.dwProcessId; - Service->lpImage->hProcess = ProcessInformation.hProcess; /* Resume Thread */ ResumeThread(ProcessInformation.hThread); @@ -1590,12 +1594,11 @@ { DPRINT1("Connecting control pipe failed! (Error %lu)\n", dwError); Service->lpImage->dwProcessId = 0; - Service->lpImage->hProcess = NULL; - CloseHandle(ProcessInformation.hProcess); - } - - /* Close thread handle */ + } + + /* Close thread and process handle */ CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); return dwError; }

1 0

[akhaldi] 54094: * Improve some includes.
by akhaldi＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: akhaldi Date: Wed Oct 12 12:24:19 2011 New Revision: 54094 URL: http://svn.reactos.org/svn/reactos?rev=54094&view=rev Log: * Improve some includes. Modified: trunk/reactos/drivers/parallel/parallel/parallel.c trunk/reactos/drivers/usb/usbd/usbd.c trunk/reactos/drivers/video/miniport/vmx_svga/precomp.h trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h trunk/reactos/lib/drivers/sound/soundblaster/precomp.h Modified: trunk/reactos/drivers/parallel/parallel/parallel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parallel/… ============================================================================== --- trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] Wed Oct 12 12:24:19 2011 @@ -12,7 +12,7 @@ /* FUNCTIONS **************************************************************/ -#include <ntddk.h> +#include <wdm.h> #include "parallel.h" Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Wed Oct 12 12:24:19 2011 @@ -32,9 +32,9 @@ * USBD_GetPdoRegistryParameters (implemented) */ -#include <ntddk.h> +#include <wdm.h> #include <usbdi.h> -#include <debug.h> + #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 #endif Modified: trunk/reactos/drivers/video/miniport/vmx_svga/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vmx… ============================================================================== --- trunk/reactos/drivers/video/miniport/vmx_svga/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vmx_svga/precomp.h [iso-8859-1] Wed Oct 12 12:24:19 2011 @@ -9,7 +9,6 @@ #include <ntdef.h> #include <dderror.h> #include <miniport.h> -#include <ntddvdeo.h> #include <video.h> #include "vmx_regs.h" Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… ============================================================================== --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h [iso-8859-1] Wed Oct 12 12:24:19 2011 @@ -29,7 +29,6 @@ #include "dderror.h" #include "devioctl.h" #include "miniport.h" -#include "ntddvdeo.h" #include "video.h" /* FIXME: NDK not compatible with miniport drivers */ Modified: trunk/reactos/lib/drivers/sound/soundblaster/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/soundbla… ============================================================================== --- trunk/reactos/lib/drivers/sound/soundblaster/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/soundblaster/precomp.h [iso-8859-1] Wed Oct 12 12:24:19 2011 @@ -1,4 +1,3 @@ -#include <ntddk.h> -#include <debug.h> +#include <wdm.h> #include <time.h> #include <sbdsp.h>

1 0

[tfaber] 54093: [RTL] - Handle a NULL buffer in RtlIpv4AddressToStringA as Windows does. Fixes crash in ntdll:rtl test [CRT] - Fail on qsort with 0 size. Fixes hang in ntdll:string test
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 11:58:46 2011 New Revision: 54093 URL: http://svn.reactos.org/svn/reactos?rev=54093&view=rev Log: [RTL] - Handle a NULL buffer in RtlIpv4AddressToStringA as Windows does. Fixes crash in ntdll:rtl test [CRT] - Fail on qsort with 0 size. Fixes hang in ntdll:string test Modified: trunk/reactos/lib/rtl/network.c trunk/reactos/lib/sdk/crt/stdlib/qsort.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=5409… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Wed Oct 12 11:58:46 2011 @@ -22,10 +22,15 @@ RtlIpv4AddressToStringA(IN struct in_addr *Addr, OUT PCHAR S) { - return S + sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); + CHAR Buffer[sizeof("255.255.255.255")]; + INT Length; + Length = sprintf(Buffer, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); + if (S) + strcpy(S, Buffer); + return S + Length; } /* Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c [iso-8859-1] Wed Oct 12 11:58:46 2011 @@ -186,7 +186,8 @@ if (n <= 1) return; - size = size; + if (size == 0) + return; compar = compar; thresh = size * THRESH; max = base + n * size;

1 0

[tfaber] 54092: [STLPORT] - Revert r54088 [GLU32] - Do not use stlport headers with MSVC, as they are broken. Should really fix MSVC build
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 11:49:25 2011 New Revision: 54092 URL: http://svn.reactos.org/svn/reactos?rev=54092&view=rev Log: [STLPORT] - Revert r54088 [GLU32] - Do not use stlport headers with MSVC, as they are broken. Should really fix MSVC build Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/include/c++/stlport/stl/config/_windows.h Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Wed Oct 12 11:49:25 2011 @@ -1,5 +1,7 @@ -set_cpp() +if(NOT MSVC) + set_cpp() +endif() add_definitions( -DRESOLVE_3D_TEXTURE_SUPPORT Modified: trunk/reactos/include/c++/stlport/stl/config/_windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/stlport/st… ============================================================================== --- trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original) +++ trunk/reactos/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Wed Oct 12 11:49:25 2011 @@ -98,10 +98,6 @@ /* Define WIN32_NO_STATUS to prevent status codes redefinitions */ # if !defined(WIN32_NO_STATUS) # define WIN32_NO_STATUS -# endif -/* Don't let windows.h define its min and max macros. */ -# if !defined (NOMINMAX) -# define NOMINMAX # endif # include <windef.h>

1 0

[tfaber] 54091: [RTL] - Rewrite RtlFindCharInUnicodeString. Fixes timeout in ntdll:rtlstr test.
by tfaber＠svn.reactos.org 12 Oct '11

12 Oct '11

Author: tfaber Date: Wed Oct 12 11:36:52 2011 New Revision: 54091 URL: http://svn.reactos.org/svn/reactos?rev=54091&view=rev Log: [RTL] - Rewrite RtlFindCharInUnicodeString. Fixes timeout in ntdll:rtlstr test. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Oct 12 11:36:52 2011 @@ -2026,7 +2026,7 @@ NTAPI RtlFindCharInUnicodeString( IN ULONG Flags, - IN PUNICODE_STRING SearchString, + IN PCUNICODE_STRING SearchString, IN PCUNICODE_STRING MatchString, OUT PUSHORT Position ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Oct 12 11:36:52 2011 @@ -242,6 +242,8 @@ // // RtlFindCharInUnicodeString Flags // +#define RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END 1 +#define RTL_FIND_CHAR_IN_UNICODE_STRING_COMPLEMENT_CHAR_SET 2 #define RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE 4 // Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=5409… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/unicode.c [iso-8859-1] Wed Oct 12 11:36:52 2011 @@ -2486,6 +2486,31 @@ return STATUS_NOT_IMPLEMENTED; } +static +BOOLEAN +RtlpIsCharInUnicodeString( + IN WCHAR Char, + IN PCUNICODE_STRING MatchString, + IN BOOLEAN CaseInSensitive) +{ + USHORT i; + + if (CaseInSensitive) + Char = RtlUpcaseUnicodeChar(Char); + + for (i = 0; i < MatchString->Length / sizeof(WCHAR); i++) + { + WCHAR OtherChar = MatchString->Buffer[i]; + if (CaseInSensitive) + OtherChar = RtlUpcaseUnicodeChar(OtherChar); + + if (Char == OtherChar) + return TRUE; + } + + return FALSE; +} + /* * @implemented */ @@ -2493,94 +2518,54 @@ NTAPI RtlFindCharInUnicodeString( IN ULONG Flags, - IN PUNICODE_STRING SearchString, + IN PCUNICODE_STRING SearchString, IN PCUNICODE_STRING MatchString, OUT PUSHORT Position) { - USHORT i, j; - - switch (Flags) - { - case 0: - { - for (i = 0; i < SearchString->Length / sizeof(WCHAR); i++) + BOOLEAN Found; + const BOOLEAN WantToFind = (Flags & RTL_FIND_CHAR_IN_UNICODE_STRING_COMPLEMENT_CHAR_SET) == 0; + const BOOLEAN CaseInSensitive = (Flags & RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE) != 0; + INT Length; + INT i; + + DPRINT("RtlFindCharInUnicodeString(%u, '%wZ', '%wZ', %p)\n", + Flags, SearchString, MatchString, Position); + + /* Parameter checks */ + if (Position == NULL) + return STATUS_INVALID_PARAMETER; + + *Position = 0; + + if (Flags & ~(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END | + RTL_FIND_CHAR_IN_UNICODE_STRING_COMPLEMENT_CHAR_SET | + RTL_FIND_CHAR_IN_UNICODE_STRING_CASE_INSENSITIVE)) + return STATUS_INVALID_PARAMETER; + + /* Search */ + Length = SearchString->Length / sizeof(WCHAR); + if (Flags & RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END) + { + for (i = Length - 1; i >= 0; i--) + { + Found = RtlpIsCharInUnicodeString(SearchString->Buffer[i], MatchString, CaseInSensitive); + if (Found == WantToFind) { - for (j = 0; j < MatchString->Length / sizeof(WCHAR); j++) - { - if (SearchString->Buffer[i] == MatchString->Buffer[j]) - { - *Position = (i + 1) * sizeof(WCHAR); - return STATUS_SUCCESS; - } - } + *Position = i * sizeof(WCHAR); + return STATUS_SUCCESS; } - - *Position = 0; - return STATUS_NOT_FOUND; - } - - case 1: - { - for (i = SearchString->Length / sizeof(WCHAR) - 1; (i + 1) > 0; i--) + } + } + else + { + for (i = 0; i < Length; i++) + { + Found = RtlpIsCharInUnicodeString(SearchString->Buffer[i], MatchString, CaseInSensitive); + if (Found == WantToFind) { - for (j = 0; j < MatchString->Length / sizeof(WCHAR); j++) - { - if (SearchString->Buffer[i] == MatchString->Buffer[j]) - { - *Position = i * sizeof(WCHAR); - return STATUS_SUCCESS; - } - } + *Position = (i + 1) * sizeof(WCHAR); + return STATUS_SUCCESS; } - - *Position = 0; - return STATUS_NOT_FOUND; - } - - case 2: - { - for (i = 0; i < SearchString->Length / sizeof(WCHAR); i++) - { - j = 0; - - while (j < MatchString->Length / sizeof(WCHAR) && - SearchString->Buffer[i] != MatchString->Buffer[j]) - { - j++; - } - - if (j >= MatchString->Length / sizeof(WCHAR)) - { - *Position = (i + 1) * sizeof(WCHAR); - return STATUS_SUCCESS; - } - } - - *Position = 0; - return STATUS_NOT_FOUND; - } - - case 3: - { - for (i = SearchString->Length / sizeof(WCHAR) - 1; (i + 1) > 0; i--) - { - j = 0; - - while (j < MatchString->Length / sizeof(WCHAR) && - SearchString->Buffer[i] != MatchString->Buffer[j]) - { - j++; - } - - if (j >= MatchString->Length / sizeof(WCHAR)) - { - *Position = i * sizeof(WCHAR); - return STATUS_SUCCESS; - } - } - - *Position = 0; - return STATUS_NOT_FOUND; } }

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