wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : dwrite/tests: Added GetFontSignature() test.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: e48879b13f8f6588c4b880f3b6acac221f7c0667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48879b13f8f6588c4b880f3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:57 2016 +0300 dwrite/tests: Added GetFontSignature() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3c1f332..e8ceca2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,8 +43,10 @@ #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define EXPECT_HR(hr,hr_exp) \ @@ -5840,6 +5842,127 @@ if (hr == S_OK) DELETE_FONTFILE(path); } +static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) +{ + void *os2_context; + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(fontsig, 0, sizeof(*fontsig)); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_os2) { + fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); + fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); + fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); + fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + IDWriteFontFace_Release(fontface); +} + +static void test_GetFontSignature(void) +{ + IDWriteFontCollection *syscollection; + IDWriteGdiInterop1 *interop1; + IDWriteGdiInterop *interop; + IDWriteFactory *factory; + FONTSIGNATURE fontsig; + UINT count, i; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_QueryInterface(interop, &IID_IDWriteGdiInterop1, (void**)&interop1); + IDWriteGdiInterop_Release(interop); + if (FAILED(hr)) { + win_skip("GetFontSignature() is not supported.\n"); + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); + return; + }; + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, NULL, &fontsig); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + FONTSIGNATURE expected_signature; + IDWriteLocalizedStrings *names; + IDWriteFontFace *fontface; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, font, &fontsig); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + get_expected_fontsig(font, &expected_signature); + + ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "%s: fsUsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[0], expected_signature.fsUsb[0]); + ok(fontsig.fsUsb[1] == expected_signature.fsUsb[1], "%s: fsUsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[1], expected_signature.fsUsb[1]); + ok(fontsig.fsUsb[2] == expected_signature.fsUsb[2], "%s: fsUsb[2] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[2], expected_signature.fsUsb[2]); + ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "%s: fsUsb[3] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[3], expected_signature.fsUsb[3]); + + ok(fontsig.fsCsb[0] == expected_signature.fsCsb[0], "%s: fsCsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[0], expected_signature.fsCsb[0]); + ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "%s: fsCsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[1], expected_signature.fsCsb[1]); +} + IDWriteFont_Release(font); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + + IDWriteGdiInterop1_Release(interop1); + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -5895,6 +6018,7 @@ START_TEST(font) test_TranslateColorGlyphRun(); test_HasCharacter(); test_CreateFontFaceReference(); + test_GetFontSignature(); IDWriteFactory_Release(factory); }

1 0

Francois Gouget : kernel32/tests: Spelling fixes for a couple of comments.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: ccad9f3b978d18080dfa8660fde33bd8098167c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad9f3b978d18080dfa8660f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:57 2016 +0200 kernel32/tests: Spelling fixes for a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 2 +- dlls/kernel32/tests/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index d4d66b2..a277f93 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -159,7 +159,7 @@ BOOL WINAPI WaitForDebugEvent( * PARAMS * pid [I] The id of the process to continue. * tid [I] The id of the thread to continue. - * status [I] The rule to apply to unhandled exeptions. + * status [I] The rule to apply to unhandled exceptions. * * RETURNS * diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 325e1ff..26cd1d6 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1735,9 +1735,9 @@ static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init - * 1: producer emits a WakeConditionVaribale without consumer waiting. + * 1: producer emits a WakeConditionVariable without consumer waiting. * 2: consumer sleeps without a wake expecting timeout - * 3: producer emits a WakeAllConditionVaribale without consumer waiting. + * 3: producer emits a WakeAllConditionVariable without consumer waiting. * 4: consumer sleeps without a wake expecting timeout * 5: a wake is handed to a SleepConditionVariableCS * 6: a wakeall is handed to a SleepConditionVariableCS

1 0

Sebastian Lackner : user32: Do not block sending/ posting WM_NOTIFY messages.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: b4ac51effaa19b3ddf64f89b23894254608b6294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ac51effaa19b3ddf64f89b2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 18:28:59 2016 +0200 user32: Do not block sending/posting WM_NOTIFY messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +-- dlls/user32/tests/msg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 94d7a84..fb4786b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -310,8 +310,7 @@ static const unsigned int message_pointer_flags[] = SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d2059a8..b2630ce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11188,6 +11188,70 @@ static void test_quit_message(void) ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } +static const struct message WmNotifySeq[] = { + { WM_NOTIFY, sent|wparam|lparam, 0x1234, 0xdeadbeef }, + { 0 } +}; + +static void test_notify_message(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); + ok(hwnd != 0, "Failed to create window\n"); + flush_events(); + flush_sequence(); + + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + DestroyWindow(hwnd); +} + static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ { WM_MOUSEACTIVATE, sent|optional }, @@ -15793,6 +15857,7 @@ START_TEST(msg) test_SendMessageTimeout(); test_edit_messages(); test_quit_message(); + test_notify_message(); test_SetActiveWindow(); if (!pTrackMouseEvent)

1 0

Sebastian Lackner : taskschd/tests: Fix a use-after-free in scheduler tests.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 9b09472d4f8a5fbd9e9201ee351eeeb005d37547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b09472d4f8a5fbd9e9201ee3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 23:33:45 2016 +0200 taskschd/tests: Fix a use-after-free in scheduler tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 60a6c94..94d9b29 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -947,12 +947,12 @@ todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); ok(hr == S_OK, "IIDFromString error %#x\n", hr); - SysFreeString(bstr); IRegisteredTask_Release(task1); hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); + SysFreeString(bstr); hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);

1 0

Vincent Povirk : Revert "user32: Set capture earlier on popup menus.".
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 3cc6a1acc31161be0f14d81c588faeb0022e2e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc6a1acc31161be0f14d81c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 19 12:57:47 2016 -0500 Revert "user32: Set capture earlier on popup menus.". This reverts commit a9bff001a1e2c919b3f6e68d642abb8da957a2bf. We can't set capture this early because the popup menu isn't visible yet. To my knowledge, no applications depend on this, nor did the next patch in the series. It's only a theoretical issue revealed by a message test. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7a49ac0..e42d8f7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3003,6 +3003,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; + HWND capture_win; mt.trackFlags = 0; mt.hCurrentMenu = hmenu; @@ -3030,8 +3031,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - if (!(wFlags & TPM_POPUPMENU)) - set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); + /* owner may not be visible when tracking a popup, so use the menu itself */ + capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; + set_capture_window( capture_win, GUI_INMENUMODE, NULL ); if ((wFlags & TPM_POPUPMENU) && menu->nItems == 0) return FALSE; @@ -3327,10 +3329,6 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) SendMessageW( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION ); - if (bPopup) - /* owner may not be visible when tracking a popup, so use the menu itself */ - set_capture_window( menu->hWnd, GUI_INMENUMODE, NULL ); - if (!(wFlags & TPM_NONOTIFY)) { SendMessageW( hWnd, WM_INITMENU, (WPARAM)hMenu, 0 ); @@ -3484,9 +3482,6 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); - - set_capture_window( 0, GUI_INMENUMODE, NULL ); - MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd)

1 0

Kim Malmo : wined3d: Add Nvidia 9700M GT.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 5f4c496480d2b07711e37185de616b4d8304e4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4c496480d2b07711e37185d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Apr 19 18:34:10 2016 +0200 wined3d: Add Nvidia 9700M GT. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a04e338..8f47b24 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1231,6 +1231,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, @@ -1823,6 +1824,7 @@ cards_nvidia_binary[] = {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ + {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3e368..50034a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1739,6 +1739,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9700MGT = 0x064a, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20,

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 0dc88185bca47dda1d8ddf4474da2f2fe6982237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc88185bca47dda1d8ddf447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 18:34:09 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 10 +--------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9798650..ce3809f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,14 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) -{ - return wined3d_texture_prepare_location(volume->container, volume->texture_level, context, location); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -222,7 +214,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return FALSE; } - if (!wined3d_volume_prepare_location(volume, context, location)) + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f04484..1b3e368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2610,8 +2610,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : winex11: Only warn when an RandR output has no modes.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 8a348a4b99515ed9095c49df513ed5a2fa77d4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a348a4b99515ed9095c49df5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:08 2016 +0200 winex11: Only warn when an RandR output has no modes. This can legitimately happen when the output is disconnected. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 58e66d6..2fee851 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -431,7 +431,7 @@ static int xrandr12_init_modes(void) if (!output_info->nmode) { - ERR("Output has no modes.\n"); + WARN("Output has no modes.\n"); goto done; }

1 0

Henri Verbeet : wined3d: Use the texture dimensions in swapchain_blit().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 62a766f75ce068313b2a3ad2691154a78491158c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a766f75ce068313b2a3ad26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:07 2016 +0200 wined3d: Use the texture dimensions in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 -- dlls/wined3d/swapchain.c | 10 +++++----- dlls/wined3d/texture.c | 2 -- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f358805..c32a1f7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4351,8 +4351,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex surface->resource.access_flags = container->resource.access_flags; surface->container = container; - surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); - surface->pow2Height = wined3d_texture_get_level_pow2_height(container, level); surface->texture_target = target; surface->texture_level = level; surface->texture_layer = layer; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bd0a089..202a890 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -361,12 +361,12 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context2 = context_acquire(device, back_buffer); context_apply_blit_state(context2, device); - if (back_buffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) + if (texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - tex_left /= back_buffer->pow2Width; - tex_right /= back_buffer->pow2Width; - tex_top /= back_buffer->pow2Height; - tex_bottom /= back_buffer->pow2Height; + tex_left /= texture->pow2_width; + tex_right /= texture->pow2_width; + tex_top /= texture->pow2_height; + tex_bottom /= texture->pow2_height; } if (is_complex_fixup(texture->resource.format->color_fixup)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2990e44..ada571c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -987,8 +987,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->pow2_width = width; texture->pow2_height = height; } - surface->pow2Width = texture->pow2_width; - surface->pow2Height = texture->pow2_height; sub_resource->locations = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5623a62..1f04484 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2651,8 +2651,6 @@ struct wined3d_surface struct wined3d_resource resource; struct wined3d_texture *container; - UINT pow2Width; - UINT pow2Height; GLenum texture_target; unsigned int texture_level; unsigned int texture_layer;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in texture2d_prepare_texture().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 70f1d0efdcf37d842ba5d542b1fed41c1c4a5700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f1d0efdcf37d842ba5d542b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:06 2016 +0200 wined3d: Use the texture dimension helpers in texture2d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c8a7695..2990e44 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1345,9 +1345,10 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei height = surface->pow2Height; - GLsizei width = surface->pow2Width; + GLsizei width, height; + width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); + height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
75
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 April 2016