Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[dgorbachev] 41156: Clear up debugger prompt from "mouse excrements". Tested in QEMU, Bochs, VirtualBox.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Thu May 28 00:27:35 2009 New Revision: 41156 URL: http://svn.reactos.org/svn/reactos?rev=41156&view=rev Log: Clear up debugger prompt from "mouse excrements". Tested in QEMU, Bochs, VirtualBox. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu May 28 00:27:35 2009 @@ -2258,7 +2258,7 @@ /* Read the next char - this is to throw away a \n which most clients should * send after \r. */ - KeStallExecutionProcessor(100000); + KeStallExecutionProcessor(100000); if (KdbDebugState & KD_DEBUG_KDSERIAL) NextKey = KdbpTryGetCharSerial(5); else Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] Thu May 28 00:27:35 2009 @@ -16,18 +16,25 @@ #if 1 -#define KBD_STATUS_REG 0x64 -#define KBD_CNTL_REG 0x64 -#define KBD_DATA_REG 0x60 +#define KBD_STATUS_REG 0x64 +#define KBD_CNTL_REG 0x64 +#define KBD_DATA_REG 0x60 + +#define KBD_STAT_OBF 0x01 +#define KBD_STAT_IBF 0x02 + +#define CTRL_WRITE_MOUSE 0xD4 +#define MOU_ENAB 0xF4 +#define MOU_DISAB 0xF5 +#define MOUSE_ACK 0xFA #define KBD_DISABLE_MOUSE 0xA7 #define KBD_ENABLE_MOUSE 0xA8 -#define KBD_STAT_OBF 0x01 /* Keyboard output buffer full */ - -#define kbd_write_command(cmd) WRITE_PORT_UCHAR((PUCHAR)KBD_STATUS_REG,cmd) -#define kbd_read_input() READ_PORT_UCHAR((PUCHAR)KBD_DATA_REG) -#define kbd_read_status() READ_PORT_UCHAR((PUCHAR)KBD_STATUS_REG) +#define kbd_write_command(cmd) WRITE_PORT_UCHAR((PUCHAR)KBD_CNTL_REG,cmd) +#define kbd_write_data(cmd) WRITE_PORT_UCHAR((PUCHAR)KBD_DATA_REG,cmd) +#define kbd_read_input() READ_PORT_UCHAR((PUCHAR)KBD_DATA_REG) +#define kbd_read_status() READ_PORT_UCHAR((PUCHAR)KBD_STATUS_REG) static unsigned char keyb_layout[2][128] = { @@ -50,14 +57,49 @@ typedef UCHAR byte_t; +/* FUNCTIONS *****************************************************************/ + +static VOID +KbdSendCommandToMouse(UCHAR Command) +{ + ULONG Retry = 20000; + + while (kbd_read_status() & KBD_STAT_OBF && Retry--) + { + kbd_read_input(); + KeStallExecutionProcessor(50); + } + + Retry = 20000; + while (kbd_read_status() & KBD_STAT_IBF && Retry--) + KeStallExecutionProcessor(50); + + kbd_write_command(CTRL_WRITE_MOUSE); + + Retry = 20000; + while (kbd_read_status() & KBD_STAT_IBF && Retry--) + KeStallExecutionProcessor(50); + + kbd_write_data(Command); + + Retry = 20000; + while (!(kbd_read_status() & KBD_STAT_OBF) && Retry--) + KeStallExecutionProcessor(50); + + if (kbd_read_input() != MOUSE_ACK) { ; } + return; +} + VOID KbdEnableMouse() { - kbd_write_command(KBD_ENABLE_MOUSE); + KbdSendCommandToMouse(MOU_ENAB); + // kbd_write_command(KBD_ENABLE_MOUSE); } VOID KbdDisableMouse() { - kbd_write_command(KBD_DISABLE_MOUSE); + KbdSendCommandToMouse(MOU_DISAB); + // kbd_write_command(KBD_DISABLE_MOUSE); } CHAR

1 0

[dgorbachev] 41155: Use a constant of the right type.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Thu May 28 00:27:27 2009 New Revision: 41155 URL: http://svn.reactos.org/svn/reactos?rev=41155&view=rev Log: Use a constant of the right type. Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Thu May 28 00:27:27 2009 @@ -65,7 +65,7 @@ { PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; - if (Adapter->NdisMiniportBlock.BusType != PCIBus || + if (Adapter->NdisMiniportBlock.BusType != NdisInterfacePci || Adapter->NdisMiniportBlock.AllocatedResources == NULL) { *AssignedResources = NULL;

1 0

[dgorbachev] 41154: Remove an unused variable that survived the Marletting.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Thu May 28 00:27:18 2009 New Revision: 41154 URL: http://svn.reactos.org/svn/reactos?rev=41154&view=rev Log: Remove an unused variable that survived the Marletting. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu May 28 00:27:18 2009 @@ -893,7 +893,6 @@ int i; HBRUSH hbsave, hb, hb2; HPEN hpsave, hp, hp2; - int tri = 290*SmallDiam/1000 - 1; int d46, d93; // end scrollgripsize switch(uFlags & 0xff)

1 0

[dgorbachev] 41153: Do not assign twice to the same variable.
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Thu May 28 00:27:09 2009 New Revision: 41153 URL: http://svn.reactos.org/svn/reactos?rev=41153&view=rev Log: Do not assign twice to the same variable. Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -104,7 +104,7 @@ ControllerProperties->SupportedTransferMode[0][0] = ControllerProperties->SupportedTransferMode[0][1] = ControllerProperties->SupportedTransferMode[1][0] = - ControllerProperties->SupportedTransferMode[1][0] = + ControllerProperties->SupportedTransferMode[1][1] = PIO_MODE0 | PIO_MODE1 | PIO_MODE2 | PIO_MODE3 | PIO_MODE4 | SWDMA_MODE0 | SWDMA_MODE1 | SWDMA_MODE2 | MWDMA_MODE0 | MWDMA_MODE1 | MWDMA_MODE2 | Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -1082,7 +1082,6 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch;

1 0

[cfinck] 41152: Don't use a dereferencing operator when incrementing the pointer here. Doesn't change the actual logic, but should avoid confusions ; -) See issue #4557 for more details.
by cfinck＠svn.reactos.org 27 May '09

27 May '09

Author: cfinck Date: Thu May 28 00:13:36 2009 New Revision: 41152 URL: http://svn.reactos.org/svn/reactos?rev=41152&view=rev Log: Don't use a dereferencing operator when incrementing the pointer here. Doesn't change the actual logic, but should avoid confusions ;-) See issue #4557 for more details. Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] Thu May 28 00:13:36 2009 @@ -197,7 +197,7 @@ newpath = newpath + "\\ "; else newpath = newpath + *p; - *p++; + p++; } return newpath; }

1 0

[mkupfer] 41151: new rosdbg icon
by mkupfer＠svn.reactos.org 27 May '09

27 May '09

Author: mkupfer Date: Wed May 27 23:12:41 2009 New Revision: 41151 URL: http://svn.reactos.org/svn/reactos?rev=41151&view=rev Log: new rosdbg icon Added: trunk/reactos/media/graphics/app-rosdebug.svg [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/media/graphics/app-rosdebug.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/graphics/app-rosdebu…

1 0

[mkupfer] 41150: new rosdbg icon
by mkupfer＠svn.reactos.org 27 May '09

27 May '09

Author: mkupfer Date: Wed May 27 23:12:16 2009 New Revision: 41150 URL: http://svn.reactos.org/svn/reactos?rev=41150&view=rev Log: new rosdbg icon Added: trunk/tools/reactosdbg/RosDBG/app-rosdbg.ico (with props) Added: trunk/tools/reactosdbg/RosDBG/app-rosdbg.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/app-rosdbg… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/reactosdbg/RosDBG/app-rosdbg.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[janderwald] 41149: - return error code when there is a timeout - improve error check in PcNewInterruptSync - write an error log entry when a device fails to start
by janderwald＠svn.reactos.org 27 May '09

27 May '09

Author: janderwald Date: Wed May 27 22:42:56 2009 New Revision: 41149 URL: http://svn.reactos.org/svn/reactos?rev=41149&view=rev Log: - return error code when there is a timeout - improve error check in PcNewInterruptSync - write an error log entry when a device fails to start Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Wed May 27 22:42:56 2009 @@ -455,9 +455,10 @@ }while(RetryCount-- >= 1); - //FIXME - // return error code on timeout - // + if (BytesRemaining) + { + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Wed May 27 22:42:56 2009 @@ -347,7 +347,7 @@ DPRINT("PcNewInterruptSync entered OutInterruptSync %p OuterUnknown %p ResourceList %p ResourceIndex %u Mode %d\n", OutInterruptSync, OuterUnknown, ResourceList, ResourceIndex, Mode); - if (!OutInterruptSync || !ResourceList || Mode > InterruptSyncModeRepeat || Mode < 0) + if (!OutInterruptSync || !ResourceList || Mode > InterruptSyncModeRepeat || Mode < InterruptSyncModeNormal || Mode > InterruptSyncModeRepeat) return STATUS_INVALID_PARAMETER; if (ResourceIndex > ResourceList->lpVtbl->NumberOfEntriesOfType(ResourceList, CmResourceTypeInterrupt)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Wed May 27 22:42:56 2009 @@ -43,6 +43,9 @@ PPCLASS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; IResourceList* resource_list = NULL; + ULONG Length; + WCHAR szMsg[100]; + PIO_ERROR_LOG_PACKET EventEntry; DPRINT("PortClsPnp called\n"); @@ -97,7 +100,22 @@ if (!NT_SUCCESS(Status)) { DPRINT("StartDevice returned a failure code [0x%8x]\n", Status); - + swprintf(szMsg, L"%%1 failed to start with %x", Status); + Length = (wcslen(szMsg) + 1) * sizeof(WCHAR) + sizeof(IO_ERROR_LOG_PACKET); + if (Length < ERROR_LOG_MAXIMUM_SIZE) + { + EventEntry = (PIO_ERROR_LOG_PACKET)IoAllocateErrorLogEntry(DeviceExt->PhysicalDeviceObject, Length); + if (EventEntry) + { + RtlZeroMemory(EventEntry, Length); + EventEntry->MajorFunctionCode = IRP_MJ_PNP; + EventEntry->NumberOfStrings = 1; + EventEntry->StringOffset = sizeof(IO_ERROR_LOG_PACKET); + EventEntry->ErrorCode = Status; + wcscpy((LPWSTR)(EventEntry + 1), szMsg); + IoWriteErrorLogEntry(EventEntry); + } + } Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -133,7 +151,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Status %x Information %p\n", Irp->IoStatus.Status, Irp->IoStatus.Information); Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Wed May 27 22:42:56 2009 @@ -18,10 +18,6 @@ }IRegistryKeyImpl; - -static IRegistryKeyVtbl vt_IRegistryKey; - - ULONG NTAPI IRegistryKey_fnAddRef( @@ -187,7 +183,7 @@ NewThis->hKey = hKey; NewThis->ref = 1; - NewThis->lpVtbl = &vt_IRegistryKey; + NewThis->lpVtbl = This->lpVtbl; *RegistrySubKey = (PREGISTRYKEY)&NewThis->lpVtbl; DPRINT("IRegistryKey_fnNewSubKey RESULT %p\n", *RegistrySubKey ); @@ -243,17 +239,19 @@ IN ULONG Length, OUT PULONG ResultLength) { - IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - - DPRINT("IRegistryKey_fnQueryValueKey entered %p value %wZ\n", This, ValueName); - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - - if (This->Deleted) - { - return STATUS_INVALID_HANDLE; - } - - return ZwQueryValueKey(This->hKey, ValueName, KeyValueInformationClass, KeyValueInformation, Length, ResultLength); + NTSTATUS Status; + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (This->Deleted) + { + return STATUS_INVALID_HANDLE; + } + + Status = ZwQueryValueKey(This->hKey, ValueName, KeyValueInformationClass, KeyValueInformation, Length, ResultLength); + DPRINT("IRegistryKey_fnQueryValueKey entered %p value %wZ Status %x\n", This, ValueName, Status); + return Status; } NTSTATUS

1 0

[janderwald] 41148: - define PORT_MAXIMUM_MESSAGE_LENGTH
by janderwald＠svn.reactos.org 27 May '09

27 May '09

Author: janderwald Date: Wed May 27 22:32:39 2009 New Revision: 41148 URL: http://svn.reactos.org/svn/reactos?rev=41148&view=rev Log: - define PORT_MAXIMUM_MESSAGE_LENGTH Modified: trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4114… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed May 27 22:32:39 2009 @@ -27,6 +27,13 @@ #else #define NTKERNELAPI DECLSPEC_IMPORT #endif + +#ifdef _WIN64 +#define PORT_MAXIMUM_MESSAGE_LENGTH 512 +#else +#define PORT_MAXIMUM_MESSAGE_LENGTH 256 +#endif + /* Simple types */ typedef UCHAR KPROCESSOR_MODE;

1 0

[dgorbachev] 41147: Change Paint to use Unicode
by dgorbachev＠svn.reactos.org 27 May '09

27 May '09

Author: dgorbachev Date: Wed May 27 21:56:50 2009 New Revision: 41147 URL: http://svn.reactos.org/svn/reactos?rev=41147&view=rev Log: Change Paint to use Unicode Modified: trunk/reactos/base/applications/paint/definitions.h trunk/reactos/base/applications/paint/dib.c trunk/reactos/base/applications/paint/dib.h trunk/reactos/base/applications/paint/globalvar.h trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/paint.rbuild trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/de… ============================================================================== --- trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] Wed May 27 21:56:50 2009 @@ -7,6 +7,8 @@ */ /* DEFINES **********************************************************/ + +#define SIZEOF(a) (sizeof(a) / sizeof((a)[0])) #define IDI_APPICON 500 Modified: trunk/reactos/base/applications/paint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.c [iso-8859-1] Wed May 27 21:56:50 2009 @@ -43,7 +43,7 @@ return bm.bmHeight; } -void SaveDIBToFile(HBITMAP hbm, LPSTR name, HDC hdc) +void SaveDIBToFile(HBITMAP hbm, LPTSTR name, HDC hdc) { BITMAP bm; GetObject(hbm, sizeof(BITMAP), &bm); @@ -77,7 +77,7 @@ HeapFree(GetProcessHeap(), 0, buffer); } -HBITMAP LoadDIBFromFile(LPSTR name) +HBITMAP LoadDIBFromFile(LPTSTR name) { HBITMAP bm; BITMAPFILEHEADER bfh; Modified: trunk/reactos/base/applications/paint/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dib.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dib.h [iso-8859-1] Wed May 27 21:56:50 2009 @@ -12,6 +12,6 @@ int GetDIBHeight(HBITMAP hbm); -void SaveDIBToFile(HBITMAP hbm, LPSTR name, HDC hdc); +void SaveDIBToFile(HBITMAP hbm, LPTSTR name, HDC hdc); -HBITMAP LoadDIBFromFile(LPSTR name); +HBITMAP LoadDIBFromFile(LPTSTR name); Modified: trunk/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl… ============================================================================== --- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Wed May 27 21:56:50 2009 @@ -68,6 +68,6 @@ extern HINSTANCE hProgInstance; -extern char filename[256]; -extern char filepathname[1000]; +extern TCHAR filename[256]; +extern TCHAR filepathname[1000]; extern BOOL isAFile; Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed May 27 21:56:50 2009 @@ -12,6 +12,7 @@ #include <windowsx.h> #include <commctrl.h> #include <stdio.h> +#include <tchar.h> #include "definitions.h" #include "drawing.h" @@ -97,11 +98,11 @@ HINSTANCE hProgInstance; -char filename[256]; -char filepathname[1000]; +TCHAR filename[256]; +TCHAR filepathname[1000]; BOOL isAFile = FALSE; -int WINAPI WinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPSTR lpszArgument, int nFunsterStil) +int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument, int nFunsterStil) { hProgInstance = hThisInstance; HWND hwnd; /* This is the handle for our window */ @@ -113,7 +114,7 @@ //initializing and registering the window class used for the main window WNDCLASSEX wincl; wincl.hInstance = hThisInstance; - wincl.lpszClassName = "WindowsApp"; + wincl.lpszClassName = _T("WindowsApp"); wincl.lpfnWndProc = WindowProcedure; wincl.style = CS_DBLCLKS; wincl.cbSize = sizeof (WNDCLASSEX); @@ -130,7 +131,7 @@ WNDCLASSEX wclScroll; wclScroll.hInstance = hThisInstance; - wclScroll.lpszClassName = "Scrollbox"; + wclScroll.lpszClassName = _T("Scrollbox"); wclScroll.lpfnWndProc = WindowProcedure; wclScroll.style = 0; wclScroll.cbSize = sizeof (WNDCLASSEX); @@ -147,7 +148,7 @@ WNDCLASSEX wclPal; wclPal.hInstance = hThisInstance; - wclPal.lpszClassName = "Palette"; + wclPal.lpszClassName = _T("Palette"); wclPal.lpfnWndProc = PalWinProc; wclPal.style = CS_DBLCLKS; wclPal.cbSize = sizeof (WNDCLASSEX); @@ -164,7 +165,7 @@ WNDCLASSEX wclSettings; wclSettings.hInstance = hThisInstance; - wclSettings.lpszClassName = "ToolSettings"; + wclSettings.lpszClassName = _T("ToolSettings"); wclSettings.lpfnWndProc = SettingsWinProc; wclSettings.style = CS_DBLCLKS; wclSettings.cbSize = sizeof (WNDCLASSEX); @@ -181,7 +182,7 @@ WNDCLASSEX wclSelection; wclSelection.hInstance = hThisInstance; - wclSelection.lpszClassName = "Selection"; + wclSelection.lpszClassName = _T("Selection"); wclSelection.lpfnWndProc = SelectionWinProc; wclSelection.style = CS_DBLCLKS; wclSelection.cbSize = sizeof (WNDCLASSEX); @@ -194,15 +195,15 @@ wclSelection.hbrBackground = NULL;//GetSysColorBrush(COLOR_BTNFACE); RegisterClassEx (&wclSelection); - LoadString(hThisInstance, IDS_DEFAULTFILENAME, (LPTSTR)filename, sizeof(filename)); - char progtitle[1000]; - char resstr[100]; - LoadString(hThisInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); - sprintf(progtitle, resstr, filename); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); + TCHAR progtitle[1000]; + TCHAR resstr[100]; + LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(progtitle, resstr, filename); // create main window - hwnd = CreateWindowEx (0, "WindowsApp", (LPTSTR)progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL); + hwnd = CreateWindowEx (0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL); hMainWnd = hwnd; @@ -222,7 +223,7 @@ hCurPen = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_PEN)); hCurAirbrush = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); - HWND hLine = CreateWindowEx (0, "STATIC", "", WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, hThisInstance, NULL); + HWND hLine = CreateWindowEx (0, _T("STATIC"), _T(""), WS_CHILD | WS_VISIBLE | SS_ETCHEDHORZ, 0, 0, 5000, 2, hwnd, NULL, hThisInstance, NULL); // creating the 16 bitmap radio buttons and setting the bitmap @@ -236,12 +237,12 @@ DeleteObject(tempBm); SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); int i; - char tooltips[16][30]; + TCHAR tooltips[16][30]; for (i=0; i<16; i++) { int wrapnow = 0; if (i % 2 == 1) wrapnow = TBSTATE_WRAP; - LoadString(hThisInstance, IDS_TOOLTIP1 + i, (LPTSTR)tooltips[i], 30); + LoadString(hThisInstance, IDS_TOOLTIP1 + i, tooltips[i], 30); TBBUTTON tbbutton = { i, ID_FREESEL + i, TBSTATE_ENABLED | wrapnow, TBSTYLE_CHECKGROUP, {0}, 0, (INT_PTR)tooltips[i] }; SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&tbbutton); } @@ -256,25 +257,25 @@ // creating the tool settings child window - hToolSettings = CreateWindowEx(0, "ToolSettings", "", WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, hThisInstance, NULL); + hToolSettings = CreateWindowEx(0, _T("ToolSettings"), _T(""), WS_CHILD | WS_VISIBLE, 7, 210, 42, 140, hwnd, NULL, hThisInstance, NULL); // creating the palette child window - hPalWin = CreateWindowEx(0, "Palette", "", WS_CHILD | WS_VISIBLE, 56, 9, 255, 32, hwnd, NULL, hThisInstance, NULL); + hPalWin = CreateWindowEx(0, _T("Palette"), _T(""), WS_CHILD | WS_VISIBLE, 56, 9, 255, 32, hwnd, NULL, hThisInstance, NULL); // creating the scroll box - hScrollbox = CreateWindowEx (WS_EX_CLIENTEDGE, "Scrollbox", "", WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 56, 49, 472, 248, hwnd, NULL, hThisInstance, NULL); + hScrollbox = CreateWindowEx (WS_EX_CLIENTEDGE, _T("Scrollbox"), _T(""), WS_CHILD | WS_GROUP | WS_HSCROLL | WS_VSCROLL | WS_VISIBLE, 56, 49, 472, 248, hwnd, NULL, hThisInstance, NULL); // creating the status bar - hStatusBar = CreateWindowEx (0, STATUSCLASSNAME, "", SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); + hStatusBar = CreateWindowEx (0, STATUSCLASSNAME, _T(""), SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); SendMessage(hStatusBar, SB_SETMINHEIGHT, 21, 0); - hScrlClient = CreateWindowEx(0, "Scrollbox", "", WS_CHILD | WS_VISIBLE, 0, 0, 500, 500, hScrollbox, NULL, hThisInstance, NULL); + hScrlClient = CreateWindowEx(0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 0, 0, 500, 500, hScrollbox, NULL, hThisInstance, NULL); // create selection window (initially hidden) - hSelection = CreateWindowEx(WS_EX_TRANSPARENT, "Selection", "", WS_CHILD | BS_OWNERDRAW, 350, 0, 100, 100, hScrlClient, NULL, hThisInstance, NULL); + hSelection = CreateWindowEx(WS_EX_TRANSPARENT, _T("Selection"), _T(""), WS_CHILD | BS_OWNERDRAW, 350, 0, 100, 100, hScrlClient, NULL, hThisInstance, NULL); // creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn - hImageArea = CreateWindowEx (0, "Scrollbox", "", WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient, NULL, hThisInstance, NULL); + hImageArea = CreateWindowEx (0, _T("Scrollbox"), _T(""), WS_CHILD | WS_VISIBLE, 3, 3, imgXRes, imgYRes, hScrlClient, NULL, hThisInstance, NULL); hDrawingDC = CreateCompatibleDC(GetDC(hImageArea)); hSelDC = CreateCompatibleDC(GetDC(hImageArea)); @@ -299,41 +300,41 @@ choosecolor.lpfnHook = NULL; choosecolor.lpTemplateName = NULL; - char *c; + TCHAR *c; // initializing the OPENFILENAME structure for use with GetOpenFileName and GetSaveFileName - char ofnFilename[1000]; + TCHAR ofnFilename[1000]; CopyMemory(ofnFilename, filename, sizeof(filename)); - char ofnFiletitle[256]; - char ofnFilter[1000]; - LoadString(hThisInstance, IDS_OPENFILTER, (LPTSTR)ofnFilter, sizeof(ofnFilter)); + TCHAR ofnFiletitle[256]; + TCHAR ofnFilter[1000]; + LoadString(hThisInstance, IDS_OPENFILTER, ofnFilter, SIZEOF(ofnFilter)); for (c = ofnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof (OPENFILENAME); ofn.hwndOwner = hwnd; ofn.hInstance = hThisInstance; - ofn.lpstrFilter = (LPCTSTR)ofnFilter; - ofn.lpstrFile = (LPTSTR)ofnFilename; - ofn.nMaxFile = sizeof(ofnFilename); - ofn.lpstrFileTitle = (LPTSTR)ofnFiletitle; - ofn.nMaxFileTitle = sizeof(ofnFiletitle); + ofn.lpstrFilter = ofnFilter; + ofn.lpstrFile = ofnFilename; + ofn.nMaxFile = SIZEOF(ofnFilename); + ofn.lpstrFileTitle = ofnFiletitle; + ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); ofn.Flags = OFN_HIDEREADONLY; - char sfnFilename[1000]; + TCHAR sfnFilename[1000]; CopyMemory(sfnFilename, filename, sizeof(filename)); - char sfnFiletitle[256]; - char sfnFilter[1000]; - LoadString(hThisInstance, IDS_SAVEFILTER, (LPTSTR)sfnFilter, sizeof(sfnFilter)); + TCHAR sfnFiletitle[256]; + TCHAR sfnFilter[1000]; + LoadString(hThisInstance, IDS_SAVEFILTER, sfnFilter, SIZEOF(sfnFilter)); for (c = sfnFilter; *c; c++) if (*c == '\1') *c = '\0'; ZeroMemory(&sfn, sizeof(OPENFILENAME)); sfn.lStructSize = sizeof (OPENFILENAME); sfn.hwndOwner = hwnd; sfn.hInstance = hThisInstance; - sfn.lpstrFilter = (LPCTSTR)sfnFilter; - sfn.lpstrFile = (LPTSTR)sfnFilename; - sfn.nMaxFile = sizeof(sfnFilename); - sfn.lpstrFileTitle = (LPTSTR)sfnFiletitle; - sfn.nMaxFileTitle = sizeof(sfnFiletitle); + sfn.lpstrFilter = sfnFilter; + sfn.lpstrFile = sfnFilename; + sfn.nMaxFile = SIZEOF(sfnFilename); + sfn.lpstrFileTitle = sfnFiletitle; + sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; Modified: trunk/reactos/base/applications/paint/paint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa… ============================================================================== --- trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] Wed May 27 21:56:50 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="paint" type="win32gui" installbase="system32" installname="paint.exe" allowwarnings="true"> +<module name="paint" type="win32gui" installbase="system32" installname="paint.exe" unicode="yes" allowwarnings="true"> <include base="paint">.</include> <library>comdlg32</library> <library>shell32</library> Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Wed May 27 21:56:50 2009 @@ -13,6 +13,7 @@ #include <commctrl.h> //#include <htmlhelp.h> #include <stdio.h> +#include <tchar.h> #include "definitions.h" #include "globalvar.h" #include "dialogs.h" @@ -60,13 +61,13 @@ case WM_CLOSE: if (undoSteps>0) { - char programname[20]; - char saveprompttext[100]; - LoadString(hProgInstance, IDS_PROGRAMNAME, (LPTSTR)programname, sizeof(programname)); - LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, (LPTSTR)saveprompttext, sizeof(saveprompttext)); - char temptext[500]; - sprintf(temptext, saveprompttext, filename); - switch (MessageBox(hwnd, (LPTSTR)temptext, (LPTSTR)programname, MB_YESNOCANCEL | MB_ICONQUESTION)) + TCHAR programname[20]; + TCHAR saveprompttext[100]; + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, saveprompttext, SIZEOF(saveprompttext)); + TCHAR temptext[500]; + _stprintf(temptext, saveprompttext, filename); + switch (MessageBox(hwnd, temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { case IDNO: DestroyWindow(hwnd); @@ -319,8 +320,8 @@ { if ((!drawing)||(activeTool<=9)) { - char coordStr[100]; - sprintf(coordStr, "%d, %d", (short)LOWORD(lParam)*1000/zoom, (short)HIWORD(lParam)*1000/zoom); + TCHAR coordStr[100]; + _stprintf(coordStr, _T("%d, %d"), (short)LOWORD(lParam)*1000/zoom, (short)HIWORD(lParam)*1000/zoom); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM)coordStr); } if (drawing) @@ -331,8 +332,8 @@ SendMessage(hImageArea, WM_PAINT, 0, 0); if ((activeTool>=10)||(activeTool==2)) { - char sizeStr[100]; - sprintf(sizeStr, "%d x %d", (short)LOWORD(lParam)*1000/zoom-startX, (short)HIWORD(lParam)*1000/zoom-startY); + TCHAR sizeStr[100]; + _stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam)*1000/zoom-startX, (short)HIWORD(lParam)*1000/zoom-startY); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM)sizeStr); } } @@ -342,15 +343,15 @@ SendMessage(hImageArea, WM_PAINT, 0, 0); if (activeTool>=10) { - char sizeStr[100]; - sprintf(sizeStr, "%d x %d", (short)LOWORD(lParam)*1000/zoom-startX, (short)HIWORD(lParam)*1000/zoom-startY); + TCHAR sizeStr[100]; + _stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam)*1000/zoom-startX, (short)HIWORD(lParam)*1000/zoom-startY); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM)sizeStr); } } } } else { - SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM)""); + SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM)_T("")); } break; @@ -362,11 +363,11 @@ case IDM_HELPINFO: { HICON paintIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); - char infotitle[100]; - char infotext[200]; - LoadString(hProgInstance, IDS_INFOTITLE, (LPTSTR)infotitle, sizeof(infotitle)); - LoadString(hProgInstance, IDS_INFOTEXT, (LPTSTR)infotext, sizeof(infotext)); - ShellAbout(hMainWnd, (LPTSTR)infotitle, (LPTSTR)infotext, paintIcon); + TCHAR infotitle[100]; + TCHAR infotext[200]; + LoadString(hProgInstance, IDS_INFOTITLE, infotitle, SIZEOF(infotitle)); + LoadString(hProgInstance, IDS_INFOTEXT, infotext, SIZEOF(infotext)); + ShellAbout(hMainWnd, infotitle, infotext, paintIcon); DeleteObject(paintIcon); } break; @@ -388,12 +389,12 @@ { insertReversible(bmNew); updateCanvasAndScrollbars(); - char tempstr[1000]; - char resstr[100]; + TCHAR tempstr[1000]; + TCHAR resstr[100]; CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); - LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); - sprintf(tempstr, resstr, filename); + LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(tempstr, resstr, filename); SetWindowText(hMainWnd, tempstr); clearHistory(); isAFile = TRUE; @@ -410,12 +411,12 @@ if (GetSaveFileName(&sfn)!=0) { SaveDIBToFile(hBms[currInd], sfn.lpstrFile, hDrawingDC); - char tempstr[1000]; - char resstr[100]; + TCHAR tempstr[1000]; + TCHAR resstr[100]; CopyMemory(filename, sfn.lpstrFileTitle, sizeof(filename)); CopyMemory(filepathname, sfn.lpstrFileTitle, sizeof(filepathname)); - LoadString(hProgInstance, IDS_WINDOWTITLE, (LPTSTR)resstr, sizeof(resstr)); - sprintf(tempstr, resstr, filename); + LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(tempstr, resstr, filename); SetWindowText(hMainWnd, tempstr); isAFile = TRUE; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009