Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[hpoussin] 15749: Save DriverObject pointer to device extension

by hpoussin＠svn.reactos.com

Save DriverObject pointer to device extension Use INTERFACE_TYPE type instead of ULONG Use OBJ_KERNEL_HANDLE when opening \Device\PhysicalMemory Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.h _____ Modified: trunk/reactos/drivers/video/videoprt/resource.c --- trunk/reactos/drivers/video/videoprt/resource.c 2005-06-03 16:04:40 UTC (rev 15748) +++ trunk/reactos/drivers/video/videoprt/resource.c 2005-06-03 16:56:27 UTC (rev 15749) @@ -1,7 +1,7 @@ /* * VideoPort driver * - * Copyright (C) 2002, 2003, 2004 ReactOS Team + * Copyright (C) 2002 - 2005 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -43,7 +43,7 @@ RtlInitUnicodeString(&UnicodeString, L"\\Device\\PhysicalMemory"); InitializeObjectAttributes(&ObjAttribs, &UnicodeString, - OBJ_CASE_INSENSITIVE/* | OBJ_KERNEL_HANDLE*/, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); /* Open physical memory section */ _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-06-03 16:04:40 UTC (rev 15748) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-06-03 16:56:27 UTC (rev 15749) @@ -232,6 +232,7 @@ DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)((*DeviceObject)->DeviceExtension); DeviceExtension->DeviceNumber = DeviceNumber; + DeviceExtension->DriverObject = DriverObject; DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->FunctionalDeviceObject = *DeviceObject; DeviceExtension->DriverExtension = DriverExtension; _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.h --- trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-03 16:04:40 UTC (rev 15748) +++ trunk/reactos/drivers/video/videoprt/videoprt.h 2005-06-03 16:56:27 UTC (rev 15749) @@ -84,6 +84,7 @@ typedef struct _VIDEO_PORT_DEVICE_EXTENSTION { ULONG DeviceNumber; + PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT FunctionalDeviceObject; PDEVICE_OBJECT NextDeviceObject; @@ -94,7 +95,7 @@ ULONG InterruptVector; ULONG InterruptLevel; BOOLEAN InterruptShared; - ULONG AdapterInterfaceType; + INTERFACE_TYPE AdapterInterfaceType; ULONG SystemIoBusNumber; ULONG SystemIoSlotNumber; LIST_ENTRY AddressMappingListHead;

19 years, 3 months

[hbirr] 15748: Fixed the compiling with DBG set to 1.

by hbirr＠svn.reactos.com

Fixed the compiling with DBG set to 1. Modified: trunk/reactos/drivers/usb/cromwell/core/config.c Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c _____ Modified: trunk/reactos/drivers/usb/cromwell/core/config.c --- trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -453,8 +453,9 @@ /* configuration is */ result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, buffer, 8); if (result < 8) { - if (result < 0) + if (result < 0) { err("unable to get descriptor"); + } else { err("config descriptor too short (expected %i, got %i)", 8, result); result = -EINVAL; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -289,9 +289,10 @@ int ret; ret = get_hub_status(dev, &hub->status->hub); - if (ret < 0) + if (ret < 0) { dev_err (hubdev (dev), "%s failed (err = %d)\n", __FUNCTION__, ret); + } else { *status = le16_to_cpu(hub->status->hub.wHubStatus); *change = le16_to_cpu(hub->status->hub.wHubChange); @@ -703,9 +704,10 @@ int ret; ret = get_port_status(dev, port + 1, &hub->status->port); - if (ret < 0) + if (ret < 0) { dev_err (hubdev (dev), "%s failed (err = %d)\n", __FUNCTION__, ret); + } else { *status = le16_to_cpu(hub->status->port.wPortStatus); *change = le16_to_cpu(hub->status->port.wPortChange); @@ -1115,8 +1117,9 @@ } /* end for i */ /* deal with hub status changes */ - if (hub_hub_status(hub, &hubstatus, &hubchange) < 0) + if (hub_hub_status(hub, &hubstatus, &hubchange) < 0) { dev_err (&hub->intf->dev, "get_hub_status failed\n"); + } else { if (hubchange & HUB_CHANGE_LOCAL_POWER) { dev_dbg (&hub->intf->dev, "power change\n"); @@ -1321,15 +1324,16 @@ ret = usb_get_device_descriptor(dev); if (ret < sizeof(dev->descriptor)) { - if (ret < 0) + if (ret < 0) { err("unable to get device %s descriptor " "(error=%d)", dev->devpath, ret); - else + } + else { err("USB device %s descriptor short read " "(expected %Zi, got %i)", dev->devpath, sizeof(dev->descriptor), ret); - + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1; return -EIO; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c --- trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-03 12:30:09 UTC (rev 15747) +++ trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-03 16:04:40 UTC (rev 15748) @@ -275,12 +275,13 @@ return; // FIXME change API to report an error in this case - if (iface->driver) + if (iface->driver) { err ("%s driver booted %s off interface %p", driver->name, iface->driver->name, iface); - else + } + else { dbg("%s driver claimed interface %p", driver->name, iface); - + } iface->driver = driver; usb_set_intfdata(iface, priv); } @@ -1139,10 +1140,12 @@ } if (err < 8) { - if (err < 0) + if (err < 0) { dev_err(&dev->dev, "USB device not responding, giving up (error=%d)\n", err); - else + } + else { dev_err(&dev->dev, "USB device descriptor short read (expected %i, got %i)\n", 8, err); + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1; return 1; @@ -1156,11 +1159,13 @@ err = usb_get_device_descriptor(dev); if (err < (signed)sizeof(dev->descriptor)) { - if (err < 0) + if (err < 0) { dev_err(&dev->dev, "unable to get device descriptor (error=%d)\n", err); - else + } + else { dev_err(&dev->dev, "USB device descriptor short read (expected %Zi, got %i)\n", sizeof(dev->descriptor), err); + } clear_bit(dev->devnum, dev->bus->devmap.devicemap); dev->devnum = -1;

19 years, 3 months

[greatlrd] 15747: activate 32 to 32 bitblt code

by greatlrd＠svn.reactos.com

activate 32 to 32 bitblt code Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 12:03:44 UTC (rev 15746) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 12:30:09 UTC (rev 15747) @@ -305,8 +305,6 @@ BOOL UsesSource; BOOL UsesPattern; PULONG DestBits; - LONG DesmaxX, DesmaxY; - LONG SrcmaxX, SrcmaxY; switch (BltInfo->Rop4) { @@ -385,9 +383,7 @@ case BMF_1BPP: break; case BMF_4BPP: - break; - case BMF_8BPP: - break; + break; case BMF_16BPP: break; case BMF_24BPP: @@ -398,19 +394,22 @@ INT Sourcedelta; register PBYTE Destaddr; register PBYTE Srcaddr; + LONG DesmaxX, DesmaxY; + LONG SrcmaxX, SrcmaxY; + SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; - /* calc the dst BMP size */ + DesmaxX = BltInfo->DestRect.right - BltInfo->DestRect.left; DesmaxY = BltInfo->DestRect.bottom - BltInfo->DestRect.top; - /* calc max X and Y size to blt */ + if (DesmaxX > SrcmaxX ) DesmaxX = SrcmaxX; if (DesmaxY > SrcmaxY ) DesmaxY = SrcmaxY; - /* do blt */ + Destdelta = BltInfo->DestSurface->lDelta; Sourcedelta = BltInfo->SourceSurface->lDelta; Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; @@ -427,8 +426,10 @@ } while (--DesmaxY); } + return TRUE; break; } + default: break;

19 years, 3 months

[hpoussin] 15746: Delete unneeded makefile

by hpoussin＠svn.reactos.com

Delete unneeded makefile Deleted: trunk/reactos/drivers/input/i8042prt/makefile _____ Deleted: trunk/reactos/drivers/input/i8042prt/makefile --- trunk/reactos/drivers/input/i8042prt/makefile 2005-06-03 01:45:26 UTC (rev 15745) +++ trunk/reactos/drivers/input/i8042prt/makefile 2005-06-03 12:03:44 UTC (rev 15746) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\.. -DEFAULT = i8042prt -include $(TOP)/proxy.mak

19 years, 3 months

[blight] 15745: DIB_32BPP_BitBlt: Fix ROP4_SRCCOPY case for 32bpp.

by blight＠svn.reactos.com

DIB_32BPP_BitBlt: Fix ROP4_SRCCOPY case for 32bpp. This file is ugly! Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 01:18:02 UTC (rev 15744) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 01:45:26 UTC (rev 15745) @@ -393,9 +393,14 @@ case BMF_24BPP: break; case BMF_32BPP: - - SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; - SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; + { + INT Destdelta; + INT Sourcedelta; + register PBYTE Destaddr; + register PBYTE Srcaddr; + + SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; + SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; /* calc the dst BMP size */ DesmaxX = BltInfo->DestRect.right - BltInfo->DestRect.left; @@ -406,19 +411,24 @@ if (DesmaxY > SrcmaxY ) DesmaxY = SrcmaxY; /* do blt */ - INT Destdelta = BltInfo->DestSurface->lDelta; - INT Sourcedelta = BltInfo->SourceSurface->lDelta; - register PBYTE Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; - register PBYTE Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; + Destdelta = BltInfo->DestSurface->lDelta; + Sourcedelta = BltInfo->SourceSurface->lDelta; + Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; + Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; DesmaxX *= 4; - while (--DesmaxY) + if (DesmaxY > 0) { - RtlCopyMemory(Destaddr, Srcaddr, DesmaxX); - Destaddr += Destdelta; - Srcaddr += Sourcedelta; + do + { + RtlCopyMemory(Destaddr, Srcaddr, DesmaxX); + Destaddr += Destdelta; + Srcaddr += Sourcedelta; + } + while (--DesmaxY); } - break; + break; + } default: break;

19 years, 3 months

[greatlrd] 15744: blt fill did broke winquake fix it now.

by greatlrd＠svn.reactos.com

blt fill did broke winquake fix it now. Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 00:35:31 UTC (rev 15743) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 01:18:02 UTC (rev 15744) @@ -329,18 +329,17 @@ else { SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * - BltInfo->DestRect.right) << 2; + BltInfo->DestRect.right); memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta, 0x00000000, SourceX); } -#else - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; +#else for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) { - DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0x00000000); + DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.left, BltInfo->DestRect.right, DestY, 0x00000000); } #endif @@ -364,7 +363,7 @@ else { SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * - BltInfo->DestRect.right) << 2; + BltInfo->DestRect.right); memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta, 0xFFFFFFFF, SourceX); @@ -372,10 +371,9 @@ } #else - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) { - DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0xFFFFFFFF); + DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.left, BltInfo->DestRect.left, DestY, 0xFFFFFFFF); } #endif return TRUE; @@ -395,6 +393,7 @@ case BMF_24BPP: break; case BMF_32BPP: + SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y;

19 years, 3 months

[greatlrd] 15743: thx agein blight and alex.

by greatlrd＠svn.reactos.com

thx agein blight and alex. we got alot faster blt for source copy for 32bpp to 32bpp now. Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 00:10:18 UTC (rev 15742) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 00:35:31 UTC (rev 15743) @@ -305,6 +305,8 @@ BOOL UsesSource; BOOL UsesPattern; PULONG DestBits; + LONG DesmaxX, DesmaxY; + LONG SrcmaxX, SrcmaxY; switch (BltInfo->Rop4) { @@ -378,7 +380,52 @@ #endif return TRUE; break; + case ROP4_SRCCOPY: + // return(Source); + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + break; + case BMF_4BPP: + break; + case BMF_8BPP: + break; + case BMF_16BPP: + break; + case BMF_24BPP: + break; + case BMF_32BPP: + SrcmaxX = BltInfo->SourceSurface->sizlBitmap.cx - BltInfo->SourcePoint.x; + SrcmaxY = BltInfo->SourceSurface->sizlBitmap.cy - BltInfo->SourcePoint.y; + + /* calc the dst BMP size */ + DesmaxX = BltInfo->DestRect.right - BltInfo->DestRect.left; + DesmaxY = BltInfo->DestRect.bottom - BltInfo->DestRect.top; + + /* calc max X and Y size to blt */ + if (DesmaxX > SrcmaxX ) DesmaxX = SrcmaxX; + if (DesmaxY > SrcmaxY ) DesmaxY = SrcmaxY; + + /* do blt */ + INT Destdelta = BltInfo->DestSurface->lDelta; + INT Sourcedelta = BltInfo->SourceSurface->lDelta; + register PBYTE Destaddr = BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * Destdelta + BltInfo->DestRect.left; + register PBYTE Srcaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->SourcePoint.y * Sourcedelta + BltInfo->SourcePoint.x; + + DesmaxX *= 4; + while (--DesmaxY) + { + RtlCopyMemory(Destaddr, Srcaddr, DesmaxX); + Destaddr += Destdelta; + Srcaddr += Sourcedelta; + } + break; + default: + break; + } + break; + default: break; }

19 years, 3 months

[greatlrd] 15742: sorry wrong optimze for black and white fixing the start menu

by greatlrd＠svn.reactos.com

sorry wrong optimze for black and white fixing the start menu Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-02 22:14:53 UTC (rev 15741) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 00:10:18 UTC (rev 15742) @@ -310,15 +310,14 @@ { case ROP4_BLACKNESS: //return(0x00000000); + #ifdef _M_IX86 if (BltInfo->DestRect.left!=0) { - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) ; - if (SourceX<=0) return TRUE; - + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { + { memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * BltInfo->DestSurface->lDelta + BltInfo->DestRect.left), 0x00000000, SourceX); @@ -326,20 +325,21 @@ } else - { - - SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * - BltInfo->DestRect.right) ; + { + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * + BltInfo->DestRect.right) << 2; - if (SourceX<=0) return TRUE; - memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * - BltInfo->DestSurface->lDelta), 0x00000000, SourceX); + memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * + BltInfo->DestSurface->lDelta, 0x00000000, SourceX); + + } -#else - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { +#else + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0x00000000); - } + } #endif return TRUE; @@ -347,13 +347,10 @@ case ROP4_WHITENESS: //return(0xFFFFFFFF); - SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right) ; - if (SourceX<=0) return TRUE; - -#ifdef _M_IX86 - - if ( BltInfo->DestRect.left!=0) - { +#ifdef _M_IX86 + if (BltInfo->DestRect.left!=0) + { + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) { memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * @@ -361,19 +358,24 @@ BltInfo->DestRect.left), 0xFFFFFFFF, SourceX); } - } + } else - { - memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * - BltInfo->DestSurface->lDelta), 0xFFFFFFFF, SourceX); + { + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * + BltInfo->DestRect.right) << 2; + + memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * + BltInfo->DestSurface->lDelta, 0xFFFFFFFF, SourceX); + + } #else - for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) - { + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; + for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) + { DIB_32BPP_HLine(BltInfo->DestSurface, BltInfo->DestRect.bottom, SourceX, DestY, 0xFFFFFFFF); - } + } #endif - return TRUE; break;

19 years, 3 months

[mf] 15741: Sync from Wine - Henning Gerhardt <henning.gerhardt@web.de>: Update German resource files

by mf＠svn.reactos.com

Sync from Wine - Henning Gerhardt <henning.gerhardt(a)web.de>: Update German resource files Modified: trunk/reactos/subsys/system/winefile/de.rc _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-06-02 22:09:06 UTC (rev 15740) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-06-02 22:14:53 UTC (rev 15741) @@ -195,7 +195,7 @@ CONTROL "Vers&teckte/Systemdateien anzeigen",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,104,24,50,14 END

19 years, 3 months

[mf] 15740: convert info strings to UTF-16

by mf＠svn.reactos.com

convert info strings to UTF-16 Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 21:39:00 UTC (rev 15739) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-02 22:09:06 UTC (rev 15740) @@ -1847,15 +1847,23 @@ for(p=InfoStrings; *p; ++p) { TCHAR subblock[200]; +#ifdef UNICODE + TCHAR infoStr[100]; +#endif LPCTSTR pTxt; UINT nValLen; LPCSTR pInfoString = *p; - wsprintf(subblock, sStringFileInfo, pTranslate->wLanguage, pTranslate->wCodePage, pInfoString); +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pInfoString, -1, infoStr, 100); +#else +#define infoStr pInfoString +#endif + wsprintf(subblock, sStringFileInfo, pTranslate->wLanguage, pTranslate->wCodePage, infoStr); /* Retrieve file description for language and code page */ if (VerQueryValue(dlg->pVersionData, subblock, (PVOID)&pTxt, &nValLen)) { - int idx = ListBox_AddString(hlbox, pInfoString); + int idx = ListBox_AddString(hlbox, infoStr); ListBox_SetItemData(hlbox, idx, pTxt); } }

19 years, 3 months

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 June 2005