March 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/tab: Implement TCM_[G, S] ETEXTENDEDSTYLE and TCS_EX_FLATSEPARATORS style.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 92b0ad98e128a7281120c3cc92b38e2f11bf3645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b0ad98e128a7281120c3cc9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:00:04 2009 -0400 comctl32/tab: Implement TCM_[G,S]ETEXTENDEDSTYLE and TCS_EX_FLATSEPARATORS style. --- dlls/comctl32/tab.c | 49 +++++++++++++++++++++++++++++++++++++------- dlls/comctl32/tests/tab.c | 6 +--- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index b8f638d..3a0e477 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -40,7 +40,6 @@ * TCIF_RTLREADING * * Extended Styles: - * TCS_EX_FLATSEPARATORS * TCS_EX_REGISTERDROP * * States: @@ -54,8 +53,6 @@ * * Messages: * TCM_DESELECTALL - * TCM_GETEXTENDEDSTYLE - * TCM_SETEXTENDEDSTYLE * * Macros: * TabCtrl_AdjustRect @@ -126,6 +123,9 @@ typedef struct BOOL bUnicode; /* Unicode control? */ HWND hwndUpDown; /* Updown control used for scrolling */ INT cbInfo; /* Number of bytes of caller supplied info per tab */ + + DWORD exStyle; /* Extended style used, currently: + TCS_EX_FLATSEPARATORS, TCS_EX_REGISTERDROP */ } TAB_INFO; /****************************************************************************** @@ -1947,7 +1947,7 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) r = itemRect; /* Separators between flat buttons */ - if (lStyle & TCS_FLATBUTTONS) + if ((lStyle & TCS_FLATBUTTONS) && (infoPtr->exStyle & TCS_EX_FLATSEPARATORS)) { r1 = r; r1.right += (FLAT_BTN_SPACINGX -2); @@ -2978,6 +2978,8 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) dwStyle = GetWindowLongW(hwnd, GWL_STYLE); SetWindowLongW(hwnd, GWL_STYLE, dwStyle|WS_CLIPSIBLINGS); + infoPtr->exStyle = (dwStyle & TCS_FLATBUTTONS) ? TCS_EX_FLATSEPARATORS : 0; + if (dwStyle & TCS_TOOLTIPS) { /* Create tooltip control */ infoPtr->hwndToolTip = @@ -3129,6 +3131,39 @@ static LRESULT TAB_RemoveImage (TAB_INFO *infoPtr, INT image) return 0; } +static LRESULT +TAB_SetExtendedStyle (TAB_INFO *infoPtr, DWORD exMask, DWORD exStyle) +{ + DWORD prevstyle = infoPtr->exStyle; + + /* zero mask means all styles */ + if (exMask == 0) exMask = ~0; + + if (exMask & TCS_EX_REGISTERDROP) + { + FIXME("TCS_EX_REGISTERDROP style unimplemented\n"); + exMask &= ~TCS_EX_REGISTERDROP; + exStyle &= ~TCS_EX_REGISTERDROP; + } + + if (exMask & TCS_EX_FLATSEPARATORS) + { + if ((prevstyle ^ exStyle) & TCS_EX_FLATSEPARATORS) + { + infoPtr->exStyle ^= TCS_EX_FLATSEPARATORS; + TAB_InvalidateTabArea(infoPtr); + } + } + + return prevstyle; +} + +static inline LRESULT +TAB_GetExtendedStyle (TAB_INFO *infoPtr) +{ + return infoPtr->exStyle; +} + static LRESULT WINAPI TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -3226,12 +3261,10 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case TCM_GETEXTENDEDSTYLE: - FIXME("Unimplemented msg TCM_GETEXTENDEDSTYLE\n"); - return 0; + return TAB_GetExtendedStyle (infoPtr); case TCM_SETEXTENDEDSTYLE: - FIXME("Unimplemented msg TCM_SETEXTENDEDSTYLE\n"); - return 0; + return TAB_SetExtendedStyle (infoPtr, wParam, lParam); case WM_GETFONT: return TAB_GetFont (infoPtr); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index daef97f..d24d097 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -768,12 +768,10 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) /* Testing Flat Separators */ extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_FLATSEPARATORS); - expect(extendedStyle, prevExtendedStyle); + expect(extendedStyle, prevExtendedStyle); extendedStyle = SendMessage(hTab, TCM_GETEXTENDEDSTYLE, 0, 0); - todo_wine{ - expect(TCS_EX_FLATSEPARATORS, extendedStyle); - } + expect(TCS_EX_FLATSEPARATORS, extendedStyle); /* Testing Register Drop */ prevExtendedStyle = SendMessage(hTab, TCM_SETEXTENDEDSTYLE, 0, TCS_EX_REGISTERDROP);

1 0

Nikolay Sivov : comctl32/trackbar: Fix reverting to default value for TBM_SETPAGESIZE with lParam = -1.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: b7d7d589782d49c0285b278d0386162429a610be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d7d589782d49c0285b278d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:05:49 2009 -0400 comctl32/trackbar: Fix reverting to default value for TBM_SETPAGESIZE with lParam = -1. --- dlls/comctl32/tests/trackbar.c | 20 +++++++++++++++++--- dlls/comctl32/trackbar.c | 9 +++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index d57e28d..e2a3c76 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -588,12 +588,26 @@ static void test_page_size(HWND hWndTrackbar){ /* test TBM_GETPAGESIZE */ r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0,0); - todo_wine{ - expect(20, r); - } + expect(20, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, page_size_test_seq, "page size test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_empty_test_seq, "parent page size test sequence", FALSE); + + /* check for zero page size */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, 0); + expect(20, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(0, r); + /* revert to default */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(20, r); + /* < -1 */ + r = SendMessage(hWndTrackbar, TBM_SETPAGESIZE, 0, -2); + expect(20, r); + r = SendMessage(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + expect(-2, r); } static void test_position(HWND hWndTrackbar){ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 3424333..849ebcd 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -81,6 +81,8 @@ typedef struct #define TOOLTIP_OFFSET 2 /* distance from ctrl edge to tooltip */ +#define TB_DEFAULTPAGESIZE 20 + /* Used by TRACKBAR_Refresh to find out which parts of the control need to be recalculated */ @@ -1128,7 +1130,10 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - infoPtr->lPageSize = lPageSize; + if (lPageSize != -1) + infoPtr->lPageSize = lPageSize; + else + infoPtr->lPageSize = TB_DEFAULTPAGESIZE; return lTemp; } @@ -1405,7 +1410,7 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->lRangeMin = 0; infoPtr->lRangeMax = 100; infoPtr->lLineSize = 1; - infoPtr->lPageSize = 20; + infoPtr->lPageSize = TB_DEFAULTPAGESIZE; infoPtr->lSelMin = 0; infoPtr->lSelMax = 0; infoPtr->lPos = 0;

1 0

Nikolay Sivov : comctl32/ipaddress: Store current IP address text as a window text for IP Address control.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 85c03a5a3160814ac21d76b624c98f9b7a935e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c03a5a3160814ac21d76b62… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:08:02 2009 -0400 comctl32/ipaddress: Store current IP address text as a window text for IP Address control. --- dlls/comctl32/ipaddress.c | 26 +++++++++++ dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/ipaddress.c | 89 +++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 2 +- 4 files changed, 117 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 15d39f5..e5631a2 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -77,6 +77,29 @@ static const WCHAR IP_SUBCLASS_PROP[] = static LRESULT CALLBACK IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) +{ + static const WCHAR zero[2] = {'0', 0}; + static const WCHAR dot[2] = {'.', 0}; + WCHAR field[4]; + WCHAR ip[16]; + INT i; + + ip[0] = 0; + + for (i = 0; i < 4; i++) { + if (GetWindowTextW (infoPtr->Part[i].EditHwnd, field, 4)) + strcatW(ip, field); + else + /* empty edit treated as zero */ + strcatW(ip, zero); + if (i != 3) + strcatW(ip, dot); + } + + SetWindowTextW(infoPtr->Self, ip); +} + static LRESULT IPADDRESS_Notify (const IPADDRESS_INFO *infoPtr, UINT command) { HWND hwnd = infoPtr->Self; @@ -219,6 +242,8 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) EnableWindow(part->EditHwnd, infoPtr->Enabled); } + IPADDRESS_UpdateText (infoPtr); + return 0; } @@ -561,6 +586,7 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: switch(wParam >> 16) { case EN_CHANGE: + IPADDRESS_UpdateText(infoPtr); IPADDRESS_Notify(infoPtr, EN_CHANGE); break; case EN_KILLFOCUS: diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 45bd219..6fe2000 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -11,6 +11,7 @@ CTESTS = \ dpa.c \ header.c \ imagelist.c \ + ipaddress.c \ listview.c \ misc.c \ monthcal.c \ diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c new file mode 100644 index 0000000..32ecdc1 --- /dev/null +++ b/dlls/comctl32/tests/ipaddress.c @@ -0,0 +1,89 @@ +/* Unit test suite for IP Address control. + * + * Copyright 2009 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <windows.h> +#include <commctrl.h> +#include <assert.h> + +#include "wine/test.h" + +#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) + +static HWND create_ipaddress_control (void) +{ + HWND handle; + + handle = CreateWindowEx(0, WC_IPADDRESS, NULL, + WS_BORDER|WS_VISIBLE, 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + assert(handle); + + return handle; +} + +static void test_get_set_text(void) +{ + HWND hwnd; + CHAR ip[16]; + INT r; + + hwnd = create_ipaddress_control(); + + /* check text just after creation */ + r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR)); + expect(7, r); + ok(strcmp(ip, "0.0.0.0") == 0, "Expected null IP address, got %s\n", ip); + + SendMessage(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(127, 0, 0, 1)); + r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR)); + expect(9, r); + ok(strcmp(ip, "127.0.0.1") == 0, "Expected 127.0.0.1, got %s\n", ip); + + DestroyWindow(hwnd); +} + +static int init(void) +{ + HMODULE hComctl32; + BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + INITCOMMONCONTROLSEX iccex; + + hComctl32 = GetModuleHandleA("comctl32.dll"); + pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); + if (!pInitCommonControlsEx) + { + skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + return 0; + } + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_USEREX_CLASSES; + pInitCommonControlsEx(&iccex); + + return 1; +} + +START_TEST(ipaddress) +{ + if (!init()) + return; + + test_get_set_text(); +} diff --git a/include/commctrl.h b/include/commctrl.h index b055bee..bebdb27 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4459,7 +4459,7 @@ typedef struct tagNMIPADDRESS #define MAKEIPRANGE(low,high) \ ((LPARAM)(WORD)(((BYTE)(high)<<8)+(BYTE)(low))) #define MAKEIPADDRESS(b1,b2,b3,b4) \ - ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<16)+((DWORD)(b3)<<8)+((DWORD)(b4)))) + ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<<16)+((DWORD)(b3)<<8)+((DWORD)(b4)))) #define FIRST_IPADDRESS(x) (((x)>>24)&0xff) #define SECOND_IPADDRESS(x) (((x)>>16)&0xff)

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVM_GETSUBITEMRECT.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: bdd1206ca5ea4e73e73df3f876dd07c37f94f255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd1206ca5ea4e73e73df3f87… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 23 16:12:51 2009 -0400 comctl32/listview: Some tests for LVM_GETSUBITEMRECT. --- dlls/comctl32/tests/listview.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4562f2e..813d9bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1222,6 +1222,62 @@ static void test_multiselect(void) DestroyWindow(hwnd); } +static void test_subitem_rect(void) +{ + HWND hwnd; + DWORD r; + LVCOLUMN col; + RECT rect; + + /* test LVM_GETSUBITEMRECT for header */ + hwnd = create_listview_control(); + ok(hwnd != NULL, "failed to create a listview window\n"); + /* add some columns */ + memset(&col, 0, sizeof(LVCOLUMN)); + col.mask = LVCF_WIDTH; + col.cx = 100; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 0, (LPARAM)&col); + expect(0, r); + col.cx = 150; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 1, (LPARAM)&col); + expect(1, r); + col.cx = 200; + r = -1; + r = SendMessage(hwnd, LVM_INSERTCOLUMN, 2, (LPARAM)&col); + expect(2, r); + /* item = -1 means header, subitem index is 1 based */ + rect.left = LVIR_BOUNDS; + rect.top = 0; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + expect(0, r); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); +todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); + expect(100, rect.left); + expect(250, rect.right); + expect(3, rect.top); +} + rect.left = LVIR_BOUNDS; + rect.top = 2; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); +todo_wine{ + ok(r != 0, "Expected not-null LRESULT\n"); + expect(250, rect.left); + expect(450, rect.right); + expect(3, rect.top); +} + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1259,4 +1315,5 @@ START_TEST(listview) test_columns(); test_getorigin(); test_multiselect(); + test_subitem_rect(); }

1 0

Henri Verbeet : wined3d: Try to make Coverity shut up (CID 863, 905).
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 8ce2506aa84e4c7a5185226d023d7bd7a903dd91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce2506aa84e4c7a5185226d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:21 2009 +0100 wined3d: Try to make Coverity shut up (CID 863, 905). Comparing gl_shaders against NULL after potentially dereferencing it a few lines earlier probably confuses Coverity. Checking num_gl_shaders instead should avoid this. --- dlls/wined3d/pixelshader.c | 3 ++- dlls/wined3d/vertexshader.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 68dd801..6b4a30b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -530,7 +530,8 @@ GLuint find_gl_pshader(IWineD3DPixelShaderImpl *shader, const struct ps_compile_ TRACE("No matching GL shader found, compiling a new shader\n"); if(shader->shader_array_size == shader->num_gl_shaders) { - if(shader->gl_shaders) { + if (shader->num_gl_shaders) + { new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2); new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, new_size * sizeof(*shader->gl_shaders)); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e8d4b84..4888c2a 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -465,7 +465,8 @@ GLuint find_gl_vshader(IWineD3DVertexShaderImpl *shader, const struct vs_compile TRACE("No matching GL shader found, compiling a new shader\n"); if(shader->shader_array_size == shader->num_gl_shaders) { - if(shader->gl_shaders) { + if (shader->num_gl_shaders) + { new_size = shader->shader_array_size + max(1, shader->shader_array_size / 2); new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, new_size * sizeof(*shader->gl_shaders));

1 0

Henri Verbeet : d3d8: Properly handle unsetting the pixelshader in SetPixelShader().
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 3f559f26d64f251ed1fb4df92afd04c11aa7dd3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f559f26d64f251ed1fb4df92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:21 2009 +0100 d3d8: Properly handle unsetting the pixelshader in SetPixelShader(). --- dlls/d3d8/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 119d33d..be6bce7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2171,14 +2171,23 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 ifac EnterCriticalSection(&d3d8_cs); + if (!pShader) + { + hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, NULL); + LeaveCriticalSection(&d3d8_cs); + return hr; + } + shader = d3d8_get_object(&This->handle_table, pShader - (VS_HIGHESTFIXEDFXF + 1)); if (!shader) { WARN("Invalid handle (%#x) passed.\n", pShader); + LeaveCriticalSection(&d3d8_cs); + return D3DERR_INVALIDCALL; } TRACE("(%p) : Setting shader %p\n", This, shader); - hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); + hr = IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader->wineD3DPixelShader); LeaveCriticalSection(&d3d8_cs); return hr; }

1 0

Henri Verbeet : d3d8: Cleanup the pixelshader handling code a bit.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 4131135a9fa4d80c47c5a112ebf5d04f8aa90380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4131135a9fa4d80c47c5a112e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 10:09:22 2009 +0100 d3d8: Cleanup the pixelshader handling code a bit. This mostly just reduces the nesting to something more sane. --- dlls/d3d8/device.c | 81 +++++++++++++++++++++++++++++----------------------- 1 files changed, 45 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index be6bce7..c1031b4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2122,7 +2122,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pFunction, DWORD* ppShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DPixelShader8Impl *object; - HRESULT hrc = D3D_OK; + DWORD handle; + HRESULT hr; TRACE("(%p) : pFunction(%p), ppShader(%p)\n", This, pFunction, ppShader); @@ -2130,36 +2131,42 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 i TRACE("(%p) Invalid call\n", This); return D3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (NULL == object) { + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate memmory.\n"); return E_OUTOFMEMORY; - } else { - EnterCriticalSection(&d3d8_cs); + } - object->ref = 1; - object->lpVtbl = &Direct3DPixelShader8_Vtbl; - hrc = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, &object->wineD3DPixelShader , (IUnknown *)object); - if (D3D_OK != hrc) { - FIXME("(%p) call to IWineD3DDevice_CreatePixelShader failed\n", This); - HeapFree(GetProcessHeap(), 0 , object); - *ppShader = 0; - } else { - DWORD handle = d3d8_allocate_handle(&This->handle_table, object); - if (handle == D3D8_INVALID_HANDLE) - { - ERR("Failed to allocate shader handle\n"); - IDirect3DVertexShader8_Release((IUnknown *)object); - hrc = E_OUTOFMEMORY; - } else { - *ppShader = object->handle = handle + VS_HIGHESTFIXEDFXF + 1; - TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); - } - } + object->ref = 1; + object->lpVtbl = &Direct3DPixelShader8_Vtbl; + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, + &object->wineD3DPixelShader, (IUnknown *)object); + if (FAILED(hr)) + { LeaveCriticalSection(&d3d8_cs); + FIXME("(%p) call to IWineD3DDevice_CreatePixelShader failed\n", This); + HeapFree(GetProcessHeap(), 0 , object); + *ppShader = 0; + return hr; } - return hrc; + handle = d3d8_allocate_handle(&This->handle_table, object); + LeaveCriticalSection(&d3d8_cs); + if (handle == D3D8_INVALID_HANDLE) + { + ERR("Failed to allocate shader handle\n"); + IDirect3DVertexShader8_Release((IUnknown *)object); + return E_OUTOFMEMORY; + } + + *ppShader = object->handle = handle + VS_HIGHESTFIXEDFXF + 1; + TRACE("(%p) : returning %p (handle %#x)\n", This, object, *ppShader); + + return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { @@ -2223,6 +2230,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DPixelShader8Impl *shader; + IWineD3DPixelShader *cur = NULL; TRACE("(%p) : pShader %#x\n", This, pShader); @@ -2234,22 +2242,23 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i WARN("Invalid handle (%#x) passed.\n", pShader); LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; - } else { - IWineD3DPixelShader *cur = NULL; + } - IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur); - if(cur) { - if(cur == shader->wineD3DPixelShader) IDirect3DDevice8_SetPixelShader(iface, 0); - IWineD3DPixelShader_Release(cur); - } + IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur); - if (IUnknown_Release((IUnknown *)shader)) - { - ERR("Shader %p has references left, this shouldn't happen.\n", shader); - } + if (cur) + { + if (cur == shader->wineD3DPixelShader) IDirect3DDevice8_SetPixelShader(iface, 0); + IWineD3DPixelShader_Release(cur); } + LeaveCriticalSection(&d3d8_cs); + if (IUnknown_Release((IUnknown *)shader)) + { + ERR("Shader %p has references left, this shouldn't happen.\n", shader); + } + return D3D_OK; }

1 0

Ricardo Filipe : setupapi: Remove invalid check for < MAX_PATH and don' t copy to NULL PathBuffer (Coverity 888).
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 1999008b8932342377f023482be441b272cf5f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1999008b8932342377f023482… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Mon Mar 23 17:05:59 2009 +0000 setupapi: Remove invalid check for < MAX_PATH and don't copy to NULL PathBuffer (Coverity 888). --- dlls/setupapi/dialog.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 21135cd..948fa74 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -108,13 +108,12 @@ static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params) *params->PathRequiredSize = requiredSize; TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize); } - if(!params->PathBuffer && !params->PathBufferSize) + if(!params->PathBuffer) { EndDialog(hwnd, NO_ERROR); return; } - if(params->PathBuffer && (requiredSize > params->PathBufferSize - || params->PathBufferSize < MAX_PATH)) + if(requiredSize > params->PathBufferSize) { EndDialog(hwnd, DPROMPT_BUFFERTOOSMALL); return;

1 0

Kai Blin : quartz/tests: If CoCreateInstance() fails, it's safe to return, as no cleanup is needed.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 3fbf3f66db23664b94f3f5945528b2d99a159b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbf3f66db23664b94f3f5945… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 23 18:14:57 2009 +0100 quartz/tests: If CoCreateInstance() fails, it's safe to return, as no cleanup is needed. --- dlls/quartz/tests/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2e5fdc4..f6d61cd 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1539,7 +1539,7 @@ static void test_render_filter_priority(void) no preference given to exact match. */ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); - if (!pgraph2) goto out; + if (!pgraph2) return; hr = TestFilter_Create(&GUID_NULL, PinData1, (LPVOID)&ptestfilter); ok(hr == S_OK, "TestFilter_Create failed with %08x\n", hr);

1 0

Jacek Caban : urlmon: Code clean up.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 050c349678e69ad2369fbdf8d838c1bc2bc754de URL: http://source.winehq.org/git/wine.git/?a=commit;h=050c349678e69ad2369fbdf8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 23 18:30:11 2009 +0100 urlmon: Code clean up. --- dlls/urlmon/umon.c | 366 +++++++++++++++++++--------------------------------- 1 files changed, 131 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=050c349678e69ad2369fb…

1 0