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

Ken Sharp : ntoskrnl: Add FsRtlRegisterUncProvider stub.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 31e5093555a864ca7e28768186920372821d451e URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e5093555a864ca7e2876818… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 17 22:29:33 2009 +0100 ntoskrnl: Add FsRtlRegisterUncProvider stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 306f065..ab7cbbf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -935,6 +935,15 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, return STATUS_NOT_IMPLEMENTED; } +/*********************************************************************** +* FsRtlRegisterUncProvider (NTOSKRNL.EXE.@) +*/ +NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING RedirDevName, + BOOLEAN MailslotsSupported) +{ + FIXME("(%p %p %d): stub\n", MupHandle, RedirDevName, MailslotsSupported); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * KeInitializeEvent (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a857bc3..786de83 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -271,7 +271,7 @@ @ stub FsRtlPrivateLock @ stub FsRtlProcessFileLock @ stub FsRtlRegisterFileSystemFilterCallbacks -@ stub FsRtlRegisterUncProvider +@ stdcall FsRtlRegisterUncProvider(ptr ptr long) @ stub FsRtlReleaseFile @ stub FsRtlRemoveLargeMcbEntry @ stub FsRtlRemoveMcbEntry

1 0

Damjan Jovanovic : winemenubuilder: Log where freedesktop menu files are created, and provide an option to clean them up.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 267858b4c2484aa1905790140b0c962c12dcbb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267858b4c2484aa1905790140… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 18 07:13:02 2009 +0200 winemenubuilder: Log where freedesktop menu files are created, and provide an option to clean them up. --- programs/winemenubuilder/winemenubuilder.c | 144 ++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267858b4c2484aa190579…

1 0

Dmitry Timoshkov : user32: Invalidate button on WM_KILLFOCUS, like Windows does.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 45c8e640578153eb3c6781d96e7685944022eb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c8e640578153eb3c6781d96… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 18 20:06:33 2009 +0900 user32: Invalidate button on WM_KILLFOCUS, like Windows does. --- dlls/user32/button.c | 1 + dlls/user32/tests/msg.c | 96 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index f2097aa..926563c 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -446,6 +446,7 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_KILLFOCUS); + InvalidateRect( hWnd, NULL, FALSE ); break; case WM_SYSCOLORCHANGE: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bde52ca..580582f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1775,6 +1775,7 @@ static BOOL ignore_message( UINT message ) message == WM_GETICON || message == WM_GETOBJECT || message == WM_TIMECHANGE || + message == WM_DISPLAYCHANGE || message == WM_DEVICECHANGE); } @@ -1870,7 +1871,10 @@ static void add_message_(int line, const struct recvd_message *msg) di.u.lp = 0; di.u.item.type = dis->CtlType; di.u.item.ctl_id = dis->CtlID; - di.u.item.item_id = dis->itemID; + if (dis->CtlType == ODT_LISTBOX || + dis->CtlType == ODT_COMBOBOX || + dis->CtlType == ODT_MENU) + di.u.item.item_id = dis->itemID; di.u.item.action = dis->itemAction; di.u.item.state = dis->itemState; @@ -5088,6 +5092,8 @@ todo_wine { } /****************** button message test *************************/ +#define ID_BUTTON 0x000e + static const struct message WmSetFocusButtonSeq[] = { { HCBT_SETFOCUS, hook }, @@ -5095,7 +5101,9 @@ static const struct message WmSetFocusButtonSeq[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_APP, sent|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmKillFocusButtonSeq[] = @@ -5103,9 +5111,13 @@ static const struct message WmKillFocusButtonSeq[] = { HCBT_SETFOCUS, hook }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORBTN, sent|parent }, { 0 } }; static const struct message WmSetFocusStaticSeq[] = @@ -5115,7 +5127,10 @@ static const struct message WmSetFocusStaticSeq[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORSTATIC, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ + { WM_APP, sent|wparam|lparam, 0, 0 }, { 0 } }; static const struct message WmKillFocusStaticSeq[] = @@ -5123,9 +5138,42 @@ static const struct message WmKillFocusStaticSeq[] = { HCBT_SETFOCUS, hook }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { WM_CTLCOLORSTATIC, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetFocusOwnerdrawSeq[] = +{ + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent|wparam, 0 }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x001040e4 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message WmKillFocusOwnerdrawSeq[] = +{ + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000040e4 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, { 0 } }; static const struct message WmLButtonDownSeq[] = @@ -5242,10 +5290,10 @@ static void test_button_messages(void) { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, - WmSetFocusButtonSeq, WmKillFocusButtonSeq } + WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq } }; unsigned int i; - HWND hwnd; + HWND hwnd, parent; DWORD dlg_code; HFONT zfont; @@ -5262,30 +5310,58 @@ static void test_button_messages(void) subclass_button(); + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "Failed to create parent window\n"); + for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) { - hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_POPUP, - 0, 0, 50, 14, 0, 0, 0, NULL); + MSG msg; + DWORD style; + + hwnd = CreateWindowExA(0, "my_button_class", "test", button[i].style | WS_CHILD | BS_NOTIFY, + 0, 0, 50, 14, parent, (HMENU)ID_BUTTON, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); + style = GetWindowLongA(hwnd, GWL_STYLE); + style &= ~(WS_CHILD | BS_NOTIFY); + /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */ + if (button[i].style == BS_USERBUTTON) + todo_wine ok(style == BS_PUSHBUTTON, "expected style BS_PUSHBUTTON got %x\n", style); + else + ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); + dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); SetFocus(0); + flush_events(); flush_sequence(); + log_all_parent_messages++; + trace("button style %08x\n", button[i].style); + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); SetFocus(hwnd); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].setfocus, "SetFocus(hwnd) on a button", FALSE); SetFocus(0); + SendMessage(hwnd, WM_APP, 0, 0); /* place a separator mark here */ + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(button[i].killfocus, "SetFocus(0) on a button", FALSE); + log_all_parent_messages--; + + ok(GetFocus() == 0, "expected focus 0, got %p\n", GetFocus()); DestroyWindow(hwnd); } + DestroyWindow(parent); + hwnd = CreateWindowExA(0, "my_button_class", "test", BS_PUSHBUTTON | WS_POPUP | WS_VISIBLE, 0, 0, 50, 14, 0, 0, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); @@ -7169,7 +7245,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || - message == WM_DRAWITEM || + message == WM_DRAWITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { switch (message)

1 0

Stefan Doesinger : wined3d: Properly load the y correction.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 3aaa530ca95a63591f1443d279a0e32705e4dfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aaa530ca95a63591f1443d27… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Wed Jun 17 19:17:14 2009 +0200 wined3d: Properly load the y correction. --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 729e6ce..6101e55 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -334,6 +334,22 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } checkGLcall("Load bumpmap consts\n"); + if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) + { + /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). + * ycorrection.y: -1.0(onscreen), 1.0(offscreen) + * ycorrection.z: 1.0 + * ycorrection.w: 0.0 + */ + float val[4]; + val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; + val[2] = 1.0; + val[3] = 0.0; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); + checkGLcall("y correction loading\n"); + } + if(gl_shader->num_int_consts == 0) return; for(i = 0; i < MAX_CONST_I; i++) @@ -350,22 +366,6 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } } checkGLcall("Load ps int consts\n"); - - if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) - { - /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). - * ycorrection.y: -1.0(onscreen), 1.0(offscreen) - * ycorrection.z: 1.0 - * ycorrection.w: 0.0 - */ - float val[4]; - val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; - val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; - val[2] = 1.0; - val[3] = 0.0; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); - checkGLcall("y correction loading\n"); - } } static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl)

1 0

Paul Vriens : comctl32/tests: Fix some typos (copy-paste).
by Alexandre Julliard 18 Jun '09

18 Jun '09

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: Make sure we have a context in stretch_rect_fbo().
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 41d93e1dd1198dbef176d45bc061042d78eca034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d93e1dd1198dbef176d45bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:02 2009 +0200 wined3d: Make sure we have a context in stretch_rect_fbo(). Specifically, in case the source surface was offscreen, we would sometimes to GL calls without active context. --- dlls/wined3d/device.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b55d6e..956bb4f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6432,11 +6432,16 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); + dst_swapchain = get_swapchain(dst_surface); + + if (src_swapchain) ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); + else if (dst_swapchain) ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); + else ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (src_swapchain) { GLenum buffer = surface_get_gl_buffer(src_surface, src_swapchain); TRACE("Source surface %p is onscreen\n", src_surface); - ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); /* Make sure the drawable is up to date. In the offscreen case * attach_surface_fbo() implicitly takes care of this. */ IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); @@ -6471,12 +6476,10 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED LEAVE_GL(); /* Attach dst surface to dst fbo */ - dst_swapchain = get_swapchain(dst_surface); if (dst_swapchain) { GLenum buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); TRACE("Destination surface %p is onscreen\n", dst_surface); - ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); /* Make sure the drawable is up to date. In the offscreen case * attach_surface_fbo() implicitly takes care of this. */ IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); @@ -6503,11 +6506,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED } else { TRACE("Destination surface %p is offscreen\n", dst_surface); - /* No src or dst swapchain? Make sure some context is active(multithreading) */ - if(!src_swapchain) { - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } - ENTER_GL(); context_bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->activeContext->dst_fbo); context_attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface);

1 0

Henri Verbeet : wined3d: Reuse the FBO for check_fbo_compat().
by Alexandre Julliard 18 Jun '09

18 Jun '09

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

Henri Verbeet : wined3d: Remove some useless code in IWineD3DDeviceImpl_SetLightEnable().
by Alexandre Julliard 18 Jun '09

18 Jun '09

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

Henri Verbeet : wined3d: Simplify IWineD3DSurfaceImpl_LockRect() a bit.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c7b684f345c43c36c6f2cd23dcb5374c4dd7845e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b684f345c43c36c6f2cd23d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:05 2009 +0200 wined3d: Simplify IWineD3DSurfaceImpl_LockRect() a bit. --- dlls/wined3d/surface.c | 77 ++++++++--------------------------------------- 1 files changed, 13 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58893f2..d398fb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1296,6 +1296,7 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + const RECT *pass_rect = pRect; TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); @@ -1328,72 +1329,19 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED goto lock_end; } - /* Now download the surface content from opengl - * Use the render target readback if the surface is on a swapchain(=onscreen render target) or the current primary target - * Offscreen targets which are not active at the moment or are higher targets(FBOs) can be locked with the texture path - */ - if ((This->Flags & SFLAG_SWAPCHAIN) || iface == myDevice->render_targets[0]) + /* IWineD3DSurface_LoadLocation() does not check if the rectangle specifies + * the full surface. Most callers don't need that, so do it here. */ + if (pRect && pRect->top == 0 && pRect->left == 0 + && pRect->right == This->currentDesc.Width + && pRect->bottom == This->currentDesc.Height) { - const RECT *pass_rect = pRect; - - /* IWineD3DSurface_LoadLocation does not check if the rectangle specifies the full surfaces - * because most caller functions do not need that. So do that here - */ - if(pRect && - pRect->top == 0 && - pRect->left == 0 && - pRect->right == This->currentDesc.Width && - pRect->bottom == This->currentDesc.Height) { - pass_rect = NULL; - } - - switch(wined3d_settings.rendertargetlock_mode) { - case RTL_TEXDRAW: - case RTL_TEXTEX: - FIXME("Reading from render target with a texture isn't implemented yet, falling back to framebuffer reading\n"); -#if 0 - /* Disabled for now. LoadLocation prefers the texture over the drawable as the source. So if we copy to the - * texture first, then to sysmem, we'll avoid glReadPixels and use glCopyTexImage and glGetTexImage2D instead. - * This may be faster on some cards - */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* No partial texture copy yet */); -#endif - /* drop through */ - - case RTL_AUTO: - case RTL_READDRAW: - case RTL_READTEX: - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pass_rect); - break; + pass_rect = NULL; + } - case RTL_DISABLE: - break; - } - } else if(iface == myDevice->stencilBufferTarget) { - /** the depth stencil in openGL has a format of GL_FLOAT - * which should be good for WINED3DFMT_D16_LOCKABLE - * and WINED3DFMT_D16 - * it is unclear what format the stencil buffer is in except. - * 'Each index is converted to fixed point... - * If GL_MAP_STENCIL is GL_TRUE, indices are replaced by their - * mappings in the table GL_PIXEL_MAP_S_TO_S. - * glReadPixels(This->lockedRect.left, - * This->lockedRect.bottom - j - 1, - * This->lockedRect.right - This->lockedRect.left, - * 1, - * GL_DEPTH_COMPONENT, - * type, - * (char *)pLockedRect->pBits + (pLockedRect->Pitch * (j-This->lockedRect.top))); - * - * Depth Stencil surfaces which are not the current depth stencil target should have their data in a - * gl texture(next path), or in local memory(early return because of set SFLAG_INSYSMEM above). If - * none of that is the case the problem is not in this function :-) - ********************************************/ - FIXME("Depth stencil locking not supported yet\n"); - } else { - /* This path is for normal surfaces, offscreen render targets and everything else that is in a gl texture */ - TRACE("locking an ordinary surface\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */); + if (!(wined3d_settings.rendertargetlock_mode == RTL_DISABLE + && ((This->Flags & SFLAG_SWAPCHAIN) || iface == myDevice->render_targets[0]))) + { + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pass_rect); } lock_end: @@ -4848,6 +4796,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D surface_download_data(This); } else { + /* Note: It might be faster to download into a texture first. */ read_from_framebuffer(This, rect, This->resource.allocatedMemory, IWineD3DSurface_GetPitch(iface));

1 0

Henri Verbeet : wined3d: Remove a redundant ActivateContext() call in IWineD3DSurfaceImpl_UnlockRect().
by Alexandre Julliard 18 Jun '09

18 Jun '09

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