April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.3.19
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: website Branch: master Commit: 8a186288e46f89d8e655202fcac9ec222069ea40 URL: http://source.winehq.org/git/website.git/?a=commit;h=8a186288e46f89d8e65520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 20:13:46 2011 +0200 Wine release 1.3.19 --- news/en/2011042901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011042901.xml b/news/en/2011042901.xml new file mode 100644 index 0000000..17d2bd5 --- /dev/null +++ b/news/en/2011042901.xml @@ -0,0 +1,17 @@ +<news> +<date>April 29, 2011</date> +<title>Wine 1.3.19 Released</title> +<body> + The Wine development release 1.3.19 is now available. + <a href="{$root}/announce/1.3.19">What's new</a> in this release: +<ul> + <li>New sound driver architecture for MMDevAPI.</li> + <li>Better support for relative mouse events in DInput.</li> + <li>Debugger support for the ARM platform.</li> + <li>Various improvements in D3DX9.</li> + <li>More MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.19.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.19.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 7b3c1738c35cf426815a02e1ac032b59b1c853e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3c1738c35cf426815a02e1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 20:04:41 2011 +0200 Release 1.3.19. --- ANNOUNCE | 947 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 503 insertions(+), 464 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b3c1738c35cf426815a0…

1 0

Tag wine-1.3.19 : Alexandre Julliard : Release 1.3.19
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: refs/tags/wine-1.3.19 Tag: 20e2b4536da8d9d827b095f0d2db23e1c6b5073f URL: http://source.winehq.org/git/wine.git/?a=tag;h=20e2b4536da8d9d827b095f0d2db… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 20:04:42 2011 +0200 Release 1.3.19

1 0

Henri Verbeet : wined3d: Remove COM from the surface implementation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 1c1de920e311373b2012dc3b145dbc29e7bc15a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1de920e311373b2012dc3b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:41 2011 +0200 wined3d: Remove COM from the surface implementation. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 12 +- dlls/d3d10core/texture.c | 9 +- dlls/d3d10core/view.c | 2 +- dlls/d3d8/d3d8_private.h | 8 +- dlls/d3d8/device.c | 99 ++++++----- dlls/d3d8/surface.c | 18 +- dlls/d3d8/swapchain.c | 10 +- dlls/d3d9/d3d9_private.h | 8 +- dlls/d3d9/device.c | 68 ++++---- dlls/d3d9/surface.c | 28 ++-- dlls/d3d9/swapchain.c | 12 +- dlls/ddraw/ddraw.c | 64 +++---- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 26 +-- dlls/ddraw/surface.c | 189 +++++++------------ dlls/dxgi/device.c | 6 +- dlls/dxgi/swapchain.c | 6 +- dlls/wined3d/device.c | 65 ++++--- dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/surface.c | 354 +++++++++++++----------------------- dlls/wined3d/swapchain.c | 27 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d.spec | 34 ++++ dlls/wined3d/wined3d_private.h | 42 ++--- include/wine/wined3d.idl | 212 +++++++--------------- 26 files changed, 557 insertions(+), 752 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c1de920e311373b2012d…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DSurface typedefs.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: c4b73c45500b16d8163ecbff8cabfbcde59145e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b73c45500b16d8163ecbff8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:42 2011 +0200 wined3d: Get rid of the IWineD3DSurface typedefs. --- dlls/wined3d/arb_program_shader.c | 13 +- dlls/wined3d/context.c | 44 ++-- dlls/wined3d/device.c | 169 +++++----- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/palette.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 12 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 615 ++++++++++++++++++------------------- dlls/wined3d/swapchain.c | 22 +- dlls/wined3d/texture.c | 24 +- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 110 ++++---- 13 files changed, 510 insertions(+), 513 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b73c45500b16d8163ec…

1 0

Hwang YunSong : appwiz.cpl: Update Korean resource.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: aeac26fec6d5f530134400d143c0d2f1ba9023eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeac26fec6d5f530134400d14… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 29 16:26:17 2011 +0900 appwiz.cpl: Update Korean resource. --- dlls/appwiz.cpl/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 4daa4db..e6078f2 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -37,9 +37,9 @@ FONT 9, "MS Shell Dlg" CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "이 소프트웨어는 자동으로 삭제되었을 수도 있습니다.설치된 구성요소를 고치거나 프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오..", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 36 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "지원 정보(&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "지원 정보(&S)", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 CONTROL "고치기(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "지우기(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "지우기(&R)", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: a77376c6a1e81a365e76e4d1b3b2798cf90321ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77376c6a1e81a365e76e4d1b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Apr 29 16:23:40 2011 +0900 po: Update Korean translation. --- po/ko.po | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/po/ko.po b/po/ko.po index af83fce..ae720cf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -67,14 +67,12 @@ msgid "All files (*.*)" msgstr "모든 파일 (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "제거(&R)..." +msgstr "제거(&R)" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "고치기(&M)/제거..." +msgstr "고치기(&M)/제거" #: appwiz.rc:48 msgid "Downloading..." @@ -133,7 +131,6 @@ msgid "Separator" msgstr "분리자" #: comctl32.rc:44 progman.rc:78 -#, fuzzy msgctxt "hotkey" msgid "None" msgstr "없음" @@ -1245,7 +1242,6 @@ msgid "Path Length Constraint=" msgstr "제한된 경로 길이 =" #: crypt32.rc:198 -#, fuzzy msgctxt "path length" msgid "None" msgstr "없음" @@ -2042,10 +2038,9 @@ msgid "&Forward" msgstr "앞으로" #: hhctrl.rc:73 -#, fuzzy msgctxt "table of contents" msgid "&Home" -msgstr "홈" +msgstr "홈(&H)" #: hhctrl.rc:74 msgid "&Stop" @@ -2104,7 +2099,6 @@ msgid "Back" msgstr "뒤로" #: hhctrl.rc:44 -#, fuzzy msgctxt "table of contents" msgid "Home" msgstr "홈" @@ -6244,7 +6238,6 @@ msgid "Pr&int..." msgstr "인쇄(&I)..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" msgstr "인쇄 미리보기(&W)..." @@ -6284,12 +6277,10 @@ msgid "&Help" msgstr "도움말(&H)" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "인터넷 익스플로어 에 관하여(&A)..." +msgstr "인터넷 익스플로어에 관하여(&A)..." #: shdocvw.rc:67 -#, fuzzy msgctxt "home page" msgid "Home" msgstr "홈" @@ -10307,7 +10298,6 @@ msgid "Hardware" msgstr "하드웨어" #: winecfg.rc:76 -#, fuzzy msgctxt "vertex shader mode" msgid "None" msgstr "없음"

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: ffae96eca05e40dcd4d91d8ab82365959a07860e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffae96eca05e40dcd4d91d8ab… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Apr 28 19:52:13 2011 +0200 po: Update Polish translation. --- po/pl.po | 148 +++++++++++++++++++++++-------------------------------------- 1 files changed, 56 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffae96eca05e40dcd4d91…

1 0

Peter Urbanec : dbghelp: Prevent winedbg page faults when loading some PDBs generated by the Intel C Compiler .
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: de4040699a014e4f594d498d749aca460556f38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4040699a014e4f594d498d7… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Apr 29 22:41:17 2011 +1000 dbghelp: Prevent winedbg page faults when loading some PDBs generated by the Intel C Compiler. --- dlls/dbghelp/msc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 9abd065..cab3338 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1453,6 +1453,8 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const switch (lt2->header) { case LT2_LINES_BLOCK: + /* Skip blocks that are too small - Intel C Compiler generates these. */ + if (lt2->size_of_block < sizeof (struct codeview_lt2blk_lines)) break; lines_blk = (const struct codeview_lt2blk_lines*)lt2; /* FIXME: should check that file_offset is within the LT2_FILES_BLOCK we've seen */ addr = codeview_get_address(msc_dbg, lines_blk->seg, lines_blk->start);

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSurface::Flip() implementations.
by Alexandre Julliard 29 Apr '11

29 Apr '11

Module: wine Branch: master Commit: 0b523df93c30fc7455a10dfe5da599d003929f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b523df93c30fc7455a10dfe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 29 13:03:38 2011 +0200 wined3d: Merge the IWineD3DSurface::Flip() implementations. --- dlls/wined3d/surface.c | 163 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 73 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 80c9263..d5fe048 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1037,6 +1037,31 @@ static HRESULT surface_getdc(IWineD3DSurfaceImpl *surface) return hr; } +static HRESULT surface_flip(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *override) +{ + TRACE("surface %p, override %p.\n", surface, override); + + /* Flipping is only supported on render targets and overlays. */ + if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) + { + WARN("Tried to flip a non-render target, non-overlay surface.\n"); + return WINEDDERR_NOTFLIPPABLE; + } + + if (surface->resource.usage & WINED3DUSAGE_OVERLAY) + { + flip_surface(surface, override); + + /* Update the overlay if it is visible */ + if (surface->overlay_dest) + return surface->surface_ops->surface_draw_overlay(surface); + else + return WINED3D_OK; + } + + return WINED3D_OK; +} + static HRESULT surface_set_mem(IWineD3DSurfaceImpl *surface, void *mem) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -1207,6 +1232,7 @@ static const struct wined3d_surface_ops surface_ops = surface_map, surface_unmap, surface_getdc, + surface_flip, surface_set_mem, }; @@ -1383,6 +1409,13 @@ static HRESULT gdi_surface_getdc(IWineD3DSurfaceImpl *surface) return hr; } +static HRESULT gdi_surface_flip(IWineD3DSurfaceImpl *surface, IWineD3DSurfaceImpl *override) +{ + TRACE("surface %p, override %p.\n", surface, override); + + return WINED3D_OK; +} + static HRESULT gdi_surface_set_mem(IWineD3DSurfaceImpl *surface, void *mem) { TRACE("surface %p, mem %p.\n", surface, mem); @@ -1440,6 +1473,7 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_map, gdi_surface_unmap, gdi_surface_getdc, + gdi_surface_flip, gdi_surface_set_mem, }; @@ -4133,6 +4167,42 @@ static HRESULT WINAPI IWineD3DBaseSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, return WINED3D_OK; } +static HRESULT WINAPI IWineD3DBaseSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) +{ + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; + struct wined3d_swapchain *swapchain; + HRESULT hr; + + TRACE("iface %p, override %p, flags %#x.\n", iface, override, flags); + + if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) + { + ERR("Flipped surface is not on a swapchain.\n"); + return WINEDDERR_NOTFLIPPABLE; + } + swapchain = surface->container.u.swapchain; + + hr = surface->surface_ops->surface_flip(surface, (IWineD3DSurfaceImpl *)override); + if (FAILED(hr)) + return hr; + + /* Just overwrite the swapchain presentation interval. This is ok because + * only ddraw apps can call Flip, and only d3d8 and d3d9 applications + * specify the presentation interval. */ + if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; + else if (flags & WINEDDFLIP_NOVSYNC) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; + else if (flags & WINEDDFLIP_INTERVAL2) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; + else if (flags & WINEDDFLIP_INTERVAL3) + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; + else + swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; + + return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); +} + /* **************************************************** IWineD3DSurface IWineD3DResource parts follow **************************************************** */ @@ -5076,63 +5146,6 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { } } -static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - struct wined3d_swapchain *swapchain = NULL; - - TRACE("iface %p, override %p, flags %#x.\n", iface, override, flags); - - /* Flipping is only supported on RenderTargets and overlays*/ - if( !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY)) ) { - WARN("Tried to flip a non-render target, non-overlay surface\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - if(This->resource.usage & WINED3DUSAGE_OVERLAY) { - flip_surface(This, (IWineD3DSurfaceImpl *) override); - - /* Update the overlay if it is visible */ - if (This->overlay_dest) - return This->surface_ops->surface_draw_overlay(This); - else - return WINED3D_OK; - } - - if(override) { - /* DDraw sets this for the X11 surfaces, so don't confuse the user - * FIXME("(%p) Target override is not supported by now\n", This); - * Additionally, it isn't really possible to support triple-buffering - * properly on opengl at all - */ - } - - if (This->container.type != WINED3D_CONTAINER_SWAPCHAIN) - { - ERR("Flipped surface is not on a swapchain\n"); - return WINEDDERR_NOTFLIPPABLE; - } - swapchain = This->container.u.swapchain; - - /* Just overwrite the swapchain presentation interval. This is ok because only ddraw apps can call Flip, - * and only d3d8 and d3d9 apps specify the presentation interval - */ - if (!(flags & (WINEDDFLIP_NOVSYNC | WINEDDFLIP_INTERVAL2 | WINEDDFLIP_INTERVAL3 | WINEDDFLIP_INTERVAL4))) - /* Most common case first to avoid wasting time on all the other cases */ - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_ONE; - else if (flags & WINEDDFLIP_NOVSYNC) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; - else if (flags & WINEDDFLIP_INTERVAL2) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_TWO; - else if (flags & WINEDDFLIP_INTERVAL3) - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_THREE; - else - swapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_FOUR; - - /* Flipping a OpenGL surface -> present. */ - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); -} - /* Does a direct frame buffer -> texture copy. Stretching is done * with single pixel copy calls */ @@ -7082,7 +7095,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, IWineD3DBaseSurfaceImpl_ReleaseDC, - IWineD3DSurfaceImpl_Flip, + IWineD3DBaseSurfaceImpl_Flip, IWineD3DSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus, IWineD3DBaseSurfaceImpl_GetFlipStatus, @@ -7349,38 +7362,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -/***************************************************************************** - * IWineD3DSurface::Flip, GDI version - * - * Flips 2 flipping enabled surfaces. Determining the 2 targets is done by - * the parent library. This implementation changes the data pointers of the - * surfaces and copies the new front buffer content to the screen - * - * Params: - * override: Flipping target(e.g. back buffer) - * - * Returns: - * WINED3D_OK on success - * - *****************************************************************************/ -static HRESULT WINAPI IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD flags) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - struct wined3d_swapchain *swapchain; - HRESULT hr; - - if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) - { - ERR("Flipped surface is not on a swapchain\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - swapchain = surface->container.u.swapchain; - hr = wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); - - return hr; -} - static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = { /* IUnknown */ @@ -7401,7 +7382,7 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_Unmap, IWineD3DBaseSurfaceImpl_GetDC, IWineD3DBaseSurfaceImpl_ReleaseDC, - IWineGDISurfaceImpl_Flip, + IWineD3DBaseSurfaceImpl_Flip, IWineD3DBaseSurfaceImpl_Blt, IWineD3DBaseSurfaceImpl_GetBltStatus, IWineD3DBaseSurfaceImpl_GetFlipStatus, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3c025c..5fb2a67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2026,6 +2026,7 @@ struct wined3d_surface_ops void (*surface_map)(struct IWineD3DSurfaceImpl *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct IWineD3DSurfaceImpl *surface); HRESULT (*surface_getdc)(struct IWineD3DSurfaceImpl *surface); + HRESULT (*surface_flip)(struct IWineD3DSurfaceImpl *surface, struct IWineD3DSurfaceImpl *override); HRESULT (*surface_set_mem)(struct IWineD3DSurfaceImpl *surface, void *mem); };

1 0