October 2008 - Wine-Commits

Michael Stefaniuc : cmdlgtst: Use NULL instead of casting 0 to a pointer.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 42e612fd7858eed8a30af1d1dfc9be5c99a7cb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e612fd7858eed8a30af1d1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 27 23:07:26 2008 +0100 cmdlgtst: Use NULL instead of casting 0 to a pointer. --- programs/cmdlgtst/cmdlgtst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index eeaf23b..d19c119 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -304,9 +304,9 @@ static void paintMainWindow(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPar /* now draw a couple of lines, just for giggles. */ - MoveToEx(ps.hdc, rect.left, rect.top, (POINT *) 0); + MoveToEx(ps.hdc, rect.left, rect.top, NULL); LineTo(ps.hdc, rect.right, rect.bottom); - MoveToEx(ps.hdc, rect.left, rect.bottom, (POINT *) 0); + MoveToEx(ps.hdc, rect.left, rect.bottom, NULL); LineTo(ps.hdc, rect.right, rect.top); /* draw some text */

1 0

Detlef Riekenberg : shdocvw/tests: Use the correct size for memset.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: f0ec2a5ca10eae06e203898d9eea6500e88466b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ec2a5ca10eae06e203898d9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Oct 27 22:43:34 2008 +0100 shdocvw/tests: Use the correct size for memset. --- dlls/shdocvw/tests/shdocvw.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/tests/shdocvw.c b/dlls/shdocvw/tests/shdocvw.c index cb75f5e..f3a75d4 100644 --- a/dlls/shdocvw/tests/shdocvw.c +++ b/dlls/shdocvw/tests/shdocvw.c @@ -63,13 +63,13 @@ static void test_URLSubRegQueryA(void) return; } - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; /* called by inetcpl.cpl */ hr = pURLSubRegQueryA(regpath_iemain, default_page_url, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); ok(hr == E_FAIL || hr == S_OK, "got 0x%x (expected E_FAIL or S_OK)\n", hr); - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; /* called by inetcpl.cpl */ hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); @@ -78,7 +78,7 @@ static void test_URLSubRegQueryA(void) ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, len); /* test buffer length: just large enough */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len+1, -1); used = lstrlenA(buffer); @@ -87,7 +87,7 @@ static void test_URLSubRegQueryA(void) "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len); /* no space for terminating 0: result is truncated */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len, -1); used = lstrlenA(buffer); @@ -96,7 +96,7 @@ static void test_URLSubRegQueryA(void) /* no space for the complete result: truncate another char */ if (len > 1) { - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, len-1, -1); used = lstrlenA(buffer); @@ -105,7 +105,7 @@ static void test_URLSubRegQueryA(void) } /* only space for the terminating 0: function still succeded */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 1, -1); used = lstrlenA(buffer); @@ -113,7 +113,7 @@ static void test_URLSubRegQueryA(void) "got 0x%x and %d (expected S_OK and 0)\n", hr, used); /* size of buffer is 0, but the function still succeed */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_SZ, buffer, 0, -1); used = lstrlenA(buffer); @@ -128,14 +128,14 @@ static void test_URLSubRegQueryA(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); /* this value does not exist */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, does_not_exist, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); /* random bytes are copied to the buffer */ ok((hr == E_FAIL), "got 0x%x (expected E_FAIL)\n", hr); /* the third parameter is ignored. Is it really a type? (data is REG_SZ) */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_iemain, start_page, REG_DWORD, buffer, INTERNET_MAX_URL_LENGTH, -1); used = lstrlenA(buffer); @@ -143,13 +143,13 @@ static void test_URLSubRegQueryA(void) "got 0x%x and %d (expected S_OK and %d)\n", hr, used, len); /* the function works for HKCU and HKLM */ - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_shellfolders, appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); used = lstrlenA(buffer); ok(hr == S_OK, "got 0x%x and %d (expected S_OK)\n", hr, used); - memset(buffer, '#', sizeof(buffer)-2); + memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pURLSubRegQueryA(regpath_shellfolders, common_appdata, REG_SZ, buffer, INTERNET_MAX_URL_LENGTH, -1); used = lstrlenA(buffer);

1 0

Marcus Meissner : oleview: Fixed size passed to LoadStringW.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 3f2047c836c27a183f438247cf5033d2d519bf39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2047c836c27a183f438247c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Oct 27 22:12:03 2008 +0100 oleview: Fixed size passed to LoadStringW. --- programs/oleview/interface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index 9350cea..2459b74 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -95,9 +95,9 @@ INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, IUnknown_Release(unk); if(hRes == S_OK) LoadString(globals.hMainInst, IDS_FALSE, wszBuf, - sizeof(WCHAR[MAX_LOAD_STRING])); + sizeof(wszBuf)/sizeof(wszBuf[0])); else LoadString(globals.hMainInst, IDS_TRUE, wszBuf, - sizeof(WCHAR[MAX_LOAD_STRING])); + sizeof(wszBuf)/sizeof(wszBuf[0])); hObject = GetDlgItem(hDlgWnd, IDC_ISDIRTY); SetWindowText(hObject, wszBuf); return TRUE; @@ -106,7 +106,7 @@ INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, IPersistStream_GetSizeMax((IPersistStream *)unk, &size); IUnknown_Release(unk); LoadString(globals.hMainInst, IDS_BYTES, wszBuf, - sizeof(WCHAR[MAX_LOAD_STRING])); + sizeof(wszBuf)/sizeof(wszBuf[0])); wsprintfW(wszSize, wszFormat, U(size).LowPart, wszBuf); hObject = GetDlgItem(hDlgWnd, IDC_GETSIZEMAX); SetWindowText(hObject, wszSize);

1 0

Austin English : winecfg: Set default windows version to XP.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: f64fbe2ef3838ad54bab3326006ea2f61357e350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64fbe2ef3838ad54bab33260… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 27 14:22:30 2008 -0500 winecfg: Set default windows version to XP. --- programs/winecfg/appdefaults.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f6495a9..28ec4fe 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -133,7 +133,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("win2k"); + else winver = strdupA("winxp"); } WINE_TRACE("winver is %s\n", winver);

1 0

Henri Verbeet : wined3d: Support some more texture types for GLSL depth blts.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: b33ddbde6a47d47b1e15c0b677757897b49a9587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33ddbde6a47d47b1e15c0b67… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 27 18:31:32 2008 +0100 wined3d: Support some more texture types for GLSL depth blts. --- dlls/wined3d/glsl_shader.c | 58 +++++++++++++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e75d8d..c43cdc3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -57,7 +57,7 @@ typedef struct { struct shader_glsl_priv { struct hash_table_t *glsl_program_lookup; struct glsl_shader_prog_link *glsl_program; - GLhandleARB depth_blt_glsl_program_id; + GLhandleARB depth_blt_program[tex_type_count]; }; /* Struct to maintain data about a linked GLSL program */ @@ -3379,7 +3379,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } } -static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { +static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info, enum tex_types tex_type) { GLhandleARB program_id; GLhandleARB vshader_id, pshader_id; const char *blt_vshader[] = { @@ -3392,21 +3392,47 @@ static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { "}\n" }; - const char *blt_pshader[] = { + const char *blt_pshaders[tex_type_count] = { + /* tex_1d */ + NULL, + /* tex_2d */ "#version 120\n" "uniform sampler2D sampler;\n" "void main(void)\n" "{\n" " gl_FragDepth = texture2D(sampler, gl_TexCoord[0].xy).x;\n" - "}\n" + "}\n", + /* tex_3d */ + NULL, + /* tex_cube */ + "#version 120\n" + "uniform samplerCube sampler;\n" + "void main(void)\n" + "{\n" + " gl_FragDepth = textureCube(sampler, gl_TexCoord[0].xyz).x;\n" + "}\n", + /* tex_rect */ + "#version 120\n" + "#extension GL_ARB_texture_rectangle : enable\n" + "uniform sampler2DRect sampler;\n" + "void main(void)\n" + "{\n" + " gl_FragDepth = texture2DRect(sampler, gl_TexCoord[0].xy).x;\n" + "}\n", }; + if (!blt_pshaders[tex_type]) + { + FIXME("tex_type %#x not supported\n", tex_type); + tex_type = tex_2d; + } + vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); GL_EXTCALL(glShaderSourceARB(vshader_id, 1, blt_vshader, NULL)); GL_EXTCALL(glCompileShaderARB(vshader_id)); pshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); - GL_EXTCALL(glShaderSourceARB(pshader_id, 1, blt_pshader, NULL)); + GL_EXTCALL(glShaderSourceARB(pshader_id, 1, &blt_pshaders[tex_type], NULL)); GL_EXTCALL(glCompileShaderARB(pshader_id)); program_id = GL_EXTCALL(glCreateProgramObjectARB()); @@ -3457,17 +3483,16 @@ static void shader_glsl_select_depth_blt(IWineD3DDevice *iface, enum tex_types t IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; + GLhandleARB *blt_program = &priv->depth_blt_program[tex_type]; - if (tex_type != tex_2d) FIXME("Unsupported tex_type %#x\n", tex_type); - - if (!priv->depth_blt_glsl_program_id) { + if (!*blt_program) { GLhandleARB loc; - priv->depth_blt_glsl_program_id = create_glsl_blt_shader(gl_info); - loc = GL_EXTCALL(glGetUniformLocationARB(priv->depth_blt_glsl_program_id, "sampler")); - GL_EXTCALL(glUseProgramObjectARB(priv->depth_blt_glsl_program_id)); + *blt_program = create_glsl_blt_shader(gl_info, tex_type); + loc = GL_EXTCALL(glGetUniformLocationARB(*blt_program, "sampler")); + GL_EXTCALL(glUseProgramObjectARB(*blt_program)); GL_EXTCALL(glUniform1iARB(loc, 0)); } else { - GL_EXTCALL(glUseProgramObjectARB(priv->depth_blt_glsl_program_id)); + GL_EXTCALL(glUseProgramObjectARB(*blt_program)); } } @@ -3560,9 +3585,14 @@ static void shader_glsl_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + int i; - if(priv->depth_blt_glsl_program_id) { - GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_glsl_program_id)); + for (i = 0; i < tex_type_count; ++i) + { + if (priv->depth_blt_program[i]) + { + GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_program[i])); + } } hash_table_destroy(priv->glsl_program_lookup, NULL, NULL);

1 0

Henri Verbeet : wined3d: Pass explicit texcoords to depth blt.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 437b34242416e55e5a6944bc26e8e704a502e09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=437b34242416e55e5a6944bc2… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 27 18:31:31 2008 +0100 wined3d: Pass explicit texcoords to depth blt. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/glsl_shader.c | 3 +-- dlls/wined3d/surface.c | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2acf5ea..d1c6f91 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1788,8 +1788,7 @@ static GLuint create_arb_blt_vertex_program(WineD3D_GL_Info *gl_info) { "PARAM c[1] = { { 1, 0.5 } };\n" "MOV result.position, vertex.position;\n" "MOV result.color, c[0].x;\n" - "MAD result.texcoord[0].y, -vertex.position, c[0], c[0];\n" - "MAD result.texcoord[0].x, vertex.position, c[0].y, c[0].y;\n" + "MOV result.texcoord[0], vertex.texcoord[0];\n" "END\n"; GL_EXTCALL(glGenProgramsARB(1, &program_id)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c1f23c7..9e75d8d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3388,8 +3388,7 @@ static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { "{\n" " gl_Position = gl_Vertex;\n" " gl_FrontColor = vec4(1.0);\n" - " gl_TexCoord[0].x = (gl_Vertex.x * 0.5) + 0.5;\n" - " gl_TexCoord[0].y = (-gl_Vertex.y * 0.5) + 0.5;\n" + " gl_TexCoord[0] = gl_MultiTexCoord0;\n" "}\n" }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7017d40..83c419e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3979,9 +3979,13 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei device->shader_backend->shader_select_depth_blt((IWineD3DDevice *)device, tex_2d); glBegin(GL_TRIANGLE_STRIP); + glTexCoord2f(0.0f, 1.0f); glVertex2f(-1.0f, -1.0f); + glTexCoord2f(1.0f, 1.0f); glVertex2f(1.0f, -1.0f); + glTexCoord2f(0.0f, 0.0f); glVertex2f(-1.0f, 1.0f); + glTexCoord2f(1.0f, 0.0f); glVertex2f(1.0f, 1.0f); glEnd();

1 0

Henri Verbeet : wined3d: Pass the texture type to the shader depth blt function.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 57401fcab253c7933b2b947490dc5f448ab88034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57401fcab253c7933b2b94749… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 27 18:31:31 2008 +0100 wined3d: Pass the texture type to the shader depth blt function. --- dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 21 +++++++++++---------- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2494ced..2acf5ea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1880,11 +1880,13 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { } } -static void shader_arb_select_depth_blt(IWineD3DDevice *iface) { +static void shader_arb_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + if (tex_type != tex_2d) FIXME("Unsupported tex_type %#x\n", tex_type); + if (!priv->depth_blt_vprogram_id) priv->depth_blt_vprogram_id = create_arb_blt_vertex_program(gl_info); GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->depth_blt_vprogram_id)); glEnable(GL_VERTEX_PROGRAM_ARB); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 877b0ee..03567a1 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1092,7 +1092,7 @@ void shader_trace_init( static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0}; static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} -static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} +static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) {} static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_cleanup(IWineD3DDevice *iface) {} diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61a38c5..c1f23c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3454,11 +3454,13 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { checkGLcall("glUseProgramObjectARB"); } -static void shader_glsl_select_depth_blt(IWineD3DDevice *iface) { +static void shader_glsl_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; + if (tex_type != tex_2d) FIXME("Unsupported tex_type %#x\n", tex_type); + if (!priv->depth_blt_glsl_program_id) { GLhandleARB loc; priv->depth_blt_glsl_program_id = create_glsl_blt_shader(gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a44131a..7017d40 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3976,7 +3976,7 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); glBindTexture(GL_TEXTURE_2D, texture); - device->shader_backend->shader_select_depth_blt((IWineD3DDevice *)device); + device->shader_backend->shader_select_depth_blt((IWineD3DDevice *)device, tex_2d); glBegin(GL_TRIANGLE_STRIP); glVertex2f(-1.0f, -1.0f); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 428fedf..1ca1edd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -323,10 +323,20 @@ struct shader_caps { DWORD MaxPixelShader30InstructionSlots; }; +enum tex_types +{ + tex_1d = 0, + tex_2d = 1, + tex_3d = 2, + tex_cube = 3, + tex_rect = 4, + tex_type_count = 5, +}; + typedef struct { const SHADER_HANDLER *shader_instruction_handler_table; void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); - void (*shader_select_depth_blt)(IWineD3DDevice *iface); + void (*shader_select_depth_blt)(IWineD3DDevice *iface, enum tex_types tex_type); void (*shader_deselect_depth_blt)(IWineD3DDevice *iface); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_cleanup)(IWineD3DDevice *iface); @@ -821,15 +831,6 @@ enum projection_types proj_count4 = 2 }; -enum tex_types -{ - tex_1d = 0, - tex_2d = 1, - tex_3d = 2, - tex_cube = 3, - tex_rect = 4 -}; - enum dst_arg { resultreg = 0,

1 0

Huw Davies : ole32: Implement IEnum*_Next marshallers.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: a26d67b14e56ea27de44cec8ca9b565407116f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26d67b14e56ea27de44cec8c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 27 15:44:07 2008 +0000 ole32: Implement IEnum*_Next marshallers. --- dlls/ole32/usrmarshal.c | 84 +++++++++++++++++++++++++++++++++------------- 1 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 9996891..e504485 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2010,8 +2010,10 @@ HRESULT CALLBACK IEnumUnknown_Next_Proxy( IUnknown **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumUnknown_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumUnknown_Next_Stub( @@ -2020,8 +2022,12 @@ HRESULT __RPC_STUB IEnumUnknown_Next_Stub( IUnknown **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumUnknown_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IBindCtx_SetBindOptions_Proxy( @@ -2062,8 +2068,10 @@ HRESULT CALLBACK IEnumMoniker_Next_Proxy( IMoniker **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumMoniker_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumMoniker_Next_Stub( @@ -2072,8 +2080,12 @@ HRESULT __RPC_STUB IEnumMoniker_Next_Stub( IMoniker **rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumMoniker_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } BOOL CALLBACK IRunnableObject_IsRunning_Proxy( @@ -2142,8 +2154,10 @@ HRESULT CALLBACK IEnumString_Next_Proxy( LPOLESTR *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumString_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumString_Next_Stub( @@ -2152,8 +2166,12 @@ HRESULT __RPC_STUB IEnumString_Next_Stub( LPOLESTR *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumString_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK ISequentialStream_Read_Proxy( @@ -2244,8 +2262,10 @@ HRESULT CALLBACK IEnumSTATSTG_Next_Proxy( STATSTG *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumSTATSTG_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumSTATSTG_Next_Stub( @@ -2254,8 +2274,12 @@ HRESULT __RPC_STUB IEnumSTATSTG_Next_Stub( STATSTG *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumSTATSTG_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IStorage_OpenStream_Proxy( @@ -2422,8 +2446,10 @@ HRESULT CALLBACK IEnumSTATDATA_Next_Proxy( STATDATA *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumSTATDATA_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumSTATDATA_Next_Stub( @@ -2432,8 +2458,12 @@ HRESULT __RPC_STUB IEnumSTATDATA_Next_Stub( STATDATA *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumSTATDATA_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } void CALLBACK IAdviseSink_OnDataChange_Proxy( @@ -2646,8 +2676,10 @@ HRESULT CALLBACK IEnumOLEVERB_Next_Proxy( LPOLEVERB rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumOLEVERB_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumOLEVERB_Next_Stub( @@ -2656,8 +2688,12 @@ HRESULT __RPC_STUB IEnumOLEVERB_Next_Stub( LPOLEVERB rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumOLEVERB_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IViewObject_Draw_Proxy(

1 0

Henri Verbeet : wined3d: Move depth_blt to surface.c.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: 4034a29f199531eb4b592765bf381c1254f0da05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4034a29f199531eb4b592765b… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Oct 27 18:31:31 2008 +0100 wined3d: Move depth_blt to surface.c. --- dlls/wined3d/drawprim.c | 37 ----------------------------------- dlls/wined3d/surface.c | 42 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 267bdf8..b3612bd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -653,43 +653,6 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa glEnd(); } -void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint old_binding = 0; - - glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); - - glDisable(GL_CULL_FACE); - glEnable(GL_BLEND); - glDisable(GL_ALPHA_TEST); - glDisable(GL_SCISSOR_TEST); - glDisable(GL_STENCIL_TEST); - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_ALWAYS); - glDepthMask(GL_TRUE); - glBlendFunc(GL_ZERO, GL_ONE); - glViewport(0, 0, w, h); - - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - glBindTexture(GL_TEXTURE_2D, texture); - - This->shader_backend->shader_select_depth_blt(iface); - - glBegin(GL_TRIANGLE_STRIP); - glVertex2f(-1.0f, -1.0f); - glVertex2f(1.0f, -1.0f); - glVertex2f(-1.0f, 1.0f); - glVertex2f(1.0f, 1.0f); - glEnd(); - - glBindTexture(GL_TEXTURE_2D, old_binding); - - glPopAttrib(); - - This->shader_backend->shader_deselect_depth_blt(iface); -} - static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 953985b..a44131a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3954,6 +3954,44 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { return WINED3D_OK; } +static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei w, GLsizei h) +{ + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + GLint old_binding = 0; + + glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); + + glDisable(GL_CULL_FACE); + glEnable(GL_BLEND); + glDisable(GL_ALPHA_TEST); + glDisable(GL_SCISSOR_TEST); + glDisable(GL_STENCIL_TEST); + glEnable(GL_DEPTH_TEST); + glDepthFunc(GL_ALWAYS); + glDepthMask(GL_TRUE); + glBlendFunc(GL_ZERO, GL_ONE); + glViewport(0, 0, w, h); + + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + glBindTexture(GL_TEXTURE_2D, texture); + + device->shader_backend->shader_select_depth_blt((IWineD3DDevice *)device); + + glBegin(GL_TRIANGLE_STRIP); + glVertex2f(-1.0f, -1.0f); + glVertex2f(1.0f, -1.0f); + glVertex2f(-1.0f, 1.0f); + glVertex2f(1.0f, 1.0f); + glEnd(); + + glBindTexture(GL_TEXTURE_2D, old_binding); + + glPopAttrib(); + + device->shader_backend->shader_deselect_depth_blt((IWineD3DDevice *)device); +} + void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -4037,7 +4075,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { context_attach_depth_stencil_fbo(device, GL_FRAMEBUFFER_EXT, iface, FALSE); /* Do the actual blit */ - depth_blt((IWineD3DDevice *)device, device->depth_blt_texture, This->currentDesc.Width, This->currentDesc.Height); + surface_depth_blt(This, device->depth_blt_texture, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("depth_blt"); if (device->activeContext->current_fbo) { @@ -4059,7 +4097,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); - depth_blt((IWineD3DDevice *)device, This->glDescription.textureName, This->currentDesc.Width, This->currentDesc.Height); + surface_depth_blt(This, This->glDescription.textureName, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("depth_blt"); if (device->activeContext->current_fbo) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc6a1cb..428fedf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2442,5 +2442,4 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); -void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h); #endif

1 0

Huw Davies : ole32: Try to load the '\1Ole' stream and create it if it doesn't exist.
by Alexandre Julliard Oct. 28, 2008

Oct. 28, 2008

Module: wine Branch: master Commit: b05d392dfb962876e670afe7fbd7fdaf1ca4f930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05d392dfb962876e670afe7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 27 15:25:24 2008 +0000 ole32: Try to load the '\1Ole' stream and create it if it doesn't exist. --- dlls/ole32/defaulthandler.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 66d2bff..833e6fd 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1598,6 +1598,42 @@ static void init_ole_stream(IStorage *storage) return; } +static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage) +{ + IStream *stream; + HRESULT hr; + + hr = IStorage_OpenStream(storage, OleStream, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); + + if(SUCCEEDED(hr)) + { + DWORD read; + ole_stream_header_t header; + + hr = IStream_Read(stream, &header, sizeof(header), &read); + if(hr == S_OK && read == sizeof(header) && header.version == ole_stream_version) + { + if(header.flags & 1) + { + /* FIXME: Read the moniker and deal with the link */ + FIXME("Linked objects are not supported yet\n"); + } + } + else + { + WARN("Incorrect OleStream header\n"); + hr = DV_E_CLIPFORMAT; + } + IStream_Release(stream); + } + else + { + init_ole_stream(storage); + hr = S_OK; + } + return hr; +} + /************************************************************************ * DefaultHandler_IPersistStorage_InitNew * @@ -1641,7 +1677,10 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( TRACE("(%p)->(%p)\n", iface, pStg); - hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); + hr = load_ole_stream(This, pStg); + + if(SUCCEEDED(hr)) + hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_Load(This->pPSDelegate, pStg);

1 0