September 2008 - Wine-Commits

Stefan Dösinger : ddraw: Catch attempts to opengl-render to the desktop window.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: c1eabc2ce7d365d4f9bf9ce0926853b0a0341d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1eabc2ce7d365d4f9bf9ce09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 27 13:20:50 2008 -0500 ddraw: Catch attempts to opengl-render to the desktop window. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1728c96..9fdbd27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3279,7 +3279,7 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, TRACE("(%p)->(%p)\n", This, primary); /* If there's no window, create a hidden window. WineD3D needs it */ - if(window == 0) + if(window == 0 || window == GetDesktopWindow()) { window = CreateWindowExA(0, This->classname, "Hidden D3D Window", WS_DISABLED, 0, 0,

1 0

Stefan Dösinger : wined3d: Report incorrect filtering settings in ValidateDevice.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 8b1727ae62f249f0d909ca76b0ae402f6e912613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1727ae62f249f0d909ca76b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 15:10:46 2008 +0200 wined3d: Report incorrect filtering settings in ValidateDevice. --- dlls/d3d9/tests/texture.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 40 +++++++++++++++++++- 2 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/texture.c b/dlls/d3d9/tests/texture.c index bbc98a7..7212d3c 100644 --- a/dlls/d3d9/tests/texture.c +++ b/dlls/d3d9/tests/texture.c @@ -236,6 +236,93 @@ static void test_mipmap_gen(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } +static void test_filter(IDirect3DDevice9 *device) { + HRESULT hr; + IDirect3DTexture9 *texture; + IDirect3D9 *d3d9; + DWORD passes = 0; + unsigned int i; + struct filter_tests { + DWORD magfilter, minfilter, mipfilter; + BOOL has_texture; + HRESULT result; + } tests[] = { + { D3DTEXF_NONE, D3DTEXF_NONE, D3DTEXF_NONE, FALSE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_POINT, D3DTEXF_NONE, D3DTEXF_NONE, FALSE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_NONE, D3DTEXF_POINT, D3DTEXF_NONE, FALSE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_POINT, D3DTEXF_POINT, D3DTEXF_NONE, FALSE, D3D_OK }, + { D3DTEXF_POINT, D3DTEXF_POINT, D3DTEXF_POINT, FALSE, D3D_OK }, + + { D3DTEXF_NONE, D3DTEXF_NONE, D3DTEXF_NONE, TRUE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_POINT, D3DTEXF_NONE, D3DTEXF_NONE, TRUE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_POINT, D3DTEXF_POINT, D3DTEXF_NONE, TRUE, D3D_OK }, + { D3DTEXF_POINT, D3DTEXF_POINT, D3DTEXF_POINT, TRUE, D3D_OK }, + + { D3DTEXF_NONE, D3DTEXF_NONE, D3DTEXF_NONE, TRUE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_LINEAR, D3DTEXF_NONE, D3DTEXF_NONE, TRUE, D3DERR_UNSUPPORTEDTEXTUREFILTER }, + { D3DTEXF_LINEAR, D3DTEXF_POINT, D3DTEXF_NONE, TRUE, E_FAIL }, + { D3DTEXF_POINT, D3DTEXF_LINEAR, D3DTEXF_NONE, TRUE, E_FAIL }, + { D3DTEXF_POINT, D3DTEXF_POINT, D3DTEXF_LINEAR, TRUE, E_FAIL }, + + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDirect3D(levels = 1) returned %08x\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_TEXTURE, D3DFMT_A32B32G32R32F); + if(FAILED(hr)) { + skip("D3DFMT_A32B32G32R32F not supported\n"); + goto out; + } + hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, + D3DRTYPE_TEXTURE, D3DFMT_A32B32G32R32F); + if(SUCCEEDED(hr)) { + skip("D3DFMT_A32B32G32R32F supports filtering\n"); + goto out; + } + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A32B32G32R32F, + D3DPOOL_MANAGED, &texture, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture returned %08x\n", hr); + + /* Needed for ValidateDevice */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); + + for(i = 0; i < (sizeof(tests) / sizeof(tests[0])); i++) { + if(tests[i].has_texture) { + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); + } else { + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); + } + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, tests[i].magfilter); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState returned %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, tests[i].minfilter); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState returned %08x\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, tests[i].mipfilter); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState returned %08x\n", hr); + + passes = 0xdeadbeef; + hr = IDirect3DDevice9_ValidateDevice(device, &passes); + ok(hr == tests[i].result, "ValidateDevice failed: Texture %s, min %u, mag %u, mip %u. Got %08x, expected %08x\n", + tests[i].has_texture ? "TRUE" : "FALSE", tests[i].magfilter, tests[i].minfilter, + tests[i].mipfilter, hr, tests[i].result); + if(SUCCEEDED(hr)) { + ok(passes != 0, "ValidateDevice succeeded, passes is %u\n", passes); + } else { + ok(passes == 0xdeadbeef, "ValidateDevice failed, passes is %u\n", passes); + } + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + + out: + IDirect3D9_Release(d3d9); +} + START_TEST(texture) { D3DCAPS9 caps; @@ -257,4 +344,5 @@ START_TEST(texture) test_texture_stage_states(device_ptr, caps.MaxTextureBlendStages); test_cube_textures(device_ptr, caps.TextureCaps); test_mipmap_gen(device_ptr); + test_filter(device_ptr); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73e4242..609b77f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5576,10 +5576,46 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetFrontBufferData(IWineD3DDevice *if static HRESULT WINAPI IWineD3DDeviceImpl_ValidateDevice(IWineD3DDevice *iface, DWORD* pNumPasses) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DBaseTextureImpl *texture; + const GlPixelFormatDesc *gl_info; + DWORD i; + + TRACE("(%p) : %p \n", This, pNumPasses); + + for(i = 0; i < MAX_COMBINED_SAMPLERS; i++) { + if(This->stateBlock->samplerState[i][WINED3DSAMP_MINFILTER] == WINED3DTEXF_NONE) { + WARN("Sampler state %u has minfilter D3DTEXF_NONE, returning D3DERR_UNSUPPORTEDTEXTUREFILTER\n", i); + return WINED3DERR_UNSUPPORTEDTEXTUREFILTER; + } + if(This->stateBlock->samplerState[i][WINED3DSAMP_MAGFILTER] == WINED3DTEXF_NONE) { + WARN("Sampler state %u has magfilter D3DTEXF_NONE, returning D3DERR_UNSUPPORTEDTEXTUREFILTER\n", i); + return WINED3DERR_UNSUPPORTEDTEXTUREFILTER; + } + + texture = (IWineD3DBaseTextureImpl *) This->stateBlock->textures[i]; + if(!texture) continue; + getFormatDescEntry(texture->resource.format, &GLINFO_LOCATION, &gl_info); + if(gl_info->Flags & WINED3DFMT_FLAG_FILTERING) continue; + + if(This->stateBlock->samplerState[i][WINED3DSAMP_MAGFILTER] != WINED3DTEXF_POINT) { + WARN("Non-filterable texture and mag filter enabled on samper %u, returning E_FAIL\n", i); + return E_FAIL; + } + if(This->stateBlock->samplerState[i][WINED3DSAMP_MINFILTER] != WINED3DTEXF_POINT) { + WARN("Non-filterable texture and min filter enabled on samper %u, returning E_FAIL\n", i); + return E_FAIL; + } + if(This->stateBlock->samplerState[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_NONE && + This->stateBlock->samplerState[i][WINED3DSAMP_MIPFILTER] != WINED3DTEXF_POINT /* sic! */) { + WARN("Non-filterable texture and mip filter enabled on samper %u, returning E_FAIL\n", i); + return E_FAIL; + } + } + /* return a sensible default */ *pNumPasses = 1; - /* TODO: If the window is minimized then validate device should return something other than WINED3D_OK */ - FIXME("(%p) : stub\n", This); + + TRACE("returning D3D_OK\n"); return WINED3D_OK; }

1 0

Stefan Dösinger : ddraw: Beware of the surface type when checking for format support.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: d5f05c59c7f7572a5383e2387641af4456ef3289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f05c59c7f7572a5383e2387… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 27 10:42:40 2008 -0500 ddraw: Beware of the surface type when checking for format support. --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 6 +++- dlls/ddraw/device.c | 9 ++++-- dlls/ddraw/direct3d.c | 3 +- dlls/wined3d/directx.c | 57 ++++++++++++++++++++++++++++++++++---- include/wine/wined3d_interface.h | 4 +- 7 files changed, 68 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5f05c59c7f7572a5383e…

1 0

Stefan Dösinger : wined3d: Implement secondary color in the arbfp ffp pipeline.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: d60ece20b5fc43ba1e1132ad6d60f48104c081bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d60ece20b5fc43ba1e1132ad6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 15:17:09 2008 -0500 wined3d: Implement secondary color in the arbfp ffp pipeline. --- dlls/wined3d/arb_program_shader.c | 68 ++++++++++++++++++++++++------------- 1 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c96feec..335e54b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2221,10 +2221,11 @@ const shader_backend_t arb_program_shader_backend = { }; /* ARB_fragment_program fixed function pipeline replacement definitions */ -#define ARB_FFP_CONST_TFACTOR 0 -#define ARB_FFP_CONST_CONSTANT(i) ((ARB_FFP_CONST_TFACTOR) + 1 + i) -#define ARB_FFP_CONST_BUMPMAT(i) ((ARB_FFP_CONST_CONSTANT(7)) + 1 + i) -#define ARB_FFP_CONST_LUMINANCE(i) ((ARB_FFP_CONST_BUMPMAT(7)) + 1 + i) +#define ARB_FFP_CONST_TFACTOR 0 +#define ARB_FFP_CONST_SPECULAR_ENABLE ((ARB_FFP_CONST_TFACTOR) + 1) +#define ARB_FFP_CONST_CONSTANT(i) ((ARB_FFP_CONST_SPECULAR_ENABLE) + 1 + i) +#define ARB_FFP_CONST_BUMPMAT(i) ((ARB_FFP_CONST_CONSTANT(7)) + 1 + i) +#define ARB_FFP_CONST_LUMINANCE(i) ((ARB_FFP_CONST_BUMPMAT(7)) + 1 + i) struct arbfp_ffp_desc { @@ -2340,6 +2341,31 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc } } +static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + float col[4]; + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + + /* Do not overwrite pixel shader constants if a pshader is in use */ + if(use_ps(device)) return; + + if(stateblock->renderState[WINED3DRS_SPECULARENABLE]) { + /* The specular color has no alpha */ + col[0] = 1.0; col[1] = 1.0; + col[2] = 1.0; col[3] = 0.0; + } else { + col[0] = 0.0; col[1] = 0.0; + col[2] = 0.0; col[3] = 0.0; + } + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)); + checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)"); + + if(device->shader_backend == &arb_program_shader_backend) { + device = stateblock->wineD3DDevice; + device->activeContext->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; + device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); + } +} + static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; @@ -2474,7 +2500,7 @@ static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, unsigned int return ret; } -static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, BOOL alpha, BOOL last, +static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, BOOL alpha, DWORD dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; unsigned int mul = 1; @@ -2484,9 +2510,7 @@ static void gen_ffp_instr(SHADER_BUFFER *buffer, unsigned int stage, BOOL color, else if(color) dstmask = ".rgb"; else dstmask = ".a"; - if(dst == tempreg && last) FIXME("Last texture stage writes to D3DTA_TEMP\n"); if(dst == tempreg) dstreg = "tempreg"; - else if(last) dstreg = "result.color"; else dstreg = "ret"; arg0 = get_argreg(buffer, 0, stage, dw_arg0); @@ -2627,8 +2651,8 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB GLuint ret; DWORD arg0, arg1, arg2; BOOL tempreg_used = FALSE, tfactor_used = FALSE; - BOOL last = FALSE; BOOL op_equal; + const char *final_combiner_src = "ret"; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -2712,6 +2736,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB if(tfactor_used) { shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); } + shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if(settings->sRGB_write) { shader_addline(&buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", @@ -2808,15 +2833,9 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB for(stage = 0; stage < MAX_TEXTURES; stage++) { if(settings->op[stage].cop == WINED3DTOP_DISABLE) { if(stage == 0) { - shader_addline(&buffer, "MOV result.color, fragment.color.primary;\n"); + final_combiner_src = "fragment.color.primary"; } break; - } else if(settings->sRGB_write) { - last = FALSE; - } else if(stage == (MAX_TEXTURES - 1)) { - last = TRUE; - } else if(settings->op[stage + 1].cop == WINED3DTOP_DISABLE) { - last = TRUE; } if(settings->op[stage].cop == WINED3DTOP_SELECTARG1 && @@ -2839,33 +2858,32 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB } if(settings->op[stage].aop == WINED3DTOP_DISABLE) { - gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - if(last && stage == 0) { - shader_addline(&buffer, "MOV result.color.a, fragment.color.primary.a;\n"); - } else if(last) { - shader_addline(&buffer, "MOV result.color.a, ret.a;\n"); - } else if(stage == 0) { + if(stage == 0) { shader_addline(&buffer, "MOV ret.a, fragment.color.primary.a;\n"); } } else if(op_equal) { - gen_ffp_instr(&buffer, stage, TRUE, TRUE, last, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, TRUE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); } else { - gen_ffp_instr(&buffer, stage, TRUE, FALSE, last, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - gen_ffp_instr(&buffer, stage, FALSE, TRUE, last, settings->op[stage].dst, + gen_ffp_instr(&buffer, stage, FALSE, TRUE, settings->op[stage].dst, settings->op[stage].aop, settings->op[stage].aarg0, settings->op[stage].aarg1, settings->op[stage].aarg2); } } if(settings->sRGB_write) { + shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); shader_addline(&buffer, "MOV result.color.a, ret.a;\n"); + } else { + shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); } /* Footer */ @@ -2938,6 +2956,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, set_bumpmat_arbfp(STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00), stateblock, context); } state_texfactor_arbfp(STATE_RENDER(WINED3DRS_TEXTUREFACTOR), stateblock, context); + state_arb_specularenable(STATE_RENDER(WINED3DRS_SPECULARENABLE), stateblock, context); } } @@ -3125,6 +3144,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + { STATE_RENDER(WINED3DRS_SPECULARENABLE), { STATE_RENDER(WINED3DRS_SPECULARENABLE), state_arb_specularenable}, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Implement YV12 support for emulated overlays.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 3b48660f43566a0417cef873d054e577bb58872b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b48660f43566a0417cef873d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 14:36:30 2008 -0500 wined3d: Implement YV12 support for emulated overlays. This is the prefered format of many codecs, and for some codecs this is the only supported output format. As usual I try to handle all the conversion in the GPU and keep the CPU involvement minimal to gain the full performance of PBO transfers. --- dlls/ddraw/utils.c | 5 + dlls/wined3d/arb_program_shader.c | 342 ++++++++++++++++++++++++++++--------- dlls/wined3d/device.c | 8 +- dlls/wined3d/surface.c | 5 + dlls/wined3d/utils.c | 14 ++- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_gl.h | 1 + 7 files changed, 291 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b48660f43566a0417cef…

1 0

Stefan Dösinger : wined3d: BLENDTEXTUREALPHAPM reads the texture.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 422eebd2c33ca4a49aa49d2e67825f35d4afdd4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=422eebd2c33ca4a49aa49d2e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 13:58:35 2008 +0200 wined3d: BLENDTEXTUREALPHAPM reads the texture. --- dlls/wined3d/arb_program_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54c2a83..c96feec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2641,6 +2641,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB if(arg2 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; if(settings->op[stage].cop == WINED3DTOP_BLENDTEXTUREALPHA) tex_read[stage] = TRUE; + if(settings->op[stage].cop == WINED3DTOP_BLENDTEXTUREALPHAPM) tex_read[stage] = TRUE; if(settings->op[stage].cop == WINED3DTOP_BUMPENVMAP) { bump_used[stage] = TRUE; tex_read[stage] = TRUE;

1 0

Muneyuki Noguchi : clock: Update Japanese translation.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 7c52cd504400d506951dee27b62c67ed2544cd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c52cd504400d506951dee27b… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 15:33:08 2008 +0900 clock: Update Japanese translation. --- programs/clock/Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc index 9591f3a..ba3cc0b 100644 --- a/programs/clock/Ja.rc +++ b/programs/clock/Ja.rc @@ -34,7 +34,7 @@ MAIN_MENU MENU MENUITEM "�b(&S)", IDM_SECONDS MENUITEM "��t(&D)", IDM_DATE MENUITEM SEPARATOR - MENUITEM "��Ɏ�O�ɕ\��(&A)", IDM_ONTOP + MENUITEM "��Ɏ�O�ɕ\\��(&A)", IDM_ONTOP } POPUP "��(&O)" { MENUITEM "��C�Z��X(&L)...", IDM_LICENSE

1 0

Muneyuki Noguchi : winecfg: Update Japanese translation.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 0cd01df155c74b094d3440c015af0466fec9d13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd01df155c74b094d3440c01… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 16:39:10 2008 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 53 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 77ecf4f..fcf2433 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -69,8 +69,8 @@ FONT 9, "MS UI Gothic" BEGIN GROUPBOX " �E�B��h�E�ݒ� ",IDC_STATIC,8,4,244,84 CONTROL "DirectX �A�v��P�[�V��}�E�X��m�ۂ��̂��(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "�E�B��h�E�}�l�[�W��E�B��h�E�𑕏��̂��(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "�E�B��h�E�}�l�[�W��E�B��h�E�𐧌䂷��̂��(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "�E�B��h�E �}�l�[�W��E�B��h�E�𑕏��̂��(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "�E�B��h�E �}�l�[�W��E�B��h�E�𐧌䂷��̂��(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "��z�f�X�N�g�b�v��G�~��[�g��(&D)",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "�f�X�N�g�b�v�̑傫��(&Z):",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED @@ -95,7 +95,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN GROUPBOX " DLL �I�[�o�[��C�h ",IDC_STATIC,8,4,244,240 - LTEXT "�_�C�i�~�b�N�E��N�E��C�u��(DLL)�͌ʂ� builtin (Wine��) �܂�� native (Windows ��̓A�v��P�[�V��񋟂̕�)��I�Ԃ��Ƃ��ł��܂��B" + LTEXT "�_�C�i�~�b�N ��N ��C�u��(DLL)�͌ʂ� builtin (Wine��) �܂�� native (Windows ��̓A�v��P�[�V��񋟂̕�)��I�Ԃ��Ƃ��ł��܂��B" ,IDC_STATIC,16,16,220,32 LTEXT "��C�u��̐V�K�I�[�o�[��C�h(&N):",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE @@ -166,15 +166,15 @@ BEGIN LTEXT "�I�[�f�B�I�h��C�o: ",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "��e�X�g(&T)",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "�R��g��[��p�l��(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 + PUSHBUTTON "�R��g��[�� p�l��(&C)",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "�n�[�h�E�F�A�E�A�N�Z��[�V��(&H): ",IDC_STATIC,15,215,90,10 + LTEXT "�n�[�h�E�F�A �A�N�Z��[�V��(&H): ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��̃T��v��[�g(&S):",IDC_STATIC,15,232,70,8 COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�h��C�o�E�G�~��[�V��(&E)",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 + CONTROL "�h��C�o �G�~��[�V��(&E)",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -184,7 +184,7 @@ BEGIN GROUPBOX " �O�� ",IDC_STATIC,8,4,244,106 LTEXT "�e�[�}(&T):",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "�e�[�}��C��X�g�[��(&I)...",IDC_THEME_INSTALL,152,23,93,14 + PUSHBUTTON "�e�[�}�̃C��X�g�[��(&I)...",IDC_THEME_INSTALL,152,23,93,14 LTEXT "�z�F(&C):",IDC_THEME_COLORTEXT,15,40,112,8 COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�T�C�Y(&S):",IDC_THEME_SIZETEXT,135,40,110,8 @@ -222,6 +222,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "�e�[�}�t�@�C��" IDS_THEMEFILE_SELECT "�e�[�}�t�@�C��I��ł��" + IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." IDS_SHELL_FOLDER "�V�F��t�H��_" IDS_LINKS_TO "Links to" END @@ -259,7 +260,7 @@ BEGIN IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" IDS_COL_DRIVELETTER "��^�[" IDS_COL_DRIVEMAPPING "�h��C�u�̊��蓖��" - IDS_NO_DRIVE_C "�h��C�u C ��܂��B��͂��܂�ǂ��܂��B\n\n�h��C�u C ��쐬��邽�߂Ƀh��C�u�^�u��́u�ǉ��v��Y�ꂸ�ɃN��b�N��Ă��!\n" + IDS_NO_DRIVE_C "�h��C�u C ��܂��B��͂��܂�ǂ��܂��B\n\n�h��C�u C ��쐬��邽�߂Ƀh��C�u�^�u�� [�ǉ�] ��Y�ꂸ�ɃN��b�N��Ă��!\n" END STRINGTABLE DISCARDABLE @@ -286,3 +287,39 @@ BEGIN IDS_UNAVAILABLE_DRIVER "��p�ł��Ȃ��h��C�o��W�X�g��Ɍ��܂��!\n\n��W�X�g�� \"%s\" ��폜��܂��?" IDS_WARNING "�x��" END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "�R��g��[��̔w�i" + IDC_SYSPARAMS_BUTTON_TEXT "�R��g��[��̃e�L�X�g" + IDC_SYSPARAMS_DESKTOP "�f�X�N�g�b�v" + IDC_SYSPARAMS_MENU "��j��[�̔w�i" + IDC_SYSPARAMS_MENU_TEXT "��j��[�̃e�L�X�g" + IDC_SYSPARAMS_SCROLLBAR "�X�N��[��o�[" + IDC_SYSPARAMS_SELECTION "�I��ڂ̔w�i" + IDC_SYSPARAMS_SELECTION_TEXT "�I��ڂ̃e�L�X�g" + IDC_SYSPARAMS_TOOLTIP "�q��g�̔w�i" + IDC_SYSPARAMS_TOOLTIP_TEXT "�q��g�̃e�L�X�g" + IDC_SYSPARAMS_WINDOW "�E�B��h�E�̔w�i" + IDC_SYSPARAMS_WINDOW_TEXT "�E�B��h�E�̃e�L�X�g" + IDC_SYSPARAMS_ACTIVE_TITLE "�A�N�e�B�u �^�C�g�� o�[" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "�A�N�e�B�u �^�C�g��̃e�L�X�g" + IDC_SYSPARAMS_INACTIVE_TITLE "��A�N�e�B�u �^�C�g�� o�[" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "��A�N�e�B�u �^�C�g��̃e�L�X�g" + IDC_SYSPARAMS_MSGBOX_TEXT "��b�Z�[�W �{�b�N�X�̃e�L�X�g" + IDC_SYSPARAMS_APPWORKSPACE "�A�v��P�[�V��ƈ�" + IDC_SYSPARAMS_WINDOW_FRAME "�E�B��h�E�̋��E" + IDC_SYSPARAMS_ACTIVE_BORDER "�A�N�e�B�u��E" + IDC_SYSPARAMS_INACTIVE_BORDER "��A�N�e�B�u��E" + IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" + IDC_SYSPARAMS_GRAY_TEXT "Gray Text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Highlight" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" + IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" + IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Title Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Highlight" + IDC_SYSPARAMS_MENUBAR "��j��[ �o�[" +END

1 0

Muneyuki Noguchi : winemine: Add Japanese translation.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: ddcbbaae1e9046af147f6020a55b15a0d9c51764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcbbaae1e9046af147f6020a… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 15:25:30 2008 +0900 winemine: Add Japanese translation. --- programs/winemine/Ja.rc | 92 +++++++++++++++++++++++++++++++++++++++++++++ programs/winemine/rsrc.rc | 1 + 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Ja.rc b/programs/winemine/Ja.rc new file mode 100644 index 0000000..c6bd52b --- /dev/null +++ b/programs/winemine/Ja.rc @@ -0,0 +1,92 @@ +/* + * WineMine + * Japanese Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * + * 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 + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Nobody" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "�I�v�V��(&O)" { + MENUITEM "�X�^�[�g(&N)\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "?�}�[�N��g�p(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "��(&B)", IDM_BEGINNER + MENUITEM "��(&A)", IDM_ADVANCED + MENUITEM "�㋉(&E)", IDM_EXPERT + MENUITEM "�Ֆʂ̕ύX(&C)", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "�I��(&X)\tAlt+X", IDM_EXIT + } + POPUP "��(&I)" { + MENUITEM "�n�C�X�R�A(&F)", IDM_TIMES + MENUITEM "WineMine �ɂ��(&A)", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Fastest Times" +{ + GROUPBOX "�n�C�X�R�A", IDIGNORE, 10, 10, 140, 45 + LTEXT "��", IDIGNORE, 20, 20, 40, 8 + LTEXT "��", IDIGNORE, 20, 30, 40, 8 + LTEXT "�㋉", IDIGNORE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "��߂łƂ�!" +{ + LTEXT "��O��͂��܂��傤", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "�Ֆʂ̕ύX" +{ + LTEXT "Rows", IDIGNORE, 5, 5, 30, 10 + LTEXT "Cols", IDIGNORE, 5, 35, 30, 10 + LTEXT "Mines", IDIGNORE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 +} diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index cb5e1e7..8387ad8 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -32,6 +32,7 @@ #include "Fi.rc" #include "Fr.rc" #include "It.rc" +#include "Ja.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc"

1 0

Muneyuki Noguchi : comdlg32: Update Japanese translation.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 874ff81640d1b4493911512e4cd0d93b79355007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874ff81640d1b4493911512e4… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 14:58:37 2008 +0900 comdlg32: Update Japanese translation. --- dlls/comdlg32/cdlg_Ja.rc | 142 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc index a5e8a0c..0b35236 100644 --- a/dlls/comdlg32/cdlg_Ja.rc +++ b/dlls/comdlg32/cdlg_Ja.rc @@ -141,7 +141,7 @@ FONT 9, "MS UI Gothic" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "�T��v��",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "��Z�b�g(&I):",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -295,6 +295,36 @@ BEGIN CONTROL "��(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�y�[�W�ݒ�" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "�p��", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "�T�C�Y(&S):", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "��@(&T):", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "��̌��", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "�c(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "��(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "�]��", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "��(&E):", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "�E(&R):", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "��(&O):", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "��(&B):", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "�L��Z��", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "�v��^(&R)...", psh3, 184, 220, 48, 14 +END + NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "�t�@�C��J��" @@ -338,9 +368,115 @@ STRINGTABLE DISCARDABLE IDS_FILENOTFOUND "�t�@�C��܂��B" IDS_VERIFYFILE "�t�@�C��m�F��Ă��B" IDS_CREATEFILE "��̃t�@�C��͑��݂��܂��B\n�쐬��܂��?" - IDS_OVERWRITEFILE "File already exists.\nDo you want to replace it?" + IDS_OVERWRITEFILE "�t�@�C��͊��ɑ��݂��܂��B\n�㏑��܂��?" IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" - IDS_INVALID_FILENAME "A filename cannot contain any of the following characters:\n / : < > |" + IDS_INVALID_FILENAME "�t�@�C��ɂ͈ȉ��̕��͎g��܂��:\n / : < > |" IDS_PATHNOTEXISTING "Path does not exist" IDS_FILENOTEXISTING "File does not exist" } + +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Up One Level" + IDS_NEWFOLDER "Create New Folder" + IDS_LISTVIEW "List" + IDS_REPORTVIEW "Details" + IDS_TODESKTOP "Browse to Desktop" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Print" + + PD32_VALUE_UREADABLE "Unreadable Entry" + PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ +Please enter a value between %d and %d." + PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the \ +'to' entry." + PD32_MARGINS_OVERLAP "Margins overlap or fall outside \ +Paper boundaries.\nPlease reenter margins." + PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \ +value cannot be empty." + PD32_TOO_LARGE_COPIES "This large number of copies is not \ +supported by your printer.\nPlease enter a value between 1 and %d." + PD32_PRINT_ERROR "A printer error occurred." + PD32_NO_DEFAULT_PRINTER "No default printer defined." + PD32_CANT_FIND_PRINTER "Cannot find the printer." + PD32_OUT_OF_MEMORY "Out of memory." + PD32_GENERIC_ERROR "An error occurred." + PD32_DRIVER_UNKNOWN "Unknown printer driver." + PD32_NO_DEVICES "Before you can perform printer-related tasks \ +such as page setup or printing a document, you need to install a printer. \ +Please install one and retry." + + PD32_DEFAULT_PRINTER "Default Printer; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" + PD32_MARGINS_IN_INCHES "Margins [inches]" + PD32_MARGINS_IN_MILIMETERS "Margins [mm]" + PD32_MILIMETERS "mm" + + PD32_PRINTER_STATUS_READY "Ready" + PD32_PRINTER_STATUS_PAUSED "Paused; " + PD32_PRINTER_STATUS_ERROR "Error; " + PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " + PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " + PD32_PRINTER_STATUS_PAPER_OUT "Out of paper; " + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " + PD32_PRINTER_STATUS_OFFLINE "Printer offline; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " + PD32_PRINTER_STATUS_BUSY "Busy; " + PD32_PRINTER_STATUS_PRINTING "Printing; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " + PD32_PRINTER_STATUS_WAITING "Waiting; " + PD32_PRINTER_STATUS_PROCESSING "Processing; " + PD32_PRINTER_STATUS_INITIALIZING "Initialising; " + PD32_PRINTER_STATUS_WARMING_UP "Warming up; " + PD32_PRINTER_STATUS_TONER_LOW "Toner low; " + PD32_PRINTER_STATUS_NO_TONER "No toner; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " + PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " + PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; " +} + +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "�W��" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "�Α�" + IDS_FONT_BOLD_ITALIC "�� Α�" +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "��" + IDS_COLOR_MAROON "��F" + IDS_COLOR_GREEN "��" + IDS_COLOR_OLIVE "�I��[�u" + IDS_COLOR_NAVY "��" + IDS_COLOR_PURPLE "��" + IDS_COLOR_TEAL "��" + IDS_COLOR_GRAY "�D�F" + IDS_COLOR_SILVER "��F" + IDS_COLOR_RED "��" + IDS_COLOR_LIME "��" + IDS_COLOR_YELLOW "��" + IDS_COLOR_BLUE "��" + IDS_COLOR_FUCHSIA "�Ԏ�" + IDS_COLOR_AQUA "��F" + IDS_COLOR_WHITE "��" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Select a font size between %d and %d points." + IDS_SAVE_BUTTON "&Save" + IDS_SAVE_IN "Save &in:" + IDS_SAVE "Save" + IDS_SAVE_AS "Save as" + IDS_OPEN_FILE "Open File" +}

1 0