September 2009 - Wine-commits

Nikolay Sivov : comctl32/updown: Fix some test failures on Win95 ( comctl32 4.0).
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 484ef1dcbf7dd2f5bb4cd55080eec80596853200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484ef1dcbf7dd2f5bb4cd5508… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 01:56:37 2009 +0400 comctl32/updown: Fix some test failures on Win95 (comctl32 4.0). --- dlls/comctl32/tests/updown.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 8797b9f..253e959 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -393,7 +393,15 @@ static void test_updown_pos32(void) /* Set the position to 0 to 1000 */ SendMessage(updown, UDM_SETRANGE32, 0 , 1000 ); + low = high = -1; r = SendMessage(updown, UDM_GETRANGE32, (WPARAM) &low , (LPARAM) &high ); + if (low == -1) + { + win_skip("UDM_SETRANGE32/UDM_GETRANGE32 not available\n"); + DestroyWindow(updown); + return; + } + expect(0,low); expect(1000,high); @@ -402,6 +410,7 @@ static void test_updown_pos32(void) if (!r) { win_skip("UDM_SETPOS32 and UDM_GETPOS32 need 5.80\n"); + DestroyWindow(updown); return; } expect(50,r); @@ -548,6 +557,12 @@ static void test_updown_unicode(void) r = SendMessage(updown, UDM_SETUNICODEFORMAT, 1 , 0); expect(0,r); r = SendMessage(updown, UDM_GETUNICODEFORMAT, 0 , 0); + if (!r) + { + win_skip("UDM_SETUNICODEFORMAT not available\n"); + DestroyWindow(updown); + return; + } expect(1,r); /* And now set it back to ANSI */

1 0

Nikolay Sivov : comctl32/monthcal: Fix locale dependent test failure.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c685729b72976c4155f8905ba05eb934d439e2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c685729b72976c4155f8905ba… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 14:14:37 2009 +0400 comctl32/monthcal: Fix locale dependent test failure. --- dlls/comctl32/tests/monthcal.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 5c5a8f8..268c25a 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -768,7 +768,7 @@ static void test_monthcal_currdate(void) static void test_monthcal_firstDay(void) { int res, fday, i, prev; - TCHAR b[128]; + CHAR b[128]; LCID lcid = LOCALE_USER_DEFAULT; HWND hwnd; @@ -778,7 +778,7 @@ static void test_monthcal_firstDay(void) /* Setter and Getters for first day of week */ /* check for locale first day */ - if(GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ + if(GetLocaleInfoA(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ fday = atoi(b); trace("fday: %d\n", fday); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); @@ -1267,6 +1267,9 @@ static void test_monthcal_monthrange(void) res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st); expect(1,res); + /* to be locale independent */ + SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM)6); + flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible);

1 0

Detlef Riekenberg : localspl: Unload only portmonitors in monitor_unloadall .
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 068e861d06de80ef264b6850926388d8f8222a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=068e861d06de80ef264b68509… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:17:02 2009 +0200 localspl: Unload only portmonitors in monitor_unloadall. --- dlls/localspl/provider.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 51bf2f9..7bfc32d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -346,7 +346,7 @@ static void monitor_unload(monitor_t * pm) /****************************************************************** * monitor_unloadall [internal] * - * release all printmonitors and unload them from memory, when needed + * release all registered printmonitors and unload them from memory, when needed * */ @@ -359,7 +359,8 @@ static void monitor_unloadall(void) /* iterate through the list, with safety against removal */ LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { - monitor_unload(pm); + /* skip monitorui dlls */ + if (pm->monitor) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); }

1 0

Detlef Riekenberg : localspl: Fix type of a WCHAR buffer.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 650f85174a5fd869fdb7a1bc4e2bd5456a49942c URL: http://source.winehq.org/git/wine.git/?a=commit;h=650f85174a5fd869fdb7a1bc4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:21:00 2009 +0200 localspl: Fix type of a WCHAR buffer. --- dlls/localspl/provider.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7bfc32d..2bf9414 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -568,7 +568,7 @@ static DWORD monitor_loadall(void) static monitor_t * monitor_loadui(monitor_t * pm) { monitor_t * pui = NULL; - LPWSTR buffer[MAX_PATH]; + WCHAR buffer[MAX_PATH]; HANDLE hXcv; DWORD len; DWORD res; @@ -591,8 +591,8 @@ static monitor_t * monitor_loadui(monitor_t * pm) TRACE("got %u with %p\n", res, hXcv); if (res) { res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); pm->monitor->pfnXcvClosePort(hXcv); } }

1 0

Henri Verbeet : wined3d: Add a separate function for state block initialization.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 664057ce6aac3ef22be1ce57d27acb8a7367bd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=664057ce6aac3ef22be1ce57d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:04 2009 +0200 wined3d: Add a separate function for state block initialization. --- dlls/wined3d/device.c | 268 ++--------------------------------- dlls/wined3d/stateblock.c | 304 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 6 +- 3 files changed, 313 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=664057ce6aac3ef22be1c…

1 0

Henri Verbeet : wined3d: Clear the correct "activeLights" array in stateblock_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 4ed126f5dcbdf99ba03c58e85023b44e8762e405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed126f5dcbdf99ba03c58e85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:05 2009 +0200 wined3d: Clear the correct "activeLights" array in stateblock_copy(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0cd3e43..5692205 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -202,7 +202,7 @@ static void stateblock_copy(IWineD3DStateBlock *destination, IWineD3DStateBlock Dest->scissorRect = This->scissorRect; /* Lights */ - memset(This->activeLights, 0, sizeof(This->activeLights)); + memset(Dest->activeLights, 0, sizeof(Dest->activeLights)); for(l = 0; l < LIGHTMAP_SIZE; l++) { struct list *e1, *e2; LIST_FOR_EACH_SAFE(e1, e2, &Dest->lightMap[l]) {

1 0

Henri Verbeet : wined3d: Pass IWineD3DStateBlockImpl pointers to stateblock_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 6d3e5a9cce5d57aea97963290c73e2cba511cc45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3e5a9cce5d57aea97963290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:06 2009 +0200 wined3d: Pass IWineD3DStateBlockImpl pointers to stateblock_copy(). --- dlls/wined3d/stateblock.c | 101 ++++++++++++++++++++++----------------------- 1 files changed, 49 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5692205..eaa3262 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -167,80 +167,77 @@ static void stateblock_savedstates_set(IWineD3DStateBlock *iface, SAVEDSTATES *s memset(states->vertexShaderConstantsF, value, bsize * GL_LIMITS(vshader_constantsF)); } -static void stateblock_copy(IWineD3DStateBlock *destination, IWineD3DStateBlock *source) +static void stateblock_copy(IWineD3DStateBlockImpl *dst, IWineD3DStateBlockImpl *src) { - int l; + const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; + unsigned int l; - IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)source; - IWineD3DStateBlockImpl *Dest = (IWineD3DStateBlockImpl *)destination; - - /* IUnknown fields */ - Dest->lpVtbl = This->lpVtbl; - Dest->ref = This->ref; - - /* IWineD3DStateBlock information */ - Dest->parent = This->parent; - Dest->wineD3DDevice = This->wineD3DDevice; - Dest->blockType = This->blockType; + dst->lpVtbl = src->lpVtbl; + dst->ref = src->ref; + dst->parent = src->parent; + dst->wineD3DDevice = src->wineD3DDevice; + dst->blockType = src->blockType; /* Saved states */ - stateblock_savedstates_copy(source, &Dest->changed, &This->changed); + stateblock_savedstates_copy((IWineD3DStateBlock *)src, &dst->changed, &src->changed); /* Single items */ - Dest->gl_primitive_type = This->gl_primitive_type; - Dest->vertexDecl = This->vertexDecl; - Dest->vertexShader = This->vertexShader; - Dest->streamIsUP = This->streamIsUP; - Dest->pIndexData = This->pIndexData; - Dest->IndexFmt = This->IndexFmt; - Dest->baseVertexIndex = This->baseVertexIndex; - /* Dest->lights = This->lights; */ - Dest->clip_status = This->clip_status; - Dest->viewport = This->viewport; - Dest->material = This->material; - Dest->pixelShader = This->pixelShader; - Dest->scissorRect = This->scissorRect; + dst->gl_primitive_type = src->gl_primitive_type; + dst->vertexDecl = src->vertexDecl; + dst->vertexShader = src->vertexShader; + dst->streamIsUP = src->streamIsUP; + dst->pIndexData = src->pIndexData; + dst->IndexFmt = src->IndexFmt; + dst->baseVertexIndex = src->baseVertexIndex; + dst->clip_status = src->clip_status; + dst->viewport = src->viewport; + dst->material = src->material; + dst->pixelShader = src->pixelShader; + dst->scissorRect = src->scissorRect; /* Lights */ - memset(Dest->activeLights, 0, sizeof(Dest->activeLights)); - for(l = 0; l < LIGHTMAP_SIZE; l++) { + memset(dst->activeLights, 0, sizeof(dst->activeLights)); + for (l = 0; l < LIGHTMAP_SIZE; ++l) + { struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &Dest->lightMap[l]) { + LIST_FOR_EACH_SAFE(e1, e2, &dst->lightMap[l]) + { PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry); list_remove(&light->entry); HeapFree(GetProcessHeap(), 0, light); } - LIST_FOR_EACH(e1, &This->lightMap[l]) { + LIST_FOR_EACH(e1, &src->lightMap[l]) + { PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); *light2 = *light; - list_add_tail(&Dest->lightMap[l], &light2->entry); - if(light2->glIndex != -1) Dest->activeLights[light2->glIndex] = light2; + list_add_tail(&dst->lightMap[l], &light2->entry); + if (light2->glIndex != -1) dst->activeLights[light2->glIndex] = light2; } } /* Fixed size arrays */ - memcpy(Dest->vertexShaderConstantB, This->vertexShaderConstantB, sizeof(Dest->vertexShaderConstantB)); - memcpy(Dest->vertexShaderConstantI, This->vertexShaderConstantI, sizeof(Dest->vertexShaderConstantI)); - memcpy(Dest->pixelShaderConstantB, This->pixelShaderConstantB, sizeof(Dest->pixelShaderConstantB)); - memcpy(Dest->pixelShaderConstantI, This->pixelShaderConstantI, sizeof(Dest->pixelShaderConstantI)); - - memcpy(Dest->streamStride, This->streamStride, sizeof(Dest->streamStride)); - memcpy(Dest->streamOffset, This->streamOffset, sizeof(Dest->streamOffset)); - memcpy(Dest->streamSource, This->streamSource, sizeof(Dest->streamSource)); - memcpy(Dest->streamFreq, This->streamFreq, sizeof(Dest->streamFreq)); - memcpy(Dest->streamFlags, This->streamFlags, sizeof(Dest->streamFlags)); - memcpy(Dest->transforms, This->transforms, sizeof(Dest->transforms)); - memcpy(Dest->clipplane, This->clipplane, sizeof(Dest->clipplane)); - memcpy(Dest->renderState, This->renderState, sizeof(Dest->renderState)); - memcpy(Dest->textures, This->textures, sizeof(Dest->textures)); - memcpy(Dest->textureState, This->textureState, sizeof(Dest->textureState)); - memcpy(Dest->samplerState, This->samplerState, sizeof(Dest->samplerState)); + memcpy(dst->vertexShaderConstantB, src->vertexShaderConstantB, sizeof(dst->vertexShaderConstantB)); + memcpy(dst->vertexShaderConstantI, src->vertexShaderConstantI, sizeof(dst->vertexShaderConstantI)); + memcpy(dst->pixelShaderConstantB, src->pixelShaderConstantB, sizeof(dst->pixelShaderConstantB)); + memcpy(dst->pixelShaderConstantI, src->pixelShaderConstantI, sizeof(dst->pixelShaderConstantI)); + + memcpy(dst->streamStride, src->streamStride, sizeof(dst->streamStride)); + memcpy(dst->streamOffset, src->streamOffset, sizeof(dst->streamOffset)); + memcpy(dst->streamSource, src->streamSource, sizeof(dst->streamSource)); + memcpy(dst->streamFreq, src->streamFreq, sizeof(dst->streamFreq)); + memcpy(dst->streamFlags, src->streamFlags, sizeof(dst->streamFlags)); + memcpy(dst->transforms, src->transforms, sizeof(dst->transforms)); + memcpy(dst->clipplane, src->clipplane, sizeof(dst->clipplane)); + memcpy(dst->renderState, src->renderState, sizeof(dst->renderState)); + memcpy(dst->textures, src->textures, sizeof(dst->textures)); + memcpy(dst->textureState, src->textureState, sizeof(dst->textureState)); + memcpy(dst->samplerState, src->samplerState, sizeof(dst->samplerState)); /* Dynamically sized arrays */ - memcpy(Dest->vertexShaderConstantF, This->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); - memcpy(Dest->pixelShaderConstantF, This->pixelShaderConstantF, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); + memcpy(dst->vertexShaderConstantF, src->vertexShaderConstantF, sizeof(float) * gl_info->max_vshader_constantsF * 4); + memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } /********************************************************** @@ -1383,7 +1380,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; /* Otherwise, might as well set the whole state block to the appropriate values */ - if (device->stateBlock) stateblock_copy((IWineD3DStateBlock *)stateblock, (IWineD3DStateBlock *)device->stateBlock); + if (device->stateBlock) stateblock_copy(stateblock, device->stateBlock); else memset(stateblock->streamFreq, 1, sizeof(stateblock->streamFreq)); /* Reset the ref and type after kludging it. */

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to stateblock_savedstates_copy().
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 49f712beff20371533a69a52594a6e8e59f90aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f712beff20371533a69a525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 29 11:09:07 2009 +0200 wined3d: Explicitly pass gl_info to stateblock_savedstates_copy(). --- dlls/wined3d/stateblock.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index eaa3262..bd868d7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -71,12 +71,10 @@ fail: return E_OUTOFMEMORY; } -/** Copy all members of one stateblock to another */ -static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES *dest, const SAVEDSTATES *source) +/* Copy all members of one stateblock to another */ +static void stateblock_savedstates_copy(SAVEDSTATES *dest, const SAVEDSTATES *source, + const struct wined3d_gl_info *gl_info) { - IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; - unsigned bsize = sizeof(BOOL); - /* Single values */ dest->primitive_type = source->primitive_type; dest->indices = source->indices; @@ -102,8 +100,10 @@ static void stateblock_savedstates_copy(IWineD3DStateBlock* iface, SAVEDSTATES * dest->vertexShaderConstantsI = source->vertexShaderConstantsI; /* Dynamically sized arrays */ - memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, bsize * GL_LIMITS(pshader_constantsF)); - memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, bsize * GL_LIMITS(vshader_constantsF)); + memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, + sizeof(BOOL) * gl_info->max_pshader_constantsF); + memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, + sizeof(BOOL) * gl_info->max_vshader_constantsF); } static inline void stateblock_set_bits(DWORD *map, UINT map_size) @@ -179,7 +179,7 @@ static void stateblock_copy(IWineD3DStateBlockImpl *dst, IWineD3DStateBlockImpl dst->blockType = src->blockType; /* Saved states */ - stateblock_savedstates_copy((IWineD3DStateBlock *)src, &dst->changed, &src->changed); + stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); /* Single items */ dst->gl_primitive_type = src->gl_primitive_type;

1 0

Nikolay Sivov : comctl32/monthcal: Right button should trigger a popup menu on release.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: bce1cebdd4fca0857e689dbe33538047b1c613c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce1cebdd4fca0857e689dbe3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:04:41 2009 +0400 comctl32/monthcal: Right button should trigger a popup menu on release. --- dlls/comctl32/monthcal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 603e3e8..e5f5b44 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1336,7 +1336,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) } static LRESULT -MONTHCAL_RButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) +MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { static const WCHAR todayW[] = { 'G','o',' ','t','o',' ','T','o','d','a','y',':',0 }; HMENU hMenu; @@ -2043,8 +2043,8 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_KILLFOCUS: return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); - case WM_RBUTTONDOWN: - return MONTHCAL_RButtonDown(infoPtr, lParam); + case WM_RBUTTONUP: + return MONTHCAL_RButtonUp(infoPtr, lParam); case WM_LBUTTONDOWN: return MONTHCAL_LButtonDown(infoPtr, lParam);

1 0

Nikolay Sivov : comctl32/monthcal: Months popup menu should be placed at current pointer position.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 30010f44d5684fa5f628c77bd5c688802e01a3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30010f44d5684fa5f628c77bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:13:56 2009 +0400 comctl32/monthcal: Months popup menu should be placed at current pointer position. --- dlls/comctl32/monthcal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e5f5b44..62c8dc8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1453,8 +1453,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+i, buf, countof(buf)); AppendMenuW(hMenu, MF_STRING|MF_ENABLED, i + 1, buf); } - menupoint.x = infoPtr->titlemonth.right; - menupoint.y = infoPtr->titlemonth.bottom; + menupoint.x = ht.pt.x; + menupoint.y = ht.pt.y; ClientToScreen(infoPtr->hwndSelf, &menupoint); i = TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); @@ -1464,6 +1464,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->curSel.wMonth = i; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } + return 0; } case MCHT_TITLEYEAR: {

1 0