August 2008 - Wine-Commits - list.winehq.org

Henri Verbeet : d3dx9: Improve a few TRACEs.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 978b0b4784a364f7cae592737ee5b86089ca23bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=978b0b4784a364f7cae592737… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 24 23:43:27 2008 +0200 d3dx9: Improve a few TRACEs. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 97109a2..48499ac 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -29,7 +29,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device) { D3DCAPS9 caps; - TRACE("(void): relay\n"); + TRACE("device %p\n", device); if (!device) return NULL; @@ -107,7 +107,7 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) { D3DCAPS9 caps; - TRACE("(void): relay\n"); + TRACE("device %p\n", device); if (!device) return NULL;

1 0

Henri Verbeet : wined3d: Move a TRACE up a few lines.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 6fbbcd19e7d37203b17ac010da781a6fdc60ce24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbbcd19e7d37203b17ac010d… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 24 23:43:26 2008 +0200 wined3d: Move a TRACE up a few lines. --- 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 6927052..6fe5374 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1446,11 +1446,12 @@ static HRESULT WINAPI IWineD3DImpl_RegisterSoftwareDevice(IWineD3D *iface, void static HMONITOR WINAPI IWineD3DImpl_GetAdapterMonitor(IWineD3D *iface, UINT Adapter) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + TRACE_(d3d_caps)("(%p)->(%d)\n", This, Adapter); + if (Adapter >= IWineD3DImpl_GetAdapterCount(iface)) { return NULL; } - TRACE_(d3d_caps)("(%p)->(%d)\n", This, Adapter); return MonitorFromPoint(Adapters[Adapter].monitorPoint, MONITOR_DEFAULTTOPRIMARY); }

1 0

Henri Verbeet : wined3d: glDeleteFramebuffersEXT() needs a context.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: e3507a725f9a039f460dea21071aab2649bd27ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3507a725f9a039f460dea210… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 24 23:43:02 2008 +0200 wined3d: glDeleteFramebuffersEXT() needs a context. --- dlls/wined3d/context.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a05434..a190b2b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -644,15 +644,16 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con *****************************************************************************/ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { - /* check that we are the current context first */ TRACE("Destroying ctx %p\n", context); - if(pwglGetCurrentContext() == context->glCtx){ - pwglMakeCurrent(NULL, NULL); - } else { + + /* The correct GL context needs to be active to cleanup the GL resources below */ + if(pwglGetCurrentContext() != context->glCtx){ + pwglMakeCurrent(context->hdc, context->glCtx); last_device = NULL; } - /* FIXME: We probably need an active context to do this... */ + ENTER_GL(); + if (context->fbo) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->fbo)); } @@ -663,9 +664,13 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->dst_fbo)); } + LEAVE_GL(); + HeapFree(GetProcessHeap(), 0, context->fbo_color_attachments); context->fbo_color_attachments = NULL; + /* Cleanup the GL context */ + pwglMakeCurrent(NULL, NULL); if(context->isPBuffer) { GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer));

1 0

Alexander Nicolaysen Sørnes : regedit: Fix memory leaks in favourites handling.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: ded5b05e4a1705e2297f7bf72c6c4329db8779f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded5b05e4a1705e2297f7bf72… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 24 22:10:08 2008 +0200 regedit: Fix memory leaks in favourites handling. --- programs/regedit/framewnd.c | 1 + programs/regedit/treeview.c | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 2ad428a..958b2c7 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -531,6 +531,7 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); SetWindowTextW(hwndValue, ItemPath); SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); + HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND: diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index e4d418d..98f6de4 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -208,7 +208,10 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName) { if (!lstrcmpiW(tvi.pszText, lpItemName)) { SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!lpKeyName) + { + HeapFree(GetProcessHeap(), 0, lpItemName); return hItem; + } hOldItem = hItem; hItem = TreeView_GetChild(hwndTV, hItem); break;

1 0

Alexander Nicolaysen Sørnes : regedit: Convert favourites handling to unicode.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 455ce06d4f4360c67f9621af1f3644b55b88b6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=455ce06d4f4360c67f9621af1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 23 00:44:29 2008 +0200 regedit: Convert favourites handling to unicode. --- programs/regedit/framewnd.c | 62 +++++++++++++++++++++--------------------- programs/regedit/main.h | 2 +- programs/regedit/treeview.c | 30 ++++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=455ce06d4f4360c67f962…

1 0

Alexander Nicolaysen Sørnes : regedit: Fix possible memory leaks.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 039df36b16bbd6e1fbf7d10ff37a66556c1dc114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039df36b16bbd6e1fbf7d10ff… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 23 00:24:36 2008 +0200 regedit: Fix possible memory leaks. --- programs/regedit/treeview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 4a7f4af..4556385 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -434,6 +434,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) } tvItem.cchTextMax = dwMaxSubKeyLen; if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { + HeapFree(GetProcessHeap(), 0, Name); return FALSE; } @@ -462,6 +463,8 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; if (!TreeView_GetItemW(hwndTV, &tvItem)) { + HeapFree(GetProcessHeap(), 0, Name); + HeapFree(GetProcessHeap(), 0, tvItem.pszText); return FALSE; }

1 0

Alexander Nicolaysen Sørnes : regedit: Remove unneeded character conversions.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 223c24bdbfa82936e8b07db8aa5ee73cd65cf8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=223c24bdbfa82936e8b07db8a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 23 00:22:27 2008 +0200 regedit: Remove unneeded character conversions. --- programs/regedit/treeview.c | 46 ++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index dcfb7fa..4a7f4af 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -234,9 +234,7 @@ BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem) /* Add an entry to the tree. Only give hKey for root nodes (HKEY_ constants) */ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HKEY hKey, DWORD dwChildren) { - TVINSERTSTRUCT tvins; - CHAR* labelA = GetMultiByteString(label); - HTREEITEM ret; + TVINSERTSTRUCTW tvins; if (hKey) { if (RegQueryInfoKeyW(hKey, 0, 0, 0, &dwChildren, 0, 0, 0, 0, 0, 0, 0) != ERROR_SUCCESS) { @@ -245,17 +243,16 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK } tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = labelA; - tvins.u.item.cchTextMax = lstrlen(labelA); + tvins.u.item.pszText = label; + tvins.u.item.cchTextMax = lstrlenW(label); tvins.u.item.iImage = Image_Closed; tvins.u.item.iSelectedImage = Image_Open; tvins.u.item.cChildren = dwChildren; tvins.u.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); tvins.hParent = hParent; - ret = TreeView_InsertItem(hwndTV, &tvins); - HeapFree(GetProcessHeap(), 0, labelA); - return ret; + + return TreeView_InsertItemW(hwndTV, &tvins); } static BOOL match_string(LPCTSTR sstring1, LPCTSTR sstring2, int mode) @@ -395,7 +392,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) LPWSTR KeyPath; DWORD dwCount, dwIndex, dwMaxSubKeyLen; LPWSTR Name; - TVITEM tvItem; + TVITEMW tvItem; hRoot = NULL; KeyPath = GetItemPathW(hwndTV, hItem, &hRoot); @@ -421,7 +418,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) tvItem.mask = TVIF_CHILDREN; tvItem.hItem = hItem; tvItem.cChildren = dwCount; - if (!TreeView_SetItem(hwndTV, &tvItem)) { + if (!TreeView_SetItemW(hwndTV, &tvItem)) { return FALSE; } @@ -436,7 +433,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) return FALSE; } tvItem.cchTextMax = dwMaxSubKeyLen; - if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(TCHAR)))) { + if (!(tvItem.pszText = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen * sizeof(WCHAR)))) { return FALSE; } @@ -444,7 +441,6 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; BOOL found; - CHAR* NameA; found = FALSE; if (RegEnumKeyExW(hKey, dwIndex, Name, &cName, 0, 0, 0, NULL) != ERROR_SUCCESS) { @@ -460,27 +456,23 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) RegCloseKey(hSubKey); } - NameA = GetMultiByteString(Name); - /* Check if the node is already in there. */ for (childItem = TreeView_GetChild(hwndTV, hItem); childItem; childItem = TreeView_GetNextSibling(hwndTV, childItem)) { tvItem.mask = TVIF_TEXT; tvItem.hItem = childItem; - if (!TreeView_GetItem(hwndTV, &tvItem)) { - HeapFree(GetProcessHeap(), 0, NameA); + if (!TreeView_GetItemW(hwndTV, &tvItem)) { return FALSE; } - if (!stricmp(tvItem.pszText, NameA)) { + if (!lstrcmpiW(tvItem.pszText, Name)) { found = TRUE; - HeapFree(GetProcessHeap(), 0, NameA); break; } } if (found == FALSE) { - WINE_TRACE("New subkey %s\n", NameA); + WINE_TRACE("New subkey %s\n", wine_dbgstr_w(Name)); AddEntryToTree(hwndTV, hItem, Name, NULL, dwSubCount); } } @@ -493,7 +485,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem) while (childItem) { HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - SendMessage(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); + SendMessageW(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem); } childItem = nextItem; } @@ -529,9 +521,9 @@ BOOL RefreshTreeView(HWND hwndTV) HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) { - TCHAR buf[MAX_NEW_KEY_LEN]; + WCHAR buf[MAX_NEW_KEY_LEN]; HTREEITEM hNewItem = 0; - TVITEMEX item; + TVITEMEXW item; if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return FALSE; @@ -540,22 +532,20 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name) } else { item.mask = TVIF_CHILDREN | TVIF_HANDLE; item.hItem = hItem; - if (!TreeView_GetItem(hwndTV, &item)) return FALSE; + if (!TreeView_GetItemW(hwndTV, &item)) return FALSE; item.cChildren = 1; - if (!TreeView_SetItem(hwndTV, &item)) return FALSE; + if (!TreeView_SetItemW(hwndTV, &item)) return FALSE; } SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem ); if (!hNewItem) { - char* nameA = GetMultiByteString(name); for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { item.mask = TVIF_HANDLE | TVIF_TEXT; item.hItem = hNewItem; item.pszText = buf; item.cchTextMax = COUNT_OF(buf); - if (!TreeView_GetItem(hwndTV, &item)) continue; - if (lstrcmp(nameA, item.pszText) == 0) break; + if (!TreeView_GetItemW(hwndTV, &item)) continue; + if (lstrcmpW(name, item.pszText) == 0) break; } - HeapFree(GetProcessHeap(), 0, nameA); } if (hNewItem) SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hNewItem);

1 0

Nikolay Sivov : gdiplus: Made Graphics calls check for busy state.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: f0a507e1fca5d51d180cc246bb11a3fecdfaf34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a507e1fca5d51d180cc246b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 24 14:45:23 2008 +0400 gdiplus: Made Graphics calls check for busy state. --- dlls/gdiplus/graphics.c | 176 ++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 144 +++++++++++++++++----------------- 2 files changed, 245 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a507e1fca5d51d180cc…

1 0

Nikolay Sivov : gdiplus: Basic GdipGetDC/GdipReleaseDC implementation.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 366ae1e6c60a3a5c110897666b8193584cacfbfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=366ae1e6c60a3a5c110897666… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 24 14:45:18 2008 +0400 gdiplus: Basic GdipGetDC/GdipReleaseDC implementation. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 20 ++++++++++++-------- dlls/gdiplus/tests/graphics.c | 12 ++++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5a18660..8df1c74 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -95,6 +95,7 @@ struct GpGraphics{ GpUnit unit; /* page unit */ REAL scale; /* page scale */ GpMatrix * worldtrans; /* world transform */ + BOOL busy; /* hdc handle obtained by GdipGetDC */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b852103..7bc0f03 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -752,6 +752,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; + (*graphics)->busy = FALSE; return Ok; } @@ -2679,26 +2680,29 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { - FIXME("(%p, %p): stub\n", graphics, hdc); - if(!graphics || !hdc) return InvalidParameter; - *hdc = NULL; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + *hdc = graphics->hdc; + graphics->busy = TRUE; + + return Ok; } GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) { - FIXME("(%p, %p): stub\n", graphics, hdc); - if(!graphics) return InvalidParameter; - if(graphics->hdc != hdc) + if(graphics->hdc != hdc || !(graphics->busy)) return InvalidParameter; - return NotImplemented; + graphics->busy = FALSE; + + return Ok; } GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f70caf5..b933f34 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -545,13 +545,17 @@ static void test_Get_Release_DC(void) status = GdipReleaseDC(NULL, (HDC)0xdeadbeef); expect(InvalidParameter, status); + /* Release without Get */ + status = GdipReleaseDC(graphics, hdc); + expect(InvalidParameter, status); + retdc = NULL; status = GdipGetDC(graphics, &retdc); - todo_wine expect(Ok, status); - todo_wine ok(retdc == hdc, "Invalid HDC returned\n"); + expect(Ok, status); + ok(retdc == hdc, "Invalid HDC returned\n"); /* call it once more */ status = GdipGetDC(graphics, &retdc); - todo_wine expect(ObjectBusy, status); + expect(ObjectBusy, status); /* try all Graphics calls here */ status = Ok; @@ -712,7 +716,7 @@ static void test_Get_Release_DC(void) todo_wine expect(ObjectBusy, status); status = Ok; status = GdipReleaseDC(graphics, retdc); - todo_wine expect(Ok, status); + expect(Ok, status); GdipDeletePen(pen); GdipDeleteGraphics(graphics);

1 0

Nikolay Sivov : gdiplus: Added a test for GdipGetDC/ GdipReleaseDC behaviour + fixes to be able to run it.
by Alexandre Julliard Aug. 25, 2008

Aug. 25, 2008

Module: wine Branch: master Commit: 4570501155d745bb424511c7564232b63044233c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4570501155d745bb424511c75… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Aug 24 14:45:14 2008 +0400 gdiplus: Added a test for GdipGetDC/GdipReleaseDC behaviour + fixes to be able to run it. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 11 ++- dlls/gdiplus/tests/graphics.c | 264 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 6 + 4 files changed, 282 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4570501155d745bb42451…

1 0