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

Henri Verbeet : d3d9/tests: Use a separate device for pointsize_test().
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: f3a898a87d52079045551fa6d806d5541187eaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a898a87d52079045551fa6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 7 10:01:04 2014 +0200 d3d9/tests: Use a separate device for pointsize_test(). --- dlls/d3d9/tests/visual.c | 112 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index af93c80..2410a90 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9616,61 +9616,71 @@ static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) return TRUE; } -static void pointsize_test(IDirect3DDevice9 *device) +static void pointsize_test(void) { - HRESULT hr; - D3DCAPS9 caps; - D3DMATRIX matrix; - D3DMATRIX identity; - float ptsize, ptsize_orig, ptsizemax_orig, ptsizemin_orig; - DWORD color; + float ptsize, ptsizemax_orig, ptsizemin_orig; IDirect3DSurface9 *rt, *backbuffer; IDirect3DTexture9 *tex1, *tex2; - RECT rect = {0, 0, 128, 128}; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; - const DWORD tex1_data[4] = {0x00ff0000, 0x00ff0000, - 0x00000000, 0x00000000}; - const DWORD tex2_data[4] = {0x00000000, 0x0000ff00, - 0x00000000, 0x0000ff00}; - - const float vertices[] = { - 64, 64, 0.1, - 128, 64, 0.1, - 192, 64, 0.1, - 256, 64, 0.1, - 320, 64, 0.1, - 384, 64, 0.1, - 448, 64, 0.1, - 512, 64, 0.1, - }; - - /* Transforms the coordinate system [-1.0;1.0]x[-1.0;1.0] to [0.0;0.0]x[640.0;480.0]. Z is untouched */ - U(matrix).m[0][0] = 2.0/640.0; U(matrix).m[1][0] = 0.0; U(matrix).m[2][0] = 0.0; U(matrix).m[3][0] =-1.0; - U(matrix).m[0][1] = 0.0; U(matrix).m[1][1] =-2.0/480.0; U(matrix).m[2][1] = 0.0; U(matrix).m[3][1] = 1.0; - U(matrix).m[0][2] = 0.0; U(matrix).m[1][2] = 0.0; U(matrix).m[2][2] = 1.0; U(matrix).m[3][2] = 0.0; - U(matrix).m[0][3] = 0.0; U(matrix).m[1][3] = 0.0; U(matrix).m[2][3] = 0.0; U(matrix).m[3][3] = 1.0; - - U(identity).m[0][0] = 1.0; U(identity).m[1][0] = 0.0; U(identity).m[2][0] = 0.0; U(identity).m[3][0] = 0.0; - U(identity).m[0][1] = 0.0; U(identity).m[1][1] = 1.0; U(identity).m[2][1] = 0.0; U(identity).m[3][1] = 0.0; - U(identity).m[0][2] = 0.0; U(identity).m[1][2] = 0.0; U(identity).m[2][2] = 1.0; U(identity).m[3][2] = 0.0; - U(identity).m[0][3] = 0.0; U(identity).m[1][3] = 0.0; U(identity).m[2][3] = 0.0; U(identity).m[3][3] = 1.0; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const RECT rect = {0, 0, 128, 128}; + static const DWORD tex1_data[4] = {0x00ff0000, 0x00ff0000, 0x00000000, 0x00000000}; + static const DWORD tex2_data[4] = {0x00000000, 0x0000ff00, 0x00000000, 0x0000ff00}; + static const float vertices[] = + { + 64.0f, 64.0f, 0.1f, + 128.0f, 64.0f, 0.1f, + 192.0f, 64.0f, 0.1f, + 256.0f, 64.0f, 0.1f, + 320.0f, 64.0f, 0.1f, + 384.0f, 64.0f, 0.1f, + 448.0f, 64.0f, 0.1f, + 512.0f, 64.0f, 0.1f, + }; + /* Transforms the coordinate system [-1.0;1.0]x[-1.0;1.0] to + * [0.0;0.0]x[640.0;480.0]. Z is untouched. */ + D3DMATRIX matrix = + {{{ + 2.0f / 640.0f, 0.0f, 0.0f, 0.0f, + 0.0f, -2.0 / 480.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -1.0f, 1.0f, 0.0f, 1.0f, + }}}; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%08x\n", hr); if(caps.MaxPointSize < 32.0) { skip("MaxPointSize < 32.0, skipping(MaxPointsize = %f)\n", caps.MaxPointSize); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed hr=%08x\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSIZE, (DWORD *) &ptsize_orig); - ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed hr=%08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%08x\n", hr); @@ -9776,7 +9786,7 @@ static void pointsize_test(IDirect3DDevice9 *device) * is no point sprite cap bit in d3d because native d3d software emulates point sprites. Until the * SW emulation is implemented in wined3d, this test will fail on GL drivers that does not support them. */ - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex1, NULL); @@ -9850,7 +9860,7 @@ static void pointsize_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -9883,23 +9893,13 @@ static void pointsize_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed hr=%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 1, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSPRITEENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize_orig))); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); - hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &identity); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed, hr=%08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void multiple_rendertargets_test(void) @@ -16523,11 +16523,11 @@ START_TEST(visual) fixed_function_decl_test(device_ptr); conditional_np2_repeat_test(device_ptr); fixed_function_bumpmap_test(device_ptr); - pointsize_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + pointsize_test(); tssargtemp_test(); np2_stretch_rect_test(); yuv_color_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for fixed_function_bumpmap_test().
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 3d78a77f7403facfd1791beaa941f7e91dd69128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d78a77f7403facfd1791beaa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 7 10:01:05 2014 +0200 d3d9/tests: Use a separate device for fixed_function_bumpmap_test(). --- dlls/d3d9/tests/visual.c | 114 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2410a90..a46ef4b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8929,15 +8929,21 @@ done: DestroyWindow(window); } -static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) +static void fixed_function_bumpmap_test(void) { - HRESULT hr; - DWORD color; - int i; - D3DCAPS9 caps; - BOOL L6V5U5_supported = FALSE; - IDirect3DTexture9 *tex1, *tex2; + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DTexture9 *texture, *tex1, *tex2; D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + BOOL L6V5U5_supported; + float scale, offset; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; static const float quad[][7] = { @@ -8946,45 +8952,48 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) { 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, }; - - static const D3DVERTEXELEMENT9 decl_elements[] = { + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, {0, 20, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 1}, D3DDECL_END() }; - /* use asymmetric matrix to test loading */ - float bumpenvmat[4] = {0.0,0.5,-0.5,0.0}; - float scale, offset; + static const float bumpenvmat[4] = {0.0f, 0.5f, -0.5f, 0.0f}; - IDirect3DVertexDeclaration9 *vertex_declaration = NULL; - IDirect3DTexture9 *texture = NULL; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%08x\n", hr); - if(!(caps.TextureOpCaps & D3DTEXOPCAPS_BUMPENVMAP)) { + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_BUMPENVMAP)) + { skip("D3DTEXOPCAPS_BUMPENVMAP not set, skipping bumpmap tests\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + /* This check is disabled, some Windows drivers do not handle + * D3DUSAGE_QUERY_LEGACYBUMPMAP properly. They report that it is not + * supported, but after that bump mapping works properly. So just test if + * the format is generally supported, and check the BUMPENVMAP flag. */ + L6V5U5_supported = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_L6V5U5)); + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_V8U8))) + { + skip("D3DFMT_V8U8 not supported for legacy bump mapping\n"); + IDirect3DDevice9_Release(device); return; - } else { - /* This check is disabled, some Windows drivers do not handle D3DUSAGE_QUERY_LEGACYBUMPMAP properly. - * They report that it is not supported, but after that bump mapping works properly. So just test - * if the format is generally supported, and check the BUMPENVMAP flag - */ - IDirect3D9 *d3d9; - - IDirect3DDevice9_GetDirect3D(device, &d3d9); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_L6V5U5); - L6V5U5_supported = SUCCEEDED(hr); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_V8U8); - IDirect3D9_Release(d3d9); - if(FAILED(hr)) { - skip("D3DFMT_V8U8 not supported for legacy bump mapping\n"); - return; - } } /* Generate the textures */ @@ -9019,10 +9028,9 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); @@ -9065,16 +9073,15 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); /* To destroy it */ } - if(!(caps.TextureOpCaps & D3DTEXOPCAPS_BUMPENVMAPLUMINANCE)) { - skip("D3DTOP_BUMPENVMAPLUMINANCE not supported, skipping\n"); - goto cleanup; - } - if(L6V5U5_supported == FALSE) { - skip("L6V5U5_supported not supported, skipping D3DTOP_BUMPENVMAPLUMINANCE test\n"); - goto cleanup; + if (!L6V5U5_supported || !(caps.TextureOpCaps & D3DTEXOPCAPS_BUMPENVMAPLUMINANCE)) + { + skip("L6V5U5 / D3DTOP_BUMPENVMAPLUMINANCE not supported, skipping tests.\n"); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0, 0x8); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); /* This test only tests the luminance part. The bumpmapping part was already tested above and * would only make this test more complicated @@ -9172,23 +9179,14 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 1, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (%08x)\n", hr); - IDirect3DTexture9_Release(tex1); IDirect3DTexture9_Release(tex2); - -cleanup: - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_MODULATE); - ok(SUCCEEDED(hr), "SetTextureStageState failed (%08x)\n", hr); - - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); IDirect3DVertexDeclaration9_Release(vertex_declaration); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void stencil_cull_test(void) @@ -16522,11 +16520,11 @@ START_TEST(visual) autogen_mipmap_test(device_ptr); fixed_function_decl_test(device_ptr); conditional_np2_repeat_test(device_ptr); - fixed_function_bumpmap_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + fixed_function_bumpmap_test(); pointsize_test(); tssargtemp_test(); np2_stretch_rect_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for conditional_np2_repeat_test().
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: e5589b74a7922e2fb297bfd7bca067547ea6201b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5589b74a7922e2fb297bfd7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 7 10:01:06 2014 +0200 d3d9/tests: Use a separate device for conditional_np2_repeat_test(). --- dlls/d3d9/tests/visual.c | 53 +++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a46ef4b..18a11a1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8646,22 +8646,38 @@ done: DestroyWindow(window); } -static void conditional_np2_repeat_test(IDirect3DDevice9 *device) +static void conditional_np2_repeat_test(void) { - D3DCAPS9 caps; IDirect3DTexture9 *texture; - HRESULT hr; + IDirect3DDevice9 *device; D3DLOCKED_RECT rect; unsigned int x, y; DWORD *dst, color; - const float quad[] = { - -1.0, -1.0, 0.1, -0.2, -0.2, - 1.0, -1.0, 0.1, 1.2, -0.2, - -1.0, 1.0, 0.1, -0.2, 1.2, - 1.0, 1.0, 0.1, 1.2, 1.2 + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, -0.2f, -0.2f, + -1.0f, 1.0f, 0.1f, -0.2f, 1.2f, + 1.0f, -1.0f, 0.1f, 1.2f, -0.2f, + 1.0f, 1.0f, 0.1f, 1.2f, 1.2f, }; - memset(&caps, 0, sizeof(caps)); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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; + } + + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%08x\n", hr); if (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) @@ -8673,15 +8689,17 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) else if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No conditional NP2 support, skipping conditional NP2 tests\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } else { skip("Card has unconditional NP2 support, skipping conditional NP2 tests\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 10, 10, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); @@ -8705,6 +8723,8 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed hr=%08x\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP); @@ -8765,9 +8785,12 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%08x\n", hr); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void vface_register_test(void) @@ -16519,11 +16542,11 @@ START_TEST(visual) texture_transform_flags_test(device_ptr); autogen_mipmap_test(device_ptr); fixed_function_decl_test(device_ptr); - conditional_np2_repeat_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + conditional_np2_repeat_test(); fixed_function_bumpmap_test(); pointsize_test(); tssargtemp_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for fixed_function_decl_test().
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 93a37ed548fa353a60cce6cfa8f6ef0827159a5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a37ed548fa353a60cce6cfa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 7 10:01:07 2014 +0200 d3d9/tests: Use a separate device for fixed_function_decl_test(). --- dlls/d3d9/tests/visual.c | 95 ++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 18a11a1..bc07268 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7971,12 +7971,21 @@ struct vertex_floatcolor { float r, g, b, a; }; -static void fixed_function_decl_test(IDirect3DDevice9 *device) +static void fixed_function_decl_test(void) { - HRESULT hr; + IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; + IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_positiont; + IDirect3DVertexBuffer9 *vb, *vb2; + IDirect3DDevice9 *device; BOOL s_ok, ub_ok, f_ok; DWORD color, size, i; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; void *data; + HRESULT hr; + static const D3DVERTEXELEMENT9 decl_elements_d3dcolor[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, @@ -8012,38 +8021,36 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) {0, 16, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; - IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; - IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_positiont; - IDirect3DVertexBuffer9 *vb, *vb2; - struct vertex quad1[] = /* D3DCOLOR */ + static const struct vertex quad1[] = /* D3DCOLOR */ { {-1.0f, -1.0f, 0.1f, 0x00ffff00}, {-1.0f, 0.0f, 0.1f, 0x00ffff00}, { 0.0f, -1.0f, 0.1f, 0x00ffff00}, { 0.0f, 0.0f, 0.1f, 0x00ffff00}, }; - struct vertex quad2[] = /* UBYTE4N */ + static const struct vertex quad2[] = /* UBYTE4N */ { {-1.0f, 0.0f, 0.1f, 0x00ffff00}, {-1.0f, 1.0f, 0.1f, 0x00ffff00}, { 0.0f, 0.0f, 0.1f, 0x00ffff00}, { 0.0f, 1.0f, 0.1f, 0x00ffff00}, }; - struct vertex_shortcolor quad3[] = /* short */ + static const struct vertex_shortcolor quad3[] = /* short */ { { 0.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, { 0.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, { 1.0f, -1.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, { 1.0f, 0.0f, 0.1f, 0x0000, 0x0000, 0xffff, 0xffff}, }; - struct vertex_floatcolor quad4[] = + static const struct vertex_floatcolor quad4[] = { { 0.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, { 0.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, { 1.0f, 0.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, { 1.0f, 1.0f, 0.1f, 1.0, 0.0, 0.0, 0.0}, }; - DWORD colors[] = { + static const DWORD colors[] = + { 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff, @@ -8061,40 +8068,51 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff, }; - float quads[] = { - -1.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, -1.0, 0.1, - 0.0, 0.0, 0.1, + static const float quads[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, - 0.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, -1.0, 0.1, - 1.0, 0.0, 0.1, + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, - 0.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 0.0, 0.1, - 1.0, 1.0, 0.1, + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + 1.0f, 1.0f, 0.1f, - -1.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 0.0, 0.1, - 0.0, 1.0, 0.1 + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, }; - struct tvertex quad_transformed[] = { + static const struct tvertex quad_transformed[] = + { { 90, 110, 0.1, 2.0, 0x00ffff00}, { 570, 110, 0.1, 2.0, 0x00ffff00}, { 90, 300, 0.1, 2.0, 0x00ffff00}, { 570, 300, 0.1, 2.0, 0x00ffff00} }; - D3DCAPS9 caps; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "GetDeviceCaps failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor, &dcl_color); @@ -8123,6 +8141,9 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) 0, 0, D3DPOOL_MANAGED, &vb, NULL); ok(hr == D3D_OK, "CreateVertexBuffer failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed (%08x)\n", hr); f_ok = FALSE; s_ok = FALSE; ub_ok = FALSE; @@ -8458,13 +8479,8 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); } - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 1, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); IDirect3DVertexBuffer9_Release(vb2); - - out: +out: IDirect3DVertexBuffer9_Release(vb); if(dcl_float) IDirect3DVertexDeclaration9_Release(dcl_float); if(dcl_short) IDirect3DVertexDeclaration9_Release(dcl_short); @@ -8473,6 +8489,11 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) if(dcl_color_2) IDirect3DVertexDeclaration9_Release(dcl_color_2); if(dcl_ubyte_2) IDirect3DVertexDeclaration9_Release(dcl_ubyte_2); if(dcl_positiont) IDirect3DVertexDeclaration9_Release(dcl_positiont); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void test_vshader_float16(void) @@ -16541,11 +16562,11 @@ START_TEST(visual) pixelshader_blending_test(device_ptr); texture_transform_flags_test(device_ptr); autogen_mipmap_test(device_ptr); - fixed_function_decl_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + fixed_function_decl_test(); conditional_np2_repeat_test(); fixed_function_bumpmap_test(); pointsize_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for autogen_mipmap_test( ).
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: f4f066ca286faea26e6d325f6e69614735a98f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f066ca286faea26e6d325f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 7 10:01:08 2014 +0200 d3d9/tests: Use a separate device for autogen_mipmap_test(). --- dlls/d3d9/tests/visual.c | 89 +++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bc07268..f50ee55 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5335,31 +5335,50 @@ done: DestroyWindow(window); } -static void autogen_mipmap_test(IDirect3DDevice9 *device) +static void autogen_mipmap_test(void) { - HRESULT hr; - IDirect3D9 *d3d; IDirect3DTexture9 *texture = NULL; IDirect3DSurface9 *surface; - DWORD color; - const RECT r1 = {256, 256, 512, 512}; - const RECT r2 = {512, 256, 768, 512}; - const RECT r3 = {256, 512, 512, 768}; - const RECT r4 = {512, 512, 768, 768}; + IDirect3DDevice9 *device; unsigned int x, y; D3DLOCKED_RECT lr; - memset(&lr, 0, sizeof(lr)); + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) { - skip("No autogenmipmap support\n"); - IDirect3D9_Release(d3d); - return; + static const RECT r1 = {256, 256, 512, 512}; + static const RECT r2 = {512, 256, 768, 512}; + static const RECT r3 = {256, 512, 512, 768}; + static const RECT r4 = {512, 512, 768, 768}; + static const float quad[] = + { + -0.5f, -0.5f, 0.1f, 0.0f, 0.0f, + -0.5f, 0.5f, 0.1f, 0.0f, 1.0f, + 0.5f, -0.5f, 0.1f, 1.0f, 0.0f, + 0.5f, 0.5f, 0.1f, 1.0f, 1.0f, + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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; } - IDirect3D9_Release(d3d); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0, 0); + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) + { + skip("No autogenmipmap support.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffff00, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); /* Make the mipmap big, so that a smaller mipmap is used @@ -5370,6 +5389,7 @@ static void autogen_mipmap_test(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel returned %08x\n", hr); + memset(&lr, 0, sizeof(lr)); hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08x\n", hr); for(y = 0; y < 1024; y++) { @@ -5400,28 +5420,17 @@ static void autogen_mipmap_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) { - const float quad[] = { - -0.5, -0.5, 0.1, 0.0, 0.0, - -0.5, 0.5, 0.1, 0.0, 1.0, - 0.5, -0.5, 0.1, 1.0, 0.0, - 0.5, 0.5, 0.1, 1.0, 1.0 - }; - - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture returned %08x\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); IDirect3DTexture9_Release(texture); color = getPixelColor(device, 200, 200); @@ -5442,6 +5451,12 @@ static void autogen_mipmap_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "pixel 440/200 has color %08x, expected 0x00ffffff\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void test_constant_clamp_vs(void) @@ -16561,11 +16576,11 @@ START_TEST(visual) g16r16_texture_test(device_ptr); pixelshader_blending_test(device_ptr); texture_transform_flags_test(device_ptr); - autogen_mipmap_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + autogen_mipmap_test(); fixed_function_decl_test(); conditional_np2_repeat_test(); fixed_function_bumpmap_test();

1 0

Huw Davies : ntdll: Add a replacement getmntent for Android.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 2139df003f8c33fc5306345efbbcea7f54bfa907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2139df003f8c33fc5306345ef… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 7 13:22:10 2014 +0100 ntdll: Add a replacement getmntent for Android. Bionic has a stub function named getmntent which outputs an unimplemented message. --- dlls/ntdll/directory.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 78b3ea7..641f642 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -365,6 +365,107 @@ static char *get_default_lpt_device( int num ) return ret; } +#ifdef __ANDROID__ + +static char *unescape_field( char *str ) +{ + char *in, *out; + + for (in = out = str; *in; in++, out++) + { + *out = *in; + if (in[0] == '\\') + { + if (in[1] == '\\') + { + out[0] = '\\'; + in++; + } + else if (in[1] == '0' && in[2] == '4' && in[3] == '0') + { + out[0] = ' '; + in += 3; + } + else if (in[1] == '0' && in[2] == '1' && in[3] == '1') + { + out[0] = '\t'; + in += 3; + } + else if (in[1] == '0' && in[2] == '1' && in[3] == '2') + { + out[0] = '\n'; + in += 3; + } + else if (in[1] == '1' && in[2] == '3' && in[3] == '4') + { + out[0] = '\\'; + in += 3; + } + } + } + *out = '\0'; + + return str; +} + +static inline char *get_field( char **str ) +{ + char *ret; + + ret = strsep( str, " \t" ); + if (*str) *str += strspn( *str, " \t" ); + + return ret; +} +/************************************************************************ + * getmntent_replacement + * + * getmntent replacement for Android. + * + * NB returned static buffer is not thread safe; protect with dir_section. + */ +static struct mntent *getmntent_replacement( FILE *f ) +{ + static struct mntent entry; + static char buf[4096]; + char *p, *start; + + do + { + if (!fgets( buf, sizeof(buf), f )) return NULL; + p = strchr( buf, '\n' ); + if (p) *p = '\0'; + else /* Partially unread line, move file ptr to end */ + { + char tmp[1024]; + while (fgets( tmp, sizeof(tmp), f )) + if (strchr( tmp, '\n' )) break; + } + start = buf + strspn( buf, " \t" ); + } while (start[0] == '\0' || start[0] == '#'); + + p = get_field( &start ); + entry.mnt_fsname = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_dir = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_type = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_opts = p ? unescape_field( p ) : (char *)""; + + p = get_field( &start ); + entry.mnt_freq = p ? atoi(p) : 0; + + p = get_field( &start ); + entry.mnt_passno = p ? atoi(p) : 0; + + return &entry; +} +#define getmntent getmntent_replacement +#endif /*********************************************************************** * DIR_get_drives_info

1 0

Huw Davies : ntdll: For Android look in /proc/ mounts for mounted file systems.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: ac79e160e7a11ad6b822e4b3d1854138190de488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac79e160e7a11ad6b822e4b3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 7 13:22:11 2014 +0100 ntdll: For Android look in /proc/mounts for mounted file systems. --- dlls/ntdll/directory.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 641f642..890fb71 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -685,6 +685,13 @@ static char *get_default_drive_device( const char *root ) RtlEnterCriticalSection( &dir_section ); +#ifdef __ANDROID__ + if ((f = fopen( "/proc/mounts", "r" ))) + { + device = parse_mount_entries( f, st.st_dev, st.st_ino ); + fclose( f ); + } +#else if ((f = fopen( "/etc/mtab", "r" ))) { device = parse_mount_entries( f, st.st_dev, st.st_ino ); @@ -696,6 +703,7 @@ static char *get_default_drive_device( const char *root ) device = parse_mount_entries( f, st.st_dev, st.st_ino ); fclose( f ); } +#endif if (device) { ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 ); @@ -827,7 +835,11 @@ static char *get_device_mount_point( dev_t dev ) RtlEnterCriticalSection( &dir_section ); +#ifdef __ANDROID__ + if ((f = fopen( "/proc/mounts", "r" ))) +#else if ((f = fopen( "/etc/mtab", "r" ))) +#endif { struct mntent *entry; struct stat st;

1 0

Hans Leidekker : netprofm: New dll.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: cb0c5f53568e8a64b9fb1b2559afdd81555fde43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0c5f53568e8a64b9fb1b255… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:13 2014 +0200 netprofm: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/netprofm/Makefile.in | 4 ++++ dlls/netprofm/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 ++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 5f4a7c5..d65c398 100755 --- a/configure +++ b/configure @@ -1143,6 +1143,7 @@ enable_msxml6 enable_nddeapi enable_netapi32 enable_netcfgx +enable_netprofm enable_newdev enable_normaliz enable_npmshtml @@ -17052,6 +17053,7 @@ wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll netcfgx enable_netcfgx clean wine_fn_config_test dlls/netcfgx/tests netcfgx_test +wine_fn_config_dll netprofm enable_netprofm wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml diff --git a/configure.ac b/configure.ac index 44d7224..fbdc269 100644 --- a/configure.ac +++ b/configure.ac @@ -3031,6 +3031,7 @@ WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(netcfgx,,[clean]) WINE_CONFIG_TEST(dlls/netcfgx/tests) +WINE_CONFIG_DLL(netprofm) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in new file mode 100644 index 0000000..0368b86 --- /dev/null +++ b/dlls/netprofm/Makefile.in @@ -0,0 +1,4 @@ +MODULE = netprofm.dll + +C_SRCS = \ + main.c diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c new file mode 100644 index 0000000..8c9fd27 --- /dev/null +++ b/dlls/netprofm/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/netprofm/netprofm.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Hans Leidekker : netprofm: Add a stub implementation of INetworkListManager.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: 984663ff4a7bf4f4bf793a66b28ca849a666170d URL: http://source.winehq.org/git/wine.git/?a=commit;h=984663ff4a7bf4f4bf793a66b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:34 2014 +0200 netprofm: Add a stub implementation of INetworkListManager. --- dlls/netprofm/Makefile.in | 1 + dlls/netprofm/list.c | 230 ++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm_private.h | 19 ++++ include/Makefile.in | 1 + include/netlistmgr.idl | 85 ++++++++++++++ 5 files changed, 336 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=984663ff4a7bf4f4bf793…

1 0

Hans Leidekker : netprofm: Add a class factory implementation.
by Alexandre Julliard 07 Apr '14

07 Apr '14

Module: wine Branch: master Commit: ff3341210c2beba6ac0efd8e9655355bc277360c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3341210c2beba6ac0efd8e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 7 14:57:57 2014 +0200 netprofm: Add a class factory implementation. --- dlls/netprofm/main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ dlls/netprofm/netprofm.spec | 4 +- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/netprofm/main.c b/dlls/netprofm/main.c index 8c9fd27..ff694d9 100644 --- a/dlls/netprofm/main.c +++ b/dlls/netprofm/main.c @@ -20,6 +20,15 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#define COBJMACROS +#include "objbase.h" +#include "rpcproxy.h" +#include "netlistmgr.h" + +#include "wine/debug.h" +#include "netprofm_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netprofm); static HINSTANCE instance; @@ -36,3 +45,102 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +struct netprofm_cf +{ + const struct IClassFactoryVtbl *vtbl; + HRESULT (*create_instance)(void **); +}; + +static inline struct netprofm_cf *impl_from_IClassFactory( IClassFactory *iface ) +{ + return (struct netprofm_cf *)((char *)iface - FIELD_OFFSET( struct netprofm_cf, vtbl )); +} + +static HRESULT WINAPI netprofm_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) +{ + if (IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IClassFactory )) + { + IClassFactory_AddRef( iface ); + *ppobj = iface; + return S_OK; + } + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; +} + +static ULONG WINAPI netprofm_cf_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI netprofm_cf_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI netprofm_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN outer, + REFIID riid, LPVOID *obj ) +{ + struct netprofm_cf *factory = impl_from_IClassFactory( iface ); + IUnknown *unk; + HRESULT r; + + TRACE( "%p %s %p\n", outer, debugstr_guid(riid), obj ); + + *obj = NULL; + if (outer) return CLASS_E_NOAGGREGATION; + + r = factory->create_instance( (void **)&unk ); + if (FAILED( r )) + return r; + + r = IUnknown_QueryInterface( unk, riid, obj ); + if (FAILED( r )) + return r; + + IUnknown_Release( unk ); + return r; +} + +static HRESULT WINAPI netprofm_cf_LockServer( IClassFactory *iface, BOOL dolock ) +{ + FIXME( "%p, %d\n", iface, dolock ); + return S_OK; +} + +static const struct IClassFactoryVtbl netprofm_cf_vtbl = +{ + netprofm_cf_QueryInterface, + netprofm_cf_AddRef, + netprofm_cf_Release, + netprofm_cf_CreateInstance, + netprofm_cf_LockServer +}; + +static struct netprofm_cf list_manager_cf = { &netprofm_cf_vtbl, list_manager_create }; + +/*********************************************************************** + * DllGetClassObject (NETPROFM.@) + */ +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) +{ + IClassFactory *cf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID( rclsid, &CLSID_NetworkListManager )) + { + cf = (IClassFactory *)&list_manager_cf.vtbl; + } + if (!cf) return CLASS_E_CLASSNOTAVAILABLE; + return IClassFactory_QueryInterface( cf, iid, ppv ); +} + +/*********************************************************************** + * DllCanUnloadNow (NETPROFM.@) + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + return S_FALSE; +} diff --git a/dlls/netprofm/netprofm.spec b/dlls/netprofm/netprofm.spec index c5fc87a..c534b4f 100644 --- a/dlls/netprofm/netprofm.spec +++ b/dlls/netprofm/netprofm.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer

1 0