February 2015 - Wine-commits

Stefan Dösinger : d3d9/tests: Test rhw table fog z vs rhw.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 3b2c642163a592c772c89d81e0b272eda5e20f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2c642163a592c772c89d81e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:42 2015 +0100 d3d9/tests: Test rhw table fog z vs rhw. The Z disable part of the test is technically not necessary because the fog coordinate is written before applying the projection matrix. I've nevertheless included it because this is not immediately obvious and fog is the only place where the vertex Z matters if depth test and depth clipping are disabled. --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e2b7b81..1f42f5a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17327,6 +17327,127 @@ done: DestroyWindow(window); } +static void test_table_fog_zw(void) +{ + HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + D3DCOLOR color; + D3DCAPS9 caps; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ 0.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{ 0.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + static const struct + { + float z, w; + D3DZBUFFERTYPE z_test; + D3DCOLOR color; + } + tests[] = + { + {0.7f, 0.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.0f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_FALSE, 0x004cb200}, + {0.3f, 0.0f, D3DZB_TRUE, 0x00b24c00}, + {0.3f, 0.0f, D3DZB_FALSE, 0x00b24c00}, + }; + unsigned int i; + + 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"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + /* Work around an AMD Windows driver bug. Needs a proj matrix applied redundantly. */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + quad[0].position.z = tests[i].z; + quad[1].position.z = tests[i].z; + quad[2].position.z = tests[i].z; + quad[3].position.z = tests[i].z; + quad[0].position.w = tests[i].w; + quad[1].position.w = tests[i].w; + quad[2].position.w = tests[i].w; + quad[3].position.w = tests[i].w; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, tests[i].z_test); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].color, 2), + "Got unexpected color 0x%08x, expected 0x%08x, case %u.\n", color, tests[i].color, i); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + +done: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -17438,4 +17559,5 @@ START_TEST(visual) test_fog_interpolation(); test_negative_fixedfunction_fog(); test_position_index(); + test_table_fog_zw(); }

1 0

Stefan Dösinger : d3d8/tests: Test rhw table fog z vs rhw.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 77eb58b54e090c2ddb49b317db6eea793ae1002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=77eb58b54e090c2ddb49b317d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:43 2015 +0100 d3d8/tests: Test rhw table fog z vs rhw. --- dlls/d3d8/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e47e6a8..7efc90d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5515,6 +5515,127 @@ static void test_negative_fixedfunction_fog(void) DestroyWindow(window); } +static void test_table_fog_zw(void) +{ + HRESULT hr; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + D3DCOLOR color; + D3DCAPS8 caps; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ 0.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{ 0.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + static const struct + { + float z, w; + D3DZBUFFERTYPE z_test; + D3DCOLOR color; + } + tests[] = + { + {0.7f, 0.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.0f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_FALSE, 0x004cb200}, + {0.3f, 0.0f, D3DZB_TRUE, 0x00b24c00}, + {0.3f, 0.0f, D3DZB_FALSE, 0x00b24c00}, + }; + unsigned int i; + + 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"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + /* Work around an AMD Windows driver bug. Needs a proj matrix applied redundantly. */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + quad[0].position.z = tests[i].z; + quad[1].position.z = tests[i].z; + quad[2].position.z = tests[i].z; + quad[3].position.z = tests[i].z; + quad[0].position.w = tests[i].w; + quad[1].position.w = tests[i].w; + quad[2].position.w = tests[i].w; + quad[3].position.w = tests[i].w; + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, tests[i].z_test); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].color, 2), + "Got unexpected color 0x%08x, expected 0x%08x, case %u.\n", color, tests[i].color, i); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + +done: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -5567,4 +5688,5 @@ START_TEST(visual) test_3dc_formats(); test_fog_interpolation(); test_negative_fixedfunction_fog(); + test_table_fog_zw(); }

1 0

Matteo Bruni : wined3d: Use the proper pitch in read_from_framebuffer().
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: ac3df5e1f1d4595b5d0e9b8404025068ed79bcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3df5e1f1d4595b5d0e9b840… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:14:49 2015 +0100 wined3d: Use the proper pitch in read_from_framebuffer(). This function is only used in the non-default "backbuffer" ORM. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8aaa82b..8f60769 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2843,7 +2843,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc } /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, surface->resource.width); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, + wined3d_surface_get_pitch(surface) / surface->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0,

1 0

Jacek Caban : vbscript: Added InStrRev implementation.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9b0ebaeb78374d23e2d1a14ec303b3643d6daca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ebaeb78374d23e2d1a14ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 10 18:46:25 2015 +0100 vbscript: Added InStrRev implementation. --- dlls/vbscript/global.c | 58 ++++++++++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 58 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bbbe22c..9bcd2b2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1777,10 +1777,62 @@ static HRESULT Global_StrReverse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt return return_bstr(res, ret); } -static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int start, ret = 0; + BSTR str1, str2; + HRESULT hres; + + TRACE("%s %s arg_cnt=%u\n", debugstr_variant(args), debugstr_variant(args+1), args_cnt); + + if(args_cnt > 3) { + FIXME("Unsupported args\n"); + return E_NOTIMPL; + } + + assert(2 <= args_cnt && args_cnt <= 4); + + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || V_VT(args+2) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_string(args, &str1); + if(FAILED(hres)) + return hres; + + hres = to_string(args+1, &str2); + if(SUCCEEDED(hres)) { + if(args_cnt > 2) { + hres = to_int(args+2, &start); + if(SUCCEEDED(hres) && start <= 0) { + FIXME("Unsupported start %d\n", start); + hres = E_NOTIMPL; + } + }else { + start = SysStringLen(str1); + } + } + + if(SUCCEEDED(hres)) { + const WCHAR *ptr; + size_t len; + + len = SysStringLen(str2); + if(start >= len && start <= SysStringLen(str1)) { + for(ptr = str1+start-SysStringLen(str2); ptr >= str1; ptr--) { + if(!memcmp(ptr, str2, len*sizeof(WCHAR))) { + ret = ptr-str1+1; + break; + } + } + } + } + + SysFreeString(str1); + SysFreeString(str2); + if(FAILED(hres)) + return hres; + + return return_int(res, ret); } static HRESULT Global_LoadPicture(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1b68d2e..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -282,6 +282,64 @@ Call ok(x = 2, "InStr returned " & x) x = InStr(2.6, "abcd", "bc") Call ok(x = 0, "InStr returned " & x) + +x = InStrRev("bcabcd", "bc") +Call ok(x = 4, "InStrRev returned " & x) +Call ok(getVT(x) = "VT_I4*", "getVT(InStrRev) returned " & getVT(x)) + +x = InStrRev("bcabcd", "bc", 6) +Call ok(x = 4, "InStrRev returned " & x) + +x = InStrRev("abcd", "bcx") +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 3) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "b", 2) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 5) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 15) +Call ok(x = 0, "InStrRev returned " & x) + +x = "abcd" +x = InStrRev(x, "bc") +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 1.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.3) +Call ok(x = 0, "InStrRev returned " & x) + +x = InStrRev("abcd", "bc", 2.6) +Call ok(x = 2, "InStrRev returned " & x) + +x = InStrRev("1234", 34) +Call ok(x = 3, "InStrRev returned " & x) + +x = InStrRev(1234, 34) +Call ok(x = 3, "InStrRev returned " & x) + +Sub testInStrRevError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = InStrRev(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +call testInStrRevError("abcd", null, 2, 94) +call testInStrRevError(null, "abcd", 2, 94) +call testInStrRevError("abcd", "abcd", null, 94) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex)

1 0

Matteo Bruni : opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3).
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9e45ae04137c58e009f62f6e719afde4b3ba0083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e45ae04137c58e009f62f6e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:13:44 2015 +0100 opengl32: Introduce wrappers for glGetIntegerv and glGetStringi. (v3). --- dlls/opengl32/make_opengl | 8 +++++++- dlls/opengl32/opengl_ext.c | 6 +----- dlls/opengl32/opengl_norm.c | 9 --------- dlls/opengl32/wgl.c | 33 ++++++++++++++++++++++++--------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9ca5ebd..2b15f58 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -236,6 +236,7 @@ sub GenerateThunk($$$$) my $trace_arg = ""; return "" if $name eq "glDebugEntry"; + return "" if $name eq "glGetIntegerv"; return "" if $name eq "glGetString"; return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; @@ -285,6 +286,7 @@ sub GenerateThunk($$$$) } } $ret .= 'void ' if (!@{$func_ref->[1]}); + return "$ret) DECLSPEC_HIDDEN;\n" if $name eq "glGetStringi"; $ret .= ") {\n"; $ret .= " const struct opengl_funcs *funcs = NtCurrentTeb()->glTable;\n"; if ($func_ref->[0] ne "void" && $gen_thread_safe) { @@ -951,7 +953,11 @@ my $count = keys %ext_functions; print EXT "const int extension_registry_size = $count;\n"; foreach (sort keys %ext_functions) { my $string = GenerateThunk($_, $ext_functions{$_}, 0, "ext"); - print EXT "\nstatic $string" if $string; + if ($string =~ /DECLSPEC_HIDDEN/) { + print EXT "\n$string"; + } else { + print EXT "\nstatic $string" if $string; + } } # Then the table giving the string <-> function correspondence */ diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 9b9dfa7..67ebc59 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -5014,11 +5014,7 @@ static void WINAPI glGetSharpenTexFuncSGIS( GLenum target, GLfloat* points ) { funcs->ext.p_glGetSharpenTexFuncSGIS( target, points ); } -static const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %d)\n", name, index ); - return funcs->ext.p_glGetStringi( name, index ); -} +const GLubyte* WINAPI glGetStringi( GLenum name, GLuint index ) DECLSPEC_HIDDEN; static GLuint WINAPI glGetSubroutineIndex( GLuint program, GLenum shadertype, const GLchar* name ) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 52fb00b..34a4892 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -948,15 +948,6 @@ void WINAPI glGetFloatv( GLenum pname, GLfloat* data ) { } /*********************************************************************** - * glGetIntegerv (OPENGL32.@) - */ -void WINAPI glGetIntegerv( GLenum pname, GLint* data ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("(%d, %p)\n", pname, data ); - funcs->gl.p_glGetIntegerv( pname, data ); -} - -/*********************************************************************** * glGetLightfv (OPENGL32.@) */ void WINAPI glGetLightfv( GLenum light, GLenum pname, GLfloat* params ) { diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6ff54f0..b028fe0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -687,27 +687,42 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +void WINAPI glGetIntegerv(GLenum pname, GLint *data) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %p)\n", pname, data); + funcs->gl.p_glGetIntegerv(pname, data); +} + +const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + + TRACE("(%d, %d)\n", name, index); + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + return funcs->ext.p_glGetStringi(name, index); +} + /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { if (!list) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext; unsigned int i; GLint extensions_count; - if (!funcs->ext.p_glGetStringi) - { - void **func_ptr = (void **)&funcs->ext.p_glGetStringi; - - *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); - } - glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); for (i = 0; i < extensions_count; ++i) { - gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + gl_ext = (const char *)glGetStringi(GL_EXTENSIONS, i); if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) return TRUE; }

1 0

Austin English : connect: Add IsInternetConnected stub.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: e94fc1db5a749670102f46df42e327ab8cd0013d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94fc1db5a749670102f46df4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 10 14:12:38 2015 -0600 connect: Add IsInternetConnected stub. --- dlls/connect/connect.spec | 2 +- dlls/connect/main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/connect/connect.spec b/dlls/connect/connect.spec index 6b4da21..7251c34 100644 --- a/dlls/connect/connect.spec +++ b/dlls/connect/connect.spec @@ -7,7 +7,7 @@ @ stub GetVPNConnected @ stub HrIsInternetConnected @ stub HrIsInternetConnectedGUID -@ stub IsInternetConnected +@ stdcall IsInternetConnected() @ stub IsInternetConnectedGUID @ stub IsUniqueConnectionName @ stub RegisterPageWithPage diff --git a/dlls/connect/main.c b/dlls/connect/main.c index 1c12f72..a84ca76 100644 --- a/dlls/connect/main.c +++ b/dlls/connect/main.c @@ -22,6 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(connect); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +39,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI IsInternetConnected(void) +{ + FIXME("stub, faking success!\n"); + return S_OK; +}

1 0

Alexandre Julliard : msvcp70: Fix calling convention for a non-member function.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: dc06802a42a380bd90d2f21d243cdff8d7518c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc06802a42a380bd90d2f21d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 23:02:03 2015 +0900 msvcp70: Fix calling convention for a non-member function. --- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 22669fb..2e98230 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1090,8 +1090,8 @@ @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z -@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort -@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort_global +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort_global @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 39c59b6..1c6111c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7129,6 +7129,14 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_ushort(basic_ostream_w basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z */ +/* ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z */ +basic_ostream_wchar* __cdecl basic_ostream_short_print_ushort_global(basic_ostream_wchar *ostr, unsigned short val) +{ + return basic_ostream_print_ushort(ostr, val, num_put_short_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(ostr))->loc)); +} + static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this);

1 0

Jacek Caban : ieframe: Keep reference to This in all IDocObjectService callback calls.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: f46ee92d906063c5d28bb45812553d989e924a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46ee92d906063c5d28bb4581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:05:54 2015 +0100 ieframe: Keep reference to This in all IDocObjectService callback calls. --- dlls/ieframe/shellbrowser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 216d3f4..51316b4 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -708,10 +708,15 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); TRACE("<<<\n"); + IShellBrowser_Release(&This->IShellBrowser_iface); + SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); SysFreeString(V_BSTR(&var_frame_name)); @@ -764,6 +769,9 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); TRACE("<<<\n"); @@ -771,6 +779,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( SysFreeString(url); This->doc_host->busy = VARIANT_FALSE; + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0

Jacek Caban : mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9e2a446fad0b2cd78c4efacb3ee77a3fd925c0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2a446fad0b2cd78c4efacb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:06:04 2015 +0100 mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes. --- dlls/mshtml/navigate.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 878e582..c2d4603 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,23 +2245,32 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; if(!(flags & BINDING_REFRESH)) { + BSTR frame_name = NULL; BOOL cancel = FALSE; + if(window != window->doc_obj->basedoc.window) { + hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); + if(FAILED(hres)) + return hres; + } + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, - NULL, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { TRACE("Navigation canceled\n"); return S_OK; } } - return super_navigate(window, uri, flags, headers, post_data, post_data_len); + if(window == window->doc_obj->basedoc.window) + return super_navigate(window, uri, flags, headers, post_data, post_data_len); } if(window->doc_obj && window == window->doc_obj->basedoc.window) {

1 0

Henri Verbeet : wined3d: Add some warnings when resource_init() fails due to format restrictions.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 5045ca639d3053b4722976aa5fac0cda1def5f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5045ca639d3053b4722976aa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:14 2015 +0100 wined3d: Add some warnings when resource_init() fails due to format restrictions. --- dlls/wined3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0ab55dc..f4134e2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -84,11 +84,20 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (pool != WINED3D_POOL_SCRATCH) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) + { + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } } resource->ref = 1;

1 0