June 2009 - Wine-Commits - list.winehq.org

Ken Sharp : ntoskrnl: Add IoUnregisterFileSystem stub.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: b68737b6be646108d9ec96987ca86904dd395b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68737b6be646108d9ec96987… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:27:42 2009 +0100 ntoskrnl: Add IoUnregisterFileSystem stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec98ea4..306f065 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1067,6 +1067,14 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) } /*********************************************************************** +* IoUnregisterFileSystem (NTOSKRNL.EXE.@) +*/ +VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject) +{ + FIXME("(%p): stub\n", DeviceObject); +} + +/*********************************************************************** * MmAllocateNonCachedMemory (NTOSKRNL.EXE.@) */ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2cfd4fe..a857bc3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -467,7 +467,7 @@ @ stub IoSynchronousInvalidateDeviceRelations @ stub IoSynchronousPageWrite @ stub IoThreadToProcess -@ stub IoUnregisterFileSystem +@ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange @ stub IoUnregisterPlugPlayNotification @ stub IoUnregisterShutdownNotification

1 0

Francois Gouget : dmime: Remove patterntrack.c and tool. c as they are unused and don't correspond to objects.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: da1601e262ae778a8aa248ed86bb5b7a4c31074b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1601e262ae778a8aa248ed8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 18 11:11:37 2009 +0200 dmime: Remove patterntrack.c and tool.c as they are unused and don't correspond to objects. --- dlls/dmime/Makefile.in | 2 - dlls/dmime/dmime_private.h | 26 --------- dlls/dmime/patterntrack.c | 106 ---------------------------------- dlls/dmime/tool.c | 134 -------------------------------------------- 4 files changed, 0 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da1601e262ae778a8aa24…

1 0

Detlef Riekenberg : mlang/tests: Some old IE versions truncate one character too short.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 957f52b4f358f88337f7bc35db1f9e0f90756652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957f52b4f358f88337f7bc35d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 17 20:58:10 2009 +0200 mlang/tests: Some old IE versions truncate one character too short. --- dlls/mlang/tests/mlang.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 14568df..1f317f4 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,7 +121,7 @@ static const WCHAR de_engb[] = {'E','n','g','l','i','s','c','h',' ', '(','G','r','o',0xDF,'b','r','i','t','a','n','n','i','e','n',')',0}; static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', '(','V','e','r','e','i','n','i','g','t','e','s',' ', - 'K',0xF6,'n','i','g','r','e','i',0}; + 'K',0xF6,'n','i','g','r','e','i','c',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ', @@ -266,6 +266,17 @@ static int mylstrcmpW(const WCHAR* str1, const WCHAR* str2) return *str1-*str2; } +/* lstrcpyW is not supported on Win95 */ +static void mylstrcpyW(WCHAR* str1, const WCHAR* str2) +{ + while (str2 && *str2) { + *str1 = *str2; + str1++; + str2++; + } + *str1 = '\0'; +} + #define DEBUGSTR_W_MAXLEN 64 static CHAR * debugstr_w(const WCHAR * strW) @@ -1238,6 +1249,7 @@ static void test_LcidToRfc1766(void) static void test_GetRfc1766Info(IMultiLanguage2 *iML2) { + WCHAR short_broken_name[MAX_LOCALE_NAME]; CHAR rfc1766A[MAX_RFC1766_NAME + 1]; BYTE buffer[sizeof(RFC1766INFO) + 4]; PRFC1766INFO prfc = (RFC1766INFO *) buffer; @@ -1258,16 +1270,22 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); + /* Some IE versions truncate an oversized name one character to short */ + mylstrcpyW(short_broken_name, info_table[i].broken_name); + short_broken_name[MAX_LOCALE_NAME - 2] = '\0'; + if (info_table[i].todo & TODO_NAME) { todo_wine ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)), /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); } else ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || - broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)), /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ + broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename));

1 0

Paul Vriens : shell32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: cca34925574f0f0dcbb27392a0aa8232cd78a1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca34925574f0f0dcbb27392a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 10:45:44 2009 +0200 shell32/tests: Fix a test failure on Vista and higher. --- dlls/shell32/tests/shlfolder.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c25c4a9..255d019 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -962,7 +962,9 @@ static void test_SHGetPathFromIDList(void) wszPath[1] = '\0'; result = pSHGetPathFromIDListW(pidlMyComputer, wszPath); ok (!result, "SHGetPathFromIDListW succeeded where it shouldn't!\n"); - ok (GetLastError()==0xdeadbeef, "SHGetPathFromIDListW shouldn't set last error! Last error: %u\n", GetLastError()); + ok (GetLastError()==0xdeadbeef || + GetLastError()==ERROR_SUCCESS, /* Vista and higher */ + "Unexpected last error from SHGetPathFromIDListW: %u\n", GetLastError()); ok (!wszPath[0], "Expected empty path\n"); if (result) { IShellFolder_Release(psfDesktop);

1 0

Paul Vriens : comctl32/tests: Fix some typos (copy-paste).
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 87366355d25d8837a1366fd8b4f3490abba2e0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87366355d25d8837a1366fd8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 08:10:52 2009 +0200 comctl32/tests: Fix some typos (copy-paste). --- dlls/comctl32/tests/rebar.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d055d8a..c819bc7 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -104,7 +104,7 @@ static HWND build_toolbar(int nr, HWND hParent) case 1: iBitmapId = IDB_VIEW_SMALL_COLOR; break; case 2: iBitmapId = IDB_STD_SMALL_COLOR; break; } - ok(SendMessage(hToolbar, TB_LOADIMAGES, iBitmapId, (LPARAM)HINST_COMMCTRL) == 0, "TB_LOADIMAGE failed\n"); + ok(SendMessage(hToolbar, TB_LOADIMAGES, iBitmapId, (LPARAM)HINST_COMMCTRL) == 0, "TB_LOADIMAGES failed\n"); ok(SendMessage(hToolbar, TB_ADDBUTTONS, 5+nr, (LPARAM)btns), "TB_ADDBUTTONS failed\n"); return hToolbar; } @@ -310,7 +310,7 @@ static int rbsize_numtests = 0; count = SendMessage(hRebar, RB_GETBANDCOUNT, 0, 0); \ compare(count, res->nBands, "%d"); \ for (i=0; i<min(count, res->nBands); i++) { \ - ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_ITEMRECT\n"); \ + ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_GETRECT\n"); \ if (!(res->bands[i].fStyle & RBBS_HIDDEN)) \ check_rect("band", rc, res->bands[i].rc); \ rbi.cbSize = sizeof(REBARBANDINFO); \ @@ -790,12 +790,12 @@ static void bandinfo_test(void) rb.cyChild = 30; rb.cyMaxChild = 20; rb.cyIntegral = 10; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); rb.fMask = RBBIM_TEXT; rb.lpText = szABC; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35); rb.cbSize = sizeof(REBARBANDINFO); @@ -806,21 +806,21 @@ static void bandinfo_test(void) rb.fMask = RBBIM_HEADERSIZE; rb.cxHeader = 50; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 50); rb.cxHeader = 5; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); rb.fMask = RBBIM_TEXT; rb.lpText = szABCD; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABCD", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); rb.fMask = RBBIM_STYLE | RBBIM_TEXT; rb.fStyle = RBBS_VARIABLEHEIGHT; rb.lpText = szABC; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 40); DestroyWindow(hRebar);

1 0

Henri Verbeet : wined3d: Remove some useless code in IWineD3DDeviceImpl_SetLightEnable().
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 9f252cd81590ff6ce93d21a5aadd3dffd05e9845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f252cd81590ff6ce93d21a5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:04 2009 +0200 wined3d: Remove some useless code in IWineD3DDeviceImpl_SetLightEnable(). --- dlls/wined3d/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 956bb4f..5378568 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2947,9 +2947,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D struct list *e; TRACE("(%p) : Idx(%d), enable? %d\n", This, Index, Enable); - /* Tests show true = 128...not clear why */ - Enable = Enable? 128: 0; - LIST_FOR_EACH(e, &This->updateStateBlock->lightMap[Hi]) { lightInfo = LIST_ENTRY(e, PLIGHTINFOEL, entry); if(lightInfo->OriginalIndex == Index) break;

1 0

Mikio Idneuma : appwiz.cpl: Update Japanese translation.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 872b4d40b5ea43b89200b0ab75f588863a08e2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=872b4d40b5ea43b89200b0ab7… Author: Mikio Idneuma <midenuma(a)netjapan.co.jp> Date: Thu Jun 18 18:14:58 2009 +0900 appwiz.cpl: Update Japanese translation. --- dlls/appwiz.cpl/Ja.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index b0d5717..0dd3fdd 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -27,11 +27,11 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE { IDS_CPL_TITLE, "プログラムの追加と削除" - IDS_CPL_DESC, "Allows you to install new software, or remove existing software from your computer." + IDS_CPL_DESC, "新しいソフトウェアをインストールするか、既存のソフトウェアを削除することができます。" IDS_TAB1_TITLE, "アプリケーション" - IDS_UNINSTALL_FAILED, "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall entry for this program from the registry?" - IDS_NOT_SPECIFIED, "Not specified" + IDS_UNINSTALL_FAILED, "アンインストーラーを起動することができません。 '%s'. レジストリからアンインストールできるプログラム登録を削除しますか？" + IDS_NOT_SPECIFIED, "指定されません" IDS_COLUMN_NAME, "名前" IDS_COLUMN_PUBLISHER, "発行元"

1 0

Aric Stewart : comctl32: In COMBOEX_FindStringExact do not try to get text from invalid items.
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: e3b942003410e8a96b15034990af3e55f95d23d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b942003410e8a96b1503499… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 18 18:15:24 2009 +0900 comctl32: In COMBOEX_FindStringExact do not try to get text from invalid items. --- dlls/comctl32/comboex.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 8a0652c..2156896 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -860,10 +860,12 @@ COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) /* now search from after starting loc and wrapping back to start */ for(i=start+1; i<count; i++) { CBE_ITEMDATA *item = get_item_data(infoPtr, i); + if ((LRESULT)item == CB_ERR) continue; if (cmptext(COMBOEX_GetText(infoPtr, item), str) == 0) return i; } for(i=0; i<=start; i++) { CBE_ITEMDATA *item = get_item_data(infoPtr, i); + if ((LRESULT)item == CB_ERR) continue; if (cmptext(COMBOEX_GetText(infoPtr, item), str) == 0) return i; } return CB_ERR;

1 0

Henri Verbeet : wined3d: Remove a redundant ActivateContext() call in IWineD3DSurfaceImpl_UnlockRect().
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 51902b89fbc5e4fa0cc29a61925fa6b8a5801402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51902b89fbc5e4fa0cc29a619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:06 2009 +0200 wined3d: Remove a redundant ActivateContext() call in IWineD3DSurfaceImpl_UnlockRect(). The various LoadLocation() handlers already take care of activating an appropriate context. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d398fb1..c6eaa69 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1548,7 +1548,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { switch(wined3d_settings.rendertargetlock_mode) { case RTL_READTEX: case RTL_TEXTEX: - ActivateContext(myDevice, iface, CTXUSAGE_BLIT); IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */

1 0

Henri Verbeet : wined3d: Reuse the FBO for check_fbo_compat().
by Alexandre Julliard June 18, 2009

June 18, 2009

Module: wine Branch: master Commit: 550a3bbf96cc2703f894284b354cae9084e86b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=550a3bbf96cc2703f894284b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:03 2009 +0200 wined3d: Reuse the FBO for check_fbo_compat(). --- dlls/wined3d/utils.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e3e3fb..881736e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -559,8 +559,8 @@ static BOOL init_format_compression_info(WineD3D_GL_Info *gl_info) static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) { - GLuint tex, fb; GLenum status; + GLuint tex; ENTER_GL(); @@ -571,12 +571,9 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb)); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - GL_EXTCALL(glDeleteFramebuffersEXT(1, &fb)); glDeleteTextures(1, &tex); checkGLcall("Framebuffer format check"); @@ -589,6 +586,13 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) { unsigned int i; + GLuint fbo; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GL_EXTCALL(glGenFramebuffersEXT(1, &fbo)); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo)); + } for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { @@ -652,6 +656,11 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) desc->rtInternal = desc->glInternal; } } + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &fbo)); + } } static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info)

1 0