November 2010 - Wine-Commits

Maarten Lankhorst : strmbase: Allow NULL for time format in ConvertTimeFormat.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 4857772bf2c206112c318211ca677d9bf0faedb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4857772bf2c206112c318211c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 4 17:54:25 2010 +0100 strmbase: Allow NULL for time format in ConvertTimeFormat. --- dlls/strmbase/seeking.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index 93fc6db..f03dde6 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -179,6 +179,11 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL HRESULT WINAPI SourceSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLONG * pTarget, const GUID * pTargetFormat, LONGLONG Source, const GUID * pSourceFormat) { + SourceSeeking *This = (SourceSeeking *)iface; + if (!pTargetFormat) + pTargetFormat = &This->timeformat; + if (!pSourceFormat) + pSourceFormat = &This->timeformat; if (IsEqualIID(pTargetFormat, &TIME_FORMAT_MEDIA_TIME) && IsEqualIID(pSourceFormat, &TIME_FORMAT_MEDIA_TIME)) { *pTarget = Source;

1 0

Michael Stefaniuc : wined3d: Fix some checkGLcall() messages.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 1183383a6ff8db5cee85848c83336a0fa5e67e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1183383a6ff8db5cee85848c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 5 11:17:51 2010 +0100 wined3d: Fix some checkGLcall() messages. --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index e49ba21..7461adf 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -425,7 +425,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, D3DCOLORTOGLFLOAT4(state, col); TRACE("Setting border color for %u to %x\n", textureDimensions, state); glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); - checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)"); + checkGLcall("glTexParameterfv(..., GL_TEXTURE_BORDER_COLOR, ...)"); gl_tex->states[WINED3DTEXSTA_BORDERCOLOR] = state; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 618ccd4..b615a76 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1758,7 +1758,7 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.0f); - checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); + checkGLcall("glTexEnvf GL_TEXTURE_LOD_BIAS_EXT ..."); } if (sampler != WINED3D_UNMAPPED_STAGE) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6b6102b..4804ced 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -842,7 +842,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); glLoadIdentity(); - checkGLcall("glLoadIndentity()"); + checkGLcall("glLoadIdentity()"); glScalef(1.0f / (max_x), 1.0f / (max_y), max_z == 0.0f ? 1.0f : 1.0f / (2.0f * max_z)); glTranslatef(0.0f, 0.0f, 0.5f); checkGLcall("glScalef"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9e0df6a..81a505d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3656,7 +3656,7 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, tmpvalue.f); - checkGLcall("glTexEnvi(GL_TEXTURE_LOD_BIAS_EXT, ...)"); + checkGLcall("glTexEnvf(GL_TEXTURE_LOD_BIAS_EXT, ...)"); } if (!use_ps(state) && sampler < state->lowest_disabled_stage) @@ -4387,7 +4387,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB { static const GLbyte one = 1; GL_EXTCALL(glWeightbvARB(1, &one)); - checkGLcall("glWeightivARB(gl_info->max_blends, weights)"); + checkGLcall("glWeightbvARB(gl_info->max_blends, weights)"); } }

1 0

Hans Leidekker : sxs: Add support for installing side-by-side assemblies.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: aaf4227ae9822391a396ddff555b3a2ba633a5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf4227ae9822391a396ddff5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 5 11:36:49 2010 +0100 sxs: Add support for installing side-by-side assemblies. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/cache.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 376 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf4227ae9822391a396d…

1 0

Hans Leidekker : msi: Features don't require a directory.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 54a61744e08cee819b3babc962d4408178a5eac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a61744e08cee819b3babc96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 5 11:36:22 2010 +0100 msi: Features don't require a directory. --- dlls/msi/dialog.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a68d953..57759f6 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2377,14 +2377,19 @@ static UINT msi_dialog_seltree_handler( msi_dialog *dialog, ControlEvent_FireSubscribedEvent( dialog->package, szSelectionDescription, rec ); dir = MSI_RecordGetString( row, 7 ); - folder = get_loaded_folder( dialog->package, dir ); - if (!folder) + if (dir) { - r = ERROR_FUNCTION_FAILED; - goto done; + folder = get_loaded_folder( dialog->package, dir ); + if (!folder) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + MSI_RecordSetStringW( rec, 1, folder->ResolvedTarget ); } + else + MSI_RecordSetStringW( rec, 1, NULL ); - MSI_RecordSetStringW( rec, 1, folder->ResolvedTarget ); ControlEvent_FireSubscribedEvent( dialog->package, szSelectionPath, rec ); done:

1 0

Jacek Caban : d3dhal.h: Removed no longer defined D3DDP2OP_* enums.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 5cbc4e818837ba473bb409536975561572aa84d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc4e818837ba473bb409536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 5 13:38:45 2010 +0100 d3dhal.h: Removed no longer defined D3DDP2OP_* enums. --- include/d3dhal.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/d3dhal.h b/include/d3dhal.h index b63ad7c..6c68d4a 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -302,7 +302,6 @@ typedef enum _D3DHAL_DP2OPERATION { D3DDP2OP_POINTS = 1, D3DDP2OP_INDEXEDLINELIST = 2, D3DDP2OP_INDEXEDTRIANGLELIST = 3, - D3DDP2OP_RESERVED0 = 4, D3DDP2OP_RENDERSTATE = 8, D3DDP2OP_LINELIST = 15, D3DDP2OP_LINESTRIP = 16, @@ -328,7 +327,6 @@ typedef enum _D3DHAL_DP2OPERATION { D3DDP2OP_SETLIGHT = 34, D3DDP2OP_CREATELIGHT = 35, D3DDP2OP_SETTRANSFORM = 36, - D3DDP2OP_EXT = 37, D3DDP2OP_TEXBLT = 38, D3DDP2OP_STATESET = 39, D3DDP2OP_SETPRIORITY = 40, @@ -522,4 +520,4 @@ typedef struct _D3DHAL_DP2SETTEXLOD { } /* extern "C" */ #endif -#endif /* __WINE_DDRAWI_H */ +#endif /* __WINE_D3DHAL_H */

1 0

Dmitry Timoshkov : Revert "gdi32: Make AddFontToList skip adding a face into global lists if the font is not supposed to be enumerated , and return a pointer to first loaded face.".
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 5c011b3dbf7032713602afbda445ba6038484ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c011b3dbf7032713602afbda… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Nov 5 19:48:54 2010 +0800 Revert "gdi32: Make AddFontToList skip adding a face into global lists if the font is not supposed to be enumerated, and return a pointer to first loaded face.". This reverts commit a2047323c9c41b44c743c345674ec934fb4cd685. That patch is not correct. --- dlls/gdi32/freetype.c | 190 +++++++++++++++++++++--------------------------- 1 files changed, 83 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c011b3dbf7032713602a…

1 0

Michael Stefaniuc : wined3d: Move the checkGLcall() right after the corresponding GL call.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 809741d5ae2cd3d1f914862bbe68351dba09d407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809741d5ae2cd3d1f914862bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 5 11:17:42 2010 +0100 wined3d: Move the checkGLcall() right after the corresponding GL call. --- 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 6e78f04..3221ea8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5868,8 +5868,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice *ifa checkGLcall("glBindTexture"); /* Copy the bitmap memory into the cursor texture */ glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, gl_format, type, mem); - HeapFree(GetProcessHeap(), 0, mem); checkGLcall("glTexImage2D"); + HeapFree(GetProcessHeap(), 0, mem); if (gl_info->supported[APPLE_CLIENT_STORAGE]) {

1 0

Alexandre Julliard : winex11: Sync the window attributes when switching a window to embedded.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 8f24cd05b1fde3fd857ccd6fb8d086a9ef3c859f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f24cd05b1fde3fd857ccd6fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 5 13:42:05 2010 +0100 winex11: Sync the window attributes when switching a window to embedded. --- dlls/winex11.drv/window.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index acf0b4d..7e96a39 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1356,6 +1356,8 @@ static void set_xembed_flags( Display *display, struct x11drv_win_data *data, un { unsigned long info[2]; + if (!data->whole_window) return; + info[0] = 0; /* protocol version */ info[1] = flags; wine_tsx11_lock(); @@ -1418,18 +1420,19 @@ static void unmap_window( Display *display, struct x11drv_win_data *data ) */ void make_window_embedded( Display *display, struct x11drv_win_data *data ) { - if (data->mapped) - { - /* the window cannot be mapped before being embedded */ - unmap_window( display, data ); - data->embedded = TRUE; + BOOL was_mapped = data->mapped; + /* the window cannot be mapped before being embedded */ + if (data->mapped) unmap_window( display, data ); + + data->embedded = TRUE; + data->managed = TRUE; + SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); + sync_window_style( display, data ); + + if (was_mapped) map_window( display, data, 0 ); - } else - { - data->embedded = TRUE; set_xembed_flags( display, data, 0 ); - } }

1 0

Martin Wilck : xcopy: Assume directory if destination ends with a backslash .
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: 20feb4772c0adf5b37de75543a527347f8b02e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20feb4772c0adf5b37de75543… Author: Martin Wilck <Martin.Wilck(a)particle-dynamics.de> Date: Fri Nov 5 00:34:26 2010 +0100 xcopy: Assume directory if destination ends with a backslash. --- programs/xcopy/xcopy.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 9e931c0..daf269b 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -519,8 +519,10 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR if (attribs == INVALID_FILE_ATTRIBUTES) { /* If /I supplied and wildcard copy, assume directory */ - if (flags & OPT_ASSUMEDIR && - (wcschr(srcspec, '?') || wcschr(srcspec, '*'))) { + /* Also if destination ends with backslash */ + if ((flags & OPT_ASSUMEDIR && + (wcschr(srcspec, '?') || wcschr(srcspec, '*'))) || + (supplieddestination[lstrlenW(supplieddestination)-1] == '\\')) { isDir = TRUE;

1 0

Nikolay Sivov : msxml3: Stub IXMLDOMDocumentType support.
by Alexandre Julliard Nov. 5, 2010

Nov. 5, 2010

Module: wine Branch: master Commit: e9e58f07d2ca688bd14c27ec0b37d567416456ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e58f07d2ca688bd14c27ec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 5 01:34:01 2010 +0300 msxml3: Stub IXMLDOMDocumentType support. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/doctype.c | 626 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 3 + 4 files changed, 632 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e58f07d2ca688bd14c2…

1 0