October 2009 - Wine-Commits

Henri Verbeet : d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM /Clang).
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: f4005c371f5b9601ff04f8f5ff8651b60b618332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4005c371f5b9601ff04f8f5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:39 2009 +0200 d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM/Clang). --- dlls/d3d8/device.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7993fac..1dcf98b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -882,9 +882,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID HRESULT hr = WINED3D_OK; WINED3DFORMAT srcFormat, destFormat; - UINT srcWidth, destWidth; - UINT srcHeight, destHeight; - UINT srcSize; WINED3DSURFACE_DESC winedesc; TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", iface, @@ -896,14 +893,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID wined3d_mutex_lock(); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); srcFormat = winedesc.format; - srcWidth = winedesc.width; - srcHeight = winedesc.height; - srcSize = winedesc.size; IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc); destFormat = winedesc.format; - destWidth = winedesc.width; - destHeight = winedesc.height; /* Check that the source and destination formats match */ if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { @@ -913,7 +905,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID } else if (WINED3DFMT_UNKNOWN == destFormat) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); - destFormat = srcFormat; } /* Quick if complete copy ... */

1 0

Henri Verbeet : d3d9/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 023446f109e11c74cf49709145ac9f738c20b759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023446f109e11c74cf4970914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:42 2009 +0200 d3d9/tests: Check some more return values (LLVM/Clang). --- dlls/d3d9/tests/surface.c | 1 + dlls/d3d9/tests/texture.c | 1 + dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 79 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=023446f109e11c74cf497…

1 0

Henri Verbeet : wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/ Clang).
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 9dd78e13d5c06cd374f313e721e2fe8a47eea403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd78e13d5c06cd374f313e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:43 2009 +0200 wined3d: Printing a FIXME once only works if the relevant BOOL is static (LLVM/Clang). --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e7723ee..194cb9e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1549,7 +1549,8 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, str static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - BOOL warned = FALSE; + static BOOL warned; + /* TODO: NV_POINT_SPRITE */ if (!warned && stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { /* A FIXME, not a WARN because point sprites should be software emulated if not supported by HW */ @@ -1561,7 +1562,8 @@ static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - BOOL warned = FALSE; + static BOOL warned; + if(GL_LIMITS(point_sprite_units) < GL_LIMITS(textures) && !warned) { if(use_ps(stateblock) || stateblock->lowest_disabled_stage > GL_LIMITS(point_sprite_units)) { FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n");

1 0

Jeff Zaroyko : d3dxof: Remove unused variable.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 8846f8ac301ec43267035ced95d81aedc9ddb39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8846f8ac301ec43267035ced9… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Oct 16 20:36:48 2009 +1100 d3dxof: Remove unused variable. --- dlls/d3dxof/parsing.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4a0ecaa..dc7b473 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1020,7 +1020,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) DWORD token; int i; xtemplate* pt = buf->pxt[buf->level]; - DWORD last_dword = 0; for (i = 0; i < pt->nb_members; i++) { @@ -1092,7 +1091,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) if (token == TOKEN_INTEGER) { get_TOKEN(buf); - last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ if (!check_buffer(buf, 4))

1 0

Ken Thomases : winecoreaudio: Quiet a noisy FIXME.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: f639c4df54079272951cd916dc8e880dd28e8f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f639c4df54079272951cd916d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 15 19:19:20 2009 -0500 winecoreaudio: Quiet a noisy FIXME. --- dlls/winecoreaudio.drv/audiounit.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index f69b03d..bef882b 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -133,7 +133,9 @@ int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDesc int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); err = AudioUnitSetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); @@ -148,7 +150,9 @@ int AudioUnit_SetVolume(AudioUnit au, float left, float right) int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented\n"); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented\n"); err = AudioUnitGetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left); if (err != noErr)

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_hostname.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: fc3808e55351229d56ee1acdda82f5e6fdcca148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3808e55351229d56ee1acdd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:39 2009 -0500 mshtml: Implement IHTMLLocation::get_hostname. --- dlls/mshtml/htmllocation.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index badf111..e21ec76 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -274,12 +274,28 @@ static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index aaf8ecf..8cd7e1d 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -59,7 +59,7 @@ static const struct location_test http_test = { "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "", FALSE, "?search", FALSE, @@ -73,7 +73,7 @@ static const struct location_test http_file_test = { "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "file", FALSE, "?search", FALSE, @@ -87,7 +87,7 @@ static const struct location_test ftp_test = { "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "", FALSE, NULL, FALSE, @@ -101,7 +101,7 @@ static const struct location_test ftp_file_test = { "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "file", FALSE, NULL, FALSE, @@ -115,7 +115,7 @@ static const struct location_test file_test = { "file:///C:/windows/win.ini", FALSE, "file:", TRUE, NULL, TRUE, - NULL, FALSE, + NULL, TRUE, "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, @@ -219,7 +219,7 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_hostname(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->hostname_ok) ok(str_eq_wa(str, test->hostname),

1 0

Detlef Riekenberg : d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken().
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 7189c58f2f9a988c970760a097b3001ddcebcece URL: http://source.winehq.org/git/wine.git/?a=commit;h=7189c58f2f9a988c970760a09… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 15 21:14:18 2009 +0200 d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken(). --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a869e79..2a6a10e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1248,7 +1248,9 @@ static void test_lights(void) broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ "Enabling one light more than supported returned %08x\n", hr); hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled); - ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ + "GetLightEnable on light %u failed with %08x\n", i + 1, hr); ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled"); hr = IDirect3DDevice8_LightEnable(device, i + 1, FALSE); ok(hr == D3D_OK, "Disabling the additional returned %08x\n", hr);

1 0

Nikolay Sivov : include: Use unicode neutral SendMessage for DateTime and Monthcal macros.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: dd96319deee704d6d1922697d009000899cf5c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd96319deee704d6d1922697d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 20:58:16 2009 +0400 include: Use unicode neutral SendMessage for DateTime and Monthcal macros. --- include/commctrl.h | 64 ++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index f2ea3ae..b8ebe94 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4739,51 +4739,51 @@ typedef struct tagNMDAYSTATE /* macros */ #define MonthCal_GetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_SetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_GetMaxSelCount(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXSELCOUNT, 0, 0L) + (DWORD)SNDMSG(hmc, MCM_GETMAXSELCOUNT, 0, 0L) #define MonthCal_SetMaxSelCount(hmc, n) \ - (BOOL)SNDMSGA(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) + (BOOL)SNDMSG(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) #define MonthCal_GetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_SetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_GetMonthRange(hmc, gmr, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) #define MonthCal_SetDayState(hmc, cbds, rgds) \ - SNDMSGA(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) + SNDMSG(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) #define MonthCal_GetMinReqRect(hmc, prc) \ - SNDMSGA(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) + SNDMSG(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) #define MonthCal_SetColor(hmc, iColor, clr)\ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, clr) + SNDMSG(hmc, MCM_SETCOLOR, iColor, clr) #define MonthCal_GetColor(hmc, iColor) \ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, 0) + SNDMSG(hmc, MCM_SETCOLOR, iColor, 0) #define MonthCal_GetToday(hmc, pst)\ - (BOOL)SNDMSGA(hmc, MCM_GETTODAY, 0, (LPARAM)pst) + (BOOL)SNDMSG(hmc, MCM_GETTODAY, 0, (LPARAM)pst) #define MonthCal_SetToday(hmc, pst)\ - SNDMSGA(hmc, MCM_SETTODAY, 0, (LPARAM)pst) + SNDMSG(hmc, MCM_SETTODAY, 0, (LPARAM)pst) #define MonthCal_HitTest(hmc, pinfo) \ - SNDMSGA(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) + SNDMSG(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) #define MonthCal_SetFirstDayOfWeek(hmc, iDay) \ - SNDMSGA(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) + SNDMSG(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) #define MonthCal_GetFirstDayOfWeek(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) #define MonthCal_GetRange(hmc, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) #define MonthCal_SetRange(hmc, gd, rgst) \ - (BOOL)SNDMSGA(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define MonthCal_GetMonthDelta(hmc) \ - (int)SNDMSGA(hmc, MCM_GETMONTHDELTA, 0, 0) + (int)SNDMSG(hmc, MCM_GETMONTHDELTA, 0, 0) #define MonthCal_SetMonthDelta(hmc, n) \ - (int)SNDMSGA(hmc, MCM_SETMONTHDELTA, n, 0) + (int)SNDMSG(hmc, MCM_SETMONTHDELTA, n, 0) #define MonthCal_GetMaxTodayWidth(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) #define MonthCal_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) + (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), MCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) /************************************************************************** @@ -4943,28 +4943,28 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) #define DateTime_GetSystemtime(hdp, pst) \ - (DWORD)SNDMSGA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) + (DWORD)SNDMSG (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) #define DateTime_SetSystemtime(hdp, gd, pst) \ - (BOOL)SNDMSGA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) + (BOOL)SNDMSG (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) #define DateTime_GetRange(hdp, rgst) \ - (DWORD)SNDMSGA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) #define DateTime_SetRange(hdp, gd, rgst) \ - (BOOL)SNDMSGA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define DateTime_SetFormatA(hdp, sz) \ (BOOL)SNDMSGA (hdp, DTM_SETFORMATA, 0, (LPARAM)(sz)) #define DateTime_SetFormatW(hdp, sz) \ (BOOL)SNDMSGW (hdp, DTM_SETFORMATW, 0, (LPARAM)(sz)) #define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat) #define DateTime_GetMonthCalColor(hdp, iColor) \ - SNDMSGA (hdp, DTM_GETMCCOLOR, iColor, 0) + SNDMSG (hdp, DTM_GETMCCOLOR, iColor, 0) #define DateTime_SetMonthCalColor(hdp, iColor, clr) \ - SNDMSGA (hdp, DTM_SETMCCOLOR, iColor, clr) + SNDMSG (hdp, DTM_SETMCCOLOR, iColor, clr) #define DateTime_GetMonthCal(hdp) \ - (HWND) SNDMSGA (hdp, DTM_GETMONTHCAL, 0, 0) + (HWND) SNDMSG (hdp, DTM_GETMONTHCAL, 0, 0) #define DateTime_SetMonthCalFont(hdp, hfont, fRedraw) \ - SNDMSGA (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) + SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ - SNDMSGA (hdp, DTM_GETMCFONT, 0, 0) + SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Alexandre Julliard : server: Free client-side user handles at process exit.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 538b24747cdadf7e8e3082911868502b2fc433b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538b24747cdadf7e8e3082911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:56:04 2009 +0200 server: Free client-side user handles at process exit. --- server/process.c | 1 + server/user.c | 12 +++++++++++- server/user.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 31d3527..630abe6 100644 --- a/server/process.c +++ b/server/process.c @@ -645,6 +645,7 @@ static void process_killed( struct process *process ) free( dll ); } destroy_process_classes( process ); + free_process_user_handles( process ); remove_process_locks( process ); set_process_startup_state( process, STARTUP_ABORTED ); finish_process_tracing( process ); diff --git a/server/user.c b/server/user.c index 2515799..c529fc7 100644 --- a/server/user.c +++ b/server/user.c @@ -166,10 +166,20 @@ void *next_user_handle( user_handle_t *handle, enum user_object type ) return NULL; } +/* free client-side user handles managed by the process */ +void free_process_user_handles( struct process *process ) +{ + unsigned int i; + + for (i = 0; i < nb_handles; i++) + if (handles[i].type == USER_CLIENT && handles[i].ptr == process) + free_user_entry( &handles[i] ); +} + /* allocate an arbitrary user handle */ DECL_HANDLER(alloc_user_handle) { - reply->handle = alloc_user_handle( NULL, USER_CLIENT ); + reply->handle = alloc_user_handle( current->process, USER_CLIENT ); } diff --git a/server/user.h b/server/user.h index bf1e23c..e9ad116 100644 --- a/server/user.h +++ b/server/user.h @@ -72,6 +72,7 @@ extern void *get_user_object_handle( user_handle_t *handle, enum user_object typ extern user_handle_t get_user_full_handle( user_handle_t handle ); extern void *free_user_handle( user_handle_t handle ); extern void *next_user_handle( user_handle_t *handle, enum user_object type ); +extern void free_process_user_handles( struct process *process ); /* clipboard functions */

1 0

Nikolay Sivov : comctl32/monthcal: Get/set unicode format flag using MCM_[ GET|SET]UNICODEFORMAT.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: cbdc99cdbaec40b7639c0948c3e21d6e07d846e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc99cdbaec40b7639c0948c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 20:16:27 2009 +0400 comctl32/monthcal: Get/set unicode format flag using MCM_[GET|SET]UNICODEFORMAT. --- dlls/comctl32/monthcal.c | 23 +++++++++++++++++++++++ dlls/comctl32/tests/monthcal.c | 2 -- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ee7dc4e..1c06d23 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -100,6 +100,8 @@ typedef struct stored in SYSTEMTIME format */ BOOL firstDaySet; /* first week day differs from locale defined */ + BOOL isUnicode; /* value set with MCM_SETUNICODE format */ + int monthRange; MONTHDAYSTATE *monthdayState; SYSTEMTIME todaysDate; @@ -2412,6 +2414,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; infoPtr->curSel = infoPtr->todaysDate; + infoPtr->isUnicode = TRUE; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ @@ -2465,6 +2468,20 @@ MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) return 0; } +static inline BOOL +MONTHCAL_SetUnicodeFormat(MONTHCAL_INFO *infoPtr, BOOL isUnicode) +{ + BOOL prev = infoPtr->isUnicode; + infoPtr->isUnicode = isUnicode; + return prev; +} + +static inline BOOL +MONTHCAL_GetUnicodeFormat(const MONTHCAL_INFO *infoPtr) +{ + return infoPtr->isUnicode; +} + static LRESULT WINAPI MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -2540,6 +2557,12 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case MCM_GETMAXTODAYWIDTH: return MONTHCAL_GetMaxTodayWidth(infoPtr); + case MCM_SETUNICODEFORMAT: + return MONTHCAL_SetUnicodeFormat(infoPtr, (BOOL)wParam); + + case MCM_GETUNICODEFORMAT: + return MONTHCAL_GetUnicodeFormat(infoPtr); + case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 2e84af5..f59614c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -901,14 +901,12 @@ static void test_monthcal_unicode(void) /* current setting is 1, so, should return 1 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0); - todo_wine ok(1 == res || broken(0 == res), /* comctl32 <= 4.70 */ "Expected 1, got %d\n", res); /* setting to 0, should return previous settings */ res = SendMessage(hwnd, MCM_SETUNICODEFORMAT, 0, 0); - todo_wine ok(1 == res || broken(0 == res), /* comctl32 <= 4.70 */ "Expected 1, got %d\n", res);

1 0