September 2011 - Wine-Commits

Alexandre Julliard : winex11: Get rid of the xrender_info structure.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: ce63099a140f3dd30d7cabe098805e271b1b9f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce63099a140f3dd30d7cabe09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 13:21:45 2011 +0200 winex11: Get rid of the xrender_info structure. --- dlls/winex11.drv/x11drv.h | 3 - dlls/winex11.drv/xrender.c | 174 ++++++++++++++++++-------------------------- 2 files changed, 71 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce63099a140f3dd30d7ca…

1 0

Francois Gouget : winetest: Also log the current thread and default user UI languages.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 49a545685c5525fddf5414066e7ba5e563267dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a545685c5525fddf5414066… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 08:55:07 2011 +0200 winetest: Also log the current thread and default user UI languages. --- programs/winetest/main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4846344..3f6dd6b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -391,9 +391,21 @@ static void print_version (void) static void print_language(void) { + HMODULE hkernel32; + LANGID (WINAPI *pGetUserDefaultUILanguage)(void); + LANGID (WINAPI *pGetThreadUILanguage)(void); + xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); xprintf (" ThreadLocale=%x\n", GetThreadLocale()); + + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + if (pGetUserDefaultUILanguage) + xprintf (" UserDefaultUILanguage=%x\n", pGetUserDefaultUILanguage()); + if (pGetThreadUILanguage) + xprintf (" ThreadUILanguage=%x\n", pGetThreadUILanguage()); } static inline int is_dot_dir(const char* x)

1 0

Francois Gouget : shlwapi/tests: Fix test_StrFromTimeIntervalA() to print the badly formatted string in case of a failure.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 0ae12c4a3b5046ad697cae4d63000b8a9f4e52b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae12c4a3b5046ad697cae4d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 08:53:40 2011 +0200 shlwapi/tests: Fix test_StrFromTimeIntervalA() to print the badly formatted string in case of a failure. --- dlls/shlwapi/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 64e5b59..4b984ce 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -607,8 +607,8 @@ static void test_StrFromTimeIntervalA(void) { StrFromTimeIntervalA(szBuff, 256, result->ms, result->digits); - ok(!strcmp(result->time_interval, szBuff), "Formatted %d %d wrong\n", - result->ms, result->digits); + ok(!strcmp(result->time_interval, szBuff), "Formatted %d %d wrong: %s\n", + result->ms, result->digits, szBuff); result++; } }

1 0

Francois Gouget : shlwapi/tests: Some tests require that the user interface be in English.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 74459389a5e91566341568644933ee85dfd5d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74459389a5e91566341568644… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 09:36:43 2011 +0200 shlwapi/tests: Some tests require that the user interface be in English. With MUI versions of Windows checking for the default user language id or locale is insufficient. --- dlls/shlwapi/tests/string.c | 44 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 4b984ce..5522137 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -197,6 +197,39 @@ static const StrFromTimeIntervalResult StrFromTimeInterval_results[] = { { 0, 0, NULL } }; + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + +/* Returns true if the dates, numbers, etc. are formatted using English + * conventions. + */ +static BOOL is_locale_english(void) +{ + /* Surprisingly GetThreadLocale() is irrelevant here */ + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_StrChrA(void) { char string[129]; @@ -1405,15 +1438,18 @@ START_TEST(string) test_StrDupA(); /* language-dependent test */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH) - skip("English is required for StrFromTimeInterval and StrFormat*Size tests\n"); - else + if (is_lang_english() && is_locale_english()) { test_StrFormatByteSize64A(); test_StrFormatKBSizeA(); test_StrFormatKBSizeW(); - test_StrFromTimeIntervalA(); } + else + skip("An English UI and locale is required for the StrFormat*Size tests\n"); + if (is_lang_english()) + test_StrFromTimeIntervalA(); + else + skip("An English UI is required for the StrFromTimeInterval tests\n"); test_StrCmpA(); test_StrCmpW();

1 0

Stefan Dösinger : wined3d: Only the ARBfp fragement pipeline reads emulated clip coords.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: eb79a2649352bb8f815074e056eef92c65be1197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb79a2649352bb8f815074e05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 1 18:32:37 2011 +0200 wined3d: Only the ARBfp fragement pipeline reads emulated clip coords. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 43789c6..3cd99be 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4508,7 +4508,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, else { args->ps_signature = ~0; - if (!device->vs_clipping) + if (!device->vs_clipping && device->adapter->fragment_pipe == &arbfp_fragment_pipeline) { args->clip.boolclip.clip_texcoord = ffp_clip_emul(state) ? gl_info->limits.texture_stages : 0; }

1 0

Stefan Dösinger : wined3d: Disable range fog with per-pixel fog.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 9bcd58f312af374a3345dc72e66686fbc2b2bfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd58f312af374a3345dc72e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 10 23:05:33 2011 +0200 wined3d: Disable range fog with per-pixel fog. --- dlls/wined3d/state.c | 51 +++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31c62a4..8cf02ef 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -898,6 +898,7 @@ static void state_stencilwrite(struct wined3d_context *context, const struct win static void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); if (!state->render_states[WINED3DRS_FOGENABLE]) @@ -912,6 +913,13 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)"); context->fog_coord = FALSE; } + + /* Range fog is only used with per-vertex fog in d3d */ + if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); + } return; } @@ -926,13 +934,33 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT)"); context->fog_coord = TRUE; } - } else { + } + else + { /* Otherwise, use the fragment depth */ if(context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)"); context->fog_coord = FALSE; } + + if (state->render_states[WINED3DRS_RANGEFOGENABLE]) + { + if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); + } + else + { + WARN("Range fog enabled, but not supported by this GL implementation.\n"); + } + } + else if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); + } } } @@ -1137,24 +1165,6 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st } } -static void state_rangefog_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3DRS_RANGEFOGENABLE]) - WARN("Range fog enabled, but not supported by this GL implementation.\n"); -} - -static void state_rangefog(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3DRS_RANGEFOGENABLE]) - { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); - } else { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); - } -} - void state_fogcolor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { float col[4]; @@ -5376,8 +5386,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog_vertexpart}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, NV_FOG_DISTANCE }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { STATE_RENDER(WINED3DRS_CLIPPING), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_LIGHTING), { STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, WINED3D_GL_EXT_NONE },

1 0

Stefan Dösinger : ddraw/tests: Not all GPUs support dwZBufferBitDepth=24 on Windows.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: e28041c9a6935cc9dfe9dbf8d71159dbaf349895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28041c9a6935cc9dfe9dbf8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 19:50:16 2011 +0200 ddraw/tests: Not all GPUs support dwZBufferBitDepth=24 on Windows. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 6b23c70..12026d8 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3987,7 +3987,7 @@ static void zbufferbitdepth_test(void) } }, { - 24, ZFMT_SUPPORTED_ALWAYS, + 24, ZFMT_SUPPORTED_HWDEPENDENT, { sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, {24}, {0}, {0x00ffffff}, {0x00000000}, {0x00000000}

1 0

Francois Gouget : po: Remove English strings from the Portuguese (Brazil) translation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: d00a00e5205731206e0c2852c07917ee82b4ca07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00a00e5205731206e0c2852c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:54:23 2011 +0200 po: Remove English strings from the Portuguese (Brazil) translation. --- po/pt_BR.po | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index aa91fee..06ec4ff 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6440,7 +6440,7 @@ msgstr "Wine Internet Explorer" #: shdoclc.rc:30 msgid "&w&bPage &p" -msgstr "&w&bPage &p" +msgstr "" #: shell32.rc:27 shell32.rc:42 shell32.rc:119 shell32.rc:159 taskmgr.rc:65 #: taskmgr.rc:110 taskmgr.rc:252 @@ -8464,16 +8464,12 @@ msgid "" "PUSHD <directoryname> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> saves the current directory onto a\n" -"stack, and then changes the current directory to the supplied one.\n" #: cmd.rc:223 msgid "" "POPD changes current directory to the last one saved with\n" "PUSHD.\n" msgstr "" -"POPD changes current directory to the last one saved with\n" -"PUSHD.\n" #: cmd.rc:231 msgid "" @@ -8503,7 +8499,7 @@ msgstr "" #: cmd.rc:244 msgid "MORE displays output of files or piped input in pages.\n" -msgstr "MORE displays output of files or piped input in pages.\n" +msgstr "" #: cmd.rc:248 msgid "" @@ -9995,6 +9991,7 @@ msgstr "" "certas condições; execute 'start /L' para detalhes.\n" #: start.rc:64 +#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -11616,11 +11613,11 @@ msgstr "Uma página" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Francois Gouget : mshtml/tests: Improve the current UI language detection a bit.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 25100a8592856a59c972b9eef1e096622d9ba0dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=25100a8592856a59c972b9eef… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 11:01:01 2011 +0200 mshtml/tests: Improve the current UI language detection a bit. --- dlls/mshtml/tests/htmldoc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 03f2539..f7aef38 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -283,16 +283,23 @@ static BSTR a2bstr(const char *str) return ret; } -static BOOL is_english(void) +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) { static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; if (!hkernel32) { hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; if (pGetUserDefaultUILanguage) return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; @@ -1629,7 +1636,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, if(expect_InPlaceUIWindow_SetActiveObject_active) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - if(pActiveObject && is_english()) + if(pActiveObject && is_lang_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); } else { @@ -1649,7 +1656,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, if(pActiveObject) { CHECK_EXPECT2(SetActiveObject); - if(pActiveObject && is_english()) + if(pActiveObject && is_lang_english()) ok(!lstrcmpW(wszHTML_Document, pszObjName), "%s != \"HTML Document\"\n", wine_dbgstr_w(pszObjName)); }else { CHECK_EXPECT(SetActiveObject_null);

1 0

Nikolay Sivov : comctl32/monthcal: Properly compute maximum date for control.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: fec346b36dcf50c5e986d56ff5af686f3b609c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec346b36dcf50c5e986d56ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 14 22:59:13 2011 +0400 comctl32/monthcal: Properly compute maximum date for control. --- dlls/comctl32/monthcal.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 07a8783..5a6f326 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -521,15 +521,27 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) { /* the latest date is in latest calendar */ - SYSTEMTIME st, lt_month = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + SYSTEMTIME st, *lt_month = &infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + INT first_day; + + *date = *lt_month; + st = *lt_month; + + /* day of week of first day of current month */ + st.wDay = 1; + first_day = MONTHCAL_CalculateDayOfWeek(&st, FALSE); - *date = lt_month; MONTHCAL_GetNextMonth(date); + MONTHCAL_GetPrevMonth(&st); + + /* last calendar starts with some date from previous month that not displayed */ + st.wDay = MONTHCAL_MonthLength(st.wMonth, st.wYear) + + (infoPtr->firstDay - first_day) % 7 + 1; + if (st.wDay > MONTHCAL_MonthLength(st.wMonth, st.wYear)) st.wDay -= 7; - MONTHCAL_GetMinDate(infoPtr, &st); /* Use month length to get max day. 42 means max day count in calendar area */ date->wDay = 42 - (MONTHCAL_MonthLength(st.wMonth, st.wYear) - st.wDay + 1) - - MONTHCAL_MonthLength(lt_month.wMonth, lt_month.wYear); + MONTHCAL_MonthLength(lt_month->wMonth, lt_month->wYear); /* fix day of week */ MONTHCAL_CalculateDayOfWeek(date, TRUE);

1 0