wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_ALL_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: ed6c221942924f2ea8da4a6e502201e07b4098bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6c221942924f2ea8da4a6e5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:41 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_ALL_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 95982be..1c89238 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -251,6 +251,10 @@ static void test_get_blob_part(void) /* D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_ALL_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } /* @@ -478,6 +482,43 @@ static void test_get_blob_part2(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_ALL_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 344, "GetBufferSize failed, got %lu, expected %u\n", size, 344); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+11), "ISGN got %#x, expected %#x.\n", *(dword+11), TAG_ISGN); + ok(TAG_OSGN == *(dword+24), "OSGN got %#x, expected %#x.\n", *(dword+24), TAG_OSGN); + ok(TAG_PCSG == *(dword+37), "PCSG got %#x, expected %#x.\n", *(dword+37), TAG_PCSG); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_ALL_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 291a3b98a58a51f4b8d0d4faaa46e4add476bcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=291a3b98a58a51f4b8d0d4faa… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:37 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 233 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 233 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=291a3b98a58a51f4b8d0d…

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 7d87a4d42badb443ef83383ce74c308097ee9feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d87a4d42badb443ef83383ce… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:34 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index be7146d..4e27a1f 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -212,6 +212,40 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 180, "GetBufferSize failed, got %lu, expected %u\n", size, 180); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+10), "ISGN got %#x, expected %#x.\n", *(dword+10), TAG_ISGN); + ok(TAG_OSGN == *(dword+32), "OSGN got %#x, expected %#x.\n", *(dword+32), TAG_OSGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB + || parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_OUTPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 87344c6726ff4fa4cfde956f524424f8b3c41b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=87344c6726ff4fa4cfde956f5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:31 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_OUTPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index ff4dfa2..be7146d 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -38,6 +38,7 @@ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') static void test_create_blob(void) { @@ -180,6 +181,37 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_OUTPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 88, "GetBufferSize failed, got %lu, expected %u\n", size, 88); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_OSGN == *(dword+9), "OSGN got %#x, expected %#x.\n", *(dword+9), TAG_OSGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_OUTPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_INPUT_SIGNATURE_BLOB test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 1c26d22dc38fc8782a6216b553b12449e9dbc2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c26d22dc38fc8782a6216b55… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:27 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_INPUT_SIGNATURE_BLOB test. --- dlls/d3dcompiler_43/tests/blob.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index c4295c5..ff4dfa2 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -33,6 +33,12 @@ */ #define D3DERR_INVALIDCALL 0x8876086c +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') + static void test_create_blob(void) { ID3D10Blob *blob; @@ -100,6 +106,9 @@ static void test_get_blob_part(void) ID3DBlob *blob, *blob2; HRESULT hr; ULONG refcount; + DWORD *dword; + SIZE_T size; + UINT i; hr = D3DCreateBlob(1, &blob2); ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); @@ -140,6 +149,37 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob2); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_INPUT_SIGNATURE_BLOB */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 124, "GetBufferSize failed, got %lu, expected %u\n", size, 124); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+9), "ISGN got %#x, expected %#x.\n", *(dword+9), TAG_ISGN); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + + if (parts[i] == D3D_BLOB_INPUT_SIGNATURE_BLOB) + { + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + } + else + { + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3DGetBlobPart( ) test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 6628944b7f82d31fe1cbf1300d2ff0dd2ab9c4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6628944b7f82d31fe1cbf1300… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:19 2010 +0200 d3dcompiler/tests: Add D3DGetBlobPart() test. --- dlls/d3dcompiler_43/tests/blob.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index a9eee7f..c4295c5 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -52,7 +52,98 @@ static void test_create_blob(void) ok(!refcount, "ID3DBlob has %u references left\n", refcount); } +static const D3D_BLOB_PART parts[] = +{ + D3D_BLOB_INPUT_SIGNATURE_BLOB, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, + D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB, D3D_BLOB_ALL_SIGNATURE_BLOB, D3D_BLOB_DEBUG_INFO, + D3D_BLOB_LEGACY_SHADER, D3D_BLOB_XNA_PREPASS_SHADER, D3D_BLOB_XNA_SHADER, + D3D_BLOB_TEST_ALTERNATE_SHADER, D3D_BLOB_TEST_COMPILE_DETAILS, D3D_BLOB_TEST_COMPILE_PERF +}; + +/* + * test_blob_part - fxc.exe /E VS /Tvs_4_0_level_9_0 /Fx + */ +#if 0 +float4 VS(float4 position : POSITION, float4 pos : SV_POSITION) : SV_POSITION +{ + return position; +} +#endif +static DWORD test_blob_part[] = { +0x43425844, 0x0ef2a70f, 0x6a548011, 0x91ff9409, 0x9973a43d, 0x00000001, 0x000002e0, 0x00000008, +0x00000040, 0x0000008c, 0x000000d8, 0x0000013c, 0x00000180, 0x000001fc, 0x00000254, 0x000002ac, +0x53414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, +0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x02000001, +0xc00f0000, 0x80e40000, 0x0000ffff, 0x50414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, +0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, +0x80000005, 0x900f0000, 0x02000001, 0xc00f0000, 0x80e40000, 0x0000ffff, 0x396e6f41, 0x0000005c, +0x0000005c, 0xfffe0200, 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, +0x00240001, 0x00000000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, +0x90ff0000, 0xa0e40000, 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, +0x0000003c, 0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, +0x00000000, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, +0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46454452, +0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xfffe0400, 0x00000100, 0x0000001c, +0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, +0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x00000050, 0x00000002, +0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, +0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x5f565300, +0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, +0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, +}; + +static void test_get_blob_part(void) +{ + ID3DBlob *blob, *blob2; + HRESULT hr; + ULONG refcount; + + hr = D3DCreateBlob(1, &blob2); + ok(hr == S_OK, "D3DCreateBlob failed with %x\n", hr); + blob = blob2; + + /* invalid cases */ + hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(NULL, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(NULL, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, 0, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_INPUT_SIGNATURE_BLOB, 1, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], 0xffffffff, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DGetBlobPart failed with %x\n", hr); + ok(blob2 == blob, "D3DGetBlobPart failed got %p, expected %p\n", blob, blob2); + + refcount = ID3D10Blob_Release(blob2); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); +} + START_TEST(blob) { test_create_blob(); + test_get_blob_part(); }

1 0

Akihiro Sagawa : shell32: Update Japanese translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 258f5a5f51b3348d2a1314ffe7016fc813d69aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258f5a5f51b3348d2a1314ffe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 15 11:49:46 2010 +0900 shell32: Update Japanese translation. --- dlls/shell32/shell32_Ja.rc | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index 187b7b3..cc71709 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -277,14 +277,35 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" - IDS_COMMON_MUSIC "Documents\\My Music" - IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Videos" + IDS_COMMON_MUSIC "Music" + IDS_COMMON_PICTURES "Pictures" + IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CONTACTS "Contacts" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Pictures\\Slide Shows" + IDS_PLAYLISTS "Music\\Playlists" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Music\\Sample Music" + IDS_SAMPLE_PICTURES "Pictures\\Sample Pictures" + IDS_SAMPLE_PLAYLISTS "Music\\Sample Playlists" + IDS_SAMPLE_VIDEOS "Videos\\Sample Videos" + IDS_SAVED_GAMES "Saved Games" + IDS_SAVED_SEARCHES "Searches" + IDS_USER_PROFILES "Users" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Documents" + IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "新しいフォルダ"

1 0

Akihiro Sagawa : crypt32: Add Japanese translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 4d5a851ca88b6b15b33a1813740be7969956d40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5a851ca88b6b15b33a18137… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 15 11:49:43 2010 +0900 crypt32: Add Japanese translation. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_Ja.rc | 244 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d5a851ca88b6b15b33a1…

1 0

Akihiro Sagawa : inetcpl: Add Japanese translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 68193114ae7a8cdc18ab960a02f345724956ec52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68193114ae7a8cdc18ab960a0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 15 11:49:40 2010 +0900 inetcpl: Add Japanese translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Ja.rc | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 2f5ca46..d11814e 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ cpl_Fr.rc \ cpl_He.rc \ cpl_It.rc \ + cpl_Ja.rc \ cpl_Ko.rc \ cpl_Lt.rc \ cpl_Nl.rc \ diff --git a/dlls/inetcpl.cpl/cpl_Ja.rc b/dlls/inetcpl.cpl/cpl_Ja.rc new file mode 100644 index 0000000..7b3cd80 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Ja.rc @@ -0,0 +1,66 @@ +/* + * Japanese resources for the Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "インターネット設定" + IDS_CPL_INFO "Wine インターネットブラウザや関連する設定を構成します" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "全般" +BEGIN + + GROUPBOX " ホームページ ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "ホームページとして使われるアドレスを選べます。", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "現在のページ(&C)", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "デフォルト(&D)", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "空白(&B)", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "コンテンツ" +BEGIN + + GROUPBOX " 証明書 ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "証明書は個人認証、証明書の権限と発行元を確認するために使われます。", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "証明書...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "発行元...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Akihiro Sagawa : cryptui: Add Japanese translation.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b3b64fdf5eafd5aea62b470e2467e0ad11578a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b64fdf5eafd5aea62b470e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 15 11:48:11 2010 +0900 cryptui: Add Japanese translation. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_Ja.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3b64fdf5eafd5aea62b4…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010