December 2009 - Wine-Commits

Henri Verbeet : wined3d: Let "SetupForBlit()" figure out the target' s width and height on its own.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 9c0bf89ed09ef529ebd544efe7274513583b5825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0bf89ed09ef529ebd544efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 27 19:57:23 2009 +0100 wined3d: Let "SetupForBlit()" figure out the target's width and height on its own. --- dlls/wined3d/context.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a0d16c9..c3c90ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1624,16 +1624,16 @@ static inline void set_blit_dimension(UINT width, UINT height) { * Params: * This: Device to activate the context for * context: Context to setup - * width: render target width - * height: render target height * *****************************************************************************/ /* Context activation is done by the caller. */ -static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *context, UINT width, UINT height) +static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *context) { int i; const struct StateEntry *StateTable = This->StateTable; const struct wined3d_gl_info *gl_info = context->gl_info; + UINT width = ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Width; + UINT height = ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height; DWORD sampler; TRACE("Setting up context %p for blitting\n", context); @@ -2205,9 +2205,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI break; case CTXUSAGE_BLIT: - SetupForBlit(device, context, - ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Width, - ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height); + SetupForBlit(device, context); break; default:

1 0

Henri Verbeet : wined3d: Introduce "context_apply_state()" to setup a context for a specific usage.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 9295de9b841ad46a628f7e1d802f93b2ce4a73ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9295de9b841ad46a628f7e1d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 27 19:57:21 2009 +0100 wined3d: Introduce "context_apply_state()" to setup a context for a specific usage. --- dlls/wined3d/context.c | 148 ++++++++++++++++++++++++------------------------ 1 files changed, 75 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 30590af..797dd6b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2105,65 +2105,11 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) context->draw_buffer_dirty = TRUE; } -/***************************************************************************** - * context_acquire - * - * Finds a rendering context and drawable matching the device and render - * target for the current thread, activates them and puts them into the - * requested state. - * - * Params: - * This: Device to activate the context for - * target: Requested render target - * usage: Prepares the context for blitting, drawing or other actions - * - *****************************************************************************/ -struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurface *target, enum ContextUsage usage) +/* Context activation is done by the caller. */ +static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage) { - struct wined3d_context *current_context = context_get_current(); - DWORD tid = GetCurrentThreadId(); - DWORD i, dirtyState, idx; - BYTE shift; - const struct StateEntry *StateTable = This->StateTable; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - - context = FindContext(This, target, tid); - context_enter(context); - if (!context->valid) return context; - - gl_info = context->gl_info; - - /* Activate the opengl context */ - if (context != current_context) - { - if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); - else This->frag_pipe->enable_extension((IWineD3DDevice *)This, !context->last_was_blit); - - if (context->vshader_const_dirty) - { - memset(context->vshader_const_dirty, 1, - sizeof(*context->vshader_const_dirty) * This->d3d_vshader_constantF); - This->highest_dirty_vs_const = This->d3d_vshader_constantF; - } - if (context->pshader_const_dirty) - { - memset(context->pshader_const_dirty, 1, - sizeof(*context->pshader_const_dirty) * This->d3d_pshader_constantF); - This->highest_dirty_ps_const = This->d3d_pshader_constantF; - } - } - else if (context->restore_ctx) - { - if (!pwglMakeCurrent(context->hdc, context->glCtx)) - { - DWORD err = GetLastError(); - ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - context->hdc, context->glCtx, err); - } - } + const struct StateEntry *state_table = device->StateTable; + unsigned int i; switch (usage) { case CTXUSAGE_CLEAR: @@ -2186,7 +2132,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, target); + context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); LEAVE_GL(); } else { @@ -2215,7 +2161,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac case CTXUSAGE_CLEAR: if(context->last_was_blit) { - This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); + device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); } /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling @@ -2224,32 +2170,33 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac ENTER_GL(); glDisable(GL_BLEND); LEAVE_GL(); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_table); ENTER_GL(); glEnable(GL_SCISSOR_TEST); checkGLcall("glEnable GL_SCISSOR_TEST"); LEAVE_GL(); context->last_was_blit = FALSE; - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_table); + Context_MarkStateDirty(context, STATE_SCISSORRECT, state_table); break; case CTXUSAGE_DRAWPRIM: /* This needs all dirty states applied */ if(context->last_was_blit) { - This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); + device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); } - IWineD3DDeviceImpl_FindTexUnitMap(This); + IWineD3DDeviceImpl_FindTexUnitMap(device); ENTER_GL(); - for(i=0; i < context->numDirtyEntries; i++) { - dirtyState = context->dirtyArray[i]; - idx = dirtyState >> 5; - shift = dirtyState & 0x1f; + for (i = 0; i < context->numDirtyEntries; ++i) + { + DWORD rep = context->dirtyArray[i]; + DWORD idx = rep >> 5; + BYTE shift = rep & 0x1f; context->isStateDirty[idx] &= ~(1 << shift); - StateTable[dirtyState].apply(dirtyState, This->stateBlock, context); + state_table[rep].apply(rep, device->stateBlock, context); } LEAVE_GL(); context->numDirtyEntries = 0; /* This makes the whole list clean */ @@ -2257,14 +2204,69 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *This, IWineD3DSurfac break; case CTXUSAGE_BLIT: - SetupForBlit(This, context, - ((IWineD3DSurfaceImpl *)target)->currentDesc.Width, - ((IWineD3DSurfaceImpl *)target)->currentDesc.Height); + SetupForBlit(device, context, + ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Width, + ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height); break; default: FIXME("Unexpected context usage requested\n"); } +} + +/***************************************************************************** + * context_acquire + * + * Finds a rendering context and drawable matching the device and render + * target for the current thread, activates them and puts them into the + * requested state. + * + * Params: + * This: Device to activate the context for + * target: Requested render target + * usage: Prepares the context for blitting, drawing or other actions + * + *****************************************************************************/ +struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurface *target, enum ContextUsage usage) +{ + struct wined3d_context *current_context = context_get_current(); + struct wined3d_context *context; + + TRACE("device %p, target %p, usage %#x.\n", device, target, usage); + + context = FindContext(device, target, GetCurrentThreadId()); + context_enter(context); + if (!context->valid) return context; + + if (context != current_context) + { + if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); + else device->frag_pipe->enable_extension((IWineD3DDevice *)device, !context->last_was_blit); + + if (context->vshader_const_dirty) + { + memset(context->vshader_const_dirty, 1, + sizeof(*context->vshader_const_dirty) * device->d3d_vshader_constantF); + device->highest_dirty_vs_const = device->d3d_vshader_constantF; + } + if (context->pshader_const_dirty) + { + memset(context->pshader_const_dirty, 1, + sizeof(*context->pshader_const_dirty) * device->d3d_pshader_constantF); + device->highest_dirty_ps_const = device->d3d_pshader_constantF; + } + } + else if (context->restore_ctx) + { + if (!pwglMakeCurrent(context->hdc, context->glCtx)) + { + DWORD err = GetLastError(); + ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", + context->hdc, context->glCtx, err); + } + } + + context_apply_state(context, device, usage); return context; }

1 0

Michael Stefaniuc : comctl32/tests: Remove some superfluous casts around SendMessage().
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 92e4e633533d03b50bcb05e19a02ed4b376c683b URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e4e633533d03b50bcb05e19… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:50:38 2009 +0100 comctl32/tests: Remove some superfluous casts around SendMessage(). --- dlls/comctl32/tests/comboex.c | 8 ++++---- dlls/comctl32/tests/header.c | 18 +++++++++--------- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/treeview.c | 10 +++++----- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index d6bbce1..f9a42df 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -54,7 +54,7 @@ static LONG addItem(HWND cbex, int idx, LPTSTR text) { cbexItem.iItem = idx; cbexItem.pszText = text; cbexItem.cchTextMax = 0; - return (LONG)SendMessage(cbex, CBEM_INSERTITEM, 0,(LPARAM)&cbexItem); + return SendMessage(cbex, CBEM_INSERTITEM, 0, (LPARAM)&cbexItem); } static LONG setItem(HWND cbex, int idx, LPTSTR text) { @@ -64,11 +64,11 @@ static LONG setItem(HWND cbex, int idx, LPTSTR text) { cbexItem.iItem = idx; cbexItem.pszText = text; cbexItem.cchTextMax = 0; - return (LONG)SendMessage(cbex, CBEM_SETITEM, 0,(LPARAM)&cbexItem); + return SendMessage(cbex, CBEM_SETITEM, 0, (LPARAM)&cbexItem); } static LONG delItem(HWND cbex, int idx) { - return (LONG)SendMessage(cbex, CBEM_DELETEITEM, (LPARAM)idx, 0); + return SendMessage(cbex, CBEM_DELETEITEM, idx, 0); } static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEM *cbItem) { @@ -77,7 +77,7 @@ static LONG getItem(HWND cbex, int idx, COMBOBOXEXITEM *cbItem) { cbItem->pszText = textBuffer; cbItem->iItem = idx; cbItem->cchTextMax = 100; - return (LONG)SendMessage(cbex, CBEM_GETITEM, 0, (LPARAM)cbItem); + return SendMessage(cbex, CBEM_GETITEM, 0, (LPARAM)cbItem); } static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 102327a..d9b4a73 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -244,7 +244,7 @@ static LONG addItem(HWND hdex, int idx, LPSTR text) hdItem.cxy = 100; hdItem.pszText = text; hdItem.cchTextMax = 0; - return (LONG)SendMessage(hdex, HDM_INSERTITEMA, (WPARAM)idx, (LPARAM)&hdItem); + return SendMessage(hdex, HDM_INSERTITEMA, idx, (LPARAM)&hdItem); } static LONG setItem(HWND hdex, int idx, LPSTR text, BOOL fCheckNotifies) @@ -259,7 +259,7 @@ static LONG setItem(HWND hdex, int idx, LPSTR text, BOOL fCheckNotifies) expect_notify(HDN_ITEMCHANGINGA, FALSE, &hdexItem); expect_notify(HDN_ITEMCHANGEDA, FALSE, &hdexItem); } - ret = (LONG)SendMessage(hdex, HDM_SETITEMA, (WPARAM)idx, (LPARAM)&hdexItem); + ret = SendMessage(hdex, HDM_SETITEMA, idx, (LPARAM)&hdexItem); if (fCheckNotifies) ok(notifies_received(), "setItem(): not all expected notifies were received\n"); return ret; @@ -279,19 +279,19 @@ static LONG setItemUnicodeNotify(HWND hdex, int idx, LPSTR text, LPWSTR wText) expect_notify(HDN_ITEMCHANGINGW, TRUE, (HDITEMA*)&hdexNotify); expect_notify(HDN_ITEMCHANGEDW, TRUE, (HDITEMA*)&hdexNotify); - ret = (LONG)SendMessage(hdex, HDM_SETITEMA, (WPARAM)idx, (LPARAM)&hdexItem); + ret = SendMessage(hdex, HDM_SETITEMA, idx, (LPARAM)&hdexItem); ok(notifies_received(), "setItemUnicodeNotify(): not all expected notifies were received\n"); return ret; } static LONG delItem(HWND hdex, int idx) { - return (LONG)SendMessage(hdex, HDM_DELETEITEM, (WPARAM)idx, 0); + return SendMessage(hdex, HDM_DELETEITEM, idx, 0); } static LONG getItemCount(HWND hdex) { - return (LONG)SendMessage(hdex, HDM_GETITEMCOUNT, 0, 0); + return SendMessage(hdex, HDM_GETITEMCOUNT, 0, 0); } static LONG getItem(HWND hdex, int idx, LPSTR textBuffer) @@ -300,7 +300,7 @@ static LONG getItem(HWND hdex, int idx, LPSTR textBuffer) hdItem.mask = HDI_TEXT; hdItem.pszText = textBuffer; hdItem.cchTextMax = MAX_CHARS; - return (LONG)SendMessage(hdex, HDM_GETITEMA, (WPARAM)idx, (LPARAM)&hdItem); + return SendMessage(hdex, HDM_GETITEMA, idx, (LPARAM)&hdItem); } static void addReadDelItem(HWND hdex, HDITEMA *phdiCreate, int maskRead, HDITEMA *phdiRead) @@ -748,10 +748,10 @@ static void test_header_control (void) TEST_GET_ITEM(i, 4); TEST_GET_ITEMCOUNT(6); } - - SendMessageA(hWndHeader, HDM_SETUNICODEFORMAT, (WPARAM)TRUE, 0); + + SendMessageA(hWndHeader, HDM_SETUNICODEFORMAT, TRUE, 0); setItemUnicodeNotify(hWndHeader, 3, pszUniTestA, pszUniTestW); - SendMessageA(hWndHeader, WM_NOTIFYFORMAT, (WPARAM)hHeaderParentWnd, (LPARAM)NF_REQUERY); + SendMessageA(hWndHeader, WM_NOTIFYFORMAT, (WPARAM)hHeaderParentWnd, NF_REQUERY); setItem(hWndHeader, 3, str_items[4], TRUE); dont_expect_notify(HDN_GETDISPINFOA); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a21eb23..0122886 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1553,7 +1553,7 @@ static void test_icon_spacing(void) hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); - r = SendMessage(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwndparent, (LPARAM)NF_REQUERY); + r = SendMessage(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwndparent, NF_REQUERY); expect(NFR_ANSI, r); /* reset the icon spacing to defaults */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index a7aeddd..ea10b9f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -857,7 +857,7 @@ static void test_monthcal_firstDay(void) /* checking for the values that actually will be stored as */ /* current first day when we set a new value */ for (i = -5; i < 12; i++){ - res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, (LPARAM) i); + res = SendMessage(hwnd, MCM_SETFIRSTDAYOFWEEK, 0, i); expect(prev, res); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); prev = res; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index e2021d1..a75a064 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -87,7 +87,7 @@ static HWND build_toolbar(int nr, HWND hParent) int i; ok(hToolbar != NULL, "Toolbar creation problem\n"); - ok(SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); + ok(SendMessage(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); ok(SendMessage(hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); ok(SendMessage(hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c49dd80..74d4d0e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -520,12 +520,12 @@ static void test_get_set_bkcolor(void) ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); /* Test for black background */ - SendMessage( hTree, TVM_SETBKCOLOR, 0, (LPARAM)RGB(0,0,0) ); + SendMessage( hTree, TVM_SETBKCOLOR, 0, RGB(0,0,0) ); crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); ok(crColor == RGB(0,0,0), "Black background color reported as 0x%.8x\n", crColor); /* Test for white background */ - SendMessage( hTree, TVM_SETBKCOLOR, 0, (LPARAM)RGB(255,255,255) ); + SendMessage( hTree, TVM_SETBKCOLOR, 0, RGB(255,255,255) ); crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); ok(crColor == RGB(255,255,255), "White background color reported as 0x%.8x\n", crColor); @@ -718,12 +718,12 @@ static void test_get_set_textcolor(void) ok(crColor == -1, "Default text color reported as 0x%.8x\n", crColor); /* Test for black text */ - SendMessage( hTree, TVM_SETTEXTCOLOR, 0, (LPARAM)RGB(0,0,0) ); + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, RGB(0,0,0) ); crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); ok(crColor == RGB(0,0,0), "Black text color reported as 0x%.8x\n", crColor); /* Test for white text */ - SendMessage( hTree, TVM_SETTEXTCOLOR, 0, (LPARAM)RGB(255,255,255) ); + SendMessage( hTree, TVM_SETTEXTCOLOR, 0, RGB(255,255,255) ); crColor = (COLORREF)SendMessage( hTree, TVM_GETTEXTCOLOR, 0, 0 ); ok(crColor == RGB(255,255,255), "White text color reported as 0x%.8x\n", crColor); @@ -785,7 +785,7 @@ static void test_get_set_unicodeformat(void) ok(bNewSetting == 0, "ANSI setting did not work.\n"); /* Revert to original setting */ - SendMessage( hTree, TVM_SETUNICODEFORMAT, (LPARAM)bPreviousSetting, 0 ); + SendMessage( hTree, TVM_SETUNICODEFORMAT, bPreviousSetting, 0 ); ok_sequence(MsgSequences, TREEVIEW_SEQ_INDEX, test_get_set_unicodeformat_seq, "test get set unicode format", FALSE);

1 0

Michael Stefaniuc : comctl32: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 9dd502a332b45e0bde6afb9f6d404712e3ddd897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd502a332b45e0bde6afb9f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 23:51:33 2009 +0100 comctl32: Remove some explicit LPARAM/WPARAM casts. --- dlls/comctl32/comboex.c | 12 +++++------- dlls/comctl32/commctrl.c | 12 +++++------- dlls/comctl32/draglist.c | 2 +- dlls/comctl32/header.c | 5 ++--- dlls/comctl32/listview.c | 18 +++++++++--------- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/status.c | 2 +- dlls/comctl32/tab.c | 4 ++-- dlls/comctl32/theme_combo.c | 5 ++--- dlls/comctl32/toolbar.c | 6 +++--- dlls/comctl32/tooltips.c | 4 ++-- dlls/comctl32/treeview.c | 12 ++++++------ 12 files changed, 39 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dd502a332b45e0bde6af…

1 0

Nikolay Sivov : comctl32/updown: Fix formatting for hex mode.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: f897a91247d9ed7a240f0db6fa902cd0148210e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f897a91247d9ed7a240f0db6f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Dec 26 23:10:34 2009 +0300 comctl32/updown: Fix formatting for hex mode. --- dlls/comctl32/updown.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index e87df87..076e315 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -309,7 +309,9 @@ static BOOL UPDOWN_GetBuddyInt (UPDOWN_INFO *infoPtr) */ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) { - WCHAR fmt[3] = { '%', 'd', '\0' }; + static const WCHAR fmt_hex[] = { '0', 'x', '%', '0', '4', 'X', 0 }; + static const WCHAR fmt_dec_oct[] = { '%', 'd', '\0' }; + const WCHAR *fmt; WCHAR txt[20], txt_old[20] = { 0 }; int len; @@ -324,7 +326,7 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) } /* Regular window, so set caption to the number */ - if (infoPtr->Base == 16) fmt[1] = 'X'; + fmt = (infoPtr->Base == 16) ? fmt_hex : fmt_dec_oct; len = wsprintfW(txt, fmt, infoPtr->CurVal);

1 0

Henri Verbeet : wined3d: Recognize "VMware, Inc." as VENDOR_MESA.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: f30999f193e564b10b3826bd90e9096038d6239e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30999f193e564b10b3826bd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 27 19:57:20 2009 +0100 wined3d: Recognize "VMware, Inc." as VENDOR_MESA. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d0e6d3d..3ab1902 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1123,7 +1123,8 @@ static enum wined3d_pci_vendor wined3d_guess_vendor(const char *gl_vendor, const if (strstr(gl_vendor, "Mesa") || strstr(gl_vendor, "DRI R300 Project") - || strstr(gl_vendor, "Tungsten Graphics, Inc")) + || strstr(gl_vendor, "Tungsten Graphics, Inc") + || strstr(gl_vendor, "VMware, Inc.")) return VENDOR_MESA; FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning VENDOR_WINE.\n", debugstr_a(gl_vendor));

1 0

Michael Stefaniuc : user32: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 6f3b49446352c4f06adba16fee7125a171525470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3b49446352c4f06adba16fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 14:40:45 2009 +0100 user32: Remove some explicit LPARAM/WPARAM casts. --- dlls/user32/button.c | 2 +- dlls/user32/combo.c | 34 +++++++++++++++------------------- dlls/user32/edit.c | 8 ++++---- dlls/user32/mdi.c | 4 ++-- dlls/user32/message.c | 2 +- 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index cec92e0..916d0c2 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -742,7 +742,7 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc) lpOutputProc = BUTTON_DrawTextCallback; if (!(text = get_button_text( hwnd ))) return; lp = (LPARAM)text; - wp = (WPARAM)dtFlags; + wp = dtFlags; break; case BS_ICON: diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1dd4f37..86b5680 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -717,7 +717,7 @@ static void CBPaintText( if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ - size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)id, (LPARAM)pText); + size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); pText[size] = '\0'; /* just in case */ } else return; } @@ -730,7 +730,7 @@ static void CBPaintText( static const WCHAR empty_stringW[] = { 0 }; if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW ); if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } else /* paint text field ourselves */ { @@ -776,8 +776,7 @@ static void CBPaintText( dis.itemState = itemState; dis.hDC = hdc; dis.rcItem = rectEdit; - dis.itemData = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, - (WPARAM)id, 0 ); + dis.itemData = SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, id, 0); /* * Clip the DC and have the parent draw the item. @@ -975,16 +974,15 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) if( pText ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); - idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, - (WPARAM)(-1), (LPARAM)pText ); + idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); HeapFree( GetProcessHeap(), 0, pText ); } - SendMessageW(lphc->hWndLBox, LB_SETCURSEL, (WPARAM)(bSelect ? idx : -1), 0); + SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); /* probably superfluous but Windows sends this too */ - SendMessageW(lphc->hWndLBox, LB_SETCARETINDEX, (WPARAM)(idx < 0 ? 0 : idx), 0); - SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, (WPARAM)(idx < 0 ? 0 : idx), 0); + SendMessageW(lphc->hWndLBox, LB_SETCARETINDEX, idx < 0 ? 0 : idx, 0); + SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, idx < 0 ? 0 : idx, 0); return idx; } @@ -1004,13 +1002,12 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( index >= 0 ) /* got an entry */ { - length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, (WPARAM)index, 0); + length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) { - SendMessageW(lphc->hWndLBox, LB_GETTEXT, - (WPARAM)index, (LPARAM)pText ); + SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); } } } @@ -1023,7 +1020,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) } if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); HeapFree( GetProcessHeap(), 0, pText ); } @@ -1061,7 +1058,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) lphc->droppedIndex = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, - (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0 ); + lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex, 0); SendMessageW(lphc->hWndLBox, LB_CARETON, 0, 0); } @@ -1356,7 +1353,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) lphc->wState |= CBF_NOLBSELECT; CBUpdateEdit( lphc, index ); /* select text in edit, as Windows does */ - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } else { @@ -1655,8 +1652,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) } } else if ( CB_OWNERDRAWN(lphc) ) /* set listbox item height */ - lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT, - (WPARAM)index, (LPARAM)height ); + lRet = SendMessageW(lphc->hWndLBox, LB_SETITEMHEIGHT, index, height); return lRet; } @@ -1665,8 +1661,8 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ static LRESULT COMBO_SelectString( LPHEADCOMBO lphc, INT start, LPARAM pText, BOOL unicode ) { - INT index = unicode ? SendMessageW(lphc->hWndLBox, LB_SELECTSTRING, (WPARAM)start, pText) : - SendMessageA(lphc->hWndLBox, LB_SELECTSTRING, (WPARAM)start, pText); + INT index = unicode ? SendMessageW(lphc->hWndLBox, LB_SELECTSTRING, start, pText) : + SendMessageA(lphc->hWndLBox, LB_SELECTSTRING, start, pText); if( index >= 0 ) { if( lphc->wState & CBF_EDIT ) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 01ca5df..d7ab5b4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3195,14 +3195,14 @@ static BOOL EDIT_CheckCombo(EDITSTATE *es, UINT msg, INT key) nEUI = 2; } - SendMessageW(hLBox, WM_KEYDOWN, (WPARAM)key, 0); + SendMessageW(hLBox, WM_KEYDOWN, key, 0); break; case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */ if (nEUI) SendMessageW(hCombo, CB_SHOWDROPDOWN, bDropped ? FALSE : TRUE, 0); else - SendMessageW(hLBox, WM_KEYDOWN, (WPARAM)VK_F4, 0); + SendMessageW(hLBox, WM_KEYDOWN, VK_F4, 0); break; } @@ -3326,7 +3326,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw)); if (hwDefCtrl) { - SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, (LPARAM)TRUE); + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); } } @@ -3797,7 +3797,7 @@ static LRESULT EDIT_WM_SysKeyDown(EDITSTATE *es, INT key, DWORD key_data) if (EDIT_CheckCombo(es, WM_SYSKEYDOWN, key)) return 0; } - return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, (WPARAM)key, (LPARAM)key_data); + return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, key, key_data); } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 991ba37..b5e934a 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1583,7 +1583,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, case WM_SYSCHAR: if (wParam == '-') { - SendMessageW( hwnd, WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (DWORD)VK_SPACE); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, VK_SPACE); return 0; } break; @@ -1686,7 +1686,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) return 0; } TRACE("wParam = %04lx\n", wParam); - SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, (LPARAM)msg->wParam); + SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, msg->wParam); return 1; } } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d85eabb..022202a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1750,7 +1750,7 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* Handle VK_APPS key by posting a WM_CONTEXTMENU message */ if (msg->wParam == VK_APPS && !MENU_IsMenuActive()) - PostMessageW(msg->hwnd, WM_CONTEXTMENU, (WPARAM)msg->hwnd, (LPARAM)-1); + PostMessageW(msg->hwnd, WM_CONTEXTMENU, (WPARAM)msg->hwnd, -1); } }

1 0

Michael Stefaniuc : user32/tests: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 7e2b6248963ccb5cbaf4b6c7d5be70df975fbf12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2b6248963ccb5cbaf4b6c7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 14:40:19 2009 +0100 user32/tests: Remove some explicit LPARAM/WPARAM casts. --- dlls/user32/tests/edit.c | 40 ++++++++++++++++++++-------------------- dlls/user32/tests/listbox.c | 16 ++++++++-------- dlls/user32/tests/msg.c | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e2b6248963ccb5cbaf4b…

1 0

Michael Stefaniuc : winex11.drv: Remove some explicit LPARAM/WPARAM casts.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 425cc7e033a7e82c701441c1f43513c639c791d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425cc7e033a7e82c701441c1f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 27 14:40:57 2009 +0100 winex11.drv: Remove some explicit LPARAM/WPARAM casts. --- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/systray.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7735b56..706d378 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -790,7 +790,7 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa * data requested into the clipboard. */ TRACE("Sending WM_RENDERFORMAT message to hwnd(%p)\n", cbInfo.hWndOwner); - SendMessageW(cbInfo.hWndOwner, WM_RENDERFORMAT, (WPARAM)lpData->wFormatID, 0); + SendMessageW(cbInfo.hWndOwner, WM_RENDERFORMAT, lpData->wFormatID, 0); if (!lpData->hData) bret = FALSE; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5bd0255..e784844 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1601,7 +1601,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, return FALSE; } - if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, (WPARAM)fmt->fmt_id, 0)) { + if(!SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0)) { ERR("Couldn't set format of the window, returning failure\n"); return FALSE; } diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index ddeb223..bbe6b67 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -185,7 +185,7 @@ static LRESULT WINAPI tray_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp case WM_MBUTTONDBLCLK: /* notify the owner hwnd of the message */ TRACE("relaying 0x%x\n", msg); - ret = PostMessageW(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); + ret = PostMessageW(icon->owner, icon->callback_message, icon->id, msg); if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Henri Verbeet : wined3d: Properly check for glBlitFramebuffer().
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 7160e56ab100876c0039f29412aab45cbe7a34f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7160e56ab100876c0039f2941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 27 19:57:19 2009 +0100 wined3d: Properly check for glBlitFramebuffer(). ARB_framebuffer_object can also provide this entry point. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ad257f5..445fbbf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -110,7 +110,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co if(w == window.right && h == window.bottom) gl_filter = GL_NEAREST; else gl_filter = GL_LINEAR; - if(gl_info->supported[EXT_FRAMEBUFFER_BLIT]) + if (gl_info->fbo_ops.glBlitFramebuffer) { ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo);

1 0