October 2009 - Wine-commits

Alexandre Julliard : advapi32: Fix lookup of the current user SID in SetEntriesInAclW.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 104a0f5439c941c5a052de28c40fd6613cdf99c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104a0f5439c941c5a052de28c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 13:19:31 2009 +0200 advapi32: Fix lookup of the current user SID in SetEntriesInAclW. --- dlls/advapi32/security.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f89c12f..ba90ad0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3507,8 +3507,15 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; SID_NAME_USE use; - if ( strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER ) && - !LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) + if (!strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER )) + { + if (!lookup_user_account_name( ppsid[i], &sid_size, NULL, &domain_size, &use )) + { + ret = GetLastError(); + goto exit; + } + } + else if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) { WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i); ret = ERROR_INVALID_PARAMETER;

1 0

Julius Schwartzenberg : user32: Change extra value for standard edit class to 6.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 8e899e0076bb88c6b1f3439a8daf90f05fa728cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e899e0076bb88c6b1f3439a8… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Oct 11 15:27:44 2009 +0200 user32: Change extra value for standard edit class to 6. Civilization II crashes when trying to display an edit box when this value is anything other than six. It crashes in exactly the same way on Windows XP 64-bit. --- dlls/user32/edit.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 38622cc..190e9c6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5425,7 +5425,11 @@ const struct builtin_class_descr EDIT_builtin_class = CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ +#ifdef _WIN64 sizeof(EDITSTATE *), /* extra */ +#else + sizeof(EDITSTATE *) + sizeof(HANDLE16), /* extra */ +#endif IDC_IBEAM, /* cursor */ 0 /* brush */ };

1 0

Julius Schwartzenberg : user32/tests: Test extra value of standard dialog and edit classes.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 9f548bd9b85995a6edd5c1ba392abdeb7934d12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f548bd9b85995a6edd5c1ba3… Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sun Oct 11 15:32:15 2009 +0200 user32/tests: Test extra value of standard dialog and edit classes. --- dlls/user32/tests/class.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 0e7b0e4..7b42ce3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -831,10 +831,42 @@ static void CreateDialogParamTest(HINSTANCE hInstance) } } +static const struct +{ + const char name[9]; + int value; + int badvalue; +} extra_values[] = +{ + {"#32770",30,30}, /* Dialog */ +#ifdef _WIN64 + {"Edit",8,8}, +#else + {"Edit",6,8}, /* Windows XP 64-bit returns 8 also to 32-bit applications */ +#endif +}; + +static void test_extra_values(void) +{ + int i; + for(i=0; i< sizeof(extra_values)/sizeof(extra_values[0]); i++) + { + WNDCLASSEX wcx; + BOOL ret = GetClassInfoEx(NULL,extra_values[i].name,&wcx); + + ok( ret, "GetClassInfo (0) failed for global class %s\n", extra_values[i].name); + if (!ret) continue; + ok(extra_values[i].value == wcx.cbWndExtra || broken(extra_values[i].badvalue == wcx.cbWndExtra), + "expected %d, got %d\n", extra_values[i].value, wcx.cbWndExtra); + } +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); + test_extra_values(); + if (!GetModuleHandleW(0)) { trace("Class test is incompatible with Win9x implementation, skipping\n");

1 0

Nikolay Sivov : comctl32/listview: Don't query header if it isn't created.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: aaec03347d3ab19d8322742095f66e257647f4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaec03347d3ab19d832274209… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 00:29:00 2009 +0400 comctl32/listview: Don't query header if it isn't created. --- dlls/comctl32/listview.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3744e10..4ec8628 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10326,19 +10326,23 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) } else if (infoPtr->uView == LV_VIEW_DETAILS) { - HDLAYOUT hl; - WINDOWPOS wp; - - hl.prc = &infoPtr->rcList; - hl.pwpos = &wp; - SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); - TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); - SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, - wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) - ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); - TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); - - infoPtr->rcList.top = max(wp.cy, 0); + /* if control created invisible header isn't created */ + if (infoPtr->hwndHeader) + { + HDLAYOUT hl; + WINDOWPOS wp; + + hl.prc = &infoPtr->rcList; + hl.pwpos = &wp; + SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); + TRACE(" wp.flags=0x%08x, wp=%d,%d (%dx%d)\n", wp.flags, wp.x, wp.y, wp.cx, wp.cy); + SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, + wp.flags | ((infoPtr->dwStyle & LVS_NOCOLUMNHEADER) + ? SWP_HIDEWINDOW : SWP_SHOWWINDOW)); + TRACE(" after SWP wp=%d,%d (%dx%d)\n", wp.x, wp.y, wp.cx, wp.cy); + + infoPtr->rcList.top = max(wp.cy, 0); + } infoPtr->rcList.top += (infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) ? 2 : 0; }

1 0

Nikolay Sivov : comctl32/listview: Free column data on control destruction.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 7301ec8aa87ba08787045ca227325dfebfe1dfb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7301ec8aa87ba08787045ca22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 01:12:05 2009 +0400 comctl32/listview: Free column data on control destruction. --- dlls/comctl32/listview.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4ec8628..ea79b38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9634,6 +9634,8 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT */ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) { + INT i; + TRACE("()\n"); /* delete all items */ @@ -9644,6 +9646,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) DPA_Destroy(infoPtr->hdpaItemIds); DPA_Destroy(infoPtr->hdpaPosX); DPA_Destroy(infoPtr->hdpaPosY); + /* columns */ + for (i = 0; i < DPA_GetPtrCount(infoPtr->hdpaColumns); i++) + Free(DPA_GetPtr(infoPtr->hdpaColumns, i)); DPA_Destroy(infoPtr->hdpaColumns); ranges_destroy(infoPtr->selectionRanges);

1 0

Nikolay Sivov : comctl32/listview: Free ID array when removing all items.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: cd7cfd7451ba12da1b51a57caa8342ed589904c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7cfd7451ba12da1b51a57ca… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 02:25:04 2009 +0400 comctl32/listview: Free ID array when removing all items. --- dlls/comctl32/listview.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ea79b38..a97fc46 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5004,6 +5004,8 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) HDPA hdpaSubItems = NULL; BOOL bSuppress; ITEMHDR *hdrItem; + ITEM_INFO *lpItem; + ITEM_ID *lpID; INT i, j; TRACE("()\n"); @@ -5025,13 +5027,20 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) { if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { - /* send LVN_DELETEITEM notification, if not suppressed - and if it is not a virtual listview */ - if (!bSuppress) notify_deleteitem(infoPtr, i); - hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); + /* send LVN_DELETEITEM notification, if not suppressed + and if it is not a virtual listview */ + if (!bSuppress) notify_deleteitem(infoPtr, i); + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); + lpItem = DPA_GetPtr(hdpaSubItems, 0); + /* free id struct */ + j = DPA_GetPtrIndex(infoPtr->hdpaItemIds, lpItem->id); + lpID = DPA_GetPtr(infoPtr->hdpaItemIds, j); + DPA_DeletePtr(infoPtr->hdpaItemIds, j); + Free(lpID); + /* both item and subitem start with ITEMHDR header */ for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++) { - hdrItem = DPA_GetPtr(hdpaSubItems, j); + hdrItem = DPA_GetPtr(hdpaSubItems, j); if (is_textW(hdrItem->pszText)) Free(hdrItem->pszText); Free(hdrItem); }

1 0

Nikolay Sivov : comctl32: Fix imagelist leak when switching LVS_EX_CHECKBOXES style.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a061d3a0d4e5e81af6236225486e12b1779c1f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a061d3a0d4e5e81af62362254… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 22 04:56:47 2009 +0400 comctl32: Fix imagelist leak when switching LVS_EX_CHECKBOXES style. --- dlls/comctl32/listview.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a97fc46..952c589 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7932,10 +7932,18 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM LISTVIEW_SetItemState(infoPtr, -1, &item); himl = LISTVIEW_CreateCheckBoxIL(infoPtr); + if(!(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) + ImageList_Destroy(infoPtr->himlState); } - LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); + himl = LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl); + /* checkbox list replaces prevous custom list or... */ + if(((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && + !(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) || + /* ...previous was checkbox list */ + (dwOldExStyle & LVS_EX_CHECKBOXES)) + ImageList_Destroy(himl); } - + if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) { DWORD dwStyle; @@ -9664,12 +9672,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) /* destroy image lists */ if (!(infoPtr->dwStyle & LVS_SHAREIMAGELISTS)) { - if (infoPtr->himlNormal) - ImageList_Destroy(infoPtr->himlNormal); - if (infoPtr->himlSmall) - ImageList_Destroy(infoPtr->himlSmall); - if (infoPtr->himlState) - ImageList_Destroy(infoPtr->himlState); + ImageList_Destroy(infoPtr->himlNormal); + ImageList_Destroy(infoPtr->himlSmall); + ImageList_Destroy(infoPtr->himlState); } /* destroy font, bkgnd brush */

1 0

Henri Verbeet : wined3d: Get rid of GL_LIMITS.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 6be41fd59ac9e1ae6a0297ce780c5049ef1b5ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be41fd59ac9e1ae6a0297ce7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:54 2009 +0200 wined3d: Get rid of GL_LIMITS. --- dlls/wined3d/arb_program_shader.c | 42 +++++++------ dlls/wined3d/ati_fragment_shader.c | 12 +++- dlls/wined3d/context.c | 52 +++++++++------- dlls/wined3d/device.c | 45 +++++++++----- dlls/wined3d/directx.c | 23 ++++---- dlls/wined3d/drawprim.c | 10 ++- dlls/wined3d/glsl_shader.c | 56 ++++++++++------- dlls/wined3d/nvidia_texture_shader.c | 16 +++-- dlls/wined3d/state.c | 110 +++++++++++++++++++++------------ dlls/wined3d/stateblock.c | 26 +++++--- dlls/wined3d/surface.c | 5 +- dlls/wined3d/utils.c | 33 ++++------ dlls/wined3d/vertexshader.c | 17 +++-- dlls/wined3d/wined3d_private.h | 1 - 14 files changed, 266 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6be41fd59ac9e1ae6a029…

1 0

Henri Verbeet : wined3d: Free the blitter private data in arbfp_blit_free() (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 8d2512317ff64fcb1aa07f47d24ab3df3f458fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d2512317ff64fcb1aa07f47d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:55 2009 +0200 wined3d: Free the blitter private data in arbfp_blit_free() (Valgrind). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 565f2ef..855c368 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6154,6 +6154,9 @@ static void arbfp_blit_free(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_2d_shader)); checkGLcall("Delete yuv programs"); LEAVE_GL(); + + HeapFree(GetProcessHeap(), 0, device->blit_priv); + device->blit_priv = NULL; } static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum yuv_fixup yuv_fixup,

1 0

Henri Verbeet : wined3d: Free the context array in IWineGDISwapChainImpl_Destroy() (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a927573395d60790f7c42772d97f1c1933b80b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a927573395d60790f7c42772d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:56 2009 +0200 wined3d: Free the context array in IWineGDISwapChainImpl_Destroy() (Valgrind). --- dlls/wined3d/swapchain_gdi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index f4909bc..f795d89 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -70,6 +70,7 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) IWineD3DDevice_SetDisplayMode((IWineD3DDevice *) This->wineD3DDevice, 0, &mode); } + HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, This); }

1 0