wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Huw Davies : gdiplus/tests: Elliptic regions have a shorter layout in win98 .
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: f0666564ced205d6059ee2084a73f68e66c5fb68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0666564ced205d6059ee2084… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 3 10:37:50 2009 +0000 gdiplus/tests: Elliptic regions have a shorter layout in win98. --- dlls/gdiplus/tests/region.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 689811c..d48554c 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -793,12 +793,14 @@ static void test_fromhrgn(void) status = GdipGetRegionDataSize(region, &needed); todo_wine{ expect(Ok, status); - expect(216, needed); + ok(needed == 216 || + needed == 196, /* win98 */ + "Got %.8x\n", needed); } status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); todo_wine expect(Ok, status); - if(status == Ok) + if(status == Ok && needed == 216) /* Don't try to test win98 layout */ { todo_wine{ expect(Ok, status);

1 0

Nikolay Sivov : comctl32: Correctly report systemcolor use for Treeview background.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: f35960200a18c8ac0fc54a0bfe0ecc6eabc92ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35960200a18c8ac0fc54a0bf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 2 16:15:45 2009 -0500 comctl32: Correctly report systemcolor use for Treeview background. --- dlls/comctl32/tests/treeview.c | 8 +++----- dlls/comctl32/treeview.c | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index f93b485..9ef6a99 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -427,11 +427,9 @@ static void TestGetSetBkColor(void) { COLORREF crColor = RGB(0,0,0); - todo_wine{ - /* If the value is -1, the control is using the system color for the background color. */ - crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); - ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); - } + /* If the value is -1, the control is using the system color for the background color. */ + crColor = (COLORREF)SendMessage( hTree, TVM_GETBKCOLOR, 0, 0 ); + ok(crColor == -1, "Default background color reported as 0x%.8x\n", crColor); /* Test for black background */ SendMessage( hTree, TVM_SETBKCOLOR, 0, (LPARAM)RGB(0,0,0) ); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index abc6fc7..43ae7b6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2306,11 +2306,13 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) > TVS_LINESATROOT); HBRUSH hbr, hbrOld; + COLORREF clrBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + infoPtr->clrBk; if (!lar && item->iLevel == 0) return; - hbr = CreateSolidBrush(infoPtr->clrBk); + hbr = CreateSolidBrush(clrBk); hbrOld = SelectObject(hdc, hbr); centerx = (item->linesOffset + item->stateOffset) / 2; @@ -2423,8 +2425,8 @@ TREEVIEW_DrawItemLines(const TREEVIEW_INFO *infoPtr, HDC hdc, const TREEVIEW_ITE { Rectangle(hdc, centerx - 1, centery - plussize + 1, centerx + 2, centery + plussize); - SetPixel(hdc, centerx - 1, centery, infoPtr->clrBk); - SetPixel(hdc, centerx + 1, centery, infoPtr->clrBk); + SetPixel(hdc, centerx - 1, centery, clrBk); + SetPixel(hdc, centerx + 1, centery, clrBk); } } } @@ -2472,7 +2474,8 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem } else { - nmcdhdr.clrTextBk = infoPtr->clrBk; + nmcdhdr.clrTextBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + infoPtr->clrBk; if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (wineItem == infoPtr->hotItem)) nmcdhdr.clrText = comctl32_color.clrHighlight; else if (infoPtr->clrText == -1) @@ -2782,9 +2785,12 @@ TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr) static LRESULT TREEVIEW_EraseBackground(const TREEVIEW_INFO *infoPtr, HDC hDC) { - HBRUSH hBrush = CreateSolidBrush(infoPtr->clrBk); + HBRUSH hBrush; + COLORREF clrBk = infoPtr->clrBk == -1 ? GetSysColor(COLOR_WINDOW): + infoPtr->clrBk; RECT rect; + hBrush = CreateSolidBrush(clrBk); GetClientRect(infoPtr->hwnd, &rect); FillRect(hDC, &rect, hBrush); DeleteObject(hBrush); @@ -4937,7 +4943,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->scrollX = 0; - infoPtr->clrBk = GetSysColor(COLOR_WINDOW); + infoPtr->clrBk = -1; /* use system color */ infoPtr->clrText = -1; /* use system color */ infoPtr->clrLine = RGB(128, 128, 128); infoPtr->clrInsertMark = GetSysColor(COLOR_BTNTEXT);

1 0

Alexandre Julliard : user32/tests: Add some more optional messages.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 114da7c46b55000c9e9e03dccab93117e8d6d12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=114da7c46b55000c9e9e03dcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 13:20:49 2009 +0100 user32/tests: Add some more optional messages. --- dlls/user32/tests/msg.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d8bfd26..4a51600 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -180,6 +180,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SYNCPAINT, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -405,9 +406,9 @@ static const struct message WmSWP_FrameChangedDeferErase[] = { static const struct message WmSWP_FrameChanged_noclip[] = { { WM_WINDOWPOSCHANGING, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED }, { WM_NCCALCSIZE, sent|wparam|parent, 1 }, - { WM_NCPAINT, sent|parent }, /* wparam != 1 */ + { WM_NCPAINT, sent|parent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|parent|defwinproc|optional }, - { WM_ERASEBKGND, sent|parent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_ERASEBKGND, sent|parent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, @@ -449,6 +450,7 @@ static const struct message WmShowOverlappedSeq[] = { { WM_GETTEXT, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { WM_SYNCPAINT, sent|optional }, #if 0 /* CreateWindow/ShowWindow(SW_SHOW) also generates WM_SIZE/WM_MOVE * messages. Does that mean that CreateWindow doesn't set initial * window dimensions for overlapped windows? @@ -495,6 +497,7 @@ static const struct message WmShowMaxOverlappedSeq[] = { { WM_ERASEBKGND, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SYNCPAINT, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -1269,6 +1272,8 @@ static const struct message WmEndCustomDialogSeq[] = { { WM_ACTIVATE, sent|wparam, 0 }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_GETTEXT, sent|optional|defwinproc }, { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, @@ -1346,7 +1351,7 @@ static const struct message WmModalDialogSeq[] = { { WM_CTLCOLORDLG, sent|optional }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_PAINT, sent|optional }, - { WM_CTLCOLORBTN, sent }, + { WM_CTLCOLORBTN, sent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, @@ -1815,6 +1820,7 @@ static void add_message_(int line, const struct recvd_message *msg) msg->descr, msg->hwnd, dis->CtlType, dis->CtlID, dis->itemID, dis->itemAction, dis->itemState); + di.u.lp = 0; di.u.item.type = dis->CtlType; di.u.item.ctl_id = dis->CtlID; di.u.item.item_id = dis->itemID; @@ -3665,7 +3671,7 @@ static void test_mdi_messages(void) */ active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, (LPARAM)&zoomed); ok(active_child == mdi_child || /* win2k */ - !active_child, /* win9x */ + !active_child || active_child == mdi_child2, /* win9x */ "wrong active MDI child %p\n", active_child); flush_sequence(); @@ -4484,8 +4490,6 @@ static void test_messages(void) flush_events(); ok_sequence(WmOptionalPaint, "ShowWindow(SW_SHOW):overlapped already visible", FALSE); - ok(GetActiveWindow() == hwnd, "window should be active\n"); - ok(GetFocus() == hwnd, "window should have input focus\n"); SetWindowPos(hwnd, 0,0,0,0,0, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE); ok_sequence(WmSWP_HideOverlappedSeq, "SetWindowPos:SWP_HIDEWINDOW:overlapped", FALSE); ok(!IsWindowVisible(hwnd), "window should not be visible at this point\n"); @@ -5622,7 +5626,7 @@ static const struct message WmInvalidateErasePaint[] = { { WM_PAINT, sent }, { WM_NCPAINT, sent|wparam|beginpaint, 1 }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -5693,7 +5697,7 @@ static const struct message WmChildPaintNc[] = { { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, - { WM_ERASEBKGND, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -8201,6 +8205,10 @@ static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, { WM_GETTEXTLENGTH, sent|optional }, + { WM_PAINT, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, { 0 } }; @@ -9886,6 +9894,7 @@ static const struct message WmShowNoActivate_2[] = { { HCBT_SETFOCUS, hook|optional }, { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ { 0 } }; @@ -10437,6 +10446,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, + { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { WM_SETFOCUS, sent|defwinproc|optional },

1 0

Alexandre Julliard : user32/tests: Fix a couple of failing menu tests.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: e256e988c5cb29a6d35bd2d03ba873a598241e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e256e988c5cb29a6d35bd2d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 13:20:34 2009 +0100 user32/tests: Fix a couple of failing menu tests. --- dlls/user32/tests/menu.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 921aade..f51bf48 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -114,6 +114,7 @@ typedef struct /* globals to communicate between test and wndproc */ static BOOL bMenuVisible; +static BOOL got_input; static HMENU hMenus[4]; #define MOD_SIZE 10 @@ -211,7 +212,8 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, } case WM_ENTERIDLE: { - ok( lparam, "Menu window handle is NULL!\n"); + ok( lparam || broken(!lparam), /* win9x, nt4 */ + "Menu window handle is NULL!\n"); PostMessage(hwnd, WM_CANCELMODE, 0, 0); return TRUE; } @@ -263,7 +265,7 @@ static void test_menu_locked_by_window(void) ok(ret, "DrawMenuBar failed with error %d\n", GetLastError()); } ret = IsMenu(GetMenu(hwnd)); - ok(!ret, "Menu handle should have been destroyed\n"); + ok(!ret || broken(ret) /* nt4 */, "Menu handle should have been destroyed\n"); SendMessage(hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0); /* did we process the WM_INITMENU message? */ @@ -1830,6 +1832,8 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) { int elapsed = 0; + got_input = i && menu_tests[i-1].bMenuVisible; + if (menu_tests[i].type == INPUT_KEYBOARD) for (j = 0; menu_tests[i].wVk[j] != 0; j++) send_key(menu_tests[i].wVk[j]); @@ -1845,6 +1849,12 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) Sleep(20); } + if (!got_input) + { + skip( "test %u: didn't receive input\n", i ); + return 0; + } + if (menu_tests[i]._todo_wine) { todo_wine { @@ -1867,6 +1877,16 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_EXITMENULOOP: bMenuVisible = FALSE; break; + case WM_KEYDOWN: + case WM_SYSKEYDOWN: + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONUP: + got_input = TRUE; + /* fall through */ default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); }

1 0

Alexandre Julliard : user32: Use MAKEWPARAM instead of MAKELONG for menu messages.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: d387cf32512cc46f47a465a134b0a607432c5a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d387cf32512cc46f47a465a13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 13:20:21 2009 +0100 user32: Use MAKEWPARAM instead of MAKELONG for menu messages. --- dlls/user32/menu.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8bcd235..8f8a7b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1981,7 +1981,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, { MENUITEM *ip = &lppop->items[lppop->FocusedItem]; SendMessageW( hwndOwner, WM_MENUSELECT, - MAKELONG(ip->fType & MF_POPUP ? wIndex: ip->wID, + MAKEWPARAM(ip->fType & MF_POPUP ? wIndex: ip->wID, ip->fType | ip->fState | (lppop->wFlags & MF_SYSMENU)), (LPARAM)hmenu); } @@ -1992,7 +1992,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, if((pos=MENU_FindSubMenu(&topmenu, hmenu))!=NO_SELECTED_ITEM){ POPUPMENU *ptm = MENU_GetMenu( topmenu ); MENUITEM *ip = &ptm->items[pos]; - SendMessageW( hwndOwner, WM_MENUSELECT, MAKELONG(pos, + SendMessageW( hwndOwner, WM_MENUSELECT, MAKEWPARAM(pos, ip->fType | ip->fState | (ptm->wFlags & MF_SYSMENU)), (LPARAM)topmenu); } @@ -2386,7 +2386,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) SendMessageW( hwndOwner, WM_INITMENUPOPUP, (WPARAM)item->hSubMenu, - MAKELONG( menu->FocusedItem, IS_SYSTEM_MENU(menu) )); + MAKELPARAM( menu->FocusedItem, IS_SYSTEM_MENU(menu) )); item = &menu->items[menu->FocusedItem]; rect = item->rect; @@ -3307,7 +3307,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); } MENU_SelectItem( mt.hOwnerWnd, mt.hTopMenu, NO_SELECTED_ITEM, FALSE, 0 ); - SendMessageW( mt.hOwnerWnd, WM_MENUSELECT, MAKELONG(0,0xffff), 0 ); + SendMessageW( mt.hOwnerWnd, WM_MENUSELECT, MAKEWPARAM(0,0xffff), 0 ); } /* Reset the variable for hiding menu */

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectPass::GetDesc().
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 28c595e3a4866e183848e45839fc9b9b4c1a18ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c595e3a4866e183848e4583… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Implement ID3D10EffectPass::GetDesc(). --- dlls/d3d10/effect.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cc02d1d..02725dd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -854,9 +854,26 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + unsigned int i; - return E_NOTIMPL; + FIXME("iface %p, desc %p partial stub!\n", iface, desc); + + memset(desc, 0, sizeof(*desc)); + desc->Name = This->name; + for (i = 0; i < This->variable_count; ++i) + { + struct d3d10_effect_variable *v = &This->variables[i]; + if (v->type == D3D10_EVT_VERTEXSHADER) + { + struct d3d10_effect_shader_variable *s = v->data; + desc->pIAInputSignature = (BYTE *)s->input_signature; + desc->IAInputSignatureSize = s->input_signature_size; + break; + } + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface,

1 0

Henri Verbeet : d3d10: Store the shader's input signature.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 7c03f2c21bcb8d6c70c15222ac5cd02931f13ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c03f2c21bcb8d6c70c15222a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Store the shader's input signature. --- dlls/d3d10/d3d10_private.h | 7 +++ dlls/d3d10/effect.c | 99 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 956d5ae..01fa69c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -42,6 +42,13 @@ struct d3d10_effect_variable { enum d3d10_effect_variable_type type; DWORD idx_offset; + void *data; +}; + +struct d3d10_effect_shader_variable +{ + char *input_signature; + UINT input_signature_size; }; /* ID3D10EffectPass */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ebfa1da..cc02d1d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') +#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; @@ -52,6 +53,18 @@ static inline void skip_dword_unknown(const char **ptr, unsigned int count) } } +static inline void write_dword(char **ptr, DWORD d) +{ + memcpy(*ptr, &d, sizeof(d)); + *ptr += sizeof(d); +} + +static inline void write_dword_unknown(char **ptr, DWORD d) +{ + FIXME("Writing unknown DWORD 0x%08x\n", d); + write_dword(ptr, d); +} + static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) { read_dword(ptr, t); @@ -179,6 +192,8 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { + struct d3d10_effect_variable *v = ctx; + struct d3d10_effect_shader_variable *s = v->data; char tag_str[5]; memcpy(tag_str, &tag, 4); @@ -189,6 +204,49 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag switch(tag) { + case TAG_ISGN: + { + /* 32 (DXBC header) + 1 * 4 (chunk index) + 2 * 4 (chunk header) + data_size (chunk data) */ + UINT size = 44 + data_size; + char *ptr; + + s->input_signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!s->input_signature) + { + ERR("Failed to allocate input signature data\n"); + return E_OUTOFMEMORY; + } + s->input_signature_size = size; + + ptr = s->input_signature; + + write_dword(&ptr, TAG_DXBC); + + /* signature(?) */ + write_dword_unknown(&ptr, 0); + write_dword_unknown(&ptr, 0); + write_dword_unknown(&ptr, 0); + write_dword_unknown(&ptr, 0); + + /* seems to be always 1 */ + write_dword_unknown(&ptr, 1); + + /* DXBC size */ + write_dword(&ptr, size); + + /* chunk count */ + write_dword(&ptr, 1); + + /* chunk index */ + write_dword(&ptr, (ptr - s->input_signature) + 4); + + /* chunk */ + write_dword(&ptr, TAG_ISGN); + write_dword(&ptr, data_size); + memcpy(ptr, data, data_size); + break; + } + default: FIXME("Unhandled chunk %s\n", tag_str); break; @@ -202,6 +260,13 @@ static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) const char *ptr = data; DWORD dxbc_size; + v->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3d10_effect_shader_variable)); + if (!v->data) + { + ERR("Failed to allocate shader variable memory\n"); + return E_OUTOFMEMORY; + } + read_dword(&ptr, &dxbc_size); TRACE("dxbc size: %#x\n", dxbc_size); @@ -424,14 +489,46 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d return parse_dxbc(data, data_size, fx10_chunk_handler, This); } +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) +{ + TRACE("variable %p\n", v); + + if (!v->data) return; + + switch(v->type) + { + case D3D10_EVT_VERTEXSHADER: + case D3D10_EVT_PIXELSHADER: + case D3D10_EVT_GEOMETRYSHADER: + HeapFree(GetProcessHeap(), 0, ((struct d3d10_effect_shader_variable *)v->data)->input_signature); + break; + + default: + break; + } + HeapFree(GetProcessHeap(), 0, v->data); +} + static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { + TRACE("pass %p\n", p); + HeapFree(GetProcessHeap(), 0, p->name); - HeapFree(GetProcessHeap(), 0, p->variables); + if (p->variables) + { + unsigned int i; + for (i = 0; i < p->variable_count; ++i) + { + d3d10_effect_variable_destroy(&p->variables[i]); + } + HeapFree(GetProcessHeap(), 0, p->variables); + } } static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) { + TRACE("technique %p\n", t); + HeapFree(GetProcessHeap(), 0, t->name); if (t->passes) {

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectTechnique::GetDesc().
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 78afd8736cf585625123d59c1cc02588bc80a580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78afd8736cf585625123d59c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Implement ID3D10EffectTechnique::GetDesc(). --- dlls/d3d10/effect.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 656325c..ebfa1da 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -656,9 +656,16 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechniq static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, D3D10_TECHNIQUE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + desc->Name = This->name; + desc->Passes = This->pass_count; + WARN("Annotations not implemented\n"); + desc->Annotations = 0; + + return S_OK; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex(

1 0

Henri Verbeet : d3d10: Simplify DXBC chunk handlers.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 26b24ed8a5392c34ddcaf63644d5d57139282292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b24ed8a5392c34ddcaf6364… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Simplify DXBC chunk handlers. --- dlls/d3d10/effect.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bb7f7a8..656325c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -60,7 +60,7 @@ static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) } static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, void *ctx), void *ctx) + HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) { const char *ptr = data; HRESULT hr = S_OK; @@ -92,12 +92,19 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, for (i = 0; i < chunk_count; ++i) { + DWORD chunk_tag, chunk_size; + const char *chunk_ptr; DWORD chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - hr = chunk_handler(data + chunk_offset, ctx); + chunk_ptr = data + chunk_offset; + + read_dword(&chunk_ptr, &chunk_tag); + read_dword(&chunk_ptr, &chunk_size); + + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); if (FAILED(hr)) break; } @@ -170,18 +177,15 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons return hr; } -static HRESULT shader_chunk_handler(const char *data, void *ctx) +static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - const char *ptr = data; - DWORD chunk_size; char tag_str[5]; - DWORD tag; - read_tag(&ptr, &tag, tag_str); + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; TRACE("tag: %s\n", tag_str); - read_dword(&ptr, &chunk_size); - TRACE("chunk size: %#x\n", chunk_size); + TRACE("chunk size: %#x\n", data_size); switch(tag) { @@ -393,24 +397,21 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s return parse_fx10_body(e, ptr, data_size - (ptr - data)); } -static HRESULT fx10_chunk_handler(const char *data, void *ctx) +static HRESULT fx10_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { struct d3d10_effect *e = ctx; - const char *ptr = data; - DWORD chunk_size; char tag_str[5]; - DWORD tag; - read_tag(&ptr, &tag, tag_str); + memcpy(tag_str, &tag, 4); + tag_str[4] = '\0'; TRACE("tag: %s\n", tag_str); - read_dword(&ptr, &chunk_size); - TRACE("chunk size: %#x\n", chunk_size); + TRACE("chunk size: %#x\n", data_size); switch(tag) { case TAG_FX10: - return parse_fx10(e, ptr, chunk_size); + return parse_fx10(e, data, data_size); default: FIXME("Unhandled chunk %s\n", tag_str);

1 0

Henri Verbeet : d3d10: Actually use the parse_fx10() return value.
by Alexandre Julliard 03 Mar '09

03 Mar '09

Module: wine Branch: master Commit: 152c9637ac402acef194c85d3cd7111ed42699e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152c9637ac402acef194c85d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 3 09:03:46 2009 +0100 d3d10: Actually use the parse_fx10() return value. --- dlls/d3d10/effect.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 61b4a6f..bb7f7a8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -410,15 +410,12 @@ static HRESULT fx10_chunk_handler(const char *data, void *ctx) switch(tag) { case TAG_FX10: - parse_fx10(e, ptr, chunk_size); - break; + return parse_fx10(e, ptr, chunk_size); default: FIXME("Unhandled chunk %s\n", tag_str); - break; + return S_OK; } - - return S_OK; } HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size)

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009