Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[tkreuzer] 37021: update videoprt.spec, add some exports found on vista64 and reorder some functions alphabetically

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 27 08:52:52 2008 New Revision: 37021 URL: http://svn.reactos.org/svn/reactos?rev=37021&view=rev Log: update videoprt.spec, add some exports found on vista64 and reorder some functions alphabetically Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.spec Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Oct 27 08:52:52 2008 @@ -1,3 +1,4 @@ +;ScsiPortNotification // vista64 @ stdcall VideoPortAcquireDeviceLock(ptr) @ stdcall VideoPortAcquireSpinLock(ptr ptr ptr) @ stdcall VideoPortAcquireSpinLockAtDpcLevel(ptr ptr) @@ -7,6 +8,7 @@ @ stdcall VideoPortAllocatePool(ptr long long long) ;VideoPortAssociateEventsWithDmaHandle @ stdcall VideoPortCheckForDeviceExistence(ptr long long long long long long) +;VideoPortCheckForDeviceExistence there's a second dummy export with the same name on ms videoprt @ stdcall VideoPortClearEvent(ptr ptr) @ stdcall VideoPortCompareMemory(ptr ptr long) NTOSKRNL.RtlCompareMemory ;VideoPortCompleteDma @@ -14,6 +16,9 @@ @ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) @ stdcall VideoPortCreateSpinLock(ptr ptr) @ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) +;VideoPortDbgReportComplete // vista64 +;VideoPortDbgReportCreate // vista64 +;VideoPortDbgReportSecondaryData // vista64 @ cdecl VideoPortDebugPrint(long ptr) @ stdcall VideoPortDeleteEvent(ptr ptr) @ stdcall VideoPortDeleteSpinLock(ptr ptr) @@ -48,29 +53,31 @@ @ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange @ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortLockBuffer(ptr ptr long long) +;VideoPortIsNoVesa // 2003 and later ;VideoPortLockPages @ stdcall VideoPortLogError(ptr ptr long long) @ stdcall VideoPortMapBankedMemory(ptr long long ptr ptr ptr long long ptr ptr) ;VideoPortMapDmaMemory @ stdcall VideoPortMapMemory(ptr long long ptr ptr ptr) @ stdcall VideoPortMoveMemory(ptr ptr long) NTOSKRNL.RtlMoveMemory +;VideoPortNotification @ stdcall VideoPortPutDmaAdapter(ptr ptr) @ stdcall VideoPortQueryPerformanceCounter(ptr ptr) @ stdcall VideoPortQueryServices(ptr long ptr) @ stdcall VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime @ stdcall VideoPortQueueDpc(ptr ptr ptr) +@ stdcall VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT @ stdcall VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG @ stdcall VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT @ stdcall VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG @ stdcall VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG ;VideoPortReadStateEvent @ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) @ stdcall VideoPortReleaseBuffer(ptr ptr) @@ -97,18 +104,18 @@ @ stdcall VideoPortUnmapMemory(ptr ptr ptr) @ stdcall VideoPortVerifyAccessRanges(ptr long ptr) @ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) +@ stdcall VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT @ stdcall VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG @ stdcall VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT @ stdcall VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG @ stdcall VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG -@ stdcall VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory -@ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall VpNotifyEaData(ptr ptr)

16 years, 2 months

[mjmartin] 37020: - Add missing goto done in NpfsRead when setting Status as STATUS_PENDING. Fixes bug #3115 and duplicates.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Oct 27 08:51:20 2008 New Revision: 37020 URL: http://svn.reactos.org/svn/reactos?rev=37020&view=rev Log: - Add missing goto done in NpfsRead when setting Status as STATUS_PENDING. Fixes bug #3115 and duplicates. Modified: trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Mon Oct 27 08:51:20 2008 @@ -450,6 +450,7 @@ if (NT_SUCCESS(Status)) { Status = STATUS_PENDING; + goto done; } ExAcquireFastMutex(&Ccb->DataListLock); break;

16 years, 2 months

[tkreuzer] 37019: On x64 the 64 bit ring3 teb (gs) shares the generic 64 bit data selector, while the 32 bit teb (fs) has it's own selector.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 27 08:00:44 2008 New Revision: 37019 URL: http://svn.reactos.org/svn/reactos?rev=37019&view=rev Log: On x64 the 64 bit ring3 teb (gs) shares the generic 64 bit data selector, while the 32 bit teb (fs) has it's own selector. Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Mon Oct 27 08:00:44 2008 @@ -386,12 +386,12 @@ /* The other registers are undefined */ /* Setup the Segments */ - Context->SegFs = KGDT_64_R3_TEB | RPL_MASK; + Context->SegGs = KGDT_64_DATA | RPL_MASK; Context->SegEs = KGDT_64_DATA | RPL_MASK; Context->SegDs = KGDT_64_DATA | RPL_MASK; Context->SegCs = KGDT_64_R3_CODE | RPL_MASK; Context->SegSs = KGDT_64_DATA | RPL_MASK; - Context->SegGs = 0; + Context->SegFs = KGDT_32_R3_TEB; /* Set the EFLAGS */ Context->EFlags = 0x3000; /* IOPL 3 */

16 years, 2 months

[cwittich] 37018: use ExFreePoolWithTag

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 27 06:16:31 2008 New Revision: 37018 URL: http://svn.reactos.org/svn/reactos?rev=37018&view=rev Log: use ExFreePoolWithTag Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Mon Oct 27 06:16:31 2008 @@ -1730,7 +1730,7 @@ /* set icon bits */ IntSetBitmapBits(BitmapObj, bm.bmWidthBytes * abs(bm.bmHeight), pBits); - ExFreePool(pBits); + ExFreePoolWithTag(pBits, TAG_BITMAP); BITMAPOBJ_UnlockBitmap(BitmapObj);

16 years, 2 months

[cwittich] 37017: sync Shell_NotifyIconW with wine 1.1.7

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 27 04:49:27 2008 New Revision: 37017 URL: http://svn.reactos.org/svn/reactos?rev=37017&view=rev Log: sync Shell_NotifyIconW with wine 1.1.7 Modified: trunk/reactos/dll/win32/shell32/systray.c Modified: trunk/reactos/dll/win32/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/systray.… ============================================================================== --- trunk/reactos/dll/win32/shell32/systray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/systray.c [iso-8859-1] Mon Oct 27 04:49:27 2008 @@ -104,6 +104,7 @@ HWND tray; COPYDATASTRUCT cds; char *buffer = NULL; + BOOL ret; TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); @@ -169,7 +170,11 @@ GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer); buffer += cbMaskBits; GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); - buffer += cbColourBits; + + /* Reset pointer to allocated block so it can be freed later. + * Note that cds.lpData cannot be passed to HeapFree since it + * points to nid when no icon info is found. */ + buffer = cds.lpData; DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor); @@ -181,11 +186,11 @@ cds.lpData = nid; } - SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); + ret = SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); /* FIXME: if statement only needed because we don't support interprocess * icon handles */ HeapFree(GetProcessHeap(), 0, buffer); - return TRUE; + return ret; }

16 years, 2 months

[dreimer] 37016: Sync winefile and write to wine Head.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Oct 27 03:29:08 2008 New Revision: 37016 URL: http://svn.reactos.org/svn/reactos?rev=37016&view=rev Log: Sync winefile and write to wine Head. Added: trunk/rosapps/applications/write/lang/pt-BR.rc (with props) Modified: trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/rsrc.rc trunk/rosapps/applications/write/write.c Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Mon Oct 27 03:29:08 2008 @@ -1088,7 +1088,7 @@ memset(&entry->data, 0, sizeof(WIN32_FIND_DATA)); entry->bhfi_valid = FALSE; - attribs = ~SFGAO_FILESYSTEM; /*SFGAO_HASSUBFOLDER|SFGAO_FOLDER; SFGAO_FILESYSTEM sorgt dafür, daß "My Documents" anstatt von "Martin's Documents" angezeigt wird */ + attribs = ~SFGAO_FILESYSTEM; /*SFGAO_HASSUBFOLDER|SFGAO_FOLDER; SFGAO_FILESYSTEM sorgt dafÃ¼r, daÃ "My Documents" anstatt von "Martin's Documents" angezeigt wird */ hr = IShellFolder_GetAttributesOf(folder, 1, (LPCITEMIDLIST*)&pidls[n], &attribs); Added: trunk/rosapps/applications/write/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/pt… ============================================================================== --- trunk/rosapps/applications/write/lang/pt-BR.rc (added) +++ trunk/rosapps/applications/write/lang/pt-BR.rc [iso-8859-1] Mon Oct 27 03:29:08 2008 @@ -1,0 +1,26 @@ +/* + * Portuguese language support + * + * Copyright (C) 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Falhou ao iniciar o Wordpad" +} Propchange: trunk/rosapps/applications/write/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/rsrc.rc… ============================================================================== --- trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/rsrc.rc [iso-8859-1] Mon Oct 27 03:29:08 2008 @@ -32,6 +32,7 @@ #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" Modified: trunk/rosapps/applications/write/write.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/write.c… ============================================================================== --- trunk/rosapps/applications/write/write.c [iso-8859-1] (original) +++ trunk/rosapps/applications/write/write.c [iso-8859-1] Mon Oct 27 03:29:08 2008 @@ -45,6 +45,8 @@ if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) goto failed; + CloseHandle(info.hProcess); + CloseHandle(info.hThread); return 0; failed:

16 years, 2 months

[dreimer] 37015: Sync wordpad and xcopy with wine HEAD. Font resizeing seems to work

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Oct 27 03:23:54 2008 New Revision: 37015 URL: http://svn.reactos.org/svn/reactos?rev=37015&view=rev Log: Sync wordpad and xcopy with wine HEAD. Font resizeing seems to work Added: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc (with props) trunk/reactos/base/applications/wordpad/Pt.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c Added: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Portuguese language support + * + * Copyright (C) 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Número de parâmetros inválido - Use xcopy /? para ajuda\n" + STRING_INVPARM, "Parâmetro inválido '%s' - Use xcopy /? para ajuda\n" + STRING_PAUSE, "Carregue <Enter> para iniciar cópia\n" + STRING_SIMCOPY, "%d ficheiro(s) seriam copiados\n" + STRING_COPY, "%d ficheiro(s) copiados\n" + STRING_QISDIR, "'%s' é um ficheiro ou directório\n" \ + "no alvo?\n" \ + "(F - Ficheiro, D - Directório)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"Reescrever %s? (Yes|No|All)\n" + STRING_COPYFAIL, "Cópia de '%s' para '%s' falhou com r/c %d\n" + STRING_OPENFAIL, "Falhou ao abrir '%s'\n" + STRING_READFAIL, "Falhou a ler '%s'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copia ficheiros ou directórios para um destino\n\ +\n\ +Sintaxe:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Onde:\n\ +\n\ +[/I] Assume directório se o destino não existe e está a copiar 2 ou\n\ +\tmais ficheiros\n\ +[/S] Copiar directórios e subdirectórios\n\ +[/E] Copiar directórios e subdirectórios, incluindo os vazios\n\ +[/Q] Não mostrar nomes durante a cópia, ie quiet.\n\ +[/F] Mostrar por completo os nomes de fonte e destino durante a cópia\n\ +[/L] Simular a operação, mostrando os nomes que seriam copiados\n\ +[/W] Alerta antes de iniciar a operação de cópia\n\ +[/T] Cria a estrutura de directórios mas não copia ficheiros\n\ +[/Y] Suprimir alertas quando reescreve ficheiros\n\ +[/-Y] Alertar quando reescreve ficheiros\n\ +[/P] Alertar antes de cada ficheiros ser copiado\n\ +[/N] Copiar usando nomes pequenos\n\ +[/U] Copiar apenas ficheiros que já existem no destino\n\ +[/R] Reescrever quaisquer ficheiros apenas de leitura\n\ +[/H] Incluir ficheiros ocultos e de sistema na cópia\n\ +[/C] Continuar mesmo que ocorra um erro durante a cópia\n\ +[/A] Copiar apenas ficheiros com atributo de arquivo\n\ +[/M] Copiar apenas ficheiros com atributo de arquivo, removendo\n\ +\to atributo de arquivo\n\ +[/D | /D:m-d-y] Copiar novos ficheiros ou os alterados após a data fornecida\n\ +\t\tSe nenhuma data for fornecida, apenas copiar se o destino for mais antigo\n\ +\t\tque a fonte\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -33,5 +33,6 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc" Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -59,19 +59,19 @@ MENUITEM "¹®ÀÚ Çü½Ä(&F)", ID_EDIT_CHARFORMAT MENUITEM "Á¤ÀÇµÈ ¹®ÀÚ¿ Çü½Ä(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "´Ü¶ô Çü½Ä(&H)", ID_EDIT_PARAFORMAT - MENUITEM "ÅØ½ºÆ® ¾ò±â(&G)", ID_EDIT_GETTEXT + MENUITEM "¹®ÀÚ¿ ¾ò±â(&G)", ID_EDIT_GETTEXT END END POPUP "º¸±â(&V)" BEGIN MENUITEM "µµ±¸¹Ù(&T)", ID_TOGGLE_TOOLBAR MENUITEM "Çü½Ä¹Ù(&F)", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "´«±Ý¹Ù(&R)", ID_TOGGLE_RULER MENUITEM "»óÅÂ¹Ù(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM " ¿É¼Ç(&O)...", ID_VIEWPROPERTIES END - POPUP "Áý¾î³Ö±â(&I)" + POPUP "»ðÀÔ(&I)" BEGIN MENUITEM "³¯Â¥¿Í ½Ã°£(&D)...", ID_DATETIME END @@ -89,7 +89,7 @@ END POPUP "µµ¿ò¸»(&H)" BEGIN - MENUITEM "¿öµåÆÐµå Á¤º¸(&A)" ID_ABOUT + MENUITEM "Wine ¿öµåÆÐµå Á¤º¸(&A)" ID_ABOUT END END @@ -237,4 +237,9 @@ "´ç½ÅÀº Á¤¸»·Î ÀúÀåÇÏ±â¸¦ ¿øÇÕ´Ï±î?" STRING_INVALID_NUMBER, "¿Ã¹Ù¸£Áö ¾ÊÀº ¼ö Çü½Ä" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE ÀúÀå ¹®¼´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù" -END + STRING_WRITE_FAILED, "ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù." + STRING_WRITE_ACCESS_DENIED, "ÆÄÀÏÀ» ÀúÀåÇÒ ±ÇÇÑÀÌ ¾ø½À´Ï´Ù." + STRING_OPEN_FAILED, "ÆÄÀÏÀ» ¿ ¼ö ¾ø½À´Ï´Ù." + STRING_OPEN_ACCESS_DENIED, "ÆÄÀÏÀ» ¿ ±ÇÇÑÀÌ ¾ø½À´Ï´Ù." + STRING_PRINTING_NOT_IMPLEMENTED, "ÀÎ¼â´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù" +END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -240,4 +240,5 @@ STRING_WRITE_ACCESS_DENIED, "Onvoldoende rechten om het bestand op te slaan." STRING_OPEN_FAILED, "Bestand kon niet geopend worden." STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." -END + STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd" +END Added: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pt.rc (added) +++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -1,0 +1,245 @@ +/* + * Portuguese Language File + * + * Copyright 2008 Ricardo Filipe + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Ficheiro" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Abrir...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Guardar\tCtrl+S", ID_FILE_SAVE + MENUITEM "Guardar &como...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Imprimir...\tCtrl+P", ID_PRINT + MENUITEM "&Pré visualizar...", ID_PREVIEW + MENUITEM "C&onfigurar página...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Sair", ID_FILE_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Anular\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Refazer\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Cortar\tCtrl+X", ID_EDIT_CUT + MENUITEM "C&opiar\tCtrl+C", ID_EDIT_COPY + MENUITEM "Col&ar\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Limpar\tDEL", ID_EDIT_CLEAR + MENUITEM "&Seleccionar tudo\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Local&izar...\tCrtl+F", ID_FIND + MENUITEM "&Encontrar Seguinte\tF3", ID_FIND_NEXT + MENUITEM "&Substituir...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Some&nte leitura", ID_EDIT_READONLY + MENUITEM "&Modificado", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtras" + BEGIN + MENUITEM "&Informação da selecção", ID_EDIT_SELECTIONINFO + MENUITEM "&Formato dos caracteres", ID_EDIT_CHARFORMAT + MENUITEM "&Definir formato dos caracteres", ID_EDIT_DEFCHARFORMAT + MENUITEM "F&ormato dos parágrafos", ID_EDIT_PARAFORMAT + MENUITEM "&Buscar texto", ID_EDIT_GETTEXT + END + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Ferramentas", ID_TOGGLE_TOOLBAR + MENUITEM "Barra de &Formatação", ID_TOGGLE_FORMATBAR + MENUITEM "&Régua", ID_TOGGLE_RULER + MENUITEM "Barra de &Estado", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opções...", ID_VIEWPROPERTIES + END + POPUP "&Inserir" + BEGIN + MENUITEM "&Data e hora...", ID_DATETIME + END + POPUP "F&ormato" + BEGIN + MENUITEM "&Tipo de Letra...", ID_FONTSETTINGS + MENUITEM "&Lista de marcas" ID_BULLET + MENUITEM "&Parágrafo..." ID_PARAFORMAT + MENUITEM "T&abulações..." ID_TABSTOPS + POPUP "&Fundo" + BEGIN + MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat amarelo\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&Sobre Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Cortar", ID_EDIT_CUT + MENUITEM "C&opiar", ID_EDIT_COPY + MENUITEM "Co&lar", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Lista de marcas" ID_BULLET + MENUITEM "&Parágrafo..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Data e hora" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Formatos Disponíveis",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Novo" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Novo tipo de documento",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Cancelar",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Parágrafo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Identação", 0, 10, 10, 120, 68 + LTEXT "Esquerda", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Direita", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "Primeira Linha", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Alinhamento", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulações" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Marca de tabulação", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 135, 15, 55, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 135, 33, 55, 15 + PUSHBUTTON "Remover &todos", ID_TAB_EMPTY, 135, 51, 55, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Moldar o texto", 0, 10, 10, 130, 85 + RADIOBUTTON "&Sem moldagem", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "&Moldar à janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Moldar pela &régua", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Barras de Ferramentas", 0, 150, 10, 120, 85 + CHECKBOX "&Barra de Ferramentas", IDC_PAGEFMT_TB, 160, 20, 90, 15 + CHECKBOX "Barra de &Formatação", IDC_PAGEFMT_FB, 160, 38, 90, 15 + CHECKBOX "&Régua", IDC_PAGEFMT_RU, 160, 56, 90, 15 + CHECKBOX "Barra de &Estado", IDC_PAGEFMT_SB, 160, 74, 90, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_TEXT_FILES_TXT, "Documentos de texto (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Documentos de texto Unicode (*.txt)" + STRING_ALL_FILES, "Todos os documentos (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Esquerda" + STRING_ALIGN_RIGHT, "Direita" + STRING_ALIGN_CENTER, "Centro" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Rich text document" + STRING_NEWFILE_TXT, "Documento de texto" + STRING_NEWFILE_TXT_UNICODE, "Documento de texto Unicode" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Ficheiros de impressora (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opções" + STRING_VIEWPROPS_TEXT, "Texto" + STRING_VIEWPROPS_RICHTEXT, "Rich text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Imprimir" + STRING_PREVIEW_NEXTPAGE, "Próxima página" + STRING_PREVIEW_PREVPAGE, "Página anterior" + STRING_PREVIEW_TWOPAGES, "Duas páginas" + STRING_PREVIEW_ONEPAGE, "Uma página" + STRING_PREVIEW_CLOSE, "Fechar" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Documento" + STRING_PROMPT_SAVE_CHANGES, "Guardar alterações a '%s'?" + STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." + STRING_LOAD_RICHED_FAILED, "Falhou o carregamento da biblioteca RichEdit." + STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, " \ + "o que vai anular todas as formatações. " \ + "Tem a certeza que quer fazer isto?" + STRING_INVALID_NUMBER, "Formato de número inválido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados" + STRING_WRITE_FAILED, "Não foi possível guardar o ficheiro." + STRING_WRITE_ACCESS_DENIED, "Não tem permissões para guardar o ficheiro." + STRING_OPEN_FAILED, "Não foi possível abrir o ficheiro." + STRING_OPEN_ACCESS_DENIED, "Não tem permissões para abrir o ficheiro." + STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada" +END Propchange: trunk/reactos/base/applications/wordpad/Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -78,7 +78,7 @@ void registry_set_options(HWND hMainWnd) { - HKEY hKey; + HKEY hKey = 0; DWORD action; if(registry_get_handle(&hKey, &action, key_options) == ERROR_SUCCESS) @@ -101,7 +101,7 @@ void registry_read_winrect(RECT* rc) { - HKEY hKey; + HKEY hKey = 0; DWORD size = sizeof(RECT); if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || @@ -119,7 +119,7 @@ void registry_read_maximized(DWORD *bMaximized) { - HKEY hKey; + HKEY hKey = 0; DWORD size = sizeof(DWORD); if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || @@ -318,8 +318,8 @@ (lstrlenW(pFiles[i])+1)*sizeof(WCHAR)); } } - } - RegCloseKey(hKey); + RegCloseKey(hKey); + } registry_read_filelist(hMainWnd); } @@ -335,9 +335,10 @@ if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS) registry_read_pagemargins(NULL); else + { registry_read_pagemargins(hKey); - - RegCloseKey(hKey); + RegCloseKey(hKey); + } } static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[]) Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -74,6 +74,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc" #include "Tr.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Mon Oct 27 03:23:54 2008 @@ -116,6 +116,25 @@ LoadStringW(hInstance, STRING_UNITS_CM, units_cmW, MAX_STRING_LEN); } +/* Show a message box with resource strings */ +static int MessageBoxWithResStringW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType) +{ + MSGBOXPARAMSW params; + + params.cbSize = sizeof(params); + params.hwndOwner = hWnd; + params.hInstance = GetModuleHandleW(0); + params.lpszText = lpText; + params.lpszCaption = lpCaption; + params.dwStyle = uType; + params.lpszIcon = NULL; + params.dwContextHelpId = 0; + params.lpfnMsgBoxCallback = NULL; + params.dwLanguageId = 0; + return MessageBoxIndirectW(&params); +} + + static void AddButton(HWND hwndToolBar, int nImage, int nCommand) { TBBUTTON button; @@ -289,7 +308,7 @@ } else { SetWindowTextW(hwndSizeList, sizeBuffer); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } } @@ -747,8 +766,8 @@ else if (!memcmp(STG_magic, fileStart, sizeof(STG_magic))) { CloseHandle(hFile); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), wszAppTitle, - MB_OK | MB_ICONEXCLAMATION); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_OLE_STORAGE_NOT_SUPPORTED), + wszAppTitle, MB_OK | MB_ICONEXCLAMATION); return; } } @@ -863,7 +882,7 @@ { if(fileformat_flags(sfn.nFilterIndex-1) != SF_RTF) { - if(MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), + if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) { continue; @@ -1161,7 +1180,7 @@ } if (opt_print) - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1239,7 +1258,7 @@ if(ret == -1) { pFr->lCustData = -1; - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SEARCH_FINISHED), wszAppTitle, MB_OK | MB_ICONASTERISK); } else { @@ -1503,7 +1522,7 @@ if(ret != 3) { - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONASTERISK); return FALSE; } else @@ -1615,7 +1634,7 @@ if(!number_from_string(buffer, &number, TRUE)) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); } else { @@ -1817,7 +1836,7 @@ hDLL = LoadLibraryW(wszRichEditDll); if(!hDLL) { - MessageBoxW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, + MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_LOAD_RICHED_FAILED), wszAppTitle, MB_OK | MB_ICONEXCLAMATION); PostQuitMessage(1); }

16 years, 2 months

[cwittich] 37014: sync riched20 with wine 1.1.7

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 27 03:10:25 2008 New Revision: 37014 URL: http://svn.reactos.org/svn/reactos?rev=37014&view=rev Log: sync riched20 with wine 1.1.7 Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/table.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -101,6 +101,7 @@ - EM_SETIMEOPTIONS 1.0asian - EM_SETLANGOPTIONS 2.0 - EM_SETLIMITTEXT + - EM_SETMARGINS + EM_SETMODIFY (not sure if implementation is correct) - EM_SETOLECALLBACK + EM_SETOPTIONS (partially implemented) @@ -1937,6 +1938,93 @@ return -1; } +typedef struct tagME_GlobalDestStruct +{ + HGLOBAL hData; + int nLength; +} ME_GlobalDestStruct; + +static DWORD CALLBACK ME_ReadFromHGLOBALUnicode(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + WORD *pSrc, *pDest; + + cb = cb >> 1; + pDest = (WORD *)lpBuff; + pSrc = (WORD *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = 2*i; + GlobalUnlock(pData->hData); + return 0; +} + +static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) +{ + ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; + int i; + BYTE *pSrc, *pDest; + + pDest = lpBuff; + pSrc = (BYTE *)GlobalLock(pData->hData); + for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { + pDest[i] = pSrc[pData->nLength+i]; + } + pData->nLength += i; + *pcb = i; + GlobalUnlock(pData->hData); + return 0; +} + +static BOOL ME_Paste(ME_TextEditor *editor) +{ + DWORD dwFormat = 0; + EDITSTREAM es; + ME_GlobalDestStruct gds; + UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); + UINT cf = 0; + + if (IsClipboardFormatAvailable(nRTFFormat)) + cf = nRTFFormat, dwFormat = SF_RTF; + else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) + cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; + else + return FALSE; + + if (!OpenClipboard(editor->hWnd)) + return FALSE; + gds.hData = GetClipboardData(cf); + gds.nLength = 0; + es.dwCookie = (DWORD)&gds; + es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; + ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); + + CloseClipboard(); + return TRUE; +} + +static BOOL ME_Copy(ME_TextEditor *editor, CHARRANGE *range) +{ + LPDATAOBJECT dataObj = NULL; + HRESULT hr = S_OK; + + if (editor->cPasswordMask) + return FALSE; /* Copying or Cutting masked text isn't allowed */ + + if(editor->lpOleCallback) + hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, range, RECO_COPY, &dataObj); + if(FAILED(hr) || !dataObj) + hr = ME_GetDataObject(editor, range, &dataObj); + if(SUCCEEDED(hr)) { + hr = OleSetClipboard(dataObj); + IDataObject_Release(dataObj); + } + return SUCCEEDED(hr) != 0; +} + /* helper to send a msg filter notification */ static BOOL ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) @@ -2022,6 +2110,49 @@ ME_UpdateRepaint(editor); ME_SendRequestResize(editor, FALSE); return TRUE; + case 'A': + if (ctrl_is_down) + { + ME_SetSelection(editor, 0, -1); + return TRUE; + } + break; + case 'V': + if (ctrl_is_down) + return ME_Paste(editor); + break; + case 'C': + case 'X': + if (ctrl_is_down) + { + CHARRANGE range; + BOOL result; + + ME_GetSelection(editor, &range.cpMin, &range.cpMax); + result = ME_Copy(editor, &range); + if (result && nKey == 'X') + { + ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); + ME_CommitUndo(editor); + ME_UpdateRepaint(editor); + } + return result; + } + break; + case 'Z': + if (ctrl_is_down) + { + ME_Undo(editor); + return TRUE; + } + break; + case 'Y': + if (ctrl_is_down) + { + ME_Redo(editor); + return TRUE; + } + break; default: if (nKey != VK_SHIFT && nKey != VK_CONTROL && nKey && nKey != VK_MENU) @@ -2103,10 +2234,29 @@ POINT pt; BOOL isExact; int offset; + SCROLLBARINFO sbi; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos); + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_HSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(editor->hWnd, OBJID_VSCROLL, &sbi); + if (!(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)) && + PtInRect(&sbi.rcScrollBar, pt)) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } ScreenToClient(editor->hWnd, &pt); + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && (pt.x < editor->selofs || (editor->nSelectionType == stLine && GetCapture() == editor->hWnd))) @@ -2209,8 +2359,7 @@ ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->bRedraw = TRUE; - ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) ? FALSE : TRUE; + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -2250,48 +2399,6 @@ return ed; } - -typedef struct tagME_GlobalDestStruct -{ - HGLOBAL hData; - int nLength; -} ME_GlobalDestStruct; - -static DWORD CALLBACK ME_ReadFromHGLOBALUnicode(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) -{ - ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; - int i; - WORD *pSrc, *pDest; - - cb = cb >> 1; - pDest = (WORD *)lpBuff; - pSrc = (WORD *)GlobalLock(pData->hData); - for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { - pDest[i] = pSrc[pData->nLength+i]; - } - pData->nLength += i; - *pcb = 2*i; - GlobalUnlock(pData->hData); - return 0; -} - -static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG cb, LONG *pcb) -{ - ME_GlobalDestStruct *pData = (ME_GlobalDestStruct *)dwCookie; - int i; - BYTE *pSrc, *pDest; - - pDest = lpBuff; - pSrc = (BYTE *)GlobalLock(pData->hData); - for (i = 0; i<cb && pSrc[pData->nLength+i]; i++) { - pDest[i] = pSrc[pData->nLength+i]; - } - pData->nLength += i; - *pcb = i; - GlobalUnlock(pData->hData); - return 0; -} - void ME_DestroyEditor(ME_TextEditor *editor) { @@ -2530,6 +2637,7 @@ UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) + UNSUPPORTED_MSG(EM_SETMARGINS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) @@ -2741,8 +2849,9 @@ ME_GetSelection(editor, &from, &to); style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from, FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 1, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 1, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); @@ -2750,8 +2859,9 @@ } else { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor), FALSE); - if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 0, (char *)lParam); + if (pStruct->codepage != 1200 && lParam && + (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf}", 6))) + ME_StreamInRTFString(editor, 0, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); len = 1; @@ -2785,11 +2895,8 @@ editor->rgbBackColor = lParam; editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } - if (editor->bRedraw) - { - InvalidateRect(hWnd, NULL, TRUE); - UpdateWindow(hWnd); - } + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); return lColor; } case EM_GETMODIFY: @@ -3047,51 +3154,15 @@ return FALSE; } case WM_PASTE: - { - DWORD dwFormat = 0; - EDITSTREAM es; - ME_GlobalDestStruct gds; - UINT nRTFFormat = RegisterClipboardFormatA("Rich Text Format"); - UINT cf = 0; - - if (IsClipboardFormatAvailable(nRTFFormat)) - cf = nRTFFormat, dwFormat = SF_RTF; - else if (IsClipboardFormatAvailable(CF_UNICODETEXT)) - cf = CF_UNICODETEXT, dwFormat = SF_TEXT|SF_UNICODE; - else - return 0; - - if (!OpenClipboard(hWnd)) - return 0; - gds.hData = GetClipboardData(cf); - gds.nLength = 0; - es.dwCookie = (DWORD)&gds; - es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; - ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); - - CloseClipboard(); + ME_Paste(editor); return 0; - } case WM_CUT: case WM_COPY: { - LPDATAOBJECT dataObj = NULL; CHARRANGE range; - HRESULT hr = S_OK; - - if (editor->cPasswordMask) - return 0; /* Copying or Cutting masked text isn't allowed */ - ME_GetSelection(editor, &range.cpMin, &range.cpMax); - if(editor->lpOleCallback) - hr = IRichEditOleCallback_GetClipboardData(editor->lpOleCallback, &range, RECO_COPY, &dataObj); - if(FAILED(hr) || !dataObj) - hr = ME_GetDataObject(editor, &range, &dataObj); - if(SUCCEEDED(hr)) { - hr = OleSetClipboard(dataObj); - IDataObject_Release(dataObj); - } - if (SUCCEEDED(hr) && msg == WM_CUT) + + if (ME_Copy(editor, &range) && msg == WM_CUT) { ME_InternalDeleteText(editor, range.cpMin, range.cpMax-range.cpMin, FALSE); ME_CommitUndo(editor); @@ -3472,18 +3543,15 @@ if (wParam >= 0x40000) nCharOfs = lParam; nLength = ME_GetTextLength(editor); - - if (nCharOfs < nLength) { - ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); - assert(pRun->type == diRun); - pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); - pt.y += ME_GetParagraph(pRun)->member.para.pt.y; - } else { - pt.x = 0; - pt.y = editor->pBuffer->pLast->member.para.pt.y; - } + nCharOfs = min(nCharOfs, nLength); + + ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); + assert(pRun->type == diRun); + pt.y = pRun->member.run.pt.y; + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.y += ME_GetParagraph(pRun)->member.para.pt.y; pt.x += editor->selofs; + pt.x++; /* for some reason native offsets x by one */ si.cbSize = sizeof(si); si.fMask = SIF_POS; @@ -3581,7 +3649,6 @@ goto do_default; break; case WM_PAINT: - if (editor->bRedraw) { HDC hDC; PAINTSTRUCT ps; @@ -3604,14 +3671,11 @@ return 0; case WM_ERASEBKGND: { - if (editor->bRedraw) - { - HDC hDC = (HDC)wParam; - RECT rc; - if (GetUpdateRect(hWnd,&rc,TRUE)) - { - FillRect(hDC, &rc, editor->hbrBackground); - } + HDC hDC = (HDC)wParam; + RECT rc; + if (GetUpdateRect(hWnd,&rc,TRUE)) + { + FillRect(hDC, &rc, editor->hbrBackground); } return 1; } @@ -3642,36 +3706,11 @@ MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); } - switch (wstr) - { - case 1: /* Ctrl-A */ - ME_SetSelection(editor, 0, -1); - return 0; - case 3: /* Ctrl-C */ - SendMessageW(editor->hWnd, WM_COPY, 0, 0); - return 0; - } - if (GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_READONLY) { MessageBeep(MB_ICONERROR); return 0; /* FIXME really 0 ? */ } - switch (wstr) - { - case 22: /* Ctrl-V */ - SendMessageW(editor->hWnd, WM_PASTE, 0, 0); - return 0; - case 24: /* Ctrl-X */ - SendMessageW(editor->hWnd, WM_CUT, 0, 0); - return 0; - case 25: /* Ctrl-Y */ - SendMessageW(editor->hWnd, EM_REDO, 0, 0); - return 0; - case 26: /* Ctrl-Z */ - SendMessageW(editor->hWnd, EM_UNDO, 0, 0); - return 0; - } if (((unsigned)wstr)>=' ' || (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE)) || wstr=='\t') { @@ -3930,9 +3969,7 @@ ME_SendRequestResize(editor, TRUE); return 0; case WM_SETREDRAW: - if ((editor->bRedraw = wParam)) - ME_RewrapRepaint(editor); - return 0; + return DefWindowProcW(hWnd, msg, wParam, lParam); case WM_SIZE: { GetClientRect(hWnd, &editor->rcFormat); Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -351,7 +351,6 @@ ME_FontCacheItem pFontCache[HFONT_CACHE_SIZE]; int nZoomNumerator, nZoomDenominator; RECT rcFormat; - BOOL bRedraw; BOOL bWordWrap; int nInvalidOfs; int nTextLimit; @@ -401,7 +400,7 @@ int nAvailWidth; int nRow; POINT pt; - BOOL bOverflown; + BOOL bOverflown, bWordWrap; ME_DisplayItem *pRowStart; ME_DisplayItem *pLastSplittableRun; Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/paint.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -147,6 +147,8 @@ ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } + if (!IsWindowVisible(editor->hWnd)) + return; if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); UpdateWindow(editor->hWnd); @@ -159,7 +161,6 @@ BOOL wrappedParagraphs; wrappedParagraphs = ME_WrapMarkedParagraphs(editor); - if (!editor->bRedraw) return; if (wrappedParagraphs) ME_UpdateScrollBar(editor); @@ -185,12 +186,9 @@ * looks, but not content. Like resizing. */ ME_MarkAllForWrapping(editor); - if (editor->bRedraw) - { - ME_WrapMarkedParagraphs(editor); - ME_UpdateScrollBar(editor); - ME_Repaint(editor); - } + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); } int ME_twips2pointsX(ME_Context *c, int x) @@ -1074,17 +1072,14 @@ si.nPos = 0; } - nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw); + nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); editor->vert_si.nPos = nNewPos; nActualScroll = nOrigPos - nNewPos; - if (editor->bRedraw) - { - if (abs(nActualScroll) > editor->sizeWindow.cy) - InvalidateRect(editor->hWnd, NULL, TRUE); - else - ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); - ME_Repaint(editor); - } + if (abs(nActualScroll) > editor->sizeWindow.cy) + InvalidateRect(editor->hWnd, NULL, TRUE); + else + ScrollWindowEx(editor->hWnd, 0, nActualScroll, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ME_Repaint(editor); hWnd = editor->hWnd; winStyle = GetWindowLongW(hWnd, GWL_STYLE); @@ -1099,7 +1094,7 @@ } - void ME_UpdateScrollBar(ME_TextEditor *editor) +void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call SetScrolLInfo * with SIF_PAGE or SIF_RANGE. SetScrollPos and SetScrollRange should never Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/para.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -287,6 +287,7 @@ { ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); *tp->member.para.pFmt = *pNext->member.para.pFmt; + tp->member.para.border = pNext->member.para.border; } if (!editor->bEmulateVersion10) { /* v4.1 */ Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -109,7 +109,7 @@ if (stream->dwSize == 0) return EOF; } - ch = stream->buffer[stream->dwUsed++]; + ch = (unsigned char)stream->buffer[stream->dwUsed++]; if (!ch) return EOF; return ch; Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… ============================================================================== --- trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/string.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -304,6 +304,8 @@ /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); + /* convert number of bytes to number of characters. */ + len /= sizeof(WCHAR); switch (code) { case WB_ISDELIMITER: @@ -330,11 +332,23 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code) { - /* FIXME: ANSIfy the string when bEmulateVersion10 is TRUE */ - if (!editor->pfnWordBreak) - return ME_WordBreakProc(str->szData, start, str->nLen, code); - else - return editor->pfnWordBreak(str->szData, start, str->nLen, code); + if (!editor->pfnWordBreak) { + return ME_WordBreakProc(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else if (!editor->bEmulateVersion10) { + /* MSDN lied about the third parameter for EditWordBreakProc being the number + * of characters, it is actually the number of bytes of the string. */ + return editor->pfnWordBreak(str->szData, start, str->nLen*sizeof(WCHAR), code); + } else { + int result; + int buffer_size = WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + NULL, 0, NULL, NULL); + char *buffer = (char*)heap_alloc(buffer_size); + WideCharToMultiByte(CP_ACP, 0, str->szData, str->nLen, + buffer, buffer_size, NULL, NULL); + result = editor->pfnWordBreak(str->szData, start, str->nLen, code); + heap_free(buffer); + return result; + } } LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -392,9 +392,10 @@ assert(table_row); assert(table_row->type == diParagraph); if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *insertedCell, *para, *cell; + ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; cell = ME_FindItemFwd(ME_GetTableRowStart(table_row), diCell); - run = ME_GetTableRowEnd(table_row)->member.para.next_para; + prevTableEnd = ME_GetTableRowEnd(table_row); + run = prevTableEnd->member.para.next_para; run = ME_FindItemFwd(run, diRun); editor->pCursors[0].pRun = run; editor->pCursors[0].nOffset = 0; @@ -412,7 +413,8 @@ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - ME_InsertTableRowEndFromCursor(editor); + para = ME_InsertTableRowEndFromCursor(editor); + *para->member.para.pFmt = *prevTableEnd->member.para.pFmt; /* return the table row start for the inserted paragraph */ return ME_FindItemFwd(cell, diParagraph)->member.para.next_para; } else { /* v1.0 - 3.0 */ Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -57,6 +57,7 @@ ITextHost *pMyHost; LONG ref; CRITICAL_SECTION csTxtSrv; + char spare[256]; } ITextServicesImpl; static const ITextServicesVtbl textservices_Vtbl; Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/undo.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -96,6 +96,7 @@ pItem->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); pItem->member.para.pFmt->dwMask = 0; *pItem->member.para.pFmt = *pdi->member.para.pFmt; + pItem->member.para.border = pdi->member.para.border; pItem->member.para.nFlags = prev_para->member.para.nFlags & ~MEPF_CELL; pItem->member.para.pCell = NULL; break; @@ -293,6 +294,7 @@ para = ME_FindItemBack(tmp.pRun, diParagraph); ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); *para->member.para.pFmt = *pItem->member.para.pFmt; + para->member.para.border = pItem->member.para.border; break; } case diUndoSetCharFormat: @@ -343,12 +345,14 @@ new_para->member.para.nFlags |= MEPF_ROWSTART; assert(pItem->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); *new_para->member.para.pFmt = *pItem->member.para.pFmt; + new_para->member.para.border = pItem->member.para.border; if (pItem->member.para.pCell) { ME_DisplayItem *pItemCell, *pCell; pItemCell = pItem->member.para.pCell; pCell = new_para->member.para.pCell; pCell->member.cell.nRightBoundary = pItemCell->member.cell.nRightBoundary; + pCell->member.cell.border = pItemCell->member.cell.border; } break; } Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -50,8 +50,10 @@ wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; + wc->bWordWrap = wc->context->editor->bWordWrap; if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) { wc->nAvailWidth = 0; + wc->bWordWrap = FALSE; if (para->member.para.nFlags & MEPF_ROWEND) { ME_Cell *cell = &ME_FindItemBack(para, diCell)->member.cell; @@ -73,11 +75,11 @@ wc->nAvailWidth = cell->nWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } else if (wc->context->editor->bWordWrap) { + wc->bWordWrap = TRUE; + } else { wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; - } else { - wc->nAvailWidth = ~0u >> 1; + - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin + - wc->context->editor->selofs; } wc->pt.x = wc->context->pt.x; if (wc->context->editor->bEmulateVersion10 && /* v1.0 - 3.0 */ @@ -148,9 +150,9 @@ assert(para->member.para.pFmt->dwMask & PFM_ALIGNMENT); align = para->member.para.pFmt->wAlignment; if (align == PFA_CENTER) - shift = (wc->nAvailWidth-width)/2; + shift = max((wc->nAvailWidth-width)/2, 0); if (align == PFA_RIGHT) - shift = wc->nAvailWidth-width; + shift = max(wc->nAvailWidth-width, 0); for (p = wc->pRowStart; p!=pEnd; p = p->next) { if (p->type==diRun) { /* FIXME add more run types */ @@ -377,7 +379,8 @@ } /* will current run fit? */ - if (wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) + if (wc->bWordWrap && + wc->pt.x + run->nWidth - wc->context->pt.x > wc->nAvailWidth) { int loc = wc->context->pt.x + wc->nAvailWidth - wc->pt.x; /* total white run ? */ @@ -416,9 +419,11 @@ { if (run->nFlags & MERF_STARTWHITE) { - /* we had only spaces so far, so we must be on the first line of the - * paragraph, since no other lines of the paragraph start with spaces. */ - assert(!wc->nRow); + /* We had only spaces so far, so we must be on the first line of the + * paragraph (or the first line after MERF_ENDROW forced the line + * break within the paragraph), since no other lines of the paragraph + * start with spaces. */ + /* The lines will only contain spaces, and the rest of the run will * overflow onto the next line. */ wc->bOverflown = TRUE; @@ -730,30 +735,31 @@ return bModified; } -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { +void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) +{ ME_Context c; + RECT rc; + int ofs; + ME_DisplayItem *item; ME_InitContext(&c, editor, GetDC(editor->hWnd)); - if (editor->bRedraw) - { - RECT rc = c.rcView; - int ofs = ME_GetYScrollPos(editor); - - ME_DisplayItem *item = editor->pBuffer->pFirst; - while(item != editor->pBuffer->pLast) { - if (item->member.para.nFlags & MEPF_REPAINT) { - rc.top = item->member.para.pt.y - ofs; - rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; - InvalidateRect(editor->hWnd, &rc, TRUE); - } - item = item->member.para.next_para; - } - if (editor->nTotalLength < editor->nLastTotalLength) - { - rc.top = editor->nTotalLength - ofs; - rc.bottom = editor->nLastTotalLength - ofs; + rc = c.rcView; + ofs = ME_GetYScrollPos(editor); + + item = editor->pBuffer->pFirst; + while(item != editor->pBuffer->pLast) { + if (item->member.para.nFlags & MEPF_REPAINT) { + rc.top = item->member.para.pt.y - ofs; + rc.bottom = item->member.para.pt.y + item->member.para.nHeight - ofs; InvalidateRect(editor->hWnd, &rc, TRUE); } + item = item->member.para.next_para; + } + if (editor->nTotalLength < editor->nLastTotalLength) + { + rc.top = editor->nTotalLength - ofs; + rc.bottom = editor->nLastTotalLength - ofs; + InvalidateRect(editor->hWnd, &rc, TRUE); } ME_DestroyContext(&c, editor->hWnd); } Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Mon Oct 27 03:10:25 2008 @@ -196,11 +196,14 @@ static BOOL -ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, const ME_DisplayItem *pLastRun) +ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, + ME_DisplayItem *pLastRun) { ME_DisplayItem *item = pFirstRun; ME_FontTableItem *table = pStream->fonttbl; int i; + ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); + ME_DisplayItem *pCell = NULL; do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; @@ -214,7 +217,7 @@ if (table[i].bCharSet == bCharSet && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) break; - if (i == pStream->nFontTblLen) { + if (i == pStream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) { table[i].bCharSet = bCharSet; table[i].szFaceName = face; pStream->nFontTblLen++; @@ -226,7 +229,7 @@ for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; } @@ -236,7 +239,7 @@ for (i = 1; i < pStream->nColorTblLen; i++) if (pStream->colortbl[i] == crColor) break; - if (i == pStream->nColorTblLen) { + if (i == pStream->nColorTblLen && i < STREAMOUT_COLORTBL_SIZE) { pStream->colortbl[i] = crColor; pStream->nColorTblLen++; } @@ -245,6 +248,38 @@ if (item == pLastRun) break; item = ME_FindItemFwd(item, diRun); + } while (item); + item = ME_GetParagraph(pFirstRun); + do { + if (item->member.para.pCell && item->member.para.pCell) + { + pCell = item->member.para.pCell; + if (pCell) + { + ME_Border* borders[4] = { &pCell->member.cell.border.top, + &pCell->member.cell.border.left, + &pCell->member.cell.border.bottom, + &pCell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width > 0) + { + int j; + COLORREF crColor = borders[i]->colorRef; + for (j = 1; j < pStream->nColorTblLen; j++) + if (pStream->colortbl[j] == crColor) + break; + if (j == pStream->nColorTblLen && j < STREAMOUT_COLORTBL_SIZE) { + pStream->colortbl[j] = crColor; + pStream->nColorTblLen++; + } + } + } + } + } + if (item == pLastPara) + break; + item = item->member.para.next_para; } while (item); if (!ME_StreamOutPrint(pStream, "{\\fonttbl")) @@ -286,30 +321,78 @@ static BOOL ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, - const ME_DisplayItem *para) + ME_DisplayItem *para) { ME_DisplayItem *cell; char props[STREAMOUT_BUFFER_SIZE] = ""; + int i; + const char sideChar[4] = {'t','l','b','r'}; if (!ME_StreamOutPrint(pStream, "\\trowd")) return FALSE; if (!editor->bEmulateVersion10) { /* v4.1 */ - assert(para->member.para.nFlags & MEPF_ROWSTART); + PARAFORMAT2 *pFmt = ME_GetTableRowEnd(para)->member.para.pFmt; + para = ME_GetTableRowStart(para); cell = para->member.para.next_para->member.para.pCell; assert(cell); + if (pFmt->dxOffset) + sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); + if (pFmt->dxStartIndent) + sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); do { + ME_Border* borders[4] = { &cell->member.cell.border.top, + &cell->member.cell.border.left, + &cell->member.cell.border.bottom, + &cell->member.cell.border.right }; + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); cell = cell->member.cell.next_cell; } while (cell->member.cell.next_cell); } else { /* v1.0 - 3.0 */ + const ME_Border* borders[4] = { &para->member.para.border.top, + &para->member.para.border.left, + &para->member.para.border.bottom, + &para->member.para.border.right }; PARAFORMAT2 *pFmt = para->member.para.pFmt; - int i; assert(!(para->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); if (pFmt->dxOffset) sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); if (pFmt->dxStartIndent) sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); + for (i = 0; i < 4; i++) + { + if (borders[i]->width) + { + int j; + COLORREF crColor = borders[i]->colorRef; + sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); + sprintf(props + strlen(props), "\\brdrs"); + sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); + for (j = 1; j < pStream->nColorTblLen; j++) { + if (pStream->colortbl[j] == crColor) { + sprintf(props + strlen(props), "\\brdrcf%u", j); + break; + } + } + } + } for (i = 0; i < pFmt->cTabCount; i++) { sprintf(props + strlen(props), "\\cellx%d", pFmt->rgxTabs[i] & 0x00FFFFFF); @@ -727,7 +810,7 @@ } } else if (p->member.para.nFlags & MEPF_ROWEND) { pStream->nNestingLevel--; - if (pStream->nNestingLevel > 1) { + if (pStream->nNestingLevel >= 1) { if (!ME_StreamOutPrint(pStream, "{\\*\\nesttableprops")) return FALSE; if (!ME_StreamOutRTFTableProps(editor, pStream, p))

16 years, 2 months

[cwittich] 37013: set correct timezone in 2nd stage patch by hto See issue #3822 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 27 02:56:33 2008 New Revision: 37013 URL: http://svn.reactos.org/svn/reactos?rev=37013&view=rev Log: set correct timezone in 2nd stage patch by hto See issue #3822 for more details. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Oct 27 02:56:33 2008 @@ -1137,7 +1137,7 @@ LPTSTR Ptr; LPTSTR End; BOOL bFound = FALSE; - int iLanguageID; + unsigned long iLanguageID; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), @@ -1158,7 +1158,7 @@ return FALSE; } - iLanguageID = _ttoi(szLanguageIdString); + iLanguageID = _tcstoul(szLanguageIdString, NULL, 16); RegCloseKey(hKey); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -1205,7 +1205,7 @@ while (*Ptr != 0) { Length = _tcslen(Ptr); - if (_ttoi(Ptr) == iLanguageID) + if (_tcstoul(Ptr, NULL, 16) == iLanguageID) bFound = TRUE; Ptr = Ptr + Length + 1;

16 years, 2 months

[pschweitzer] 37012: FsRtlNotifyVolumeEvent: - IoReportTargetDeviceChangeAsynchronous is only called for mount event. For the rest, call IoReportTargetDeviceChange - Fixed a mistake in status return (even if it's not perfect, because of the FIXME)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Oct 27 02:34:02 2008 New Revision: 37012 URL: http://svn.reactos.org/svn/reactos?rev=37012&view=rev Log: FsRtlNotifyVolumeEvent: - IoReportTargetDeviceChangeAsynchronous is only called for mount event. For the rest, call IoReportTargetDeviceChange - Fixed a mistake in status return (even if it's not perfect, because of the FIXME) Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Mon Oct 27 02:34:02 2008 @@ -39,10 +39,11 @@ IN ULONG EventCode) { LPGUID Guid = NULL; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_INVALID_PARAMETER; PDEVICE_OBJECT DeviceObject = NULL; TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; + /* FIXME: We should call IoGetRelatedTargetDevice here */ DeviceObject = IoGetRelatedDeviceObject(FileObject); if (DeviceObject) { @@ -85,20 +86,26 @@ Guid = (LPGUID)&GUID_IO_VOLUME_UNLOCK; break; } - default: - { - Status = STATUS_INVALID_PARAMETER; - break; - } } if (Guid) { /* Copy GUID to notification structure and then report the change */ RtlCopyMemory(&(Notification.Event), Guid, sizeof(GUID)); - IoReportTargetDeviceChangeAsynchronous(DeviceObject, - &Notification, - NULL, - NULL); + + if (EventCode == FSRTL_VOLUME_MOUNT) + { + IoReportTargetDeviceChangeAsynchronous(DeviceObject, + &Notification, + NULL, + NULL); + } + else + { + IoReportTargetDeviceChange(DeviceObject, + &Notification); + } + + Status = STATUS_SUCCESS; } ObfDereferenceObject(DeviceObject); }

16 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008