Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 20527: Start \\Device\\USBFDOx names at index 0.
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Start \\Device\\USBFDOx names at index 0. Use the same index to create the symbolic link \\??\\HCDx This should fix the handling of multiple USB controllers Modified: trunk/reactos/drivers/usb/miniport/common/main.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/main.c --- trunk/reactos/drivers/usb/miniport/common/main.c 2006-01-02 11:32:03 UTC (rev 20526) +++ trunk/reactos/drivers/usb/miniport/common/main.c 2006-01-02 11:37:00 UTC (rev 20527) @@ -17,7 +17,7 @@ #define INITGUID #include "usbcommon.h" -// data for embedded drivers +/* Data for embedded drivers */ CONNECT_DATA KbdClassInformation; CONNECT_DATA MouseClassInformation; PDEVICE_OBJECT KeyboardFdo = NULL; @@ -32,9 +32,9 @@ PDEVICE_OBJECT Pdo; PUSBMP_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - + DPRINT("USBMP: CreateRootHubPdo()\n"); - + Status = IoCreateDevice( DriverObject, sizeof(USBMP_DEVICE_EXTENSION), @@ -48,19 +48,19 @@ DPRINT("USBMP: IoCreateDevice() call failed with status 0x%08x\n", Status); return Status; } - + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; Pdo->Flags |= DO_POWER_PAGABLE; - - // zerofill device extension + + /* Zerofill device extension */ DeviceExtension = (PUSBMP_DEVICE_EXTENSION)Pdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(USBMP_DEVICE_EXTENSION)); - + DeviceExtension->IsFDO = FALSE; DeviceExtension->FunctionalDeviceObject = Fdo; - + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - + *pPdo = Pdo; return STATUS_SUCCESS; } @@ -189,18 +189,18 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT pdo) { - PDEVICE_OBJECT fdo; + PDEVICE_OBJECT fdo = NULL; NTSTATUS Status; WCHAR DeviceBuffer[20]; WCHAR LinkDeviceBuffer[20]; UNICODE_STRING DeviceName; UNICODE_STRING LinkDeviceName; PUSBMP_DRIVER_EXTENSION DriverExtension; - PUSBMP_DEVICE_EXTENSION DeviceExtension; + PUSBMP_DEVICE_EXTENSION DeviceExtension = NULL; static ULONG DeviceNumber = 0; - BOOL AlreadyRestarted = FALSE; + BOOLEAN AlreadyRestarted = FALSE; - // Allocate driver extension now + /* Allocate driver extension now */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (DriverExtension == NULL) { @@ -212,56 +212,59 @@ if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: Allocating DriverObjectExtension failed.\n"); - return Status; + DPRINT1("USBMP: Allocating DriverObjectExtension failed.\n"); + goto cleanup; } } /* Create a unicode device name. Allocate a new device number every time */ - do + while (TRUE) { - DeviceNumber++; + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); + RtlInitUnicodeString(&DeviceName, DeviceBuffer); + + Status = IoCreateDevice(DriverObject, + sizeof(USBMP_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &fdo); + if (Status != STATUS_OBJECT_NAME_COLLISION) + break; + if (DeviceNumber == 9999) { /* Hmm. We don't have a free number. */ if (AlreadyRestarted) { - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_TOO_MANY_NAMES; break; } /* Start again at DeviceNumber = 0 to find a free number */ DeviceNumber = 0; AlreadyRestarted = TRUE; } - swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); - RtlInitUnicodeString(&DeviceName, DeviceBuffer); + else + DeviceNumber++; + } - Status = IoCreateDevice(DriverObject, - sizeof(USBMP_DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &fdo); - } while (Status == STATUS_OBJECT_NAME_COLLISION); - if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoCreateDevice call failed with status 0x%08lx\n", Status); - return Status; + DPRINT1("USBMP: IoCreateDevice call failed with status 0x%08lx\n", Status); + goto cleanup; } - // zerofill device extension + /* Zerofill device extension */ DeviceExtension = (PUSBMP_DEVICE_EXTENSION)fdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(USBMP_DEVICE_EXTENSION)); - + /* Create root hub Pdo */ Status = CreateRootHubPdo(DriverObject, fdo, &DeviceExtension->RootHubPdo); if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: CreateRootHubPdo() failed with status 0x%08lx\n", Status); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: CreateRootHubPdo() failed with status 0x%08lx\n", Status); + goto cleanup; } /* Register device interface for controller */ @@ -272,15 +275,13 @@ &DeviceExtension->HcdInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - IoDeleteDevice(DeviceExtension->RootHubPdo); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + goto cleanup; } DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(fdo, pdo); - // Initialize device extension + /* Initialize device extension */ DeviceExtension->IsFDO = TRUE; DeviceExtension->DeviceNumber = DeviceNumber; DeviceExtension->PhysicalDeviceObject = pdo; @@ -288,24 +289,26 @@ DeviceExtension->DriverExtension = DriverExtension; fdo->Flags &= ~DO_DEVICE_INITIALIZING; - - /* FIXME: do a loop to find an available number */ - swprintf(LinkDeviceBuffer, L"\\??\\HCD%lu", 0); + /* Use the same number as the FDO */ + swprintf(LinkDeviceBuffer, L"\\??\\HCD%lu", DeviceNumber); + RtlInitUnicodeString(&LinkDeviceName, LinkDeviceBuffer); - Status = IoCreateSymbolicLink(&LinkDeviceName, &DeviceName); - if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoCreateSymbolicLink() call failed with status 0x%08x\n", Status); - IoDeleteDevice(DeviceExtension->RootHubPdo); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: IoCreateSymbolicLink() call failed with status 0x%08x\n", Status); + goto cleanup; } - return STATUS_SUCCESS; + +cleanup: + if (DeviceExtension && DeviceExtension->RootHubPdo) + IoDeleteDevice(DeviceExtension->RootHubPdo); + if (fdo) + IoDeleteDevice(fdo); + return Status; } NTSTATUS STDCALL @@ -428,15 +431,15 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; - // Register in usbcore.sys + /* Register in usbcore.sys */ UsbPortInterface.KbdConnectData = &KbdClassInformation; UsbPortInterface.MouseConnectData = &MouseClassInformation; - + KbdClassInformation.ClassService = NULL; KbdClassInformation.ClassDeviceObject = NULL; MouseClassInformation.ClassService = NULL; MouseClassInformation.ClassDeviceObject = NULL; - + RegisterPortDriver(DriverObject, &UsbPortInterface); AddDevice_Keyboard(DriverObject, NULL);

1 0

[hpoussin] 20526: Replace STATUS_UNSUCCESSFUL by STATUS_TOO_MANY_NAMES
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Replace STATUS_UNSUCCESSFUL by STATUS_TOO_MANY_NAMES Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2006-01-01 20:59:39 UTC (rev 20525) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2006-01-02 11:32:03 UTC (rev 20526) @@ -312,8 +312,8 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); - Status = STATUS_UNSUCCESSFUL; + DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2006-01-01 20:59:39 UTC (rev 20525) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2006-01-02 11:32:03 UTC (rev 20526) @@ -307,8 +307,8 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); - Status = STATUS_UNSUCCESSFUL; + DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) {

1 0

[ekohl] 20525: Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and MIDL_STUB_DESC.
by ekohl＠svn.reactos.org 01 Jan '06

01 Jan '06

Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and MIDL_STUB_DESC. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/ChangeLog 2006-01-01 20:59:39 UTC (rev 20525) @@ -1,5 +1,13 @@ ChangeLog +2006-01-01 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and + MIDL_STUB_DESC variables. + 2005-12-05 ekohl tools/widl/widl.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/client.c 2006-01-01 20:59:39 UTC (rev 20525) @@ -304,7 +304,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_client("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -429,7 +429,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; - print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -1782,7 +1782,7 @@ static void write_stubdescdecl(type_t *iface) { - print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); + print_client("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); fprintf(client, "\n"); } @@ -1791,7 +1791,7 @@ { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - print_client("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); @@ -1956,8 +1956,8 @@ write_formatdesc("TYPE"); write_formatdesc("PROC"); fprintf(client, "\n"); - print_client("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_client("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); print_client("\n"); } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/server.c 2006-01-01 20:59:39 UTC (rev 20525) @@ -309,7 +309,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_server("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -426,7 +426,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; - print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -1922,14 +1922,14 @@ static void write_stubdescdecl(type_t *iface) { - print_server("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); + print_server("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); fprintf(server, "\n"); } static void write_stubdescriptor(type_t *iface) { - print_server("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_server("{\n"); indent++; print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name); @@ -2093,8 +2093,8 @@ write_formatdesc("TYPE"); write_formatdesc("PROC"); fprintf(server, "\n"); - print_server("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_server("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); print_server("\n"); }

1 0

[gedmurphy] 20524: revert 20523.
by gedmurphy＠svn.reactos.org 01 Jan '06

01 Jan '06

revert 20523. explorer and my computer are different animals Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:45:16 UTC (rev 20523) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 20:56:01 UTC (rev 20524) @@ -122,7 +122,7 @@ HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); - AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_COMPUTER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); + AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep);

1 0

[gedmurphy] 20523: change explorer quick launch icon to use default 'my computer' icon instead of a folder.
by gedmurphy＠svn.reactos.org 01 Jan '06

01 Jan '06

change explorer quick launch icon to use default 'my computer' icon instead of a folder. Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:13:07 UTC (rev 20522) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:45:16 UTC (rev 20523) @@ -122,7 +122,7 @@ HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); - AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); + AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_COMPUTER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep);

1 0

[gedmurphy] 20522: - split logoff and shutdown resources
by gedmurphy＠svn.reactos.org 01 Jan '06

01 Jan '06

- split logoff and shutdown resources - add icons for each Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -392,6 +392,7 @@ _icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK); _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF); + _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE); } _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-01 18:13:07 UTC (rev 20522) @@ -138,6 +138,7 @@ IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" +IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -80,6 +80,7 @@ ICID_NETWORK, ICID_COMPUTER, ICID_LOGOFF, + ICID_SHUTDOWN, ICID_BOOKMARK, ICID_MINIMIZE, _____ Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/shutdown.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/shutdown.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-01 18:13:07 UTC (rev 20522) @@ -67,6 +67,7 @@ #define IDI_FOLDERARROW 125 #define IDI_ARROW 125 #define IDI_ARROW_SELECTED 126 +#define IDI_SHUTDOWN 127 #define IDB_LOGOV 129 #define IDB_LOGOV256 130 #define IDA_SEARCH_PROGRAM 133 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -121,7 +121,7 @@ COLORREF bk_color = GetSysColor(COLOR_BTNFACE); HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); - AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE/*@@*/).create_bitmap(bk_col or, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); + AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 17:12:19 UTC (rev 20521) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-01 18:13:07 UTC (rev 20522) @@ -1753,7 +1753,7 @@ #else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif - AddButton(ResString(IDS_SHUTDOWN), ICID_LOGOFF, false, IDC_SHUTDOWN); + AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); #ifndef _ROS_

1 0

[greatlrd] 20521: fix some bugs wih org with strechblt.
by greatlrd＠svn.reactos.org 01 Jan '06

01 Jan '06

fix some bugs wih org with strechblt. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -630,10 +630,10 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom; + DesSizeY = DestRect->bottom ; DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; @@ -659,7 +659,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -670,7 +670,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -692,7 +692,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -703,7 +703,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -728,7 +728,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -739,7 +739,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -759,7 +759,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -770,7 +770,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -797,7 +797,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -808,7 +808,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -826,7 +826,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -837,7 +837,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -859,7 +859,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -870,7 +870,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -886,7 +886,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -897,7 +897,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -921,7 +921,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -932,7 +932,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -950,7 +950,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -961,7 +961,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -983,7 +983,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -994,7 +994,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1010,7 +1010,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1021,7 +1021,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1050,7 +1050,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1061,7 +1061,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1079,7 +1079,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1090,7 +1090,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1112,7 +1112,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1123,7 +1123,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1139,7 +1139,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1150,7 +1150,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1174,7 +1174,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1185,7 +1185,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1203,7 +1203,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1214,7 +1214,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1236,7 +1236,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1247,7 +1247,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1263,7 +1263,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1274,7 +1274,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -518,8 +518,8 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; DesSizeY = DestRect->bottom; DesSizeX = DestRect->right; @@ -544,7 +544,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -555,7 +555,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -576,7 +576,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -587,7 +587,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -611,7 +611,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -622,7 +622,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -639,7 +639,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); @@ -650,7 +650,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -675,7 +675,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -686,7 +686,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -704,7 +704,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -715,7 +715,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -737,7 +737,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -748,7 +748,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -764,7 +764,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -775,7 +775,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -799,7 +799,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -810,7 +810,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -828,7 +828,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -839,7 +839,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -861,7 +861,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -872,7 +872,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -888,7 +888,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -899,7 +899,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -923,7 +923,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -934,7 +934,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -952,7 +952,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -963,7 +963,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -985,7 +985,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -996,7 +996,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1012,7 +1012,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1023,7 +1023,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1047,7 +1047,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1058,7 +1058,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1076,7 +1076,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1087,7 +1087,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1109,7 +1109,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1120,7 +1120,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1136,7 +1136,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1147,7 +1147,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1171,7 +1171,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1182,7 +1182,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1200,7 +1200,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1211,7 +1211,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -1233,7 +1233,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1244,7 +1244,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -1260,7 +1260,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -1271,7 +1271,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 16:49:53 UTC (rev 20520) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 17:12:19 UTC (rev 20521) @@ -513,10 +513,10 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom; - SrcSizeX = SourceRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom; + DesSizeY = DestRect->bottom ; DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; @@ -538,7 +538,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -549,7 +549,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -571,7 +571,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -582,7 +582,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -607,7 +607,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -618,7 +618,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -638,7 +638,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -649,7 +649,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -676,7 +676,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -687,7 +687,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -705,7 +705,7 @@ { /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -716,7 +716,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -738,7 +738,7 @@ if (DesSizeX>SrcSizeX) { /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -749,7 +749,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); @@ -765,7 +765,7 @@ else { /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -776,7 +776,7 @@ saveY = DesY+zoomY; - for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); @@ -800,7 +800,7 @@ /* Draw one Hline on X - Led to the Des Zoom In*/ if (DesSizeX>SrcSizeX) { - for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) { if (DesIsBiggerY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -811,7 +811,7 @@ saveY = DesY+zoomY; [truncated at 1000 lines; 1483 more skipped]

1 0

[hpoussin] 20520: Add missing processor architecture cases
by hpoussin＠svn.reactos.org 01 Jan '06

01 Jan '06

Add missing processor architecture cases Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2006-01-01 16:00:45 UTC (rev 20519) +++ trunk/reactos/lib/setupapi/devinst.c 2006-01-01 16:49:53 UTC (rev 20520) @@ -2,7 +2,7 @@ * SetupAPI device installer * * Copyright 2000 Andreas Mohr for CodeWeavers - * 2005 HervÚ Poussineau (hpoussin(a)reactos.org) + * 2005-2006 HervÚ Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -979,7 +979,10 @@ static const WCHAR ExtensionPlatformWindows[] = {'.','W','i','n',0}; static const WCHAR ExtensionArchitectureNone[] = {0}; +static const WCHAR ExtensionArchitecturealpha[] = {'a','l','p','h','a',0}; static const WCHAR ExtensionArchitectureamd64[] = {'a','m','d','6','4',0}; +static const WCHAR ExtensionArchitectureia64[] = {'i','a','6','4',0}; +static const WCHAR ExtensionArchitecturemips[] = {'m','i','p','s',0}; static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0}; @@ -993,17 +996,27 @@ pExtensionPlatform = ExtensionPlatformNT; break; default: + ERR("Unkown platform 0x%lx\n", pPlatformInfo->Platform); pExtensionPlatform = ExtensionPlatformNone; break; } switch (pPlatformInfo->ProcessorArchitecture) { + case PROCESSOR_ARCHITECTURE_ALPHA: + pExtensionArchitecture = ExtensionArchitecturealpha; + break; case PROCESSOR_ARCHITECTURE_AMD64: pExtensionArchitecture = ExtensionArchitectureamd64; break; + case PROCESSOR_ARCHITECTURE_IA64: + pExtensionArchitecture = ExtensionArchitectureia64; + break; case PROCESSOR_ARCHITECTURE_INTEL: pExtensionArchitecture = ExtensionArchitecturex86; break; + case PROCESSOR_ARCHITECTURE_MIPS: + pExtensionArchitecture = ExtensionArchitecturemips; + break; case PROCESSOR_ARCHITECTURE_PPC: pExtensionArchitecture = ExtensionArchitectureppc; break; @@ -6529,7 +6542,7 @@ break; } } - ItemList= ItemList->Flink; + ItemList = ItemList->Flink; } if (ItemList == ListHead) SetLastError(ERROR_INVALID_PARAMETER);

1 0

[greatlrd] 20519: revert 17709 for it break streach for windows mode. That why I did only got black windows in winquake with windows mode 640x480.
by greatlrd＠svn.reactos.org 01 Jan '06

01 Jan '06

revert 17709 for it break streach for windows mode. That why I did only got black windows in winquake with windows mode 640x480. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -630,11 +630,11 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -518,12 +518,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -513,12 +513,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -557,11 +557,11 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -397,12 +397,12 @@ int saveY; BOOLEAN DesIsBiggerY=FALSE; - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-01 15:48:03 UTC (rev 20518) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2006-01-01 16:00:45 UTC (rev 20519) @@ -480,12 +480,12 @@ BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; - DesSizeY = DestRect->bottom - DestRect->top; - DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1;

1 0

[mf] 20518: eliminate GCC warning about initialization order
by mf＠svn.reactos.org 01 Jan '06

01 Jan '06

eliminate GCC warning about initialization order Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h --- branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2006-01-01 15:44:46 UTC (rev 20517) +++ branches/lean-explorer/reactos/subsys/system/explorer/shell/shellbrowser .h 2006-01-01 15:48:03 UTC (rev 20518) @@ -104,13 +104,13 @@ protected: HWND _hwnd; + HWND _hWndFrame; HWND _left_hwnd; WindowHandle& _right_hwnd; ShellPathInfo& _create_info; Root _root; - WindowHandle _hWndFrame; ShellFolder _folder; IShellView* _pShellView; // current hosted shellview

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