Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[rmessiant] 50158: [SCSIPORT] - ScsiPortDeviceControl: Slight improvement to buffer length validation. Return failure status on a handful of failure cases. Prevents buffer overruns in user code.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Mon Dec 27 10:15:36 2010 New Revision: 50158 URL: http://svn.reactos.org/svn/reactos?rev=50158&view=rev Log: [SCSIPORT] - ScsiPortDeviceControl: Slight improvement to buffer length validation. Return failure status on a handful of failure cases. Prevents buffer overruns in user code. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Mon Dec 27 10:15:36 2010 @@ -2809,7 +2809,8 @@ { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status = STATUS_SUCCESS; + PDUMP_POINTERS DumpPointers; + NTSTATUS Status; DPRINT("ScsiPortDeviceControl()\n"); @@ -2821,15 +2822,22 @@ switch (Stack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_SCSI_GET_DUMP_POINTERS: - { - PDUMP_POINTERS DumpPointers; - DPRINT(" IOCTL_SCSI_GET_DUMP_POINTERS\n"); - DumpPointers = (PDUMP_POINTERS)Irp->AssociatedIrp.SystemBuffer; - DumpPointers->DeviceObject = DeviceObject; - - Irp->IoStatus.Information = sizeof(DUMP_POINTERS); - } - break; + DPRINT(" IOCTL_SCSI_GET_DUMP_POINTERS\n"); + + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DUMP_POINTERS)) + { + Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(DUMP_POINTERS); + break; + } + + DumpPointers = Irp->AssociatedIrp.SystemBuffer; + DumpPointers->DeviceObject = DeviceObject; + /* More data.. ? */ + + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(DUMP_POINTERS); + break; case IOCTL_SCSI_GET_CAPABILITIES: DPRINT(" IOCTL_SCSI_GET_CAPABILITIES\n"); @@ -2865,16 +2873,18 @@ case IOCTL_SCSI_MINIPORT: DPRINT1("IOCTL_SCSI_MINIPORT unimplemented!\n"); + Status = STATUS_NOT_IMPLEMENTED; break; case IOCTL_SCSI_PASS_THROUGH: DPRINT1("IOCTL_SCSI_PASS_THROUGH unimplemented!\n"); + Status = STATUS_NOT_IMPLEMENTED; break; default: - DPRINT1(" unknown ioctl code: 0x%lX\n", - Stack->Parameters.DeviceIoControl.IoControlCode); - break; + DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_IMPLEMENTED; + break; } /* Complete the request with the given status */

13 years, 10 months

[cwittich] 50157: [FUSION] use crt="msvcrt" instead of <library>msvcrt</library>

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Dec 27 09:54:01 2010 New Revision: 50157 URL: http://svn.reactos.org/svn/reactos?rev=50157&view=rev Log: [FUSION] use crt="msvcrt" instead of <library>msvcrt</library> Modified: trunk/reactos/dll/win32/fusion/fusion.rbuild Modified: trunk/reactos/dll/win32/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.rb… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] Mon Dec 27 09:54:01 2010 @@ -1,4 +1,4 @@ -<module name="fusion" type="win32dll" baseaddress="${BASEADDRESS_FUSION}" installbase="system32" installname="fusion.dll" allowwarnings="true"> +<module name="fusion" type="win32dll" baseaddress="${BASEADDRESS_FUSION}" installbase="system32" installname="fusion.dll" crt="msvcrt" allowwarnings="true"> <importlibrary definition="fusion.spec" /> <include base="fusion">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -8,7 +8,6 @@ <library>shlwapi</library> <library>advapi32</library> <library>dbghelp</library> - <library>msvcrt</library> <library>user32</library> <file>asmcache.c</file> <file>asmenum.c</file>

13 years, 10 months

[cwittich] 50156: [FUSION] sync to wine 1.3.10

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Dec 27 09:50:02 2010 New Revision: 50156 URL: http://svn.reactos.org/svn/reactos?rev=50156&view=rev Log: [FUSION] sync to wine 1.3.10 Modified: trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmenum.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/fusion/fusion.rbuild trunk/reactos/dll/win32/fusion/fusionpriv.h Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -123,15 +123,20 @@ /* IAssemblyCache */ typedef struct { - const IAssemblyCacheVtbl *lpIAssemblyCacheVtbl; + IAssemblyCache IAssemblyCache_iface; LONG ref; } IAssemblyCacheImpl; +static inline IAssemblyCacheImpl *impl_from_IAssemblyCache(IAssemblyCache *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyCacheImpl, IAssemblyCache_iface); +} + static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyCacheImpl *This = (IAssemblyCacheImpl *)iface; + IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -151,7 +156,7 @@ static ULONG WINAPI IAssemblyCacheImpl_AddRef(IAssemblyCache *iface) { - IAssemblyCacheImpl *This = (IAssemblyCacheImpl *)iface; + IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -161,7 +166,7 @@ static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) { - IAssemblyCacheImpl *This = (IAssemblyCacheImpl *)iface; + IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); @@ -222,6 +227,8 @@ if (!pAsmInfo) goto done; + + hr = IAssemblyName_GetPath(next, pAsmInfo->pszCurrentAssemblyPathBuf, &pAsmInfo->cchBuf); pAsmInfo->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; @@ -362,10 +369,10 @@ if (!cache) return E_OUTOFMEMORY; - cache->lpIAssemblyCacheVtbl = &AssemblyCacheVtbl; + cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; - *ppAsmCache = (IAssemblyCache *)cache; + *ppAsmCache = &cache->IAssemblyCache_iface; return S_OK; } @@ -373,15 +380,20 @@ /* IAssemblyCacheItem */ typedef struct { - const IAssemblyCacheItemVtbl *lpIAssemblyCacheItemVtbl; + IAssemblyCacheItem IAssemblyCacheItem_iface; LONG ref; } IAssemblyCacheItemImpl; +static inline IAssemblyCacheItemImpl *impl_from_IAssemblyCacheItem(IAssemblyCacheItem *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyCacheItemImpl, IAssemblyCacheItem_iface); +} + static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyCacheItemImpl *This = (IAssemblyCacheItemImpl *)iface; + IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -401,7 +413,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_AddRef(IAssemblyCacheItem *iface) { - IAssemblyCacheItemImpl *This = (IAssemblyCacheItemImpl *)iface; + IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -411,7 +423,7 @@ static ULONG WINAPI IAssemblyCacheItemImpl_Release(IAssemblyCacheItem *iface) { - IAssemblyCacheItemImpl *This = (IAssemblyCacheItemImpl *)iface; + IAssemblyCacheItemImpl *This = impl_from_IAssemblyCacheItem(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); Modified: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -45,17 +45,22 @@ typedef struct { - const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; + IAssemblyEnum IAssemblyEnum_iface; struct list assemblies; struct list *iter; LONG ref; } IAssemblyEnumImpl; +static inline IAssemblyEnumImpl *impl_from_IAssemblyEnum(IAssemblyEnum *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyEnumImpl, IAssemblyEnum_iface); +} + static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -75,7 +80,7 @@ static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -85,7 +90,7 @@ static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedDecrement(&This->ref); struct list *item, *cursor; @@ -113,7 +118,7 @@ IAssemblyName **ppName, DWORD dwFlags) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); ASMNAME *asmname; TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); @@ -135,7 +140,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); TRACE("(%p)\n", iface); @@ -287,6 +292,7 @@ WIN32_FIND_DATAW ffd; WCHAR buf[MAX_PATH]; WCHAR disp[MAX_PATH]; + WCHAR asmpath[MAX_PATH]; ASMNAME *asmname; HANDLE hfind; LPWSTR ptr; @@ -297,9 +303,9 @@ static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; static const WCHAR search_fmt[] = {'%','s','\\','*',0}; - static const WCHAR parent_fmt[] = {'%','s',',',' ',0}; static const WCHAR dblunder[] = {'_','_',0}; - static const WCHAR fmt[] = {'V','e','r','s','i','o','n','=','%','s',',',' ', + static const WCHAR path_fmt[] = {'%','s','\\','%','s','\\','%','s','.','d','l','l',0}; + static const WCHAR fmt[] = {'%','s',',',' ','V','e','r','s','i','o','n','=','%','s',',',' ', 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; @@ -325,17 +331,17 @@ else ptr = ffd.cFileName; - sprintfW(parent, parent_fmt, ptr); + lstrcpyW(parent, ptr); } else if (depth == 1) { + sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); + ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; ptr += 2; - sprintfW(buf, fmt, ffd.cFileName, ptr); - - lstrcpyW(disp, parent); - lstrcatW(disp, buf); + + sprintfW(disp, fmt, parent, ffd.cFileName, ptr); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname) @@ -352,6 +358,14 @@ break; } + hr = IAssemblyName_SetPath(asmname->name, asmpath); + if (FAILED(hr)) + { + IAssemblyName_Release(asmname->name); + HeapFree(GetProcessHeap(), 0, asmname); + break; + } + insert_assembly(assemblies, asmname); continue; } @@ -422,7 +436,7 @@ if (!asmenum) return E_OUTOFMEMORY; - asmenum->lpIAssemblyEnumVtbl = &AssemblyEnumVtbl; + asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; list_init(&asmenum->assemblies); @@ -437,7 +451,7 @@ } asmenum->iter = list_head(&asmenum->assemblies); - *pEnum = (IAssemblyEnum *)asmenum; + *pEnum = &asmenum->IAssemblyEnum_iface; return S_OK; } Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS #define INITGUID @@ -40,6 +41,8 @@ typedef struct { const IAssemblyNameVtbl *lpIAssemblyNameVtbl; + LPWSTR path; + LPWSTR displayname; LPWSTR name; LPWSTR culture; @@ -104,6 +107,7 @@ if (!refCount) { + HeapFree(GetProcessHeap(), 0, This->path); HeapFree(GetProcessHeap(), 0, This->displayname); HeapFree(GetProcessHeap(), 0, This->name); HeapFree(GetProcessHeap(), 0, This->culture); @@ -425,6 +429,43 @@ IAssemblyNameImpl_Clone }; +/* Internal methods */ +HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) +{ + IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + + assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + + name->path = strdupW(path); + if (!name->path) + return E_OUTOFMEMORY; + + return S_OK; +} + +HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) +{ + ULONG buffer_size = *len; + IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + + assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + + if (!name->path) + return S_OK; + + if (!buf) + buffer_size = 0; + + *len = lstrlenW(name->path) + 1; + + if (*len <= buffer_size) + lstrcpyW(buf, name->path); + else + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + return S_OK; +} + static HRESULT parse_version(IAssemblyNameImpl *name, LPWSTR version) { LPWSTR beg, end; @@ -450,7 +491,7 @@ return S_OK; } -static HRESULT parse_culture(IAssemblyNameImpl *name, LPWSTR culture) +static HRESULT parse_culture(IAssemblyNameImpl *name, LPCWSTR culture) { static const WCHAR empty[] = {0}; @@ -480,7 +521,7 @@ return 0; } -static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPWSTR pubkey) +static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) { int i; BYTE val; @@ -522,8 +563,16 @@ if (!str) return E_OUTOFMEMORY; - ptr = strstrW(str, separator); + ptr = strchrW(str, ','); if (ptr) *ptr = '\0'; + + /* no ',' but ' ' only */ + if( !ptr && strchrW(str, ' ') ) + { + hr = FUSION_E_INVALID_NAME; + goto done; + } + name->name = strdupW(str); if (!name->name) return E_OUTOFMEMORY; Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -146,7 +146,7 @@ #define MAX_TABLES_3BIT_ENCODE 8191 #define MAX_TABLES_5BIT_ENCODE 2047 -static inline ULONG get_table_size(ASSEMBLY *assembly, DWORD index) +static inline ULONG get_table_size(const ASSEMBLY *assembly, DWORD index) { DWORD size; INT tables; @@ -731,11 +731,11 @@ return S_OK; } -static LPWSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) +static LPWSTR assembly_dup_str(const ASSEMBLY *assembly, DWORD index) { int len; LPWSTR cpy; - LPSTR str = (LPSTR)&assembly->strings[index]; + LPCSTR str = (LPCSTR)&assembly->strings[index]; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -772,7 +772,7 @@ return S_OK; } -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path) +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) { LPWSTR cpy = HeapAlloc(GetProcessHeap(), 0, (strlenW(assembly->path) + 1) * sizeof(WCHAR)); *path = cpy; Modified: trunk/reactos/dll/win32/fusion/fusion.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.rb… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.rbuild [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -8,6 +8,7 @@ <library>shlwapi</library> <library>advapi32</library> <library>dbghelp</library> + <library>msvcrt</library> <library>user32</library> <file>asmcache.c</file> <file>asmenum.c</file> Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Mon Dec 27 09:50:02 2010 @@ -431,10 +431,13 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); -HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); +HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); BYTE assembly_get_architecture(ASSEMBLY *assembly); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); + +extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path); +extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len); static inline LPWSTR strdupW(LPCWSTR src) {

13 years, 10 months

[tkreuzer] 50155: [NSLOOKUP] Use memcpy with sizeof instead of strncpy with strlen to make sure the destination string will be zero terminated. CID 1649

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 27 09:18:00 2010 New Revision: 50155 URL: http://svn.reactos.org/svn/reactos?rev=50155&view=rev Log: [NSLOOKUP] Use memcpy with sizeof instead of strncpy with strlen to make sure the destination string will be zero terminated. CID 1649 Modified: trunk/reactos/base/applications/network/nslookup/nslookup.c Modified: trunk/reactos/base/applications/network/nslookup/nslookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/nslookup/nslookup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/nslookup/nslookup.c [iso-8859-1] Mon Dec 27 09:18:00 2010 @@ -791,7 +791,7 @@ RtlZeroMemory( State.DefaultServer, 256 ); RtlZeroMemory( State.DefaultServerAddress, 16 ); - strncpy( State.root, DEFAULT_ROOT, strlen( DEFAULT_ROOT ) ); + memcpy( State.root, DEFAULT_ROOT, sizeof(DEFAULT_ROOT) ); /* We don't know how long of a buffer it will want to return. So we'll pass an empty one now and let it fail only once, instead of guessing. */

13 years, 10 months

[jimtabor] 50154: [Win32k] - Use SendNotifyMessage for broadcasting these messages and SendMessageNoWait when not broadcasting.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 27 09:08:01 2010 New Revision: 50154 URL: http://svn.reactos.org/svn/reactos?rev=50154&view=rev Log: [Win32k] - Use SendNotifyMessage for broadcasting these messages and SendMessageNoWait when not broadcasting. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Mon Dec 27 09:08:01 2010 @@ -187,7 +187,7 @@ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult); - +BOOL FASTCALL UserSendNotifyMessage( HWND hWnd,UINT Msg,WPARAM wParam,LPARAM lParam ); LRESULT FASTCALL co_IntSendMessageNoWait(HWND hWnd, UINT Msg, WPARAM wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Mon Dec 27 09:08:01 2010 @@ -601,7 +601,7 @@ if (ret && ClipboardOwnerWindow) { DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->head.h); - co_IntSendMessage( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); + co_IntSendMessageNoWait( ClipboardOwnerWindow->head.h, WM_DESTROYCLIPBOARD, 0, 0); } UserLeave(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Dec 27 09:08:01 2010 @@ -79,10 +79,10 @@ /* Send palette messages */ if (co_IntSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { - UserPostMessage( HWND_BROADCAST, - WM_PALETTEISCHANGING, - (WPARAM)hWnd, - 0); + UserSendNotifyMessage( HWND_BROADCAST, + WM_PALETTEISCHANGING, + (WPARAM)hWnd, + 0); } if (Window->spwndPrev != NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Mon Dec 27 09:08:01 2010 @@ -564,7 +564,7 @@ } if (Ret) { - UserPostMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); + UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); } UserLeave(); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Dec 27 09:08:01 2010 @@ -1952,7 +1952,7 @@ hWnd = IntWindowFromDC(hdc); if (hWnd) // Send broadcast if dc is associated with a window. { // FYI: Thread locked in CallOneParam. - co_IntSendMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); + UserSendNotifyMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); } } return Ret;

13 years, 10 months

[cwittich] 50153: [CRT] import MSVCRT_I10_OUTPUT from wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Dec 27 09:07:27 2010 New Revision: 50153 URL: http://svn.reactos.org/svn/reactos?rev=50153&view=rev Log: [CRT] import MSVCRT_I10_OUTPUT from wine Added: trunk/reactos/lib/sdk/crt/misc/i10output.c (with props) Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/misc/stubs.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Dec 27 09:07:27 2010 @@ -314,6 +314,7 @@ <file>assert.c</file> <file>environ.c</file> <file>getargs.c</file> + <file>i10output.c</file> <file>initterm.c</file> <file>lock.c</file> <file>purecall.c</file> Added: trunk/reactos/lib/sdk/crt/misc/i10output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/i10output… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/i10output.c (added) +++ trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] Mon Dec 27 09:07:27 2010 @@ -1,0 +1,99 @@ +#include <precomp.h> + +#define I10_OUTPUT_MAX_PREC 21 +/* Internal structure used by $I10_OUTPUT */ +struct _I10_OUTPUT_DATA { + short pos; + char sign; + BYTE len; + char str[I10_OUTPUT_MAX_PREC+1]; /* add space for '\0' */ +}; + +/********************************************************************* + * $I10_OUTPUT (MSVCRT.@) + * ld - long double to be printed to data + * prec - precision of part, we're interested in + * flag - 0 for first prec digits, 1 for fractional part + * data - data to be populated + * + * return value + * 0 if given double is NaN or INF + * 1 otherwise + * + * FIXME + * Native sets last byte of data->str to '0' or '9', I don't know what + * it means. Current implementation sets it always to '0'. + */ +int CDECL MSVCRT_I10_OUTPUT(long double ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +{ + static const char inf_str[] = "1#INF"; + static const char nan_str[] = "1#QNAN"; + + double d = ld; + char format[8]; + char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ + char *p; + + TRACE("(%lf %d %x %p)\n", d, prec, flag, data); + + if(d<0) { + data->sign = '-'; + d = -d; + } else + data->sign = ' '; + + if(isinf(d)) { + data->pos = 1; + data->len = 5; + memcpy(data->str, inf_str, sizeof(inf_str)); + + return 0; + } + + if(isnan(d)) { + data->pos = 1; + data->len = 6; + memcpy(data->str, nan_str, sizeof(nan_str)); + + return 0; + } + + if(flag&1) { + int exp = 1+floor(log10(d)); + + prec += exp; + if(exp < 0) + prec--; + } + prec--; + + if(prec+1 > I10_OUTPUT_MAX_PREC) + prec = I10_OUTPUT_MAX_PREC-1; + else if(prec < 0) { + d = 0.0; + prec = 0; + } + + sprintf(format, "%%.%dle", prec); + sprintf(buf, format, d); + + buf[1] = buf[0]; + data->pos = atoi(buf+prec+3); + if(buf[1] != '0') + data->pos++; + + for(p = buf+prec+1; p>buf+1 && *p=='0'; p--); + data->len = p-buf; + + memcpy(data->str, buf+1, data->len); + data->str[data->len] = '\0'; + + if(buf[1]!='0' && prec-data->len+1>0) + memcpy(data->str+data->len+1, buf+data->len+1, prec-data->len+1); + + return 1; +} +#undef I10_OUTPUT_MAX_PREC + + + Propchange: trunk/reactos/lib/sdk/crt/misc/i10output.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/stubs.c [iso-8859-1] Mon Dec 27 09:07:27 2010 @@ -4,15 +4,6 @@ { FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); return 0; -} - -/********************************************************************* - * $I10_OUTPUT (MSVCRT.@) - * Function not really understood but needed to make the DLL work - */ -void MSVCRT_I10_OUTPUT(void) -{ - /* FIXME: This is probably data, not a function */ } void __fileinfo(void)

13 years, 10 months

[tkreuzer] 50152: [NTOSKRNL] Make definitions of ExpChangeRundown, ExpChangePushlock and ExpSetRundown 64 bit safe (have one portable definition and use it accordingly)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 26 22:25:47 2010 New Revision: 50152 URL: http://svn.reactos.org/svn/reactos?rev=50152&view=rev Log: [NTOSKRNL] Make definitions of ExpChangeRundown, ExpChangePushlock and ExpSetRundown 64 bit safe (have one portable definition and use it accordingly) Modified: trunk/reactos/ntoskrnl/ex/rundown.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/rundown.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/rundown.c [iso-8859-1] Sun Dec 26 22:25:47 2010 @@ -145,7 +145,7 @@ ASSERT((RunRef->Count & EX_RUNDOWN_ACTIVE) != 0); /* Reset the count */ - ExpSetRundown(&RunRef->Count, 0); + ExpSetRundown(RunRef, 0); } /*++ @@ -173,7 +173,7 @@ ASSERT((RunRef->Count & EX_RUNDOWN_ACTIVE) != 0); /* Mark the counter as active */ - ExpSetRundown(&RunRef->Count, EX_RUNDOWN_ACTIVE); + ExpSetRundown(RunRef, EX_RUNDOWN_ACTIVE); } /*++ @@ -359,7 +359,7 @@ WaitBlock.Count = Count; /* Now set the pointer */ - NewValue = ExpChangeRundown(RunRef, PtrToUlong(WaitBlockPointer), Value); + NewValue = ExpChangeRundown(RunRef, (ULONG_PTR)WaitBlockPointer, Value); if (NewValue == Value) break; /* Loop again */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Dec 26 22:25:47 2010 @@ -95,7 +95,7 @@ // Detect old GCC // #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) || \ - (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40303) + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ == 40303) #define DEFINE_WAIT_BLOCK(x) \ struct _AlignHack \ @@ -119,15 +119,9 @@ #endif -#ifdef _WIN64 -#define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z) +#define ExpChangeRundown(x, y, z) (ULONG_PTR)InterlockedCompareExchangePointer(&x->Ptr, (PVOID)y, (PVOID)z) #define ExpChangePushlock(x, y, z) InterlockedCompareExchangePointer((PVOID*)x, (PVOID)y, (PVOID)z) -#define ExpSetRundown(x, y) InterlockedExchange64((PLONGLONG)x, y) -#else -#define ExpChangeRundown(x, y, z) PtrToUlong(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))) -#define ExpChangePushlock(x, y, z) LongToPtr(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))) -#define ExpSetRundown(x, y) InterlockedExchange((PLONG)x, y) -#endif +#define ExpSetRundown(x, y) InterlockedExchangePointer(&x->Ptr, (PVOID)y) /* INITIALIZATION FUNCTIONS *************************************************/ @@ -496,7 +490,7 @@ { /* Sanity check */ ASSERT((((ULONG_PTR)Object) & MAX_FAST_REFS) == 0); - + /* Check if an object is being set */ if (!Object) { @@ -515,7 +509,7 @@ ExAcquireFastReference(IN OUT PEX_FAST_REF FastRef) { EX_FAST_REF OldValue, NewValue; - + /* Start reference loop */ for (;;) { @@ -530,11 +524,11 @@ OldValue.Object); if (NewValue.Object != OldValue.Object) continue; } - + /* We are done */ break; } - + /* Return the old value */ return OldValue; } @@ -545,16 +539,16 @@ IN PVOID Object) { EX_FAST_REF OldValue, NewValue; - + /* Sanity checks */ ASSERT(!(((ULONG_PTR)Object) & MAX_FAST_REFS)); - + /* Start update loop */ for (;;) { /* Get the current reference count */ OldValue = *FastRef; - + /* Check if the current count is too high or if the pointer changed */ if (((OldValue.RefCnt + MAX_FAST_REFS) > MAX_FAST_REFS) || ((OldValue.Value &~ MAX_FAST_REFS) != (ULONG_PTR)Object)) @@ -562,20 +556,20 @@ /* Fail */ return FALSE; } - + /* Update the reference count */ NewValue.Value = OldValue.Value + MAX_FAST_REFS; NewValue.Object = ExpChangePushlock(&FastRef->Object, NewValue.Object, OldValue.Object); if (NewValue.Object != OldValue.Object) continue; - + /* We are done */ break; } - + /* Return success */ - return TRUE; + return TRUE; } FORCEINLINE @@ -584,31 +578,31 @@ IN PVOID Object) { EX_FAST_REF OldValue, NewValue; - + /* Sanity checks */ ASSERT(Object != NULL); ASSERT(!(((ULONG_PTR)Object) & MAX_FAST_REFS)); - + /* Start reference loop */ for (;;) { /* Get the current reference count */ OldValue = *FastRef; - + /* Check if we're full if if the pointer changed */ if ((OldValue.Value ^ (ULONG_PTR)Object) >= MAX_FAST_REFS) return FALSE; - + /* Decrease the reference count */ NewValue.Value = OldValue.Value + 1; NewValue.Object = ExpChangePushlock(&FastRef->Object, NewValue.Object, OldValue.Object); if (NewValue.Object != OldValue.Object) continue; - + /* We are done */ break; } - + /* Return success */ return TRUE; } @@ -619,10 +613,10 @@ IN PVOID Object) { EX_FAST_REF NewValue, OldValue; - + /* Sanity check */ ASSERT((((ULONG_PTR)Object) & MAX_FAST_REFS) == 0); - + /* Check if an object is being set */ if (!Object) { @@ -634,7 +628,7 @@ /* Otherwise, we assume the object was referenced and is ready */ NewValue.Value = (ULONG_PTR)Object | MAX_FAST_REFS; } - + /* Update the object */ OldValue.Object = InterlockedExchangePointer(&FastRef->Object, NewValue.Object); return OldValue; @@ -647,17 +641,17 @@ IN PVOID OldObject) { EX_FAST_REF OldValue, NewValue; - + /* Sanity check and start swap loop */ ASSERT(!(((ULONG_PTR)Object) & MAX_FAST_REFS)); for (;;) { /* Get the current value */ OldValue = *FastRef; - + /* Make sure there's enough references to swap */ if (!((OldValue.Value ^ (ULONG_PTR)OldObject) <= MAX_FAST_REFS)) break; - + /* Check if we have an object to swap */ if (Object) { @@ -669,17 +663,17 @@ /* Write the object address itself (which is empty) */ NewValue.Value = (ULONG_PTR)Object; } - + /* Do the actual compare exchange */ NewValue.Object = ExpChangePushlock(&FastRef->Object, NewValue.Object, OldValue.Object); if (NewValue.Object != OldValue.Object) continue; - + /* All done */ break; } - + /* Return the old value */ return OldValue; } @@ -849,7 +843,7 @@ ASSERT((RunRef->Count & EX_RUNDOWN_ACTIVE) != 0); /* Mark the counter as active */ - ExpSetRundown(&RunRef->Count, EX_RUNDOWN_ACTIVE); + ExpSetRundown(RunRef, EX_RUNDOWN_ACTIVE); } /* PUSHLOCKS *****************************************************************/ @@ -1221,21 +1215,21 @@ _ExAcquireFastMutexUnsafe(IN PFAST_MUTEX FastMutex) { PKTHREAD Thread = KeGetCurrentThread(); - + /* Sanity check */ ASSERT((KeGetCurrentIrql() == APC_LEVEL) || (Thread->CombinedApcDisable != 0) || (Thread->Teb == NULL) || (Thread->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); ASSERT(FastMutex->Owner != Thread); - + /* Decrease the count */ if (InterlockedDecrement(&FastMutex->Count)) { /* Someone is still holding it, use slow path */ KiAcquireFastMutex(FastMutex); } - + /* Set the owner */ FastMutex->Owner = Thread; } @@ -1249,10 +1243,10 @@ (KeGetCurrentThread()->Teb == NULL) || (KeGetCurrentThread()->Teb >= (PTEB)MM_SYSTEM_RANGE_START)); ASSERT(FastMutex->Owner == KeGetCurrentThread()); - + /* Erase the owner */ FastMutex->Owner = NULL; - + /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) { @@ -1267,17 +1261,17 @@ { KIRQL OldIrql; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - + /* Raise IRQL to APC */ KeRaiseIrql(APC_LEVEL, &OldIrql); - + /* Decrease the count */ if (InterlockedDecrement(&FastMutex->Count)) { /* Someone is still holding it, use slow path */ KiAcquireFastMutex(FastMutex); } - + /* Set the owner and IRQL */ FastMutex->Owner = KeGetCurrentThread(); FastMutex->OldIrql = OldIrql; @@ -1289,18 +1283,18 @@ { KIRQL OldIrql; ASSERT(KeGetCurrentIrql() == APC_LEVEL); - + /* Erase the owner */ FastMutex->Owner = NULL; OldIrql = (KIRQL)FastMutex->OldIrql; - + /* Increase the count */ if (InterlockedIncrement(&FastMutex->Count) <= 0) { /* Someone was waiting for it, signal the waiter */ KeSetEventBoostPriority(&FastMutex->Event, NULL); } - + /* Lower IRQL back */ KeLowerIrql(OldIrql); } @@ -1311,10 +1305,10 @@ { KIRQL OldIrql; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); - + /* Raise to APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); - + /* Check if we can quickly acquire it */ if (InterlockedCompareExchange(&FastMutex->Count, 0, 1) == 1) {

13 years, 10 months

[dreimer] 50151: Update Winefile to 1.3.10 too

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Dec 26 16:28:51 2010 New Revision: 50151 URL: http://svn.reactos.org/svn/reactos?rev=50151&view=rev Log: Update Winefile to 1.3.10 too Modified: trunk/rosapps/applications/winfile/It.rc trunk/rosapps/applications/winfile/winefile.c Modified: trunk/rosapps/applications/winfile/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/It.rc… ============================================================================== --- trunk/rosapps/applications/winfile/It.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/It.rc [iso-8859-1] Sun Dec 26 16:28:51 2010 @@ -38,7 +38,7 @@ MENUITEM "&Apri\tInvio", ID_ACTIVATE MENUITEM "&Sposta...\tF7", ID_FILE_MOVE MENUITEM "&Copia...\tF8", ID_FILE_COPY - MENUITEM "&Negli Appunti...\tF9", 118 + MENUITEM "&Negli appunti...\tF9", 118 MENUITEM "&Cancella\tDel", ID_FILE_DELETE MENUITEM "Ri&nomina...", 109 MENUITEM "Propri&etÃ ...\tAlt+Invio", ID_EDIT_PROPERTIES @@ -50,7 +50,7 @@ MENUITEM "&Stampa...", 102 MENUITEM "Associa...", 103 MENUITEM SEPARATOR - MENUITEM "Cr&ea Directory...", 111 + MENUITEM "Cr&ea cartella...", 111 MENUITEM "Cerc&a...", 104 MENUITEM "&Seleziona i file...", 116 MENUITEM SEPARATOR @@ -62,65 +62,65 @@ } POPUP "&Disco" { - MENUITEM "&Copia Disco...", 201 - MENUITEM "&Etichetta Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatta Disco...", ID_FORMAT_DISK + MENUITEM "&Copia disco...", 201 + MENUITEM "&Etichetta disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatta disco...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Crea Disco di Sistema...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Connetti & Drive di Rete", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Disconnetti Drive di Rete", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "&Crea disco di sistema...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Connetti unitÃ di rete", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Disconnetti unitÃ di rete", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Condividi come...", 254 MENUITEM "&Rimuovi condivisione...", 255 MENUITEM SEPARATOR - MENUITEM "&Seleziona Drive...", 251 + MENUITEM "&Seleziona unitÃ ...", 251 } POPUP "&Directory" { - MENUITEM "&Livello Sucessivo\t+", 301 - MENUITEM "Espandi &Albero\t*", 302 + MENUITEM "&Livello successivo\t+", 301 + MENUITEM "&Espandi albero\t*", 302 MENUITEM "Espandi &tutto\tStrg+*", 303 - MENUITEM "Riduci &Albero\t-", 304 + MENUITEM "&Riduci albero\t-", 304 MENUITEM SEPARATOR MENUITEM "&Seleziona unitÃ ", 505 } POPUP "&Visualizza" { - MENUITEM "A&lbero e Directory", 413 - MENUITEM "So&lo Albero", 411 - MENUITEM "&Solo Directory", 412 + MENUITEM "&Albero e cartella", 413 + MENUITEM "Solo &albero", 411 + MENUITEM "Solo &cartella", 412 MENUITEM SEPARATOR MENUITEM "Di&vidi", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Nome", ID_VIEW_NAME MENUITEM "&Mostra tutti i dettagli sui file",ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Mostra dettagli parziali...",ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ordina per Nome", ID_VIEW_SORT_NAME - MENUITEM "&Ordina per Tipo", ID_VIEW_SORT_TYPE - MENUITEM "&Ordina per Dimensione", ID_VIEW_SORT_SIZE - MENUITEM "&Ordina per Data", ID_VIEW_SORT_DATE + MENUITEM "Mostra dettagli &parziali...",ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "Ordina per n&ome", ID_VIEW_SORT_NAME + MENUITEM "Ordina per &tipo", ID_VIEW_SORT_TYPE + MENUITEM "Ordina per &dimensione", ID_VIEW_SORT_SIZE + MENUITEM "Ordina per d&ata", ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Ordina per &...", ID_VIEW_FILTER } POPUP "&Opzioni" { - MENUITEM "&Confermazione...", 501 - MENUITEM "&Font...", ID_SELECT_FONT + MENUITEM "&Conferma...", 501 + MENUITEM "C&arattere...", ID_SELECT_FONT MENUITEM "&Personalizza barra degli strumenti...", 512 MENUITEM SEPARATOR - MENUITEM "&Barra degli strumenti", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Barra dei Drive", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Barra di stato", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Barra degli &strumenti", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barra delle &unitÃ ", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra di s&tato", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "A& tutto schermo\tCtrl+Shift+S",ID_VIEW_FULLSCREEN + MENUITEM "A tutto scher&mo\tCtrl+Shift+S",ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Esegui minimizzato", 504 - MENUITEM "&Salva impostazioni all'uscita",511 + MENUITEM "Sa&lva impostazioni all'uscita",511 } @@ -131,14 +131,14 @@ } POPUP "&Finestra" { - MENUITEM "Nuova &Finestra", ID_WINDOW_NEW + MENUITEM "&Nuova finestra", ID_WINDOW_NEW MENUITEM "Finestre a cascata\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordina &Orizontalmente", ID_WINDOW_TILE_HORZ - MENUITEM "Ordina &Verticlmente\tCtrl+F4",ID_WINDOW_TILE_VERT + MENUITEM "Ordina &orizzontalmente", ID_WINDOW_TILE_HORZ + MENUITEM "Ordina &verticalmente\tCtrl+F4",ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Disponi automaticamente", ID_WINDOW_AUTOSORT #endif - MENUITEM "Disponi &Simboli", ID_WINDOW_ARRANGE + MENUITEM "Disponi &simboli", ID_WINDOW_ARRANGE MENUITEM "&Aggiorna\tF5", ID_REFRESH } @@ -178,9 +178,9 @@ BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 CONTROL "Docu&menti",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 - CONTROL "&Altri files",IDC_VIEW_TYPE_OTHERS,"Button", + CONTROL "&Altri file",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "&Mostra files nascosti/di sistema",IDC_VIEW_TYPE_HIDDEN, + CONTROL "&Mostra file nascosti/di sistema",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annulla",IDCANCEL,104,24,50,14 @@ -188,7 +188,7 @@ IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "PropprietÃ di %s" +CAPTION "ProprietÃ di %s" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 @@ -201,7 +201,7 @@ EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Versione:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Cop&yright:",-1,7,51,59,9 + LTEXT "&Copyright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Dimensione:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP @@ -210,7 +210,7 @@ CONTROL "&Nascosto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archivio",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Di sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Compresso",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + CONTROL "Co&mpresso",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 GROUPBOX "&Informazioni sulla versione",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -225,12 +225,12 @@ STRINGTABLE { - IDS_WINEFILE "Wine File Manager" + IDS_WINEFILE "Gestore di file di Wine" IDS_ERROR "Errore" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" + IDS_ROOT_FS "radice fs" + IDS_UNIXFS "unix fs" IDS_DESKTOP "Scrivania" - IDS_SHELL "Shell" + IDS_SHELL "Terminale" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Non ancora implementato" IDS_WINE_FILE "Wine File" @@ -240,10 +240,10 @@ { IDS_COL_NAME "Nome" IDS_COL_SIZE "Dimensione" - IDS_COL_CDATE "CDate" - IDS_COL_ADATE "ADate" - IDS_COL_MDATE "MDate" - IDS_COL_IDX "Index/Inode" + IDS_COL_CDATE "Data di creazione" + IDS_COL_ADATE "Data di ultimo accesso" + IDS_COL_MDATE "Data di ultima modifica" + IDS_COL_IDX "Indice/Inode" IDS_COL_LINKS "Collegamenti" IDS_COL_ATTR "Attributi" IDS_COL_SEC "Sicurezza" Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Sun Dec 26 16:28:51 2010 @@ -2019,8 +2019,7 @@ g_fullscreen.wasZoomed = IsZoomed(hwnd); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = g_fullscreen.orgPos.left-rt.left; rt.top = g_fullscreen.orgPos.top-rt.top; @@ -2046,8 +2045,7 @@ GetWindowRect(hwnd, &pos); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = pos.left-rt.left; rt.top = pos.top-rt.top;

13 years, 10 months

[dreimer] 50150: Sync xcopy, iexplore, winhlp32, wordpad and write to wine 1.3.10

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Dec 26 16:25:30 2010 New Revision: 50150 URL: http://svn.reactos.org/svn/reactos?rev=50150&view=rev Log: Sync xcopy, iexplore, winhlp32, wordpad and write to wine 1.3.10 Added: trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc (with props) trunk/reactos/base/applications/write/Sr.rc (with props) trunk/reactos/base/applications/write/Zh.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h trunk/reactos/base/applications/iexplore/iexplore.rc trunk/reactos/base/applications/winhlp32/Ko.rc trunk/reactos/base/applications/winhlp32/Zh.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/write/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -34,7 +34,7 @@ STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n\ - nell'obiettivo?\n\ + nella destinazione?\n\ (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (SÃ¬|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (SÃ¬|No|Tutti)\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -56,7 +56,7 @@ \n\ Where:\n\ \n\ -[/I] ë§ì½ ëìì´ ì¡´ì¬íì§ ìë ê²½ì° ëë í ë¦¬ë¡ ê°ì íê³ ëê°ë ë ë§ì íì¼ì \n\ +[/I] ë§ì½ ëìì´ ì¡´ì¬íì§ ìë ê²½ì° ëë í ë¦¬ë¡ ê°ì íê³ ëê°ë ë ë§ì íì¼ì\n\ \të³µì¬\n\ [/S] ëë í ë¦¬íê³ íì ëë í ë¦¬ ë³µì¬\n\ [/E] ë¹ ëë í ë¦¬ë¥¼ í¬í¨í´ì ëë í ë¦¬ì íì ëë í ë¦¬ ë³µì¬\n\ Added: trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -1,0 +1,141 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Serbian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright 2010 ÄorÄe VasiljeviÄ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + STRING_INVPARMS, "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð±ÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°ÑÐ°. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" + STRING_INVPARM, "ÐÐµÐ¸ÑÐ¿ÑÐ°Ð²Ð°Ð½ Ð¿Ð°ÑÐ°Ð¼ÐµÑÐ°Ñ â%sâ. ÐÐ¾ÑÐ¸ÑÑÐ¸ÑÐµ xcopy /? Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\n" + STRING_PAUSE, "ÐÑÐ¸ÑÐ¸ÑÐ½Ð¸ÑÐµ <enter> Ð´Ð° Ð·Ð°Ð¿Ð¾ÑÐ½ÐµÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ\n" + STRING_SIMCOPY, "%d Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_COPY, "%d Ð´Ð°ÑÐ¾ÑÐµÐºÐ°/Ðµ ÑÐµ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¾\n" + STRING_QISDIR, "ÐÐ° Ð»Ð¸ ÑÐµ â%sâ Ð½Ð°Ð·Ð¸Ð² Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ð°\n\ + Ð½Ð° Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÑ?\n\ + (Ð - Ð´Ð°ÑÐ¾ÑÐµÐºÐ°, Ð¤ - ÑÐ°ÑÑÐ¸ÐºÐ»Ð°)\n" + STRING_SRCPROMPT,"%s? (ÐÐ°|ÐÐµ)\n" + STRING_OVERWRITE,"ÐÐ°Ð¼ÐµÐ½Ð¸ÑÐ¸ %s? (ÐÐ°|ÐÐµ|Ð¡Ð²Ðµ)\n" + STRING_COPYFAIL, "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ â%sâ Ñ â%sâ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾ ÑÐ° r/c %d\n" + STRING_OPENFAIL, "ÐÑÐ²Ð°ÑÐ°ÑÐµ â%sâ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_READFAIL, "Ð§Ð¸ÑÐ°ÑÐµ â%sâ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾\n" + STRING_YES_CHAR, "Ð" + STRING_NO_CHAR, "Ð" + STRING_ALL_CHAR, "Ð¡" + STRING_FILE_CHAR,"Ð" + STRING_DIR_CHAR, "Ð¤" + + STRING_HELP, +"XCOPY â ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð²Ð¾ÑÐ½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸Ð»Ð¸ Ð³ÑÐ°Ð½Ðµ ÑÐ°ÑÑÐ¸ÐºÐ»Ð¸ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ\n\ +\n\ +Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ°:\n\ +XCOPY Ð¸Ð·Ð²Ð¾Ñ [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +ÐÐ´Ðµ:\n\ +\n\ +[/I] ÐÑÐµÑÐ¿Ð¾ÑÑÐ°Ð²Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ñ ÐºÐ°Ð´Ð° Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ Ð½Ðµ Ð¿Ð¾ÑÑÐ¾ÑÐ¸ Ð¸ ÐºÐ°Ð´Ð° ÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÑ Ð´Ð²Ðµ Ð¸Ð»Ð¸\n\ +\tÐ²Ð¸ÑÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÐ°\n\ +[/S] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ Ð¸ Ð¿Ð¾ÑÑÐ°ÑÑÐ¸ÐºÐ»Ðµ\n\ +[/E] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ Ð¸ Ð¿Ð¾ÑÑÐ°ÑÑÐ¸ÐºÐ»Ðµ Ð·Ð°ÑÐµÐ´Ð½Ð¾ Ñ Ð¿ÑÐ°Ð·Ð½Ð¸Ð¼\n\ +[/Q] ÐÐµ Ð¿ÑÐ¸ÐºÐ°Ð·ÑÑ Ð½Ð°Ð·Ð¸Ð²Ðµ ÑÐ¾ÐºÐ¾Ð¼ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐ°.\n\ +[/F] ÐÑÐ¸ÐºÐ°Ð¶Ð¸ ÑÐµÐ¾ Ð¸Ð·Ð²Ð¾Ñ Ð¸ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ ÑÐ¾ÐºÐ¾Ð¼ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐ°\n\ +[/L] ÐÐ¿Ð¾Ð½Ð°ÑÐ°Ñ ÑÐ°Ð´ÑÑ Ð¿ÑÐ¸ÐºÐ°Ð·ÑÑÑÑÐ¸ Ð½Ð°Ð·Ð¸Ð²Ðµ ÐºÐ¾ÑÐ¸ ÑÐµ Ð±Ð¸ÑÐ¸ ÑÐ¼Ð½Ð¾Ð¶ÐµÐ½Ð¸\n\ +[/W] ÐÐ¸ÑÐ°Ñ Ð¿ÑÐµ Ð¿Ð¾ÑÐ¸ÑÐ°ÑÐ° ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐ°\n\ +[/T] ÐÑÐ°Ð²Ð¸ Ð¿ÑÐ°Ð·Ð½Ñ ÑÑÑÑÐºÑÑÑÑ ÑÐ°ÑÑÐ¸ÐºÐ»Ðµ, Ð°Ð»Ð¸ Ð½Ðµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð´Ð°ÑÐ¾ÑÐµÐºÐµ\n\ +[/Y] ÐÐ¾ÑÐ¸ÑÐ½Ð¸ ÑÐ¿Ð¸Ñ Ð¿ÑÐ¸ Ð·Ð°Ð¼ÐµÑÐ¸Ð²Ð°ÑÑ Ð´Ð°ÑÐ¾ÑÐµÐºÐ°\n\ +[/-Y] ÐÐ¼Ð¾Ð³ÑÑÐ¸ ÑÐ¿Ð¸Ñ Ð¿ÑÐ¸ Ð·Ð°Ð¼ÐµÑÐ¸Ð²Ð°ÑÑ Ð´Ð°ÑÐ¾ÑÐµÐºÐ°\n\ +[/P] ÐÐ¸ÑÐ°Ñ Ð·Ð° ÑÐ²Ð°ÐºÑ Ð¸Ð·Ð²Ð¾ÑÐ½Ñ Ð´Ð°ÑÐ¾ÑÐµÐºÑ Ð¿ÑÐµ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐ°\n\ +[/N] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾ÑÐ¸ÑÑÐµÑÐ¸ ÐºÑÐ°ÑÐºÐµ Ð½Ð°Ð·Ð¸Ð²Ðµ\n\ +[/U] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð¾Ð½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ ÐºÐ¾ÑÐµ Ð¿Ð¾ÑÑÐ¾ÑÐµ Ñ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÑ\n\ +[/R] ÐÐ°Ð¼ÐµÐ½Ð¸ ÑÐ²Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ ÐºÐ¾ÑÐµ ÑÐµ ÑÐ°Ð¼Ð¾ ÑÐ¸ÑÐ°ÑÑ\n\ +[/H] Ð£ÐºÑÑÑÐ¸ ÑÐ°ÐºÑÐ¸Ð²ÐµÐ½Ðµ Ð¸ ÑÐ¸ÑÑÐµÐ¼ÑÐºÐµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ñ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÐµ\n\ +[/C] ÐÐ°ÑÑÐ°Ð²Ð¸ Ð¸Ð°ÐºÐ¾ Ð´Ð¾ÑÐµ Ð´Ð¾ Ð³ÑÐµÑÐºÐµ Ñ ÑÐ¼Ð½Ð¾Ð¶Ð°Ð²Ð°ÑÑ\n\ +[/A] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð°ÑÑÐ¸Ð²Ð¸ÑÐ°Ð½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ\n\ +[/M] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð°ÑÑÐ¸Ð²Ð¸ÑÐ°Ð½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð¸ ÑÐºÐ»Ð¾Ð½Ð¸\n\ +\tÐ¾ÑÐ¾Ð±Ð¸Ð½Ðµ Ð°ÑÑÐ¸Ð²Ðµ\n\ +[/D | /D:m-d-y] Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð½Ð¾Ð²Ðµ Ð¸Ð»Ð¸ Ð¸Ð·Ð¼ÐµÑÐµÐ½Ðµ Ð´Ð°ÑÐ¾ÑÐµÐºÐµ Ð½Ð°ÐºÐ¾Ð½ Ð¾Ð´ÑÐµÑÐµÐ½Ð¾Ð³ Ð´Ð°ÑÑÐ¼Ð°.\n\ +\t\tÐÐºÐ¾ Ð´Ð°ÑÑÐ¼ Ð½Ð¸ÑÐµ ÑÐ½ÐµÑÐµÐ½, ÑÐ¼Ð½Ð¾Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð°ÐºÐ¾ ÑÐµ Ð¾Ð´ÑÐµÐ´Ð¸ÑÑÐµ ÑÑÐ°ÑÐ¸ÑÐµ\n\ +\t\tÐ¾Ð´ Ð¸Ð·Ð²Ð¾ÑÐ°\n\n" + +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + STRING_INVPARMS, "Neispravan broj parametara. Koristite xcopy /? za pomoÄ\n" + STRING_INVPARM, "Neispravan parametar â%sâ. Koristite xcopy /? za pomoÄ\n" + STRING_PAUSE, "Pritisnite <enter> da zapoÄnete umnoÅ¾avanje\n" + STRING_SIMCOPY, "%d datoteka/e Äe biti umoÅ¾eno\n" + STRING_COPY, "%d datoteka/e je umnoÅ¾eno\n" + STRING_QISDIR, "Da li je â%sâ naziv datoteke ili fascikla\n\ + na odrediÅ¡tu?\n\ + (D - datoteka, F - fascikla)\n" + STRING_SRCPROMPT,"%s? (Da|Ne)\n" + STRING_OVERWRITE,"Zameniti %s? (Da|Ne|Sve)\n" + STRING_COPYFAIL, "UmnoÅ¾avanje â%sâ u â%sâ nije uspelo sa r/c %d\n" + STRING_OPENFAIL, "Otvaranje â%sâ datoteke nije uspelo\n" + STRING_READFAIL, "Äitanje â%sâ datoteke nije uspelo\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "S" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "F" + + STRING_HELP, +"XCOPY â umnoÅ¾ava izvorne datoteke ili grane fascikli u odrediÅ¡te\n\ +\n\ +Sintaksa:\n\ +XCOPY izvor [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Gde:\n\ +\n\ +[/I] Pretpostavi fasciklu kada odrediÅ¡te ne postoji i kada se umnoÅ¾avaju dve ili\n\ +\tviÅ¡e datoteka\n\ +[/S] UmnoÅ¾i fascikle i potfascikle\n\ +[/E] UmnoÅ¾i fascikle i potfascikle zajedno s praznim\n\ +[/Q] Ne prikazuj nazive tokom umnoÅ¾avanja.\n\ +[/F] PrikaÅ¾i ceo izvor i odrediÅ¡te tokom umnoÅ¾avanja\n\ +[/L] OponaÅ¡aj radnju prikazujuÄi nazive koji Äe biti umnoÅ¾eni\n\ +[/W] Pitaj pre poÄinjanja umnoÅ¾avanja\n\ +[/T] Pravi praznu strukturu fascikle, ali ne umnoÅ¾ava datoteke\n\ +[/Y] Potisni upit pri zamenjivanju datoteka\n\ +[/-Y] OmoguÄi upit pri zamenjivanju datoteka\n\ +[/P] Pitaj za svaku izvornu datoteku pre umnoÅ¾avanja\n\ +[/N] UmnoÅ¾i koristeÄi kratke nazive\n\ +[/U] UmnoÅ¾i samo one datoteke koje postoje u odrediÅ¡tu\n\ +[/R] Zameni sve datoteke koje se samo Äitaju\n\ +[/H] UkljuÄi sakrivene i sistemske datoteke u umnoÅ¾avanje\n\ +[/C] Nastavi iako doÄe do greÅ¡ke u umnoÅ¾avanju\n\ +[/A] UmnoÅ¾i samo arhivirane datoteke\n\ +[/M] UmnoÅ¾i samo arhivirane datoteke i ukloni\n\ +\tosobine arhive\n\ +[/D | /D:m-d-y] UmnoÅ¾i nove ili izmenjene datoteke nakon odreÄenog datuma.\n\ +\t\tAko datum nije unesen, umnoÅ¾i samo ako je odrediÅ¡te starije\n\ +\t\tod izvora\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Sr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -43,5 +43,6 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sr.rc" #include "Sv.rc" #include "Uk.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xcopy); /* Prototypes */ +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *flags); static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, WCHAR *spec, DWORD flags); static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, @@ -108,17 +110,6 @@ const WCHAR PROMPTSTR1[] = {'/', 'Y', 0}; const WCHAR PROMPTSTR2[] = {'/', 'y', 0}; const WCHAR COPYCMD[] = {'C', 'O', 'P', 'Y', 'C', 'M', 'D', 0}; - const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; - - /* - * Parse the command line - */ - - /* Confirm at least one parameter */ - if (argc < 2) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; - } /* Preinitialize flags based on COPYCMD */ if (GetEnvironmentVariableW(COPYCMD, copyCmd, MAXSTRING)) { @@ -135,30 +126,171 @@ lose */ flags |= OPT_COPYHIDSYS; + /* + * Parse the command line + */ + if ((rc = XCOPY_ParseCommandLine(suppliedsource, supplieddestination, + &flags)) != RC_OK) { + if (rc == RC_HELP) + return RC_OK; + else + return rc; + } + + /* Trace out the supplied information */ + WINE_TRACE("Supplied parameters:\n"); + WINE_TRACE("Source : '%s'\n", wine_dbgstr_w(suppliedsource)); + WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); + + /* Extract required information from source specification */ + rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); + if (rc != RC_OK) return rc; + + /* Extract required information from destination specification */ + rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, + destinationspec, sourcespec, flags); + if (rc != RC_OK) return rc; + + /* Trace out the resulting information */ + WINE_TRACE("Resolved parameters:\n"); + WINE_TRACE("Source Stem : '%s'\n", wine_dbgstr_w(sourcestem)); + WINE_TRACE("Source Spec : '%s'\n", wine_dbgstr_w(sourcespec)); + WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); + WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); + + /* Pause if necessary */ + if (flags & OPT_PAUSE) { + DWORD count; + char pausestr[10]; + + XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), + &count, NULL); + } + + /* Now do the hard work... */ + rc = XCOPY_DoCopy(sourcestem, sourcespec, + destinationstem, destinationspec, + flags); + + /* Clear up exclude list allocated memory */ + while (excludeList) { + EXCLUDELIST *pos = excludeList; + excludeList = excludeList -> next; + HeapFree(GetProcessHeap(), 0, pos->name); + HeapFree(GetProcessHeap(), 0, pos); + } + + /* Finished - print trailer and exit */ + if (flags & OPT_SIMULATE) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); + } else if (!(flags & OPT_NOCOPY)) { + XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); + } + if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; + return rc; + +} + +/* ========================================================================= + XCOPY_ParseCommandLine - Parses the command line + ========================================================================= */ +static BOOL is_whitespace(WCHAR c) +{ + return c == ' ' || c == '\t'; +} + +static WCHAR *skip_whitespace(WCHAR *p) +{ + for (; *p && is_whitespace(*p); p++); + return p; +} + +/* Windows XCOPY uses a simplified command line parsing algorithm + that lacks the escaped-quote logic of build_argv(), because + literal double quotes are illegal in any of its arguments. + Example: 'XCOPY "c:\DIR A" "c:DIR B\"' is OK. */ +static int find_end_of_word(const WCHAR *word, WCHAR **end) +{ + BOOL in_quotes = 0; + const WCHAR *ptr = word; + for (;;) { + for (; *ptr != '\0' && *ptr != '"' && + (in_quotes || !is_whitespace(*ptr)); ptr++); + if (*ptr == '"') { + in_quotes = !in_quotes; + ptr++; + } + /* Odd number of double quotes is illegal for XCOPY */ + if (in_quotes && *ptr == '\0') + return RC_INITERROR; + if (*ptr == '\0' || (!in_quotes && is_whitespace(*ptr))) + break; + } + *end = (WCHAR*)ptr; + return RC_OK; +} + +/* Remove all double quotes from a word */ +static void strip_quotes(WCHAR *word, WCHAR **end) +{ + WCHAR *rp, *wp; + for (rp = word, wp = word; *rp != '\0'; rp++) { + if (*rp == '"') + continue; + if (wp < rp) + *wp = *rp; + wp++; + } + *wp = '\0'; + *end = wp; +} + +static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, + WCHAR *supplieddestination, DWORD *pflags) +{ + const WCHAR EXCLUDE[] = {'E', 'X', 'C', 'L', 'U', 'D', 'E', ':', 0}; + DWORD flags = *pflags; + WCHAR *cmdline, *word, *end, *next; + int rc = RC_INITERROR; + + cmdline = _wcsdup(GetCommandLineW()); + if (cmdline == NULL) + return rc; + /* Skip first arg, which is the program name */ - argvW++; - - while (argc > 1) + if ((rc = find_end_of_word(cmdline, &word)) != RC_OK) + goto out; + word = skip_whitespace(word); + + while (*word) { - argc--; - WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(*argvW)); + WCHAR first; + if ((rc = find_end_of_word(word, &end)) != RC_OK) + goto out; + + next = skip_whitespace(end); + first = word[0]; + *end = '\0'; + strip_quotes(word, &end); + WINE_TRACE("Processing Arg: '%s'\n", wine_dbgstr_w(word)); /* First non-switch parameter is source, second is destination */ - if (*argvW[0] != '/') { + if (first != '/') { if (suppliedsource[0] == 0x00) { - lstrcpyW(suppliedsource, *argvW); + lstrcpyW(suppliedsource, word); } else if (supplieddestination[0] == 0x00) { - lstrcpyW(supplieddestination, *argvW); + lstrcpyW(supplieddestination, word); } else { XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARMS)); - return RC_INITERROR; + goto out; } } else { /* Process all the switch options Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - switch (toupper(argvW[0][1])) { + switch (toupper(word[1])) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; case 'Q': flags |= OPT_QUIET; break; @@ -180,19 +312,19 @@ /* E can be /E or /EXCLUDE */ case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - &argvW[0][1], 8, + &word[1], 8, EXCLUDE, -1) == 2) { - if (XCOPY_ProcessExcludeList(&argvW[0][9])) { + if (XCOPY_ProcessExcludeList(&word[9])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } else flags |= OPT_EXCLUDELIST; } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; break; /* D can be /D or /D: */ - case 'D': if ((argvW[0][2])==':' && isdigit(argvW[0][3])) { + case 'D': if (word[2]==':' && isdigit(word[3])) { SYSTEMTIME st; - WCHAR *pos = &argvW[0][3]; + WCHAR *pos = &word[3]; BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); @@ -211,6 +343,7 @@ /* Parse the arg : Day */ if (!isError) { st.wYear = _wtol(pos); + while (*pos && isdigit(*pos)) pos++; if (st.wYear < 100) st.wYear+=2000; } @@ -231,83 +364,37 @@ wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); } else { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - return RC_INITERROR; + goto out; } } else { flags |= OPT_DATENEWER; } break; - case '-': if (toupper(argvW[0][2])=='Y') + case '-': if (toupper(word[2])=='Y') flags &= ~OPT_NOPROMPT; break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - return RC_OK; + rc = RC_HELP; + goto out; default: - WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(*argvW)); - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), *argvW); - return RC_INITERROR; - } - } - argvW++; + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); + goto out; + } + } + word = next; } /* Default the destination if not supplied */ if (supplieddestination[0] == 0x00) lstrcpyW(supplieddestination, wchr_dot); - /* Trace out the supplied information */ - WINE_TRACE("Supplied parameters:\n"); - WINE_TRACE("Source : '%s'\n", wine_dbgstr_w(suppliedsource)); - WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination)); - - /* Extract required information from source specification */ - rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags); - if (rc != RC_OK) return rc; - - /* Extract required information from destination specification */ - rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem, - destinationspec, sourcespec, flags); - if (rc != RC_OK) return rc; - - /* Trace out the resulting information */ - WINE_TRACE("Resolved parameters:\n"); - WINE_TRACE("Source Stem : '%s'\n", wine_dbgstr_w(sourcestem)); - WINE_TRACE("Source Spec : '%s'\n", wine_dbgstr_w(sourcespec)); - WINE_TRACE("Dest Stem : '%s'\n", wine_dbgstr_w(destinationstem)); - WINE_TRACE("Dest Spec : '%s'\n", wine_dbgstr_w(destinationspec)); - - /* Pause if necessary */ - if (flags & OPT_PAUSE) { - DWORD count; - char pausestr[10]; - - XCOPY_wprintf(XCOPY_LoadMessage(STRING_PAUSE)); - ReadFile (GetStdHandle(STD_INPUT_HANDLE), pausestr, sizeof(pausestr), - &count, NULL); - } - - /* Now do the hard work... */ - rc = XCOPY_DoCopy(sourcestem, sourcespec, - destinationstem, destinationspec, - flags); - - /* Clear up exclude list allocated memory */ - while (excludeList) { - EXCLUDELIST *pos = excludeList; - excludeList = excludeList -> next; - HeapFree(GetProcessHeap(), 0, pos->name); - HeapFree(GetProcessHeap(), 0, pos); - } - - /* Finished - print trailer and exit */ - if (flags & OPT_SIMULATE) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_SIMCOPY), filesCopied); - } else if (!(flags & OPT_NOCOPY)) { - XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); - } - if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; + *pflags = flags; + rc = RC_OK; + + out: + free(cmdline); return rc; - } @@ -432,8 +519,10 @@ if (attribs == INVALID_FILE_ATTRIBUTES) { /* If /I supplied and wildcard copy, assume directory */ - if (flags & OPT_ASSUMEDIR && - (wcschr(srcspec, '?') || wcschr(srcspec, '*'))) { + /* Also if destination ends with backslash */ + if ((flags & OPT_ASSUMEDIR && + (wcschr(srcspec, '?') || wcschr(srcspec, '*'))) || + (supplieddestination[lstrlenW(supplieddestination)-1] == '\\')) { isDir = TRUE; Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.h [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -26,6 +26,7 @@ #define RC_CTRLC 2 #define RC_INITERROR 4 #define RC_WRITEERROR 5 +#define RC_HELP 6 #define OPT_ASSUMEDIR 0x00000001 #define OPT_RECURSIVE 0x00000002 Modified: trunk/reactos/base/applications/iexplore/iexplore.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -16,13 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine core exe" +#define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" #define WINE_FILEVERSION 6,0,2900,2180 #define WINE_FILEVERSION_STR "6.0.2900.2180" #define WINE_PRODUCTVERSION 6,0,2900,2180 #define WINE_PRODUCTVERSION_STR "6.0.2900.2180" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" Modified: trunk/reactos/base/applications/winhlp32/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Ko.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -21,49 +21,51 @@ #include "winhelp_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* Menu */ MAIN_MENU MENU { - POPUP "ÆÄÀÏ(&F)" { - MENUITEM "¿±â(&O)...", MNID_FILE_OPEN + POPUP "íì¼(&F)" { + MENUITEM "ì´ê¸°(&O)...", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "ÀÎ¼â(&P)", MNID_FILE_PRINT - MENUITEM "ÇÁ¸°ÅÍ ¼³Á¤(&S)...", MNID_FILE_SETUP + MENUITEM "ì¸ì(&P)", MNID_FILE_PRINT + MENUITEM "íë¦°í° ì¤ì (&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "Á¾·á(&E)", MNID_FILE_EXIT + MENUITEM "ì¢ë£(&E)", MNID_FILE_EXIT } - POPUP "ÆíÁý(&E)" { - MENUITEM "º¹»ç(&C)...", MNID_EDIT_COPYDLG + POPUP "í¸ì§(&E)" { + MENUITEM "ë³µì¬(&C)...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "ÁÖ¼®(&A)...", MNID_EDIT_ANNOTATE + MENUITEM "ì£¼ì(&A)...", MNID_EDIT_ANNOTATE } - POPUP "Ã¥°¥ÇÇ(&B)" { - MENUITEM "Á¤ÀÇ(&D)...", MNID_BKMK_DEFINE + POPUP "ì±ê°í¼(&B)" { + MENUITEM "ì ì(&D)...", MNID_BKMK_DEFINE } - POPUP "¿É¼Ç(&O)" { - POPUP "°¡´ÉÇÑ µµ¿ò¸» º¸ÀÌ±â" + POPUP "ìµì(&O)" { + POPUP "ê°ë¥í ëìë§ ë³´ì´ê¸°" BEGIN - MENUITEM "±âº»", MNID_OPTS_HELP_DEFAULT - MENUITEM "º¸ÀÌ±â", MNID_OPTS_HELP_VISIBLE - MENUITEM "º¸¿©ÁÖÁö ¾Ê±â", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "ê¸°ë³¸", MNID_OPTS_HELP_DEFAULT + MENUITEM "ë³´ì´ê¸°", MNID_OPTS_HELP_VISIBLE + MENUITEM "ë³´ì¬ì£¼ì§ ìê¸°", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "±â·Ï", MNID_OPTS_HISTORY - POPUP "±Û²Ã" + MENUITEM "ê¸°ë¡", MNID_OPTS_HISTORY + POPUP "ê¸ê¼´" BEGIN - MENUITEM "ÀÛ°Ô", MNID_OPTS_FONTS_SMALL - MENUITEM "º¸Åë", MNID_OPTS_FONTS_NORMAL - MENUITEM "Å©°Ô", MNID_OPTS_FONTS_LARGE + MENUITEM "ìê²", MNID_OPTS_FONTS_SMALL + MENUITEM "ë³´íµ", MNID_OPTS_FONTS_NORMAL + MENUITEM "í¬ê²", MNID_OPTS_FONTS_LARGE END - MENUITEM "½Ã½ºÅÛ »ö»ó »ç¿ë", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ìì¤í ìì ì¬ì©", MNID_OPTS_SYSTEM_COLORS } - POPUP "µµ¿ò¸»(&H)" { - MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&O)", MNID_HELP_HELPON - MENUITEM "Ç×»ó À§(&T)", MNID_HELP_HELPTOP + POPUP "ëìë§(&H)" { + MENUITEM "ëìë§ ì¬ì©ë²(&O)", MNID_HELP_HELPON + MENUITEM "íì ì(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "Á¤º¸(&I)...", MNID_HELP_ABOUT + MENUITEM "Wine ëìë§ ì ë³´(&I)...", MNID_HELP_ABOUT } } @@ -71,7 +73,7 @@ IDD_INDEX DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "ÀÎµ¦½º" +CAPTION "ì¸ë±ì¤" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } @@ -79,50 +81,50 @@ IDD_SEARCH DIALOG 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "Ã£±â" +CAPTION "ì°¾ê¸°" { - LTEXT "¾ÆÁ÷ ±¸ÇöµÇÁö ¾ÊÀ½", -1, 10, 10, 180, 150 + LTEXT "ìì§ êµ¬íëì§ ìì", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE { -STID_WINE_HELP, "Wine µµ¿ò¸»" -STID_WHERROR, "¿¡·¯" -STID_WARNING, "°æ°í" -STID_INFO, "Á¤º¸" -STID_NOT_IMPLEMENTED, "±¸ÇöµÇÁö ¾Ê¾ÒÀ½" -STID_HLPFILE_ERROR_s, "µµ¿ò¸» ÆÄÀÏ `%s'¸¦ ÀÐ´Â µµÁß ¿À·ù ¹ß»ý" -STID_INDEX, "¸ñÂ÷(&C)" -STID_CONTENTS, "¿ä¾à" -STID_BACK, "µÚ·Î(&B)" -STID_ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)" -STID_HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)" -STID_FILE_NOT_FOUND_s "%sÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù'. ÀÌ ÆÄÀÏÀ» Á÷Á¢ Ã£°Ú½À´Ï±î?" -STID_NO_RICHEDIT "richedit ±¸ÇöÀ» Ã£À»¼ö ¾÷½À´Ï´Ù.. Ãë¼ÒÁß" -STID_PSH_INDEX, "µµ¿ò¸» ¸ñÂ÷: " +STID_WINE_HELP, "Wine ëìë§" +STID_WHERROR, "ìë¬" +STID_WARNING, "ê²½ê³ " +STID_INFO, "ì ë³´" +STID_NOT_IMPLEMENTED, "êµ¬íëì§ ììì" +STID_HLPFILE_ERROR_s, "ëìë§ íì¼ `%s'ë¥¼ ì½ë ëì¤ ì¤ë¥ ë°ì" +STID_INDEX, "ëª©ì°¨(&C)" +STID_CONTENTS, "ìì½" +STID_BACK, "ë¤ë¡(&B)" +STID_ALL_FILES, "ëª¨ë íì¼ (*.*)" +STID_HELP_FILES_HLP, "ëìë§ íì¼ (*.hlp)" +STID_FILE_NOT_FOUND_s "%sì ì°¾ì ì ììµëë¤'. ì´ íì¼ì ì§ì ì°¾ê² ìµëê¹?" +STID_NO_RICHEDIT "richedit êµ¬íì ì°¾ìì ììµëë¤.. ì·¨ìì¤" +STID_PSH_INDEX, "ëìë§ ëª©ì°¨: " } CONTEXT_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "ÁÖ¼®...", MNID_CTXT_ANNOTATE - MENUITEM "º¹»ç", MNID_CTXT_COPY - MENUITEM "ÀÎ¼â...", MNID_CTXT_PRINT - POPUP "±Û²Ã" + MENUITEM "ì£¼ì...", MNID_CTXT_ANNOTATE + MENUITEM "ë³µì¬", MNID_CTXT_COPY + MENUITEM "ì¸ì...", MNID_CTXT_PRINT + POPUP "ê¸ê¼´" BEGIN - MENUITEM "Á¼°Ô", MNID_CTXT_FONTS_SMALL - MENUITEM "º¸Åë", MNID_CTXT_FONTS_NORMAL - MENUITEM "³Ð°Ô", MNID_CTXT_FONTS_LARGE + MENUITEM "ì¢ê²", MNID_CTXT_FONTS_SMALL + MENUITEM "ë³´íµ", MNID_CTXT_FONTS_NORMAL + MENUITEM "ëê²", MNID_CTXT_FONTS_LARGE END - POPUP "µµ¿ò¸» Ç×»ó º¸ÀÌ±â" + POPUP "ëìë§ íì ë³´ì´ê¸°" BEGIN - MENUITEM "±âº»", MNID_CTXT_HELP_DEFAULT - MENUITEM "º¸ÀÌ±â", MNID_CTXT_HELP_VISIBLE - MENUITEM "¾È º¸ÀÌ±â", MNID_CTXT_HELP_NONVISIBLE + MENUITEM "ê¸°ë³¸", MNID_CTXT_HELP_DEFAULT + MENUITEM "ë³´ì´ê¸°", MNID_CTXT_HELP_VISIBLE + MENUITEM "ì ë³´ì´ê¸°", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "½Ã½ºÅÛ »ö»ó »ç¿ë", MNID_CTXT_SYSTEM_COLORS + MENUITEM "ìì¤í ìì ì¬ì©", MNID_CTXT_SYSTEM_COLORS END END Modified: trunk/reactos/base/applications/winhlp32/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Zh.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -4,6 +4,7 @@ * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,7 +38,7 @@ MENUITEM "æå°(&P)", MNID_FILE_PRINT MENUITEM "æå°æºè®¾ç½®(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "éåº(&E)", MNID_FILE_EXIT + MENUITEM "éåº(&X)", MNID_FILE_EXIT } POPUP "ç¼è¾(&E)" { MENUITEM "å¤å¶(&C)...", MNID_EDIT_COPYDLG @@ -48,7 +49,7 @@ MENUITEM "å®ä¹(&D)...", MNID_BKMK_DEFINE } POPUP "éé¡¹(&O)" { - POPUP "æ¾ç¤ºå¸®å©" + POPUP "æ»æ¯æ¾ç¤ºå¸®å©" BEGIN MENUITEM "é»è®¤", MNID_OPTS_HELP_DEFAULT MENUITEM "æ¾ç¤º", MNID_OPTS_HELP_VISIBLE @@ -67,8 +68,24 @@ MENUITEM "å¦ä½ä½¿ç¨å¸®å©(&O)", MNID_HELP_HELPON MENUITEM "æ»æ¯å¨æåé¢(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "èµæä¿¡æ¯(&I)...", MNID_HELP_ABOUT + MENUITEM "å³äº Wine å¸®å©(&I)...", MNID_HELP_ABOUT } +} + +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ç´¢å¼" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "æç´¢" +{ + LTEXT "å°æªå®ç°", -1, 10, 10, 180, 150 } /* Strings */ @@ -79,16 +96,39 @@ STID_WARNING, "è¦å" STID_INFO, "ä¿¡æ¯" STID_NOT_IMPLEMENTED, "æªå®ç°" -STID_HLPFILE_ERROR_s, "è¯»å¥å¸®å©æä»¶ â%sâ æ¶åçéè¯¯" -STID_INDEX, "åå®¹(&C)" +STID_HLPFILE_ERROR_s, "è¯»å¥å¸®å©æä»¶â%sâæ¶åçéè¯¯" +STID_INDEX, "ç´¢å¼(&I)" STID_CONTENTS, "æ¦è¦" STID_BACK, "è¿å(&B)" STID_ALL_FILES, "æææä»¶ (*.*)" STID_HELP_FILES_HLP, "å¸®å©æä»¶ (*.hlp)" -STID_FILE_NOT_FOUND_s "ä¸è½æå¼æä»¶ '%s'. ä½ æ³è¦èªå·±æ¾è¿ä¸ªæä»¶å?" -STID_NO_RICHEDIT "æ¾ä¸å° richedit... ç»æ¢" -STID_PSH_INDEX, "å¸®å©åå®¹: " +STID_FILE_NOT_FOUND_s "æ¾ä¸å°æä»¶â%sâã ä½ æ³è¦èªå·±æ¾è¿ä¸ªæä»¶åï¼" +STID_NO_RICHEDIT "æ¾ä¸å° richedit çå®ç°â¦â¦ç»æ¢" +STID_PSH_INDEX, "å¸®å©ä¸»é¢ï¼" } + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "æ³¨é...", MNID_CTXT_ANNOTATE + MENUITEM "å¤å¶", MNID_CTXT_COPY + MENUITEM "æå°...", MNID_CTXT_PRINT + POPUP "åä½" + BEGIN + MENUITEM "å°å·", MNID_CTXT_FONTS_SMALL + MENUITEM "ä¸å·", MNID_CTXT_FONTS_NORMAL + MENUITEM "å¤§å·", MNID_CTXT_FONTS_LARGE + END + POPUP "æ»æ¯æ¾ç¤ºå¸®å©" + BEGIN + MENUITEM "é»è®¤", MNID_CTXT_HELP_DEFAULT + MENUITEM "æ¾ç¤º", MNID_CTXT_HELP_VISIBLE + MENUITEM "ä¸æ¾ç¤º", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "ä½¿ç¨ç³»ç»é¢è²", MNID_CTXT_SYSTEM_COLORS + END +END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -30,7 +30,6 @@ #include "Es.rc" #include "Fi.rc" #include "Hu.rc" -#include "Ko.rc" #include "No.rc" #include "Pl.rc" #include "Sk.rc" @@ -44,6 +43,7 @@ #include "He.rc" #include "It.rc" #include "Ja.rc" +#include "Ko.rc" #include "Lt.rc" #include "Nl.rc" #include "Pt.rc" Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -61,7 +61,7 @@ MENUITEM SEPARATOR POPUP "å¶ä»(&X)" BEGIN - MENUITEM "éä¸ä¿¡æ¯(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "éä¸ä¿¡æ¯(&I)", ID_EDIT_SELECTIONINFO /* åç¡®æ§å¾è®® */ MENUITEM "æåæ ¼å¼(&F)", ID_EDIT_CHARFORMAT MENUITEM "é»è®¤æ ¼å¼(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "æ®µè½æ ¼å¼(&H)", ID_EDIT_PARAFORMAT @@ -118,7 +118,7 @@ BEGIN MENUITEM "é»è²", ID_COLOR_BLACK /* æªæ¾å°âæ åè¯åè¡¨â */ MENUITEM "æ è²", ID_COLOR_MAROON - MENUITEM "è°åç»¿", ID_COLOR_GREEN + MENUITEM "ç»¿è²", ID_COLOR_GREEN MENUITEM "æ©æ¦è²" ID_COLOR_OLIVE MENUITEM "èé" ID_COLOR_NAVY MENUITEM "ç´«è²" ID_COLOR_PURPLE @@ -126,7 +126,7 @@ MENUITEM "ç°è²" ID_COLOR_GRAY MENUITEM "é¶è²" ID_COLOR_SILVER MENUITEM "çº¢è²" ID_COLOR_RED - MENUITEM "ç»¿è²" ID_COLOR_LIME + MENUITEM "éæ è²" ID_COLOR_LIME MENUITEM "é»è²" ID_COLOR_YELLOW MENUITEM "èè²" ID_COLOR_BLUE MENUITEM "æ´çº¢" ID_COLOR_FUCHSIA /* =magenta? */ Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -162,7 +162,7 @@ button.iBitmap = nImage; button.idCommand = nCommand; button.fsState = TBSTATE_ENABLED; - button.fsStyle = TBSTYLE_BUTTON; + button.fsStyle = BTNS_BUTTON; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -176,7 +176,7 @@ button.iBitmap = -1; button.idCommand = 0; button.fsState = 0; - button.fsStyle = TBSTYLE_SEP; + button.fsStyle = BTNS_SEP; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -1818,7 +1818,7 @@ if(!SendMessageW(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|BTNS_BUTTON, IDC_TOOLBAR, 1, hInstance, IDB_TOOLBAR, NULL, 0, @@ -1880,7 +1880,7 @@ SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, - CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, + CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); Added: trunk/reactos/base/applications/write/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Sr… ============================================================================== --- trunk/reactos/base/applications/write/Sr.rc (added) +++ trunk/reactos/base/applications/write/Sr.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -1,0 +1,38 @@ +/* + * Serbian language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright 2010 ÄorÄe VasiljeviÄ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_FAILED, "ÐÐ¾ÐºÑÐµÑÐ°ÑÐµ ÐÐ¸ÑÐ°Ð½ÐºÐµ Ð½Ð¸ÑÐµ ÑÑÐ¿ÐµÐ»Ð¾" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_FAILED, "Pokretanje Pisanke nije uspelo" +} Propchange: trunk/reactos/base/applications/write/Sr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/write/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Zh… ============================================================================== --- trunk/reactos/base/applications/write/Zh.rc (added) +++ trunk/reactos/base/applications/write/Zh.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -1,0 +1,31 @@ +/* + * Simplified Chinese language support + * + * Copyright (C) 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE +{ + IDS_FAILED, "å¯å¨ååæ¿å¤±è´¥" +} Propchange: trunk/reactos/base/applications/write/Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Sun Dec 26 16:25:30 2010 @@ -39,4 +39,6 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sr.rc" #include "Uk.rc" +#include "Zh.rc"

13 years, 10 months

[tkreuzer] 50148: [VMX_SVGA] Convert a pointer to a WCHAR string to an array of WCHARs to fix sizeof calculation. CID 10404

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 26 15:04:02 2010 New Revision: 50148 URL: http://svn.reactos.org/svn/reactos?rev=50148&view=rev Log: [VMX_SVGA] Convert a pointer to a WCHAR string to an array of WCHARs to fix sizeof calculation. CID 10404 Modified: trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c Modified: trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vmx… ============================================================================== --- trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c [iso-8859-1] Sun Dec 26 15:04:02 2010 @@ -14,7 +14,7 @@ /* GLOBALS ********************************************************************/ PHW_DEVICE_EXTENSION VmxDeviceExtensionArray[SVGA_MAX_DISPLAYS]; -static PWCHAR AdapterString = L"VMware SVGA II"; +static WCHAR AdapterString[] = L"VMware SVGA II"; /* FUNCTIONS ******************************************************************/ @@ -64,17 +64,17 @@ VmxIsMultiMon(IN PHW_DEVICE_EXTENSION DeviceExtension) { ULONG Capabilities; - + /* Get the caps */ Capabilities = DeviceExtension->Capabilities; - + /* Check for multi-mon support */ if ((Capabilities & SVGA_CAP_MULTIMON) && (Capabilities & SVGA_CAP_PITCHLOCK)) { /* Query the monitor count */ if (VmxReadUlong(DeviceExtension, SVGA_REG_NUM_DISPLAYS) > 1) return TRUE; } - + /* Either no support, or just one screen */ return FALSE; } @@ -90,10 +90,10 @@ VP_STATUS Status; PHW_DEVICE_EXTENSION DeviceExtension = HwDeviceExtension; DPRINT1("VMX searching for adapter\n"); - + /* Zero out the fields */ VideoPortZeroMemory(DeviceExtension, sizeof(HW_DEVICE_EXTENSION)); - + /* Validate the Config Info */ if (ConfigInfo->Length < sizeof(VIDEO_PORT_CONFIG_INFO)) { @@ -101,21 +101,21 @@ DPRINT1("Invalid configuration info\n"); return ERROR_INVALID_PARAMETER; } - + /* Initialize the device extension and find the adapter */ Status = VmxInitDevice(DeviceExtension); DPRINT1("Init status: %lx\n", Status); if (Status != NO_ERROR) return ERROR_DEV_NOT_EXIST; - + /* Save this adapter extension */ VmxDeviceExtensionArray[0] = DeviceExtension; - + /* Create the sync event */ VideoPortCreateEvent(DeviceExtension, NOTIFICATION_EVENT, NULL, &DeviceExtension->SyncEvent); - + /* Check for multi-monitor configuration */ if (VmxIsMultiMon(DeviceExtension)) { @@ -123,14 +123,14 @@ UNIMPLEMENTED; while (TRUE); } - + /* Zero the frame buffer */ - VideoPortZeroMemory((PVOID)DeviceExtension->FrameBuffer.LowPart, + VideoPortZeroMemory((PVOID)DeviceExtension->FrameBuffer.LowPart, DeviceExtension->VramSize.LowPart); - + /* Initialize the video modes */ VmxInitModes(DeviceExtension); - + /* Setup registry keys */ VideoPortSetRegistryParameters(DeviceExtension, L"HardwareInformation.ChipType", @@ -152,7 +152,7 @@ L"HardwareInformation.BiosString", AdapterString, sizeof(AdapterString)); - + /* No VDM support */ ConfigInfo->NumEmulatorAccessEntries = 0; ConfigInfo->EmulatorAccessEntries = 0; @@ -160,7 +160,7 @@ ConfigInfo->HardwareStateSize = 0; ConfigInfo->VdmPhysicalVideoMemoryAddress.QuadPart = 0; ConfigInfo->VdmPhysicalVideoMemoryLength = 0; - + /* Write that this is Windows XP or higher */ VmxWriteUlong(DeviceExtension, SVGA_REG_GUEST_ID, 0x5000 | 0x08); return NO_ERROR; @@ -252,7 +252,7 @@ DPRINT1("VMX-SVGAII Loading...\n"); VideoPortZeroMemory(VmxDeviceExtensionArray, sizeof(VmxDeviceExtensionArray)); VideoPortZeroMemory(&InitData, sizeof(InitData)); - + /* Setup the initialization structure with VideoPort */ InitData.HwInitDataSize = sizeof(VIDEO_HW_INITIALIZATION_DATA); InitData.HwFindAdapter = VmxFindAdapter;

13 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010