wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Henri Verbeet : d3d8: Add tests for D3DSBT_PIXELSTATE stateblocks.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 1e5c3984393531a98c6296589a4eadbede7e22ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5c3984393531a98c6296589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:50 2009 +0200 d3d8: Add tests for D3DSBT_PIXELSTATE stateblocks. --- dlls/d3d8/tests/stateblock.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 5dbf0b0..423a1eb 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -121,6 +121,7 @@ struct state_test const void *test_data_in; const void *test_data_out_all; const void *test_data_out_vertex; + const void *test_data_out_pixel; /* Test resource management handlers */ HRESULT (*setup_handler)(struct state_test *test); @@ -157,6 +158,7 @@ enum stateblock_data SB_DATA_TEST_IN, SB_DATA_TEST_ALL, SB_DATA_TEST_VERTEX, + SB_DATA_TEST_PIXEL, }; struct event @@ -185,6 +187,9 @@ static const void *get_event_data(const struct state_test *test, enum stateblock case SB_DATA_TEST_VERTEX: return test->test_data_out_vertex; + case SB_DATA_TEST_PIXEL: + return test->test_data_out_pixel; + default: return NULL; } @@ -322,6 +327,16 @@ static int create_stateblock_vertex(IDirect3DDevice8 *device, struct event_data return EVENT_OK; } +static int create_stateblock_pixel(IDirect3DDevice8 *device, struct event_data *event_data) +{ + HRESULT hr; + + hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_PIXELSTATE, &event_data->stateblock); + ok(SUCCEEDED(hr), "CreateStateBlock returned %#x.\n", hr); + if (FAILED(hr)) return EVENT_ERROR; + return EVENT_OK; +} + static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { HRESULT hr; @@ -438,6 +453,20 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * {apply_stateblock, SB_DATA_TEST_VERTEX, SB_DATA_NONE}, }; + struct event create_stateblock_capture_apply_pixel_events[] = + { + {create_stateblock_pixel, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {capture_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE}, + }; + + struct event create_stateblock_apply_pixel_events[] = + { + {NULL, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {create_stateblock_pixel, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST_PIXEL, SB_DATA_NONE}, + }; + struct event rendertarget_switch_events[] = { {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, @@ -489,6 +518,12 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * trace("Running create stateblock apply vertex state tests\n"); execute_test_chain(device, test, ntests, create_stateblock_apply_vertex_events, 3, &arg); + trace("Running create stateblock capture/apply pixel state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_pixel_events, 3, &arg); + + trace("Running create stateblock apply pixel state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_apply_pixel_events, 3, &arg); + trace("Running rendertarget switch state tests\n"); execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg); @@ -589,10 +624,12 @@ static HRESULT shader_constant_setup_handler(struct state_test *test) if (test_arg->pshader) { test->test_data_out_vertex = &shader_constant_default_data; + test->test_data_out_pixel = &shader_constant_test_data; } else { test->test_data_out_vertex = &shader_constant_test_data; + test->test_data_out_pixel = &shader_constant_default_data; } test->default_data = &shader_constant_default_data; test->initial_data = &shader_constant_default_data; @@ -809,6 +846,7 @@ static HRESULT light_setup_handler(struct state_test *test) test->test_data_in = &light_test_data_in; test->test_data_out_all = &light_test_data_out; test->test_data_out_vertex = &light_test_data_out; + test->test_data_out_pixel = &light_default_data; test->default_data = &light_default_data; test->initial_data = &light_initial_data; @@ -1059,6 +1097,7 @@ static HRESULT transform_setup_handler(struct state_test *test) test->test_data_in = &transform_test_data; test->test_data_out_all = &transform_test_data; test->test_data_out_vertex = &transform_default_data; + test->test_data_out_pixel = &transform_default_data; test->default_data = &transform_default_data; test->initial_data = &transform_default_data; @@ -1173,6 +1212,7 @@ struct render_state_context struct render_state_data default_data_buffer; struct render_state_data test_data_all_buffer; struct render_state_data test_data_vertex_buffer; + struct render_state_data test_data_pixel_buffer; struct render_state_data poison_data_buffer; }; @@ -1416,6 +1456,45 @@ static HRESULT render_state_setup_handler(struct state_test *test) D3DRS_VERTEXBLEND, }; + static const DWORD states_pixel[] = + { + D3DRS_ALPHABLENDENABLE, + D3DRS_ALPHAFUNC, + D3DRS_ALPHAREF, + D3DRS_ALPHATESTENABLE, + D3DRS_BLENDOP, + D3DRS_COLORWRITEENABLE, + D3DRS_DESTBLEND, + D3DRS_DITHERENABLE, + D3DRS_FILLMODE, + D3DRS_FOGDENSITY, + D3DRS_FOGEND, + D3DRS_FOGSTART, + D3DRS_LASTPIXEL, + D3DRS_SHADEMODE, + D3DRS_SRCBLEND, + D3DRS_STENCILENABLE, + D3DRS_STENCILFAIL, + D3DRS_STENCILFUNC, + D3DRS_STENCILMASK, + D3DRS_STENCILPASS, + D3DRS_STENCILREF, + D3DRS_STENCILWRITEMASK, + D3DRS_STENCILZFAIL, + D3DRS_TEXTUREFACTOR, + D3DRS_WRAP0, + D3DRS_WRAP1, + D3DRS_WRAP2, + D3DRS_WRAP3, + D3DRS_WRAP4, + D3DRS_WRAP5, + D3DRS_WRAP6, + D3DRS_WRAP7, + D3DRS_ZENABLE, + D3DRS_ZFUNC, + D3DRS_ZWRITEENABLE, + }; + const struct render_state_arg *rsarg = test->test_arg; unsigned int i, j; @@ -1428,6 +1507,7 @@ static HRESULT render_state_setup_handler(struct state_test *test) test->test_data_in = &ctx->test_data_all_buffer; test->test_data_out_all = &ctx->test_data_all_buffer; test->test_data_out_vertex = &ctx->test_data_vertex_buffer; + test->test_data_out_pixel = &ctx->test_data_pixel_buffer; render_state_default_data_init(rsarg, &ctx->default_data_buffer); render_state_test_data_init(&ctx->test_data_all_buffer); @@ -1444,6 +1524,16 @@ static HRESULT render_state_setup_handler(struct state_test *test) break; } } + + ctx->test_data_pixel_buffer.states[i] = ctx->default_data_buffer.states[i]; + for (j = 0; j < sizeof(states_pixel) / sizeof(*states_pixel); ++j) + { + if (render_state_indices[i] == states_pixel[j]) + { + ctx->test_data_pixel_buffer.states[i] = ctx->test_data_all_buffer.states[i]; + break; + } + } } return D3D_OK;

1 0

Henri Verbeet : d3d9: Add tests for D3DSBT_VERTEXSTATE stateblocks.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 489264d49567e3216744098154afe25fc3787e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489264d49567e321674409815… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:49 2009 +0200 d3d9: Add tests for D3DSBT_VERTEXSTATE stateblocks. --- dlls/d3d9/tests/stateblock.c | 168 +++++++++++++++++++++++++++++++++++------- 1 files changed, 140 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=489264d49567e32167440…

1 0

Henri Verbeet : d3d8: Add tests for D3DSBT_VERTEXSTATE stateblocks.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: aa576b3d353069d4cdddeca094e84dd6df7348d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa576b3d353069d4cdddeca09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:48 2009 +0200 d3d8: Add tests for D3DSBT_VERTEXSTATE stateblocks. --- dlls/d3d8/tests/stateblock.c | 157 ++++++++++++++++++++++++++++++++++------- 1 files changed, 130 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa576b3d353069d4cddde…

1 0

Henri Verbeet : wined3d: Capture some more renderstates in vertex and pixel stateblocks.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 3dbfda1ab3122bf4a94361120290a9b88ea22d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbfda1ab3122bf4a94361120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:47 2009 +0200 wined3d: Capture some more renderstates in vertex and pixel stateblocks. --- dlls/wined3d/stateblock.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7d6f831..cd70605 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -34,17 +34,33 @@ static const DWORD pixel_states_render[] = WINED3DRS_ALPHAFUNC, WINED3DRS_ALPHAREF, WINED3DRS_ALPHATESTENABLE, + WINED3DRS_ANTIALIASEDLINEENABLE, + WINED3DRS_BLENDFACTOR, WINED3DRS_BLENDOP, + WINED3DRS_BLENDOPALPHA, + WINED3DRS_CCW_STENCILFAIL, + WINED3DRS_CCW_STENCILPASS, + WINED3DRS_CCW_STENCILZFAIL, WINED3DRS_COLORWRITEENABLE, + WINED3DRS_COLORWRITEENABLE1, + WINED3DRS_COLORWRITEENABLE2, + WINED3DRS_COLORWRITEENABLE3, + WINED3DRS_DEPTHBIAS, WINED3DRS_DESTBLEND, + WINED3DRS_DESTBLENDALPHA, WINED3DRS_DITHERENABLE, WINED3DRS_FILLMODE, WINED3DRS_FOGDENSITY, WINED3DRS_FOGEND, WINED3DRS_FOGSTART, WINED3DRS_LASTPIXEL, + WINED3DRS_SCISSORTESTENABLE, + WINED3DRS_SEPARATEALPHABLENDENABLE, WINED3DRS_SHADEMODE, + WINED3DRS_SLOPESCALEDEPTHBIAS, WINED3DRS_SRCBLEND, + WINED3DRS_SRCBLENDALPHA, + WINED3DRS_SRGBWRITEENABLE, WINED3DRS_STENCILENABLE, WINED3DRS_STENCILFAIL, WINED3DRS_STENCILFUNC, @@ -54,14 +70,23 @@ static const DWORD pixel_states_render[] = WINED3DRS_STENCILWRITEMASK, WINED3DRS_STENCILZFAIL, WINED3DRS_TEXTUREFACTOR, + WINED3DRS_TWOSIDEDSTENCILMODE, WINED3DRS_WRAP0, WINED3DRS_WRAP1, + WINED3DRS_WRAP10, + WINED3DRS_WRAP11, + WINED3DRS_WRAP12, + WINED3DRS_WRAP13, + WINED3DRS_WRAP14, + WINED3DRS_WRAP15, WINED3DRS_WRAP2, WINED3DRS_WRAP3, WINED3DRS_WRAP4, WINED3DRS_WRAP5, WINED3DRS_WRAP6, WINED3DRS_WRAP7, + WINED3DRS_WRAP8, + WINED3DRS_WRAP9, WINED3DRS_ZENABLE, WINED3DRS_ZFUNC, WINED3DRS_ZWRITEENABLE, @@ -106,14 +131,22 @@ static const DWORD pixel_states_sampler[] = static const DWORD vertex_states_render[] = { + WINED3DRS_ADAPTIVETESS_W, + WINED3DRS_ADAPTIVETESS_X, + WINED3DRS_ADAPTIVETESS_Y, + WINED3DRS_ADAPTIVETESS_Z, WINED3DRS_AMBIENT, WINED3DRS_AMBIENTMATERIALSOURCE, WINED3DRS_CLIPPING, WINED3DRS_CLIPPLANEENABLE, WINED3DRS_COLORVERTEX, + WINED3DRS_CULLMODE, WINED3DRS_DIFFUSEMATERIALSOURCE, WINED3DRS_EMISSIVEMATERIALSOURCE, + WINED3DRS_ENABLEADAPTIVETESSELLATION, + WINED3DRS_FOGCOLOR, WINED3DRS_FOGDENSITY, + WINED3DRS_FOGENABLE, WINED3DRS_FOGEND, WINED3DRS_FOGSTART, WINED3DRS_FOGTABLEMODE, @@ -121,8 +154,11 @@ static const DWORD vertex_states_render[] = WINED3DRS_INDEXEDVERTEXBLENDENABLE, WINED3DRS_LIGHTING, WINED3DRS_LOCALVIEWER, + WINED3DRS_MAXTESSELLATIONLEVEL, + WINED3DRS_MINTESSELLATIONLEVEL, WINED3DRS_MULTISAMPLEANTIALIAS, WINED3DRS_MULTISAMPLEMASK, + WINED3DRS_NORMALDEGREE, WINED3DRS_NORMALIZENORMALS, WINED3DRS_PATCHEDGESTYLE, WINED3DRS_POINTSCALE_A, @@ -133,12 +169,13 @@ static const DWORD vertex_states_render[] = WINED3DRS_POINTSIZE_MAX, WINED3DRS_POINTSIZE_MIN, WINED3DRS_POINTSPRITEENABLE, + WINED3DRS_POSITIONDEGREE, WINED3DRS_RANGEFOGENABLE, + WINED3DRS_SHADEMODE, + WINED3DRS_SPECULARENABLE, WINED3DRS_SPECULARMATERIALSOURCE, WINED3DRS_TWEENFACTOR, WINED3DRS_VERTEXBLEND, - WINED3DRS_CULLMODE, - WINED3DRS_FOGCOLOR, }; static const DWORD vertex_states_texture[] =

1 0

Henri Verbeet : wined3d: Clear resources that we aren' t recording in stateblock_init().
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 442beb1dcfc766077d9cadbaa940aa7db4449737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442beb1dcfc766077d9cadbaa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 9 09:58:46 2009 +0200 wined3d: Clear resources that we aren't recording in stateblock_init(). --- dlls/wined3d/stateblock.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8bbde2f..7d6f831 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1674,6 +1674,13 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { stateblock->streamSource[i] = NULL; } + + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + stateblock->textures[i] = NULL; + } + + stateblock->vertexDecl = NULL; stateblock->pIndexData = NULL; stateblock->vertexShader = NULL; } @@ -1700,8 +1707,14 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + stateblock->textures[i] = NULL; + } + if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); + stateblock->vertexDecl = NULL; stateblock->pIndexData = NULL; stateblock->pixelShader = NULL; }

1 0

Paul Vriens : setupapi/tests: Fix some test failures on Win98.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 61abc0a51d1185c86fd74f212bbdedb057b3d773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61abc0a51d1185c86fd74f212… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 9 09:00:30 2009 +0200 setupapi/tests: Fix some test failures on Win98. --- dlls/setupapi/tests/misc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f7ac6d1..a3abde4 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -197,7 +197,9 @@ static void test_SetupCopyOEMInf(void) /* try a relative SourceInfFileName */ SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); - ok(res == FALSE, "Expected FALSE, got %d\n", res); + ok(res == FALSE || + broken(res == TRUE), /* Win98 */ + "Expected FALSE, got %d\n", res); if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */) { /* FIXME: @@ -209,7 +211,8 @@ static void test_SetupCopyOEMInf(void) return; } - ok(GetLastError() == ERROR_FILE_NOT_FOUND, + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == ERROR_SUCCESS), /* Win98 */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); ok(file_exists(tmpfile), "Expected tmpfile to exist\n");

1 0

Paul Vriens : shell32/tests: Fix remaining failures on WinMe.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 856be7c9a71e3da91c0b6ea737ab5a2412dc3bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=856be7c9a71e3da91c0b6ea73… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 9 08:50:55 2009 +0200 shell32/tests: Fix remaining failures on WinMe. --- dlls/shell32/tests/shlfileop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 14fe7cf..cbd6025 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2073,9 +2073,10 @@ static void test_sh_path_prepare(void) WideCharToMultiByte(CP_ACP, 0, UNICODE_PATH, -1, UNICODE_PATH_A, sizeof(UNICODE_PATH_A), NULL, NULL); /* unicode directory doesn't exist, SHPPFW_NONE */ + RemoveDirectoryA(UNICODE_PATH_A); res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == %08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); - ok(!file_existsW(UNICODE_PATH), "unicode path was created but shouldn't be\n"); + ok(!file_exists(UNICODE_PATH_A), "unicode path was created but shouldn't be\n"); RemoveDirectoryA(UNICODE_PATH_A); /* unicode directory doesn't exist, SHPPFW_DIRCREATE */

1 0

Joel Holdsworth : comctl32/tests: Added tests for ImageList_DrawIndirect.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 84cb7031f4d702371805a946882ab07cc3024f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cb7031f4d702371805a9468… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Oct 8 23:28:49 2009 +0100 comctl32/tests: Added tests for ImageList_DrawIndirect. --- dlls/comctl32/tests/imagelist.c | 229 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 229 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84cb7031f4d702371805a…

1 0

Nikolay Sivov : comctl32/datetime: Draw field text horizontally centered.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: d083e7701b1fbefaf4a7e29f2fa7fab478d8356e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d083e7701b1fbefaf4a7e29f2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 01:49:10 2009 +0400 comctl32/datetime: Draw field text horizontally centered. --- dlls/comctl32/datetime.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9b4926c..0165166 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -712,12 +712,13 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) /* fill if focused */ HBRUSH hbr = CreateSolidBrush (comctl32_color.clrActiveCaption); - selection.right = field->right; - selection.left = selection.right - size.cx; + selection.left = 0; selection.top = 0; + selection.right = size.cx; selection.bottom = size.cy; /* center rectangle */ - OffsetRect(&selection, 0, (field->bottom - size.cy)/2); + OffsetRect(&selection, (field->right + field->left - size.cx)/2, + (field->bottom - size.cy)/2); FillRect(hdc, &selection, hbr); DeleteObject (hbr); @@ -727,7 +728,7 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) oldTextColor = SetTextColor (hdc, comctl32_color.clrWindowText); /* draw the date text using the colour set above */ - DrawTextW (hdc, txt, strlenW(txt), field, DT_RIGHT | DT_VCENTER | DT_SINGLELINE); + DrawTextW (hdc, txt, strlenW(txt), field, DT_CENTER | DT_VCENTER | DT_SINGLELINE); SetTextColor (hdc, oldTextColor); } SetBkMode (hdc, oldBkMode);

1 0

Nikolay Sivov : comctl32/datetime: Use locale data to compute field widths for day and month.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: f27e37a22f2b680b93f404d486a67a396ddb947a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27e37a22f2b680b93f404d48… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 01:19:33 2009 +0400 comctl32/datetime: Use locale data to compute field widths for day and month. --- dlls/comctl32/datetime.c | 74 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index b21eb0f..9b4926c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -543,7 +543,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) static void -DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *fieldWidthPtr) +DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *width) { /* fields are a fixed width, determined by the largest possible string */ /* presumably, these widths should be language dependent */ @@ -552,10 +552,6 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO static const WCHAR fld_d4W[] = { '2', '2', '2', '2', 0 }; static const WCHAR fld_am1[] = { 'A', 0 }; static const WCHAR fld_am2[] = { 'A', 'M', 0 }; - static const WCHAR fld_day[] = { 'W', 'e', 'd', 'n', 'e', 's', 'd', 'a', 'y', 0 }; - static const WCHAR fld_day3[] = { 'W', 'e', 'd', 0 }; - static const WCHAR fld_mon[] = { 'S', 'e', 'p', 't', 'e', 'm', 'b', 'e', 'r', 0 }; - static const WCHAR fld_mon3[] = { 'D', 'e', 'c', 0 }; int spec; WCHAR buffer[80]; LPCWSTR bufptr; @@ -602,18 +598,64 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO case FULLYEAR: bufptr = fld_d4W; break; - case THREECHARDAY: - bufptr = fld_day3; - break; - case FULLDAY: - bufptr = fld_day; - break; case THREECHARMONTH: - bufptr = fld_mon3; - break; case FULLMONTH: - bufptr = fld_mon; - break; + case THREECHARDAY: + case FULLDAY: + { + static const WCHAR fld_day[] = {'W','e','d','n','e','s','d','a','y',0}; + static const WCHAR fld_abbrday[] = {'W','e','d',0}; + static const WCHAR fld_mon[] = {'S','e','p','t','e','m','b','e','r',0}; + static const WCHAR fld_abbrmon[] = {'D','e','c',0}; + + const WCHAR *fall; + LCTYPE lctype; + INT i, max_count; + LONG cx; + + /* choose locale data type and fallback string */ + switch (spec) { + case THREECHARDAY: + fall = fld_abbrday; + lctype = LOCALE_SABBREVDAYNAME1; + max_count = 7; + break; + case FULLDAY: + fall = fld_day; + lctype = LOCALE_SDAYNAME1; + max_count = 7; + break; + case THREECHARMONTH: + fall = fld_abbrmon; + lctype = LOCALE_SABBREVMONTHNAME1; + max_count = 12; + break; + case FULLMONTH: + fall = fld_mon; + lctype = LOCALE_SMONTHNAME1; + max_count = 12; + break; + } + + cx = 0; + for (i = 0; i < max_count; i++) + { + if(GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype + i, + buffer, lstrlenW(buffer))) + { + GetTextExtentPoint32W(hdc, buffer, lstrlenW(buffer), &size); + if (size.cx > cx) cx = size.cx; + } + else /* locale independent fallback on failure */ + { + GetTextExtentPoint32W(hdc, fall, lstrlenW(fall), &size); + cx = size.cx; + break; + } + } + *width = cx; + return; + } case ONELETTERAMPM: bufptr = fld_am1; break; @@ -626,7 +668,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO } } GetTextExtentPoint32W (hdc, bufptr, strlenW(bufptr), &size); - *fieldWidthPtr = size.cx; + *width = size.cx; } static void

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 2009