August 2011 - Wine-commits - list.winehq.org

Alexander Morozov : cryptui: Add stubs for CryptUIDlgSelectCertificateA/W.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: d15d45e5d1006bfee502ebec3447ed59e1e642cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15d45e5d1006bfee502ebec3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 20 21:09:42 2011 +0400 cryptui: Add stubs for CryptUIDlgSelectCertificateA/W. --- dlls/cryptui/cryptui.spec | 4 ++-- dlls/cryptui/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index d243217..bce5de0 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -2,9 +2,9 @@ 2 stdcall CryptUIDlgCertMgr(ptr) 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA -5 stub CryptUIDlgSelectCertificateA +5 stdcall CryptUIDlgSelectCertificateA(ptr) 6 stub CryptUIDlgSelectCertificateFromStore -7 stub CryptUIDlgSelectCertificateW +7 stdcall CryptUIDlgSelectCertificateW(ptr) 8 stdcall CryptUIDlgSelectStoreA(ptr) 9 stdcall CryptUIDlgSelectStoreW(ptr) 10 stub CryptUIDlgViewCRLA diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 15e71d5..9df9800 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7043,3 +7043,15 @@ BOOL WINAPI CryptUIDlgViewSignerInfoA(CRYPTUI_VIEWSIGNERINFO_STRUCTA *pcvsi) FIXME("%p: stub\n", pcvsi); return FALSE; } + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_STRUCTW pcsc) +{ + FIXME("%p: stub\n", pcsc); + return NULL; +} + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_STRUCTA pcsc) +{ + FIXME("%p: stub\n", pcsc); + return NULL; +}

1 0

Henri Verbeet : wined3d: Simplify context_apply_fbo_state_blit().
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 98277e1fc6896348d1becded9a809d5b6a3b18b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98277e1fc6896348d1becded9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:55 2011 +0200 wined3d: Simplify context_apply_fbo_state_blit(). --- dlls/wined3d/context.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 797eb73..33b07ce 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -431,17 +431,12 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) { - if (location != SFLAG_INDRAWABLE || surface_is_offscreen(render_target)) - { - UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); - context->blit_targets[0] = render_target; - if (clear_size) memset(&context->blit_targets[1], 0, clear_size); - context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location); - } - else - { - context_apply_fbo_state(context, target, NULL, NULL, location); - } + UINT clear_size = (context->gl_info->limits.buffers - 1) * sizeof(*context->blit_targets); + + context->blit_targets[0] = render_target; + if (clear_size) + memset(&context->blit_targets[1], 0, clear_size); + context_apply_fbo_state(context, target, context->blit_targets, depth_stencil, location); } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Get rid of the location fixup for ORM_FBO in surface_load_location().
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 68a5305dfd6708045d72d7af0ecba2b778c349e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a5305dfd6708045d72d7af0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:56 2011 +0200 wined3d: Get rid of the location fixup for ORM_FBO in surface_load_location(). --- dlls/wined3d/surface.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75e39fc..c880e6e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5908,6 +5908,12 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, UINT byte_count; BYTE *mem; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)) + { + ERR("Trying to load offscreen surface into SFLAG_INDRAWABLE.\n"); + return WINED3DERR_INVALIDCALL; + } + if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) surface_load_location(surface, SFLAG_INTEXTURE, NULL); @@ -6140,7 +6146,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - BOOL in_fbo = FALSE; HRESULT hr; TRACE("surface %p, location %s, rect %s.\n", surface, debug_surflocation(location), wine_dbgstr_rect(rect)); @@ -6161,22 +6166,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c } } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (surface_is_offscreen(surface)) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same - * for offscreen targets. Prefer SFLAG_INTEXTURE. */ - if (location == SFLAG_INDRAWABLE) - location = SFLAG_INTEXTURE; - in_fbo = TRUE; - } - else - { - TRACE("Surface %p is an onscreen surface.\n", surface); - } - } - if (location == SFLAG_INSRGBTEX && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) location = SFLAG_INTEXTURE; @@ -6231,12 +6220,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c surface_evict_sysmem(surface); } - if (in_fbo && (surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ - surface->flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); - } - if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) {

1 0

Henri Verbeet : wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location().
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: eac640532da26841b1ac41d01823c00270cc6376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac640532da26841b1ac41d01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:57 2011 +0200 wined3d: Get rid of the location fixup for ORM_FBO in surface_modify_location(). --- dlls/wined3d/surface.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c880e6e..49dbc68 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5793,20 +5793,9 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO TRACE("surface %p, location %s, persistent %#x.\n", surface, debug_surflocation(location), persistent); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (surface_is_offscreen(surface)) - { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same - * for offscreen targets. */ - if (location & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) - location |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); - } - else - { - TRACE("Surface %p is an onscreen surface.\n", surface); - } - } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface) + && (location & SFLAG_INDRAWABLE)) + ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE])

1 0

Henri Verbeet : wined3d: Get rid of the location fixup in surface_blt_fbo() .
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 3b478afd10031a39fb3b92c6506de04c4e69b8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b478afd10031a39fb3b92c65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 25 21:04:58 2011 +0200 wined3d: Get rid of the location fixup in surface_blt_fbo(). --- dlls/wined3d/surface.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 49dbc68..ec3cf20 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1207,11 +1207,6 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF break; } - if (src_location == SFLAG_INDRAWABLE && surface_is_offscreen(src_surface)) - src_location = SFLAG_INTEXTURE; - if (dst_location == SFLAG_INDRAWABLE && surface_is_offscreen(dst_surface)) - dst_location = SFLAG_INTEXTURE; - /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with

1 0

Frédéric Delanoy : cmd/tests: Add attrib tests.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 3ce59f5dba4bcb26f8408d3bfe69111808d25529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce59f5dba4bcb26f8408d3bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Aug 24 12:53:21 2011 +0200 cmd/tests: Add attrib tests. --- programs/cmd/tests/test_builtins.cmd | 61 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 20 ++++++++++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 668bea4..618a6c7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -786,6 +786,67 @@ if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! cd .. rd /s/q foobaz +echo ------------ Testing attrib -------------- +rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications +mkdir foobar & cd foobar +echo foo original contents> foo +attrib foo +echo > bar +echo ... read-only attribute +rem Read-only files cannot be altered or deleted, unless forced +attrib +R foo +attrib foo +dir /Ar /B +echo bar>> foo +type foo +del foo > NUL 2>&1 +if exist foo ( + echo Read-only file not deleted +) else ( + echo Should not delete read-only file! +) +del /F foo +if not exist foo ( + echo Read-only file forcibly deleted +) else ( + echo Should delete read-only file with del /F! + attrib -r foo + del foo +) +cd .. +rd /s/q foobar +echo ... recursive behaviour +mkdir foobar\baz & cd foobar +echo > level1 +echo > whatever +echo > baz\level2 +attrib baz\level2 +cd .. +attrib +R l*vel? /S > nul 2>&1 +cd foobar +attrib level1 +attrib baz\level2 +echo > bar +attrib bar +cd .. +rd /s/q foobar +echo ... folders processing +mkdir foobar +attrib foobar +cd foobar +mkdir baz +echo toto> baz\toto +attrib +r baz /s /d > nul 2>&1 +attrib baz +attrib baz\toto +echo lulu>>baz\toto +type baz\toto +echo > baz\lala +rem Oddly windows allows file creation in a read-only directory... +if exist baz\lala (echo file created in read-only dir) else echo file not created +cd .. +rd /s/q foobar + echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 08a66eb..ae21f05 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -476,6 +476,26 @@ foo removed bar removed foobar removed bar\baz removed +------------ Testing attrib -------------- +(a)todo_wine@A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo +... read-only attribute +(a)todo_wine@A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo +foo +foo original contents +Read-only file not deleted +Read-only file forcibly deleted +... recursive behaviour +(a)todo_wine@A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2 +(a)todo_wine@A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1 +(a)todo_wine@A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2 +(a)todo_wine@A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar +... folders processing +(a)todo_wine@ @pwd@\foobar(a)or_broken@ @pwd@\foobar +(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz +(a)todo_wine@A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto +toto +lulu +file created in read-only dir ------------ Testing CALL -------------- foo(a)space@ @todo_wine(a)foo 8

1 0

Francois Gouget : msvidc32: Mark 'MS-CRAM' as not needing translation.
by Alexandre Julliard 25 Aug '11

25 Aug '11

1 0

Francois Gouget : notepad: Mark the page header as not needing translation.
by Alexandre Julliard 25 Aug '11

25 Aug '11

1 0

Francois Gouget : shdoclc: Mark the page print footer as not needing translation.
by Alexandre Julliard 25 Aug '11

25 Aug '11

1 0

Octavian Voicu : ieframe/tests: Skip rest of tests if CoCreateInstance failed.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 3ba185d5ceea0c63dd22960d33d53d80eecfc85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba185d5ceea0c63dd22960d3… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Aug 25 16:06:20 2011 +0300 ieframe/tests: Skip rest of tests if CoCreateInstance failed. --- dlls/ieframe/tests/ie.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 6f62e23..b761c6f 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -60,6 +60,9 @@ static void test_InternetExplorer(void) &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create InternetExplorer instance: %08x\n", hres); + if(hres != S_OK) + return; + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres);

1 0