April 2014 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Load the message box font through the dialog template.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 7e874aed75765f3c017673178cfd64301b7ba3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e874aed75765f3c017673178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 15 19:50:53 2014 +0200 user32: Load the message box font through the dialog template. --- dlls/user32/msgbox.c | 28 +++++----------------------- dlls/user32/user32.rc | 2 +- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 8b3cb4d..7fb17bd 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -61,9 +61,9 @@ static BOOL CALLBACK MSGBOX_EnumProc(HWND hwnd, LPARAM lParam) return TRUE; } -static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) +static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) { - HFONT hFont = 0, hPrevFont = 0; + HFONT hPrevFont; RECT rect; HWND hItem; HDC hdc; @@ -84,15 +84,6 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); - hFont = CreateFontIndirectW (&nclm.lfMessageFont); - /* set button font */ - for (i = IDOK; i <= IDCONTINUE; i++) - /* no close button */ - if (i != IDCLOSE) - SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); - - /* set text font */ - SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); if (!IS_INTRESOURCE(lpmb->lpszCaption)) { SetWindowTextW(hwnd, lpmb->lpszCaption); @@ -229,8 +220,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) iwidth = rect.right - ileft; hdc = GetDC(hwnd); - if (hFont) - hPrevFont = SelectObject(hdc, hFont); + hPrevFont = SelectObject( hdc, (HFONT)SendMessageW( hwnd, WM_GETFONT, 0, 0 )); /* Get the number of visible buttons and their size */ bh = bw = 1; /* Minimum button sizes */ @@ -270,8 +260,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) twidth = max((bw + bspace) * buttons + bspace - tleft, rect.right); theight = rect.bottom; - if (hFont) - SelectObject(hdc, hPrevFont); + SelectObject(hdc, hPrevFont); ReleaseDC(hwnd, hdc); tiheight = 16 + max(iheight, theight); @@ -319,7 +308,6 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); HeapFree( GetProcessHeap(), 0, buffer ); - return hFont; } @@ -331,15 +319,12 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - HFONT hFont; - switch(message) { case WM_INITDIALOG: { LPMSGBOXPARAMSW mbp = (LPMSGBOXPARAMSW)lParam; SetWindowContextHelpId(hwnd, mbp->dwContextHelpId); - hFont = MSGBOX_OnInit(hwnd, mbp); - SetPropA(hwnd, "WINE_MSGBOX_HFONT", hFont); + MSGBOX_OnInit(hwnd, mbp); SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback); break; } @@ -356,10 +341,7 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, case IDNO: case IDTRYAGAIN: case IDCONTINUE: - hFont = GetPropA(hwnd, "WINE_MSGBOX_HFONT"); EndDialog(hwnd, wParam); - if (hFont) - DeleteObject(hFont); break; case IDHELP: FIXME("Help button not supported yet\n"); diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index a031bfc..d281d53 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -72,7 +72,7 @@ STRINGTABLE } MSGBOX DIALOG 100, 80, 216, 168 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN ICON "", MSGBOX_IDICON, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", MSGBOX_IDTEXT, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX

1 0

Nikolay Sivov : riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 601738dfb56282b7b98a8dd6a181e54ead287a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601738dfb56282b7b98a8dd6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 08:49:41 2014 +0400 riched20: GetClientSite() is implemented for IRichEditOle so uncomment related code (Coverity). --- dlls/riched20/editor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1235a16..bc5bc08 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1198,11 +1198,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm } if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && -#if 0 - /* FIXME: enable it when rich-edit properly implements this method */ IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && -#endif IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && IOleCache_Cache(lpOleCache, &fm, 0, &conn) == S_OK &&

1 0

Nikolay Sivov : wininet: Remove some dead code (Coverity).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: d87724e626e48ff2b380d270325cd9e3e3e01321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87724e626e48ff2b380d2703… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 09:07:40 2014 +0400 wininet: Remove some dead code (Coverity). --- dlls/wininet/http.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 934af3a..07b4787 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3289,7 +3289,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, { appinfo_t *hIC = session->appInfo; http_request_t *request; - DWORD len, res = ERROR_SUCCESS; + DWORD len; TRACE("-->\n"); @@ -3378,13 +3378,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, INTERNET_STATUS_HANDLE_CREATED, &request->hdr.hInternet, sizeof(HINTERNET)); - TRACE("<-- %u (%p)\n", res, request); - - if(res != ERROR_SUCCESS) { - WININET_Release( &request->hdr ); - *ret = NULL; - return res; - } + TRACE("<-- (%p)\n", request); *ret = request->hdr.hInternet; return ERROR_SUCCESS;

1 0

Henri Verbeet : wined3d: Set VTF filter caps when VTF is supported.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 7f2ae9889d4b30912b01511e0bc489acbb5d1695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2ae9889d4b30912b01511e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:19 2014 +0200 wined3d: Set VTF filter caps when VTF is supported. --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 62ad4c8..132dad1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4546,6 +4546,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); + caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) {

1 0

Henri Verbeet : wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when ARB_blend_func_extended is supported.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 5b8d3a0c70e7b800317aeda7c698f991eece1ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8d3a0c70e7b800317aeda7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:20 2014 +0200 wined3d: Set the WINED3DPBLENDCAPS_SRCALPHASAT destination blend cap when ARB_blend_func_extended is supported. --- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_gl.h | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 132dad1..f3331bf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -93,6 +93,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ + {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -4239,6 +4240,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPCMPCAPS_NEVER | WINED3DPCMPCAPS_NOTEQUAL; + /* WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA + * are legacy settings for srcblend only. */ caps->SrcBlendCaps = WINED3DPBLENDCAPS_BOTHINVSRCALPHA | WINED3DPBLENDCAPS_BOTHSRCALPHA | WINED3DPBLENDCAPS_DESTALPHA | @@ -4263,12 +4266,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPBLENDCAPS_SRCALPHA | WINED3DPBLENDCAPS_SRCCOLOR | WINED3DPBLENDCAPS_ZERO; - /* NOTE: WINED3DPBLENDCAPS_SRCALPHASAT is not supported as dest blend factor, - * according to the glBlendFunc manpage - * - * WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA are - * legacy settings for srcblend only - */ + + if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) + caps->DestBlendCaps |= WINED3DPBLENDCAPS_SRCALPHASAT; if (gl_info->supported[EXT_BLEND_COLOR]) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b357bb1..7331592 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -43,6 +43,7 @@ enum wined3d_gl_extension APPLE_FLUSH_BUFFER_RANGE, APPLE_YCBCR_422, /* ARB */ + ARB_BLEND_FUNC_EXTENDED, ARB_COLOR_BUFFER_FLOAT, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, @@ -180,6 +181,9 @@ enum wined3d_gl_extension /* GL_APPLE_flush_buffer_range */ \ USE_GL_FUNC(glBufferParameteriAPPLE) \ USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) \ + /* GL_ARB_blend_func_extended */ \ + USE_GL_FUNC(glBindFragDataLocationIndexed) \ + USE_GL_FUNC(glGetFragDataIndex) \ /* GL_ARB_color_buffer_float */ \ USE_GL_FUNC(glClampColorARB) \ /* GL_ARB_debug_output */ \

1 0

Henri Verbeet : d3d8/tests: Make the sanity test a normal test.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: ef5e4c794da5616b79173c9c54da14a19bc2e362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5e4c794da5616b79173c9c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:21 2014 +0200 d3d8/tests: Make the sanity test a normal test. --- dlls/d3d8/tests/visual.c | 137 +++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 76 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4b743a8..a421579 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -38,20 +38,6 @@ struct vec4 float x, y, z, w; }; -static HWND create_window(void) -{ - WNDCLASSA wc = {0}; - HWND ret; - wc.lpfnWndProc = DefWindowProcA; - wc.lpszClassName = "d3d8_test_wc"; - RegisterClassA(&wc); - - ret = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_POPUP | WS_SYSMENU, - 20, 20, 640, 480, 0, 0, 0, 0); - ShowWindow(ret, SW_SHOW); - return ret; -} - static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; @@ -126,22 +112,13 @@ out: return ret; } -static IDirect3DDevice8 *init_d3d8(void) +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice8 *device = NULL; - IDirect3D8 *d3d8; - HRESULT hr; + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice8 *device; - if (!(d3d8 = Direct3DCreate8(D3D_SDK_VERSION))) - { - skip("could not create D3D8\n"); - return NULL; - } - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); + present_parameters.Windowed = windowed; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -149,12 +126,11 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), - "IDirect3D_CreateDevice returned: %#08x\n", hr); + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + return NULL; } struct vertex @@ -176,6 +152,28 @@ struct nvertex DWORD diffuse; }; +static void test_sanity(IDirect3DDevice8 *device) +{ + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = getPixelColor(device, 639, 479); + ok(color == 0x0000ddee, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); +} + static void lighting_test(IDirect3DDevice8 *device) { HRESULT hr; @@ -4651,51 +4649,43 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) START_TEST(visual) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device_ptr; - HRESULT hr; - DWORD color; + IDirect3D8 *d3d; + ULONG refcount; D3DCAPS8 caps; + HWND window; + HRESULT hr; - if (!(device_ptr = init_d3d8())) + if (!(d3d = Direct3DCreate8(D3D_SDK_VERSION))) { - win_skip("Could not initialize direct3d\n"); + skip("Failed to create D3D8 object.\n"); return; } - IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); - - /* Check for the reliability of the returned data */ - hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - if(FAILED(hr)) - { - skip("Clear failed, can't assure correctness of the test results\n"); - goto cleanup; - } - - color = getPixelColor(device_ptr, 1, 1); - if(color !=0x00ff0000) - { - skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); + memset(&identifier, 0, sizeof(identifier)); + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + trace("Driver string: \"%s\"\n", identifier.Driver); + trace("Description string: \"%s\"\n", identifier.Description); + /* Only Windows XP's default VGA driver should have an empty description */ + ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n"); + trace("Driver version %d.%d.%d.%d\n", + HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), + HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(device_ptr = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); goto cleanup; } - IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 0.0, 0); - if(FAILED(hr)) - { - skip("Clear failed, can't assure correctness of the test results\n"); - goto cleanup; - } - - color = getPixelColor(device_ptr, 639, 479); - if(color != 0x0000ddee) - { - skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests\n", color); - goto cleanup; - } - IDirect3DDevice8_Present(device_ptr, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - /* Now run the real test */ + test_sanity(device_ptr); depth_clamp_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); @@ -4733,14 +4723,9 @@ START_TEST(visual) volume_v16u16_test(device_ptr); add_dirty_rect_test(device_ptr); + refcount = IDirect3DDevice8_Release(device_ptr); + ok(!refcount, "Device has %u references left.\n", refcount); cleanup: - if(device_ptr) { - D3DDEVICE_CREATION_PARAMETERS creation_parameters; - ULONG refcount; - - IDirect3DDevice8_GetCreationParameters(device_ptr, &creation_parameters); - DestroyWindow(creation_parameters.hFocusWindow); - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left\n", refcount); - } + IDirect3D8_Release(d3d); + DestroyWindow(window); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for add_dirty_rect_test( ).
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 29680b685a28bdf0cf2c32597885755ea9d5ea67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29680b685a28bdf0cf2c32597… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:22 2014 +0200 d3d8/tests: Use a separate device for add_dirty_rect_test(). --- dlls/d3d8/tests/visual.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a421579..c395355 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4333,10 +4333,10 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) } quad[] = { - {{-1.0, -1.0, 0.0}, {0.0, 0.0}}, - {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, - {{-1.0, 1.0, 0.0}, {0.0, 1.0}}, - {{ 1.0, 1.0, 0.0}, {1.0, 1.0}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, }; hr = IDirect3DDevice8_BeginScene(device); @@ -4347,16 +4347,31 @@ static void add_dirty_rect_test_draw(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); } -static void add_dirty_rect_test(IDirect3DDevice8 *device) +static void add_dirty_rect_test(void) { - HRESULT hr; - IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; unsigned int i; + D3DCOLOR color; + ULONG refcount; DWORD *texel; - D3DLOCKED_RECT locked_rect; + HWND window; + HRESULT hr; + static const RECT part_rect = {96, 96, 160, 160}; - DWORD color; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dst1); @@ -4632,10 +4647,6 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DSurface8_Release(surface_dst2); IDirect3DSurface8_Release(surface_managed); IDirect3DSurface8_Release(surface_src_red); @@ -4645,6 +4656,11 @@ static void add_dirty_rect_test(IDirect3DDevice8 *device) IDirect3DTexture8_Release(tex_dst1); IDirect3DTexture8_Release(tex_dst2); IDirect3DTexture8_Release(tex_managed); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } START_TEST(visual) @@ -4721,11 +4737,12 @@ START_TEST(visual) fog_special_test(device_ptr); volume_dxt5_test(device_ptr); volume_v16u16_test(device_ptr); - add_dirty_rect_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + + add_dirty_rect_test(); }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for volume_v16u16_test() .
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 554871ea81116e0142e6a2c765abed918b4dcfc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=554871ea81116e0142e6a2c76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 15 09:15:23 2014 +0200 d3d8/tests: Use a separate device for volume_v16u16_test(). --- dlls/d3d8/tests/visual.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c395355..ce4de4a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4142,17 +4142,21 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } -static void volume_v16u16_test(IDirect3DDevice8 *device) +static void volume_v16u16_test(void) { - HRESULT hr; - IDirect3D8 *d3d8; IDirect3DVolumeTexture8 *texture; - DWORD shader; + IDirect3DDevice8 *device; D3DLOCKED_BOX box; + IDirect3D8 *d3d; unsigned int i; - DWORD color; - SHORT *texel; + D3DCOLOR color; + ULONG refcount; D3DCAPS8 caps; + DWORD shader; + SHORT *texel; + HWND window; + HRESULT hr; + static const struct { struct vec3 position; @@ -4161,13 +4165,13 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD shader_code[] = @@ -4180,22 +4184,30 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); - IDirect3D8_Release(d3d8); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16))) { skip("Volume V16U16 textures are not supported, skipping test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) { skip("No pixel shader 1.1 support, skipping test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); @@ -4258,7 +4270,7 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -4288,12 +4300,13 @@ static void volume_v16u16_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, shader); ok(SUCCEEDED(hr), "Failed delete pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fill_surface(IDirect3DSurface8 *surface, DWORD color, DWORD flags) @@ -4736,7 +4749,6 @@ START_TEST(visual) resz_test(device_ptr); fog_special_test(device_ptr); volume_dxt5_test(device_ptr); - volume_v16u16_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4744,5 +4756,6 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + volume_v16u16_test(); add_dirty_rect_test(); }

1 0

Jacek Caban : wscript: Added WScript.CreateObject implementation.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 6617f27004039860ac5d487c5ec0e112890deaed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6617f27004039860ac5d487c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 09:34:53 2014 +0200 wscript: Added WScript.CreateObject implementation. --- programs/wscript/host.c | 25 +++++++++++++++++++++++-- programs/wscript/tests/run.js | 8 ++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 2a47ed8..55d4010 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -236,8 +236,29 @@ static HRESULT WINAPI Host_put_Timeout(IHost *iface, LONG v) static HRESULT WINAPI Host_CreateObject(IHost *iface, BSTR ProgID, BSTR Prefix, IDispatch **out_Dispatch) { - WINE_FIXME("(%s %s %p)\n", wine_dbgstr_w(ProgID), wine_dbgstr_w(Prefix), out_Dispatch); - return E_NOTIMPL; + IUnknown *unk; + GUID guid; + HRESULT hres; + + TRACE("(%s %s %p)\n", wine_dbgstr_w(ProgID), wine_dbgstr_w(Prefix), out_Dispatch); + + if(Prefix && *Prefix) { + FIXME("Prefix %s not supported\n", debugstr_w(Prefix)); + return E_NOTIMPL; + } + + hres = CLSIDFromProgID(ProgID, &guid); + if(FAILED(hres)) + return hres; + + hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)out_Dispatch); + IUnknown_Release(unk); + return hres; } static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 8c75d0a..db0d6f9 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -49,4 +49,12 @@ WScript.Interactive = true; ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); ok(WScript.Application === WScript, "WScript.Application = " + WScript.Application); +var obj = WScript.CreateObject("Wine.Test"); +obj.ok(true, "Broken WScript.CreateObject object?"); + +try { + obj = WScript.CreateObject("nonexistent"); + ok(false, "Expected exception for CreateObject('nonexistent')"); +}catch(e) {} + winetest.reportSuccess();

1 0

Hans Leidekker : netprofm: Fix a memory leak.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 06fd202a20ffc18dec43b76b11cdc8f88e1af80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fd202a20ffc18dec43b76b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 15 13:33:57 2014 +0200 netprofm: Fix a memory leak. --- dlls/netprofm/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index d6e9537..9808dee 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -96,9 +96,6 @@ static HRESULT WINAPI netprofm_cf_CreateInstance( IClassFactory *iface, LPUNKNOW return r; r = IUnknown_QueryInterface( unk, riid, obj ); - if (FAILED( r )) - return r; - IUnknown_Release( unk ); return r; }

1 0