Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[hpoussin] 28217: Remove some debug messages scsiport.c: Do not try to open Device subkey if we don't have a service key cmhardwr.c: Write BIOS information only if we succeeded to open the key

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 7 15:45:30 2007 New Revision: 28217 URL: http://svn.reactos.org/svn/reactos?rev=28217&view=rev Log: Remove some debug messages scsiport.c: Do not try to open Device subkey if we don't have a service key cmhardwr.c: Write BIOS information only if we succeeded to open the key Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/drivers/filesystems/vfat/create.c trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/include/psdk/msidefs.h trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c (original) +++ trunk/reactos/base/setup/usetup/bootsup.c Tue Aug 7 15:45:30 2007 @@ -1826,7 +1826,7 @@ NTSTATUS Status; /* FAT or FAT32 partition */ - DPRINT1("System path: '%wZ'\n", SystemRootPath); + DPRINT("System path: '%wZ'\n", SystemRootPath); if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE || DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE) @@ -2040,7 +2040,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.sys"); - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); if (!NT_SUCCESS(Status)) { @@ -2055,7 +2055,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.ini"); - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = CreateFreeLoaderIniForReactos(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) @@ -2069,7 +2069,7 @@ wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\bootsect.old"); - DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Save bootsector: %S ==> %S\n", SrcPath, DstPath); Status = SaveCurrentBootSector(SrcPath, DstPath); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c (original) +++ trunk/reactos/base/setup/usetup/inicache.c Tue Aug 7 15:45:30 2007 @@ -1032,7 +1032,7 @@ } BufferSize++; /* Null-terminator */ - DPRINT1("BufferSize: %lu\n", BufferSize); + DPRINT("BufferSize: %lu\n", BufferSize); /* Allocate file buffer */ Buffer = (CHAR*) RtlAllocateHeap(ProcessHeap, Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Aug 7 15:45:30 2007 @@ -481,10 +481,6 @@ /* Load keyboard driver */ -#if 0 - if (!LoadDriver(SourcePath, "keyboard.sys")) - return; -#endif if (!LoadDriver(SourcePath, "i8042prt.sys")) return; if (!LoadDriver(SourcePath, "kbdclass.sys")) 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 (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Tue Aug 7 15:45:30 2007 @@ -1249,7 +1249,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcA: can not dereference WndProcHandle\n"); + WARN("CallWindowProcA: can not dereference WndProcHandle\n"); return 0; } } @@ -1282,7 +1282,7 @@ hWnd, Msg, wParam, lParam); else { - DPRINT("CallWindowProcW: can not dereference WndProcHandle\n"); + WARN("CallWindowProcW: can not dereference WndProcHandle\n"); return 0; } } Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Tue Aug 7 15:45:30 2007 @@ -249,7 +249,7 @@ } else { - CHECKPOINT1; + DPRINT1("File not found %wZ\n", &PathNameU); Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb); Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Tue Aug 7 15:45:30 2007 @@ -194,13 +194,13 @@ * set them manually anyway... */ RTL_QUERY_REGISTRY_TABLE *Current = Parameters; - DPRINT1 ("Can't read registry: %x\n", Status); + DPRINT ("Can't read registry: %x\n", Status); while (Current->Name) { *((PULONG)Current->EntryContext) = *((PULONG)Current->DefaultData); Current++; } - DPRINT1 ("Manually set defaults\n"); + DPRINT ("Manually set defaults\n"); } Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c (original) +++ trunk/reactos/drivers/setup/blue/blue.c Tue Aug 7 15:45:30 2007 @@ -255,7 +255,7 @@ DeviceExtension->Rows = 30; #endif - DPRINT1 ("%d Columns %d Rows %d Scanlines\n", + DPRINT ("%d Columns %d Rows %d Scanlines\n", DeviceExtension->Columns, DeviceExtension->Rows, DeviceExtension->ScanLines); Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Tue Aug 7 15:45:30 2007 @@ -806,7 +806,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); + DPRINT("Unable to open driver's registry key %wZ, status 0x%08x\n", RegistryPath, Status); ConfigInfo->ServiceKey = NULL; } @@ -835,18 +835,21 @@ } } - /* Open the Device key */ - RtlInitUnicodeString(&KeyName, L"Device"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ConfigInfo->ServiceKey, - NULL); - - /* We don't check for failure here - not needed */ - ZwOpenKey(&ConfigInfo->DeviceKey, - KEY_READ, - &ObjectAttributes); + if (ConfigInfo->ServiceKey != NULL) + { + /* Open the Device key */ + RtlInitUnicodeString(&KeyName, L"Device"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ConfigInfo->ServiceKey, + NULL); + + /* We don't check for failure here - not needed */ + ZwOpenKey(&ConfigInfo->DeviceKey, + KEY_READ, + &ObjectAttributes); + } } Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… ============================================================================== --- trunk/reactos/include/psdk/msidefs.h (original) +++ trunk/reactos/include/psdk/msidefs.h Tue Aug 7 15:45:30 2007 @@ -166,6 +166,12 @@ msidbComponentAttributesTransitive = 0x00000040, msidbComponentAttributesNeverOverwrite = 0x00000080, msidbComponentAttributes64bit = 0x00000100 +}; + +enum msidbODBCDataSourceRegistration +{ + msidbODBCDataSourceRegistrationPerMachine = 0x00000000, + msidbODBCDataSourceRegistrationPerUser = 0x00000001 }; enum msidbRegistryRoot Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Tue Aug 7 15:45:30 2007 @@ -304,7 +304,13 @@ NULL, REG_OPTION_NON_VOLATILE, &Disposition); - if (!NT_SUCCESS(Status) && !ExpInTextModeSetup) return Status; + if (ExpInTextModeSetup) + { + if (!NT_SUCCESS(Status)) + BiosHandle = NULL; + } + else if (!NT_SUCCESS(Status)) + return Status; /* Create the CPU Key, and check if it already existed */ RtlInitUnicodeString(&KeyName, L"CentralProcessor"); @@ -623,29 +629,32 @@ /* Free the string */ RtlFreeUnicodeString(&Data); - /* Get the BIOS Date Identifier */ - RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); - Buffer[8] = ANSI_NULL; - - /* Convert it to unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); - if (NT_SUCCESS(Status)) - { - /* Save it to the registry */ - Status = NtSetValueKey(BiosHandle, - &ValueName, - 0, - REG_SZ, - Data.Buffer, - Data.Length + sizeof(UNICODE_NULL)); - - /* Free the string */ - RtlFreeUnicodeString(&Data); - } - - /* Close the bios information handle */ - NtClose(BiosHandle); + if (BiosHandle) + { + /* Get the BIOS Date Identifier */ + RtlCopyMemory(Buffer, (PCHAR)BaseAddress + (16*PAGE_SIZE - 11), 8); + Buffer[8] = ANSI_NULL; + + /* Convert it to unicode */ + RtlInitAnsiString(&TempString, Buffer); + Status = RtlAnsiStringToUnicodeString(&Data, &TempString, TRUE); + if (NT_SUCCESS(Status)) + { + /* Save it to the registry */ + Status = NtSetValueKey(BiosHandle, + &ValueName, + 0, + REG_SZ, + Data.Buffer, + Data.Length + sizeof(UNICODE_NULL)); + + /* Free the string */ + RtlFreeUnicodeString(&Data); + } + + /* Close the bios information handle */ + NtClose(BiosHandle); + } } /* Get the BIOS Version */ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Tue Aug 7 15:45:30 2007 @@ -461,7 +461,7 @@ if (!NT_SUCCESS(Status)) { hKey = NULL; - DPRINT1("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); + DPRINT("ZwCreateKey failed for %wZ, status=%x\n", &UnicodeString1, Status); } /* Create PhysicalDrive links */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Aug 7 15:45:30 2007 @@ -787,7 +787,6 @@ if (!NT_SUCCESS(Status)) { IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -1253,6 +1252,7 @@ if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ + DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); } Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Tue Aug 7 15:45:30 2007 @@ -698,7 +698,7 @@ * a conflict is detected with another driver. */ { - DPRINT1("IoReportResourceUsage is unimplemented\n"); + UNIMPLEMENTED; *ConflictDetected = FALSE; return STATUS_SUCCESS; }

17 years, 4 months

[fireball] 28216: - Remove empty init.S

by fireball＠svn.reactos.org

Author: fireball Date: Tue Aug 7 14:24:06 2007 New Revision: 28216 URL: http://svn.reactos.org/svn/reactos?rev=28216&view=rev Log: - Remove empty init.S Removed: trunk/reactos/ntoskrnl/ke/i386/init.S Removed: trunk/reactos/ntoskrnl/ke/i386/init.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/init.S?re… ============================================================================== (empty)

17 years, 4 months

[winesync] 28215: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Tue Aug 7 11:27:43 2007 New Revision: 28215 URL: http://svn.reactos.org/svn/reactos?rev=28215&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Eo.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc (with props) trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc (with props) Removed: trunk/reactos/dll/win32/shlwapi/Makefile.in Modified: trunk/reactos/dll/win32/shlwapi/assoc.c trunk/reactos/dll/win32/shlwapi/clist.c trunk/reactos/dll/win32/shlwapi/istream.c trunk/reactos/dll/win32/shlwapi/msgbox.c trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/shlwapi/path.c trunk/reactos/dll/win32/shlwapi/reg.c trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/resource.h trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_main.c trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff trunk/reactos/dll/win32/shlwapi/stopwatch.c trunk/reactos/dll/win32/shlwapi/string.c trunk/reactos/dll/win32/shlwapi/thread.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/dll/win32/shlwapi/version.rc trunk/reactos/dll/win32/shlwapi/wsprintf.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/shlwapi/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/Makefile… Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… Modified: trunk/reactos/dll/win32/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/clist.c?… Modified: trunk/reactos/dll/win32/shlwapi/istream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/istream.… Modified: trunk/reactos/dll/win32/shlwapi/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/msgbox.c… Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… Modified: trunk/reactos/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?r… Modified: trunk/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re… Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… Modified: trunk/reactos/dll/win32/shlwapi/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/resource… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Added: trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/stopwatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/stopwatc… Modified: trunk/reactos/dll/win32/shlwapi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/string.c… Modified: trunk/reactos/dll/win32/shlwapi/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/thread.c… Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… Modified: trunk/reactos/dll/win32/shlwapi/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/version.… Modified: trunk/reactos/dll/win32/shlwapi/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/wsprintf…

17 years, 4 months

[jimtabor] 28214: Move Break Extra and Count justification to Dc_Attr.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Aug 7 11:27:12 2007 New Revision: 28214 URL: http://svn.reactos.org/svn/reactos?rev=28214&view=rev Log: Move Break Extra and Count justification to Dc_Attr. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Aug 7 11:27:12 2007 @@ -35,11 +35,6 @@ GdiPath path; /* #endif */ - - short breakTotalExtra; /* Total extra space for justification */ - short breakCount; /* Break char. count */ - short breakExtra; /* breakTotalExtra / breakCount */ - short breakRem; /* breakTotalExtra % breakCount */ RECT totalExtent; BYTE bitsPerPixel; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 7 11:27:12 2007 @@ -1302,10 +1302,8 @@ newdc->Dc_Attr.ptlBrushOrigin.y = dc->Dc_Attr.ptlBrushOrigin.y; newdc->Dc_Attr.lTextAlign = dc->Dc_Attr.lTextAlign; newdc->Dc_Attr.lTextExtra = dc->Dc_Attr.lTextExtra; - newdc->w.breakTotalExtra = dc->w.breakTotalExtra; - newdc->w.breakCount = dc->w.breakCount; - newdc->w.breakExtra = dc->w.breakExtra; - newdc->w.breakRem = dc->w.breakRem; + newdc->Dc_Attr.cBreak = dc->Dc_Attr.cBreak; + newdc->Dc_Attr.lBreakExtra = dc->Dc_Attr.lBreakExtra; newdc->Dc_Attr.iMapMode = dc->Dc_Attr.iMapMode; newdc->Dc_Attr.iGraphicsMode = dc->Dc_Attr.iGraphicsMode; #if 0 @@ -1385,10 +1383,8 @@ dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; - dc->w.breakTotalExtra = dcs->w.breakTotalExtra; - dc->w.breakCount = dcs->w.breakCount; - dc->w.breakExtra = dcs->w.breakExtra; - dc->w.breakRem = dcs->w.breakRem; + dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; + dc->Dc_Attr.lBreakExtra = dcs->Dc_Attr.lBreakExtra; dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; #if 0

17 years, 4 months

[hpoussin] 28213: Add mlang.dll to bootcd

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 7 10:54:21 2007 New Revision: 28213 URL: http://svn.reactos.org/svn/reactos?rev=28213&view=rev Log: Add mlang.dll to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Aug 7 10:54:21 2007 @@ -186,6 +186,7 @@ dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 dll\win32\winmm\midimap\midimap.dll 1 +dll\win32\mlang\mlang.dll 1 dll\win32\mmdrv\mmdrv.dll 1 dll\win32\mpr\mpr.dll 1 dll\win32\msacm32\msacm32.dll 1

17 years, 4 months

[winesync] 28212: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Tue Aug 7 10:52:34 2007 New Revision: 28212 URL: http://svn.reactos.org/svn/reactos?rev=28212&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/mlang/ trunk/reactos/dll/win32/mlang/mlang.c (with props) trunk/reactos/dll/win32/mlang/mlang.rbuild (with props) trunk/reactos/dll/win32/mlang/mlang.spec (with props) trunk/reactos/dll/win32/mlang/regsvr.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… Added: trunk/reactos/dll/win32/mlang/mlang.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.rbui… Added: trunk/reactos/dll/win32/mlang/mlang.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.spec… Added: trunk/reactos/dll/win32/mlang/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/regsvr.c?r…

17 years, 4 months

[hpoussin] 28211: Prepare import of mlang library. This revision does not compile.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Aug 7 10:48:01 2007 New Revision: 28211 URL: http://svn.reactos.org/svn/reactos?rev=28211&view=rev Log: Prepare import of mlang library. This revision does not compile. Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=282… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Aug 7 10:48:01 2007 @@ -26,6 +26,7 @@ <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> + <property name="BASEADDRESS_MLANG" value="0x65140000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Aug 7 10:48:01 2007 @@ -115,6 +115,9 @@ <directory name="mapi32"> <xi:include href="mapi32/mapi32.rbuild" /> </directory> +<directory name="mlang"> + <xi:include href="mlang/mlang.rbuild" /> +</directory> <directory name="mmdrv"> <xi:include href="mmdrv/mmdrv.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Aug 7 10:48:01 2007 @@ -49,6 +49,7 @@ reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync +reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync reactos/dll/win32/msacm32 # Out of sync reactos/dll/win32/msimg32 # Autosync

17 years, 4 months

[mbosma] 28210: Sorry, reverted wrong rev.

by mbosma＠svn.reactos.org

Author: mbosma Date: Tue Aug 7 10:30:23 2007 New Revision: 28210 URL: http://svn.reactos.org/svn/reactos?rev=28210&view=rev Log: Sorry, reverted wrong rev. Modified: branches/cache_manager_rewrite/Instructions.txt branches/cache_manager_rewrite/cc/copy.c branches/cache_manager_rewrite/cc/pin.c branches/cache_manager_rewrite/cc/view.c branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (original) +++ branches/cache_manager_rewrite/Instructions.txt Tue Aug 7 10:30:23 2007 @@ -1,2 +1,2 @@ To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc with the folders from here. -This branch currently applies against: r25313 +This branch currently applies against: 0.3.1 branch - r25940 Modified: branches/cache_manager_rewrite/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/copy.c… ============================================================================== --- branches/cache_manager_rewrite/cc/copy.c (original) +++ branches/cache_manager_rewrite/cc/copy.c Tue Aug 7 10:30:23 2007 @@ -203,9 +203,8 @@ { CurrentLength = Length; } - RtlCopyMemory(Buffer, - (PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), - CurrentLength); + memcpy (Buffer, + (PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), CurrentLength); Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; @@ -213,7 +212,7 @@ else { CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - RtlCopyMemory(Buffer, Bcb->CacheView[Index]->BaseAddress, CurrentLength); + memcpy (Buffer, Bcb->CacheView[Index]->BaseAddress, CurrentLength); Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; @@ -356,8 +355,8 @@ { CurrentLength = Length; } - RtlCopyMemory((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), - Buffer, CurrentLength); + memcpy ((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), + Buffer, CurrentLength); Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; @@ -365,7 +364,7 @@ else { CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - RtlCopyMemory(Bcb->CacheView[Index]->BaseAddress, Buffer, CurrentLength); + memcpy (Bcb->CacheView[Index]->BaseAddress, Buffer, CurrentLength); Buffer = (PVOID) ((ULONG_PTR) Buffer + CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; @@ -603,15 +602,15 @@ { CurrentLength = Length; } - RtlZeroMemory((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), - CurrentLength); + memset ((PVOID) ((ULONG_PTR) Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE), 0, + CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; } else { CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; - RtlZeroMemory(Bcb->CacheView[Index]->BaseAddress, CurrentLength); + memset (Bcb->CacheView[Index]->BaseAddress, 0, CurrentLength); Length -= CurrentLength; Offset.QuadPart += CurrentLength; } Modified: branches/cache_manager_rewrite/cc/pin.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/pin.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/pin.c (original) +++ branches/cache_manager_rewrite/cc/pin.c Tue Aug 7 10:30:23 2007 @@ -152,7 +152,7 @@ { KEBUGCHECK (0); } - RtlZeroMemory(iBcb, sizeof (INTERNAL_BCB)); + memset (iBcb, 0, sizeof (INTERNAL_BCB)); iBcb->Bcb = Bcb; iBcb->Index = Index; Modified: branches/cache_manager_rewrite/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/view.c… ============================================================================== --- branches/cache_manager_rewrite/cc/view.c (original) +++ branches/cache_manager_rewrite/cc/view.c Tue Aug 7 10:30:23 2007 @@ -191,7 +191,7 @@ { KEBUGCHECK (0); } - RtlZeroMemory(Bcb, sizeof (BCB)); + memset (Bcb, 0, sizeof (BCB)); Bcb->FileObject = FileObject; Bcb->FileSizes = *FileSizes; Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Tue Aug 7 10:30:23 2007 @@ -479,7 +479,9 @@ MmPageArray[j].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[j].Flags.Zero = 0; MmPageArray[j].Flags.Consumer = MC_NPPOOL; - MmPageArray[j].ReferenceCount = 1; + /* Reference count 2, because we're having ReferenceCount track + MapCount as well. */ + MmPageArray[j].ReferenceCount = 2; MmPageArray[j].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[j].ListEntry); @@ -519,7 +521,7 @@ MmPageArray[i].Flags.Type = MM_PHYSICAL_PAGE_USED; MmPageArray[i].Flags.Zero = 0; MmPageArray[i].Flags.Consumer = MC_NPPOOL; - MmPageArray[i].ReferenceCount = 1; + MmPageArray[i].ReferenceCount = 2; MmPageArray[i].MapCount = 1; InsertTailList(&UsedPageListHeads[MC_NPPOOL], &MmPageArray[i].ListEntry); @@ -588,6 +590,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount++; + MmPageArray[Pfn].ReferenceCount++; KeReleaseSpinLock(&PageListLock, oldIrql); } } @@ -612,6 +615,7 @@ KEBUGCHECK(0); } MmPageArray[Pfn].MapCount--; + MmPageArray[Pfn].ReferenceCount--; KeReleaseSpinLock(&PageListLock, oldIrql); } } Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Tue Aug 7 10:30:23 2007 @@ -485,7 +485,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(KeLoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* FIXME: Read parameters from memory */ MmInitSectionImplementation2(); Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Tue Aug 7 10:30:23 2007 @@ -415,7 +415,7 @@ if (MmGetPfnForProcess(Process, Address) != Page) { DPRINT1("Insert rmap (%d, 0x%.8X) 0x%.8X which doesn't match physical " - "address 0x%.8X\n", Process ? Process->UniqueProcessId : 0, Address, + "address 0x%.8X\n", Process->UniqueProcessId, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); KEBUGCHECK(0); @@ -492,7 +492,7 @@ } if (Process) { - InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); + (void)InterlockedExchangeAddUL(&Process->Vm.WorkingSetSize, -PAGE_SIZE); } } } 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 Tue Aug 7 10:30:23 2007 @@ -3281,6 +3281,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; + ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); InitializeListHead(&ImageSectionObjectListHead);

17 years, 4 months

[jimtabor] 28209: Removed NtGdiGetDCOrgEx, GetViewportExt/OrgEx, GetWindowExt/OrgEx. Added NtGdiGetDCPoint. Will update ntgdibad.h once we sort out the internal use of these functions.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Aug 7 09:58:29 2007 New Revision: 28209 URL: http://svn.reactos.org/svn/reactos?rev=28209&view=rev Log: Removed NtGdiGetDCOrgEx, GetViewportExt/OrgEx, GetWindowExt/OrgEx. Added NtGdiGetDCPoint. Will update ntgdibad.h once we sort out the internal use of these functions. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Tue Aug 7 09:58:29 2007 @@ -366,7 +366,7 @@ GetCurrentObject@8=NtGdiGetCurrentObject@8 GetCurrentPositionEx@8=NtGdiGetCurrentPositionEx@8 GetDCBrushColor@4 -GetDCOrgEx@8=NtGdiGetDCOrgEx@8 +GetDCOrgEx@8 GetDCPenColor@4 GetDIBColorTable@16=NtGdiGetDIBColorTable@16 GetDIBits@28=NtGdiGetDIBits@28 @@ -454,11 +454,11 @@ GetTextMetricsA@8 GetTextMetricsW@8 GetTransform@12 -GetViewportExtEx@8=NtGdiGetViewportExtEx@8 -GetViewportOrgEx@8=NtGdiGetViewportOrgEx@8 +GetViewportExtEx@8 +GetViewportOrgEx@8 GetWinMetaFileBits@20 -GetWindowExtEx@8=NtGdiGetWindowExtEx@8 -GetWindowOrgEx@8=NtGdiGetWindowOrgEx@8 +GetWindowExtEx@8 +GetWindowOrgEx@8 GetWorldTransform@8=NtGdiGetWorldTransform@8 HT_Get8BPPFormatPalette@16 HT_Get8BPPMaskPalette@24 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Tue Aug 7 09:58:29 2007 @@ -94,22 +94,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -GetAspectRatioFilterEx( - HDC a0, - LPSIZE a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Tue Aug 7 09:58:29 2007 @@ -356,9 +356,34 @@ } -/* - * @implemented -*/ +BOOL +STDCALL +GetAspectRatioFilterEx( + HDC hdc, + LPSIZE lpAspectRatio + ) +{ + return NtGdiGetDCPoint( hdc, GdiGetAspectRatioFilter, (LPPOINT) lpAspectRatio ); +} + + +/* + * @implemented + */ +BOOL +STDCALL +GetDCOrgEx( + HDC hdc, + LPPOINT lpPoint + ) +{ + return NtGdiGetDCPoint( hdc, GdiGetDCOrg, lpPoint ); +} + + +/* + * @implemented + */ LONG STDCALL GetDCOrg( @@ -367,7 +392,7 @@ { // Officially obsolete by Microsoft POINT Pt; - if (!NtGdiGetDCOrgEx(hdc, &Pt)) + if (!GetDCOrgEx(hdc, &Pt)) return 0; return(MAKELONG(Pt.x, Pt.y)); } @@ -781,3 +806,89 @@ return Ret; } + +BOOL +STDCALL +GetViewportExtEx( + HDC hdc, + LPSIZE lpSize + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if ( Dc_Attr->flXform & PAGE_EXTENTS_CHANGED ) // Something was updated, go to kernel. +#endif + return NtGdiGetDCPoint( hdc, GdiGetViewPortExt, (LPPOINT) lpSize ); +#if 0 + else + { + lpSize->cx = Dc_Attr->szlViewportExt.cx; + lpSize->cy = Dc_Attr->szlViewportExt.cy; + } + return TRUE; +#endif +} + + +BOOL +STDCALL +GetViewportOrgEx( + HDC hdc, + LPPOINT lpPoint + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpPoint->x = Dc_Attr->ptlViewportOrg.x; + lpPoint->x = Dc_Attr->ptlViewportOrg.x; + return TRUE; +#endif + // Do it this way for now. + return NtGdiGetDCPoint( hdc, GdiGetViewPortOrg, lpPoint ); +} + + +BOOL +STDCALL +GetWindowExtEx( + HDC hdc, + LPSIZE lpSize + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpSize->cx = Dc_Attr->szlWindowExt.cx; + lpSize->cy = Dc_Attr->szlWindowExt.cy; + return TRUE; +#endif + // Do it this way for now. + return NtGdiGetDCPoint( hdc, GdiGetWindowExt, (LPPOINT) lpSize ); +} + + +BOOL +STDCALL +GetWindowOrgEx( + HDC hdc, + LPPOINT lpPoint + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + lpPoint->x = Dc_Attr->ptlWindowOrg.x; + lpPoint->x = Dc_Attr->ptlWindowOrg.x; + return TRUE; +#endif + // Do it this way for now. + return NtGdiGetDCPoint( hdc, GdiGetWindowOrg, lpPoint ); +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 7 09:58:29 2007 @@ -1162,11 +1162,12 @@ } BOOL STDCALL -NtGdiGetDCOrgEx(HDC hDC, LPPOINT Point) -{ - BOOL Ret; +NtGdiGetDCPoint( HDC hDC, UINT iPoint, PPOINTL Point) +{ + BOOL Ret = TRUE; DC *dc; POINT SafePoint; + SIZE Size; NTSTATUS Status = STATUS_SUCCESS; if(!Point) @@ -1182,8 +1183,33 @@ return FALSE; } - Ret = IntGdiGetDCOrgEx(dc, &SafePoint); - + switch (iPoint) + { + case GdiGetViewPortExt: + IntGetViewportExtEx(dc, &Size); + SafePoint.x = Size.cx; + SafePoint.y = Size.cy; + break; + case GdiGetWindowExt: + IntGetWindowExtEx(dc, &Size); + SafePoint.x = Size.cx; + SafePoint.y = Size.cy; + break; + case GdiGetViewPortOrg: + IntGetViewportOrgEx(dc, &SafePoint); + break; + case GdiGetWindowOrg: + IntGetWindowOrgEx(dc, &SafePoint); + break; + case GdiGetDCOrg: + Ret = IntGdiGetDCOrgEx(dc, &SafePoint); + break; + case GdiGetAspectRatioFilter: + default: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + break; + } _SEH_TRY { ProbeForWrite(Point, Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Aug 7 09:58:29 2007 @@ -176,7 +176,7 @@ # NtGdiGetDCDword 3 # NtGdiGetDCforBitmap 1 # NtGdiGetDCObject 2 -# NtGdiGetDCPoint 3 +NtGdiGetDCPoint 3 NtGdiGetDeviceCaps 2 NtGdiGetDeviceGammaRamp 2 # NtGdiGetDeviceCapsAll 2 @@ -799,7 +799,6 @@ NtGdiGetColorSpace 1 NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2 -NtGdiGetDCOrgEx 2 NtGdiGetDIBColorTable 4 NtGdiGetDIBits 7 NtGdiGetEnhMetaFile 1 @@ -825,10 +824,6 @@ NtGdiGetTextAlign 1 NtGdiGetTextColor 1 NtGdiGetTextExtentPoint32 4 -NtGdiGetViewportExtEx 2 -NtGdiGetViewportOrgEx 2 -NtGdiGetWindowExtEx 2 -NtGdiGetWindowOrgEx 2 NtGdiGetWorldTransform 2 NtGdiLPtoDP 3 NtGdiMoveToEx 4

17 years, 4 months

[tkreuzer] 28208: update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 7 05:28:02 2007 New Revision: 28208 URL: http://svn.reactos.org/svn/reactos?rev=28208&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Aug 7 05:28:02 2007 @@ -662,14 +662,6 @@ STDCALL NtGdiRemoveFontResource(LPCWSTR FileName); -/* Use NtGdiExtSelectClipRgn with RGN_COPY. */ -int -STDCALL -NtGdiSelectClipRgn ( - HDC hDC, - HRGN hrgn - ); - /* Should be done in user-mode. */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj);

17 years, 4 months

← Newer
1
...
49
50
51
52
53
54
55
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007