November 2012 - Wine-commits

Alexandre Julliard : comctl32/pager: Don' t rely on PGN_CALCSIZE to set the non-scrollable dimension of the control.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 3ad9f29e02208c628d8b00bdd0384bac3d97610d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad9f29e02208c628d8b00bdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 17:18:17 2012 +0100 comctl32/pager: Don't rely on PGN_CALCSIZE to set the non-scrollable dimension of the control. --- dlls/comctl32/pager.c | 109 +++++++----------------------------------------- 1 files changed, 16 insertions(+), 93 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index d541374..3b2c11c 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -205,22 +205,24 @@ PAGER_GetBkColor(const PAGER_INFO *infoPtr) } static void -PAGER_CalcSize (const PAGER_INFO *infoPtr, INT* size, BOOL getWidth) +PAGER_CalcSize( PAGER_INFO *infoPtr ) { NMPGCALCSIZE nmpgcs; ZeroMemory (&nmpgcs, sizeof (NMPGCALCSIZE)); nmpgcs.hdr.hwndFrom = infoPtr->hwndSelf; nmpgcs.hdr.idFrom = GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_ID); nmpgcs.hdr.code = PGN_CALCSIZE; - nmpgcs.dwFlag = getWidth ? PGF_CALCWIDTH : PGF_CALCHEIGHT; - nmpgcs.iWidth = getWidth ? *size : 0; - nmpgcs.iHeight = getWidth ? 0 : *size; + nmpgcs.dwFlag = (infoPtr->dwStyle & PGS_HORZ) ? PGF_CALCWIDTH : PGF_CALCHEIGHT; + nmpgcs.iWidth = infoPtr->nWidth; + nmpgcs.iHeight = infoPtr->nHeight; SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); - *size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight; + if (infoPtr->dwStyle & PGS_HORZ) + infoPtr->nWidth = nmpgcs.iWidth; + else + infoPtr->nHeight = nmpgcs.iHeight; - TRACE("[%p] PGN_CALCSIZE returns %s=%d\n", infoPtr->hwndSelf, - getWidth ? "width" : "height", *size); + TRACE("[%p] PGN_CALCSIZE returns %dx%d\n", infoPtr->hwndSelf, nmpgcs.iWidth, nmpgcs.iHeight ); } static void @@ -281,16 +283,15 @@ PAGER_GetScrollRange(PAGER_INFO* infoPtr) RECT wndRect; GetWindowRect(infoPtr->hwndSelf, &wndRect); + PAGER_CalcSize(infoPtr); if (infoPtr->dwStyle & PGS_HORZ) { wndSize = wndRect.right - wndRect.left; - PAGER_CalcSize(infoPtr, &infoPtr->nWidth, TRUE); childSize = infoPtr->nWidth; } else { wndSize = wndRect.bottom - wndRect.top; - PAGER_CalcSize(infoPtr, &infoPtr->nHeight, FALSE); childSize = infoPtr->nHeight; } @@ -415,68 +416,6 @@ PAGER_WindowPosChanging(PAGER_INFO* infoPtr, WINDOWPOS *winpos) return DefWindowProcW (infoPtr->hwndSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM)winpos); } -static INT -PAGER_SetFixedWidth(PAGER_INFO* infoPtr) -{ - /* Must set the non-scrollable dimension to be less than the full height/width - * so that NCCalcSize is called. The Microsoft docs mention 3/4 factor for button - * size, and experimentation shows that the effect is almost right. */ - - RECT wndRect; - INT delta, h; - GetWindowRect(infoPtr->hwndSelf, &wndRect); - - /* see what the app says for btn width */ - PAGER_CalcSize(infoPtr, &infoPtr->nWidth, TRUE); - - if (infoPtr->dwStyle & CCS_NORESIZE) - { - delta = wndRect.right - wndRect.left - infoPtr->nWidth; - if (delta > infoPtr->nButtonSize) - infoPtr->nWidth += 4 * infoPtr->nButtonSize / 3; - else if (delta > 0) - infoPtr->nWidth += infoPtr->nButtonSize / 3; - } - - h = wndRect.bottom - wndRect.top + infoPtr->nButtonSize; - - TRACE("[%p] infoPtr->nWidth set to %d\n", - infoPtr->hwndSelf, infoPtr->nWidth); - - return h; -} - -static INT -PAGER_SetFixedHeight(PAGER_INFO* infoPtr) -{ - /* Must set the non-scrollable dimension to be less than the full height/width - * so that NCCalcSize is called. The Microsoft docs mention 3/4 factor for button - * size, and experimentation shows that the effect is almost right. */ - - RECT wndRect; - INT delta, w; - GetWindowRect(infoPtr->hwndSelf, &wndRect); - - /* see what the app says for btn height */ - PAGER_CalcSize(infoPtr, &infoPtr->nHeight, FALSE); - - if (infoPtr->dwStyle & CCS_NORESIZE) - { - delta = wndRect.bottom - wndRect.top - infoPtr->nHeight; - if (delta > infoPtr->nButtonSize) - infoPtr->nHeight += infoPtr->nButtonSize; - else if (delta > 0) - infoPtr->nHeight += infoPtr->nButtonSize / 3; - } - - w = wndRect.right - wndRect.left + infoPtr->nButtonSize; - - TRACE("[%p] infoPtr->nHeight set to %d\n", - infoPtr->hwndSelf, infoPtr->nHeight); - - return w; -} - /****************************************************************** * For the PGM_RECALCSIZE message (but not the other uses in * * this module), the native control does only the following: * @@ -561,28 +500,14 @@ PAGER_SetButtonSize (PAGER_INFO* infoPtr, INT iButtonSize) static LRESULT PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild) { - INT hw; - infoPtr->hwndChild = IsWindow (hwndChild) ? hwndChild : 0; if (infoPtr->hwndChild) { TRACE("[%p] hwndChild=%p\n", infoPtr->hwndSelf, infoPtr->hwndChild); - if (infoPtr->dwStyle & PGS_HORZ) { - hw = PAGER_SetFixedHeight(infoPtr); - /* adjust non-scrollable dimension to fit the child */ - SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, hw, infoPtr->nHeight, - SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | - SWP_NOSIZE | SWP_NOACTIVATE); - } - else { - hw = PAGER_SetFixedWidth(infoPtr); - /* adjust non-scrollable dimension to fit the child */ - SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, infoPtr->nWidth, hw, - SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | - SWP_NOSIZE | SWP_NOACTIVATE); - } + SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, + SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); /* position child within the page scroller */ SetWindowPos(infoPtr->hwndChild, HWND_TOP, @@ -721,11 +646,12 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) MapWindowPoints (0, infoPtr->hwndSelf, (LPPOINT)&rcChild, 2); /* FIXME: RECT != 2 POINTS */ GetWindowRect (infoPtr->hwndSelf, &rcWindow); + infoPtr->nWidth = lpRect->right - lpRect->left; + infoPtr->nHeight = lpRect->bottom - lpRect->top; + PAGER_CalcSize( infoPtr ); + if (infoPtr->dwStyle & PGS_HORZ) { - infoPtr->nWidth = lpRect->right - lpRect->left; - PAGER_CalcSize (infoPtr, &infoPtr->nWidth, TRUE); - if (infoPtr->TLbtnState && (lpRect->left + infoPtr->nButtonSize < lpRect->right)) lpRect->left += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->right - infoPtr->nButtonSize > lpRect->left)) @@ -733,9 +659,6 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) } else { - infoPtr->nHeight = lpRect->bottom - lpRect->top; - PAGER_CalcSize (infoPtr, &infoPtr->nHeight, FALSE); - if (infoPtr->TLbtnState && (lpRect->top + infoPtr->nButtonSize < lpRect->bottom)) lpRect->top += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))

1 0

Alexandre Julliard : comctl32/tests: Add some initial pager tests.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: c3f0abfa405996805707243c3d60f7629ae14090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f0abfa405996805707243c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 17:21:08 2012 +0100 comctl32/tests: Add some initial pager tests. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/pager.c | 204 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 145c125..670f52e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ misc.c \ monthcal.c \ mru.c \ + pager.c \ progress.c \ propsheet.c \ rebar.c \ diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c new file mode 100644 index 0000000..8ac062d --- /dev/null +++ b/dlls/comctl32/tests/pager.c @@ -0,0 +1,204 @@ +/* + * Unit tests for the pager control + * + * Copyright 2012 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" +#include "msg.h" + +#define NUM_MSG_SEQUENCES 1 +#define PAGER_SEQ_INDEX 0 + +static HWND parent_wnd; + +static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + +static const struct message set_child_seq[] = { + { PGM_SETCHILD, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, + { WM_WINDOWPOSCHANGED, sent }, + { 0 } +}; + +static const struct message set_pos_seq[] = { + { PGM_SETPOS, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { 0 } +}; + +static const struct message set_pos_empty_seq[] = { + { PGM_SETPOS, sent }, + { 0 } +}; + +static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCPAINT && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam|parent; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + add_message(sequences, PAGER_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static BOOL register_parent_wnd_class(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = parent_wnd_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "Pager test parent class"; + return RegisterClassA(&cls); +} + +static HWND create_parent_window(void) +{ + if (!register_parent_wnd_class()) + return NULL; + + return CreateWindow("Pager test parent class", "Pager test parent window", + WS_OVERLAPPED | WS_VISIBLE, + 0, 0, 200, 200, 0, NULL, GetModuleHandleA(NULL), NULL ); +} + +static LRESULT WINAPI pager_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + struct message msg; + + trace("pager: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = 0; + add_message(sequences, PAGER_SEQ_INDEX, &msg); + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static HWND create_pager_control( DWORD style ) +{ + WNDPROC oldproc; + HWND hwnd; + RECT rect; + + GetClientRect( parent_wnd, &rect ); + hwnd = CreateWindowA( WC_PAGESCROLLERA, "pager", WS_CHILD | WS_BORDER | WS_VISIBLE | style, + 0, 0, 100, 100, parent_wnd, 0, GetModuleHandleA(0), 0 ); + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)pager_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + return hwnd; +} + +static void test_pager(void) +{ + HWND pager, child; + RECT rect; + + pager = create_pager_control( PGS_HORZ ); + if (!pager) + { + win_skip( "Pager control not supported\n" ); + return; + } + child = CreateWindowA( "BUTTON", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, + pager, 0, GetModuleHandleA(0), 0 ); + + flush_sequences( sequences, NUM_MSG_SEQUENCES ); + SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child ); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", TRUE); + GetWindowRect( pager, &rect ); + ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); + + flush_sequences( sequences, NUM_MSG_SEQUENCES ); + SendMessageA( pager, PGM_SETPOS, 0, 10 ); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE); + GetWindowRect( pager, &rect ); + ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); + + flush_sequences( sequences, NUM_MSG_SEQUENCES ); + SendMessageA( pager, PGM_SETPOS, 0, 10 ); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_empty_seq, "set pos empty", TRUE); + + flush_sequences( sequences, NUM_MSG_SEQUENCES ); + SendMessageA( pager, PGM_SETPOS, 0, 9 ); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE); + + DestroyWindow( pager ); +} + +START_TEST(pager) +{ + HMODULE mod = GetModuleHandleA("comctl32.dll"); + + pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); + + InitCommonControls(); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + + parent_wnd = create_parent_window(); + ok(parent_wnd != NULL, "Failed to create parent window!\n"); + + test_pager(); +}

1 0

Alexandre Julliard : user32: Make sure the scroll button arrows are really at least 3 pixels.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 4428049a7a77069330d77b6fccb7aab3537d1003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4428049a7a77069330d77b6fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 19:46:46 2012 +0100 user32: Make sure the scroll button arrows are really at least 3 pixels. --- dlls/user32/uitools.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index f1ce0d6..a21ab7b 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1001,8 +1001,7 @@ static BOOL UITOOLS95_DrawFrameScroll(HDC dc, LPRECT r, UINT uFlags) * with the updown control. * Making sure that the arrow is as least 3 pixels wide (or high). */ - if (tri == 0) - tri = 1; + tri = max( 2, tri ); switch(uFlags & 0xff) {

1 0

Michael Stefaniuc : shell32: Use the proper type for a function pointer field.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 0705793eb0abf9e716dfd7407dda1348bbf32484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0705793eb0abf9e716dfd7407… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 20 13:13:18 2012 +0100 shell32: Use the proper type for a function pointer field. --- dlls/shell32/shellord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7f329de..c1fb382 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -60,7 +60,7 @@ typedef struct tagCREATEMRULIST DWORD dwFlags; /* see below */ HKEY hKey; /* root reg. key under which list is saved */ LPCSTR lpszSubKey; /* reg. subkey */ - PROC lpfnCompare; /* item compare proc */ + int (CALLBACK *lpfnCompare)(LPCVOID, LPCVOID, DWORD); /* item compare proc */ } CREATEMRULISTA, *LPCREATEMRULISTA; /* dwFlags */ @@ -927,7 +927,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) mymru.dwFlags = MRUF_BINARY_LIST | MRUF_DELAYED_SAVE; mymru.hKey = HCUbasekey; mymru.lpszSubKey = "RecentDocs"; - mymru.lpfnCompare = (PROC)SHADD_compare_mru; + mymru.lpfnCompare = SHADD_compare_mru; mruhandle = CreateMRUListA(&mymru); if (!mruhandle) { /* MRU failed */

1 0

Michael Stefaniuc : comdlg32/tests: Fix the prototype of callback functions .
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 098fd250095f6ac6f540336e2adcb4bfff47be93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098fd250095f6ac6f540336e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 20 13:35:05 2012 +0100 comdlg32/tests: Fix the prototype of callback functions. --- dlls/comdlg32/tests/filedlg.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index b701956..9ae4e66 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -239,7 +239,7 @@ cleanup: return 0; } -static LONG_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_INITDIALOG) { @@ -286,7 +286,7 @@ static void test_create_view_template(void) ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; + ofn.lpfnHook = template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleA(NULL); ofn.lpTemplateName = "template1"; @@ -318,7 +318,7 @@ static const struct { { 0xffffffff } }; -static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { static RECT initrc, rc; static int index, count; @@ -538,7 +538,7 @@ static void test_resize(void) ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; + ofn.lpfnHook = resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); ofn.lpTemplateName = "template_sz"; for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { @@ -581,7 +581,7 @@ static ok_wndproc_testcase ok_testcases[] = { /* test_ok_wndproc can be used as hook procedure or a subclass * window proc for the file dialog */ -static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { HWND parent = GetParent( dlg); static ok_wndproc_testcase *testcase = NULL; @@ -624,7 +624,7 @@ static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM return FALSE; } -static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (msg == WM_SETFONT) SetWindowLongPtrA( dlg, GWLP_WNDPROC, (LONG_PTR) test_ok_wndproc); @@ -655,9 +655,7 @@ static void test_ok(void) for( i = 0; ok_testcases[i].retval != -1; i++) { strcpy( filename, tmpfilename); ofn.lCustData = (LPARAM)(ok_testcases + i); - ofn.lpfnHook = ok_testcases[i].do_subclass - ? (LPOFNHOOKPROC) ok_template_hook - : (LPOFNHOOKPROC) test_ok_wndproc; + ofn.lpfnHook = ok_testcases[i].do_subclass ? ok_template_hook : test_ok_wndproc; ret = GetOpenFileNameA(&ofn); ok( ok_testcases[i].expclose == ok_testcases[i].actclose, "testid %d: Open File dialog should %shave closed.\n", i, @@ -706,7 +704,7 @@ static struct { { -1 } }; -static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) +static UINT_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wParam, LPARAM lParam) { static int index, fixhelp; static posz posz0[2]; @@ -846,7 +844,7 @@ static void test_arrange(void) ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; ofn.lpstrFile = filename; ofn.nMaxFile = 1024; - ofn.lpfnHook = (LPOFNHOOKPROC)template_hook_arrange; + ofn.lpfnHook = template_hook_arrange; ofn.hInstance = hDlgTmpl; ofn.lpstrFilter="text\0*.txt\0All\0*\0\0"; for( i = 0; arrange_tests[i].nrcontrols != -1; i++) { @@ -996,7 +994,7 @@ static void test_mru(void) ofn.hInstance = GetModuleHandle(NULL); ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_NOCHANGEDIR; ofn.lCustData = (LPARAM)&testcase; - ofn.lpfnHook = (LPOFNHOOKPROC)test_ok_wndproc; + ofn.lpfnHook = test_ok_wndproc; SetLastError(0xdeadbeef); ret = CreateDirectoryA(test_dir_name, NULL);

1 0

Jacek Caban : mshtml: Use stdint.h type names in nsiface.idl.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 96ace8636a307e30144df074c6906bb978ffbf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ace8636a307e30144df074c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 20 15:29:21 2012 +0100 mshtml: Use stdint.h type names in nsiface.idl. Gecko uses stdint.h types instead of NSPR types for most of the codebase now. --- dlls/mshtml/nsiface.idl | 934 ++++++++++++++++++++++++----------------------- 1 files changed, 475 insertions(+), 459 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96ace8636a307e30144df…

1 0

Aric Stewart : wineqtdecoder: Properly clean up splitter and loader threads on QTSplitter destruction.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 2a4cab537531104c59e42f48444985dc0f9d5eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4cab537531104c59e42f484… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 08:08:36 2012 -0600 wineqtdecoder: Properly clean up splitter and loader threads on QTSplitter destruction. --- dlls/wineqtdecoder/qtsplitter.c | 56 +++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index b584198..a3cd91f 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -168,6 +168,9 @@ typedef struct QTSplitter { TimeValue movie_time; TimeValue movie_start; TimeScale movie_scale; + + HANDLE loaderThread; + HANDLE splitterThread; } QTSplitter; static const IPinVtbl QT_OutputPin_Vtbl; @@ -293,6 +296,7 @@ static void QT_Destroy(QTSplitter *This) TRACE("Destroying\n"); + EnterCriticalSection(&This->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo(&This->pInputPin.pin.IPin_iface, &connected); if (connected) @@ -311,14 +315,31 @@ static void QT_Destroy(QTSplitter *This) } if (This->pQTMovie) + { DisposeMovie(This->pQTMovie); + This->pQTMovie = NULL; + } if (This->vContext) QTVisualContextRelease(This->vContext); if (This->aSession) MovieAudioExtractionEnd(This->aSession); - CloseHandle(This->runEvent); ExitMovies(); + LeaveCriticalSection(&This->csReceive); + + if (This->loaderThread) + { + WaitForSingleObject(This->loaderThread, INFINITE); + CloseHandle(This->loaderThread); + } + if (This->splitterThread) + { + SetEvent(This->runEvent); + WaitForSingleObject(This->splitterThread, INFINITE); + CloseHandle(This->splitterThread); + } + + CloseHandle(This->runEvent); This->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csReceive); @@ -495,13 +516,15 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) to try to minimize that. */ - while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) + EnterCriticalSection(&This->csReceive); + while(This->pQTMovie && GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) { - EnterCriticalSection(&This->csReceive); MoviesTask(This->pQTMovie, 100); LeaveCriticalSection(&This->csReceive); Sleep(0); + EnterCriticalSection(&This->csReceive); } + LeaveCriticalSection(&This->csReceive); } return 0; } @@ -518,6 +541,12 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); EnterCriticalSection(&This->csReceive); + if (!This->pQTMovie) + { + LeaveCriticalSection(&This->csReceive); + return 0; + } + This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); @@ -536,6 +565,12 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) float time; EnterCriticalSection(&This->csReceive); + if (!This->pQTMovie) + { + LeaveCriticalSection(&This->csReceive); + return 0; + } + GetMovieNextInterestingTime(This->pQTMovie, nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); if (next_time == -1) @@ -992,7 +1027,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) Track trk; short id = 0; DWORD tid; - HANDLE thread; LONGLONG time; TRACE("Trying movie connect\n"); @@ -1039,18 +1073,12 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); - thread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); - if (thread) - { + filter->loaderThread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); + if (filter->loaderThread) TRACE("Created loading thread 0x%08x\n", tid); - CloseHandle(thread); - } - thread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); - if (thread) - { + filter->splitterThread = CreateThread(NULL, 0, QTSplitter_thread, filter, 0, &tid); + if (filter->splitterThread) TRACE("Created processing thread 0x%08x\n", tid); - CloseHandle(thread); - } else hr = HRESULT_FROM_WIN32(GetLastError());

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTDRAWSURFACE.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 34dd6ff2e4811b92639bc54a5615f58472c4b602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd6ff2e4811b92639bc54a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:10 2012 +0100 d3drm: Avoid LPDIRECTDRAWSURFACE. --- dlls/d3drm/d3drm.c | 28 ++++++++++++---------------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/frame.c | 16 ++++++++-------- dlls/d3drm/texture.c | 9 ++++++--- include/d3drm.h | 21 ++++++++++++--------- include/d3drmobj.h | 28 ++++++++++++++-------------- 6 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34dd6ff2e4811b92639bc…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTDRAWCLIPPER.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 0a7e2accc4844e34334d9f58a7e4c2057eeb910d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7e2accc4844e34334d9f58a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:11 2012 +0100 d3drm: Avoid LPDIRECTDRAWCLIPPER. --- dlls/d3drm/d3drm.c | 20 ++++++++++---------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/tests/d3drm.c | 4 ++-- include/d3drm.h | 12 ++++++------ include/d3drmobj.h | 6 +++--- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cadfd70..e90ce30 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -260,7 +260,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LP return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface, LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM *iface, + IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height, + IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); @@ -638,10 +640,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* iface, - LPDIRECTDRAWCLIPPER pDDClipper, - LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2 *iface, + IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height, + IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -1083,14 +1084,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3* iface, - LPDIRECTDRAWCLIPPER clipper, - LPGUID GUID, int width, int height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3 *iface, + IDirectDrawClipper *clipper, GUID *guid, int width, int height, + IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(GUID), + FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(guid), width, height, device); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c43c27c..05ca080 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -223,9 +223,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -652,9 +651,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cde1577..7fee3e1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -944,9 +944,9 @@ static void test_Frame(void) static void test_Viewport(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMFRAME pFrame; LPDIRECT3DRMVIEWPORT pViewport; @@ -1177,9 +1177,9 @@ static void test_Texture(void) static void test_Device(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMWINDEVICE pWinDevice; GUID driver; diff --git a/include/d3drm.h b/include/d3drm.h index b228400..3ec1183 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -72,8 +72,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, @@ -207,8 +207,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, @@ -345,8 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c0ec232..3bafd9d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -504,7 +504,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -649,7 +649,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;

1 0

Henri Verbeet : d3d9: Avoid resetting device state for d3d9ex resets.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Module: wine Branch: master Commit: 79f0b4d9771d7fbd553770f7337309a7d96527e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f0b4d9771d7fbd553770f73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:12 2012 +0100 d3d9: Avoid resetting device state for d3d9ex resets. --- dlls/d3d8/device.c | 3 +- dlls/d3d9/device.c | 11 ++---- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 70 ++++++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c73f065..b4bd3f9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -597,7 +597,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + NULL, reset_enum_callback, TRUE))) { wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ce5bf1a..0c70f96 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -582,8 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback); - if (FAILED(hr)) + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + NULL, reset_enum_callback, !device->d3d_parent->extended); + if (FAILED(hr) && !device->d3d_parent->extended) device->not_reset = TRUE; else device->not_reset = FALSE; @@ -2907,11 +2908,7 @@ static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback); - if (FAILED(hr)) - device->not_reset = TRUE; - else - device->not_reset = FALSE; + mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 376db17..14fc73d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2867,7 +2867,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, swapchain_desc.backbuffer_format = mode.format_id; hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback); + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE); if (FAILED(hr)) { ERR("Failed to reset device.\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16287ad..ea11f70 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4974,15 +4974,15 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, - wined3d_device_reset_cb callback) + wined3d_device_reset_cb callback, BOOL reset_state) { struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + HRESULT hr = WINED3D_OK; unsigned int i; - HRESULT hr; TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); @@ -4992,7 +4992,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - stateblock_unbind_resources(device->stateBlock); + if (reset_state) + stateblock_unbind_resources(device->stateBlock); + if (device->fb.render_targets) { if (swapchain->back_buffers && swapchain->back_buffers[0]) @@ -5012,11 +5014,14 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->onscreen_depth_stencil = NULL; } - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + if (reset_state) { - TRACE("Enumerating resource %p.\n", resource); - if (FAILED(hr = callback(resource))) - return hr; + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Enumerating resource %p.\n", resource); + if (FAILED(hr = callback(resource))) + return hr; + } } /* Is it necessary to recreate the gl context? Actually every setting can be changed @@ -5067,8 +5072,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil && !device->auto_depth_stencil) { - HRESULT hr; - TRACE("Creating the depth stencil buffer\n"); if (FAILED(hr = device->device_parent->ops->create_swapchain_surface(device->device_parent, @@ -5222,28 +5225,49 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->exStyle = exStyle; } - TRACE("Resetting stateblock.\n"); - wined3d_stateblock_decref(device->updateStateBlock); - wined3d_stateblock_decref(device->stateBlock); + if (reset_state) + { + TRACE("Resetting stateblock.\n"); + wined3d_stateblock_decref(device->updateStateBlock); + wined3d_stateblock_decref(device->stateBlock); - if (device->d3d_initialized) - delete_opengl_contexts(device, swapchain); + if (device->d3d_initialized) + delete_opengl_contexts(device, swapchain); - /* Note: No parent needed for initial internal stateblock */ - hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); - if (FAILED(hr)) - ERR("Resetting the stateblock failed with error %#x.\n", hr); + /* Note: No parent needed for initial internal stateblock */ + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); + if (FAILED(hr)) + ERR("Resetting the stateblock failed with error %#x.\n", hr); + else + TRACE("Created stateblock %p.\n", device->stateBlock); + device->updateStateBlock = device->stateBlock; + wined3d_stateblock_incref(device->updateStateBlock); + + stateblock_init_default_state(device->stateBlock); + } else - TRACE("Created stateblock %p.\n", device->stateBlock); - device->updateStateBlock = device->stateBlock; - wined3d_stateblock_incref(device->updateStateBlock); + { + struct wined3d_surface *rt = device->fb.render_targets[0]; + struct wined3d_state *state = &device->stateBlock->state; - stateblock_init_default_state(device->stateBlock); + /* Note the min_z / max_z is not reset. */ + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = rt->resource.width; + state->viewport.height = rt->resource.height; + device_invalidate_state(device, STATE_VIEWPORT); + + state->scissor_rect.top = 0; + state->scissor_rect.left = 0; + state->scissor_rect.right = rt->resource.width; + state->scissor_rect.bottom = rt->resource.height; + device_invalidate_state(device, STATE_SCISSORRECT); + } swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); - if (device->d3d_initialized) + if (reset_state && device->d3d_initialized) hr = create_primary_opengl_context(device, swapchain); /* All done. There is no need to reload resources or shaders, this will happen automatically on the diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f8364e1..e97c102 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -102,7 +102,7 @@ @ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) -@ cdecl wined3d_device_reset(ptr ptr ptr ptr) +@ cdecl wined3d_device_reset(ptr ptr ptr ptr long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7169a25..329698a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2184,7 +2184,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, - wined3d_device_reset_cb callback); + wined3d_device_reset_cb callback, BOOL reset_state); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,

1 0