Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[winesync] 23007: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Tue Jul 11 01:32:49 2006 New Revision: 23007 URL: http://svn.reactos.org/svn/reactos?rev=23007&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc Tue Jul 11 01:32:49 2006 @@ -17,18 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "CryptoAPI Library\0" -#define REACTOS_STR_INTERNAL_NAME "crypt32\0" -#define REACTOS_STR_ORIGINAL_FILENAME "crypt32.dll\0" - #include "windef.h" #include "winbase.h" #include "winuser.h" #include "cryptres.h" -#include <reactos/version.rc> +#include "version.rc" #include "crypt32_De.rc" #include "crypt32_En.rc"

18 years, 6 months

[winesync] 23006: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Tue Jul 11 01:25:32 2006 New Revision: 23006 URL: http://svn.reactos.org/svn/reactos?rev=23006&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/crypt32/cert.c trunk/reactos/dll/win32/crypt32/protectdata.c Modified: trunk/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/cert.c (original) +++ trunk/reactos/dll/win32/crypt32/cert.c Tue Jul 11 01:25:32 2006 @@ -731,12 +731,16 @@ } if (*pdwFlags & CERT_STORE_REVOCATION_FLAG) { - PCCRL_CONTEXT crl = CertFindCRLInStore(pSubject->hCertStore, - pSubject->dwCertEncodingType, 0, CRL_FIND_ISSUED_BY, pSubject, NULL); - + DWORD flags = 0; + PCCRL_CONTEXT crl = CertGetCRLFromStore(pSubject->hCertStore, pSubject, + NULL, &flags); + + /* FIXME: what if the CRL has expired? */ if (crl) { - FIXME("check CRL for subject\n"); + if (CertVerifyCRLRevocation(pSubject->dwCertEncodingType, + pSubject->pCertInfo, 1, (PCRL_INFO *)&crl->pCrlInfo)) + *pdwFlags &= CERT_STORE_REVOCATION_FLAG; } else *pdwFlags |= CERT_STORE_NO_CRL_FLAG; Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Tue Jul 11 01:25:32 2006 @@ -107,7 +107,7 @@ }; /* this is used to check if an incoming structure was built by Wine */ -static const char * crypt_magic_str = "Wine Crypt32 ok"; +static const char crypt_magic_str[] = "Wine Crypt32 ok"; /* debugging tool to print strings of hex chars */ static const char * @@ -835,8 +835,8 @@ DWORD dwFlags, DATA_BLOB* pDataOut) { + static const WCHAR empty_str[1]; BOOL rc = FALSE; - HCRYPTPROV hProv; struct protect_data_t protect_data; HCRYPTHASH hHash; @@ -861,7 +861,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr=(WCHAR[]){'\0'}; + szDataDescr = empty_str; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

18 years, 6 months

[fireball] 23005: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for adding UNIMPLEMENTE

by fireball＠svn.reactos.org

Author: fireball Date: Tue Jul 11 01:03:26 2006 New Revision: 23005 URL: http://svn.reactos.org/svn/reactos?rev=23005&view=rev Log: [FORMATTING] / [AUDIT] - Cleanup a big coding-style mess - Add UNIMPLEMENTED macro in empty functions (otherwise we will never know if they are being called by a 3rd-party driver) - Add proper debug headers inclusion in every file - Add documentation headers into almost every file (except mcb.c and context.c - will be added later) - Standardize per-file headers (some files still lack contributors names, they will be added later too) No code change except for adding UNIMPLEMENTED macros in the code. Name.c unlocked because the implementations of functions are trivial and in fact could be derived from their names. Not documented functions will be further reviewed. Modified: trunk/reactos/ntoskrnl/fs/context.c trunk/reactos/ntoskrnl/fs/mcb.c trunk/reactos/ntoskrnl/fs/name.c (contents, props changed) trunk/reactos/ntoskrnl/fs/notify.c trunk/reactos/ntoskrnl/fs/oplock.c trunk/reactos/ntoskrnl/fs/pool.c trunk/reactos/ntoskrnl/fs/tunnel.c trunk/reactos/ntoskrnl/fs/unc.c trunk/reactos/ntoskrnl/fs/util.c (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/fs/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/context.c?rev=… Modified: trunk/reactos/ntoskrnl/fs/mcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/mcb.c?rev=2300… Modified: trunk/reactos/ntoskrnl/fs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/name.c?rev=230… Modified: trunk/reactos/ntoskrnl/fs/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/notify.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/oplock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/oplock.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/pool.c?rev=230… Modified: trunk/reactos/ntoskrnl/fs/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/tunnel.c?rev=2… Modified: trunk/reactos/ntoskrnl/fs/unc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/unc.c?rev=2300… Modified: trunk/reactos/ntoskrnl/fs/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/util.c?rev=230…

18 years, 6 months

[greatlrd] 23004: fixing broken asm code. tcslen, wsclen did not check if the string was null or not. Adding a NULL pointer check. This make user32 test working and alot other apps.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 11 00:02:12 2006 New Revision: 23004 URL: http://svn.reactos.org/svn/reactos?rev=23004&view=rev Log: fixing broken asm code. tcslen, wsclen did not check if the string was null or not. Adding a NULL pointer check. This make user32 test working and alot other apps. Modified: trunk/reactos/lib/string/i386/tcslen.h Modified: trunk/reactos/lib/string/i386/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/string/i386/tcslen.h?r… ============================================================================== --- trunk/reactos/lib/string/i386/tcslen.h (original) +++ trunk/reactos/lib/string/i386/tcslen.h Tue Jul 11 00:02:12 2006 @@ -9,6 +9,9 @@ push %edi mov 0x8(%esp), %edi xor %eax, %eax + test %edi,%edi + jz _tcslen_end + mov $-1, %ecx cld @@ -18,6 +21,8 @@ dec %ecx mov %ecx, %eax + +_tcslen_end: pop %edi ret

18 years, 6 months

[greatlrd] 23003: Fixing two user mode crash for menu. Do not try reading from NULL pointer and compare the value. This let me come bit futer with user32_winetest.exe, but we still have some user mode crash with menu.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 10 23:32:24 2006 New Revision: 23003 URL: http://svn.reactos.org/svn/reactos?rev=23003&view=rev Log: Fixing two user mode crash for menu. Do not try reading from NULL pointer and compare the value. This let me come bit futer with user32_winetest.exe, but we still have some user mode crash with menu. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jul 10 23:32:24 2006 @@ -4488,10 +4488,13 @@ HeapFree(GetProcessHeap(),0, mii.dwTypeData); } /* Item beginning with a backspace is a help item */ - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; + if (lpNewItem != NULL) + { + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } } mii.fMask |= MIIM_TYPE; mii.dwTypeData = (LPSTR)lpNewItem; @@ -4579,14 +4582,18 @@ } else { - /*if(mii.dwTypeData != NULL) + /* + if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - }*/ - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; + } */ + if (lpNewItem != NULL) + { + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } } mii.fMask |= MIIM_TYPE; mii.dwTypeData = (LPWSTR)lpNewItem;

18 years, 6 months

[mbosma] 23002: Last parameter of IoQueryVolumeInformation is not optional.

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon Jul 10 22:24:02 2006 New Revision: 23002 URL: http://svn.reactos.org/svn/reactos?rev=23002&view=rev Log: Last parameter of IoQueryVolumeInformation is not optional. Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Mon Jul 10 22:24:02 2006 @@ -902,7 +902,7 @@ NTSTATUS Status; ULONG SectorSize; LARGE_INTEGER FileOffset; - ULONG Length; + ULONG Length, ReturnedLength; Status = MmspRequestPages(PageCount, Pages, Consumer); if (!NT_SUCCESS(Status)) @@ -942,7 +942,7 @@ FileFsSizeInformation, sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + &ReturnedLength); if (NT_SUCCESS(tmpStatus)) { @@ -4164,13 +4164,13 @@ ULONG Flags; ULONG OldNrSegments; NTSTATUS Status; - ULONG i; + ULONG i, ReturnedLength; Status = IoQueryVolumeInformation(FileObject, FileFsSizeInformation, sizeof(FILE_FS_SIZE_INFORMATION), &FileFsSize, - NULL); + &ReturnedLength); if (!NT_SUCCESS(Status)) { return Status;

18 years, 6 months

[cwittich] 23001: -get rid of DllMain@12 because MSVC defaults to_DllMainCRTStartup@12 when using CRT

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jul 10 22:16:28 2006 New Revision: 23001 URL: http://svn.reactos.org/svn/reactos?rev=23001&view=rev Log: -get rid of DllMain@12 because MSVC defaults to_DllMainCRTStartup@12 when using CRT Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Jul 10 22:16:28 2006 @@ -449,7 +449,14 @@ if (module.GetEntryPoint(false) == "0") fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); else - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); + { + // get rid of DllMain@12 because MSVC needs to link to _DllMainCRTStartup@12 + // when using CRT + if (module.GetEntryPoint(false) == "DllMain@12") + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"\"\r\n" ); + else + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false).c_str ()); + } fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); @@ -486,6 +493,12 @@ fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" ); + fprintf ( OUT, "\t\t\t<Tool\r\n" ); + if (configuration.VSProjectVersion == "8.00") + { + fprintf ( OUT, "\t\t\t\tName=\"VCManifestTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEmbedManifest=\"false\"/>\r\n" ); + } fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" ); fprintf ( OUT, "\t\t\t<Tool\r\n" );

18 years, 6 months

[janderwald] 23000: * make resources compilable with msvc

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jul 10 20:22:03 2006 New Revision: 23000 URL: http://svn.reactos.org/svn/reactos?rev=23000&view=rev Log: * make resources compilable with msvc Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc trunk/reactos/dll/cpl/sysdm/cz.rc trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/cpl/sysdm/dk.rc trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/es.rc trunk/reactos/dll/cpl/sysdm/fr.rc trunk/reactos/dll/cpl/sysdm/hu.rc trunk/reactos/dll/cpl/sysdm/nl.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/ru.rc trunk/reactos/dll/cpl/sysdm/sv.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/Ja.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/cz.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/dk.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/es.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/fr.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hu.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/nl.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… Modified: trunk/reactos/dll/cpl/sysdm/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sv.rc?rev=23… Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev…

18 years, 6 months

[mbosma] 22999: Make patch a bit smaller.

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon Jul 10 19:11:48 2006 New Revision: 22999 URL: http://svn.reactos.org/svn/reactos?rev=22999&view=rev Log: Make patch a bit smaller. Modified: branches/cache_manager_rewrite/headers.patch Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Mon Jul 10 19:11:48 2006 @@ -1,6 +1,6 @@ Index: drivers/filesystems/cdfs/cdfs.h =================================================================== ---- drivers/filesystems/cdfs/cdfs.h (revision 22905) +--- drivers/filesystems/cdfs/cdfs.h (revision 22988) +++ drivers/filesystems/cdfs/cdfs.h (working copy) @@ -6,7 +6,7 @@ #include <ntddcdrm.h> @@ -13,7 +13,7 @@ #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Index: drivers/filesystems/ntfs/ntfs.h =================================================================== ---- drivers/filesystems/ntfs/ntfs.h (revision 22905) +--- drivers/filesystems/ntfs/ntfs.h (revision 22988) +++ drivers/filesystems/ntfs/ntfs.h (working copy) @@ -6,7 +6,7 @@ #include <ntdddisk.h> @@ -26,7 +26,7 @@ #define CACHEPAGESIZE(pDeviceExt) \ Index: include/reactos/exeformat.h =================================================================== ---- include/reactos/exeformat.h (revision 22905) +--- include/reactos/exeformat.h (revision 22988) +++ include/reactos/exeformat.h (working copy) @@ -34,7 +34,8 @@ @@ -49,7 +49,7 @@ IN PEXEFMT_CB_READ_FILE ReadFileCb, Index: ntoskrnl/include/internal/cc.h =================================================================== ---- ntoskrnl/include/internal/cc.h (revision 22905) +--- ntoskrnl/include/internal/cc.h (revision 22988) +++ ntoskrnl/include/internal/cc.h (working copy) @@ -1,17 +1,29 @@ #ifndef __INCLUDE_INTERNAL_CC_H @@ -102,25 +102,9 @@ Index: ntoskrnl/include/internal/mm.h =================================================================== ---- ntoskrnl/include/internal/mm.h (revision 22905) +--- ntoskrnl/include/internal/mm.h (revision 22988) +++ ntoskrnl/include/internal/mm.h (working copy) -@@ -165,17 +165,20 @@ - - typedef struct _MM_SECTION_SEGMENT - { -- LONGLONG FileOffset; -- ULONG_PTR VirtualAddress; -- ULONG RawLength; -- ULONG Length; -+ LONGLONG FileOffset; /* start offset into the file for image sections */ -+ ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ -+ ULONG RawLength; /* length of the segment which is part of the mapped file */ -+ ULONG Length; /* absolute length of the segment */ - ULONG Protection; -- FAST_MUTEX Lock; -+ FAST_MUTEX Lock; /* lock which protects the page directory */ - ULONG ReferenceCount; - SECTION_PAGE_DIRECTORY PageDirectory; +@@ -176,6 +176,9 @@ ULONG Flags; ULONG Characteristics; BOOLEAN WriteCopy; @@ -169,18 +153,17 @@ - ULONG ViewOffset; - PMM_SECTION_SEGMENT Segment; - BOOLEAN WriteCopyView; -- LIST_ENTRY RegionListHead; + LIST_ENTRY RegionListHead; - } SectionData; - struct - { - LIST_ENTRY RegionListHead; -+ LIST_ENTRY RegionListHead; } VirtualMemoryData; } Data; } MEMORY_AREA, *PMEMORY_AREA; Index: ntoskrnl/ntoskrnl.def =================================================================== ---- ntoskrnl/ntoskrnl.def (revision 22905) +--- ntoskrnl/ntoskrnl.def (revision 22988) +++ ntoskrnl/ntoskrnl.def (working copy) @@ -5,9 +5,6 @@ ; ReactOS Operating System

18 years, 6 months

[greatlrd] 22998: Fixing a small bug, value where never devliver from SPI and that did make screensaver start direcky and start mulitetimes.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 10 19:02:43 2006 New Revision: 22998 URL: http://svn.reactos.org/svn/reactos?rev=22998&view=rev Log: Fixing a small bug, value where never devliver from SPI and that did make screensaver start direcky and start mulitetimes. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Mon Jul 10 19:02:43 2006 @@ -217,8 +217,9 @@ { BOOL nPreviousState = FALSE; DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT1("Keyboard Timeout counter was %I64d\n",DiffTimeKeyboard.QuadPart); - DPRINT1("Mouse Timeout counter was %I64d\n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); CSR_API_MESSAGE Request; CsrInit(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Jul 10 19:02:43 2006 @@ -1016,34 +1016,42 @@ switch(uiAction) { case SPI_GETFLATMENU: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; - return TRUE; + if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; + return TRUE; + break; case SPI_SETFLATMENU: WinStaObject->FlatMenu = uiParam; - break; + return TRUE; + break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; + break; case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; - return TRUE; + WinStaObject->ScreenSaverTimeOut = uiParam; + return TRUE; + break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - return TRUE; + return TRUE; + break; case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; WinStaObject->ScreenSaverRunning = uiParam; - return TRUE; + return TRUE; + break; case SPI_GETWHEELSCROLLLINES: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; /* FIXME add this value to scroll list as scroll value ?? */ return TRUE; + break; case SPI_GETWHEELSCROLLCHARS: CurInfo = IntGetSysCursorInfo(WinStaObject); if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? return TRUE; + break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); /* FIXME limit the maximum value? */

18 years, 6 months

← Newer
1
...
37
38
39
40
41
42
43
...
67
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 July 2006