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

Rico Schüller : inetmib1: Fix wrong arguments.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: c62529a7ae5e8cf679f788f9343fa558bbd2de94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62529a7ae5e8cf679f788f93… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 5 13:33:00 2008 +0200 inetmib1: Fix wrong arguments. --- dlls/inetmib1/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index d19f048..3b39174 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -730,7 +730,7 @@ static void mib2IpRouteInit(void) MIB_IPFORWARDTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); if (table) { - if (!GetIpForwardTable(ipRouteTable, &size, TRUE)) ipRouteTable = table; + if (!GetIpForwardTable(table, &size, TRUE)) ipRouteTable = table; else HeapFree(GetProcessHeap(), 0, table ); } } @@ -813,7 +813,7 @@ static void mib2IpNetInit(void) MIB_IPNETTABLE *table = HeapAlloc(GetProcessHeap(), 0, size); if (table) { - if (!GetIpNetTable(ipNetTable, &size, FALSE)) ipNetTable = table; + if (!GetIpNetTable(table, &size, FALSE)) ipNetTable = table; else HeapFree(GetProcessHeap(), 0, table ); } }

1 0

Kirill K. Smirnov : winhlp32: Fix parsing system header of win3.0 help file .
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 737785635268f21fab3eab8af0d0e10f9c3faddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=737785635268f21fab3eab8af… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Aug 4 03:50:52 2008 +0400 winhlp32: Fix parsing system header of win3.0 help file. --- programs/winhlp32/hlpfile.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 2e3db2c..870bac7 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1886,6 +1886,17 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) hlpfile->flags = flags; hlpfile->charset = DEFAULT_CHARSET; + if (hlpfile->version <= 16) + { + char *str = (char*)buf + 0x15; + + hlpfile->lpszTitle = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + if (!hlpfile->lpszTitle) return FALSE; + lstrcpy(hlpfile->lpszTitle, str); + WINE_TRACE("Title: %s\n", hlpfile->lpszTitle); + /* Nothing more to parse */ + return TRUE; + } for (ptr = buf + 0x15; ptr + 4 <= end; ptr += GET_USHORT(ptr, 2) + 4) { char *str = (char*) ptr + 4;

1 0

Dylan Smith : richedit: Joined paragraph format depends on number of characters deleted.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 4e56a3cda93d7332d37779ac1d390f487e025a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e56a3cda93d7332d37779ac1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 4 19:19:01 2008 -0400 richedit: Joined paragraph format depends on number of characters deleted. --- dlls/riched20/caret.c | 6 +++++- dlls/riched20/editor.h | 3 ++- dlls/riched20/para.c | 12 ++++++++---- dlls/riched20/undo.c | 12 +++++++----- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3f89398..89cd132 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -267,6 +267,7 @@ void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, { ME_Cursor c; int shift = 0; + int totalChars = nChars; while(nChars > 0) { @@ -275,12 +276,15 @@ void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, run = &c.pRun->member.run; if (run->nFlags & MERF_ENDPARA) { int eollen = run->nCR + run->nLF; + BOOL keepFirstParaFormat; if (!ME_FindItemFwd(c.pRun, diParagraph)) { return; } - ME_JoinParagraphs(editor, ME_GetParagraph(c.pRun)); + keepFirstParaFormat = (totalChars == nChars && nChars <= eollen && + run->nCharOfs); + ME_JoinParagraphs(editor, ME_GetParagraph(c.pRun), keepFirstParaFormat); /* ME_SkipAndPropagateCharOffset(p->pRun, shift); */ ME_CheckCharOffsets(editor); nChars -= (eollen < nChars) ? eollen : nChars; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 51f7e53..a32811c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -218,7 +218,8 @@ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); void ME_GetSelectionParas(ME_TextEditor *editor, ME_DisplayItem **para, ME_DisplayItem **para_end); void ME_MakeFirstParagraph(ME_TextEditor *editor); ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *rp, ME_Style *style, int numCR, int numLF); -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp); +ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, + BOOL keepFirstParaFormat); void ME_DumpParaStyle(ME_Paragraph *s); void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]); void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 4ac234d..5289fdd 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -167,7 +167,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME /* join tp with tp->member.para.next_para, keeping tp's style; this * is consistent with the original */ -ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp) +ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, + BOOL keepFirstParaFormat) { ME_DisplayItem *pNext, *pFirstRunInNext, *pRun, *pTmp; int i, shift; @@ -195,14 +196,17 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp) ME_InitCharFormat2W(&fmt); ME_SetCharFormat(editor, pNext->member.para.nCharOfs - end_len, end_len, &fmt); } - undo = ME_AddUndoItem(editor, diUndoSplitParagraph, NULL); + undo = ME_AddUndoItem(editor, diUndoSplitParagraph, pNext); if (undo) { undo->nStart = pNext->member.para.nCharOfs - end_len; undo->nCR = pRun->member.run.nCR; undo->nLF = pRun->member.run.nLF; - assert(pNext->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - *undo->di.member.para.pFmt = *pNext->member.para.pFmt; + } + if (!keepFirstParaFormat) + { + ME_AddUndoItem(editor, diUndoSetParagraphFormat, tp); + *tp->member.para.pFmt = *pNext->member.para.pFmt; } shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index eaf1791..9fcdc4b 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -89,10 +89,9 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp case diUndoJoinParagraphs: break; case diUndoSplitParagraph: + assert(pdi->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); pItem->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - pItem->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); - pItem->member.para.pFmt->dwMask = 0; - + *pItem->member.para.pFmt = *pdi->member.para.pFmt; break; default: assert(0 == "AddUndoItem, unsupported item type"); @@ -282,8 +281,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) case diUndoSetParagraphFormat: { ME_Cursor tmp; + ME_DisplayItem *para; ME_CursorFromCharOfs(editor, pItem->member.para.nCharOfs, &tmp); - ME_SetParaFormat(editor, ME_FindItemBack(tmp.pRun, diParagraph), pItem->member.para.pFmt); + para = ME_FindItemBack(tmp.pRun, diParagraph); + ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); + *para->member.para.pFmt = *pItem->member.para.pFmt; break; } case diUndoSetCharFormat: @@ -306,7 +308,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) ME_Cursor tmp; ME_CursorFromCharOfs(editor, pUItem->nStart, &tmp); /* the only thing that's needed is paragraph offset, so no need to split runs */ - ME_JoinParagraphs(editor, ME_GetParagraph(tmp.pRun)); + ME_JoinParagraphs(editor, ME_GetParagraph(tmp.pRun), TRUE); break; } case diUndoSplitParagraph:

1 0

Vladimir Pankratov : winecfg: Update Russian translation.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2a4429bfa33124a824281c544413b7f877f6f8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4429bfa33124a824281c544… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Aug 4 15:45:39 2008 +0500 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 1d78053..692b5ee 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -204,7 +204,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE

1 0

Roy Shea : mstask: Task stub with AddRef, QueryInterface, and Release.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 777c2f1d4649d9e5f1a3b78737cdc6a72590d26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=777c2f1d4649d9e5f1a3b7873… Author: Roy Shea <royshea(a)gmail.com> Date: Mon Aug 4 11:43:21 2008 -0700 mstask: Task stub with AddRef, QueryInterface, and Release. --- dlls/mstask/Makefile.in | 1 + dlls/mstask/mstask_private.h | 9 + dlls/mstask/task.c | 578 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 588 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=777c2f1d4649d9e5f1a3b…

1 0

Roy Shea : mstask: Implemented NewWorkItem.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 2f366935d55ec3dfaf695f3f726037bbe18c7c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f366935d55ec3dfaf695f3f7… Author: Roy Shea <royshea(a)gmail.com> Date: Mon Aug 4 11:46:14 2008 -0700 mstask: Implemented NewWorkItem. --- dlls/mstask/task_scheduler.c | 13 +++++++++++-- dlls/mstask/tests/task_scheduler.c | 8 ++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index a1d52a8..bd4cc1d 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -119,9 +119,18 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( REFIID riid, IUnknown **ppunk) { - FIXME("%p, %s, %s, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), + HRESULT hr; + TRACE("(%p, %s, %s, %s, %p)\n", iface, debugstr_w(pwszTaskName), debugstr_guid(rclsid) ,debugstr_guid(riid), ppunk); - return E_NOTIMPL; + + if (!IsEqualGUID(rclsid, &CLSID_CTask)) + return CLASS_E_CLASSNOTAVAILABLE; + + if (!IsEqualGUID(riid, &IID_ITask)) + return E_NOINTERFACE; + + hr = TaskConstructor(pwszTaskName, (LPVOID *)ppunk); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 94614dc..5292a3c 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -49,25 +49,25 @@ static void test_NewWorkItem(void) /* Test basic task creation */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown**)&task); - todo_wine ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); + ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); if (hres == S_OK) ITask_Release(task); /* Task creation attempt using invalid work item class ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &IID_ITask, (IUnknown**)&task); - todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + ok(hres == CLASS_E_CLASSNOTAVAILABLE, "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); /* Task creation attempt using invalid interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &GUID_BAD, (IUnknown**)&task); - todo_wine ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); /* Task creation attempt using invalid work item class and interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &GUID_BAD, (IUnknown**)&task); - todo_wine ok(hres == CLASS_E_CLASSNOTAVAILABLE, + ok(hres == CLASS_E_CLASSNOTAVAILABLE, "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); ITaskScheduler_Release(test_task_scheduler);

1 0

Adam Petaccia : gdiplus: Skip the generic font tests if we don' t have the required fonts.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: e4cc0bc4229dff8374b1f7117eb2685bd265c4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cc0bc4229dff8374b1f7117… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Mon Aug 4 14:55:06 2008 -0400 gdiplus: Skip the generic font tests if we don't have the required fonts. --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 8ce0ec6..3d30a86 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -108,6 +108,11 @@ todo_wine { memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + if (stat == FileNotFound) + { + skip("Arial not installed.\n"); + return; + } expect(Ok, stat); stat = GdipGetLogFontW(font, graphics, &lfw2); expect(Ok, stat); @@ -282,6 +287,11 @@ static void test_getgenerics (void) ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); stat = GdipGetGenericFontFamilySansSerif (&family); + if (stat == FontFamilyNotFound) + { + skip("Microsoft Sans Serif not installed\n"); + goto serif; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); @@ -292,7 +302,13 @@ static void test_getgenerics (void) stat = GdipDeleteFontFamily (family); expect (Ok, stat); +serif: stat = GdipGetGenericFontFamilySerif (&family); + if (stat == FontFamilyNotFound) + { + skip("Times New Roman not installed\n"); + goto monospace; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); @@ -301,7 +317,13 @@ static void test_getgenerics (void) stat = GdipDeleteFontFamily (family); expect (Ok, stat); +monospace: stat = GdipGetGenericFontFamilyMonospace (&family); + if (stat == FontFamilyNotFound) + { + skip("Courier New not installed\n"); + return; + } expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat);

1 0

Alexandre Julliard : gdi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 73423c1a40523abc0a0d46fa1ef19c49a4b633f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73423c1a40523abc0a0d46fa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 5 12:48:55 2008 +0200 gdi32/tests: Fix some test failures on Win9x. --- dlls/gdi32/tests/gdiobj.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index bd7a065..6f051b0 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -43,7 +43,7 @@ static void test_gdi_objects(void) */ SetLastError(0); hp = SelectObject(NULL, GetStockObject(BLACK_PEN)); - ok(!hp && GetLastError() == ERROR_INVALID_HANDLE, + ok(!hp && (GetLastError() == ERROR_INVALID_HANDLE || broken(!GetLastError())), "SelectObject(NULL DC) expected 0, ERROR_INVALID_HANDLE, got %p, %u\n", hp, GetLastError()); @@ -77,7 +77,7 @@ static void test_gdi_objects(void) /* GetObject does not SetLastError() on a null object */ SetLastError(0); i = GetObjectA(NULL, sizeof(buff), buff); - ok (!i && !GetLastError(), + ok (!i && (GetLastError() == 0 || GetLastError() == ERROR_INVALID_PARAMETER), "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); @@ -207,7 +207,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); hbrush = CreateSolidBrush(RGB(10, 20, 30)); assert(hbrush != 0); @@ -243,7 +243,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); hcs = GetColorSpace(hdc); if (hcs) @@ -254,7 +254,7 @@ static void test_GetCurrentObject(void) ok(hcs != 0, "CreateColorSpace failed\n"); SelectObject(hdc, hcs); hobj = GetCurrentObject(hdc, OBJ_COLORSPACE); - ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj); + ok(hobj == hcs || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj); } hrgn = CreateRectRgn(1, 1, 100, 100);

1 0

Paul Vriens : kernel32/tests: Show the setting of the debugger registry value.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 0d88bf89dcc6d285949171b6c0b819f8118bbae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d88bf89dcc6d285949171b6c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 5 10:53:54 2008 +0200 kernel32/tests: Show the setting of the debugger registry value. --- dlls/kernel32/tests/debugger.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 003403f..0b943f2 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -339,6 +339,7 @@ static void test_ExitCode(void) { debugger_val=HeapAlloc(GetProcessHeap(), 0, debugger_size); RegQueryValueExA(hkey, "debugger", NULL, &debugger_type, debugger_val, &debugger_size); + trace("HKLM\\%s\\debugger is set to '%s'\n", AeDebug, debugger_val); } } else if (ret == ERROR_ACCESS_DENIED)

1 0

Stefan Dösinger : wined3d: Track overlay surfaces in the overlayed surface.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: dff3a422338b839876b305c288c5fbb654d656d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff3a422338b839876b305c28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 15:28:25 2008 -0500 wined3d: Track overlay surfaces in the overlayed surface. --- dlls/wined3d/device.c | 1 + dlls/wined3d/surface.c | 4 ++++ dlls/wined3d/surface_base.c | 10 ++++++++-- dlls/wined3d/surface_gdi.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dab4b38..49a72eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -660,6 +660,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U object->currentDesc.MultiSampleType = MultiSample; object->currentDesc.MultiSampleQuality = MultisampleQuality; object->glDescription.level = Level; + list_init(&object->overlays); /* Flags */ object->Flags = SFLAG_NORMCOORD; /* Default to normalized coords */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1ea221c..07c7076 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -474,6 +474,10 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; + if(This->overlay_dest) { + list_remove(&This->overlay_entry); + } + TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 3816329..bace476 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -450,9 +450,15 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, REC This->overlay_destrect.bottom = Dst ? Dst->currentDesc.Height : 0; } - if(Flags & WINEDDOVER_SHOW) { - This->overlay_dest = Dst; + if(This->overlay_dest && (This->overlay_dest != Dst || Flags & WINEDDOVER_HIDE)) { + list_remove(&This->overlay_entry); + } + if(Flags & WINEDDOVER_SHOW) { + if(This->overlay_dest != Dst) { + This->overlay_dest = Dst; + list_add_tail(&Dst->overlays, &This->overlay_entry); + } } else if(Flags & WINEDDOVER_HIDE) { /* tests show that the rectangles are erased on hide */ This->overlay_srcrect.left = 0; This->overlay_srcrect.top = 0; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 60564b4..1b1e5db 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -160,6 +160,10 @@ ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; + if(This->overlay_dest) { + list_remove(&This->overlay_entry); + } + TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 669e865..91617e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1331,6 +1331,8 @@ struct IWineD3DSurfaceImpl RECT overlay_srcrect; RECT overlay_destrect; IWineD3DSurfaceImpl *overlay_dest; + struct list overlays; + struct list overlay_entry; }; extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl;

1 0