Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[khornicek] 40286: - fix possible memory leak (patch from Mesa3D by Daniel Zimmermann)

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Mar 29 17:39:18 2009 New Revision: 40286 URL: http://svn.reactos.org/svn/reactos?rev=40286&view=rev Log: - fix possible memory leak (patch from Mesa3D by Daniel Zimmermann) Modified: trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc Modified: trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… ============================================================================== --- trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libnurbs/interface/bezierPatchMesh.cc [iso-8859-1] Sun Mar 29 17:39:18 2009 @@ -105,23 +105,22 @@ int dimension; int the_ustride; int the_vstride; - - bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh)); - assert(ret); - - ret->bpatch = NULL; - ret->bpatch_normal = NULL; - ret->bpatch_color = NULL; - ret->bpatch_texcoord = NULL; - + if(maptype == GL_MAP2_VERTEX_3) dimension = 3; else if (maptype==GL_MAP2_VERTEX_4) dimension = 4; else { fprintf(stderr, "error in inMap2f, maptype=%i is wrong, maptype,map is invalid\n", maptype); return NULL; } - + + bezierPatchMesh *ret = (bezierPatchMesh*) malloc(sizeof(bezierPatchMesh)); + assert(ret); + + ret->bpatch_normal = NULL; + ret->bpatch_color = NULL; + ret->bpatch_texcoord = NULL; ret->bpatch = bezierPatchMake(umin, vmin, umax, vmax, uorder, vorder, dimension); + /*copy the control points there*/ the_ustride = vorder * dimension; the_vstride = dimension;

15 years, 9 months

[fireball] 40285: - Synchronize debug messages output to the serial port. Now each line of a debug log is printed synchronously, as it is NT. In future, this should be converted to a generic spinlock for all registered KD handlers.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 29 17:15:03 2009 New Revision: 40285 URL: http://svn.reactos.org/svn/reactos?rev=40285&view=rev Log: - Synchronize debug messages output to the serial port. Now each line of a debug log is printed synchronously, as it is NT. In future, this should be converted to a generic spinlock for all registered KD handlers. Modified: trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=402… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sun Mar 29 17:15:03 2009 @@ -21,6 +21,7 @@ CHAR DebugBuffer[BufferSize]; ULONG CurrentPosition; WORK_QUEUE_ITEM KdpDebugLogQueue; +KSPIN_LOCK KdpSerialSpinLock; BOOLEAN ItemQueued; KD_PORT_INFORMATION SerialPortInfo = {DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0}; @@ -150,8 +151,27 @@ KdpSerialDebugPrint(LPSTR Message, ULONG Length) { + KIRQL OldIrql; PCHAR pch = (PCHAR) Message; + /* Acquire the printing spinlock without waiting at raised IRQL */ + while (TRUE) + { + /* Wait when the spinlock becomes available */ + while (!KeTestSpinLock(&KdpSerialSpinLock)); + + /* Spinlock was free, raise irql */ + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + + /* Try to get the spinlock */ + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpSerialSpinLock)) + break; + + /* Someone else got the spinlock, lower IRQL back */ + KeLowerIrql(OldIrql); + } + + /* Output the message */ while (*pch != 0) { if (*pch == '\n') @@ -161,6 +181,12 @@ KdPortPutByteEx(&SerialPortInfo, *pch); pch++; } + + /* Release spinlock */ + KiReleaseSpinLock(&KdpSerialSpinLock); + + /* Lower IRQL */ + KeLowerIrql(OldIrql); } VOID @@ -183,6 +209,9 @@ return; } KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress; + + /* Initialize spinlock */ + KeInitializeSpinLock(&KdpSerialSpinLock); /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);

15 years, 9 months

[fireball] 40284: - Implement KeTestSpinLock.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 29 16:57:58 2009 New Revision: 40284 URL: http://svn.reactos.org/svn/reactos?rev=40284&view=rev Log: - Implement KeTestSpinLock. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ke/spinlock.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Mar 29 16:57:58 2009 @@ -5791,6 +5791,13 @@ IN OUT PKSPIN_LOCK SpinLock ); +NTKERNELAPI +BOOLEAN +FASTCALL +KeTestSpinLock( + IN PKSPIN_LOCK SpinLock +); + #if defined (_X86_) NTKERNELAPI Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Sun Mar 29 16:57:58 2009 @@ -305,14 +305,24 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN FASTCALL KeTestSpinLock(IN PKSPIN_LOCK SpinLock) { - UNIMPLEMENTED; - return FALSE; + /* Test this spinlock */ + if (*SpinLock) + { + /* Spinlock is busy, yield execution */ + YieldProcessor(); + + /* Return busy flag */ + return FALSE; + } + + /* Spinlock appears to be free */ + return TRUE; } /* EOF */

15 years, 9 months

[khornicek] 40283: update Mesa3D to version 7.4

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Mar 29 16:45:34 2009 New Revision: 40283 URL: http://svn.reactos.org/svn/reactos?rev=40283&view=rev Log: update Mesa3D to version 7.4 Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/gl.h trunk/reactos/dll/3rdparty/mesa32/include/GL/gl_mangle.h trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/descrip.mms trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_clip.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_norm.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_xform.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi_getproc.c trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c trunk/reactos/dll/3rdparty/mesa32/src/main/config.h trunk/reactos/dll/3rdparty/mesa32/src/main/context.c trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.c trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c trunk/reactos/dll/3rdparty/mesa32/src/main/execmem.c trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c trunk/reactos/dll/3rdparty/mesa32/src/main/get.c trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c trunk/reactos/dll/3rdparty/mesa32/src/main/hash.c trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h trunk/reactos/dll/3rdparty/mesa32/src/main/state.c trunk/reactos/dll/3rdparty/mesa32/src/main/stencil.c trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.c trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.c trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c trunk/reactos/dll/3rdparty/mesa32/src/main/version.h trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_norm.c trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fragprog.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_draw.c trunk/reactos/dll/3rdparty/mesa32/src/x86/gen_matypes.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/gl_mangle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/glext.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/descrip.mms URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_norm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gldirect/gld_debug_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/mesa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glapi_getproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/glapi/glthread.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/gl… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/dlopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/execmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/framebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/imports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texformat_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/texstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/math/m_debug_norm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/ma… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_instruction.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/shader_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_codegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_emit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_vartable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sh… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_fragprog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/sw… Modified: trunk/reactos/dll/3rdparty/mesa32/src/tnl/t_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/tn… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/vb… Modified: trunk/reactos/dll/3rdparty/mesa32/src/x86/gen_matypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/x8…

15 years, 9 months

[dgorbachev] 40282: Shell32 translation patch from Tomoya Kitagawa, bug #4310.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 29 15:53:16 2009 New Revision: 40282 URL: http://svn.reactos.org/svn/reactos?rev=40282&view=rev Log: Shell32 translation patch from Tomoya Kitagawa, bug #4310. Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Mar 29 15:53:16 2009 @@ -13,7 +13,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT @@ -92,28 +92,28 @@ SHNEWBRSFORFOLDER_MSGBOX DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "tH_ÌQÆ" FONT 9, "MS UI Gothic" BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDD_FOLDER, 10, 152, 40, 12 + LTEXT "tH_:", IDD_FOLDER, 10, 152, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Vµ¢tH_Ìì¬(&M)", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "LZ", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END SHELL_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Message" -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP +CAPTION "bZ[W" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "Í¢(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "·×ÄÍ¢(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢¢¦(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "LZ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END @@ -125,14 +125,14 @@ BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "o[W " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "±ÌReactOSÌo[WÍÌûÉöF³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "Ú³êÄ¢é¨eÊ:", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 @@ -143,7 +143,7 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOSÍÌûXÉæÁÄà½ç³êÜµ½:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -163,432 +163,433 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "V[gJbg" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 64, 10 + LTEXT "ÎÛÌíÞ:", 14004, 8, 38, 64, 10 LTEXT "", 14005, 78, 38, 142, 10 - LTEXT "Target location:", 14006, 8, 58, 64, 10 + LTEXT "ÎÛÌê:", 14006, 8, 58, 64, 10 LTEXT "", 14007, 79, 58, 141, 10 - LTEXT "Target:", 14008, 8, 77, 45, 10 + LTEXT "ÎÛ:", 14008, 8, 77, 45, 10 EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL - LTEXT "&Start in:", 14010, 8, 96, 57, 10 + LTEXT "Às³(&S):", 14010, 8, 96, 57, 10 EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 115, 57, 10 + LTEXT "V[gJbgL[(&K):", 14014, 8, 115, 57, 10 EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT - LTEXT "Run:", 14016, 8, 134, 57, 10 + LTEXT "ÀsóÔ:", 14016, 8, 134, 57, 10 EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL - LTEXT "C&omment:", 14018, 8, 152, 57, 10 + LTEXT "Rg(&O):", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + PUSHBUTTON "ÎÛÌõ(&F)...", 14020, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "ACRÌÏX(&C)...", 14021, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "Ú×Ýè(&D)...", 14022, 159, 172, 70, 14, ES_LEFT END SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED +CAPTION "g£vpeB" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "±ÌV[gJbgÉgp·ég£vpeBðIðµÄ¾³¢B", -1, 5, 30, 210, 10 + CHECKBOX "ÙÈél¨Ø¾îñÅÀs·é", 14000, 25, 50, 150, 10 + LTEXT "±ÌIvVðgp·éÆ±ÌV[gJbgðÊÌ[U[ÆµÄÀsÅ«Ü·BÜ½A©ª©gÅÀs·éêAÂ³êÄ¢È¢vOÌ®©çRs[^Æf[^ðÛìÅ«Ü·B", -1, 50, 60, 175, 40 + CHECKBOX "ÊÌÌæÅÀs·é", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "~", 2, 120, 124, 50, 15, WS_VISIBLE END SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +CAPTION "SÊ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "Folder", 14005, 68, 35, 160, 10 - LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "t@CÌíÞ:", 14004, 8, 35, 50, 10 + LTEXT "tH_", 14005, 68, 35, 160, 10 + LTEXT "ê:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 315, 10 - LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "TCY:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "ûeTCY:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "ì¬ú:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 -END + AUTOCHECKBOX "ÇÝæèêp(&R)", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "Bµt@C(&H)", 14022, 126, 150, 50, 10 +END + SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "SÊ" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "File", 14005, 68, 35, 160, 10 - LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "t@CÌíÞ:", 14004, 8, 35, 50, 10 + LTEXT "t@C", 14005, 68, 35, 160, 10 + LTEXT "ÀsvO:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "Location:", 14008, 8, 72, 45, 10 + LTEXT "ê:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Size:", 14010, 8, 93, 45, 10 + LTEXT "TCY:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "ì¬ú:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Modified:", 14016, 8, 140, 45, 10 + LTEXT "ÏXú:", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Accessed:", 14018, 8, 160, 45, 10 + LTEXT "ANZXú:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 189, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 189, 67, 10 - CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 - CHECKBOX "&Archive", 14023, 181, 189, 49, 10 + LTEXT "®«:", 14020, 8, 189, 45, 10 + CHECKBOX "ÇÝæèêp(&R)", 14021, 58, 189, 67, 10 + CHECKBOX "Bµt@C(&H)", 14022, 126, 189, 50, 10 + CHECKBOX "A[JCu(&A)", 14023, 181, 189, 49, 10 END SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - LTEXT "File version: ", 14000, 10, 10, 55, 10 +CAPTION "o[W" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "t@Co[W: ", 14000, 10, 10, 55, 10 LTEXT "", 14001, 77, 10, 152, 10 - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "à¾: ", 14002, 10, 27, 45, 10 LTEXT "", 14003, 77, 27, 152, 10 - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "ì : ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 - LTEXT "Item name: ", 14007, 13, 82, 50, 10 - LTEXT "Value: ", 14008, 112, 82, 45, 10 + GROUPBOX "»Ì¼Ìo[Wîñ: ", 14006, 6, 70, 222, 115 + LTEXT "Ú¼: ", 14007, 13, 82, 50, 10 + LTEXT "l: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "SÊ" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "íÞ:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "t@CVXe:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "gpÌæ:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "ó«Ìæ:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "eÊ:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "Drive %s", 14010, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED + LTEXT "hCu %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "fBXNÌN[Abv", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "hCuð³kµÄfBXNÌæðmÛ·é", 14012, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "±ÌfBXNÉCfbNXðt¯Ät@Cõð¬·éB", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP - GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 - LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP - GROUPBOX "Backup", -1, 5, 130, 230, 60 - LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 - PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +CAPTION "c[" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "G[`FbN", -1, 5, 5, 230, 60 + LTEXT "±ÌIvVÍ{[G[ð`FbNµÜ·B", -1, 40, 25, 160, 20 + PUSHBUTTON "·®É`FbN...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "ÅK»", -1, 5, 65, 230, 60 + LTEXT "±ÌIvVÍ±Ì{[Ìt@CðÅK»µÜ·", -1, 40, 85, 160, 20 + PUSHBUTTON "·®ÉÅK»...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "obNAbv", -1, 5, 130, 230, 60 + LTEXT "±ÌIvVÍ±Ì{[Ìt@CðobNAbvµÜ·B", -1, 40, 150, 160, 20 + PUSHBUTTON "·®ÉobNAbv...", 14002, 130, 170, 90, 15, WS_TABSTOP END DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" +CAPTION "n[hEFA" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN END RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 - CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 - LTEXT "User name:", -1, 20, 118, 54, 10 +CAPTION "ÊÌ[U[ÆµÄÀs" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "±ÌvOðÀs·é[U[AJEgðIðµÄ¾³¢", -1, 10, 20, 220, 20 + CHECKBOX "»ÝÌ[U[ (%s)", 14000, 10, 45, 150, 10 + LTEXT "Â³êÄ¢È¢vOÌ®©çRs[^Æf[^ðÛì·é", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "±ÌIvVÍRs[^âÂlf[^ÉëQðà½ç·Rs[^ECXð¢RÉh~·é±ÆªÅ«Ü·B½¾µA±ÌIvVðIð·éÆvOª³íÉ@\\µÈÈéÂ\\«ª èÜ·B", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Ì[U[:", 14002, 10, 100, 90, 10 + LTEXT "[U[¼:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Password:", -1, 20, 143, 53, 10 + LTEXT "pX[h:", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP - PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "LZ", 14008, 122, 170, 60, 14, WS_TABSTOP END BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "²Ý ÌvpeB" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP + GROUPBOX "Ið³ê½êÌÝè", -1, 10, 72, 220, 70 + RADIOBUTTON "JX^TCY(&C):", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + LTEXT "ÅåTCY(MB)(&A):", -1, 20, 105, 70, 10 + RADIOBUTTON "t@Cð²Ý ÉÚ®¹¸É·®Éí·éB(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP + AUTOCHECKBOX "íÌmF_CAOð\\¦·é(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Open With" +CAPTION "JvO" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 10 - GROUPBOX "&Programs", -1, 7, 42, 249, 187 + LTEXT "±Ìt@CðJ½ßÉgp·évOðIðµÄ¾³¢:", -1, 44, 12, 211, 10 + LTEXT "t@C: ", 14001, 44, 25, 188, 10 + GROUPBOX "vOÌê(&P)", -1, 7, 42, 249, 187 LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + AUTOCHECKBOX "±ÌíÞÌt@CðJÆ«ÍAíÉIðµ½vOðgp·é(&A)", 14003, 20, 193, 225, 10 + PUSHBUTTON "QÆ(&B)...", 14004, 198, 207, 50, 14 PUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + PUSHBUTTON "LZ", 14006, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN - GROUPBOX "Tasks", -1, 7, 10, 249, 45 +CAPTION "SÊ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "^XN", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Use ReactOS class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP - GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP + AUTORADIOBUTTON "tH_É¤ÊÌ^XNð\\¦·é(&F)", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ReactOS NVbN tH_ðgp·é(&I)", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP + GROUPBOX "tH_ÌQÆ", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Open each folder in its own &window", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP - GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 + AUTORADIOBUTTON "¯¶EBhEÅtH_ðJ(&M)", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "tH_²ÆÉÙÈéEBhEÅJ(&W)", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP + GROUPBOX "ÚÌNbNû@", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Single-click to open an item (point to select)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles only when I &point at them", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "VONbNÅÚðJ(|CgÅIð) (&S)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "uEUÉí¹ÄACR^CgÉºüðø(&B)", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "|Cgµ½Æ«ÌÝACR^CgÉºüðø(&P)", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "_uNbNÅÚðJ(VONbNÅIð)(&D)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP + PUSHBUTTON "ftHgÉß·(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP END FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "View" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN -GROUPBOX "Folder views", -1, 7, 10, 249, 60 +CAPTION "\\¦" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN +GROUPBOX "tH_Ì\\¦û@", -1, 7, 10, 249, 60 //ICON -LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20 -PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP -LTEXT "Advanced settings:", -1, 7, 80, 100, 10 +LTEXT "±ÌtH_ÉgpµÄ¢é\\¦û@(Ú×\\¦âÀ×Ä\\¦ÈÇ)\nð·×ÄÌtH_ÉKpÅ«Ü·B", -1, 60, 20, 180, 20 +PUSHBUTTON "·×ÄÌtH_ÉKp(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "·×ÄÌtH_ðZbg(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP +LTEXT "Ú×Ýè:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "ftHgÉß·(&D)", 14004, 180, 210, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "File Types" -FONT 9, "MS UI Gothic", 0, 0, 0x0 -BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +CAPTION "t@CÌíÞ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN +LTEXT "o^³êÄ¢ét@CÌíÞ(&T):", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 -LTEXT "Opens with:", -1, 12, 140, 40, 10 +PUSHBUTTON "VK(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "í(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "g£q '%s' ÌÚ×", 14003, 7, 130, 249, 70 +LTEXT "JvO:", -1, 12, 140, 40, 10 //ICON -LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 -PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP +LTEXT "Av¼", 14005, 100, 140, 40, 10 +PUSHBUTTON "ÏX(&C)...", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B\n'%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ\nÚ×ÝèðNbNµÄ¾³¢B", 14007, 12, 155, 160, 30 +PUSHBUTTON "Ú×Ýè(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 - PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 +CAPTION "t@CÌu«·¦ÌmF" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "Í¢(&Y)", IDYES, 20, 122, 60, 14 + PUSHBUTTON "·×ÄÍ¢(&A)", 12807, 85, 122, 60, 14 + PUSHBUTTON "¢¢¦(&N)", IDNO, 150, 122, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "±ÌtH_ÉÍùÉt@C'%2'ª¶ÝµÜ·B", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "±ÌtH_ÉÍùÉÇÝæèêpt@C'%2'ª¶ÝµÜ·B", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "±ÌtH_ÉÍùÉVXet@C'%2'ª¶ÝµÜ·B", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "ù¶Ìt@C", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "(útÆTCYs¾)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL - LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "Æ±Ìt@Cðu«·¦Äàæëµ¢Å·©?", -1, 44, 75, 228, 10, SS_NOPREFIX + LTEXT "(útÆTCYs¾)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END LOGOFF_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Log Off ReactOS" +CAPTION "ReactOSÌOIt" FONT 9, "MS UI Gothic" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + LTEXT "OItµÄàæëµ¢Å·©?", -1, 43, 11, 140, 22 + DEFPUSHBUTTON "OIt(&L)", IDOK, 57, 40, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 122, 40, 60, 14 END DISCONNECT_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Disconnect ReactOS" +CAPTION "ReactOSÌØf" FONT 9, "MS UI Gothic" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 - DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + LTEXT "ØfµÄàæëµ¢Å·©?", -1, 49, 12, 137, 23 + DEFPUSHBUTTON "Øf(&D)", IDOK, 57, 40, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 123, 40, 60, 14 END AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "AutoPlay" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 +CAPTION "©®Ä¶" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "RecÌíÞðIñÅA»ÌíÞª±ÌfoCXÅgp³êéÆ«ÉReactOSª©®IÉÀs·é®ìðIðµÄ¾³¢(&S):", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 - GROUPBOX "Actions", -1, 7, 45, 212, 146 - AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP + GROUPBOX "®ì", -1, 7, 45, 212, 146 + AUTORADIOBUTTON "Às·é®ìðIð(&P):", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 - AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10 - PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED + AUTORADIOBUTTON "®ìðñIð·éæ¤É£·(&C)", 1006, 14, 177, 202, 10 + PUSHBUTTON "ftHgÉß·(&R)", 1008, 108, 197, 110, 14, WS_DISABLED END MIXED_CONTENT1_DLG DIALOGEX 0, 0, 227, 207 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "¬Ýµ½Rec" FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 - LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 + LTEXT "±ÌfBXNàµÍfoCXÉÍ¡ÌíÞÌRecªÜÜêÄ¢Ü·B", 1001, 32, 7, 191, 20 + LTEXT "ReactOS ªÀs·é®ìðIðµÄ¾³¢", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 160, 186, 60, 14 END MIXED_CONTENT2_DLG DIALOGEX 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "¬Ýµ½Rec" FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS ÍfBXNª}ü³êéAàµÍ±Ìt@CÌíÞÌfoCXªÚ±³ê½Æ«ñ¯¶®ìªÂ\\Å·:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 + LTEXT "ReactOS ªÀs·é®ìðIðµÄ¾³¢", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 - AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 + AUTOCHECKBOX "íÉIðµ½®ìðs¤B", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 160, 185, 60, 14 END AUTOPLAY2_DLG DIALOGEX 0, 0, 227, 181 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Autoplay" +CAPTION "©®Ä¶" FONT 9, "MS UI Gothic" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 - LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 + LTEXT "ReactOS Í±ÌfoCXªÚ±³ê½Æ«ñ¯¶®ìªÂ\\Å·B", 1001, 32, 7, 190, 22 + LTEXT "ReactOS ªÀs·é®ìðIðµÄ¾³¢(&W)", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "íÉIðµ½®ìðs¤(&A)", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 159, 160, 60, 14 END SHUTDOWN_DLG DIALOGEX 0, 0, 211, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Shut Down ReactOS" +CAPTION "ReactOSÌVbg_E" FONT 9, "MS UI Gothic" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 + LTEXT "Rs[^Ì®ìðIðµÄ¾³¢", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 + LTEXT "Éf[^ª éóÔÅZbVðÛµAádÍÅRs[^ðÀsµ±¯Ü·BL[ðµ½èA}EXð®©µ½è·éÆARs[^Í®«oµÜ·B", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 - PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "wv(&H)", IDHELP, 144, 82, 60, 14 END FORMAT_DLG DIALOGEX 50, 50, 184, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "tH[}bg" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "Jn(&S)", IDOK, 53, 198, 60, 14 + PUSHBUTTON "Â¶é(&C)", IDCANCEL, 118, 198, 60, 14 + LTEXT "eÊ(&P):", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "t@CVXe(&F)", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "AP[VjbgTCY(&A)", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "{[x(&L)", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "tH[}bg IvV(&O)", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "NCbN tH[}bg(&Q)", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "³kðLøÉ·é(&E)", 28675, 16, 152, 155, 10 END CHKDSK_DLG DIALOGEX 50, 50, 194, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 +CAPTION "`FbNfBXN" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "Jn", IDOK, 53, 100, 60, 14 + GROUPBOX "`FbNfBXNIvV", -1, 7, 6, 179, 50 + PUSHBUTTON "LZ", IDCANCEL, 118, 100, 60, 14 + AUTOCHECKBOX "©®IÉt@CVXeÌG[ðC·é", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "obhZN^ðXLµñðÝé(&S)", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 +CAPTION "ACRÌÏX" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + LTEXT "t@C¼:", -1, 7, 14, 208, 10 + PUSHBUTTON "QÆ...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL LTEXT "Icons:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 - PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 + PUSHBUTTON "LZ",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -605,25 +606,25 @@ IDS_SHV_COLUMN9 "Rg" IDS_SHV_COLUMN10 "LÒ" IDS_SHV_COLUMN11 "O[v" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" - IDS_SHV_COLUMN_MODEL "Model" + IDS_SHV_COLUMN12 "t@C¼" + IDS_SHV_COLUMN13 "JeS" + IDS_SHV_COLUMN_DELFROM "³Ìê" + IDS_SHV_COLUMN_DELDATE "íú" + IDS_SHV_COLUMN_FONTTYPE "tHgÌíÞ" + IDS_SHV_COLUMN_WORKGROUP "[NO[v" + IDS_SHV_NETWORKLOCATION "lbg[NÌê" + IDS_SHV_COLUMN_DOCUMENTS "hLg" + IDS_SHV_COLUMN_STATUS "óÔ" + IDS_SHV_COLUMN_COMMENTS "Rg" + IDS_SHV_COLUMN_LOCATION "ê" + IDS_SHV_COLUMN_MODEL "f" /* special folders */ IDS_DESKTOP "fXNgbv" IDS_MYCOMPUTER "}C Rs[^" - IDS_RECYCLEBIN_FOLDER_NAME "Trash" - IDS_CONTROLPANEL "Control Panel" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_RECYCLEBIN_FOLDER_NAME "²Ý " + IDS_CONTROLPANEL "Rg[ pl" + IDS_ADMINISTRATIVETOOLS "Çc[" /* context menus */ IDS_VIEW_LARGE "å«¢ACR(&G)" @@ -633,14 +634,14 @@ IDS_SELECT "Ið" IDS_OPEN "J" IDS_CREATELINK "V[gJbgÌì¬(&L)" - IDS_COPY "Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "Cut" - IDS_RESTORE "Restore" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_INSERT "Insert" + IDS_COPY "Rs[" + IDS_DELETE "í" + IDS_PROPERTIES "vpeB" + IDS_CUT "Øèæè" + IDS_RESTORE "³Éß·" + IDS_FORMATDRIVE "®..." + IDS_RENAME "¼OÌÏX" + IDS_INSERT "}ü" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" IDS_CREATEFOLDER_CAPTION "Vµ¢tH_Ìì¬ÉG[ª¶µÜµ½" @@ -648,17 +649,17 @@ IDS_DELETEFOLDER_CAPTION "tH_íÌmF" IDS_DELETEITEM_TEXT "'%1' ðíµÄàæëµ¢Å·©?" IDS_DELETEMULTIPLE_TEXT "±êç %1 ÂÌÚðíµÄàæëµ¢Å·©?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETESELECTED_TEXT "Ið³ê½ÚðíµÄàæëµ¢Å·©?" + IDS_TRASHITEM_TEXT "'%1' ð²Ý ÉÁÄàæëµ¢Å·©?" + IDS_TRASHFOLDER_TEXT "'%1'Æ»êÉÜÜêéàÌ·×Äð²Ý ÉÁÄàæëµ¢Å·©?" + IDS_TRASHMULTIPLE_TEXT "%1 ÂÌÚð²Ý ÉÁÄàæëµ¢Å·©?" + IDS_CANTTRASH_TEXT "Ú '%1' Í²Ý ÉêÜ¹ñB ãíèÉíµÄàæëµ¢Å·©?" + IDS_OVERWRITEFILE_TEXT "±ÌtH_ÉÍùÉt@C'%1'ªÜÜêÄ¢Ü·B\n\nu«·¦Äàæëµ¢Å·©?" IDS_OVERWRITEFILE_CAPTION "t@Cã«ÌmF" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "±ÌtH_ÉÍùÉtH_'%1'ªÜÜêÄ¢Ü·B\n\n"\ + "fBNgtH_àÌt@C¼ªIð³ê½tH_àÌt@C¼\n"\ + "Æ¯¶Íu«·¦çêÜ·B»êÅàAtH_ðÚ®Ü½Í\n"\ + "Rs[µÜ·©?" /* message box strings */ IDS_RESTART_TITLE "ÄN®" @@ -668,14 +669,14 @@ /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" - IDS_PERSONAL "My Documents" - IDS_FAVORITES "Favorites" + IDS_PERSONAL "}C hLg" + IDS_FAVORITES "¨CÉüè" IDS_STARTUP "X^[g j[\\vO\\X^[gAbv" IDS_RECENT "Recent" IDS_SENDTO "SendTo" - IDS_STARTMENU "Start Menu" - IDS_MYMUSIC "My Music" - IDS_MYVIDEO "My Videos" + IDS_STARTMENU "X^[g j[" + IDS_MYMUSIC "}C ~[WbN" + IDS_MYVIDEO "}C rfI" IDS_DESKTOPDIRECTORY "fXNgbv" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -686,66 +687,66 @@ IDS_COOKIES "Cookies" IDS_HISTORY "History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "\My Pictures" + IDS_MYPICTURES "}C sN`" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" - IDS_COMMON_DOCUMENTS "Documents" + IDS_COMMON_DOCUMENTS "hLg" IDS_ADMINTOOLS "X^[g j[\\vO\\Çc[" - IDS_COMMON_MUSIC "Documents\\My Music" - IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Videos" + IDS_COMMON_MUSIC "hLg\\}C ~[WbN" + IDS_COMMON_PICTURES "hLg\\}C sN`" + IDS_COMMON_VIDEO "hLg\\}C rfI" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Places" - - IDS_NEWFOLDER "New Folder" - - IDS_DRIVE_FIXED "Local Disk" + IDS_NETWORKPLACE "}C lbg[N" + + IDS_NEWFOLDER "Vµ¢tH_" + + IDS_DRIVE_FIXED "[J fBXN" IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Network Disk" - - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Choose Program..." - - IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_BACK "< &Back" + IDS_DRIVE_NETWORK "lbg[N fBXN" + + IDS_OPEN_WITH "vO©çJ" + IDS_OPEN_WITH_CHOOSE "vOÌIð..." + + IDS_SHELL_ABOUT_AUTHORS "ìÒ(&A)" + IDS_SHELL_ABOUT_BACK "< ßé(&B)" FCIDM_SHVIEW_NEW "VKì¬" FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" - IDS_FOLDER_OPTIONS "Folder Options" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - IDS_EMPTY_BITBUCKET "Empty Recycle Bin" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" - IDS_DIRECTORY "Folder" - IDS_VIRTUAL_DRIVER "Virtual Device Driver" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" - IDS_COM_FILE "Dos Application" - IDS_CPL_FILE "Control Panel Item" - IDS_CUR_FILE "Cursor" - IDS_DLL_FILE "Application Extension" - IDS_DRV_FILE "Device Driver" - IDS_EXE_FILE "Application" - IDS_FON_FILE "Font file" - IDS_TTF_FILE "TrueType Font file" - IDS_HLP_FILE "Help File" - IDS_INI_FILE "Configuration Settings" - IDS_LNK_FILE "Shortcut" - IDS_SYS_FILE "System file" - - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" - - IDS_FILE_FOLDER "%u Files, %u Folders" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" - -END + IDS_FOLDER_OPTIONS "tH_ IvV" + IDS_RECYCLEBIN_LOCATION "²Ý Ìê" + IDS_RECYCLEBIN_DISKSPACE "pÅ«éÌæ" + IDS_EMPTY_BITBUCKET "²Ý ðóÉ·é" + IDS_PICK_ICON_TITLE "ACRÌIð" + IDS_PICK_ICON_FILTER "ACRt@C(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + IDS_OPEN_WITH_FILTER "ÀsÂ\\ t@C\0*.exe\0" + IDS_DIRECTORY "tH_" + IDS_VIRTUAL_DRIVER "¼z foCX hCo" + IDS_BAT_FILE "ReactOS ob` t@C" + IDS_CMD_FILE "ReactOS R}h XNvg" + IDS_COM_FILE "Dos AvP[V" + IDS_CPL_FILE "Rg[ plÌÚ" + IDS_CUR_FILE "J[\\" + IDS_DLL_FILE "AvP[V g£" + IDS_DRV_FILE "foCX hCo" + IDS_EXE_FILE "AvP[V" + IDS_FON_FILE "tHg t@C" + IDS_TTF_FILE "TrueType tHg t@C" + IDS_HLP_FILE "wv t@C" + IDS_INI_FILE "\\¬Ýè" + IDS_LNK_FILE "V[gJbg" + IDS_SYS_FILE "VXe t@C" + + IDS_OPEN_VERB "J" + IDS_RUNAS_VERB "ÊÌ[U[ÆµÄÀs " + IDS_EDIT_VERB "ÒW" + IDS_FIND_VERB "õ" + IDS_PRINT_VERB "óü" + IDS_PLAY_VERB "Ä¶" + IDS_PREVIEW_VERB "vr[" + + IDS_FILE_FOLDER "%u ÂÌt@CA %u ÂÌtH_" + IDS_PRINTERS "v^" + IDS_FONTS "tHg" + IDS_INSTALLNEWFONT "Vµ¢tHgÌCXg[..." + + IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" +END

15 years, 9 months

[mjmartin] 40281: create.c: NpfsCleanup - Do not set the pipe's state to FILE_PIPE_DISCONNECTED_STATE, it is needed for determining broken pipes. Only set pipes otherside to NULL if it is not NULL already. fsctrl.c: NpfsDisconnectPipe - Set return status to STATUS_PIPE_DISCONNECTED if pipe is already disconnected. Add code to handle cases where PipeState is connected and pipes otherside has been set to NULL. rw.c: Set return status to STATUS_BROKEN_PIPE if the other side of pipe has been set to

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Mar 29 15:15:10 2009 New Revision: 40281 URL: http://svn.reactos.org/svn/reactos?rev=40281&view=rev Log: create.c: NpfsCleanup - Do not set the pipe's state to FILE_PIPE_DISCONNECTED_STATE, it is needed for determining broken pipes. Only set pipes otherside to NULL if it is not NULL already. fsctrl.c: NpfsDisconnectPipe - Set return status to STATUS_PIPE_DISCONNECTED if pipe is already disconnected. Add code to handle cases where PipeState is connected and pipes otherside has been set to NULL. rw.c: Set return status to STATUS_BROKEN_PIPE if the other side of pipe has been set to NULL, the data available in pipe is zero and pipe state is connected. Check that pipes otherside is valid before attempting to set the othersides read/write event. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Mar 29 15:15:10 2009 @@ -605,7 +605,7 @@ { DPRINT("Client\n"); } - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->OtherSide)) { OtherSide = Ccb->OtherSide; /* Lock the server first */ @@ -619,7 +619,7 @@ ExAcquireFastMutex(&OtherSide->DataListLock); ExAcquireFastMutex(&Ccb->DataListLock); } - OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; + //OtherSide->PipeState = FILE_PIPE_DISCONNECTED_STATE; OtherSide->OtherSide = NULL; /* * Signaling the write event. If is possible that an other Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Mar 29 15:15:10 2009 @@ -196,6 +196,13 @@ if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) { DPRINT("Pipe is already disconnected\n"); + Status = STATUS_PIPE_DISCONNECTED; + } + else if ((!Ccb->OtherSide) && (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE)) + { + ExAcquireFastMutex(&Ccb->DataListLock); + Ccb->PipeState = FILE_PIPE_DISCONNECTED_STATE; + ExReleaseFastMutex(&Ccb->DataListLock); Status = STATUS_SUCCESS; } else if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) 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] Sun Mar 29 15:15:10 2009 @@ -331,10 +331,12 @@ if ((Ccb->OtherSide == NULL) && (Ccb->ReadDataAvailable == 0)) { - /* Its ok if the other side has been Disconnect, but if we have data still in the buffer - , need to still be able to read it. Currently this is a HAXXXX */ - DPRINT("Pipe no longer connected and no data exist in buffer. Ok to close pipe\n"); - if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + DPRINT("File pipe broken\n"); + Status = STATUS_PIPE_BROKEN; + } + else if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) Status = STATUS_PIPE_DISCONNECTED; @@ -431,9 +433,8 @@ if (Ccb->PipeEnd == FILE_PIPE_CLIENT_END) ConnectionSideReadMode=Ccb->Fcb->ClientReadMode; else ConnectionSideReadMode = Ccb->Fcb->ServerReadMode; - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - ASSERT(Ccb->OtherSide != NULL); + if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->OtherSide)) + { KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } if (Information > 0 && @@ -526,7 +527,7 @@ if ((Length == 0) || (Ccb->ReadDataAvailable == 0)) { - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->OtherSide)) { KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } @@ -545,6 +546,8 @@ memcpy(Ccb->Data, Ccb->ReadPtr, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr); Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->ReadPtr - (ULONG_PTR)Ccb->Data)); Ccb->ReadPtr = Ccb->Data; + ASSERT((ULONG_PTR)Ccb->WritePtr < ((ULONG_PTR)Ccb->Data + Ccb->MaxDataLength)); + ASSERT(Ccb->WritePtr >= Ccb->Data); } /* For Message mode, the Message length is stored in the buffer preceeding the Message. */ @@ -631,7 +634,7 @@ { KeResetEvent(&Ccb->ReadEvent); - if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->WriteQuotaAvailable > 0)) + if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->WriteQuotaAvailable > 0) && (Ccb->OtherSide)) { KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } @@ -817,7 +820,7 @@ if ((Status == STATUS_USER_APC) || (Status == STATUS_KERNEL_APC)) { Status = STATUS_CANCELLED; - break; + goto done; } if (!NT_SUCCESS(Status)) {

15 years, 9 months

[jmorlan] 40280: Make command parsing in DoCommand/Execute more compatible with Windows

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Mar 29 09:13:35 2009 New Revision: 40280 URL: http://svn.reactos.org/svn/reactos?rev=40280&view=rev Log: Make command parsing in DoCommand/Execute more compatible with Windows Modified: trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Sun Mar 29 09:13:35 2009 @@ -37,7 +37,9 @@ INT cmd_call (LPTSTR param) { - TCHAR line[CMDLINE_LENGTH]; + TCHAR line[CMDLINE_LENGTH + 1]; + TCHAR *first; + BOOL bInQuote = FALSE; TRACE ("cmd_call: (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) @@ -50,26 +52,31 @@ if (!SubstituteVars(param, line, _T('%'))) return nErrorLevel = 1; - param = line; - while (_istspace(*param)) - param++; - if (*param == _T(':') && (bc)) + /* Find start and end of first word */ + first = line; + while (_istspace(*first)) + first++; + + for (param = first; *param; param++) + { + if (!bInQuote && (_istspace(*param) || _tcschr(_T(",;="), *param))) + break; + bInQuote ^= (*param == _T('"')); + } + + /* Separate first word from rest of line */ + memmove(param + 1, param, (_tcslen(param) + 1) * sizeof(TCHAR)); + *param++ = _T('\0'); + + if (*first == _T(':') && (bc)) { /* CALL :label - call a subroutine of the current batch file */ - TCHAR *first = param; - while (*param && !_istspace(*param)) + while (*param == _T(' ')) param++; - if (*param) - { - /* Separate label and arguments */ - *param++ = _T('\0'); - while (_istspace(*param)) - param++; - } return !Batch(bc->BatchFilePath, first, param, NULL); } - return !DoCommand(param, NULL); + return !DoCommand(first, param, NULL); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 29 09:13:35 2009 @@ -214,15 +214,6 @@ } /* - * is character a delimeter when used on first word? - * - */ -static BOOL IsDelimiter (TCHAR c) -{ - return (c == _T('/') || c == _T('=') || c == _T('\0') || _istspace (c)); -} - -/* * Is a process a console process? */ static BOOL IsConsoleProcess(HANDLE Process) @@ -313,7 +304,7 @@ /* * This command (in first) was not found in the command table * - * Full - whole command line + * Full - buffer to hold whole command line * First - first word on command line * Rest - rest of command line */ @@ -321,103 +312,41 @@ static BOOL Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) { - TCHAR *szFullName=NULL; - TCHAR *first = NULL; - TCHAR *rest = NULL; - TCHAR *full = NULL; - TCHAR *dot = NULL; + TCHAR szFullName[MAX_PATH]; + TCHAR *first, *rest, *dot; TCHAR szWindowTitle[MAX_PATH]; DWORD dwExitCode = 0; - - TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(first), debugstr_aw(rest)); - - /* we need biger buffer that First, Rest, Full are already - need rewrite some code to use cmd_realloc when it need instead - of add 512bytes extra */ - - first = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); - if (first == NULL) - { - error_out_of_memory(); - nErrorLevel = 1; - return FALSE; - } - - rest = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); - if (rest == NULL) - { - cmd_free (first); - error_out_of_memory(); - nErrorLevel = 1; - return FALSE; - } - - full = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); - if (full == NULL) - { - cmd_free (first); - cmd_free (rest); - error_out_of_memory(); - nErrorLevel = 1; - return FALSE; - } - - szFullName = cmd_alloc ( (_tcslen(Full) + 512) * sizeof(TCHAR)); - if (full == NULL) - { - cmd_free (first); - cmd_free (rest); - cmd_free (full); - error_out_of_memory(); - nErrorLevel = 1; - return FALSE; - } - + TCHAR *FirstEnd; + + TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); /* Though it was already parsed once, we have a different set of rules for parsing before we pass to CreateProccess */ - if(!_tcschr(Full,_T('\"'))) - { - _tcscpy(first,First); - _tcscpy(rest,Rest); - _tcscpy(full,Full); + if (First[0] == _T('/') || (First[0] && First[1] == _T(':'))) + { + /* Use the entire first word as the program name (no change) */ + FirstEnd = First + _tcslen(First); } else { - UINT i = 0; + /* If present in the first word, spaces and ,;=/ end the program + * name and become the beginning of its parameters. */ BOOL bInside = FALSE; - rest[0] = _T('\0'); - full[0] = _T('\0'); - first[0] = _T('\0'); - _tcscpy(first,Full); - /* find the end of the command and start of the args */ - for(i = 0; i < _tcslen(first); i++) - { - if(!_tcsncmp(&first[i], _T("\""), 1)) - bInside = !bInside; - if(!_tcsncmp(&first[i], _T(" "), 1) && !bInside) - { - _tcscpy(rest,&first[i]); - first[i] = _T('\0'); + for (FirstEnd = First; *FirstEnd; FirstEnd++) + { + if (!bInside && (_istspace(*FirstEnd) || _tcschr(_T(",;=/"), *FirstEnd))) break; - } - - } - i = 0; - /* remove any slashes */ - while(i < _tcslen(first)) - { - if(first[i] == _T('\"')) - memmove(&first[i],&first[i + 1], _tcslen(&first[i]) * sizeof(TCHAR)); - else - i++; - } - /* Drop quotes around it just in case there is a space */ - _tcscpy(full,_T("\"")); - _tcscat(full,first); - _tcscat(full,_T("\" ")); - _tcscat(full,rest); - } + bInside ^= *FirstEnd == _T('"'); + } + } + + /* Copy the new first/rest into the buffer */ + first = Full; + rest = &Full[FirstEnd - First + 1]; + _tcscpy(rest, FirstEnd); + _tcscat(rest, Rest); + *FirstEnd = _T('\0'); + _tcscpy(first, First); /* check for a drive change */ if ((_istalpha (first[0])) && (!_tcscmp (first + 1, _T(":")))) @@ -435,27 +364,16 @@ } if (!working) ConErrResPuts (STRING_FREE_ERROR1); - - cmd_free (first); - cmd_free (rest); - cmd_free (full); - cmd_free (szFullName); - nErrorLevel = 1; return working; } /* get the PATH environment variable and parse it */ /* search the PATH environment variable for the binary */ - if (!SearchForExecutable (first, szFullName)) - { - error_bad_command (first); - cmd_free (first); - cmd_free (rest); - cmd_free (full); - cmd_free (szFullName); - nErrorLevel = 1; - return FALSE; - + StripQuotes(First); + if (!SearchForExecutable(First, szFullName)) + { + error_bad_command(first); + return FALSE; } GetConsoleTitle (szWindowTitle, MAX_PATH); @@ -464,6 +382,8 @@ dot = _tcsrchr (szFullName, _T('.')); if (dot && (!_tcsicmp (dot, _T(".bat")) || !_tcsicmp (dot, _T(".cmd")))) { + while (*rest == _T(' ')) + rest++; TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); Batch (szFullName, first, rest, Cmd); } @@ -473,8 +393,11 @@ PROCESS_INFORMATION prci; STARTUPINFO stui; - TRACE ("[EXEC: %s %s]\n", debugstr_aw(full), debugstr_aw(rest)); - /* build command line for CreateProcess() */ + /* build command line for CreateProcess(): first + " " + rest */ + if (*rest) + rest[-1] = _T(' '); + + TRACE ("[EXEC: %s]\n", debugstr_aw(Full)); /* fill startup info */ memset (&stui, 0, sizeof (STARTUPINFO)); @@ -487,7 +410,7 @@ ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); if (CreateProcess (szFullName, - full, + Full, NULL, NULL, TRUE, @@ -534,7 +457,7 @@ } else { - TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(full)); + TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); error_bad_command (first); nErrorLevel = 1; } @@ -550,10 +473,6 @@ OutputCodePage = GetConsoleOutputCP(); SetConsoleTitle (szWindowTitle); - cmd_free(first); - cmd_free(rest); - cmd_free(full); - cmd_free (szFullName); return nErrorLevel == 0; } @@ -563,120 +482,60 @@ * command is one of them. If it is, call the command. If not, call * execute to run it as an external program. * - * line - the command line of the program to run - * + * first - first word on command line + * rest - rest of command line */ BOOL -DoCommand (LPTSTR line, PARSED_COMMAND *Cmd) -{ - TCHAR *com = NULL; /* the first word in the command */ - TCHAR *cp = NULL; - LPTSTR cstart; - LPTSTR rest; /* pointer to the rest of the command line */ +DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) +{ + TCHAR com[_tcslen(first) + _tcslen(rest) + 2]; /* full command line */ + TCHAR *cp; + LPTSTR param; /* pointer to command's parameters */ INT cl; LPCOMMAND cmdptr; - BOOL ret = TRUE; - - TRACE ("DoCommand: (\'%s\')\n", debugstr_aw(line)); - - com = cmd_alloc( (_tcslen(line) +512)*sizeof(TCHAR) ); - if (com == NULL) - { - error_out_of_memory(); - return FALSE; - } - - cp = com; - /* Skip over initial white space */ - while (_istspace (*line)) - line++; - rest = line; - - cstart = rest; - - /* Anything to do ? */ - if (*rest) - { - if (*rest == _T('"')) - { - /* treat quoted words specially */ - - rest++; - - while(*rest != _T('\0') && *rest != _T('"')) - *cp++ = _totlower (*rest++); - if (*rest == _T('"')) - rest++; - } - else - { - while (!IsDelimiter (*rest)) - *cp++ = _totlower (*rest++); - } - - - /* Terminate first word */ - *cp = _T('\0'); - - /* Do not limit commands to MAX_PATH */ - /* - if(_tcslen(com) > MAX_PATH) - { - error_bad_command(); - cmd_free(com); - return; - } - */ - - /* Skip over whitespace to rest of line, exclude 'echo' command */ - if (_tcsicmp (com, _T("echo"))) - { - while (_istspace (*rest)) - rest++; - } - - /* Scan internal command table */ - for (cmdptr = cmds;; cmdptr++) - { - /* If end of table execute ext cmd */ - if (cmdptr->name == NULL) - { - ret = Execute (line, com, rest, Cmd); - break; - } - - if (!_tcscmp (com, cmdptr->name)) - { - cmdptr->func (rest); - break; - } - - /* The following code handles the case of commands like CD which - * are recognised even when the command name and parameter are - * not space separated. - * - * e.g dir.. - * cd\freda - */ - - /* Get length of command name */ - cl = _tcslen (cmdptr->name); - - if ((cmdptr->flags & CMD_SPECIAL) && - (!_tcsncmp (cmdptr->name, com, cl)) && - (_tcschr (_T("\\.-"), *(com + cl)))) - { - /* OK its one of the specials...*/ - - /* Call with new rest */ - cmdptr->func (cstart + cl); - break; - } - } - } - cmd_free(com); - return ret; + BOOL nointernal = FALSE; + + TRACE ("DoCommand: (\'%s\' \'%s\')\n", debugstr_aw(first), debugstr_aw(rest)); + + /* If present in the first word, these characters end the name of an + * internal command and become the beginning of its parameters. */ + cp = first + _tcscspn(first, _T("\t +,/;=[]")); + + for (cl = 0; cl < (cp - first); cl++) + { + /* These characters do it too, but if one of them is present, + * then we check to see if the word is a file name and skip + * checking for internal commands if so. + * This allows running programs with names like "echo.exe" */ + if (_tcschr(_T(".:\\"), first[cl])) + { + TCHAR tmp = *cp; + *cp = _T('\0'); + nointernal = IsExistingFile(first); + *cp = tmp; + break; + } + } + + /* Scan internal command table */ + for (cmdptr = cmds; !nointernal && cmdptr->name; cmdptr++) + { + if (!_tcsnicmp(first, cmdptr->name, cl) && cmdptr->name[cl] == _T('\0')) + { + _tcscpy(com, first); + _tcscat(com, rest); + param = &com[cl]; + + /* Skip over whitespace to rest of line, exclude 'echo' command */ + if (_tcsicmp(cmdptr->name, _T("echo")) != 0) + while (_istspace(*param)) + param++; + return !cmdptr->func(param); + } + } + + return Execute(com, first, rest, Cmd); } @@ -825,7 +684,7 @@ ExecuteCommand(PARSED_COMMAND *Cmd) { PARSED_COMMAND *Sub; - LPTSTR ExpandedLine; + LPTSTR First, Rest; BOOL Success = TRUE; if (!PerformRedirection(Cmd->Redirections)) @@ -834,14 +693,18 @@ switch (Cmd->Type) { case C_COMMAND: - ExpandedLine = DoDelayedExpansion(Cmd->Command.CommandLine); - if (!ExpandedLine) - { - Success = FALSE; - break; - } - Success = DoCommand(ExpandedLine, Cmd); - cmd_free(ExpandedLine); + Success = FALSE; + First = DoDelayedExpansion(Cmd->Command.First); + if (First) + { + Rest = DoDelayedExpansion(Cmd->Command.Rest); + if (Rest) + { + Success = DoCommand(First, Rest, Cmd); + cmd_free(Rest); + } + cmd_free(First); + } break; case C_QUIET: case C_BLOCK: Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Mar 29 09:13:35 2009 @@ -112,7 +112,7 @@ BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); LPTSTR DoDelayedExpansion(LPTSTR Line); -BOOL DoCommand (LPTSTR line, struct _PARSED_COMMAND *Cmd); +BOOL DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore); int cmd_main (int argc, const TCHAR *argv[]); @@ -375,8 +375,8 @@ { struct { - TCHAR *Tail; - TCHAR CommandLine[]; + TCHAR *Rest; + TCHAR First[]; } Command; struct { Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Mar 29 09:13:35 2009 @@ -704,11 +704,7 @@ /* If a param was send, display help of correspondent command */ if (_tcslen(param)) { - LPTSTR NewCommand = cmd_alloc((_tcslen(param)+4)*sizeof(TCHAR)); - _tcscpy(NewCommand, param); - _tcscat(NewCommand, _T(" /?")); - DoCommand(NewCommand, NULL); - cmd_free(NewCommand); + DoCommand(param, _T("/?"), NULL); } /* Else, display detailed commands list */ else Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sun Mar 29 09:13:35 2009 @@ -576,7 +576,7 @@ Type = ParseToken(_T('('), STANDARD_SEPS); if (Type == TOK_NORMAL) { - Pos = _stpcpy(ParsedLine, CurrentToken); + Pos = _stpcpy(ParsedLine, CurrentToken) + 1; break; } else if (Type == TOK_REDIRECTION) @@ -645,14 +645,15 @@ break; } } - - Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, Command.CommandLine[Pos + 1 - ParsedLine])); + *Pos++ = _T('\0'); + + Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, Command.First[Pos - ParsedLine])); Cmd->Type = C_COMMAND; Cmd->Next = NULL; Cmd->Subcommands = NULL; Cmd->Redirections = RedirList; - _tcscpy(Cmd->Command.CommandLine, ParsedLine); - Cmd->Command.Tail = Cmd->Command.CommandLine + TailOffset; + memcpy(Cmd->Command.First, ParsedLine, (Pos - ParsedLine) * sizeof(TCHAR)); + Cmd->Command.Rest = Cmd->Command.First + TailOffset; return Cmd; } @@ -747,7 +748,9 @@ switch (Cmd->Type) { case C_COMMAND: - if (SubstituteForVars(Cmd->Command.CommandLine, Buf)) + if (SubstituteForVars(Cmd->Command.First, Buf)) + ConOutPrintf(_T("%s"), Buf); + if (SubstituteForVars(Cmd->Command.Rest, Buf)) ConOutPrintf(_T("%s"), Buf); break; case C_QUIET: @@ -852,10 +855,12 @@ switch (Cmd->Type) { case C_COMMAND: - if (!SubstituteForVars(Cmd->Command.CommandLine, Buf)) return NULL; /* This is fragile since there could be special characters, but * Windows doesn't bother escaping them, so for compatibility * we probably shouldn't do it either */ + if (!SubstituteForVars(Cmd->Command.First, Buf)) return NULL; + STRING(Buf) + if (!SubstituteForVars(Cmd->Command.Rest, Buf)) return NULL; STRING(Buf) break; case C_QUIET:

15 years, 9 months

[tkreuzer] 40279: Add the DC XlateBrush / XlatePen hack to DC_vUpdateFillBrush / DC_vUpdateLineBrush, so these should now be a full replacement for the current usage of IntGdiSelectPen/Brush + EBRUSHOBJ_vInit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 29 06:15:37 2009 New Revision: 40279 URL: http://svn.reactos.org/svn/reactos?rev=40279&view=rev Log: Add the DC XlateBrush / XlatePen hack to DC_vUpdateFillBrush / DC_vUpdateLineBrush, so these should now be a full replacement for the current usage of IntGdiSelectPen/Brush + EBRUSHOBJ_vInit Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Sun Mar 29 06:15:37 2009 @@ -72,11 +72,8 @@ { PDC_ATTR pdcattr = pdc->pdcattr; PBRUSH pbrFill; - XLATEOBJ *pxlo; + XLATEOBJ *pxlo = NULL; ULONG iSolidColor; - - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlatePen; /* Check if the brush handle has changed */ if (pdcattr->hbrush != pdc->dclevel.pbrFill->BaseObject.hHmgr) @@ -89,15 +86,24 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrFill); pdc->dclevel.pbrFill = pbrFill; + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); + /* Update eboFill, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pxlo); + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); } else { /* Invalid brush handle, restore old one */ pdcattr->hbrush = pdc->dclevel.pbrFill->BaseObject.hHmgr; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pdc->dclevel.pbrFill); } } + + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlateBrush; /* Check for DC brush */ if (pdcattr->hbrush == StockObjects[DC_BRUSH]) @@ -136,15 +142,24 @@ BRUSH_ShareUnlockBrush(pdc->dclevel.pbrLine); pdc->dclevel.pbrLine = pbrLine; + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); + /* Update eboLine, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pxlo); + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); } else { /* Invalid pen handle, restore old one */ pdcattr->hpen = pdc->dclevel.pbrLine->BaseObject.hHmgr; + + /* ROS HACK, should use surf xlate */ + IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pdc->dclevel.pbrLine); } } + + /* ROS HACK, should use surf xlate */ + pxlo = pdc->rosdc.XlatePen; /* Check for DC pen */ if (pdcattr->hpen == StockObjects[DC_PEN])

15 years, 9 months

[tkreuzer] 40278: Simple temporary implementation of EngRealizeBrush. Not tested, not used yet.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 29 05:43:09 2009 New Revision: 40278 URL: http://svn.reactos.org/svn/reactos?rev=40278&view=rev Log: Simple temporary implementation of EngRealizeBrush. Not tested, not used yet. Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/include/brush.h Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sun Mar 29 05:43:09 2009 @@ -27,8 +27,48 @@ XLATEOBJ *pxlo, ULONG iHatch) { - UNIMPLEMENTED; - return FALSE; + EBRUSHOBJ *pebo; + HBITMAP hbmpRealize; + SURFOBJ *psoRealize; + POINTL ptlSrc = {0, 0}; + RECTL rclDest; + ULONG lWidth; + + rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy}; + + /* Calculate width in bytes of the realized brush */ + lWidth = DIB_GetDIBWidthBytes(psoPattern->sizlBitmap.cx, + BitsPerFormat(psoDst->iBitmapFormat)); + + /* Allocate a bitmap */ + hbmpRealize = EngCreateBitmap(psoPattern->sizlBitmap, + lWidth, + psoDst->iBitmapFormat, + BMF_NOZEROINIT, + NULL); + if (!hbmpRealize) + { + return FALSE; + } + + /* Lock the bitmap */ + psoRealize = EngLockSurface(hbmpRealize); + if (!psoRealize) + { + EngDeleteSurface(hbmpRealize); + return FALSE; + } + + /* Copy the bits to the new format bitmap */ + EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc); + + /* Unlock the bitmap again */ + EngUnlockSurface(psoRealize); + + pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); + pebo->pengbrush = (PVOID)hbmpRealize; + + return TRUE; } VOID @@ -61,6 +101,7 @@ // EBRUSHOBJ_bRealizeBrush(pebo); } +// pebo->psurfTrg = psurfTrg; pebo->BrushObject.pvRbrush = pbrush->ulRealization; pebo->BrushObject.flColorType = 0; pebo->pbrush = pbrush; @@ -91,7 +132,7 @@ psurfTrg = pebo->psurfTrg; // FIXME: all EBRUSHOBJs need a surface ppdev = (PPDEVOBJ)psurfTrg->SurfObj.hdev; // FIXME: all SURFACEs need a PDEV - pfnRealzizeBrush = ppdev->DriverFunctions.RealizeBrush; + pfnRealzizeBrush = NULL;//ppdev->DriverFunctions.RealizeBrush; if (!pfnRealzizeBrush) { pfnRealzizeBrush = EngRealizeBrush; Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h [iso-8859-1] Sun Mar 29 05:43:09 2009 @@ -14,7 +14,6 @@ * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK ON * A MAILING LIST FIRST. */ - typedef struct _BRUSH { /* Header for all gdi objects in the handle table. @@ -50,7 +49,7 @@ COLORREF crRealize; ULONG ulRGBColor; - DWORD pengbrush; + PVOID pengbrush; ULONG ulSurfPalTime; ULONG ulDCPalTime; COLORREF crCurrentText;

15 years, 9 months

[tkreuzer] 40277: BltMask: by me: optimize by replacing the maskbit table with a byte containing the maskbit and rotating using _rotr8. Also move the comparison out of the loop, making 2 loops, one with pattern, one without. By Evgeniy Boltik: Optimize by using function pointers. Fix calculation of brush position. By me again: optimize the fix by moving the calculation out of the outer loop.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 29 04:26:30 2009 New Revision: 40277 URL: http://svn.reactos.org/svn/reactos?rev=40277&view=rev Log: BltMask: by me: optimize by replacing the maskbit table with a byte containing the maskbit and rotating using _rotr8. Also move the comparison out of the loop, making 2 loops, one with pattern, one without. By Evgeniy Boltik: Optimize by using function pointers. Fix calculation of brush position. By me again: optimize the fix by moving the calculation out of the outer loop. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Mar 29 04:26:30 2009 @@ -77,40 +77,39 @@ } static BOOLEAN APIENTRY -BltMask(SURFOBJ* Dest, - SURFOBJ* Source, - SURFOBJ* Mask, +BltMask(SURFOBJ* psoDest, + SURFOBJ* psoSource, // FIXME: why isn't this used? + SURFOBJ* psoMask, XLATEOBJ* ColorTranslation, RECTL* DestRect, POINTL* SourcePoint, - POINTL* MaskPoint, + POINTL* MaskPoint, // FIXME: why isn't this used? BRUSHOBJ* pbo, POINTL* BrushPoint, ROP4 Rop4) { - LONG i, j, dx, dy, c8; - BYTE *tMask, *lMask; - static BYTE maskbit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; + LONG x, y; + BYTE *pjMskLine, *pjMskCurrent; + BYTE fjMaskBit0, fjMaskBit; /* Pattern brushes */ PEBRUSHOBJ pebo = NULL; SURFOBJ *psoPattern = NULL; PSURFACE psurfPattern; - ULONG PatternWidth = 0, PatternHeight = 0, PatternY = 0; - - if (Mask == NULL) + ULONG PatternWidth = 0, PatternHeight = 0; + LONG PatternX0 = 0, PatternX = 0, PatternY = 0; + PFN_DIB_PutPixel fnDest_PutPixel = NULL; + PFN_DIB_GetPixel fnPattern_GetPixel = NULL; + XLATEOBJ *XlateObj; + ULONG Pattern = 0; + + if (psoMask == NULL) { return FALSE; } - dx = DestRect->right - DestRect->left; - dy = DestRect->bottom - DestRect->top; - if (pbo && pbo->iSolidColor == 0xFFFFFFFF) { - pebo = CONTAINING_RECORD( - pbo, - EBRUSHOBJ, - BrushObject); + pebo = CONTAINING_RECORD(pbo, EBRUSHOBJ, BrushObject); psurfPattern = SURFACE_LockSurface(pebo->pbrush->hbmPattern); if (psurfPattern != NULL) @@ -119,46 +118,75 @@ PatternWidth = psoPattern->sizlBitmap.cx; PatternHeight = psoPattern->sizlBitmap.cy; } + fnPattern_GetPixel = DibFunctionsForBitmapFormat[psoPattern->iBitmapFormat].DIB_GetPixel; } else psurfPattern = NULL; - tMask = (PBYTE)Mask->pvScan0 + SourcePoint->y * Mask->lDelta + (SourcePoint->x >> 3); - for (j = 0; j < dy; j++) - { - lMask = tMask; - c8 = SourcePoint->x & 0x07; - - if (psurfPattern != NULL) - PatternY = (DestRect->top + j) % PatternHeight; - - for (i = 0; i < dx; i++) - { - if (0 != (*lMask & maskbit[c8])) + pjMskLine = (PBYTE)psoMask->pvScan0 + SourcePoint->y * psoMask->lDelta + (SourcePoint->x >> 3); + fjMaskBit0 = 0x80 >> (SourcePoint->x & 0x07); + + fnDest_PutPixel = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_PutPixel; + if (psurfPattern) + { + XlateObj = pebo ? pebo->XlateObject : NULL; + PatternY = (DestRect->top - BrushPoint->y) % PatternHeight; + if (PatternY < 0) + { + PatternY += PatternHeight; + } + PatternX0 = (DestRect->left - BrushPoint->x) % PatternWidth; + if (PatternX0 < 0) + { + PatternX0 += PatternWidth; + } + + for (y = DestRect->top; y < DestRect->bottom; y++) + { + pjMskCurrent = pjMskLine; + fjMaskBit = fjMaskBit0; + PatternX = PatternX0; + + for (x = DestRect->left; x < DestRect->right; x++) { - if (psurfPattern == NULL) + if (*pjMskCurrent & fjMaskBit) { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, pbo ? pbo->iSolidColor : 0); + fnDest_PutPixel(psoDest, x, y, + XLATEOBJ_iXlate(XlateObj, + fnPattern_GetPixel(psoPattern, PatternX, PatternY))); } - else + fjMaskBit = _rotr8(fjMaskBit, 1); + pjMskCurrent += (fjMaskBit >> 7); + PatternX++; + PatternX %= PatternWidth; + } + pjMskLine += psoMask->lDelta; + PatternY++; + PatternY %= PatternHeight; + } + } + else + { + Pattern = pbo ? pbo->iSolidColor : 0; + for (y = DestRect->top; y < DestRect->bottom; y++) + { + pjMskCurrent = pjMskLine; + fjMaskBit = fjMaskBit0; + + for (x = DestRect->left; x < DestRect->right; x++) + { + if (*pjMskCurrent & fjMaskBit) { - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel( - Dest, DestRect->left + i, DestRect->top + j, - DIB_GetSource(psoPattern, (DestRect->left + i) % PatternWidth, PatternY, pebo ? pebo->XlateObject : NULL)); + fnDest_PutPixel(psoDest, x, y, Pattern); } + fjMaskBit = _rotr8(fjMaskBit, 1); + pjMskCurrent += (fjMaskBit >> 7); } - c8++; - if (8 == c8) - { - lMask++; - c8 = 0; - } - } - tMask += Mask->lDelta; - } - - if (psurfPattern != NULL) + pjMskLine += psoMask->lDelta; + } + } + + if (psurfPattern) SURFACE_UnlockSurface(psurfPattern); return TRUE;

15 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009