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

Bernhard Loos : msi: MsiDatabaseCommit also succeeds for a a readonly database.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 20bdf059ab0e00c3b0a5db8003b1e8d87afdfd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bdf059ab0e00c3b0a5db800… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Jul 27 22:04:26 2011 +0200 msi: MsiDatabaseCommit also succeeds for a a readonly database. --- dlls/msi/msiquery.c | 6 ++++++ dlls/msi/tests/db.c | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 08a87a9..0f2e377 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -831,6 +831,12 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) return ERROR_SUCCESS; } + if (db->mode == MSIDBOPEN_READONLY) + { + msiobj_release( &db->hdr ); + return ERROR_SUCCESS; + } + /* FIXME: lock the database */ r = MSI_CommitTables( db ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d97a8cb..28a2ff2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -96,6 +96,9 @@ static void test_msidatabase(void) res = MsiOpenDatabase( msifile, MSIDBOPEN_READONLY, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); + res = MsiDatabaseCommit( hdb ); + ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); + res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" );

1 0

Hans Leidekker : winhttp: Disable automatic authentication.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 7939090fde5a51b7db63bdcdd683c98eb672b16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7939090fde5a51b7db63bdcdd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 28 09:08:26 2011 +0200 winhttp: Disable automatic authentication. --- dlls/winhttp/request.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ef5c2cb..01fdc20 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2440,7 +2440,7 @@ static HRESULT WINAPI winhttp_request_Open( HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; WCHAR *hostname, *path; - DWORD err, len, flags = 0, request_flags = 0; + DWORD err, len, flags = 0, request_flags = 0, disable_flags; TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -2488,6 +2488,12 @@ static HRESULT WINAPI winhttp_request_Open( err = get_last_error(); goto error; } + disable_flags = WINHTTP_DISABLE_AUTHENTICATION; + if (!WinHttpSetOption( hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &disable_flags, sizeof(disable_flags) )) + { + err = get_last_error(); + goto error; + } if (flags & WINHTTP_FLAG_ASYNC) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL );

1 0

Michael Stefaniuc : dswave: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 348392fe2b6a0b47c2110d06f03a4efc76c85042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348392fe2b6a0b47c2110d06f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 28 10:18:37 2011 +0200 dswave: COM cleanup for the IClassFactory iface. --- dlls/dswave/dswave_main.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a3d5809..9055dfa 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -31,13 +31,14 @@ static HINSTANCE instance; LONG DSWAVE_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } IClassFactoryImpl; /****************************************************************** * DirectMusicWave ClassFactory */ -static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { +static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, void **ppobj) +{ FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); if (ppobj == NULL) return E_POINTER; @@ -45,25 +46,30 @@ static HRESULT WINAPI WaveCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPV return E_NOINTERFACE; } -static ULONG WINAPI WaveCF_AddRef(LPCLASSFACTORY iface) { +static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface) +{ DSWAVE_LockModule(); return 2; /* non-heap based object */ } -static ULONG WINAPI WaveCF_Release(LPCLASSFACTORY iface) { +static ULONG WINAPI WaveCF_Release(IClassFactory * iface) +{ DSWAVE_UnlockModule(); return 1; /* non-heap based object */ } -static HRESULT WINAPI WaveCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *pOuter, REFIID riid, + void **ppobj) +{ TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - + return DMUSIC_CreateDirectMusicWaveImpl (riid, ppobj, pOuter); } -static HRESULT WINAPI WaveCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { +static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) +{ TRACE("(%d)\n", dolock); if (dolock) @@ -82,7 +88,7 @@ static const IClassFactoryVtbl WaveCF_Vtbl = { WaveCF_LockServer }; -static IClassFactoryImpl Wave_CF = {&WaveCF_Vtbl}; +static IClassFactoryImpl Wave_CF = {{&WaveCF_Vtbl}}; /****************************************************************** * DllMain

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in surface_blt_fbo().
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 2bf020e26fcee9f09dbb167f4db8c1126053ae1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf020e26fcee9f09dbb167f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:33 2011 +0200 wined3d: Only invalidate state for the current context in surface_blt_fbo(). --- dlls/wined3d/surface.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d34bcd5..3d9bfb7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5105,16 +5105,16 @@ static void surface_blt_fbo(struct wined3d_device *device, const WINED3DTEXTUREF context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); - device_invalidate_state(device, STATE_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); glDisable(GL_SCISSOR_TEST); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); gl_info->fbo_ops.glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter);

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in tesselate_rectpatch().
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 7e3f85cab6c2a5111f9f96ca4d9f0f0cafffbd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3f85cab6c2a5111f9f96ca4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:34 2011 +0200 wined3d: Only invalidate state for the current context in tesselate_rectpatch(). --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bbcfc59..6133182 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -875,7 +875,7 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch */ glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_FILLMODE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_FILLMODE)); if (patch->has_normals) { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -887,30 +887,30 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch checkGLcall("glEnable(GL_LIGHTING)"); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, black); checkGLcall("glLightModel for MODEL_AMBIENT"); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_AMBIENT)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_AMBIENT)); for (i = 3; i < context->gl_info->limits.lights; ++i) { glDisable(GL_LIGHT0 + i); checkGLcall("glDisable(GL_LIGHT0 + i)"); - device_invalidate_state(This, STATE_ACTIVELIGHT(i)); + context_invalidate_state(context, STATE_ACTIVELIGHT(i)); } - device_invalidate_state(This, STATE_ACTIVELIGHT(0)); + context_invalidate_state(context, STATE_ACTIVELIGHT(0)); glLightfv(GL_LIGHT0, GL_DIFFUSE, red); glLightfv(GL_LIGHT0, GL_SPECULAR, black); glLightfv(GL_LIGHT0, GL_AMBIENT, black); glLightfv(GL_LIGHT0, GL_POSITION, red); glEnable(GL_LIGHT0); checkGLcall("Setting up light 1"); - device_invalidate_state(This, STATE_ACTIVELIGHT(1)); + context_invalidate_state(context, STATE_ACTIVELIGHT(1)); glLightfv(GL_LIGHT1, GL_DIFFUSE, green); glLightfv(GL_LIGHT1, GL_SPECULAR, black); glLightfv(GL_LIGHT1, GL_AMBIENT, black); glLightfv(GL_LIGHT1, GL_POSITION, green); glEnable(GL_LIGHT1); checkGLcall("Setting up light 2"); - device_invalidate_state(This, STATE_ACTIVELIGHT(2)); + context_invalidate_state(context, STATE_ACTIVELIGHT(2)); glLightfv(GL_LIGHT2, GL_DIFFUSE, blue); glLightfv(GL_LIGHT2, GL_SPECULAR, black); glLightfv(GL_LIGHT2, GL_AMBIENT, black); @@ -918,8 +918,8 @@ HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch glEnable(GL_LIGHT2); checkGLcall("Setting up light 3"); - device_invalidate_state(This, STATE_MATERIAL); - device_invalidate_state(This, STATE_RENDER(WINED3DRS_COLORVERTEX)); + context_invalidate_state(context, STATE_MATERIAL); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORVERTEX)); glDisable(GL_COLOR_MATERIAL); glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, black);

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in device_clear_render_targets ().
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: a1ba5b5131b7b13ff718bd3b2677b7e2e727f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ba5b5131b7b13ff718bd3b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:35 2011 +0200 wined3d: Only invalidate state for the current context in device_clear_render_targets(). --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f1901bf..e3e6848 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -707,10 +707,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (context->gl_info->supported[EXT_STENCIL_TWO_SIDE]) { glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); } glStencilMask(~0U); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); glClearStencil(stencil); checkGLcall("glClearStencil"); clear_mask = clear_mask | GL_STENCIL_BUFFER_BIT; @@ -730,7 +730,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); glDepthMask(GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); glClearDepth(depth); checkGLcall("glClearDepth"); clear_mask = clear_mask | GL_DEPTH_BUFFER_BIT; @@ -744,10 +744,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count } glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); - device_invalidate_state(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + context_invalidate_state(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); glClearColor(color->r, color->g, color->b, color->a); checkGLcall("glClearColor"); clear_mask = clear_mask | GL_COLOR_BUFFER_BIT;

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_device_set_cursor_properties ().
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: cc2dc5b0c8dcaa17e6900fa7a6e4ebcac821d6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2dc5b0c8dcaa17e6900fa7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:36 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_device_set_cursor_properties(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e3e6848..16327e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5263,7 +5263,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device checkGLcall("glActiveTextureARB"); sampler = device->rev_tex_unit_map[0]; if (sampler != WINED3D_UNMAPPED_STAGE) - device_invalidate_state(device, STATE_SAMPLER(sampler)); + context_invalidate_state(context, STATE_SAMPLER(sampler)); /* Create a new cursor texture */ glGenTextures(1, &device->cursorTexture); checkGLcall("glGenTextures");

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_buffer_map().
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 487cc9729b19fcb14b1cd753801e505f3d713182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487cc9729b19fcb14b1cd7538… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 27 21:13:37 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_buffer_map(). --- dlls/wined3d/buffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 807579e..9b20d87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1016,12 +1016,13 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN struct wined3d_context *context; const struct wined3d_gl_info *gl_info; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - context = context_acquire(device, NULL); gl_info = context->gl_info; + ENTER_GL(); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(buffer->buffer_type_hint, buffer->buffer_object)); if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0

Michael Stefaniuc : dpnet: COM cleanup for the IDirectPlay8Address iface.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 2ddf1c38c70994a697229675115b16b1193d9c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ddf1c38c70994a6972296751… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 23:32:47 2011 +0200 dpnet: COM cleanup for the IDirectPlay8Address iface. --- dlls/dpnet/address.c | 149 ++++++++++++++++++++++++++++---------------- dlls/dpnet/dpnet_private.h | 5 +- 2 files changed, 98 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ddf1c38c70994a697229…

1 0

Stefan Dösinger : wined3d: Restore the call to context_validate_onscreen_formats.
by Alexandre Julliard 28 Jul '11

28 Jul '11

Module: wine Branch: master Commit: 41f9ca2abfe7ca253d25e7184113da56c67ee815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f9ca2abfe7ca253d25e7184… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 27 23:22:49 2011 +0200 wined3d: Restore the call to context_validate_onscreen_formats. This got lost accidentally in d321959dd7ba21b555f27d32937c911fa61117a6. --- dlls/wined3d/context.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b83dab5..fbfb843 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2247,6 +2247,11 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de fb->render_targets, fb->depth_stencil)) return FALSE; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) + { + context_validate_onscreen_formats(context, fb->depth_stencil); + } + /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */

1 0