August 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : user32: Use straight assignments instead of CopyRect() .
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 07f9f71278c880713f2692966c3a6483a8765beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f9f71278c880713f2692966… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 19:09:01 2016 +0200 user32: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/sysparams.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index c744ee5..a2e8b3c 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -777,7 +777,7 @@ static void CBPaintBorder( } else { - CopyRect(&clientRect, &lphc->textRect); + clientRect = lphc->textRect; InflateRect(&clientRect, EDIT_CONTROL_PADDING(), EDIT_CONTROL_PADDING()); InflateRect(&clientRect, COMBO_XBORDERSIZE(), COMBO_YBORDERSIZE()); diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 23139e9..46fda41 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4665,7 +4665,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case EM_GETRECT: if (lParam) - CopyRect((LPRECT)lParam, &es->format_rect); + *((LPRECT)lParam) = es->format_rect; break; case EM_SETRECT: diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a42a302..63c4ffe 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1683,7 +1683,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (!pvParam) return FALSE; spi_idx = SPI_SETWORKAREA_IDX; - CopyRect( &work_area, pvParam ); + work_area = *(RECT*)pvParam; spi_loaded[spi_idx] = TRUE; ret = TRUE; break; @@ -1702,7 +1702,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } - CopyRect( pvParam, &work_area ); + *(RECT*)pvParam = work_area; ret = TRUE; TRACE("work area %s\n", wine_dbgstr_rect( &work_area )); break;

1 0

Michael Stefaniuc : uxtheme: Use straight assignments instead of CopyRect( ).
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 74a03b1adc0fe080225b6b491c1d18f62f61f566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a03b1adc0fe080225b6b491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 19:11:09 2016 +0200 uxtheme: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 730a26c..753ac36 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -98,9 +98,9 @@ HRESULT WINAPI DrawThemeParentBackground(HWND hwnd, HDC hdc, RECT *prc) if(!hParent) hParent = hwnd; if(prc) { - CopyRect(&rt, prc); + rt = *prc; MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); - + clip = CreateRectRgn(0,0,1,1); hasClip = GetClipRgn(hdc, clip); if(hasClip == -1) @@ -142,7 +142,7 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, opts.dwFlags = 0; if(pClipRect) { opts.dwFlags |= DTBG_CLIPRECT; - CopyRect(&opts.rcClip, pClipRect); + opts.rcClip = *pClipRect; } return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); } @@ -578,7 +578,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; - CopyRect(&rcDst, prc); + rcDst = *prc; dstSize.x = rcDst.right-rcDst.left; dstSize.y = rcDst.bottom-rcDst.top; @@ -2021,8 +2021,8 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId, return E_HANDLE; if(pBoundingRect) - CopyRect(&rt, pBoundingRect); - + rt = *pBoundingRect; + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); if(SUCCEEDED(hr)) { hFont = CreateFontIndirectW(&logfont);

1 0

Nikolay Sivov : comctl32/tests: Test that callback mask is stored as is, check more message results.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 9ef65cf3d6af2e488d7efcb94fe61aa7e8540351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef65cf3d6af2e488d7efcb94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 21:03:47 2016 +0300 comctl32/tests: Test that callback mask is stored as is, check more message results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 73 +++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 97f611f..811800c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1179,7 +1179,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_SELECTED, "Expected LVIS_SELECTED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_SELECTED with zero stateMask */ /* set */ @@ -1201,7 +1202,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_FOCUSED, "Expected LVIS_FOCUSED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_CUT with LVIS_FOCUSED stateMask */ /* set */ @@ -1223,7 +1225,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_CUT, "Expected LVIS_CUT\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* Insert an item with just a param */ memset (&item, 0xcc, sizeof (item)); @@ -2294,15 +2297,18 @@ static void test_multiselect(void) /* deselect all items */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); /* set initial position */ - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + ok(r, "got %d\n", r); item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + ok(r, "got %d\n", r); selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %d\n", selected_count); @@ -2347,7 +2353,8 @@ static void test_multiselect(void) /* select all, check notifications */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2381,7 +2388,8 @@ static void test_multiselect(void) item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "deselect all notification", FALSE); @@ -2410,11 +2418,13 @@ static void test_multiselect(void) ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, "set state all notification 3", FALSE); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r, "got %d\n", r); for (i = 0; i < 3; i++) { item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + ok(r, "got %d\n", r); } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2435,13 +2445,14 @@ static void test_multiselect(void) } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(3, r); - SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); - expect(3, r); + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == -1, "got %d\n", r); /* select one more */ item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + ok(r, "got %d\n", r); for (i=0;i<3;i++) { r = SendMessageA(hwnd, LVM_GETITEMSTATE, i, LVIS_SELECTED); @@ -2461,7 +2472,8 @@ static void test_multiselect(void) item.stateMask = LVIS_SELECTED; r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r == -1, "got %d\n", r); item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED; @@ -2681,7 +2693,8 @@ static void test_subitem_rect(void) expect(100, rect.left); expect(250, rect.right); - SendMessageA(hwnd, LVM_SCROLL, 10, 0); + r = SendMessageA(hwnd, LVM_SCROLL, 10, 0); + ok(r, "got %d\n", r); SetRect(&rect, LVIR_BOUNDS, 1, 0, 0); r = SendMessageA(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); @@ -3798,7 +3811,8 @@ static void test_getviewrect(void) memset(&item, 0, sizeof(item)); item.iItem = 0; item.iSubItem = 0; - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(!r, "got %d\n", r); r = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); expect(TRUE, r); @@ -3860,7 +3874,8 @@ static void test_getitemposition(void) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); SetRectEmpty(&rect); - SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + r = SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + ok(r, "got %d\n", r); /* some padding? */ expect(2, pt.x); /* offset by header height */ @@ -4859,7 +4874,8 @@ static void test_getcolumnwidth(void) /* default column width with item added */ hwnd = create_listview_control(LVS_LIST); memset(&itema, 0, sizeof(itema)); - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ok(!ret, "got %d\n", ret); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); height = get_current_font_height(hwnd); ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); @@ -5798,6 +5814,26 @@ static void test_oneclickactivate(void) DestroyWindow(hwnd); } +static void test_callback_mask(void) +{ + DWORD mask; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 0); + ok(ret, "got %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 1); + ok(ret, "got %d\n", ret); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == ~0u, "got 0x%08x\n", mask); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5868,6 +5904,7 @@ START_TEST(listview) test_insertitem(); test_header_proc(); test_oneclickactivate(); + test_callback_mask(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Michael Stefaniuc : dwrite/tests: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: b8a3fabc0cbb7283c09fd72bd363479c7fa1524f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a3fabc0cbb7283c09fd72bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jul 30 22:01:04 2016 +0200 dwrite/tests: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3b402b8..6070c58 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4316,7 +4316,7 @@ static void test_CreateGlyphRunAnalysis(void) rect.top == 0 && rect.bottom == 0, "unexpected rect\n"); /* check how origin affects bounds */ - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect), "got empty rect\n"); @@ -4327,7 +4327,7 @@ static void test_CreateGlyphRunAnalysis(void) DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, 0.0, 0.0, &analysis); ok(hr == S_OK, "got 0x%08x\n", hr); - memset(&rect2, 0, sizeof(rect2)); + SetRectEmpty(&rect2); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(rect.right - rect.left < rect2.right - rect2.left, "expected wider rect\n"); @@ -4339,7 +4339,7 @@ static void test_CreateGlyphRunAnalysis(void) 10.0, -5.0, &analysis); ok(hr == S_OK, "got 0x%08x\n", hr); - memset(&rect2, 0, sizeof(rect2)); + SetRectEmpty(&rect2); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect2), "got empty rect\n"); @@ -4356,7 +4356,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (rendermodes[i] == DWRITE_RENDERING_MODE_ALIASED) { - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect), "got empty rect\n"); @@ -4372,7 +4372,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsRectEmpty(&rect), "got empty rect\n"); - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect), "got empty rect\n"); @@ -4393,7 +4393,7 @@ static void test_CreateGlyphRunAnalysis(void) 0.0, 0.0, &analysis); ok(hr == S_OK, "got 0x%08x\n", hr); - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : ntdll: Fix its vs it's typos.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 7de025c970e7239316ad25b9c6c6bafd1647de48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de025c970e7239316ad25b9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 01:10:09 2016 +0300 ntdll: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 2 +- dlls/ntdll/threadpool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bef85a8..c179760 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1537,7 +1537,7 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu * purposes. The following table lists all possible states the lock can be * in, notation: [X, #exclusive, #shared]: * - * [0, 0, N] -> locked by N shared access threads, if N=0 its unlocked + * [0, 0, N] -> locked by N shared access threads, if N=0 it's unlocked * [0, >=1, >=1] -> threads are requesting exclusive locks, but there are * still shared access threads inside. #shared should not be incremented * anymore! diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 15510e2..799245c 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1217,7 +1217,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) timer->u.timer.timer_pending = FALSE; tp_object_submit( timer, FALSE ); - /* Insert the timer back into the queue, except its marked for shutdown. */ + /* Insert the timer back into the queue, except it's marked for shutdown. */ if (timer->u.timer.period && !timer->shutdown) { timer->u.timer.timeout += (ULONGLONG)timer->u.timer.period * 10000;

1 0

Nikolay Sivov : ddraw: Fix its vs it's typos.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: a4fabd283dd4d640ff6afc90905048b65df53ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4fabd283dd4d640ff6afc909… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 01:10:08 2016 +0300 ddraw: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b3b171a..667dcd0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -180,7 +180,7 @@ struct ddraw_surface */ #define MAX_COMPLEX_ATTACHED 6 struct ddraw_surface *complex_array[MAX_COMPLEX_ATTACHED]; - /* You can't traverse the tree upwards. Only a flag for Surface::Release because its needed there, + /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ BOOL is_complex_root; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0f7398b..bb9e37f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -772,7 +772,7 @@ HRESULT WINAPI DllUnregisterServer(void) * * Params: * surf: The enumerated surface - * desc: it's description + * desc: its description * context: Pointer to the ddraw impl * * Returns: diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d877020..8c82e4c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -415,7 +415,7 @@ static void StateTest( void ) { HRESULT rc; - /* The msdn says its undocumented, does it return an error too? */ + /* The msdn says it's undocumented, does it return an error too? */ rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, TRUE); ok(rc == D3D_OK, "IDirect3DDevice7_SetRenderState(D3DRENDERSTATE_ZVISIBLE, TRUE) returned %08x\n", rc); rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, FALSE); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 154f9aa..000158d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -480,7 +480,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, } /* According to the d3d test, the offscreen flag is set only - * if exactly one vertex is transformed. Its not documented, + * if exactly one vertex is transformed. It's not documented, * but the test shows that the lpOffscreen flag is set to the * flag combination of clipping planes that clips the vertex. * @@ -580,7 +580,7 @@ static HRESULT WINAPI d3d_viewport_GetBackground(IDirect3DViewport3 *iface, /***************************************************************************** * IDirect3DViewport3::SetBackgroundDepth * - * Sets a surface that represents the background depth. It's contents are + * Sets a surface that represents the background depth. Its contents are * used to set the depth buffer in IDirect3DViewport3::Clear * * Params:

1 0

Józef Kucia : wined3d: Extract wined3d_swapchain_set_fullscreen() from wined3d_device_reset().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: cad279449c62a965a70a712a91b11ba52c4ff4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad279449c62a965a70a712a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 1 22:28:35 2016 +0200 wined3d: Extract wined3d_swapchain_set_fullscreen() from wined3d_device_reset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 74 ++++------------------------------------------- dlls/wined3d/swapchain.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 80 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb3a23b..55046db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4641,8 +4641,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view_desc view_desc; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; - struct wined3d_display_mode m; - BOOL DisplayModeChanged; HRESULT hr = WINED3D_OK; unsigned int i; @@ -4654,7 +4652,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, ERR("Failed to get the first implicit swapchain.\n"); return WINED3DERR_INVALIDCALL; } - DisplayModeChanged = swapchain->reapply_mode; if (reset_state) { @@ -4733,72 +4730,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_swapchain_set_window(swapchain, NULL); } - if (mode) - { - DisplayModeChanged = TRUE; - m = *mode; - } - else if (swapchain_desc->windowed) - { - m = swapchain->original_mode; - } - else - { - m.width = swapchain_desc->backbuffer_width; - m.height = swapchain_desc->backbuffer_height; - m.refresh_rate = swapchain_desc->refresh_rate; - m.format_id = swapchain_desc->backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - - if ((m.width != swapchain->desc.backbuffer_width - || m.height != swapchain->desc.backbuffer_height)) - DisplayModeChanged = TRUE; - } - if (!swapchain_desc->windowed != !swapchain->desc.windowed - || DisplayModeChanged) + || swapchain->reapply_mode || mode + || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width + || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &m))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } - - if (!swapchain_desc->windowed) - { - if (swapchain->desc.windowed) - { - HWND focus_window = device->create_parms.focus_window; - if (!focus_window) - focus_window = swapchain_desc->device_window; - if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - return hr; - } - - /* switch from windowed to fs */ - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height); - } - else - { - /* Fullscreen -> fullscreen mode change */ - MoveWindow(swapchain->device_window, 0, 0, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height, - TRUE); - } - swapchain->d3d_mode = m; - } - else if (!swapchain->desc.windowed) - { - /* Fullscreen -> windowed switch */ - wined3d_device_restore_fullscreen_window(device, swapchain->device_window); - wined3d_device_release_focus_window(device); - } - swapchain->desc.windowed = swapchain_desc->windowed; + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) + return hr; } else if (!swapchain_desc->windowed) { @@ -4832,7 +4770,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_resource_desc texture_desc; struct wined3d_texture *texture; - TRACE("Creating the depth stencil buffer\n"); + TRACE("Creating the depth stencil buffer.\n"); texture_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; texture_desc.format = swapchain->desc.auto_depth_stencil_format; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7485c1c..28629ab 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1387,3 +1387,74 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha return WINED3D_OK; } + +HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_display_mode default_mode; + unsigned int width, height; + HRESULT hr; + + TRACE("swapchain %p, desc %p, mode %p.\n", swapchain, swapchain_desc, mode); + + width = swapchain_desc->backbuffer_width; + height = swapchain_desc->backbuffer_height; + + if (!mode) + { + if (!swapchain_desc->windowed) + { + default_mode.width = swapchain_desc->backbuffer_width; + default_mode.height = swapchain_desc->backbuffer_height; + default_mode.refresh_rate = swapchain_desc->refresh_rate; + default_mode.format_id = swapchain_desc->backbuffer_format; + default_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + } + else + { + default_mode = swapchain->original_mode; + } + mode = &default_mode; + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + + if (!swapchain_desc->windowed) + { + if (swapchain->desc.windowed) + { + HWND focus_window = device->create_parms.focus_window; + if (!focus_window) + focus_window = swapchain->device_window; + if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + return hr; + } + + /* switch from windowed to fs */ + wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); + } + else + { + /* Fullscreen -> fullscreen mode change */ + MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); + } + swapchain->d3d_mode = *mode; + } + else if (!swapchain->desc.windowed) + { + /* Fullscreen -> windowed switch */ + wined3d_device_restore_fullscreen_window(device, swapchain->device_window); + wined3d_device_release_focus_window(device); + } + + swapchain->desc.windowed = swapchain_desc->windowed; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 77b506d..bdf3916 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -242,6 +242,7 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) +@ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e2f1004..948a57b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2524,6 +2524,8 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); +HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, + const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in context_validate_onscreen_formats().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 3160eabf24613a8608a348330d4877de42958d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3160eabf24613a8608a348330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:29 2016 +0200 wined3d: Use wined3d_texture_load_location() in context_validate_onscreen_formats(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb97fb9..f5311af 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2455,7 +2455,6 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, { /* Onscreen surfaces are always in a swapchain */ struct wined3d_swapchain *swapchain = context->current_rt.texture->swapchain; - struct wined3d_surface *surface; if (context->render_offscreen || !depth_stencil) return; if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->format)) return; @@ -2466,8 +2465,9 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ - surface = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + if (!(wined3d_texture_load_location(context->current_rt.texture, context->current_rt.sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB))) + ERR("Failed to load location.\n"); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); context_set_render_offscreen(context, TRUE); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 865fb4d..098b5d0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -176,7 +176,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ -static BOOL wined3d_texture_load_location(struct wined3d_texture *texture, +BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { return texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4984ba2..abb950c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2760,6 +2760,8 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +BOOL wined3d_texture_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size_t size, const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 56f60eed909974a8b41f4cc941deba0d793be933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f60eed909974a8b41f4cc94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:30 2016 +0200 wined3d: Use wined3d_texture_load_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55046db..ce06474 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -324,15 +324,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c for (i = 0; i < rt_count; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); - if (rt && rtv->format->id != WINED3DFMT_NULL) + if (rtv && rtv->format->id != WINED3DFMT_NULL) { + struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) - surface_load_location(rt, context, rtv->resource->draw_binding); + wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else - wined3d_texture_prepare_location(rt->container, rtv->sub_resource_idx, - context, rtv->resource->draw_binding); + wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); } }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 887bf4354345d54be5f291e6d361446bda87316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=887bf4354345d54be5f291e6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:31 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce06474..34ce224 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4151,7 +4151,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (!dst_point.x && !dst_point.y && src_rect.right == width && src_rect.bottom == height) wined3d_texture_prepare_texture(texture, context, FALSE); else - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_surface_upload_data(surface, gl_info, resource->format,

1 0