August 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: D3DTOP_DOTPRODUCT3 colorop overrides the alphaop.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: b294e43206dab65687dd9358f4a1c8ae396ab7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b294e43206dab65687dd9358f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 14:11:47 2008 -0500 wined3d: D3DTOP_DOTPRODUCT3 colorop overrides the alphaop. Note that the fix is only implemented in the arbfp and atifs fragment pipeline. Unfortunately nvrc doesn't support dot3 as alpha operation. --- dlls/d3d9/tests/visual.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 16 ++++++++-- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d36411f..c889e7e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9576,6 +9576,82 @@ static void alphareplicate_test(IDirect3DDevice9 *device) { } +static void dp3_alpha_test(IDirect3DDevice9 *device) { + HRESULT hr; + D3DCAPS9 caps; + DWORD color; + struct vertex quad[] = { + { -1.0, -1.0, 0.1, 0x408080c0 }, + { 1.0, -1.0, 0.1, 0x408080c0 }, + { -1.0, 1.0, 0.1, 0x408080c0 }, + { 1.0, 1.0, 0.1, 0x408080c0 }, + }; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_DOTPRODUCT3)) { + skip("D3DTOP_DOTPRODUCT3 not supported\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with 0x%08x\n", hr); + + /* dp3_x4 r0, diffuse_bias, tfactor_bias + * mov r0.a, diffuse.a + * mov r0, r0.a + * + * It turns out that the 2nd line is ignored, and the dp3 result written into r0.a instead + * thus with input vec4(0.5, 0.5, 0.75, 0.25) and vec4(1.0, 1.0, 1.0, 1.0) the result is + * (0.0 * 0.5 + 0.0 * 0.5 + 0.25 * 0.5) * 4 = 0.125 * 4 = 0.5, with a bunch of inprecision. + */ + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DOTPRODUCT3); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG2, D3DTA_TFACTOR); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_CURRENT | D3DTA_ALPHAREPLICATE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0xffffffff); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00808080, 4), "dp3 alpha test 0x%08x, expected 0x00808080\n", + color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9732,9 +9808,11 @@ START_TEST(visual) } } else skip("No ps_1_1 support\n"); + texop_test(device_ptr); texop_range_test(device_ptr); alphareplicate_test(device_ptr); + dp3_alpha_test(device_ptr); cleanup: if(device_ptr) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8501544..3cce302 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1871,9 +1871,19 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting cop = WINED3DTOP_SELECTARG1; } - aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff; - aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff; - aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff; + if(cop == WINED3DTOP_DOTPRODUCT3) { + /* A dotproduct3 on the colorop overwrites the alphaop operation and replicates + * the color result to the alpha component of the destination + */ + aop = cop; + aarg1 = carg1; + aarg2 = carg2; + aarg0 = carg0; + } else { + aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff; + aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff; + aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff; + } if(i == 0 && stateblock->textures[0] && stateblock->renderState[WINED3DRS_COLORKEYENABLE] &&

1 0

Stefan Dösinger : wined3d: Clean up the texbeml parameter forward.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 8dcc6b66dc3588fce1c0b847ef9c9c636ddcaff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcc6b66dc3588fce1c0b847e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 11:31:05 2008 -0500 wined3d: Clean up the texbeml parameter forward. There's no point in separating scale and luminance since they're uploaded at the same time. We still want to separate the stages though. --- dlls/wined3d/state.c | 49 ++++++++----------------------------------------- 1 files changed, 8 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5b92420..31c76ae 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3407,10 +3407,6 @@ static void shaderconstant(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; - union { - DWORD d; - float f; - } tmpvalue; if(stateblock->pixelShader && stage != 0 && ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { @@ -3422,35 +3418,6 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); } } - - tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]; - if(tmpvalue.f != 0.0) { - FIXME("WINED3DTSS_BUMPENVLSCALE not supported yet\n"); - } -} - -static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; - union { - DWORD d; - float f; - } tmpvalue; - - if(stateblock->pixelShader && stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { - /* The pixel shader has to know the luminance offset. Do a constants update if it - * isn't scheduled anyway - */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT) && - !isStateDirty(context, STATE_PIXELSHADER)) { - shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); - } - } - - tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLOFFSET]; - if(tmpvalue.f != 0.0) { - FIXME("WINED3DTSS_BUMPENVLOFFSET not supported yet\n"); - } } static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -4906,21 +4873,21 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), shader_bumpenvmat }, 0 }, { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), shader_bumpenvmat }, 0 }, { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, 0 }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT },

1 0

Detlef Riekenberg : shlwapi/tests: Add tests for UrlApplyScheme.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: a34f4ae848b2197f8e1e41e89ecc7f0f16bbd38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34f4ae848b2197f8e1e41e89… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 26 10:40:43 2008 +0200 shlwapi/tests: Add tests for UrlApplyScheme. --- dlls/shlwapi/tests/url.c | 105 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ede4d7c..76996c4 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1,7 +1,7 @@ /* Unit test suite for Path functions * * Copyright 2002 Matthew Mastracci - * Copyright 2007 Detlef Riekenberg + * Copyright 2007,2008 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,6 +40,35 @@ static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w', /* ################ */ +static const CHAR untouchedA[] = "untouched"; + +#define TEST_APPLY_MAX_LENGTH INTERNET_MAX_URL_LENGTH + +typedef struct _TEST_URL_APPLY { + const char * url; + DWORD flags; + HRESULT res; + DWORD newlen; + const char * newurl; +} TEST_URL_APPLY; + +static const TEST_URL_APPLY TEST_APPLY[] = { + {"www.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 21, "http://www.winehq.org"}, + {"www.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, 21, "http://www.winehq.org"}, + {"www.winehq.org", URL_APPLY_DEFAULT, S_OK, 21, "http://www.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 20, "ftp://ftp.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_GUESSSCHEME, S_OK, 20, "ftp://ftp.winehq.org"}, + {"ftp.winehq.org", URL_APPLY_DEFAULT, S_OK, 21, "http://ftp.winehq.org"}, + {"winehq.org", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, + {"winehq.org", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"winehq.org", URL_APPLY_DEFAULT, S_OK, 17, "http://winehq.org"}, + {"", URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT, S_OK, 7, "http://"}, + {"", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA}, + {"", URL_APPLY_DEFAULT, S_OK, 7, "http://"} +}; + +/* ################ */ + typedef struct _TEST_URL_CANONICALIZE { const char *url; DWORD flags; @@ -338,6 +367,79 @@ static void FreeWideString(LPWSTR wszString) /* ########################### */ +static void test_UrlApplyScheme(void) +{ + CHAR newurl[TEST_APPLY_MAX_LENGTH]; + WCHAR urlW[TEST_APPLY_MAX_LENGTH]; + WCHAR newurlW[TEST_APPLY_MAX_LENGTH]; + HRESULT res; + DWORD len; + DWORD i; + + for(i = 0; i < sizeof(TEST_APPLY)/sizeof(TEST_APPLY[0]); i++) { + len = TEST_APPLY_MAX_LENGTH; + lstrcpyA(newurl, untouchedA); + res = UrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); + ok( res == TEST_APPLY[i].res, + "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); + + ok( len == TEST_APPLY[i].newlen, + "#%dA: got len %d (expected %d)\n", i, len, TEST_APPLY[i].newlen); + + ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), + "#%dA: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); + + /* returned length is in character */ + len = TEST_APPLY_MAX_LENGTH; + lstrcpyA(newurl, untouchedA); + MultiByteToWideChar(CP_ACP, 0, newurl, -1, newurlW, len); + MultiByteToWideChar(CP_ACP, 0, TEST_APPLY[i].url, -1, urlW, len); + + res = UrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); + WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); + ok( res == TEST_APPLY[i].res, + "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); + + ok( len == TEST_APPLY[i].newlen, + "#%dW: got len %d (expected %d)\n", i, len, TEST_APPLY[i].newlen); + + ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), + "#%dW: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); + + } + + /* buffer too small */ + lstrcpyA(newurl, untouchedA); + len = lstrlenA(TEST_APPLY[0].newurl); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, &len, TEST_APPLY[0].flags); + ok(res == E_POINTER, "got HRESULT 0x%x (expected E_POINTER)\n", res); + /* The returned length include the space for the terminating 0 */ + i = lstrlenA(TEST_APPLY[0].newurl)+1; + ok(len == i, "got len %d (expected %d)\n", len, i); + ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); + + /* NULL as parameter. The length and the buffer are not modified */ + lstrcpyA(newurl, untouchedA); + len = TEST_APPLY_MAX_LENGTH; + res = UrlApplySchemeA(NULL, newurl, &len, TEST_APPLY[0].flags); + ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); + ok(len == TEST_APPLY_MAX_LENGTH, "got len %d (expected %d)\n", len, TEST_APPLY_MAX_LENGTH); + ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); + + len = TEST_APPLY_MAX_LENGTH; + res = UrlApplySchemeA(TEST_APPLY[0].url, NULL, &len, TEST_APPLY[0].flags); + ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); + ok(len == TEST_APPLY_MAX_LENGTH, "got len %d (expected %d)\n", len, TEST_APPLY_MAX_LENGTH); + + lstrcpyA(newurl, untouchedA); + res = UrlApplySchemeA(TEST_APPLY[0].url, newurl, NULL, TEST_APPLY[0].flags); + ok(res == E_INVALIDARG, "got HRESULT 0x%x (expected E_INVALIDARG)\n", res); + ok(!lstrcmpA(newurl, untouchedA), "got '%s' (expected '%s')\n", newurl, untouchedA); + +} + +/* ########################### */ + static void hash_url(const char* szUrl) { LPCSTR szTestUrl = szUrl; @@ -840,6 +942,7 @@ START_TEST(url) hShlwapi = GetModuleHandleA("shlwapi.dll"); pUrlCanonicalizeW = (void *) GetProcAddress(hShlwapi, "UrlCanonicalizeW"); + test_UrlApplyScheme(); test_UrlHash(); test_UrlGetPart(); test_UrlCanonicalizeA();

1 0

Jeff Zaroyko : msvcrt: Add a test for unlinking non-empty directories.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: c7093febab51ca3cf79fb10ff17e74459b158618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7093febab51ca3cf79fb10ff… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Aug 26 18:32:35 2008 +1000 msvcrt: Add a test for unlinking non-empty directories. --- dlls/msvcrt/tests/file.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 45ffdce..0cf13fd 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1085,6 +1085,19 @@ static void test_pipes(const char* selfname) ok(fclose(file) == 0, "unable to close the pipe: %d\n", errno); } +static void test_unlink(void) +{ + FILE* file; + ok(mkdir("test_unlink") == 0, "unable to create test dir\n"); + file = fopen("test_unlink\\empty", "w"); + ok(file != NULL, "unable to create test file\n"); + if(file) + fclose(file); + todo_wine ok(_unlink("test_unlink") != 0, "unlinking a non-empty directory must fail\n"); + unlink("test_unlink\\empty"); + rmdir("test_unlink"); +} + START_TEST(file) { int arg_c; @@ -1109,6 +1122,7 @@ START_TEST(file) test_file_write_read(); test_chsize(); test_stat(); + test_unlink(); /* testing stream I/O */ test_fdopen();

1 0

Detlef Riekenberg : shlwapi: Fix results for UrlApplyScheme.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: b331b1a3ed82bf1602122e5c294a093fb33277f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b331b1a3ed82bf1602122e5c2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 26 10:36:09 2008 +0200 shlwapi: Fix results for UrlApplyScheme. --- dlls/shlwapi/url.c | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ca6e200..c286fc6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1504,32 +1504,38 @@ HRESULT WINAPI UrlHashW(LPCWSTR pszUrl, unsigned char *lpDest, DWORD nDestLen) HRESULT WINAPI UrlApplySchemeA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, DWORD dwFlags) { LPWSTR in, out; - DWORD ret, len, len2; + HRESULT ret; + DWORD len; + + TRACE("(%s, %p, %p:out size %d, 0x%08x)\n", debugstr_a(pszIn), + pszOut, pcchOut, pcchOut ? *pcchOut : 0, dwFlags); - TRACE("(in %s, out size %d, flags %08x) using W version\n", - debugstr_a(pszIn), *pcchOut, dwFlags); + if (!pszIn || !pszOut || !pcchOut) return E_INVALIDARG; in = HeapAlloc(GetProcessHeap(), 0, - (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); + (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); out = in + INTERNET_MAX_URL_LENGTH; - MultiByteToWideChar(0, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); + MultiByteToWideChar(CP_ACP, 0, pszIn, -1, in, INTERNET_MAX_URL_LENGTH); len = INTERNET_MAX_URL_LENGTH; ret = UrlApplySchemeW(in, out, &len, dwFlags); - if ((ret != S_OK) && (ret != S_FALSE)) { - HeapFree(GetProcessHeap(), 0, in); - return ret; + if (ret != S_OK) { + HeapFree(GetProcessHeap(), 0, in); + return ret; } - len2 = WideCharToMultiByte(0, 0, out, len+1, 0, 0, 0, 0); - if (len2 > *pcchOut) { - *pcchOut = len2; - HeapFree(GetProcessHeap(), 0, in); - return E_POINTER; + len = WideCharToMultiByte(CP_ACP, 0, out, -1, NULL, 0, NULL, NULL); + if (len > *pcchOut) { + ret = E_POINTER; + goto cleanup; } - WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); - *pcchOut = len2; + + WideCharToMultiByte(CP_ACP, 0, out, -1, pszOut, *pcchOut, NULL, NULL); + len--; + +cleanup: + *pcchOut = len; HeapFree(GetProcessHeap(), 0, in); return ret; } @@ -1623,8 +1629,10 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW DWORD res1; HRESULT ret; - TRACE("(in %s, out size %d, flags %08x)\n", - debugstr_w(pszIn), *pcchOut, dwFlags); + TRACE("(%s, %p, %p:out size %d, 0x%08x)\n", debugstr_w(pszIn), + pszOut, pcchOut, pcchOut ? *pcchOut : 0, dwFlags); + + if (!pszIn || !pszOut || !pcchOut) return E_INVALIDARG; if (dwFlags & URL_APPLY_GUESSFILE) { FIXME("(%s %p %p(%d) 0x%08x): stub URL_APPLY_GUESSFILE not implemented\n", @@ -1669,14 +1677,6 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW return URL_ApplyDefault(pszIn, pszOut, pcchOut); } - /* just copy and give proper return code */ - if (strlenW(pszIn) + 1 > *pcchOut) { - *pcchOut = strlenW(pszIn) + 1; - return E_POINTER; - } - strcpyW(pszOut, pszIn); - *pcchOut = strlenW(pszOut); - TRACE("returning copy, left alone\n"); return S_FALSE; }

1 0

Detlef Riekenberg : shlwapi: Fix parameters for RegQueryValueExW to read the default value.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 177c2a2798ea25297965b65949c685853712e02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=177c2a2798ea25297965b6594… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 25 12:49:18 2008 +0200 shlwapi: Fix parameters for RegQueryValueExW to read the default value. --- dlls/shlwapi/url.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 18ebc41..ca6e200 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1586,7 +1586,7 @@ static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) { HKEY newkey; DWORD data_len, dwType; - WCHAR value[MAX_PATH], data[MAX_PATH]; + WCHAR data[MAX_PATH]; static const WCHAR prefix_keyW[] = {'S','o','f','t','w','a','r','e', @@ -1598,14 +1598,12 @@ static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) /* get and prepend default */ RegOpenKeyExW(HKEY_LOCAL_MACHINE, prefix_keyW, 0, 1, &newkey); - data_len = MAX_PATH; - value[0] = '@'; - value[1] = '\0'; - RegQueryValueExW(newkey, value, 0, &dwType, (LPBYTE)data, &data_len); + data_len = sizeof(data); + RegQueryValueExW(newkey, NULL, 0, &dwType, (LPBYTE)data, &data_len); RegCloseKey(newkey); if (strlenW(data) + strlenW(pszIn) + 1 > *pcchOut) { - *pcchOut = strlenW(data) + strlenW(pszIn) + 1; - return E_POINTER; + *pcchOut = strlenW(data) + strlenW(pszIn) + 1; + return E_POINTER; } strcpyW(pszOut, data); strcatW(pszOut, pszIn);

1 0

Detlef Riekenberg : include: Declare TranslateURL and needed flags.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 52a406f72fa9a583bf37eae639a3c3c7ffd78c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a406f72fa9a583bf37eae63… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 26 11:23:31 2008 +0200 include: Declare TranslateURL and needed flags. --- include/intshcut.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/intshcut.h b/include/intshcut.h index 71c7514..842a9c0 100644 --- a/include/intshcut.h +++ b/include/intshcut.h @@ -95,7 +95,17 @@ DECL_WINELIB_TYPE_AW(PURLINVOKECOMMANDINFO) DECL_WINELIB_TYPE_AW(CURLINVOKECOMMANDINFO) DECL_WINELIB_TYPE_AW(PCURLINVOKECOMMANDINFO) -BOOL WINAPI InetIsOffline(DWORD); + +typedef enum translateurl_in_flags { + TRANSLATEURL_FL_GUESS_PROTOCOL=1, + TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL +} TRANSLATEURL_IN_FLAGS; + +HRESULT WINAPI TranslateURLA(LPCSTR, DWORD, LPSTR *); +HRESULT WINAPI TranslateURLW(LPCWSTR, DWORD, LPWSTR *); +#define TranslateURL WINELIB_NAME_AW(TranslateURL) + +BOOL WINAPI InetIsOffline(DWORD); #ifdef __cplusplus }

1 0

Paul Vriens : mstask/tests: Skip tests for security services if they are not implemented.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 6cd32ffc07cd572290fcac1a18ed87b5e2687254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd32ffc07cd572290fcac1a1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 27 10:59:56 2008 +0200 mstask/tests: Skip tests for security services if they are not implemented. --- dlls/mstask/tests/task.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index a5f2d0a..820b962 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -448,7 +448,14 @@ static void test_SetAccountInformation_GetAccountInformation(void) /* Get account information before it is set */ hres = ITask_GetAccountInformation(test_task, &account_name); /* WinXP returns HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND): 0x80070002 but - * Win2K returns SCHED_E_CANNOT_OPEN_TASK: 0x8004130d */ + * Win2K returns SCHED_E_CANNOT_OPEN_TASK: 0x8004130d + * Win9x doesn't support security services */ + if (hres == SCHED_E_NO_SECURITY_SERVICES) + { + win_skip("Security services are not supported\n"); + cleanup_task(); + return; + } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, "Unset account name generated: 0x%08x\n", hres);

1 0

Paul Vriens : advapi32/tests: Remove tests for calculation with drivers.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 3a7111e0ded96783bdf9a19be2413590b9a716fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7111e0ded96783bdf9a19be… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 27 09:20:39 2008 +0200 advapi32/tests: Remove tests for calculation with drivers. --- dlls/advapi32/tests/service.c | 114 +++++----------------------------------- 1 files changed, 15 insertions(+), 99 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 1cf0f62..268827e 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -960,8 +960,7 @@ static void test_enum_svc(void) BOOL ret; DWORD bufsize, needed, returned, resume; DWORD tempneeded, tempreturned; - DWORD drivercountactive, servicecountactive; - DWORD drivercountinactive, servicecountinactive; + DWORD servicecountactive, servicecountinactive; ENUM_SERVICE_STATUS *services; ENUM_SERVICE_STATUS_PROCESS *exservices; INT i; @@ -1172,39 +1171,15 @@ static void test_enum_svc(void) /* See if things add up */ - /* Get the number of active driver services */ - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_ACTIVE, NULL, 0, - &needed, &returned, NULL); - services = HeapAlloc(GetProcessHeap(), 0, needed); - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_ACTIVE, services, - needed, &needed, &returned, NULL); - HeapFree(GetProcessHeap(), 0, services); - - /* Store the number of active driver services */ - drivercountactive = returned; - - /* Get the number of inactive driver services */ - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_INACTIVE, NULL, 0, - &needed, &returned, NULL); - services = HeapAlloc(GetProcessHeap(), 0, needed); - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_INACTIVE, services, - needed, &needed, &returned, NULL); - HeapFree(GetProcessHeap(), 0, services); - - drivercountinactive = returned; - - /* Get the number of driver services */ - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_STATE_ALL, NULL, 0, - &needed, &returned, NULL); - services = HeapAlloc(GetProcessHeap(), 0, needed); - EnumServicesStatusA(scm_handle, SERVICE_DRIVER, SERVICE_STATE_ALL, services, - needed, &needed, &returned, NULL); - HeapFree(GetProcessHeap(), 0, services); - - /* Check if total is the same as active and inactive driver services */ - todo_wine - ok(returned == (drivercountactive + drivercountinactive), - "Something wrong in the calculation\n"); + /* Vista only shows the drivers with a state of SERVICE_RUNNING as active + * and doesn't count the others as inactive. This means that Vista could + * show a total that is greater then the sum of active and inactive drivers. + * + * The number of active and inactive drivers is greatly influenced by the + * time when tests are run, immediately after boot or later for example. + * + * Both reasons make calculations for drivers not so useful + */ /* Get the number of active win32 services */ EnumServicesStatusA(scm_handle, SERVICE_WIN32, SERVICE_ACTIVE, NULL, 0, @@ -1239,7 +1214,8 @@ static void test_enum_svc(void) ok(returned == (servicecountactive + servicecountinactive), "Something wrong in the calculation\n"); - /* Get the number of all services. + /* Get all drivers and services + * * Fetch the status of the last call as failing could make the following tests crash * on Wine (we don't return anything yet). */ @@ -1249,12 +1225,7 @@ static void test_enum_svc(void) ret = EnumServicesStatusA(scm_handle, SERVICE_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, services, needed, &needed, &returned, NULL); - /* Check if total is the same as all those single calls */ - todo_wine - ok(returned == (drivercountactive + drivercountinactive + servicecountactive + servicecountinactive), - "Something wrong in the calculation\n"); - - /* Loop through all those returned services */ + /* Loop through all those returned drivers and services */ for (i = 0; ret && i < returned; i++) { SERVICE_STATUS status = services[i].ServiceStatus; @@ -1266,15 +1237,6 @@ static void test_enum_svc(void) /* Decrement the counters to see if the functions calls return the same * numbers as the contents of these structures. */ - if (status.dwServiceType & (SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER)) - { - /* FIXME: should be probably more then just SERVICE_RUNNING */ - if (status.dwCurrentState == SERVICE_RUNNING) - drivercountactive--; - else - drivercountinactive--; - } - if (status.dwServiceType & (SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS)) { if (status.dwCurrentState == SERVICE_RUNNING) @@ -1287,8 +1249,6 @@ static void test_enum_svc(void) todo_wine { - ok(drivercountactive == 0, "Active driver mismatch\n"); - ok(drivercountinactive == 0, "Inactive driver mismatch\n"); ok(servicecountactive == 0, "Active services mismatch\n"); ok(servicecountinactive == 0, "Inactive services mismatch\n"); } @@ -1561,39 +1521,6 @@ static void test_enum_svc(void) /* See if things add up */ - /* Get the number of active driver services */ - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_ACTIVE, - NULL, 0, &needed, &returned, NULL, NULL); - exservices = HeapAlloc(GetProcessHeap(), 0, needed); - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_ACTIVE, - (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); - HeapFree(GetProcessHeap(), 0, exservices); - - /* Store the number of active driver services */ - drivercountactive = returned; - - /* Get the number of inactive driver services */ - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_INACTIVE, - NULL, 0, &needed, &returned, NULL, NULL); - exservices = HeapAlloc(GetProcessHeap(), 0, needed); - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_INACTIVE, - (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); - HeapFree(GetProcessHeap(), 0, exservices); - - drivercountinactive = returned; - - /* Get the number of driver services */ - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_STATE_ALL, - NULL, 0, &needed, &returned, NULL, NULL); - exservices = HeapAlloc(GetProcessHeap(), 0, needed); - pEnumServicesStatusExA(scm_handle, 0, SERVICE_DRIVER, SERVICE_STATE_ALL, - (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); - HeapFree(GetProcessHeap(), 0, exservices); - - /* Check if total is the same as active and inactive driver services */ - ok(returned == (drivercountactive + drivercountinactive), - "Something wrong in the calculation\n"); - /* Get the number of active win32 services */ pEnumServicesStatusExA(scm_handle, 0, SERVICE_WIN32, SERVICE_ACTIVE, NULL, 0, &needed, &returned, NULL, NULL); @@ -1626,18 +1553,14 @@ static void test_enum_svc(void) ok(returned == (servicecountactive + servicecountinactive), "Something wrong in the calculation\n"); - /* Get the number of all services */ + /* Get all drivers and services */ pEnumServicesStatusExA(scm_handle, 0, SERVICE_WIN32 | SERVICE_DRIVER, SERVICE_STATE_ALL, NULL, 0, &needed, &returned, NULL, NULL); exservices = HeapAlloc(GetProcessHeap(), 0, needed); pEnumServicesStatusExA(scm_handle, 0, SERVICE_WIN32 | SERVICE_DRIVER, SERVICE_STATE_ALL, (BYTE*)exservices, needed, &needed, &returned, NULL, NULL); - /* Check if total is the same as all those single calls */ - ok(returned == (drivercountactive + drivercountinactive + servicecountactive + servicecountinactive), - "Something wrong in the calculation\n"); - - /* Loop through all those returned services */ + /* Loop through all those returned drivers and services */ for (i = 0; i < returned; i++) { SERVICE_STATUS_PROCESS status = exservices[i].ServiceStatusProcess; @@ -1653,11 +1576,6 @@ static void test_enum_svc(void) */ if (status.dwServiceType & (SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER)) { - if (status.dwCurrentState == SERVICE_RUNNING) - drivercountactive--; - else - drivercountinactive--; - /* We shouldn't have a process id for drivers */ ok(status.dwProcessId == 0, "This driver shouldn't have an associated process id\n"); @@ -1684,8 +1602,6 @@ static void test_enum_svc(void) } HeapFree(GetProcessHeap(), 0, exservices); - ok(drivercountactive == 0, "Active driver mismatch\n"); - ok(drivercountinactive == 0, "Inactive driver mismatch\n"); ok(servicecountactive == 0, "Active services mismatch\n"); ok(servicecountinactive == 0, "Inactive services mismatch\n");

1 0

Hongbo Ni : shell32: Convert traditional Chinese resource to utf8.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 435604c1fbc67e27a7b3b0ebee94e0171a87f3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435604c1fbc67e27a7b3b0ebe… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Aug 27 16:24:17 2008 +1000 shell32: Convert traditional Chinese resource to utf8. --- dlls/shell32/shell32_Zh.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index cb3839a..0b98d47 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -16,8 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -#pragma code_page(936) /* FIXME: default for CHINESE_TRADITIONAL is 950 */ /* shellview item menu @@ -65,10 +67,10 @@ END SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�P� %s" +CAPTION "關於 %s" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "�_��", IDOK, 153, 133, 60, 12, WS_TABSTOP + DEFPUSHBUTTON "確定", IDOK, 153, 133, 60, 12, WS_TABSTOP PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 @@ -95,13 +97,13 @@ FONT 8, "MS Shell Dlg" /* columns in the shellview */ STRINGTABLE BEGIN - IDS_SHV_COLUMN1 "�n��" - IDS_SHV_COLUMN2 "��С" - IDS_SHV_COLUMN3 "��" - IDS_SHV_COLUMN4 "��޸�" - IDS_SHV_COLUMN5 "��" - IDS_SHV_COLUMN6 "ʹ�ÿ��g" - IDS_SHV_COLUMN7 "ʣ�N��g" + IDS_SHV_COLUMN1 "檔案" + IDS_SHV_COLUMN2 "大小" + IDS_SHV_COLUMN3 "類型" + IDS_SHV_COLUMN4 "已修改" + IDS_SHV_COLUMN5 "屬性" + IDS_SHV_COLUMN6 "使用空間" + IDS_SHV_COLUMN7 "剩餘空間" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/

1 0