Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 58567: [PROPSYS] * Import from Wine 1.5.26.
by akhaldi＠svn.reactos.org 22 Mar '13

22 Mar '13

Author: akhaldi Date: Fri Mar 22 12:08:04 2013 New Revision: 58567 URL: http://svn.reactos.org/svn/reactos?rev=58567&view=rev Log: [PROPSYS] * Import from Wine 1.5.26. Added: trunk/reactos/dll/win32/propsys/ (with props) trunk/reactos/dll/win32/propsys/CMakeLists.txt (with props) trunk/reactos/dll/win32/propsys/propstore.c (with props) trunk/reactos/dll/win32/propsys/propsys.rc (with props) trunk/reactos/dll/win32/propsys/propsys.spec (with props) trunk/reactos/dll/win32/propsys/propsys_classes.idl (with props) trunk/reactos/dll/win32/propsys/propsys_classes.rgs (with props) trunk/reactos/dll/win32/propsys/propsys_main.c (with props) trunk/reactos/dll/win32/propsys/propsys_private.h (with props) trunk/reactos/dll/win32/propsys/propvar.c (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -145,6 +145,7 @@ add_subdirectory(pidgen) add_subdirectory(powrprof) add_subdirectory(printui) +add_subdirectory(propsys) add_subdirectory(psapi) add_subdirectory(pstorec) add_subdirectory(qmgr) Propchange: trunk/reactos/dll/win32/propsys/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Mar 22 12:08:04 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/propsys/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/propsys/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/propsys/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/propsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/propsys/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/propsys/CMakeLists.txt [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,20 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) + +spec2def(propsys.dll propsys.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + propstore.c + propsys_main.c + propvar.c + propsys.rc + ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/propsys.def) + +add_library(propsys SHARED ${SOURCE}) +set_module_type(propsys win32dll) +target_link_libraries(propsys uuid wine) +add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll) +add_dependencies(propsys psdk) +add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/propsys/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propstor… ============================================================================== --- trunk/reactos/dll/win32/propsys/propstore.c (added) +++ trunk/reactos/dll/win32/propsys/propstore.c [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,481 @@ +/* + * standard IPropertyStore implementation + * + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * 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 + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#include <config.h> + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +//#include "rpcproxy.h" +#include <propsys.h> +#include <wine/debug.h> +//#include "wine/unicode.h" +#include <wine/list.h> + +#include <initguid.h> +//#include "propsys_private.h" + +DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae); + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + +typedef struct { + struct list entry; + DWORD pid; + PROPVARIANT propvar; + PSC_STATE state; +} propstore_value; + +typedef struct { + struct list entry; + GUID fmtid; + struct list values; /* list of struct propstore_value */ + DWORD count; +} propstore_format; + +typedef struct { + IPropertyStoreCache IPropertyStoreCache_iface; + LONG ref; + CRITICAL_SECTION lock; + struct list formats; /* list of struct propstore_format */ +} PropertyStore; + +static inline PropertyStore *impl_from_IPropertyStoreCache(IPropertyStoreCache *iface) +{ + return CONTAINING_RECORD(iface, PropertyStore, IPropertyStoreCache_iface); +} + +static HRESULT WINAPI PropertyStore_QueryInterface(IPropertyStoreCache *iface, REFIID iid, + void **ppv) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IPropertyStore, iid) || + IsEqualIID(&IID_IPropertyStoreCache, iid)) + { + *ppv = &This->IPropertyStoreCache_iface; + } + else + { + FIXME("No interface for %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static void destroy_format(propstore_format *format) +{ + propstore_value *cursor, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &format->values, propstore_value, entry) + { + PropVariantClear(&cursor->propvar); + HeapFree(GetProcessHeap(), 0, cursor); + } + HeapFree(GetProcessHeap(), 0, format); +} + +static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + propstore_format *cursor, *cursor2; + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->formats, propstore_format, entry) + destroy_format(cursor); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PropertyStore_GetCount(IPropertyStoreCache *iface, + DWORD *cProps) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format; + + TRACE("%p,%p\n", iface, cProps); + + if (!cProps) + return E_POINTER; + + *cProps = 0; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format, &This->formats, propstore_format, entry) + *cProps += format->count; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, + DWORD iProp, PROPERTYKEY *pkey) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format=NULL, *format_candidate; + propstore_value *value; + HRESULT hr; + + TRACE("%p,%d,%p\n", iface, iProp, pkey); + + if (!pkey) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format_candidate, &This->formats, propstore_format, entry) + { + if (format_candidate->count > iProp) + { + format = format_candidate; + pkey->fmtid = format->fmtid; + break; + } + + iProp -= format_candidate->count; + } + + if (format) + { + LIST_FOR_EACH_ENTRY(value, &format->values, propstore_value, entry) + { + if (iProp == 0) + { + pkey->pid = value->pid; + break; + } + + iProp--; + } + + hr = S_OK; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key, + int insert, propstore_value **result) +{ + propstore_format *format=NULL, *format_candidate; + propstore_value *value=NULL, *value_candidate; + + if (IsEqualGUID(&key->fmtid, &FMTID_NamedProperties)) + { + /* This is used in the property store format [MS-PROPSTORE] + * for named values and probably gets special treatment. */ + ERR("don't know how to handle FMTID_NamedProperties\n"); + return E_FAIL; + } + + LIST_FOR_EACH_ENTRY(format_candidate, &This->formats, propstore_format, entry) + { + if (IsEqualGUID(&format_candidate->fmtid, &key->fmtid)) + { + format = format_candidate; + break; + } + } + + if (!format) + { + if (!insert) + return TYPE_E_ELEMENTNOTFOUND; + + format = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format)); + if (!format) + return E_OUTOFMEMORY; + + format->fmtid = key->fmtid; + list_init(&format->values); + list_add_tail(&This->formats, &format->entry); + } + + LIST_FOR_EACH_ENTRY(value_candidate, &format->values, propstore_value, entry) + { + if (value_candidate->pid == key->pid) + { + value = value_candidate; + break; + } + } + + if (!value) + { + if (!insert) + return TYPE_E_ELEMENTNOTFOUND; + + value = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*value)); + if (!value) + return E_OUTOFMEMORY; + + value->pid = key->pid; + list_add_tail(&format->values, &value->entry); + format->count++; + } + + *result = value; + + return S_OK; +} + +static HRESULT WINAPI PropertyStore_GetValue(IPropertyStoreCache *iface, + REFPROPERTYKEY key, PROPVARIANT *pv) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p\n", iface, key, pv); + + if (!pv) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(pv, &value->propvar); + else if (hr == TYPE_E_ELEMENTNOTFOUND) + { + PropVariantInit(pv); + hr = S_OK; + } + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT WINAPI PropertyStore_SetValue(IPropertyStoreCache *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + PROPVARIANT temp; + + TRACE("%p,%p,%p\n", iface, key, propvar); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 1, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(&temp, propvar); + + if (SUCCEEDED(hr)) + { + PropVariantClear(&value->propvar); + value->propvar = temp; + } + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT WINAPI PropertyStore_Commit(IPropertyStoreCache *iface) +{ + FIXME("%p: stub\n", iface); + return S_OK; +} + +static HRESULT WINAPI PropertyStore_GetState(IPropertyStoreCache *iface, + REFPROPERTYKEY key, PSC_STATE *pstate) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p\n", iface, key, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + *pstate = value->state; + + LeaveCriticalSection(&This->lock); + + if (FAILED(hr)) + *pstate = PSC_NORMAL; + + return hr; +} + +static HRESULT WINAPI PropertyStore_GetValueAndState(IPropertyStoreCache *iface, + REFPROPERTYKEY key, PROPVARIANT *ppropvar, PSC_STATE *pstate) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p,%p\n", iface, key, ppropvar, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(ppropvar, &value->propvar); + + if (SUCCEEDED(hr)) + *pstate = value->state; + + LeaveCriticalSection(&This->lock); + + if (FAILED(hr)) + { + PropVariantInit(ppropvar); + *pstate = PSC_NORMAL; + } + + return hr; +} + +static HRESULT WINAPI PropertyStore_SetState(IPropertyStoreCache *iface, + REFPROPERTYKEY key, PSC_STATE pstate) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%d\n", iface, key, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + value->state = pstate; + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, + REFPROPERTYKEY key, const PROPVARIANT *ppropvar, PSC_STATE state) +{ + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + PROPVARIANT temp; + + TRACE("%p,%p,%p,%d\n", iface, key, ppropvar, state); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 1, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(&temp, ppropvar); + + if (SUCCEEDED(hr)) + { + PropVariantClear(&value->propvar); + value->propvar = temp; + value->state = state; + } + + LeaveCriticalSection(&This->lock); + + return hr; +} + +static const IPropertyStoreCacheVtbl PropertyStore_Vtbl = { + PropertyStore_QueryInterface, + PropertyStore_AddRef, + PropertyStore_Release, + PropertyStore_GetCount, + PropertyStore_GetAt, + PropertyStore_GetValue, + PropertyStore_SetValue, + PropertyStore_Commit, + PropertyStore_GetState, + PropertyStore_GetValueAndState, + PropertyStore_SetState, + PropertyStore_SetValueAndState +}; + +HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + PropertyStore *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyStore)); + if (!This) return E_OUTOFMEMORY; + + This->IPropertyStoreCache_iface.lpVtbl = &PropertyStore_Vtbl; + This->ref = 1; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStore.lock"); + list_init(&This->formats); + + ret = IPropertyStoreCache_QueryInterface(&This->IPropertyStoreCache_iface, iid, ppv); + IPropertyStoreCache_Release(&This->IPropertyStoreCache_iface); + + return ret; +} Propchange: trunk/reactos/dll/win32/propsys/propstore.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys.rc (added) +++ trunk/reactos/dll/win32/propsys/propsys.rc [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,1 @@ +1 WINE_REGISTRY propsys_classes.rgs Propchange: trunk/reactos/dll/win32/propsys/propsys.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys.spec (added) +++ trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,210 @@ + 3 stub GetProxyDllInfo + +400 stub PROPSYS_400 +402 stub PROPSYS_402 +403 stub PROPSYS_403 +404 stub PROPSYS_404 +405 stub PROPSYS_405 +406 stub PROPSYS_406 +407 stub PROPSYS_407 +408 stub PROPSYS_408 +409 stub PROPSYS_409 +410 stub PROPSYS_410 +411 stub PROPSYS_411 +412 stub PROPSYS_412 +413 stub PROPSYS_413 +414 stub PROPSYS_414 +415 stub PROPSYS_415 +416 stub PROPSYS_416 +417 stub PROPSYS_417 +418 stub PROPSYS_418 +420 stub PROPSYS_420 +421 stub PROPSYS_421 +422 stub PROPSYS_422 + +@ stub ClearPropVariantArray +@ stub ClearVariantArray +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub InitPropVariantFromBooleanVector +@ stdcall InitPropVariantFromBuffer(ptr long ptr) +@ stub InitPropVariantFromCLSID +@ stub InitPropVariantFromDoubleVector +@ stub InitPropVariantFromFileTime +@ stub InitPropVariantFromFileTimeVector +@ stdcall InitPropVariantFromGUIDAsString(ptr ptr) +@ stub InitPropVariantFromInt16Vector +@ stub InitPropVariantFromInt32Vector +@ stub InitPropVariantFromInt64Vector +@ stub InitPropVariantFromPropVariantVectorElem +@ stub InitPropVariantFromResource +@ stub InitPropVariantFromStrRet +@ stub InitPropVariantFromStringAsVector +@ stub InitPropVariantFromStringVector +@ stub InitPropVariantFromUInt16Vector +@ stub InitPropVariantFromUInt32Vector +@ stub InitPropVariantFromUInt64Vector +@ stub InitPropVariantVectorFromPropVariant +@ stub InitVariantFromBooleanArray +@ stdcall InitVariantFromBuffer(ptr long ptr) +@ stub InitVariantFromDoubleArray +@ stub InitVariantFromFileTime +@ stub InitVariantFromFileTimeArray +@ stdcall InitVariantFromGUIDAsString(ptr ptr) +@ stub InitVariantFromInt16Array +@ stub InitVariantFromInt32Array +@ stub InitVariantFromInt64Array +@ stub InitVariantFromResource +@ stub InitVariantFromStrRet +@ stub InitVariantFromStringArray +@ stub InitVariantFromUInt16Array +@ stub InitVariantFromUInt32Array +@ stub InitVariantFromUInt64Array +@ stub InitVariantFromVariantArrayElem +@ stub PSCoerceToCanonicalValue +@ stub PSCreateAdapterFromPropertyStore +@ stub PSCreateDelayedMultiplexPropertyStore +@ stub PSCreateMemoryPropertyStore +@ stub PSCreateMultiplexPropertyStore +@ stub PSCreatePropertyChangeArray +@ stub PSCreatePropertyStoreFromObject +@ stub PSCreatePropertyStoreFromPropertySetStorage +@ stub PSCreateSimplePropertyChange +@ stub PSEnumeratePropertyDescriptions +@ stub PSFormatForDisplay +@ stub PSFormatForDisplayAlloc +@ stub PSFormatPropertyValue +@ stub PSGetItemPropertyHandler +@ stub PSGetItemPropertyHandlerWithCreateObject +@ stub PSGetNameFromPropertyKey +@ stub PSGetNamedPropertyFromPropertyStorage +@ stdcall PSGetPropertyDescription(ptr ptr ptr) +@ stub PSGetPropertyDescriptionByName +@ stub PSGetPropertyDescriptionListFromString +@ stub PSGetPropertyFromPropertyStorage +@ stub PSGetPropertyKeyFromName +@ stub PSGetPropertySystem +@ stub PSGetPropertyValue +@ stub PSLookupPropertyHandlerCLSID +@ stdcall PSPropertyKeyFromString(wstr ptr) +@ stdcall PSRefreshPropertySchema() +@ stdcall PSRegisterPropertySchema(wstr) +@ stub PSSetPropertyValue +@ stdcall PSStringFromPropertyKey(ptr ptr long) +@ stdcall PSUnregisterPropertySchema(wstr) +@ stdcall PropVariantChangeType(ptr ptr long long) +@ stdcall PropVariantCompareEx(ptr ptr long long) +@ stub PropVariantGetBooleanElem +@ stub PropVariantGetDoubleElem +@ stub PropVariantGetElementCount +@ stub PropVariantGetFileTimeElem +@ stub PropVariantGetInt16Elem +@ stub PropVariantGetInt32Elem +@ stub PropVariantGetInt64Elem +@ stub PropVariantGetStringElem +@ stub PropVariantGetUInt16Elem +@ stub PropVariantGetUInt32Elem +@ stub PropVariantGetUInt64Elem +@ stub PropVariantToBSTR +@ stub PropVariantToBoolean +@ stub PropVariantToBooleanVector +@ stub PropVariantToBooleanVectorAlloc +@ stub PropVariantToBooleanWithDefault +@ stub PropVariantToBuffer +@ stub PropVariantToDouble +@ stub PropVariantToDoubleVector +@ stub PropVariantToDoubleVectorAlloc +@ stub PropVariantToDoubleWithDefault +@ stub PropVariantToFileTime +@ stub PropVariantToFileTimeVector +@ stub PropVariantToFileTimeVectorAlloc +@ stdcall PropVariantToGUID(ptr ptr) +@ stdcall PropVariantToInt16(ptr ptr) +@ stub PropVariantToInt16Vector +@ stub PropVariantToInt16VectorAlloc +@ stub PropVariantToInt16WithDefault +@ stdcall PropVariantToInt32(ptr ptr) +@ stub PropVariantToInt32Vector +@ stub PropVariantToInt32VectorAlloc +@ stub PropVariantToInt32WithDefault +@ stdcall PropVariantToInt64(ptr ptr) +@ stub PropVariantToInt64Vector +@ stub PropVariantToInt64VectorAlloc +@ stub PropVariantToInt64WithDefault +@ stub PropVariantToStrRet +@ stub PropVariantToString +@ stub PropVariantToStringAlloc +@ stub PropVariantToStringVector +@ stub PropVariantToStringVectorAlloc +@ stub PropVariantToStringWithDefault +@ stdcall PropVariantToUInt16(ptr ptr) +@ stub PropVariantToUInt16Vector +@ stub PropVariantToUInt16VectorAlloc +@ stub PropVariantToUInt16WithDefault +@ stdcall PropVariantToUInt32(ptr ptr) +@ stub PropVariantToUInt32Vector +@ stub PropVariantToUInt32VectorAlloc +@ stub PropVariantToUInt32WithDefault +@ stdcall PropVariantToUInt64(ptr ptr) +@ stub PropVariantToUInt64Vector +@ stub PropVariantToUInt64VectorAlloc +@ stub PropVariantToUInt64WithDefault +@ stub PropVariantToVariant +@ stub StgDeserializePropVariant +@ stub StgSerializePropVariant +@ stub VariantCompare +@ stub VariantGetBooleanElem +@ stub VariantGetDoubleElem +@ stub VariantGetElementCount +@ stub VariantGetInt16Elem +@ stub VariantGetInt32Elem +@ stub VariantGetInt64Elem +@ stub VariantGetStringElem +@ stub VariantGetUInt16Elem +@ stub VariantGetUInt32Elem +@ stub VariantGetUInt64Elem +@ stub VariantToBoolean +@ stub VariantToBooleanArray +@ stub VariantToBooleanArrayAlloc +@ stub VariantToBooleanWithDefault +@ stub VariantToBuffer +@ stub VariantToDosDateTime +@ stub VariantToDouble +@ stub VariantToDoubleArray +@ stub VariantToDoubleArrayAlloc +@ stub VariantToDoubleWithDefault +@ stub VariantToFileTime +@ stdcall VariantToGUID(ptr ptr) +@ stub VariantToInt16 +@ stub VariantToInt16Array +@ stub VariantToInt16ArrayAlloc +@ stub VariantToInt16WithDefault +@ stub VariantToInt32 +@ stub VariantToInt32Array +@ stub VariantToInt32ArrayAlloc +@ stub VariantToInt32WithDefault +@ stub VariantToInt64 +@ stub VariantToInt64Array +@ stub VariantToInt64ArrayAlloc +@ stub VariantToInt64WithDefault +@ stub VariantToPropVariant +@ stub VariantToStrRet +@ stub VariantToString +@ stub VariantToStringAlloc +@ stub VariantToStringArray +@ stub VariantToStringArrayAlloc +@ stub VariantToStringWithDefault +@ stub VariantToUInt16 +@ stub VariantToUInt16Array +@ stub VariantToUInt16ArrayAlloc +@ stub VariantToUInt16WithDefault +@ stub VariantToUInt32 +@ stub VariantToUInt32Array +@ stub VariantToUInt32ArrayAlloc +@ stub VariantToUInt32WithDefault +@ stub VariantToUInt64 +@ stub VariantToUInt64Array +@ stub VariantToUInt64ArrayAlloc +@ stub VariantToUInt64WithDefault Propchange: trunk/reactos/dll/win32/propsys/propsys.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_classes.idl (added) +++ trunk/reactos/dll/win32/propsys/propsys_classes.idl [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,26 @@ +/* + * Coclasses for propsys + * + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * 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 + */ + +[ + helpstring("Packed Property Storage Object"), + threading(both), + uuid(9a02e012-6303-4e1e-b9a1-630f802592c5) +] +coclass InMemoryPropertyStore { interface IPropertyStoreCache; } Propchange: trunk/reactos/dll/win32/propsys/propsys_classes.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_classes.rgs (added) +++ trunk/reactos/dll/win32/propsys/propsys_classes.rgs [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,13 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{9A02E012-6303-4E1E-B9A1-630F802592C5}' = s 'Packed Property Storage Object' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } +} Propchange: trunk/reactos/dll/win32/propsys/propsys_classes.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_main.c (added) +++ trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,404 @@ +/* + * propsys main + * + * Copyright 1997, 2002 Alexandre Julliard + * Copyright 2008 James Hawkins + * + * 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 + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#include <config.h> + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <rpcproxy.h> +#include <propsys.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "propsys_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + +static HINSTANCE propsys_hInstance; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + propsys_hInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( propsys_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( propsys_hInstance ); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + + return S_OK; +} + +static HRESULT WINAPI InMemoryPropertyStoreFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(outer, riid, ppv); +} + +static const IClassFactoryVtbl InMemoryPropertyStoreFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + InMemoryPropertyStoreFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory InMemoryPropertyStoreFactory = { &InMemoryPropertyStoreFactoryVtbl }; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + if(IsEqualGUID(&CLSID_InMemoryPropertyStore, rclsid)) { + TRACE("(CLSID_InMemoryPropertyStore %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&InMemoryPropertyStoreFactory, riid, ppv); + } + + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) +{ + FIXME("%s stub\n", debugstr_w(path)); + + return S_OK; +} + +HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) +{ + FIXME("%s stub\n", debugstr_w(path)); + + return E_NOTIMPL; +} + +HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p, %p, %p\n", propkey, riid, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI PSRefreshPropertySchema(void) +{ + FIXME("\n"); + return S_OK; +} + +HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) +{ + static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; + static const WCHAR pid_fmtW[] = {'%','u',0}; + + WCHAR pidW[PKEY_PIDSTR_MAX + 1]; + LPWSTR p = psz; + int len; + + TRACE("(%p, %p, %u)\n", pkey, psz, cch); + + if (!psz) + return E_POINTER; + + /* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */ + if (cch <= GUIDSTRING_MAX + 1) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (!pkey) + { + psz[0] = '\0'; + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, + pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], + pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], + pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); + + /* Overwrite the null terminator with the space character. */ + p += GUIDSTRING_MAX - 1; + *p++ = ' '; + cch -= GUIDSTRING_MAX - 1 + 1; + + len = sprintfW(pidW, pid_fmtW, pkey->pid); + + if (cch >= len + 1) + { + strcpyW(p, pidW); + return S_OK; + } + else + { + WCHAR *ptr = pidW + len - 1; + + psz[0] = '\0'; + *p++ = '\0'; + cch--; + + /* Replicate a quirk of the native implementation where the contents + * of the property ID string are written backwards to the output + * buffer, skipping the rightmost digit. */ + if (cch) + { + ptr--; + while (cch--) + *p++ = *ptr--; + } + + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } +} + +static const BYTE hex2bin[] = +{ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ +}; + +static BOOL validate_indices(LPCWSTR s, int min, int max) +{ + int i; + + for (i = min; i <= max; i++) + { + if (!s[i]) + return FALSE; + + if (i == 0) + { + if (s[i] != '{') + return FALSE; + } + else if (i == 9 || i == 14 || i == 19 || i == 24) + { + if (s[i] != '-') + return FALSE; + } + else if (i == 37) + { + if (s[i] != '}') + return FALSE; + } + else + { + if (s[i] > 'f' || (!hex2bin[s[i]] && s[i] != '0')) + return FALSE; + } + } + + return TRUE; +} + +/* Adapted from CLSIDFromString helper in dlls/ole32/compobj.c and + * UuidFromString in dlls/rpcrt4/rpcrt4_main.c. */ +static BOOL string_to_guid(LPCWSTR s, LPGUID id) +{ + /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ + + if (!validate_indices(s, 0, 8)) return FALSE; + id->Data1 = (hex2bin[s[1]] << 28 | hex2bin[s[2]] << 24 | hex2bin[s[3]] << 20 | hex2bin[s[4]] << 16 | + hex2bin[s[5]] << 12 | hex2bin[s[6]] << 8 | hex2bin[s[7]] << 4 | hex2bin[s[8]]); + if (!validate_indices(s, 9, 14)) return FALSE; + id->Data2 = hex2bin[s[10]] << 12 | hex2bin[s[11]] << 8 | hex2bin[s[12]] << 4 | hex2bin[s[13]]; + if (!validate_indices(s, 15, 19)) return FALSE; + id->Data3 = hex2bin[s[15]] << 12 | hex2bin[s[16]] << 8 | hex2bin[s[17]] << 4 | hex2bin[s[18]]; + + /* these are just sequential bytes */ + + if (!validate_indices(s, 20, 21)) return FALSE; + id->Data4[0] = hex2bin[s[20]] << 4 | hex2bin[s[21]]; + if (!validate_indices(s, 22, 24)) return FALSE; + id->Data4[1] = hex2bin[s[22]] << 4 | hex2bin[s[23]]; + + if (!validate_indices(s, 25, 26)) return FALSE; + id->Data4[2] = hex2bin[s[25]] << 4 | hex2bin[s[26]]; + if (!validate_indices(s, 27, 28)) return FALSE; + id->Data4[3] = hex2bin[s[27]] << 4 | hex2bin[s[28]]; + if (!validate_indices(s, 29, 30)) return FALSE; + id->Data4[4] = hex2bin[s[29]] << 4 | hex2bin[s[30]]; + if (!validate_indices(s, 31, 32)) return FALSE; + id->Data4[5] = hex2bin[s[31]] << 4 | hex2bin[s[32]]; + if (!validate_indices(s, 33, 34)) return FALSE; + id->Data4[6] = hex2bin[s[33]] << 4 | hex2bin[s[34]]; + if (!validate_indices(s, 35, 37)) return FALSE; + id->Data4[7] = hex2bin[s[35]] << 4 | hex2bin[s[36]]; + + return TRUE; +} + +HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) +{ + int has_minus = 0, has_comma = 0; + + TRACE("(%s, %p)\n", debugstr_w(pszString), pkey); + + if (!pszString || !pkey) + return E_POINTER; + + memset(pkey, 0, sizeof(PROPERTYKEY)); + + if (!string_to_guid(pszString, &pkey->fmtid)) + return E_INVALIDARG; + + pszString += GUIDSTRING_MAX - 1; + + if (!*pszString) + return E_INVALIDARG; + + /* Only the space seems to be recognized as whitespace. The comma is only + * recognized once and processing terminates if another comma is found. */ + while (*pszString == ' ' || *pszString == ',') + { + if (*pszString == ',') + { + if (has_comma) + return S_OK; + else + has_comma = 1; + } + pszString++; + } + + if (!*pszString) + return E_INVALIDARG; + + /* Only two minus signs are recognized if no comma is detected. The first + * sign is ignored, and the second is interpreted. If a comma is detected + * before the minus sign, then only one minus sign counts, and property ID + * interpretation begins with the next character. */ + if (has_comma) + { + if (*pszString == '-') + { + has_minus = 1; + pszString++; + } + } + else + { + if (*pszString == '-') + pszString++; + + /* Skip any intermediate spaces after the first minus sign. */ + while (*pszString == ' ') + pszString++; + + if (*pszString == '-') + { + has_minus = 1; + pszString++; + } + + /* Skip any remaining spaces after minus sign. */ + while (*pszString == ' ') + pszString++; + } + + /* Overflow is not checked. */ + while (isdigitW(*pszString)) + { + pkey->pid *= 10; + pkey->pid += (*pszString - '0'); + pszString++; + } + + if (has_minus) + pkey->pid = ~pkey->pid + 1; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/propsys/propsys_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propsys_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_private.h (added) +++ trunk/reactos/dll/win32/propsys/propsys_private.h [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,21 @@ +/* + * propsys private definitions + * + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * 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 + */ + +HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; Propchange: trunk/reactos/dll/win32/propsys/propsys_private.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/propsys/propvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propvar.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propvar.c (added) +++ trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -1,0 +1,603 @@ +/* + * PropVariant implementation + * + * Copyright 2008 James Hawkins for CodeWeavers + * + * 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 + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +#include <stdio.h> + +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +//#include "winerror.h" +#include <winreg.h> +//#include "winuser.h" +#include <shlobj.h> +#include <propvarutil.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(propsys); + +static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, + REFPROPVARIANT propvarSrc, VARTYPE vt) +{ + SYSTEMTIME time; + + FileTimeToSystemTime(&propvarSrc->u.filetime, &time); + + switch (vt) + { + case VT_LPSTR: + { + static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; + + ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, + lstrlenA(format) + 1); + if (!ppropvarDest->u.pszVal) + return E_OUTOFMEMORY; + + sprintf(ppropvarDest->u.pszVal, format, time.wYear, time.wMonth, + time.wDay, time.wHour, time.wMinute, + time.wSecond, time.wMilliseconds); + + return S_OK; + } + + default: + FIXME("Unhandled target type: %d\n", vt); + } + + return E_FAIL; +} + +static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, + int dest_signed, LONGLONG *res) +{ + int src_signed; + + switch (pv->vt) + { + case VT_I1: + src_signed = 1; + *res = pv->u.cVal; + break; + case VT_UI1: + src_signed = 0; + *res = pv->u.bVal; + break; + case VT_I2: + src_signed = 1; + *res = pv->u.iVal; + break; + case VT_UI2: + src_signed = 0; + *res = pv->u.uiVal; + break; + case VT_I4: + src_signed = 1; + *res = pv->u.lVal; + break; + case VT_UI4: + src_signed = 0; + *res = pv->u.ulVal; + break; + case VT_I8: + src_signed = 1; + *res = pv->u.hVal.QuadPart; + break; + case VT_UI8: + src_signed = 0; + *res = pv->u.uhVal.QuadPart; + break; + case VT_EMPTY: + src_signed = 0; + *res = 0; + break; + default: + FIXME("unhandled vt %d\n", pv->vt); + return E_NOTIMPL; + } + + if (*res < 0 && src_signed != dest_signed) + return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); + + if (dest_bits < 64) + { + if (dest_signed) + { + if (*res >= ((LONGLONG)1 << (dest_bits-1)) || + *res < ((LONGLONG)-1 << (dest_bits-1))) + return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); + } + else + { + if ((ULONGLONG)(*res) >= ((ULONGLONG)1 << dest_bits)) + return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW); + } + } + + return S_OK; +} + +HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res); + if (SUCCEEDED(hr)) *ret = (SHORT)res; + return hr; +} + +HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res); + if (SUCCEEDED(hr)) *ret = (LONG)res; + return hr; +} + +HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res); + if (SUCCEEDED(hr)) *ret = (LONGLONG)res; + return hr; +} + +HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res); + if (SUCCEEDED(hr)) *ret = (USHORT)res; + return hr; +} + +HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res); + if (SUCCEEDED(hr)) *ret = (ULONG)res; + return hr; +} + +HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("%p,%p\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res); + if (SUCCEEDED(hr)) *ret = (ULONGLONG)res; + return hr; +} + +/****************************************************************** + * PropVariantChangeType (PROPSYS.@) + */ +HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, + PROPVAR_CHANGE_FLAGS flags, VARTYPE vt) +{ + HRESULT hr; + + FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc, + propvarSrc->vt, flags, vt); + + switch (vt) + { + case VT_I2: + { + SHORT res; + hr = PropVariantToInt16(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I2; + ppropvarDest->u.iVal = res; + } + return hr; + } + case VT_UI2: + { + USHORT res; + hr = PropVariantToUInt16(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI2; + ppropvarDest->u.uiVal = res; + } + return hr; + } + case VT_I4: + { + LONG res; + hr = PropVariantToInt32(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I4; + ppropvarDest->u.lVal = res; + } + return hr; + } + case VT_UI4: + { + ULONG res; + hr = PropVariantToUInt32(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI4; + ppropvarDest->u.ulVal = res; + } + return hr; + } + case VT_I8: + { + LONGLONG res; + hr = PropVariantToInt64(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_I8; + ppropvarDest->u.hVal.QuadPart = res; + } + return hr; + } + case VT_UI8: + { + ULONGLONG res; + hr = PropVariantToUInt64(propvarSrc, &res); + if (SUCCEEDED(hr)) + { + ppropvarDest->vt = VT_UI8; + ppropvarDest->u.uhVal.QuadPart = res; + } + return hr; + } + } + + switch (propvarSrc->vt) + { + case VT_FILETIME: + return PROPVAR_ConvertFILETIME(ppropvarDest, propvarSrc, vt); + default: + FIXME("Unhandled source type: %d\n", propvarSrc->vt); + } + + return E_FAIL; +} + +static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) +{ + static const WCHAR format[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X', + '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; + + sprintfW(str, format, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); +} + +HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar) +{ + TRACE("(%p %p)\n", guid, ppropvar); + + if(!guid) + return E_FAIL; + + ppropvar->vt = VT_LPWSTR; + ppropvar->u.pwszVal = CoTaskMemAlloc(39*sizeof(WCHAR)); + if(!ppropvar->u.pwszVal) + return E_OUTOFMEMORY; + + PROPVAR_GUIDToWSTR(guid, ppropvar->u.pwszVal); + return S_OK; +} + +HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar) +{ + TRACE("(%p %p)\n", guid, pvar); + + if(!guid) { + FIXME("guid == NULL\n"); + return E_FAIL; + } + + V_VT(pvar) = VT_BSTR; + V_BSTR(pvar) = SysAllocStringLen(NULL, 38); + if(!V_BSTR(pvar)) + return E_OUTOFMEMORY; + + PROPVAR_GUIDToWSTR(guid, V_BSTR(pvar)); + return S_OK; +} + +HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar) +{ + TRACE("(%p %u %p)\n", pv, cb, ppropvar); + + ppropvar->u.caub.pElems = CoTaskMemAlloc(cb); + if(!ppropvar->u.caub.pElems) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_VECTOR|VT_UI1; + ppropvar->u.caub.cElems = cb; + memcpy(ppropvar->u.caub.pElems, pv, cb); + return S_OK; +} + +HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) +{ + SAFEARRAY *arr; + void *data; + HRESULT hres; + + TRACE("(%p %u %p)\n", pv, cb, pvar); + + arr = SafeArrayCreateVector(VT_UI1, 0, cb); + if(!arr) + return E_OUTOFMEMORY; + + hres = SafeArrayAccessData(arr, &data); + if(FAILED(hres)) { + SafeArrayDestroy(arr); + return hres; + } + + memcpy(data, pv, cb); + + hres = SafeArrayUnaccessData(arr); + if(FAILED(hres)) { + SafeArrayDestroy(arr); + return hres; + } + + V_VT(pvar) = VT_ARRAY|VT_UI1; + V_ARRAY(pvar) = arr; + return S_OK; +} + +static inline DWORD PROPVAR_HexToNum(const WCHAR *hex) +{ + DWORD ret; + + if(hex[0]>='0' && hex[0]<='9') + ret = hex[0]-'0'; + else if(hex[0]>='a' && hex[0]<='f') + ret = hex[0]-'a'+10; + else if(hex[0]>='A' && hex[0]<='F') + ret = hex[0]-'A'+10; + else + return -1; + + ret <<= 4; + if(hex[1]>='0' && hex[1]<='9') + return ret + hex[1]-'0'; + else if(hex[1]>='a' && hex[1]<='f') + return ret + hex[1]-'a'+10; + else if(hex[1]>='A' && hex[1]<='F') + return ret + hex[1]-'A'+10; + else + return -1; +} + +static inline HRESULT PROPVAR_WCHARToGUID(const WCHAR *str, int len, GUID *guid) +{ + DWORD i, val=0; + const WCHAR *p; + + memset(guid, 0, sizeof(GUID)); + + if(len!=38 || str[0]!='{' || str[9]!='-' || str[14]!='-' + || str[19]!='-' || str[24]!='-' || str[37]!='}') { + WARN("Error parsing %s\n", debugstr_w(str)); + return E_INVALIDARG; + } + + p = str+1; + for(i=0; i<4 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data1 = (guid->Data1<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data2 = (guid->Data2<<8) + val; + p += 2; + } + p++; + for(i=0; i<2 && val!=-1; i++) { + val = PROPVAR_HexToNum(p); + guid->Data3 = (guid->Data3<<8) + val; + p += 2; + } + p++; + for(i=0; i<8 && val!=-1; i++) { + if(i == 2) + p++; + + val = guid->Data4[i] = PROPVAR_HexToNum(p); + p += 2; + } + + if(val == -1) { + WARN("Error parsing %s\n", debugstr_w(str)); + memset(guid, 0, sizeof(GUID)); + return E_INVALIDARG; + } + return S_OK; +} + +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) +{ + TRACE("%p %p)\n", ppropvar, guid); + + switch(ppropvar->vt) { + case VT_BSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); + case VT_LPWSTR: + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + + default: + FIXME("unsupported vt: %d\n", ppropvar->vt); + return E_NOTIMPL; + } +} + +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) +{ + TRACE("(%p %p)\n", pvar, guid); + + switch(V_VT(pvar)) { + case VT_BSTR: { + HRESULT hres = PROPVAR_WCHARToGUID(V_BSTR(pvar), SysStringLen(V_BSTR(pvar)), guid); + if(hres == E_INVALIDARG) + return E_FAIL; + return hres; + } + + default: + FIXME("unsupported vt: %d\n", V_VT(pvar)); + return E_NOTIMPL; + } +} + +static int isemptyornull(const PROPVARIANT *propvar) +{ + if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL) + return 1; + if ((propvar->vt & VT_ARRAY) == VT_ARRAY) + { + int i; + for (i=0; i<propvar->u.parray->cDims; i++) + { + if (propvar->u.parray->rgsabound[i].cElements != 0) + break; + } + return i == propvar->u.parray->cDims; + } + /* FIXME: vectors, byrefs, errors? */ + return 0; +} + +INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, + PROPVAR_COMPARE_UNIT unit, PROPVAR_COMPARE_FLAGS flags) +{ + const PROPVARIANT *propvar2_converted; + PROPVARIANT propvar2_static; + HRESULT hr; + INT res=-1; + + TRACE("%p,%p,%x,%x\n", propvar1, propvar2, unit, flags); + + if (isemptyornull(propvar1)) + { + if (isemptyornull(propvar2)) + return 0; + return (flags & PVCF_TREATEMPTYASGREATERTHAN) ? 1 : -1; + } + + if (isemptyornull(propvar2)) + return (flags & PVCF_TREATEMPTYASGREATERTHAN) ? -1 : 1; + + if (propvar1->vt != propvar2->vt) + { + hr = PropVariantChangeType(&propvar2_static, propvar2, 0, propvar1->vt); + + if (FAILED(hr)) + return -1; + + propvar2_converted = &propvar2_static; + } + else + propvar2_converted = propvar2; + +#define CMP_INT_VALUE(var) do { \ + if (propvar1->u.var > propvar2_converted->u.var) \ + res = 1; \ + else if (propvar1->u.var < propvar2_converted->u.var) \ + res = -1; \ + else \ + res = 0; \ + } while (0) + + switch (propvar1->vt) + { + case VT_I1: + CMP_INT_VALUE(cVal); + break; + case VT_UI1: + CMP_INT_VALUE(bVal); + break; + case VT_I2: + CMP_INT_VALUE(iVal); + break; + case VT_UI2: + CMP_INT_VALUE(uiVal); + break; + case VT_I4: + CMP_INT_VALUE(lVal); + break; + case VT_UI4: + CMP_INT_VALUE(uiVal); + break; + case VT_I8: + CMP_INT_VALUE(hVal.QuadPart); + break; + case VT_UI8: + CMP_INT_VALUE(uhVal.QuadPart); + break; + case VT_BSTR: + /* FIXME: Use string flags. */ + res = lstrcmpW(propvar1->u.bstrVal, propvar2->u.bstrVal); + break; + default: + FIXME("vartype %d not handled\n", propvar1->vt); + res = -1; + break; + } + + if (propvar2_converted == &propvar2_static) + PropVariantClear(&propvar2_static); + + return res; +} Propchange: trunk/reactos/dll/win32/propsys/propvar.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Mar 22 12:08:04 2013 @@ -142,6 +142,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.5.19 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.5.4 +reactos/dll/win32/propsys # Synced to Wine-1.5.26 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/qmgr # Synced to Wine-1.2-rc5? reactos/dll/win32/qmgrprxy # Synced to Wine-1.14?

1 0

[akhaldi] 58566: [PSDK] * Update propvarutil.h.
by akhaldi＠svn.reactos.org 22 Mar '13

22 Mar '13

Author: akhaldi Date: Fri Mar 22 12:02:09 2013 New Revision: 58566 URL: http://svn.reactos.org/svn/reactos?rev=58566&view=rev Log: [PSDK] * Update propvarutil.h. Modified: trunk/reactos/include/psdk/propvarutil.h Modified: trunk/reactos/include/psdk/propvarutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propvarutil.h… ============================================================================== --- trunk/reactos/include/psdk/propvarutil.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propvarutil.h [iso-8859-1] Fri Mar 22 12:02:09 2013 @@ -19,7 +19,6 @@ #ifndef __WINE_PROPVARUTIL_H #define __WINE_PROPVARUTIL_H -#include <propidl.h> #include <shtypes.h> #include <shlwapi.h> @@ -35,7 +34,85 @@ typedef int PROPVAR_CHANGE_FLAGS; +enum tagPROPVAR_COMPARE_UNIT +{ + PVCU_DEFAULT = 0x00000000, + PVCU_SECOND = 0x00000001, + PVCU_MINUTE = 0x00000002, + PVCU_HOUR = 0x00000003, + PVCU_DAY = 0x00000004, + PVCU_MONTH = 0x00000005, + PVCU_YEAR = 0x00000006, +}; + +typedef int PROPVAR_COMPARE_UNIT; + +enum tagPROPVAR_COMPARE_FLAGS +{ + PVCF_DEFAULT = 0x00000000, + PVCF_TREATEMPTYASGREATERTHAN = 0x00000001, + PVCF_USESTRCMP = 0x00000002, + PVCF_USESTRCMPC = 0x00000004, + PVCF_USESTRCMPI = 0x00000008, + PVCF_USESTRCMPIC = 0x00000010, +}; + +typedef int PROPVAR_COMPARE_FLAGS; + HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); +HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); +HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); +HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid); +HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); +INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, + PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); + +HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); +HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); +HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret); +HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); +HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); +HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); + +#ifdef __cplusplus + +HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); +HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar); + +#ifndef NO_PROPVAR_INLINES + +inline HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_BOOL; + ppropvar->boolVal = fVal ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; +} + +inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) +{ + HRESULT hres; + + hres = SHStrDupW(psz, &ppropvar->pwszVal); + if(SUCCEEDED(hres)) + ppropvar->vt = VT_LPWSTR; + else + PropVariantInit(ppropvar); + + return hres; +} + +inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) +{ + ppropvar->vt = VT_I8; + ppropvar->hVal.QuadPart = llVal; + return S_OK; +} + +#endif +#endif #endif /* __WINE_PROPVARUTIL_H */

1 0

[akhaldi] 58565: [CRT] * Annotate mbstring.h.
by akhaldi＠svn.reactos.org 22 Mar '13

22 Mar '13

Author: akhaldi Date: Fri Mar 22 12:00:26 2013 New Revision: 58565 URL: http://svn.reactos.org/svn/reactos?rev=58565&view=rev Log: [CRT] * Annotate mbstring.h. Modified: trunk/reactos/include/crt/mbstring.h Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… ============================================================================== --- trunk/reactos/include/crt/mbstring.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbstring.h [iso-8859-1] Fri Mar 22 12:00:26 2013 @@ -31,100 +31,791 @@ #ifndef _MBSTRING_DEFINED #define _MBSTRING_DEFINED - _CRTIMP unsigned char *__cdecl _mbsdup(const unsigned char *_Str); - _CRTIMP unsigned int __cdecl _mbbtombc(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbbtombc_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _mbbtype(unsigned char _Ch,int _CType); - _CRTIMP int __cdecl _mbbtype_l(unsigned char _Ch,int _CType,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbctombb(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbctombb_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _mbsbtype(const unsigned char *_Str,size_t _Pos); - _CRTIMP int __cdecl _mbsbtype_l(const unsigned char *_Str,size_t _Pos,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbscat(unsigned char *_Dest,const unsigned char *_Source); - _CRTIMP unsigned char *_mbscat_l(unsigned char *_Dest,const unsigned char *_Source,_locale_t _Locale); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbschr(const unsigned char *_Str,unsigned int _Ch); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbschr_l(const unsigned char *_Str,unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _mbscmp(const unsigned char *_Str1,const unsigned char *_Str2); - _CRTIMP int __cdecl _mbscmp_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _mbscoll(const unsigned char *_Str1,const unsigned char *_Str2); - _CRTIMP int __cdecl _mbscoll_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbscpy(unsigned char *_Dest,const unsigned char *_Source); - _CRTIMP unsigned char *_mbscpy_l(unsigned char *_Dest,const unsigned char *_Source,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbscspn(const unsigned char *_Str,const unsigned char *_Control); - _CRTIMP size_t __cdecl _mbscspn_l(const unsigned char *_Str,const unsigned char *_Control,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsdec(const unsigned char *_Start,const unsigned char *_Pos); - _CRTIMP unsigned char *__cdecl _mbsdec_l(const unsigned char *_Start,const unsigned char *_Pos,_locale_t _Locale); - _CRTIMP int __cdecl _mbsicmp(const unsigned char *_Str1,const unsigned char *_Str2); - _CRTIMP int __cdecl _mbsicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); - _CRTIMP int __cdecl _mbsicoll(const unsigned char *_Str1,const unsigned char *_Str2); - _CRTIMP int __cdecl _mbsicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsinc(const unsigned char *_Ptr); - _CRTIMP unsigned char *__cdecl _mbsinc_l(const unsigned char *_Ptr,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbslen(const unsigned char *_Str); - _CRTIMP size_t __cdecl _mbslen_l(const unsigned char *_Str,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbsnlen(const unsigned char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbsnlen_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbslwr(unsigned char *_String); - _CRTIMP unsigned char *_mbslwr_l(unsigned char *_String,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsnbcat(unsigned char *_Dest,const unsigned char *_Source,size_t _Count); - _CRTIMP unsigned char *__cdecl _mbsnbcat_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnbcmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnbcmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnbcoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnbcoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbsnbcnt(const unsigned char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbsnbcnt_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsnbcpy(unsigned char *_Dest,const unsigned char *_Source,size_t _Count); - _CRTIMP int __cdecl _mbsnbcpy_s(unsigned char* dst, size_t size, const unsigned char* src, size_t n); - _CRTIMP unsigned char *__cdecl _mbsnbcpy_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnbicmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnbicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnbicoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnbicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsnbset(unsigned char *_Str,unsigned int _Ch,size_t _MaxCount); - _CRTIMP unsigned char *__cdecl _mbsnbset_l(unsigned char *_Str,unsigned int _Ch,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsncat(unsigned char *_Dest,const unsigned char *_Source,size_t _Count); - _CRTIMP unsigned char *__cdecl _mbsncat_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbsnccnt(const unsigned char *_Str,size_t _MaxCount); - _CRTIMP size_t __cdecl _mbsnccnt_l(const unsigned char *_Str,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _mbsncmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsncmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _mbsncoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsncoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsncpy(unsigned char *_Dest,const unsigned char *_Source,size_t _Count); - _CRTIMP unsigned char *__cdecl _mbsncpy_l(unsigned char *_Dest,const unsigned char *_Source,size_t _Count,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbsnextc (const unsigned char *_Str); - _CRTIMP unsigned int __cdecl _mbsnextc_l(const unsigned char *_Str,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnicmp(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnicmp_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP int __cdecl _mbsnicoll(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount); - _CRTIMP int __cdecl _mbsnicoll_l(const unsigned char *_Str1,const unsigned char *_Str2,size_t _MaxCount,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsninc(const unsigned char *_Str,size_t _Count); - _CRTIMP unsigned char *__cdecl _mbsninc_l(const unsigned char *_Str,size_t _Count,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsnset(unsigned char *_Dst,unsigned int _Val,size_t _MaxCount); - _CRTIMP unsigned char *__cdecl _mbsnset_l(unsigned char *_Dst,unsigned int _Val,size_t _MaxCount,_locale_t _Locale); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbspbrk(const unsigned char *_Str,const unsigned char *_Control); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbspbrk_l(const unsigned char *_Str,const unsigned char *_Control,_locale_t _Locale); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbsrchr(const unsigned char *_Str,unsigned int _Ch); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbsrchr_l(const unsigned char *_Str,unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsrev(unsigned char *_Str); - _CRTIMP unsigned char *__cdecl _mbsrev_l(unsigned char *_Str,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsset(unsigned char *_Str,unsigned int _Val); - _CRTIMP unsigned char *__cdecl _mbsset_l(unsigned char *_Str,unsigned int _Val,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbsspn(const unsigned char *_Str,const unsigned char *_Control); - _CRTIMP size_t __cdecl _mbsspn_l(const unsigned char *_Str,const unsigned char *_Control,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsspnp(const unsigned char *_Str1,const unsigned char *_Str2); - _CRTIMP unsigned char *__cdecl _mbsspnp_l(const unsigned char *_Str1,const unsigned char *_Str2,_locale_t _Locale); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbsstr(const unsigned char *_Str,const unsigned char *_Substr); - _CRTIMP _CONST_RETURN unsigned char *__cdecl _mbsstr_l(const unsigned char *_Str,const unsigned char *_Substr,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbstok(unsigned char *_Str,const unsigned char *_Delim); - _CRTIMP unsigned char *__cdecl _mbstok_l(unsigned char *_Str,const unsigned char *_Delim,_locale_t _Locale); - _CRTIMP unsigned char *__cdecl _mbsupr(unsigned char *_String); - _CRTIMP unsigned char *_mbsupr_l(unsigned char *_String,_locale_t _Locale); - _CRTIMP size_t __cdecl _mbclen(const unsigned char *_Str); - _CRTIMP size_t __cdecl _mbclen_l(const unsigned char *_Str,_locale_t _Locale); - _CRTIMP void __cdecl _mbccpy(unsigned char *_Dst,const unsigned char *_Src); - _CRTIMP void __cdecl _mbccpy_l(unsigned char *_Dst,const unsigned char *_Src,_locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsdup( + _In_z_ const unsigned char *_Str); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbbtombc( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbbtombc_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbbtype( + _In_ unsigned char _Ch, + _In_ int _CType); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbbtype_l( + _In_ unsigned char _Ch, + _In_ int _CType, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctombb( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctombb_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _CRTIMP + int + __cdecl + _mbsbtype( + _In_reads_bytes_(_Pos) _Pre_z_ const unsigned char *_Str, + _In_ size_t _Pos); + + _CRTIMP + int + __cdecl + _mbsbtype_l( + _In_reads_bytes_(_Pos) _Pre_z_ const unsigned char *_Str, + _In_ size_t _Pos, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbscat( + _Inout_updates_z_(_String_length_(_Curr_) + _String_length_(_Source) + 1) unsigned char *_Dest, + _In_z_ const unsigned char *_Source); + + _CRTIMP + unsigned char* + _mbscat_l( + _Inout_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbschr( + _In_z_ const unsigned char *_Str, + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbschr_l( + _In_z_ const unsigned char *_Str, + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbscmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbscmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbscoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbscoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbscpy( + _Out_writes_z_(_String_length_(_Source) + 1) unsigned char *_Dest, + _In_z_ const unsigned char *_Source); + + _CRTIMP + unsigned char* + _mbscpy_l( + _Pre_notnull_ _Post_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbscspn( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbscspn_l( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsdec( + _In_reads_z_(_Pos-_Start + 1) const unsigned char *_Start, + _In_z_ const unsigned char *_Pos); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsdec_l( + _In_reads_z_(_Pos-_Start + 1) const unsigned char *_Start, + _In_z_ const unsigned char *_Pos, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsicmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsicmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsicoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsicoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsinc( + _In_z_ const unsigned char *_Ptr); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsinc_l( + _In_z_ const unsigned char *_Ptr, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbslen( + _In_z_ const unsigned char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbslen_l( + _In_z_ const unsigned char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnlen( + _In_z_ const unsigned char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnlen_l( + _In_z_ const unsigned char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbslwr( + _Inout_z_ unsigned char *_String); + + _CRTIMP + unsigned char* + _mbslwr_l( + _Inout_z_ unsigned char *_String, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbcat( + _Inout_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbcat_l( + _Inout_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbcmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbcmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbcoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbcoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnbcnt( + _In_reads_bytes_(_MaxCount) _Pre_z_ const unsigned char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnbcnt_l( + _In_reads_bytes_(_MaxCount) _Pre_z_ const unsigned char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbcpy( + _Out_writes_(_Count) _Post_maybez_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count); + + _CRTIMP + int + __cdecl + _mbsnbcpy_s( + _Out_writes_z_(size) unsigned char* dst, + _In_ size_t size, + _In_z_ const unsigned char* src, + _In_ size_t n); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbcpy_l( + _Out_writes_(_Count) _Post_maybez_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbicmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbicmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbicoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnbicoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbset( + _Inout_updates_z_(_MaxCount) unsigned char *_Str, + _In_ unsigned int _Ch, + _In_ size_t _MaxCount); + + _CRTIMP + unsigned char* + __cdecl + _mbsnbset_l( + _Inout_updates_z_(_MaxCount) unsigned char *_Str, + _In_ unsigned int _Ch, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsncat( + _Inout_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count); + + _CRTIMP + unsigned char* + __cdecl + _mbsncat_l( + _Inout_z_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnccnt( + _In_reads_bytes_(_MaxCount) _Pre_z_ const unsigned char *_Str, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsnccnt_l( + _In_reads_bytes_(_MaxCount) _Pre_z_ const unsigned char *_Str, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsncmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsncmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsncoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsncoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsncpy( + _Pre_notnull_ _Out_writes_(2 * _Count) _Post_maybez_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count); + + _CRTIMP + unsigned char* + __cdecl + _mbsncpy_l( + _Out_writes_(_Count) _Post_maybez_ unsigned char *_Dest, + _In_z_ const unsigned char *_Source, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbsnextc( + _In_z_ const unsigned char *_Str); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbsnextc_l( + _In_z_ const unsigned char *_Str, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnicmp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnicmp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnicoll( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount); + + _Check_return_ + _CRTIMP + int + __cdecl + _mbsnicoll_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsninc( + _In_reads_bytes_(_Count) _Pre_z_ const unsigned char *_Str, + _In_ size_t _Count); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsninc_l( + _In_reads_bytes_(_Count) _Pre_z_ const unsigned char *_Str, + _In_ size_t _Count, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsnset( + _Inout_updates_z_(_MaxCount) unsigned char *_Dst, + _In_ unsigned int _Val, + _In_ size_t _MaxCount); + + _CRTIMP + unsigned char* + __cdecl + _mbsnset_l( + _Inout_updates_z_(_MaxCount) unsigned char *_Dst, + _In_ unsigned int _Val, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbspbrk( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbspbrk_l( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbsrchr( + _In_z_ const unsigned char *_Str, + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbsrchr_l( + _In_z_ const unsigned char *_Str, + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsrev( + _Inout_z_ unsigned char *_Str); + + _CRTIMP + unsigned char* + __cdecl + _mbsrev_l( + _Inout_z_ unsigned char *_Str, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsset( + _Inout_z_ unsigned char *_Str, + _In_ unsigned int _Val); + + _CRTIMP + unsigned char* + __cdecl + _mbsset_l( + _Inout_z_ unsigned char *_Str, + _In_ unsigned int _Val, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsspn( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbsspn_l( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Control, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsspnp( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbsspnp_l( + _In_z_ const unsigned char *_Str1, + _In_z_ const unsigned char *_Str2, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbsstr( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Substr); + + _Check_return_ + _CRTIMP + _CONST_RETURN + unsigned char* + __cdecl + _mbsstr_l( + _In_z_ const unsigned char *_Str, + _In_z_ const unsigned char *_Substr, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbstok( + _Inout_opt_z_ unsigned char *_Str, + _In_z_ const unsigned char *_Delim); + + _Check_return_ + _CRTIMP + unsigned char* + __cdecl + _mbstok_l( + _Inout_opt_z_ unsigned char *_Str, + _In_z_ const unsigned char *_Delim, + _In_opt_ _locale_t _Locale); + + _CRTIMP + unsigned char* + __cdecl + _mbsupr( + _Inout_z_ unsigned char *_String); + + _CRTIMP + unsigned char* + _mbsupr_l( + _Inout_z_ unsigned char *_String, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbclen( + _In_z_ const unsigned char *_Str); + + _Check_return_ + _CRTIMP + size_t + __cdecl + _mbclen_l( + _In_z_ const unsigned char *_Str, + _In_opt_ _locale_t _Locale); + + _CRTIMP + void + __cdecl + _mbccpy( + _Out_writes_bytes_(2) unsigned char *_Dst, + _In_z_ const unsigned char *_Src); + + _CRTIMP + void + __cdecl + _mbccpy_l( + _Out_writes_bytes_(2) unsigned char *_Dst, + _In_z_ const unsigned char *_Src, + _In_opt_ _locale_t _Locale); + #define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1) #ifdef __cplusplus @@ -143,64 +834,406 @@ #endif #endif - _CRTIMP int __cdecl _ismbcalnum(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcalnum_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcalpha(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcalpha_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcdigit(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcdigit_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcgraph(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcgraph_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbclegal(unsigned int _Ch); - _CRTIMP int __cdecl _ismbclegal_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbclower(unsigned int _Ch); - _CRTIMP int __cdecl _ismbclower_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcprint(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcprint_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcpunct(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcpunct_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcspace(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcspace_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcupper(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcupper_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbctolower(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbctolower_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbctoupper(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbctoupper_l(unsigned int _Ch,_locale_t _Locale); -#endif + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcalnum( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcalnum_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcalpha( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcalpha_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcdigit( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcdigit_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcgraph( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcgraph_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbclegal( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbclegal_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbclower( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbclower_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcprint( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcprint_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcpunct( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcpunct_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcspace( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcspace_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcupper( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + __cdecl _ismbcupper_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctolower( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctolower_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctoupper( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctoupper_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + +#endif /* _MBSTRING_DEFINED */ #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED - _CRTIMP int __cdecl _ismbblead(unsigned int _Ch); - _CRTIMP int __cdecl _ismbblead_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbbtrail(unsigned int _Ch); - _CRTIMP int __cdecl _ismbbtrail_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbslead(const unsigned char *_Str,const unsigned char *_Pos); - _CRTIMP int __cdecl _ismbslead_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale); - _CRTIMP int __cdecl _ismbstrail(const unsigned char *_Str,const unsigned char *_Pos); - _CRTIMP int __cdecl _ismbstrail_l(const unsigned char *_Str,const unsigned char *_Pos,_locale_t _Locale); -#endif - - _CRTIMP int __cdecl _ismbchira(unsigned int _Ch); - _CRTIMP int __cdecl _ismbchira_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbckata(unsigned int _Ch); - _CRTIMP int __cdecl _ismbckata_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcsymbol(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcsymbol_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcl0(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcl0_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcl1(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcl1_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP int __cdecl _ismbcl2(unsigned int _Ch); - _CRTIMP int __cdecl _ismbcl2_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbcjistojms(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbcjistojms_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbcjmstojis(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbcjmstojis_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbctohira(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbctohira_l(unsigned int _Ch,_locale_t _Locale); - _CRTIMP unsigned int __cdecl _mbctokata(unsigned int _Ch); - _CRTIMP unsigned int __cdecl _mbctokata_l(unsigned int _Ch,_locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbblead( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbblead_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbtrail( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbbtrail_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbslead( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbslead_l( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbstrail( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbstrail_l( + _In_reads_z_(_Pos - _Str + 1) const unsigned char *_Str, + _In_z_ const unsigned char *_Pos, + _In_opt_ _locale_t _Locale); + +#endif /* _MBLEADTRAIL_DEFINED */ + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbchira( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbchira_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbckata( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbckata_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcsymbol( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcsymbol_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl0( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl0_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl1( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl1_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl2( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + int + __cdecl + _ismbcl2_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbcjistojms( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbcjistojms_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbcjmstojis( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbcjmstojis_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctohira( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctohira_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctokata( + _In_ unsigned int _Ch); + + _Check_return_ + _CRTIMP + unsigned int + __cdecl + _mbctokata_l( + _In_ unsigned int _Ch, + _In_opt_ _locale_t _Locale); #ifdef __cplusplus } @@ -210,4 +1243,4 @@ #include <sec_api/mbstring_s.h> -#endif +#endif /* _INC_MBSTRING */

1 0

[spetreolle] 58564: [HIVES] No need for NAME_ON_CD anymore since the multi arch hive files implementation. (r58271)
by spetreolle＠svn.reactos.org 21 Mar '13

21 Mar '13

Author: spetreolle Date: Thu Mar 21 00:10:58 2013 New Revision: 58564 URL: http://svn.reactos.org/svn/reactos?rev=58564&view=rev Log: [HIVES] No need for NAME_ON_CD anymore since the multi arch hive files implementation. (r58271) Modified: trunk/reactos/boot/bootdata/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Thu Mar 21 00:10:58 2013 @@ -3,10 +3,10 @@ #common hives add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf DESTINATION reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd regtest) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf DESTINATION reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd regtest) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd regtest) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf DESTINATION reactos NO_CAB FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf DESTINATION reactos NO_CAB FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf DESTINATION reactos NO_CAB FOR bootcd regtest) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf DESTINATION reactos NO_CAB FOR bootcd regtest) # livecd hives list(APPEND CD_HIVES

1 0

[jimtabor] 58563: - Add missing file for revision 58562.
by jimtabor＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: jimtabor Date: Wed Mar 20 22:34:48 2013 New Revision: 58563 URL: http://svn.reactos.org/svn/reactos?rev=58563&view=rev Log: - Add missing file for revision 58562. Modified: trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Mar 20 22:34:48 2013 @@ -3310,6 +3310,7 @@ #define TWOPARAM_ROUTINE_SETMENUBARHEIGHT 0xfffd0050 #define TWOPARAM_ROUTINE_EXITREACTOS 0xfffd0051 #define TWOPARAM_ROUTINE_SETGUITHRDHANDLE 0xfffd0052 +#define HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE 0xfffd0053 #define MSQ_STATE_CAPTURE 0x1 #define MSQ_STATE_ACTIVE 0x2 #define MSQ_STATE_FOCUS 0x3

1 0

[jimtabor] 58562: [Win32k|User32] - Use set foreground instead of setting active during a mouse click. Add support hack since this should be handled on server side. - This is an ATI patch fix.
by jimtabor＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: jimtabor Date: Wed Mar 20 22:31:42 2013 New Revision: 58562 URL: http://svn.reactos.org/svn/reactos?rev=58562&view=rev Log: [Win32k|User32] - Use set foreground instead of setting active during a mouse click. Add support hack since this should be handled on server side. - This is an ATI patch fix. Modified: trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/focus.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/windows/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Wed Mar 20 22:31:42 2013 @@ -866,6 +866,17 @@ API Call */ BOOL FASTCALL +co_IntSetForegroundWindowMouse(PWND Window) +{ + if (Window) ASSERT_REFS_CO(Window); + + return co_IntSetForegroundAndFocusWindow(Window, TRUE); +} + +/* + API Call +*/ +BOOL FASTCALL IntLockSetForegroundWindow(UINT uLockCode) { ULONG Err = ERROR_ACCESS_DENIED; Modified: trunk/reactos/win32ss/user/ntuser/focus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.h [iso-8859-1] Wed Mar 20 22:31:42 2013 @@ -19,5 +19,6 @@ BOOL FASTCALL co_IntMouseActivateWindow(PWND Window); BOOL FASTCALL co_IntSetForegroundWindow(PWND Window); BOOL FASTCALL co_IntSetActiveWindow(PWND,HWND *,BOOL,BOOL,BOOL); +BOOL FASTCALL co_IntSetForegroundWindowMouse(PWND Window); BOOL FASTCALL IntLockSetForegroundWindow(UINT uLockCode); BOOL FASTCALL IntAllowSetForegroundWindow(DWORD dwProcessId); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Mar 20 22:31:42 2013 @@ -577,6 +577,12 @@ TRACE("co_IntSetForegroundWindow 2 \n"); break; + case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE: + TRACE("co_IntSetForegroundWindow 1 0x%p\n",hWnd); + Ret = co_IntSetForegroundWindowMouse(Window); + TRACE("co_IntSetForegroundWindow 2 0x%p\n",hWnd); + break; + case HWNDLOCK_ROUTINE_UPDATEWINDOW: Ret = co_UserRedrawWindow( Window, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN); break; Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Wed Mar 20 22:31:42 2013 @@ -987,7 +987,8 @@ case HTCAPTION: { HWND hTopWnd = GetAncestor(hWnd, GA_ROOT); - if (SetActiveWindow(hTopWnd) || GetActiveWindow() == hTopWnd) + if ( NtUserCallHwndLock(hTopWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE) || + GetActiveWindow() == hTopWnd) { SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOVE + HTCAPTION, lParam); }

1 0

[gadamopoulos] 58561: [newdev] - Dialog procs should return FALSE instead of calling DefWindowProc. Fixes mouse activation of the window when the user clicks in the client area
by gadamopoulos＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: gadamopoulos Date: Wed Mar 20 21:23:19 2013 New Revision: 58561 URL: http://svn.reactos.org/svn/reactos?rev=58561&view=rev Log: [newdev] - Dialog procs should return FALSE instead of calling DefWindowProc. Fixes mouse activation of the window when the user clicks in the client area Modified: trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Wed Mar 20 21:23:19 2013 @@ -493,7 +493,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static void @@ -656,7 +656,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -751,7 +751,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -857,7 +857,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -972,7 +972,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1051,7 +1051,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1130,7 +1130,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1209,7 +1209,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static HFONT

1 0

[ekohl] 58560: [SAMSRV] Calculate PasswordCanChange and PasswordMustChange time for SamQueryInformationUser.UserLogonInformation and SamQueryInformationUser.UserAllInformation.
by ekohl＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: ekohl Date: Wed Mar 20 20:52:59 2013 New Revision: 58560 URL: http://svn.reactos.org/svn/reactos?rev=58560&view=rev Log: [SAMSRV] Calculate PasswordCanChange and PasswordMustChange time for SamQueryInformationUser.UserLogonInformation and SamQueryInformationUser.UserAllInformation. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Mar 20 20:52:59 2013 @@ -61,6 +61,22 @@ /* FUNCTIONS *****************************************************************/ + +static +LARGE_INTEGER +SampAddRelativeTimeToTime(IN LARGE_INTEGER AbsoluteTime, + IN LARGE_INTEGER RelativeTime) +{ + LARGE_INTEGER NewTime; + + NewTime.QuadPart = AbsoluteTime.QuadPart - RelativeTime.QuadPart; + + if (NewTime.QuadPart < 0) + NewTime.QuadPart = 0; + + return NewTime; +} + VOID SampStartRpcServer(VOID) @@ -5269,7 +5285,10 @@ PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA DomainFixedData; SAM_USER_FIXED_DATA FixedData; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; ULONG Length = 0; NTSTATUS Status; @@ -5279,6 +5298,17 @@ if (InfoBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Get the fixed size domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + (PVOID)&DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); Status = SampGetObjectAttribute(UserObject, L"F", @@ -5300,8 +5330,15 @@ InfoBuffer->Logon.LogonCount = FixedData.LogonCount; InfoBuffer->Logon.UserAccountControl = FixedData.UserAccountControl; -// OLD_LARGE_INTEGER PasswordCanChange; -// OLD_LARGE_INTEGER PasswordMustChange; + PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MinPasswordAge); + InfoBuffer->Logon.PasswordCanChange.LowPart = PasswordCanChange.LowPart; + InfoBuffer->Logon.PasswordCanChange.HighPart = PasswordCanChange.HighPart; + + PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MaxPasswordAge); + InfoBuffer->Logon.PasswordMustChange.LowPart = PasswordMustChange.LowPart; + InfoBuffer->Logon.PasswordMustChange.HighPart = PasswordMustChange.HighPart; /* Get the Name string */ Status = SampGetObjectAttributeString(UserObject, @@ -6184,7 +6221,10 @@ PSAMPR_USER_INFO_BUFFER *Buffer) { PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_DOMAIN_FIXED_DATA DomainFixedData; SAM_USER_FIXED_DATA FixedData; + LARGE_INTEGER PasswordCanChange; + LARGE_INTEGER PasswordMustChange; ULONG Length = 0; NTSTATUS Status; @@ -6194,6 +6234,17 @@ if (InfoBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; + /* Get the fixed size domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + (PVOID)&DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); Status = SampGetObjectAttribute(UserObject, L"F", @@ -6324,8 +6375,15 @@ InfoBuffer->All.LogonCount = FixedData.LogonCount; -// USER_ALL_PASSWORDCANCHANGE -// USER_ALL_PASSWORDMUSTCHANGE + PasswordCanChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MinPasswordAge); + InfoBuffer->All.PasswordCanChange.LowPart = PasswordCanChange.LowPart; + InfoBuffer->All.PasswordCanChange.HighPart = PasswordCanChange.HighPart; + + PasswordMustChange = SampAddRelativeTimeToTime(FixedData.PasswordLastSet, + DomainFixedData.MaxPasswordAge); + InfoBuffer->All.PasswordMustChange.LowPart = PasswordMustChange.LowPart; + InfoBuffer->All.PasswordMustChange.HighPart = PasswordMustChange.HighPart; InfoBuffer->All. WhichFields |= /* USER_ALL_READ_LOGON_MASK; */ USER_ALL_HOMEDIRECTORY | @@ -6338,8 +6396,8 @@ // USER_ALL_LOGONHOURS | USER_ALL_BADPASSWORDCOUNT | USER_ALL_LOGONCOUNT; -// USER_ALL_PASSWORDCANCHANGE | -// USER_ALL_PASSWORDMUSTCHANGE; + USER_ALL_PASSWORDCANCHANGE | + USER_ALL_PASSWORDMUSTCHANGE; } if (UserObject->Access & USER_READ_ACCOUNT)

1 0

[dgorbachev] 58559: [UUID] Remove IID_IDeskBarClient. It is already in shlguid.h.
by dgorbachev＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: dgorbachev Date: Wed Mar 20 15:50:52 2013 New Revision: 58559 URL: http://svn.reactos.org/svn/reactos?rev=58559&view=rev Log: [UUID] Remove IID_IDeskBarClient. It is already in shlguid.h. Modified: trunk/reactos/lib/sdk/uuid/otherguids.c Modified: trunk/reactos/lib/sdk/uuid/otherguids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/otherguids.c?… ============================================================================== --- trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/otherguids.c [iso-8859-1] Wed Mar 20 15:50:52 2013 @@ -48,7 +48,6 @@ DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); -DEFINE_GUID(IID_IDeskBarClient, 0xEB0FE175, 0x1A3A, 0x11D0, 0x89,0xB3, 0x00,0xA0,0xC9,0x0A,0x90,0xAC); DEFINE_GUID(CLSID_StdPicture, 0x0BE35204, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51); DEFINE_GUID(CLSID_StdFont, 0x0BE35203, 0x8F91, 0x11CE, 0x9D,0xE3, 0x00,0xAA,0x00,0x4B,0xB8,0x51);

1 0

[dgorbachev] 58558: [TRANSLATION] Remove extra space characters produced by replacing backslash with space for Shift_JIS backslash problem. Patch by me, reviewed by Katayama Hirofumi MZ. Fixes bug ...
by dgorbachev＠svn.reactos.org 20 Mar '13

20 Mar '13

Author: dgorbachev Date: Wed Mar 20 14:28:34 2013 New Revision: 58558 URL: http://svn.reactos.org/svn/reactos?rev=58558&view=rev Log: [TRANSLATION] Remove extra space characters produced by replacing backslash with space for Shift_JIS backslash problem. Patch by me, reviewed by Katayama Hirofumi MZ. Fixes bug CORE-6990. Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/spider/lang/ja-JP.rc trunk/reactos/base/applications/logoff/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/system/regsvr32/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netid/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -3,7 +3,7 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "ãã¡ã¤ã«ã®ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã(ACL) ãè¡¨ ç¤ºã¾ãã¯å¤æ´ãã¾ããn\n\ +IDS_HELP, "ãã¡ã¤ã«ã®ã¢ã¯ã»ã¹å¶å¾¡ãªã¹ã(ACL) ãè¡¨ç¤ºã¾ãã¯å¤æ´ãã¾ãã\n\n\ CACLS ãã¡ã¤ã«å [/T] [/E] [/C] [/G ã¦ã¼ã¶ã¼å:ã¢ã¯ã»ã¹æ¨©]\n\ [/R ã¦ã¼ã¶ã¼å [...]] [/P ã¦ã¼ã¶ã¼å:ã¢ã¯ã»ã¹æ¨© [...]]\n\ [/D ã¦ã¼ã¶ã¼å [...]]\n\ Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -19,8 +19,8 @@ AUTORADIOBUTTON "1 æãã¤åã(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "3 æãã¤åã(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - AUTOCHECKBOX "æéãè¡¨ ç¤ºãã(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "ã¹ãã¼ã¿ã¹ãã¼ãè¡¨ ç¤ºãã(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "æéãè¡¨ç¤ºãã(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "ã¹ãã¼ã¿ã¹ãã¼ãè¡¨ç¤ºãã(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 101, 97, 50, 14 @@ -53,8 +53,8 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "ã½ ãªãã£ã¢" - IDS_SOL_ABOUT "J Brown ã«ããã½ ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0ã" + IDS_SOL_NAME "ã½ãªãã£ã¢" + IDS_SOL_ABOUT "J Brown ã«ããã½ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0ã" IDS_SOL_QUIT "ç¾å¨ã®ã²ã¼ã ãçµäºãã¾ãã?" IDS_SOL_WIN "ããã§ã¨ããããªãã®åã¡ã§ã!" IDS_SOL_DEAL "ããä¸åº¦ã«ã¼ããéãã¾ãã?" Modified: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -49,7 +49,7 @@ STRINGTABLE BEGIN IDS_SPI_NAME "ã¹ãã¤ã" - IDS_SPI_ABOUT "Gregor Schneider ã«ããã¹ãã¤ã ã½ ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0" + IDS_SPI_ABOUT "Gregor Schneider ã«ããã¹ãã¤ã ã½ãªãã£ã¢\n\nCardLib ãã¼ã¸ã§ã³ 1.0" IDS_SPI_QUIT "ç¾å¨ã®ã²ã¼ã ãçµäºãã¾ãã?" IDS_SPI_WIN "ããã§ã¨ããããªãã®åã¡ã§ã!" IDS_SPI_DEAL "ããä¸åº¦ã«ã¼ããéãã¾ãã?" Modified: trunk/reactos/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -4,8 +4,8 @@ BEGIN IDS_USAGE, "ã»ãã·ã§ã³ãçµäºãã¾ãã\n\n\ - /v\t\tå®è¡ä¸ã«è©³ç´°æå ±ãè¡¨ ç¤ºãã¾ãã\n\ - /?\t\tãã®æå ±ãè¡¨ ç¤ºãã¾ãã\n\n" + /v\t\tå®è¡ä¸ã«è©³ç´°æå ±ãè¡¨ç¤ºãã¾ãã\n\ + /?\t\tãã®æå ±ãè¡¨ç¤ºãã¾ãã\n\n" IDS_LOGOFF_REMOTE, "ãªã¢ã¼ã ãã·ã³ã®ã»ãã·ã§ã³ãçµäºãã¦ãã¾ãã" IDS_LOGOFF_LOCAL, "ãã®ãã·ã³ã®ç¾å¨ã®ã»ãã·ã§ã³ãçµäºãã¦ãã¾ãã" Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN @@ -14,12 +14,12 @@ MENUITEM SEPARATOR MENUITEM "ãã«ã", IDC_PROGHELP, GRAYED END - POPUP "è¡¨ ç¤º" + POPUP "è¡¨ç¤º" BEGIN MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN - MENUITEM "ãªã½ ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED - MENUITEM "ãªã½ ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED + MENUITEM "ãªã½ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED + MENUITEM "ãªã½ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR MENUITEM "Show hidden devices", IDC_SHOWHIDDEN END @@ -72,8 +72,8 @@ IDS_HINT_EXIT " ãã®ããã°ã©ã ãçµäºãã¾ãã" IDS_HINT_REFRESH " ãµã¼ãã¹ã®ãªã¹ããæ´æ°ãã¾ãã" IDS_HINT_PROP " ç¾å¨é¸æããã¦ããã·ã¼ãã®ããããã£ãéãã¾ãã" - IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ ç¤ºãã¾ãã" - IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ ç¤ºãã¾ãã" + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ç¤ºãã¾ãã" IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -18,7 +18,7 @@ MENUITEM SEPARATOR MENUITEM "çµäº(&X)", IDM_EXIT END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "æ´æ°(&R)", IDM_REFRESH END @@ -78,7 +78,7 @@ LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 LTEXT "ã¤ãã³ãID:",IDC_STATIC,133,15,36,8 LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 - LTEXT "ã½ ã¼ã¹:",IDC_STATIC,133,28,36,8 + LTEXT "ã½ã¼ã¹:",IDC_STATIC,133,28,36,8 LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 LTEXT "ç¨®é¡:",IDC_STATIC,133,42,36,8 LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 @@ -93,7 +93,7 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ã¤ãã³ã ãã¥ã¼ã¢" - IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½ æ§ãããã¾ãã" + IDS_EVENTSTRINGIDNOTFOUND "ã¤ãã³ã ID (%lu) (ã½ã¼ã¹ %s å) ã«é¢ããèª¬æãè¦ã¤ããã¾ããã§ããã ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ããã¡ãã»ã¼ã¸ãè¡¨ç¤ºããããã«å¿è¦ãªã¬ã¸ã¹ããªæå ±ã¾ãã¯ã¡ãã»ã¼ã¸ DLL ãã¡ã¤ã«ããã¼ã«ã« ã³ã³ãã¥ã¼ã¿ã«ãªãå¯è½æ§ãããã¾ãã" IDS_EVENTLOG_ERROR_TYPE "ã¨ã©ã¼" IDS_EVENTLOG_WARNING_TYPE "è¦å" IDS_EVENTLOG_INFORMATION_TYPE "æå ±" Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -26,7 +26,7 @@ MENUITEM SEPARATOR MENUITEM "ããããã£...", ID_PROP, GRAYED END - POPUP "è¡¨ ç¤º" + POPUP "è¡¨ç¤º" BEGIN MENUITEM "å¤§ããã¢ã¤ã³ã³", ID_VIEW_LARGE MENUITEM "å°ããã¢ã¤ã³ã³", ID_VIEW_SMALL @@ -89,7 +89,7 @@ PUSHBUTTON "ä¸æåæ¢", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED PUSHBUTTON "åé", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED LTEXT "ãµã¼ãã¹å:", IDC_STATIC, 4, 11, 53, 11 - LTEXT "è¡¨ ç¤ºå:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "è¡¨ç¤ºå:", IDC_STATIC, 4, 29, 53, 11 LTEXT "èª¬æ:", IDC_STATIC, 4, 51, 53, 11 LTEXT "å®è¡ãã¡ã¤ã«ã®ãã¹:", IDC_STATIC, 6, 73, 82, 9 LTEXT "ã¹ã¿ã¼ãã¢ããã®ç¨®é¡:", IDC_STATIC, 6, 108, 53, 11 @@ -124,7 +124,7 @@ EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE LTEXT "*ãµã¼ãã¹å :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*è¡¨ ç¤ºå :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*è¡¨ç¤ºå :", IDC_STATIC, 12, 33, 54, 9 LTEXT "*å®è¡ãã¡ã¤ã«ã®ãã¹ :", IDC_STATIC, 10, 51, 68, 9 LTEXT "èª¬æ :", IDC_STATIC, 12, 86, 44, 9 PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 @@ -258,14 +258,14 @@ IDS_HINT_DELETE " é¸æãããµã¼ãã¹ãåé¤ãã¾ãã" IDS_HINT_PROP " ç¾å¨é¸æããã¦ããé ç®ã®ããããã£ ã·ã¼ããéãã¾ãã" - IDS_HINT_LARGE " ã¢ã¤ãã ãå¤§ããã¢ã¤ã³ã³ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_SMALL " ã¢ã¤ãã ãå°ããã¢ã¤ã³ã³ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_LIST " ã¢ã¤ãã ãä¸è¦§ã§è¡¨ ç¤ºãã¾ãã" - IDS_HINT_DETAILS " åã¢ã¤ãã ã®æå ±ãã¦ã£ã³ãã¦ã«è¡¨ ç¤ºãã¾ãã" - IDS_HINT_CUST " è¡¨ ç¤ºãã«ã¹ã¿ãã¤ãºãã¾ãã" - - IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ ç¤ºãã¾ãã" - IDS_HINT_ABOUT " ReactOS ãµã¼ãã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ ç¤ºãã¾ãã" + IDS_HINT_LARGE " ã¢ã¤ãã ãå¤§ããã¢ã¤ã³ã³ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_SMALL " ã¢ã¤ãã ãå°ããã¢ã¤ã³ã³ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_LIST " ã¢ã¤ãã ãä¸è¦§ã§è¡¨ç¤ºãã¾ãã" + IDS_HINT_DETAILS " åã¢ã¤ãã ã®æå ±ãã¦ã£ã³ãã¦ã«è¡¨ç¤ºãã¾ãã" + IDS_HINT_CUST " è¡¨ç¤ºãã«ã¹ã¿ãã¤ãºãã¾ãã" + + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ãµã¼ãã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨ç¤ºãã¾ãã" IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -17,8 +17,8 @@ MENUITEM "ä¸æ¸ãä¿å(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "ååãä»ãã¦ä¿å(&A)...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "èæ¯ã«è¨å® (ä¸¦ã¹ã¦è¡¨ ç¤º)", IDM_FILEASWALLPAPERPLANE - MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ ç¤º)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "èæ¯ã«è¨å® (ä¸¦ã¹ã¦è¡¨ç¤º)", IDM_FILEASWALLPAPERPLANE + MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ç¤º)", IDM_FILEASWALLPAPERCENTERED MENUITEM "èæ¯ã«è¨å® (æ¡å¤§)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "ãã¤ã³ãã®çµäº(&Q)\tAlt+F4", IDM_FILEEXIT @@ -31,16 +31,16 @@ MENUITEM SEPARATOR MENUITEM "åãåã\tCtrl+X", IDM_EDITCUT MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDITCOPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDITPASTE + MENUITEM "è²¼ãä»ã\tCtrl+V", IDM_EDITPASTE MENUITEM "é¸æç¯å²ã®åé¤\tDel", IDM_EDITDELETESELECTION MENUITEM "é¸æç¯å²ã®æ¿å¥", IDM_EDITINVERTSELECTION MENUITEM "ãã¹ã¦é¸æ\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "ãã¡ã¤ã«ã¸ã³ãã¼", IDM_EDITCOPYTO - MENUITEM "ãã¡ã¤ã«ããè²¼ ãä»ã", IDM_EDITPASTEFROM - END - - POPUP "è¡¨ ç¤º(&V)" + MENUITEM "ãã¡ã¤ã«ããè²¼ãä»ã", IDM_EDITPASTEFROM + END + + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ãã¼ã« ããã¯ã¹\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED MENUITEM "ã«ã©ã¼ ãã¬ãã\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED @@ -60,10 +60,10 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "ã°ãªãããè¡¨ ç¤º\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "å®å¯¸è¡¨ ç¤º", IDM_VIEWSHOWMINIATURE + MENUITEM "ã°ãªãããè¡¨ç¤º\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "å®å¯¸è¡¨ç¤º", IDM_VIEWSHOWMINIATURE END - MENUITEM "å¨ç»é¢è¡¨ ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "å¨ç»é¢è¡¨ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN END POPUP "ç»å(&I)" @@ -179,7 +179,7 @@ IDS_PROGRAMNAME, "ãã¤ã³ã" IDS_WINDOWTITLE, "%s - ãã¤ã³ã" IDS_INFOTITLE, "ReactOS ãã¤ã³ã" - IDS_INFOTEXT, "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ ã§ãã" + IDS_INFOTEXT, "ReactOS ãã¤ã³ãã¯ GNU Lesser General Public License (LGPL) version 3 (è©³ç´°ã¯ www.gnu.org)ã®ä¸ã§å©ç¨å¯è½ã§ãã" IDS_SAVEPROMPTTEXT, "%s ã®å¤æ´åå®¹ãä¿åãã¾ãã?" IDS_DEFAULTFILENAME, "ç¡é¡.bmp" IDS_MINIATURETITLE, "ç¸®å°å³" Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -27,11 +27,11 @@ GROUPBOX "è²",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ãã ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ ç¤ºã«ãªãã¾ã",IDC_STATIC,53,22,175,21 + LTEXT "ãªã¢ã¼ã ãã¹ã¯ãããã®ç»é¢ãµã¤ãºãè¨å®ãã¦ãã ãããã¹ã©ã¤ãã®ã¤ã¾ã¿ãå³ç«¯ã«åããã¨ãå¨ç»é¢è¡¨ç¤ºã«ãªãã¾ã",IDC_STATIC,53,22,175,21 CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "æ³¨æ: ãã®è¨å®ã¯ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ã®è¨å®ã§ä¸æ¸ããããå¯è½ æ§ãããã¾ãã",IDC_STATIC,56,143,165,18 + LTEXT "æ³¨æ: ãã®è¨å®ã¯ãªã¢ã¼ã ã³ã³ãã¥ã¼ã¿ã®è¨å®ã§ä¸æ¸ããããå¯è½æ§ãããã¾ãã",IDC_STATIC,56,143,165,18 LTEXT "å°",IDC_STATIC,35,42,15,8 LTEXT "å¤§",IDC_STATIC,189,42,17,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER @@ -57,7 +57,7 @@ IDS_HIGHCOLOR16 "65,536 è² (16 ããã)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ããã)" IDS_PIXEL "%lu x %lu ãã¯ã»ã«" - IDS_FULLSCREEN "å¨ç»é¢è¡¨ ç¤º" + IDS_FULLSCREEN "å¨ç»é¢è¡¨ç¤º" IDS_BROWSESERVER "<åç§...>" IDS_HEADERTEXT1 "ãªã¢ã¼ã ãã¹ã¯ããã" IDS_HEADERTEXT2 "æ¥ç¶" Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -61,7 +61,7 @@ MENUITEM SEPARATOR MENUITEM "åãåã(&T)\tCtrl+X", CMD_CUT MENUITEM "ã³ãã¼(&C)\tCtrl+C", CMD_COPY - MENUITEM "è²¼ ãä»ã(&P)\tCtrl+V", CMD_PASTE + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", CMD_PASTE MENUITEM "åé¤(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "æ¤ç´¢(&F)...\tCtrl+F", CMD_SEARCH @@ -77,7 +77,7 @@ MENUITEM "å³ç«¯ã§æãè¿ã(&W)", CMD_WRAP MENUITEM "ãã©ã³ã(&F)...", CMD_FONT END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼(&B)", CMD_STATUSBAR END Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -164,7 +164,7 @@ BEGIN MENUITEM "åãåã(&C)", ID_HEXEDIT_CUT MENUITEM "ã³ãã¼(&C)", ID_HEXEDIT_COPY - MENUITEM "è²¼ ãä»ã(&P)", ID_HEXEDIT_PASTE + MENUITEM "è²¼ãä»ã(&P)", ID_HEXEDIT_PASTE MENUITEM "åé¤(&D)", ID_HEXEDIT_DELETE MENUITEM SEPARATOR MENUITEM "ãã¹ã¦é¸æ(&A)", ID_HEXEDIT_SELECT_ALL Modified: trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -35,7 +35,7 @@ PUSHBUTTON "é²é³(&R)", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON PUSHBUTTON "ãã®ä»(&O):", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED - LTEXT "è¡¨ ç¤ºããã³ã³ããã¼ã«:", IDC_LABELCONTROLS, 7, 109, 162, 8 + LTEXT "è¡¨ç¤ºããã³ã³ããã¼ã«:", IDC_LABELCONTROLS, 7, 109, 162, 8 CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 PUSHBUTTON "OK", IDOK, 114,226,50,14 Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -10,16 +10,16 @@ END POPUP "ãªãã·ã§ã³(&O)" BEGIN - MENUITEM "å¸¸ã«æåã«è¡¨ ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED MENUITEM "æªä½¿ç¨æã«æå°å(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED MENUITEM "æå°åæã«é ã(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 ããã ã¿ã¹ã¯ã®è¡¨ ç¤º(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 ããã ã¿ã¹ã¯ã®è¡¨ç¤º(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "è¡¨ ç¤º(&V)" + POPUP "è¡¨ç¤º(&V)" BEGIN MENUITEM "ææ°ã®ç¶æã«æ´æ°(&R)", ID_VIEW_REFRESH POPUP "æ´æ°ã®é »åº¦(&U)" @@ -43,16 +43,16 @@ MENUITEM "CPU ãã¨ã« 1 ã°ã©ã(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "ã«ã¼ãã«æéãè¡¨ ç¤ºãã(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "ã«ã¼ãã«æéãè¡¨ç¤ºãã(&S)", ID_VIEW_SHOWKERNELTIMES END POPUP "ã¦ã£ã³ãã¦(&W)" BEGIN - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT END POPUP "ãã«ã(&H)" BEGIN @@ -64,12 +64,12 @@ IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE @@ -89,16 +89,16 @@ POPUP "DUMMY" BEGIN MENUITEM "åãæ¿ã(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "æåã«è¡¨ ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "æåã«è¡¨ç¤º(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "æå°å(&M)", ID_WINDOWS_MINIMIZE MENUITEM "æå¤§å(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "éãã¦è¡¨ ç¤º(&C)", ID_WINDOWS_CASCADE + MENUITEM "éãã¦è¡¨ç¤º(&C)", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "ã¿ã¹ã¯ã®çµäº(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "ããã»ã¹ã®è¡¨ ç¤º(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "ããã»ã¹ã®è¡¨ç¤º(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -110,7 +110,7 @@ MENUITEM "åã®ãµã¤ãºã«æ»ã(&R)", ID_RESTORE MENUITEM "éãã(&C)", ID_FILE_EXIT MENUITEM SEPARATOR - MENUITEM "å¸¸ã«æåã«è¡¨ ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -180,7 +180,7 @@ LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "ããã»ã¹ã®çµäº(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "å¨ã¦ã¼ã¶ã¼ã®ããã»ã¹ãè¡¨ ç¤ºãã(&S)",IDC_SHOWALLPROCESSES, + CONTROL "å¨ã¦ã¼ã¶ã¼ã®ããã»ã¹ãè¡¨ç¤ºãã(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -233,8 +233,8 @@ ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP GROUPBOX "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU ä½¿ç¨çã®è¡¨ ç¤º",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®è¡¨ ç¤º",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU ä½¿ç¨çã®è¡¨ç¤º",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®è¡¨ç¤º",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "CPU ä½¿ç¨çã®å±¥æ´",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE PUSHBUTTON "ã¡ã¢ãªä½¿ç¨éã®å±¥æ´",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, @@ -334,7 +334,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,138,178,50,14 - LTEXT "ã¿ã¹ã¯ ããã¼ã¸ã£ã® [ããã»ã¹] ãã¼ã¸ã«è¡¨ ç¤ºããåãé¸æãã¾ãã", + LTEXT "ã¿ã¹ã¯ ããã¼ã¸ã£ã® [ããã»ã¹] ãã¼ã¸ã«è¡¨ç¤ºããåãé¸æãã¾ãã", IDC_STATIC,7,7,181,17 CONTROL "ã¤ã¡ã¼ã¸å(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 @@ -517,41 +517,41 @@ STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "æ°ããããã°ã©ã ãå®è¡ãã¾ã" - ID_OPTIONS_ALWAYSONTOP "æå°åãããªãéããå¸¸ã«ã¿ã¹ã¯ ããã¼ã¸ã£ãã»ãã®ãã¹ã¦ã®ã¦ã£ã³ãã¦ãããæåã«è¡¨ ç¤ºããã¾ã" + ID_OPTIONS_ALWAYSONTOP "æå°åãããªãéããå¸¸ã«ã¿ã¹ã¯ ããã¼ã¸ã£ãã»ãã®ãã¹ã¦ã®ã¦ã£ã³ãã¦ãããæåã«è¡¨ç¤ºããã¾ã" ID_OPTIONS_MINIMIZEONUSE "[åãæ¿ã] æä½ãå®è¡ããã¨ãã¿ã¹ã¯ ããã¼ã¸ã£ãæå°åããã¾ã" ID_OPTIONS_HIDEWHENMINIMIZED "æå°åãããã¨ãã«ãã¿ã¹ã¯ ããã¼ã¸ã£ãé ãã¾ã" ID_VIEW_REFRESH "[æ´æ°ã®é »åº¦] ã®è¨å®ã«ããããããä»ããã¿ã¹ã¯ ããã¼ã¸ã£ãæ´æ°ãã¾ã" - ID_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_SMALL "å°ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_DETAILS "åã¿ã¹ã¯ã®æå ±ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_UPDATESPEED_HIGH "æ¯ç§ 2 åè¡¨ ç¤ºãæ´æ°ãã¾ã" - ID_VIEW_UPDATESPEED_NORMAL "2 ç§ã« 1 åè¡¨ ç¤ºãæ´æ°ãã¾ã" - ID_VIEW_UPDATESPEED_LOW "4 ç§ã« 1 åè¡¨ ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ç¤ºãã¾ã" + ID_VIEW_SMALL "å°ããã¢ã¤ã³ã³ãä½¿ã£ã¦ã¿ã¹ã¯ãè¡¨ç¤ºãã¾ã" + ID_VIEW_DETAILS "åã¿ã¹ã¯ã®æå ±ãè¡¨ç¤ºãã¾ã" + ID_VIEW_UPDATESPEED_HIGH "æ¯ç§ 2 åè¡¨ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_NORMAL "2 ç§ã« 1 åè¡¨ç¤ºãæ´æ°ãã¾ã" + ID_VIEW_UPDATESPEED_LOW "4 ç§ã« 1 åè¡¨ç¤ºãæ´æ°ãã¾ã" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "è¡¨ ç¤ºãèªåçã«æ´æ°ãã¾ãã" + ID_VIEW_UPDATESPEED_PAUSED "è¡¨ç¤ºãèªåçã«æ´æ°ãã¾ãã" ID_WINDOWS_TILEHORIZONTALLY - "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ ç¤ºãã¾ã" - ID_WINDOWS_TILEVERTICALLY "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«å·¦å³ã«ä¸¦ã¹ã¦è¡¨ ç¤ºãã¾ã" + "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤ºãã¾ã" + ID_WINDOWS_TILEVERTICALLY "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãªããªãããã«å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤ºãã¾ã" ID_WINDOWS_MINIMIZE "ã¦ã£ã³ãã¦ãæå°åãã¾ã" ID_WINDOWS_MAXIMIZE "ã¦ã£ã³ãã¦ãæå¤§åãã¾ã" - ID_WINDOWS_CASCADE "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãã¦è¡¨ ç¤ºãã¾ã" - ID_WINDOWS_BRINGTOFRONT "ã¦ã£ã³ãã¦ãæåã«è¡¨ ç¤ºãã¾ãããåãæ¿ãã¾ããã" - ID_HELP_TOPICS "ã¿ã¹ã¯ ããã¼ã¸ã£ã®ãã«ã ãããã¯ãè¡¨ ç¤ºãã¾ã" - ID_HELP_ABOUT "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨ ç¤ºãã¾ã" + ID_WINDOWS_CASCADE "ãã¹ã¯ãããä¸ã§ã¦ã£ã³ãã¦ãéãã¦è¡¨ç¤ºãã¾ã" + ID_WINDOWS_BRINGTOFRONT "ã¦ã£ã³ãã¦ãæåã«è¡¨ç¤ºãã¾ãããåãæ¿ãã¾ããã" + ID_HELP_TOPICS "ã¿ã¹ã¯ ããã¼ã¸ã£ã®ãã«ã ãããã¯ãè¡¨ç¤ºãã¾ã" + ID_HELP_ABOUT "ããã°ã©ã æå ±ããã¼ã¸ã§ã³çªå·ãèä½æ¨©ãè¡¨ç¤ºãã¾ã" ID_FILE_EXIT "ã¿ã¹ã¯ ããã¼ã¸ã£ ã¢ããªã±ã¼ã·ã§ã³ãçµäºãã¾ã" ID_OPTIONS_SHOW16BITTASKS - "16 ããã ã¿ã¹ã¯ããé¢é£ä»ãããã ntvdm.exe ã®ä¸ã«è¡¨ ç¤ºãã¾ã" - ID_VIEW_SELECTCOLUMNS "[ããã»ã¹] ãã¼ã¸ã«è¡¨ ç¤ºããåãé¸æãã¾ã" - ID_VIEW_SHOWKERNELTIMES "ã«ã¼ãã«æéãããã©ã¼ãã³ã¹ ã°ã©ãä¸ã«è¡¨ ç¤ºãã¾ã" + "16 ããã ã¿ã¹ã¯ããé¢é£ä»ãããã ntvdm.exe ã®ä¸ã«è¡¨ç¤ºãã¾ã" + ID_VIEW_SELECTCOLUMNS "[ããã»ã¹] ãã¼ã¸ã«è¡¨ç¤ºããåãé¸æãã¾ã" + ID_VIEW_SHOWKERNELTIMES "ã«ã¼ãã«æéãããã©ã¼ãã³ã¹ ã°ã©ãä¸ã«è¡¨ç¤ºãã¾ã" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 ã¤ã®å±¥æ´ã°ã©ãã§ CPU ä½¿ç¨çã®åè¨ãè¡¨ ç¤ºãã¾ã" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU ä½¿ç¨çã®å±¥æ´ã CPU ãã¨ã«ã°ã©ãã§è¡¨ ç¤ºãã¾ã" + "1 ã¤ã®å±¥æ´ã°ã©ãã§ CPU ä½¿ç¨çã®åè¨ãè¡¨ç¤ºãã¾ã" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU ä½¿ç¨çã®å±¥æ´ã CPU ãã¨ã«ã°ã©ãã§è¡¨ç¤ºãã¾ã" ID_APPLICATION_PAGE_SWITCHTO - "ã¿ã¹ã¯ãæåã«è¡¨ ç¤ºãããã©ã¼ã«ã¹ãåãæ¿ãã¾ã" + "ã¿ã¹ã¯ãæåã«è¡¨ç¤ºãããã©ã¼ã«ã¹ãåãæ¿ãã¾ã" END STRINGTABLE DISCARDABLE @@ -611,7 +611,7 @@ IDS_TAB_IOWRITESBYTES "I/O æ¸ãè¾¼ã¿ãã¤ãæ°" IDS_TAB_IOOTHERBYTES "I/O ãã®ä»ã®ãã¤ãæ°" IDS_MENU_SELECTCOLUMNS "åã®é¸æ(&S)..." - IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨ ç¤º(&S)" + IDS_MENU_16BITTASK "16 ããã ã¿ã¹ã¯ã®è¡¨ç¤º(&S)" IDS_MENU_WINDOWS "ã¦ã£ã³ãã¦(&W)" IDS_MENU_LARGEICONS "å¤§ããã¢ã¤ã³ã³(&G)" IDS_MENU_SMALLICONS "å°ããã¢ã¤ã³ã³(&M)" @@ -619,19 +619,19 @@ IDS_MENU_ONEGRAPHALLCPUS "ãã¹ã¦ã® CPU ã§ 1 ã°ã©ã(&O)" IDS_MENU_ONEGRAPHPERCPU "CPU ãã¨ã« 1 ã°ã©ã(&P)" IDS_MENU_CPUHISTORY "CPU å±¥æ´(&C)" - IDS_MENU_SHOWKERNELTIMES "ã«ã¼ãã«æéãè¡¨ ç¤ºãã(&S)" + IDS_MENU_SHOWKERNELTIMES "ã«ã¼ãã«æéãè¡¨ç¤ºãã(&S)" IDS_CREATENEWTASK "æ°ããã¿ã¹ã¯ã®ä½æ" - IDS_CREATENEWTASK_DESC "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããããã¥ã¡ã³ãåãã¤ã³ã¿ã¼ããã ãªã½ ã¼ã¹åãå¥åãã¦ãã ããã" + IDS_CREATENEWTASK_DESC "å®è¡ããããã°ã©ã åãã¾ãã¯éããã©ã«ããããã¥ã¡ã³ãåãã¤ã³ã¿ã¼ããã ãªã½ã¼ã¹åãå¥åãã¦ãã ããã" IDS_MSG_ACCESSPROCESSAFF "ããã»ã¹ã®é¢ä¿ã¸ã®ã¢ã¯ã»ã¹ã¾ãã¯è¨å®ãã§ãã¾ãã" IDS_MSG_PROCESSONEPRO "ããã»ã¹ã¯ãå°ãªãã¨ã 1 ã¤ã®ããã»ããµã¨é¢ä¿ãæããªããã°ãªãã¾ããã" IDS_MSG_INVALIDOPTION "ç¡å¹ãªãªãã·ã§ã³" IDS_MSG_UNABLEDEBUGPROCESS "ãããã¬ãæ·»ä»ã§ãã¾ãã" - IDS_MSG_WARNINGDEBUG "è¦å: ãã®ããã»ã¹ããããã°ããã¨ããã¼ã¿ãå¤±ãããå¯è½ æ§ãããã¾ãã\nãããã¬ãæ·»ä»ãã¾ãã?" + IDS_MSG_WARNINGDEBUG "è¦å: ãã®ããã»ã¹ããããã°ããã¨ããã¼ã¿ãå¤±ãããå¯è½æ§ãããã¾ãã\nãããã¬ãæ·»ä»ãã¾ãã?" IDS_MSG_TASKMGRWARNING "ã¿ã¹ã¯ ããã¼ã¸ã£ã®è¦å" - IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäº æããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨ ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" + IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" IDS_MSG_UNABLETERMINATEPRO "ããã»ã¹ãçµäºã§ãã¾ãã" IDS_MSG_UNABLECHANGEPRIORITY "åªååº¦ãå¤æ´ã§ãã¾ãã" - IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäº æããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" + IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ç: %d%%" IDS_STATUS_MEMUSAGE "ã¡ã¢ãªä½¿ç¨é: %dKB / %dKB" IDS_STATUS_CPUUSAGE "CPU ä½¿ç¨ç: %3d%%" Modified: trunk/reactos/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -4,9 +4,9 @@ IDS_UsageMessage, "%s\n\nä½¿ç¨æ³: regsvr32 [/u] [/s] [/c] [/n] [/i[:ã³ãã³ã ã©ã¤ã³]] DLLå\n\ /u - ãµã¼ãã¼ãç»é²è§£é¤ãã\n\ -/s - ãµã¤ã¬ã³ã; ã¡ãã»ã¼ã¸ ããã¯ã¹ãè¡¨ ç¤ºããªã\n\ -/c - ã³ã³ã½ ã¼ã«åºå\n\ -/i - çç¥å¯è½ ãª [ã³ãã³ã ã©ã¤ã³] ãå¼æ°ã¨ãã¦ DllInstall ãå¼ã³åºã; /u ã¨ä½µç¨ããå ´åã¯ dll uninstall ãå¼ã³åºã\n\ +/s - ãµã¤ã¬ã³ã; ã¡ãã»ã¼ã¸ ããã¯ã¹ãè¡¨ç¤ºããªã\n\ +/c - ã³ã³ã½ã¼ã«åºå\n\ +/i - çç¥å¯è½ãª [ã³ãã³ã ã©ã¤ã³] ãå¼æ°ã¨ãã¦ DllInstall ãå¼ã³åºã; /u ã¨ä½µç¨ããå ´åã¯ dll uninstall ãå¼ã³åºã\n\ /n - DllRegisterServer ãå¼ã³åºããªã; ãã®ãªãã·ã§ã³ã¯ /i ã¨ä½µç¨ããå¿è¦ããã" IDS_NoDllSpecified, "DLL åãæå®ããã¦ãã¾ããã" @@ -18,7 +18,7 @@ IDS_DllNotLoaded, "LoadLibrary('%s') ã«å¤±æãã¾ããã\nGetLastError ã¯ 0x%08x ãè¿ãã¾ããã" IDS_MissingEntry, "%s ãèªã¿è¾¼ã¿ã¾ãããã%s ã¨ã³ããª ãã¤ã³ããè¦ã¤ããã¾ããã§ããã\n\n\ -%s ã¯ã¨ã¯ã¹ãã¼ãããã¦ããªããã%s ã®ä¸æ£ãªãã¼ã¸ã§ã³ãã¡ã¢ãªä¸ã«ããå¯è½ æ§ãããã¾ããæ¤åºãåé¤ããããããPView ã®ä½¿ç¨ãæ¤è¨ãã¦ãã ããã" +%s ã¯ã¨ã¯ã¹ãã¼ãããã¦ããªããã%s ã®ä¸æ£ãªãã¼ã¸ã§ã³ãã¡ã¢ãªä¸ã«ããå¯è½æ§ãããã¾ããæ¤åºãåé¤ããããããPView ã®ä½¿ç¨ãæ¤è¨ãã¦ãã ããã" IDS_FailureMessage, "%s (%s ã®) ã«å¤±æãã¾ããã\nè¿ã£ã¦ããã³ã¼ã: 0x%08x" Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -7,21 +7,21 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "åºå®ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "åºå®ãã¼æ©è½ ãä½¿ãã¨ããã¼ãåæã«æ¼ããªãã¦ããShiftãCtrlãAlt ãã¼ã®æ©è½ ãä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "åºå®ãã¼æ©è½ ãä½¿ã(&U)",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "åºå®ãã¼æ©è½ãä½¿ãã¨ããã¼ãåæã«æ¼ããªãã¦ããShiftãCtrlãAlt ãã¼ã®æ©è½ãä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "åºå®ãã¼æ©è½ãä½¿ã(&U)",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "ãã£ã«ã¿ ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "ãã£ã«ã¿ ãã¼æ©è½ ãä½¿ãã¨ãéããã¼å¥åãç¹°ãè¿ããããã¼å¥åãç¡è¦ããããç¹°ãè¿ãå¥åã®ééãé·ãããããããã¨ãã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "ãã£ã«ã¿ ãã¼æ©è½ ãä½¿ã(&F)",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "ãã£ã«ã¿ ãã¼æ©è½ãä½¿ãã¨ãéããã¼å¥åãç¹°ãè¿ããããã¼å¥åãç¡è¦ããããç¹°ãè¿ãå¥åã®ééãé·ãããããããã¨ãã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "ãã£ã«ã¿ ãã¼æ©è½ãä½¿ã(&F)",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&E)",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 GROUPBOX "åãæ¿ããã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "åãæ¿ããã¼æ©è½ ãä½¿ãã¨ãCapsLockãNumLockãScrollLock ãã¼ãæ¼ããã¨ãã«é³ãé³´ããã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "åãæ¿ããã¼æ©è½ ãä½¿ã(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "åãæ¿ããã¼æ©è½ãä½¿ãã¨ãCapsLockãNumLockãScrollLock ãã¼ãæ¼ããã¨ãã«é³ãé³´ããã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "åãæ¿ããã¼æ©è½ãä½¿ã(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 - AUTOCHECKBOX "ããã°ã©ã ã§è¿½å ã®ãã¼ãã¼ã ãã«ããè¡¨ ç¤ºãã(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 + AUTOCHECKBOX "ããã°ã©ã ã§è¿½å ã®ãã¼ãã¼ã ãã«ããè¡¨ç¤ºãã(&W)",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -37,7 +37,7 @@ COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "ãµã¦ã³ãè§£èª¬",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "ããã°ã©ã ãé³ãé³´ããã¨ããé³´ããé³ã«ã¤ãã¦è§£èª¬ãè¡¨ ç¤ºãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "ããã°ã©ã ãé³ãé³´ããã¨ããé³´ããé³ã«ã¤ãã¦è§£èª¬ãè¡¨ç¤ºãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "ãµã¦ã³ãè§£èª¬(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END @@ -48,7 +48,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ãã¤ã³ã³ãã©ã¹ã",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "ãã®æ©è½ ãä½¿ãã¨ãç»é¢è¡¨ ç¤ºã«èªã¿ãããéè²ã¨ãã©ã³ããä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + LTEXT "ãã®æ©è½ãä½¿ãã¨ãç»é¢è¡¨ç¤ºã«èªã¿ãããéè²ã¨ãã©ã³ããä½¿ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "ãã¤ã³ã³ãã©ã¹ããä½¿ã(&U)",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 @@ -72,8 +72,8 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN GROUPBOX "ãã¦ã¹ ãã¼æ©è½",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "ãã¦ã¹ ãã¼æ©è½ ãä½¿ãã¨ããã³ãã¼ãä½¿ã£ã¦ãã¦ã¹ ãã¤ã³ã¿ãæä½ã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "ãã¦ã¹ ãã¼æ©è½ (&M)",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + LTEXT "ãã¦ã¹ ãã¼æ©è½ãä½¿ãã¨ããã³ãã¼ãä½¿ã£ã¦ãã¦ã¹ ãã¤ã³ã¿ãæä½ã§ãã¾ãã",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "ãã¦ã¹ ãã¼æ©è½(&M)",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "è¨å®(&S)",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -292,7 +292,7 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "ã¦ã¼ã¶ã¼è£å©" - IDS_CPLSYSTEMDESCRIPTION "è¦è¦ãè´è¦ãåè¢ã®ç¶æã«åããã¦ãã¦ã¼ã¶ã¼ãè£å©ããæ©è½ ãèª¿æ´ãã¾ãã" + IDS_CPLSYSTEMDESCRIPTION "è¦è¦ãè´è¦ãåè¢ã®ç¶æã«åããã¦ãã¦ã¼ã¶ã¼ãè£å©ããæ©è½ãèª¿æ´ãã¾ãã" IDS_SENTRY_NONE "[None]" IDS_SENTRY_TITLE "Flash the titlebar" Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -18,7 +18,7 @@ LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS ãã¼ã ãã¼ã¸</A>ã¸è¡ã", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 - PUSHBUTTON "ã©ã¤ã»ã³ã¹ãè¡¨ ç¤º(&L)...", IDC_LICENCE, 170, 199, 78, 13 + PUSHBUTTON "ã©ã¤ã»ã³ã¹ãè¡¨ç¤º(&L)...", IDC_LICENCE, 170, 199, 78, 13 END @@ -29,7 +29,7 @@ BEGIN GROUPBOX "ããã¤ã¹ ããã¼ã¸ã£", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON - LTEXT "ããã¤ã¹ããã¼ã¸ã£ã¯ã³ã³ãã¥ã¼ã¿ã«è£çããã¦ãããã¹ã¦ã®ãã¼ãã¦ã§ã¢ãè¡¨ ç¤º ãã¾ããåããã¤ã¹ã®ããããã£ãå¤æ´ããã«ã¯ããã¤ã¹ããã¼ã¸ã£ãä½¿ç¨ ãã¦ãã ããã", IDC_STATIC, 42, 18, 204, 24 + LTEXT "ããã¤ã¹ããã¼ã¸ã£ã¯ã³ã³ãã¥ã¼ã¿ã«è£çããã¦ãããã¹ã¦ã®ãã¼ãã¦ã§ã¢ãè¡¨ç¤º ãã¾ããåããã¤ã¹ã®ããããã£ãå¤æ´ããã«ã¯ããã¤ã¹ããã¼ã¸ã£ãä½¿ç¨ ãã¦ãã ããã", IDC_STATIC, 42, 18, 204, 24 PUSHBUTTON "ããã¤ã¹ ããã¼ã¸ã£(&D)...", IDC_HARDWARE_DEVICE_MANAGER, 154, 48, 90, 15 GROUPBOX "ãã¼ãã¦ã§ã¢ ã¦ã£ã¶ã¼ã", IDC_STATIC, 6, 79, 244, 61 @@ -39,7 +39,7 @@ GROUPBOX "ãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON - LTEXT "ãã¼ãã¦ã§ã¢ãããã¡ã¤ã«ã¯å¥ã®ãã¼ãã¦ã§ã¢ã®æ§ æãè¨å®ããæ ¼ç´ããæ¹æ³ã æä¾ãã¾ãã", IDC_STATIC, 42, 160, 204, 24 + LTEXT "ãã¼ãã¦ã§ã¢ãããã¡ã¤ã«ã¯å¥ã®ãã¼ãã¦ã§ã¢ã®æ§æãè¨å®ããæ ¼ç´ããæ¹æ³ã æä¾ãã¾ãã", IDC_STATIC, 42, 160, 204, 24 PUSHBUTTON "ãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«(&W)...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END @@ -86,8 +86,8 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON - LTEXT "ç°ãªããã¼ãã¦ã§ã¢æ§ æã«åããããã¼ãã¦ã§ã¢ ãããã¡ã¤ã«ãã»ããã¢ããã§ãã¾ãã èµ·åæã«ä½¿ç¨ãããããã¡ã¤ã«ãé¸æã§ãã¾ãã", IDC_STATIC, 46, 11, 188, 25 - LTEXT "å©ç¨å¯è½ ãªãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«:", IDC_STATIC, 8, 41, 120, 8 + LTEXT "ç°ãªããã¼ãã¦ã§ã¢æ§æã«åããããã¼ãã¦ã§ã¢ ãããã¡ã¤ã«ãã»ããã¢ããã§ãã¾ãã èµ·åæã«ä½¿ç¨ãããããã¡ã¤ã«ãé¸æã§ãã¾ãã", IDC_STATIC, 46, 11, 188, 25 + LTEXT "å©ç¨å¯è½ãªãã¼ãã¦ã§ã¢ ãããã¡ã¤ã«:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED @@ -169,11 +169,11 @@ GROUPBOX "ã·ã¹ãã ã®èµ·å", IDC_STATIC, 7, 12, 238, 95 LTEXT "æ¢å®ã®ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã (&S):", IDC_STATIC, 14, 26, 100, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST - AUTOCHECKBOX "ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã ã®ä¸è¦§ãè¡¨ ç¤ºããæé(&T):", IDC_STRECLIST, 14, 56, 160, 8 + AUTOCHECKBOX "ãªãã¬ã¼ãã£ã³ã° ã·ã¹ãã ã®ä¸è¦§ãè¡¨ç¤ºããæé(&T):", IDC_STRECLIST, 14, 56, 160, 8 EDITTEXT IDC_STRRECLISTEDIT, 185, 54, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ç§", IDC_STATIC, 223, 56, 18, 8 - AUTOCHECKBOX "å¿è¦ãªã¨ãã«ä¿®å¾©ãªãã·ã§ã³ãè¡¨ ç¤ºããæé(&D):", IDC_STRRECREC, 14, 70, 170, 8 + AUTOCHECKBOX "å¿è¦ãªã¨ãã«ä¿®å¾©ãªãã·ã§ã³ãè¡¨ç¤ºããæé(&D):", IDC_STRRECREC, 14, 70, 170, 8 EDITTEXT IDC_STRRECRECEDIT, 185, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ç§", IDC_STATIC, 223, 70, 18, 8 Modified: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -3,5 +3,5 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "é»è©±ã¨ã¢ãã ã®ãªãã·ã§ã³" - IDS_CPLSYSTEMDESCRIPTION "é»è©±ã®ãã¤ã¤ã«æå ±ã¨ã¢ãã ã®ããããã£ãæ§ æãã¾ãã" + IDS_CPLSYSTEMDESCRIPTION "é»è©±ã®ãã¤ã¤ã«æå ±ã¨ã¢ãã ã®ããããã£ãæ§æãã¾ãã" END Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -5,7 +5,7 @@ CAPTION "å¨è¬" FONT 9, "MS UI Gothic" BEGIN - LTEXT "ãããã¯ã¼ã¯ã§ãã®æ©è½ ããµãã¼ãããã¦ããå ´åã¯ãIP è¨å®ãèªåçã«åå¾ãããã¨ãã§ãã¾ãããµãã¼ãããã¦ããªãå ´åã¯ããããã¯ã¼ã¯ç®¡çèã«é©åãª IP è¨å®ãåãåããã¦ãã ããã", -1, 9, 9, 228, 27 + LTEXT "ãããã¯ã¼ã¯ã§ãã®æ©è½ããµãã¼ãããã¦ããå ´åã¯ãIP è¨å®ãèªåçã«åå¾ãããã¨ãã§ãã¾ãããµãã¼ãããã¦ããªãå ´åã¯ããããã¯ã¼ã¯ç®¡çèã«é©åãª IP è¨å®ãåãåããã¦ãã ããã", -1, 9, 9, 228, 27 CONTROL "IP ã¢ãã¬ã¹ãèªåçã«åå¾ãã", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX CONTROL "æ¬¡ã® IP ã¢ãã¬ã¹ãä½¿ã(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 Modified: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -67,7 +67,7 @@ 22 "%1 ã¯ã¼ã¯ã°ã«ã¼ãã¸ããããã" 23 "%1 ãã¡ã¤ã³ã¸ããããã" 24 "å¤æ´ãæå¹ã«ããã«ã¯ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã¦ãã ããã" - 25 "ãã®ã³ã³ãã¥ã¼ã¿ã®ååã¨ã¡ã³ãã·ãããå¤æ´ã§ãã¾ããå¤æ´ããã¨ãããã¯ã¼ã¯ ãªã½ ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«å½±é¿ããå¯è½ æ§ãããã¾ãã" + 25 "ãã®ã³ã³ãã¥ã¼ã¿ã®ååã¨ã¡ã³ãã·ãããå¤æ´ã§ãã¾ããå¤æ´ããã¨ãããã¯ã¼ã¯ ãªã½ã¼ã¹ã¸ã®ã¢ã¯ã»ã¹ã«å½±é¿ããå¯è½æ§ãããã¾ãã" 1021 "æ³¨æ: ãã®ã³ã³ãã¥ã¼ã¿ã® ID ãå¤æ´ã§ããã®ã¯ç®¡çèã®ã¿ã§ãã" 1022 "æ³¨æ: æ¬¡ã®çç±ã«ããããã®ã³ã³ãã¥ã¼ã¿ã® ID ãå¤æ´ã§ãã¾ãã:" 1030 "æ°ããã³ã³ãã¥ã¼ã¿å ""%s"" ã«ã¯ãä½¿ç¨ã§ããªããªæåãå«ã¾ãã¦ãã¾ããä½¿ç¨ã§ããªãæåã¯ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ? ã§ãã" Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -11,7 +11,7 @@ IDC_STATIC,120,21,195,30 LTEXT "ç¶è¡ããã«ã¯ã[æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã",IDC_STATIC,120,169,195,17 LTEXT "ä¸æãªããã¤ã¹",IDC_DEVICE,134,52,164,11 - LTEXT "è¦å! ã«ã¹ã¿ã ããã¤ã¹ãã¤ã³ã¹ãã¼ã«ããã¨ãã³ã³ãã¥ã¼ã¿ãããªã¼ãºããããèµ·åä¸è½ ã«ãªãå¯è½ æ§ãããã¾ã!",IDC_STATIC,120,67,195,34 + LTEXT "è¦å! ã«ã¹ã¿ã ããã¤ã¹ãã¤ã³ã¹ãã¼ã«ããã¨ãã³ã³ãã¥ã¼ã¿ãããªã¼ãºããããèµ·åä¸è½ã«ãªãå¯è½æ§ãããã¾ã!",IDC_STATIC,120,67,195,34 CONTROL "ãã©ã¤ããèªåçã«ã¤ã³ã¹ãã¼ã«ãã",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "ãã©ã¤ããç¹å®ã®å ´æããã¤ã³ã¹ãã¼ã«ãã",IDC_RADIO_MANUAL, @@ -29,7 +29,7 @@ IDC_STATIC,120,40,195,19 LTEXT "ãã©ã¤ãã®ãã£ã¹ã¯ãæã£ã¦ãããããã©ã¤ãã¸ã®ãã¹ãç¥ã£ã¦ããå ´åã¯ã[æ»ã] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC,120,98,181,24 - CONTROL "ãã®ãã¤ã¢ãã°ãä»å¾è¡¨ ç¤ºããªã",IDC_DONOTSHOWDLG,"Button", + CONTROL "ãã®ãã¤ã¢ãã°ãä»å¾è¡¨ç¤ºããªã",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END @@ -40,7 +40,7 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "ã¤ã³ã¹ãã¼ã«å¤±æ",IDC_FINISHTITLE,120,8,195,24 - LTEXT "äº æãã¬ã¨ã©ã¼ãçºçãããããããã¤ã¹ã¯ã¤ã³ã¹ãã¼ã«ããã¾ããã§ããã", + LTEXT "äºæãã¬ã¨ã©ã¼ãçºçãããããããã¤ã¹ã¯ã¤ã³ã¹ãã¼ã«ããã¾ããã§ããã", IDC_STATIC,120,40,195,19 LTEXT "ä¸æãªããã¤ã¹",IDC_DEVICE,134,55,164,11 END Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Wed Mar 20 14:28:34 2013 @@ -36,13 +36,13 @@ CAPTION "ReactOS ã»ããã¢ãã" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨ æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", + LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOSã¯GPLã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯GPLã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC,15,110,227,19 - PUSHBUTTON "GPLãè¡¨ ç¤º(&V)...",IDC_VIEWGPL,251,110,50,19 + PUSHBUTTON "GPLãè¡¨ç¤º(&V)...",IDC_VIEWGPL,251,110,50,19 LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã",IDC_STATIC,15,136, 195,17 END @@ -91,7 +91,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ãã±ã¼ã«è¨å®å¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 @@ -172,7 +172,7 @@ BEGIN IDS_ACKTITLE "æ¿èª" IDS_ACKSUBTITLE "ReactOS ãå©ç¨ãã¦ããããã¸ã§ã¯ãã¨ã©ã¤ã»ã³ã¹ã«é¢ããæå ±" - IDS_OWNERTITLE "ã½ ããã¦ã§ã¢ã®åäººç¨è¨å®" + IDS_OWNERTITLE "ã½ããã¦ã§ã¢ã®åäººç¨è¨å®" IDS_OWNERSUBTITLE "ãã®æå ±ã¯ãReactOS ã®åäººç¨è¨å®ã«ç¨ãããã¾ãã" IDS_COMPUTERTITLE "ã³ã³ãã¥ã¼ã¿åã¨ Administrator ãã¹ã¯ã¼ã" IDS_COMPUTERSUBTITLE "ã³ã³ãã¥ã¼ã¿åã¨ Administrator ãã¹ã¯ã¼ããå¥åããå¿è¦ãããã¾ãã" @@ -197,7 +197,7 @@ IDS_CMT_DEVMGMT "ããã¤ã¹ ããã¼ã¸ã£ãèµ·åãã¾ã" IDS_CMT_EVENTVIEW "ã¤ãã³ã ãã¥ã¼ã¢ãèµ·åãã¾ã" IDS_CMT_EXPLORER "ã¨ã¯ã¹ããã¼ã©ãèµ·åãã¾ã" - IDS_CMT_MSCONFIG "ã·ã¹ãã ã®æ§ æããã°ã©ã ãéãã¾ã" + IDS_CMT_MSCONFIG "ã·ã¹ãã ã®æ§æããã°ã©ã ãéãã¾ã" IDS_CMT_NOTEPAD "ããã¹ãã¨ãã£ã¿ãèµ·åãã¾ã" IDS_CMT_RDESKTOP "ãªã¢ã¼ã ãã¹ã¯ããããèµ·åãã¾ã" IDS_CMT_REGEDIT "ã¬ã¸ã¹ããª ã¨ãã£ã¿ãèµ·åãã¾ã" @@ -210,9 +210,9 @@ STRINGTABLE BEGIN IDS_GAMES "ã²ã¼ã " - IDS_CMT_SOLITAIRE "ã½ ãªãã£ã¢" + IDS_CMT_SOLITAIRE "ã½ãªãã£ã¢" IDS_CMT_WINEMINE "WineMine" - IDS_CMT_SPIDER "ã¹ãã¤ã ã½ ãªãã£ã¢" + IDS_CMT_SPIDER "ã¹ãã¤ã ã½ãªãã£ã¢" END STRINGTABLE @@ -253,7 +253,7 @@ STRINGTABLE BEGIN IDS_SHORT_CALC "é»å.lnk" - IDS_SHORT_CHARMAP "æåã³ã¼ãè¡¨ .lnk" + IDS_SHORT_CHARMAP "æåã³ã¼ãè¡¨.lnk" IDS_SHORT_CMD "ã³ãã³ã ããã³ãã.lnk" IDS_SHORT_DEVICE "ããã¤ã¹ ããã¼ã¸ã£.lnk" IDS_SHORT_DOWNLOADER "ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£.lnk" @@ -263,7 +263,7 @@ IDS_SHORT_KBSWITCH "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ã åæ¿å¨.lnk" IDS_SHORT_MAGNIFY "æ¡å¤§é¡.lnk" IDS_SHORT_MPLAY32 "ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤.lnk" - IDS_SHORT_MSCONFIG "ã·ã¹ãã ã®æ§ æ.lnk" + IDS_SHORT_MSCONFIG "ã·ã¹ãã ã®æ§æ.lnk" IDS_SHORT_NOTEPAD "ã¡ã¢å¸³.lnk" IDS_SHORT_RDESKTOP "ãªã¢ã¼ã ãã¹ã¯ãããæ¥ç¶.lnk" IDS_SHORT_REGEDIT "ã¬ã¸ã¹ããª ã¨ãã£ã¿.lnk" @@ -271,11 +271,11 @@ IDS_SHORT_SNAP "ã¹ãããã·ã§ãã.lnk" IDS_SHORT_SNDVOL32 "ããªã¥ã¼ã ã³ã³ããã¼ã«.lnk" IDS_SHORT_SNDREC32 "ãªã¼ãã£ãªã¬ã³ã¼ã.lnk" - IDS_SHORT_SOLITAIRE "ã½ ãªãã£ã¢.lnk" + IDS_SHORT_SOLITAIRE "ã½ãªãã£ã¢.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "ã¯ã¼ãããã.lnk" IDS_SHORT_PAINT "ãã¤ã³ã.lnk" - IDS_SHORT_SPIDER "ã¹ãã¤ã ã½ ãªãã£ã¢.lnk" + IDS_SHORT_SPIDER "ã¹ãã¤ã ã½ãªãã£ã¢.lnk" END STRINGTABLE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs