Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 75884: [JSPROXY] Sync with Wine Staging 2.16. CORE-13762 a79c6a8 jsproxy: Label ordinals.
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:44 2017 New Revision: 75884 URL: http://svn.reactos.org/svn/reactos?rev=75884&view=rev Log: [JSPROXY] Sync with Wine Staging 2.16. CORE-13762 a79c6a8 jsproxy: Label ordinals. Modified: trunk/reactos/dll/win32/jsproxy/jsproxy.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jsproxy/jsproxy.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/jsproxy.… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/jsproxy.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jsproxy/jsproxy.spec [iso-8859-1] Sun Sep 17 22:54:44 2017 @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx 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] Sun Sep 17 22:54:44 2017 @@ -86,7 +86,7 @@ reactos/dll/win32/itircl # Synced to WineStaging-2.9 reactos/dll/win32/itss # Synced to WineStaging-2.9 reactos/dll/win32/jscript # Synced to WineStaging-2.16 -reactos/dll/win32/jsproxy # Synced to WineStaging-2.9 +reactos/dll/win32/jsproxy # Synced to WineStaging-2.16 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9 reactos/dll/win32/mapi32 # Synced to WineStaging-2.9

1 0

[akhaldi] 75883: [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:31 2017 New Revision: 75883 URL: http://svn.reactos.org/svn/reactos?rev=75883&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/jscript/run.c Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/jscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/run.c [iso-8859-1] Sun Sep 17 22:54:31 2017 @@ -1322,7 +1322,7 @@ return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[6], v; + VARIANT args[7], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1362,6 +1362,8 @@ V_UI4(args+4) = 0xffffffff; V_VT(args+5) = VT_BYREF|VT_VARIANT; V_VARIANTREF(args+5) = &v; + V_VT(args+6) = VT_R4; + V_R4(args+6) = 0.5; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2651,7 +2653,8 @@ CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," + "function(r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2661,6 +2664,8 @@ " ok(ui4 > 0, 'ui4 = ' + ui4);" " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" " ok(i4ref === 2, 'i4ref = ' + i4ref);" + " ok(r4 === 0.5, 'r4 = ' + r4);" + " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

[akhaldi] 75882: [JSCRIPT] Sync with Wine Staging 2.16. CORE-13762 c25208f jscript: Added support for VT_R4 VARIANT types. 5c8c4d9 jscript: A spelling fix in a comment.
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:24 2017 New Revision: 75882 URL: http://svn.reactos.org/svn/reactos?rev=75882&view=rev Log: [JSCRIPT] Sync with Wine Staging 2.16. CORE-13762 c25208f jscript: Added support for VT_R4 VARIANT types. 5c8c4d9 jscript: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.… ============================================================================== --- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Sun Sep 17 22:54:24 2017 @@ -1736,7 +1736,7 @@ if(stat->finally_statement) { /* * finally block expects two elements on the stack, which may be: - * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed addres + * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed address * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows */ finally_off = ctx->code_off; Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Sun Sep 17 22:54:24 2017 @@ -293,6 +293,9 @@ case VT_UI4: *r = jsval_number(V_UI4(var)); return S_OK; + case VT_R4: + *r = jsval_number(V_R4(var)); + return S_OK; case VT_UNKNOWN: if(V_UNKNOWN(var)) { IDispatch *disp; 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] Sun Sep 17 22:54:24 2017 @@ -85,7 +85,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-2.9 reactos/dll/win32/itss # Synced to WineStaging-2.9 -reactos/dll/win32/jscript # Synced to WineStaging-2.9 +reactos/dll/win32/jscript # Synced to WineStaging-2.16 reactos/dll/win32/jsproxy # Synced to WineStaging-2.9 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9

1 0

[akhaldi] 75881: [INETCOMM_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:17 2017 New Revision: 75881 URL: http://svn.reactos.org/svn/reactos?rev=75881&view=rev Log: [INETCOMM_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/inetcomm/mimeole.c Modified: trunk/rostests/winetests/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimeol… ============================================================================== --- trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] Sun Sep 17 22:54:17 2017 @@ -197,9 +197,17 @@ MIMEPARAMINFO *param_info; IMimeAllocator *alloc; BODYOFFSETS offsets; + CLSID clsid; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, &clsid); + ok(hr == S_OK, "ret %08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IMimeBody), "got %s\n", wine_dbgstr_guid(&clsid)); hr = IMimeBody_GetHandle(body, &handle); ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); @@ -445,14 +453,14 @@ Stream_Clone }; -static TestStream *create_test_stream(void) +static IStream *create_test_stream(void) { TestStream *stream; stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); stream->IStream_iface.lpVtbl = &StreamVtbl; stream->ref = 1; stream->pos = 0; - return stream; + return &stream->IStream_iface; } #define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) @@ -474,8 +482,7 @@ static void test_SetData(void) { - IStream *stream, *stream2; - TestStream *test_stream; + IStream *stream, *stream2, *test_stream; IMimeBody *body; HRESULT hr; @@ -492,7 +499,7 @@ IStream_Release(stream); test_stream = create_test_stream(); - hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, test_stream); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeBody_IsContentType(body, "text", "plain"); @@ -507,7 +514,7 @@ CHECK_CALLED(Stream_Stat); CHECK_CALLED(Stream_Seek_END); ok(hr == S_OK, "GetData failed %08x\n", hr); - ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + ok(stream != test_stream, "unexpected stream\n"); SET_EXPECT(Stream_Seek); SET_EXPECT(Stream_Read); @@ -538,7 +545,7 @@ IStream_Release(stream); IStream_Release(stream2); - IStream_Release(&test_stream->IStream_iface); + IStream_Release(test_stream); stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream);

1 0

[akhaldi] 75880: [INETCOMM] Sync with Wine Staging 2.16. CORE-13762 fe6367a inetcomm: Implemented IMimeBody::GetClassID(). 5557081 inetcomm: Release previously set data (Valgrind).
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:12 2017 New Revision: 75880 URL: http://svn.reactos.org/svn/reactos?rev=75880&view=rev Log: [INETCOMM] Sync with Wine Staging 2.16. CORE-13762 fe6367a inetcomm: Implemented IMimeBody::GetClassID(). 5557081 inetcomm: Release previously set data (Valgrind). Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Sun Sep 17 22:54:12 2017 @@ -954,10 +954,15 @@ CLSID* pClassID) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%p) stub\n", This, pClassID); - return E_NOTIMPL; -} - + + TRACE("(%p)->(%p)\n", This, pClassID); + + if(!pClassID) + return E_INVALIDARG; + + *pClassID = IID_IMimeBody; + return S_OK; +} static HRESULT WINAPI MimeBody_IsDirty( IMimeBody* iface) @@ -1738,7 +1743,7 @@ } if(This->data) - FIXME("release old data\n"); + release_data(&This->data_iid, This->data); This->data_iid = *riid; This->data = pvObject; 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] Sun Sep 17 22:54:12 2017 @@ -78,7 +78,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-2.9 +reactos/dll/win32/inetcomm # Synced to WineStaging-2.16 reactos/dll/win32/inetmib1 # Synced to WineStaging-2.9 reactos/dll/win32/initpki # Synced to WineStaging-2.9 reactos/dll/win32/inseng # Synced to WineStaging-2.9

1 0

[akhaldi] 75879: [IMAADP32.ACM] Sync with Wine Staging 2.16. CORE-13762 0f0fb98 imaadp32.acm: Fix nibble ordering. 2a1c1a4 imaadp32.acm: Fix block size calculations.
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:07 2017 New Revision: 75879 URL: http://svn.reactos.org/svn/reactos?rev=75879&view=rev Log: [IMAADP32.ACM] Sync with Wine Staging 2.16. CORE-13762 0f0fb98 imaadp32.acm: Fix nibble ordering. 2a1c1a4 imaadp32.acm: Fix block size calculations. Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Sun Sep 17 22:54:07 2017 @@ -156,7 +156,7 @@ } pwfx->cbSize = sizeof(WORD); - awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels) * 2) / pwfx->nChannels + 1; + awfx->wSamplesPerBlock = (pwfx->nBlockAlign - (4 * pwfx->nChannels)) * (2 / pwfx->nChannels) + 1; pwfx->nAvgBytesPerSec = (pwfx->nSamplesPerSec * pwfx->nBlockAlign) / awfx->wSamplesPerBlock; } @@ -447,7 +447,7 @@ &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -455,7 +455,7 @@ &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -511,7 +511,7 @@ src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; } @@ -633,14 +633,7 @@ afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits; - afd->pwfx->nBlockAlign = 1024; - /* we got 4 bits per sample */ - afd->pwfx->nAvgBytesPerSec = - (afd->pwfx->nSamplesPerSec * 4) / 8; - if (afd->cbwfx >= sizeof(WAVEFORMATEX)) - afd->pwfx->cbSize = sizeof(WORD); - if (afd->cbwfx >= sizeof(IMAADPCMWAVEFORMAT)) - ((IMAADPCMWAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = (1024 - 4 * afd->pwfx->nChannels) * (2 / afd->pwfx->nChannels) + 1; + init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT *)afd->pwfx); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag); 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] Sun Sep 17 22:54:07 2017 @@ -75,7 +75,7 @@ reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to WineStaging-2.9 reactos/dll/win32/ieframe # Synced to WineStaging-2.9 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.9 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.16 reactos/dll/win32/imagehlp # Synced to WineStaging-2.9 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-2.9

1 0

[akhaldi] 75878: [COMCTL32] Addendum to r75862. CORE-13762
by akhaldi＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: akhaldi Date: Sun Sep 17 22:54:01 2017 New Revision: 75878 URL: http://svn.reactos.org/svn/reactos?rev=75878&view=rev Log: [COMCTL32] Addendum to r75862. CORE-13762 Modified: trunk/reactos/dll/win32/comctl32/idc_copy.cur trunk/reactos/dll/win32/comctl32/idc_divider.cur trunk/reactos/dll/win32/comctl32/idc_divideropen.cur trunk/reactos/dll/win32/comctl32/idc_movebutton.cur trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/idc_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_cop… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_divider.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_divideropen.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_div… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idc_movebutton.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idc_mov… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Sep 17 22:54:01 2017 @@ -2221,9 +2221,8 @@ SelectObject(hdc, hOldFont); } else - { - LISTVIEW_DrawFocusRect(infoPtr, hdc); - } + LISTVIEW_InvalidateItem(infoPtr, infoPtr->nFocusedItem); + done: ReleaseDC(infoPtr->hwndSelf, hdc); } Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Sep 17 22:54:01 2017 @@ -1867,14 +1867,22 @@ if( bWrap ) { if ( !(btnPtr->fsStyle & BTNS_SEP) ) +#ifdef __REACTOS__ y += cy + infoPtr->szSpacing.cy; +#else + y += cy; +#endif else { if ( !(infoPtr->dwStyle & CCS_VERT)) y += cy + ( (btnPtr->cx > 0 ) ? btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; else +#ifdef __REACTOS__ y += cy + infoPtr->szSpacing.cy; +#else + y += cy; +#endif /* nSepRows is used to calculate the extra height following */ /* the last row. */ @@ -1888,7 +1896,11 @@ nRows++; } else +#ifdef __REACTOS__ x += cx + infoPtr->szSpacing.cx; +#else + x += cx; +#endif } /* infoPtr->nRows is the number of rows on the toolbar */ @@ -4485,7 +4497,7 @@ short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam);

1 0

[ekohl] 75877: desk.cpl: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13784
by ekohl＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: ekohl Date: Sun Sep 17 22:50:06 2017 New Revision: 75877 URL: http://svn.reactos.org/svn/reactos?rev=75877&view=rev Log: desk.cpl: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13784 Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:50:06 2017 @@ -43,13 +43,13 @@ FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 104, 9 + LTEXT "è¦è¦ã¹ã¿ã¤ã«", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "éè²", IDC_STATIC, 7, 160, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 104, 9 + LTEXT "ãµã¤ãº", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "å¹æ(&E)...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 @@ -152,13 +152,13 @@ IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 +CAPTION "ãã£ã¹ãã¬ã¤è¨å®" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ãã®ãã£ã¹ãã¬ã¤è¨å®ãä¿åãã¾ããï¼", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "ã¯ã(&Y)", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "ããã(&N)", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU @@ -232,7 +232,7 @@ IDS_MESSBOX "ã¡ãã»ã¼ã¸ ããã¯ã¹" IDS_MESSTEXT "ã¡ãã»ã¼ã¸ ããã¹ã" IDS_BUTTEXT "OK" - IDS_CLASSIC_THEME "Classic Theme" + IDS_CLASSIC_THEME "ã¯ã©ã·ãã¯ ãã¼ã" END STRINGTABLE @@ -263,5 +263,5 @@ IDS_DISPLAY_SETTINGS "è¡¨ç¤ºè¨å®" IDS_APPLY_FAILED "æ°ããè¨å®ã®é©ç¨ã«å¤±æãã¾ãã..." IDS_APPLY_NEEDS_RESTART "å¤æ´ãåæ ããã«ã¯ã³ã³ãã¥ã¼ã¿ãåèµ·åããå¿è¦ãããã¾ãã" - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." -END + IDS_TIMEOUTTEXT "%d ç§å¾ã«ä»¥åã®è¨å®ã«æ»ãã¾ãã" +END

1 0

[ekohl] 75876: devmgr: Japanese translation Patch by Katayama Hirofumi MZ. CORE-13783
by ekohl＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: ekohl Date: Sun Sep 17 22:41:08 2017 New Revision: 75876 URL: http://svn.reactos.org/svn/reactos?rev=75876&view=rev Log: devmgr: Japanese translation Patch by Katayama Hirofumi MZ. CORE-13783 Added: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc (with props) Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sun Sep 17 22:41:08 2017 @@ -57,6 +57,9 @@ #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif Added: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:41:08 2017 @@ -0,0 +1,320 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_NAME "åå" + IDS_TYPE "ç¨®é¡" + IDS_MANUFACTURER "è£½é å: %1" + IDS_LOCATION "å°å: %1" + IDS_STATUS "ããã¤ã¹ã®ç¶æ: %1" + IDS_UNKNOWN "ä¸æ" + IDS_LOCATIONSTR "å°å %1!u! (%2)" + IDS_DEVCODE " (ã³ã¼ã %1!u!)" + IDS_DEVCODE2 " (ã³ã¼ã %2!u!)" + IDS_ENABLEDEVICE "ãã®ããã¤ã¹ãä½¿ã (æå¹)" + IDS_DISABLEDEVICE "ãã®ããã¤ã¹ãä½¿ããªã (ç¡å¹)" + IDS_UNKNOWNDEVICE "æªç¥ã®ããã¤ã¹" + IDS_NODRIVERLOADED "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEVONPARENT "on %1" + IDS_TROUBLESHOOTDEV "åé¡ç©¶æ(&T)..." + IDS_ENABLEDEV "ããã¤ã¹ãæå¹ã«ãã(&N)" + IDS_REINSTALLDRV "ãã©ã¤ããåã¤ã³ã¹ãã¼ã«ãã(&I)" + IDS_PROPERTIES "ããããã£(&R)" + IDS_UPDATEDRV "ãã©ã¤ããæ´æ°(&P)..." + IDS_REBOOT "ã³ã³ãã¥ã¼ã¿ãåèµ·å(&C)..." + IDS_NOTAVAILABLE "å©ç¨ä¸å¯" + IDS_NOTDIGITALLYSIGNED "ãã¸ã¿ã«ç½²åããã¦ãã¾ãã" + IDS_NODRIVERS "ãã®ããã¤ã¹ã«å¯¾ãã¦ã¯ããã©ã¤ã ãã¡ã¤ã«ã¯ä¸å¿è¦ãèªã¿è¾¼ã¾ãã¦ãã¾ããã" + IDS_RESOURCE_COLUMN "ãªã½ã¼ã¹ã®ç¨®é¡" + IDS_SETTING_COLUMN "ã»ããã£ã³ã°" + IDS_RESOURCE_MEMORY_RANGE "ã¡ã¢ãªã¼ç¯å²" + IDS_RESOURCE_INTERRUPT "IRQ" + IDS_RESOURCE_DMA "DMA" + IDS_RESOURCE_PORT "I/O ç¯å²" +END + +/* error messages, source: http://www.z123.org/techsupport/medm.htm */ +STRINGTABLE +BEGIN + IDS_DEV_NO_PROBLEM "ãã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ãã" + IDS_DEV_NOT_CONFIGURED "ãã®ããã¤ã¹ã¯ãæ£ããæ§æããã¦ãã¾ããã" + IDS_DEV_DEVLOADER_FAILED "ã³ã³ãã¥ã¼ã¿ãï¼ç¨®é¡ã® %1 ãã¹ãå ±åãã¦ãããããReactOS ã¯ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_DEVLOADER_FAILED2 "ãã®ããã¤ã¹ã«å¯¾ãã %1 ããã¤ã¹ãã¼ãã¼ã¯ãããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ã¿ã§ãã¾ããã§ããã" + IDS_DEV_OUT_OF_MEMORY "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãããããæªãããããªãã®ã·ã¹ãã ã®ã¡ã¢ãªã¼ããªã½ã¼ã¹ãè¶³ããªãããã§ãã" + IDS_DEV_ENTRY_IS_WRONG_TYPE "ãã®ããã¤ã¹ã¯ããã©ã¤ãã®ããã¤ããæªãããã¬ã¸ã¹ããªãæªããããæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_LACKED_ARBITRATOR "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãReactOS ãã©ã®ããã«æ±ããããããªããªã½ã¼ã¹ãè¦æ±ãã¾ããã" + IDS_DEV_BOOT_CONFIG_CONFLICT "å¥ã®ããã¤ã¹ããã®ããã¤ã¹ãå¿è¦ã¨ãããªã½ã¼ã¹ãä½¿ç¨ä¸ã§ãã" + IDS_DEV_FAILED_FILTER "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãåã¤ã³ã¹ãã¼ã«ãããå¿è¦ãããã¾ãã" + IDS_DEV_DEVLOADER_NOT_FOUND "ããã¤ã¹ãèªã¿è¾¼ããã¡ã¤ã« %1 ã ReactOS ãèªã¿è¾¼ããªãããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_FOUND2 "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããèªã¿è¾¼ããã¡ã¤ã« %1 ãæªãããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_FOUND3 "ããã¤ã¹å¤±æ: ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããå¤æ´ãããã¨ãã¦ãã¾ãããããããæ©è½ããªããã°ããã¼ãã¦ã§ã¢ã®ææ¸ãåç§ãã¦ä¸ããã" + IDS_DEV_INVALID_DATA "ããªãã®ã³ã³ãã¥ã¼ã¿ã®ä¸ã® BIOS ããããã¤ã¹ã«å¯¾ãããªã½ã¼ã¹ãä¸æ£ã«å ±åãã¦ããããããã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_INVALID_DATA2 "ããã¤ã¹ä¸ã® BIOS ããããã¤ã¹ã«å¯¾ãã¦ãªã½ã¼ã¹ãä¸æ£ã«å ±åãã¦ããããããã®ããã¤ã¹ã¯æ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_FAILED_START "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããåä½ãã¦ããªããããã¹ã¦ã®ãã©ã¤ããã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_LIAR "ReactOS ã¯ãã®ããã¤ã¹ã®éå§ãè©¦ã¿ãã®ãããã¾ããããã£ã¦ReactOS ã¯åã³ãã®ããã¤ã¹ã®éå§ãè©¦ã¿ããã¨ã¯ããã¾ããã" + IDS_DEV_NORMAL_CONFLICT "ãã®ããã¤ã¹ã¯ãä½¿ç¨ããããã®æªå²ãå½ã¦ã® %1 ãªã½ã¼ã¹ãè¦ã¤ããã¾ããã" + IDS_DEV_NOT_VERIFIED "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããåä½ãã¦ããªããããã¹ã¦ã®ãã©ã¤ããã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_NEED_RESTART "ãã®ããã¤ã¹ã¯ãããªããã³ã³ãã¥ã¼ã¿ãåèµ·åããã¾ã§æ£ããåä½ã§ãã¾ããã" + IDS_DEV_REENUMERATION "ãã®ããã¤ã¹ã¯ããªã½ã¼ã¹ç«¶åãèµ·ããã¦ãã¾ãã" + IDS_DEV_PARTIAL_LOG_CONF "ReactOS ã¯ããã®ããã¤ã¹ãä½¿ç¨ãããã¹ã¦ã®ãªã½ã¼ã¹ãèå¥ã§ãã¾ããã§ããã" + IDS_DEV_UNKNOWN_RESOURCE "ãã©ã¤ãæå ±ãã¡ã¤ã« %1 ã¯ããã®åããã¤ã¹ããè¦ªããã¤ã¹ã®ææã¾ãã¯èªèããªããªã½ã¼ã¹ãä½¿ããã¨ãä¼ãã¦ãã¾ãã" + IDS_DEV_REINSTALL "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãåã¤ã³ã¹ãã¼ã«ã®å¿è¦ãããã¾ãã" + IDS_DEV_REGISTRY "ããªãã®ã¬ã¸ã¹ããªãæªãã®ããããã¾ããã" + IDS_DEV_WILL_BE_REMOVED "ReactOS ã¯ãã®ããã¤ã¹ãé¤å»ä¸ã§ãã" + IDS_DEV_DISABLED "ãã®ããã¤ã¹ã¯ãéå§ãã¦ãã¾ããã" + IDS_DEV_DISABLED2 "ãã®ããã¤ã¹ã¯ãç¡å¹ã«ãªã£ã¦ãã¾ãã" + IDS_DEV_DEVLOADER_NOT_READY "ãã®ããã¤ã¹ã®ãã¼ãã¼ã¯å¿è¦ãªãã©ã¤ãã¼ãèªã¿è¾¼ã¿ã§ãã¾ããã" + IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ + IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ + IDS_DEV_DEVICE_NOT_THERE "ãã®ããã¤ã¹ã¯ãåå¨ããªãããæ£ããæ©è½ãã¦ããªãããå¿è¦ãªãã©ã¤ãããã¹ã¦ã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_MOVED "ReactOS ã¯ããã®ããã¤ã¹ãã»ããã¢ãããã¦ãã¾ãã" + IDS_DEV_TOO_EARLY "ReactOS ã¯ããã®ããã¤ã¹ãã»ããã¢ãããã¦ãã¾ãã" + IDS_DEV_NO_VALID_LOG_CONF "ReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ãããªã½ã¼ã¹ãæå®ã§ãã¾ããã" + IDS_DEV_FAILED_INSTALL "ãã®ããã¤ã¹ã«å¯¾ãããã©ã¤ãã¯ãã¤ã³ã¹ãã¼ã«ããã¦ãã¾ããã" + IDS_DEV_HARDWARE_DISABLED "ãã®ããã¤ã¹ã¯ãBIOS ããªã½ã¼ã¹ãæä¾ããªãã£ããããç¡å¹ã«ãªã£ã¦ãã¾ãã" + IDS_DEV_CANT_SHARE_IRQ "ãã®ããã¤ã¹ã¯ãä»ã®ããã¤ã¹ãä½¿ç¨ä¸ã®IRQ (Interrupt Request) ãªã½ã¼ã¹ãä½¿ã£ã¦ãããå±æã§ãã¾ããã\nããªãã¯ãç«¶åããè¨å®ãå¤æ´ããããç«¶åãå¼ãèµ·ããã¦ãããªã¢ã«ã¢ã¼ã ãã©ã¤ããé¤å»ããå¿è¦ãããã¾ãã" + IDS_DEV_FAILED_ADD "%1 ãæ£ããåä½ãã¦ããªãããããã®ããã¤ã¹ã¯ãæ£ããåä½ãã¦ãã¾ããã" + IDS_DEV_DISABLED_SERVICE "ã»ããã¢ãã ãã¡ã¤ã«ããããã©ã¤ãããããã¯ã¼ã¯ã®å ´æã«ã¢ã¯ã»ã¹ã§ããªããããReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããã¤ã³ã¹ãã¼ã«ã§ãã¾ããã" + IDS_DEV_TRANSLATION_FAILED "ãã®ããã¤ã¹ã¯ããã®ãã©ã¤ãã«å¿çãã¦ãã¾ããã" + IDS_DEV_NO_SOFTCONFIG "ReactOS ã¯ããã®ããã¤ã¹ã«å¯¾ããè¨å®ãæ±ºå®ã§ãã¾ããããã®ããã¤ã¹ã«ä»å±ããææ¸ã¨ç¸è«ããããæ§æãã»ããããããã«ãªã½ã¼ã¹ ã¿ããä½¿ç¨ãã¦ä¸ããã" + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããåæåã§ãã¾ããã" + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ä»¥åã®ããã¤ã¹ ãã©ã¤ãã®å®ä½ãã¡ã¢ãªã¼ä¸ã«ãããããReactOS ã¯ããã®ããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããããã©ã¤ãã¯ãå£ãã¦ãããè¦ã¤ããã¾ããã" + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ã¬ã¸ã¹ããªä¸ã«ãµã¼ãã¹ ãã¼æå ±ãè¦ã¤ãããªãããä¸æ£ã«è¨é²ããã¦ãããããReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«ã¢ã¯ã»ã¹ã§ãã¾ããã" + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããæ£ããèªã¿è¾¼ã¿ã¾ãããããã¼ãã¦ã§ã¢ ããã¤ã¹ãè¦ã¤ããã¾ããã" + IDS_DEV_DUPLICATE_DEVICE "ã·ã¹ãã ã«éè¤ããããã¤ã¹ããã§ã«ä½åãã¦ãããããReactOS ã¯ãã®ãã¼ãã¦ã§ã¢ã«å¯¾ããããã¤ã¹ ãã©ã¤ããèªã¿è¾¼ãã¾ããã" + IDS_DEV_FAILED_POST_START "ReactOS ã¯ãããã¤ã¹ãåé¡ãå ±åããããããã®ããã¤ã¹ãåæ¢ãã¾ããã" + IDS_DEV_HALTED "ã¢ããªã±ã¼ã·ã§ã³ããµã¼ãã¹ã¯ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ãã·ã£ãããã¦ã³ãã¾ããã" + IDS_DEV_PHANTOM "ç¾å¨ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ã¯ãã³ã³ãã¥ã¼ã¿ã«æ¥ç¶ããã¦ãã¾ããã" + IDS_DEV_SYSTEM_SHUTDOWN "OS ãã·ã£ãããã¦ã³ä¸ã®ãããReactOS ã¯ããã®ãã¼ãã¦ã§ã¢ ããã¤ã¹ã¸ã®ã¢ã¯ã»ã¹ãåå¾ã§ãã¾ããã" + IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_DRIVER_BLOCKED "ãã®ããã¤ã¹ã«å¯¾ããã½ããã¦ã§ã¢ã¯ãReactOS ã¨ã®åé¡ããããã¨ãåãã£ã¦ãããããèµ·åããããã¯ããã¦ãã¾ããæ°ãããã©ã¤ãã®ãã¼ãã¦ã§ã¢ã®ãã³ãã¼ã«é£çµ¡ãã¦ä¸ããã" + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS ã¯ãã·ã¹ãã ãã¤ããå¤§ããããï¼ã¬ã¸ã¹ããª ãµã¤ãºã®å¶éãè¶ããï¼ãããæ°ãããã¼ãã¦ã§ã¢ ããã¤ã¹ãéå§ã§ãã¾ããã" + IDS_DEV_SETPROPERTIES_FAILED "ReactOS ã¯ããã®ããã¤ã¹ã®è¨å®ãå¤æ´ã§ãã¾ããã§ããã" +END + +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device Instance ID" + IDS_PROP_HARDWAREIDS "Hardware IDs" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_CAPABILITIES "Capabilities" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTIONRELATIONS "Ejection Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Device Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Device Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Class Upper Filters" + IDS_PROP_CLASSLOWERFILTERS "Class Lower Filters" + IDS_PROP_CLASSINSTALLER "Class Installers" + IDS_PROP_CLASSCOINSTALLER "Class Coinstallers" + IDS_PROP_DEVICECOINSTALLER "Device Coinstallers" + IDS_PROP_FIRMWAREREVISION "Firmware Revision" + IDS_PROP_CURRENTPOWERSTATE "Current Power State" + IDS_PROP_POWERCAPABILITIES "Power Capabilities" + IDS_PROP_POWERSTATEMAPPINGS "Power State Mappings" +END + +IDD_HARDWARE DIALOGEX 0, 0, 300, 400 +STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "ããã¤ã¹(&D):", IDC_DEVICES, 7, 6, 196, 10 + CONTROL "", IDC_LV_DEVICES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | + LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 16, 196, 50 + GROUPBOX "ããã¤ã¹ ããããã£", IDC_PROPERTIESGROUP, 7, 76, 196, 105 + LTEXT "", IDC_MANUFACTURER, 14, 88, 183, 10, SS_ENDELLIPSIS + LTEXT "", IDC_LOCATION, 14, 100, 183, 10, SS_ENDELLIPSIS + LTEXT "", IDC_STATUS, 14, 112, 183, 30 + PUSHBUTTON "åé¡ç©¶æ(&T)...", IDC_TROUBLESHOOT, 80, 140, 60, 14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "ããããã£(&R)", IDC_PROPERTIES, 146, 140, 50, 14 +END + +IDD_DEVICEGENERAL DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ä¸è¬" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ããã¤ã¹ã®ç¨®é¡:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "è£½é å:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "å°å:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "ããã¤ã¹ã®ç¶æ", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 + EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL + PUSHBUTTON "åé¡ç©¶æ(&T)...", IDC_DEVPROBLEM, 148, 163, 90, 15 + LTEXT "ããã¤ã¹ã®ä½¿ç¨(&D):", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED +END + +IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãã©ã¤ã" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãã©ã¤ã æä¾å:", -1, 37, 39, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã©ã¤ãã®æ¥ä»:", -1, 37, 53, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã©ã¤ãã®ãã¼ã¸ã§ã³:", -1, 37, 67, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¸ã¿ã«ç½²åè:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "ãã©ã¤ãã®è©³ç´°(&D)...", IDC_DRIVERDETAILS, 7, 106, 75, 15 + LTEXT "ãã©ã¤ã ãã¡ã¤ã«ã®è©³ç´°ãè¡¨ç¤ºãã¾ãã", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "ãã©ã¤ãã®æ´æ°(&U)...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "ããã¤ã¹ ãã©ã¤ããæ´æ°ãã¾ãã", -1, 91, 130, 154, 17, SS_NOPREFIX +END + +IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "ãã©ã¤ã ãã¡ã¤ã«ã®è©³ç´°" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãã©ã¤ã ãã¡ã¤ã«(&D):", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "æä¾å:", -1, 14, 134, 50, 8 + EDITTEXT IDC_FILEPROVIDER, 66, 134, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¡ã¤ã« ãã¼ã¸ã§ã³:", -1, 14, 150, 50, 8 + EDITTEXT IDC_FILEVERSION, 66, 150, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "èä½æ¨©:", -1, 14, 166, 50, 8 + EDITTEXT IDC_FILECOPYRIGHT, 66, 166, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "ãã¸ã¿ã«ç½²åå:", -1, 14, 182, 50, 8 + EDITTEXT IDC_DIGITALSIGNER, 66, 182, 155, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", IDOK, 167, 208, 50, 14 +END + +IDD_DEVICEDETAILS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "è©³ç´°" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_DETAILSPROPVALUE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ãªã½ã¼ã¹" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "ãªã½ã¼ã¹è¨å®:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 +END + +IDD_DEVICEPOWER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "é»æº" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + + +/* + This code relates to the device manager GUI + */ + +IDR_MAINMENU MENU +BEGIN + POPUP "ãã¡ã¤ã«(&F)" + BEGIN + MENUITEM "çµäº(&X)", IDC_EXIT + END + MENUITEM "ã¢ã¯ã·ã§ã³(&A)", IDC_ACTIONMENU + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "ç¨®é¡å¥ããã¤ã¹(&E)", IDC_DEVBYTYPE + MENUITEM "æ¥ç¶å¥ããã¤ã¹(&V)", IDC_DEVBYCONN + MENUITEM "ç¨®é¡å¥ãªã½ã¼ã¹(&Y)", IDC_RESBYTYPE, GRAYED + MENUITEM "æ¥ç¶å¥ãªã½ã¼ã¹(&N)", IDC_RESBYCONN, GRAYED + MENUITEM SEPARATOR + MENUITEM "é ãããã¤ã¹ãè¡¨ç¤º(&W)", IDC_SHOWHIDDEN + END + POPUP "ãã«ã(&H)" + BEGIN + MENUITEM "ãã¼ã¸ã§ã³æå ±(&A)", IDC_ABOUT + END +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS ããã¤ã¹ ããã¼ã¸ã£" + IDS_CONFIRM_DISABLE "ãã®ããã¤ã¹ãç¡å¹ã«ããã¨ãæ©è½ãæ¢ã¾ãã¾ãã\r\nãããæ¬å½ã«ç¡å¹ã«ãããã§ããï¼" + IDS_CONFIRM_UNINSTALL "è¦å: ããªãã®ã·ã¹ãã ãããã®ããã¤ã¹ãã¢ã³ã¤ã³ã¹ãã¼ã«ãããã¨ãã¦ãã¾ãã\r\nç¶è¡ãããã§ããï¼" +END +STRINGTABLE DISCARDABLE +BEGIN + IDS_MENU_UPDATE "ãã©ã¤ã ã½ããã¦ã§ã¢ãæ´æ°..." + IDS_MENU_ENABLE "æå¹ã«ãã" + IDS_MENU_DISABLE "ç¡å¹ã«ãã" + IDS_MENU_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" + IDS_MENU_SCAN "ãã¼ãã¦ã§ã¢ã®å¤æ´ãã¹ãã£ã³" + IDS_MENU_ADD "ãã¼ãã¦ã§ã¢ãè¿½å " + IDS_MENU_PROPERTIES "ããããã£" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROPERTIES "ããããã£" + IDS_TOOLTIP_SCAN "ãã¼ãã¦ã§ã¢ã®å¤æ´ãã¹ãã£ã³" + IDS_TOOLTIP_ENABLE "æå¹ã«ãã" + IDS_TOOLTIP_DISABLE "ç¡å¹ã«ãã" + IDS_TOOLTIP_UPDATE "æ´æ°ãã©ã¤ã ã½ããã¦ã§ã¢" + IDS_TOOLTIP_UNINSTALL "ã¢ã³ã¤ã³ã¹ãã¼ã«" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_PROPERTIES " ç¾å¨ã®é¸æã«å¯¾ããããããã£ ãã¤ã¢ãã°ãéãã¾ãã" + IDS_HINT_SCAN " å¤æ´ã¾ãã¯æ°è¦ã®ãã©ã° ã¢ã³ã ãã¬ã¤ ããã¤ã¹ãã¹ãã£ã³ãã¾ãã" + IDS_HINT_ENABLE " é¸æä¸ã®ããã¤ã¹ãæå¹ã«ãã¾ãã" + IDS_HINT_DISABLE " é¸æä¸ã®ããã¤ã¹ãç¡å¹ã«ãã¾ãã" + IDS_HINT_UPDATE " é¸æä¸ã®ããã¤ã¹ã«å¯¾ããããã¤ã¹æ´æ°ã½ããã¦ã§ã¢ ã¦ã£ã¶ã¼ããèµ·åãã¾ãã" + IDS_HINT_UNINSTALL " é¸æä¸ã®ããã¤ã¹ã«å¯¾ãããã©ã¤ããã¢ã³ã¤ã³ã¹ãã¼ã«ãã¾ãã" + IDS_HINT_ADD " ã¬ã¬ã·ã¼ (éãã©ã° ã¢ã³ã ãã¬ã¤) ããã¤ã¹ãã³ã³ãã¥ã¼ã¿ã«è¿½å ãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦." + IDS_HINT_EXIT " ããã°ã©ã ãçµäºãã¾ãã" + + IDS_HINT_DEV_BY_TYPE " ãã¼ãã¦ã§ã¢ã®ç¨®é¡å¥ã«ããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_DEV_BY_CONN " æ¥ç¶å¥ã«ããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_RES_BY_TYPE " ç¨®é¡å¥ã«ãªã½ã¼ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_RES_BY_CONN " æ¥ç¶ã®ç¨®é¡å¥ã«ãªã½ã¼ã¹ãè¡¨ç¤ºãã¾ãã" + IDS_HINT_SHOW_HIDDEN " ã¬ã¬ã·ã¼ ããã¤ã¹ã¨ãã¤ã³ã¹ãã¼ã«ã§ããªããªã£ãããã¤ã¹ãè¡¨ç¤ºãã¾ãã" + + IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãåã®ãµã¤ãºã«æ»ãã¾ãã" + IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãåããã¾ãã" + IDS_HINT_SYS_SIZE " ãã®ã¦ã£ã³ãã¦ã®ãµã¤ãºãå¤æ´ãã¾ãã" + IDS_HINT_SYS_MINIMIZE " ãã®ã¦ã£ã³ãã¦ãã¢ã¤ã³ã³ã«ç¸®å°ãã¾ãã" + IDS_HINT_SYS_MAXIMIZE " ãã®ã¦ã£ã³ãã¦ãã¹ã¯ãªã¼ã³ãæºããããã«åºãã¾ãã" + IDS_HINT_SYS_CLOSE " ãã®ã¦ã£ã³ãã¦ãéãã¾ãã" +END Propchange: trunk/reactos/dll/win32/devmgr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 75875: SysSetup: Russian translation of Theme dialog Patch by amber. CORE-13708
by ekohl＠svn.reactos.org 18 Sep '17

18 Sep '17

Author: ekohl Date: Sun Sep 17 22:23:24 2017 New Revision: 75875 URL: http://svn.reactos.org/svn/reactos?rev=75875&view=rev Log: SysSetup: Russian translation of Theme dialog Patch by amber. CORE-13708 Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Sep 17 22:23:24 2017 @@ -87,11 +87,11 @@ IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Ð¢ÐµÐ¼Ð° ""Lautus""", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "ÐÐ»Ð°ÑÑÐ¸ÑÐµÑÐºÐ°Ñ ÑÐµÐ¼Ð°", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -146,8 +146,8 @@ IDS_DATETIMESUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÑ Ð´Ð°ÑÑ Ð¸ Ð²ÑÐµÐ¼Ñ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ." IDS_PROCESSTITLE "ÐÑÐ¾ÑÐµÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_PROCESSSUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS Ð½Ð° Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" + IDS_THEMESELECTIONTITLE "ÐÐ½ÐµÑÐ½Ð¸Ð¹ Ð²Ð¸Ð´" + IDS_THEMESELECTIONSUBTITLE "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ¼Ñ, ÐºÐ¾ÑÐ¾ÑÑÑ Ð²Ñ Ð¿ÑÐµÐ´Ð¿Ð¾ÑÐ¸ÑÐ°ÐµÑÐµ" 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