October 2011 - Wine-Commits

Jacek Caban : vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 1c936039ed716fd6fcda3b31262b898c30fff9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c936039ed716fd6fcda3b312… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 11 14:59:06 2011 +0200 vbscript: Pass arguments to 1-arg functions directly if they are VT_VARIANT|VT_BYREF. --- dlls/vbscript/vbdisp.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d083d74..e22e060 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -133,6 +133,8 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { + VARIANT *args; + switch(flags) { case DISPATCH_PROPERTYGET: if(!(prop->flags & (BP_GET|BP_GETPUT))) { @@ -166,7 +168,12 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - return prop->proc(This, dp->rgvarg, dp->cArgs, res); + if(arg_cnt(dp) == 1 && V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) + args = V_VARIANTREF(dp->rgvarg); + else + args = dp->rgvarg; + + return prop->proc(This, args, dp->cArgs, res); } static BOOL run_terminator(vbdisp_t *This)

1 0

Huw Davies : gdi32: Add a helper to retrieve the bounding rectangle.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: a7b5d8665589059a151da7505bde733a00b3c73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b5d8665589059a151da7505… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 12:49:53 2011 +0100 gdi32: Add a helper to retrieve the bounding rectangle. --- dlls/gdi32/bitblt.c | 16 ++++++---------- dlls/gdi32/gdi_private.h | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c595a60..a2a7698 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -65,12 +65,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, dst->height = rect.bottom - rect.top; if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - dst->x = rect.left; - dst->width = rect.right - rect.left; + dst->x += dst->width; + dst->width = -dst->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, dst->x, dst->y, dst->width, dst->height ); if (get_clip_box( dc_dst, &clip )) intersect_rect( &dst->visrect, &rect, &clip ); @@ -92,12 +90,10 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, src->height = rect.bottom - rect.top; if (src->layout & LAYOUT_RTL && src->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) { - swap_ints( &rect.left, &rect.right ); - src->x = rect.left; - src->width = rect.right - rect.left; + src->x += src->width; + src->width = -src->width; } - if (rect.left > rect.right) { swap_ints( &rect.left, &rect.right ); rect.left++; rect.right++; } - if (rect.top > rect.bottom) { swap_ints( &rect.top, &rect.bottom ); rect.top++; rect.bottom++; } + get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); /* source is not clipped */ if (dc_src->header.type == OBJ_MEMDC) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b3d027a..6a600a4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,6 +469,26 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) +{ + rect->left = x; + rect->right = x + width; + rect->top = y; + rect->bottom = y + height; + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right + 1; + rect->right = tmp + 1; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom + 1; + rect->bottom = tmp + 1; + } +} + static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1;

1 0

Henri Verbeet : gameux: Parse GDFs in a separate thread.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 95ede76673df1dafb3e716a4617c57922907694c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ede76673df1dafb3e716a46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 11 17:24:51 2011 +0200 gameux: Parse GDFs in a separate thread. The res protocol handler dislikes running from a multithreaded apartment. --- dlls/gameux/gameexplorer.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 322dd7a..c6935c9 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -387,6 +387,13 @@ static HRESULT GAMEUX_ParseGameDefinition( return hr; } + +struct parse_gdf_thread_param +{ + struct GAMEUX_GAME_DATA *GameData; + HRESULT hr; +}; + /******************************************************************************* * GAMEUX_ParseGDFBinary * @@ -399,8 +406,10 @@ static HRESULT GAMEUX_ParseGameDefinition( * GDF will be stored in other fields of this * structure. */ -static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) +static DWORD WINAPI GAMEUX_ParseGDFBinary(void *thread_param) { + struct parse_gdf_thread_param *ctx = thread_param; + struct GAMEUX_GAME_DATA *GameData = ctx->GameData; static const WCHAR sRes[] = {'r','e','s',':','/','/',0}; static const WCHAR sDATA[] = {'D','A','T','A',0}; static const WCHAR sSlash[] = {'/',0}; @@ -423,6 +432,8 @@ static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) lstrcatW(sResourcePath, sSlash); lstrcatW(sResourcePath, ID_GDF_XML_STR); + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&document); @@ -474,8 +485,11 @@ static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) IXMLDOMDocument_Release(document); } - return hr; + CoUninitialize(); + ctx->hr = hr; + return 0; } + /******************************************************************* * GAMEUX_RemoveRegistryRecord * @@ -548,12 +562,35 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, /* load data from GDF binary */ if(SUCCEEDED(hr)) - hr = GAMEUX_ParseGDFBinary(&GameData); + { + struct parse_gdf_thread_param thread_param; + HANDLE thread; + HRESULT hr; + DWORD ret; + + thread_param.GameData = &GameData; + if(!(thread = CreateThread(NULL, 0, GAMEUX_ParseGDFBinary, &thread_param, 0, &ret))) + { + ERR("Failed to create thread.\n"); + hr = E_FAIL; + goto done; + } + ret = WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + if(ret != WAIT_OBJECT_0) + { + ERR("Wait failed (%#x).\n", ret); + hr = E_FAIL; + goto done; + } + hr = thread_param.hr; + } /* save data to registry */ if(SUCCEEDED(hr)) hr = GAMEUX_WriteRegistryRecord(&GameData); +done: GAMEUX_uninitGameData(&GameData); TRACE("returning 0x%08x\n", hr); return hr;

1 0

Alexandre Julliard : gdi32: Add an AlphaBlend entry point in the DIB driver .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 6c07876e87642feba0c18541b599be8fa64a58c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c07876e87642feba0c18541b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 15:23:04 2011 +0200 gdi32: Add an AlphaBlend entry point in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 16 ++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 ++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 48afa8e..f78f9a2 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1133,3 +1133,19 @@ BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, release_dc_ptr( dc_dst ); return ret; } + +/*********************************************************************** + * dibdrv_AlphaBlend + */ +BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) +{ + BOOL ret; + DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + + if (!dc_dst) return FALSE; + + ret = dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); + release_dc_ptr( dc_dst ); + return ret; +} diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9d8391a..f610390 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -501,7 +501,7 @@ const DC_FUNCTIONS dib_driver = { NULL, /* pAbortDoc */ NULL, /* pAbortPath */ - NULL, /* pAlphaBlend */ + dibdrv_AlphaBlend, /* pAlphaBlend */ NULL, /* pAngleArc */ NULL, /* pArc */ NULL, /* pArcTo */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 5f9a31e..0be8ffa 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -100,6 +100,8 @@ typedef struct dibdrv_physdev #define DEFER_PEN 2 #define DEFER_BRUSH 4 +extern BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Don' t attempt to patch files if the component action resolves to anything other than INSTALLSTATE_LOCAL .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: cda63b8a3820de7864c663ab79d47c431eb9038f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda63b8a3820de7864c663ab7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 11 11:02:41 2011 +0200 msi: Don't attempt to patch files if the component action resolves to anything other than INSTALLSTATE_LOCAL. --- dlls/msi/files.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 210e012..c6282f7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -497,6 +497,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { MSIFILE *file = patch->File; + MSICOMPONENT *comp = file->Component; rc = msi_load_media_info( package, patch->Sequence, mi ); if (rc != ERROR_SUCCESS) @@ -504,7 +505,8 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } - if (!file->Component->Enabled) continue; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) continue; if (!patch->IsApplied) {

1 0

Huw Davies : gdi32: Remove no longer needed include file.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 6ee2eaeff2aff2acff06d00eb0a2fbe6e412d93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee2eaeff2aff2acff06d00eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 10:14:55 2011 +0100 gdi32: Remove no longer needed include file. --- configure | 18 +----------------- configure.ac | 8 +------- dlls/gdi32/freetype.c | 3 --- include/config.h.in | 6 ------ 4 files changed, 2 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 0e968c2..3cf9675 100755 --- a/configure +++ b/configure @@ -10262,8 +10262,7 @@ fi freetype/ftoutln.h \ freetype/ftwinfnt.h \ freetype/ftmodapi.h \ - freetype/ftlcdfil.h \ - freetype/internal/sfnt.h + freetype/ftlcdfil.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_FT2BUILD_H @@ -10304,21 +10303,6 @@ _ACEOF fi - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ac_freetype_libs" - for ac_func in FT_Load_Sfnt_Table -do : - ac_fn_c_check_func "$LINENO" "FT_Load_Sfnt_Table" "ac_cv_func_FT_Load_Sfnt_Table" -if test "x$ac_cv_func_FT_Load_Sfnt_Table" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FT_LOAD_SFNT_TABLE 1 -_ACEOF - -fi -done - - CFLAGS="$ac_save_CFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS" if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then diff --git a/configure.ac b/configure.ac index 1401072..5de420b 100644 --- a/configure.ac +++ b/configure.ac @@ -1373,8 +1373,7 @@ then freetype/ftoutln.h \ freetype/ftwinfnt.h \ freetype/ftmodapi.h \ - freetype/ftlcdfil.h \ - freetype/internal/sfnt.h,,, + freetype/ftlcdfil.h,,, [#ifdef HAVE_FT2BUILD_H # include <ft2build.h> #endif]) @@ -1383,11 +1382,6 @@ then [Define if you have the <freetype/fttrigon.h> header file.]) wine_cv_fttrigon=yes],[wine_cv_fttrigon=no]) AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>]) - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ac_freetype_libs" - AC_CHECK_FUNCS(FT_Load_Sfnt_Table) - CFLAGS="$ac_save_CFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS" dnl Check that we have at least freetype/freetype.h if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" then diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9357766..e527490 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -117,9 +117,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #ifdef HAVE_FREETYPE_FTOUTLN_H #include <freetype/ftoutln.h> #endif -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <freetype/internal/sfnt.h> -#endif #ifdef HAVE_FREETYPE_FTTRIGON_H #include <freetype/fttrigon.h> #endif diff --git a/include/config.h.in b/include/config.h.in index f0016c8..f70e354 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,9 +152,6 @@ /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ #undef HAVE_FREETYPE_FTWINFNT_H -/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ -#undef HAVE_FREETYPE_INTERNAL_SFNT_H - /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ #undef HAVE_FREETYPE_TTNAMEID_H @@ -179,9 +176,6 @@ /* Define to 1 if you have the `ftruncate' function. */ #undef HAVE_FTRUNCATE -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -#undef HAVE_FT_LOAD_SFNT_TABLE - /* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ #undef HAVE_FT_TRUETYPEENGINETYPE

1 0

Hans Leidekker : msi: Properly build the shortcut target path.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: e973115a798380fb5ebd87377492c04307afca22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e973115a798380fb5ebd87377… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 11 11:03:02 2011 +0200 msi: Properly build the shortcut target path. --- dlls/msi/action.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 80bcfc8..72d431a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3611,9 +3611,26 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) target = MSI_RecordGetString(row, 5); if (strchrW(target, '[')) { - deformat_string(package, target, &deformated); - IShellLinkW_SetPath(sl,deformated); - msi_free(deformated); + int len; + WCHAR *format_string, *p; + + if (!(p = strchrW( target, ']' ))) goto err; + len = p - target + 1; + format_string = msi_alloc( (len + 1) * sizeof(WCHAR) ); + memcpy( format_string, target, len * sizeof(WCHAR) ); + format_string[len] = 0; + deformat_string( package, format_string, &deformated ); + msi_free( format_string ); + + path = msi_alloc( (strlenW( deformated ) + strlenW( p + 1 ) + 2) * sizeof(WCHAR) ); + strcpyW( path, deformated ); + PathAddBackslashW( path ); + strcatW( path, p + 1 ); + TRACE("target path is %s\n", debugstr_w(path)); + + IShellLinkW_SetPath( sl, path ); + msi_free( deformated ); + msi_free( path ); } else {

1 0

Dmitry Timoshkov : user32: Respect the requested size of NONCLIENTMETRICSW structure.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 9711cdbcabfce9910196f75451f0ada977d3560d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9711cdbcabfce9910196f7545… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 11 14:10:17 2011 +0900 user32: Respect the requested size of NONCLIENTMETRICSW structure. --- dlls/user32/sysparams.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index afa15a2..3c7da43 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1582,11 +1582,21 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, { LPNONCLIENTMETRICSW lpnm = pvParam; + if (!lpnm) + { + ret = FALSE; + break; + } + if (!spi_loaded[SPI_NONCLIENTMETRICS_IDX]) load_nonclient_metrics(); - if (lpnm && (lpnm->cbSize == sizeof(NONCLIENTMETRICSW) || - lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth))) + if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) *lpnm = nonclient_metrics; + else if (lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)) + { + memcpy(lpnm, &nonclient_metrics, FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth)); + lpnm->cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); + } else ret = FALSE; break;

1 0

Michael Stefaniuc : winealsa.drv: Remove redundant NULL checks before free (Smatch).
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: d8ca6972339ad3f2e35276bff4aab2485a0cdce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ca6972339ad3f2e35276bff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 11 00:03:50 2011 +0200 winealsa.drv: Remove redundant NULL checks before free (Smatch). --- dlls/winealsa.drv/mmdevdrv.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 160371c..ea5da17 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1043,18 +1043,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ - if(This->local_buffer){ - HeapFree(GetProcessHeap(), 0, This->local_buffer); - This->local_buffer = NULL; - } - if(This->fmt){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - } - if(This->vols){ - HeapFree(GetProcessHeap(), 0, This->vols); - This->vols = NULL; - } + HeapFree(GetProcessHeap(), 0, This->local_buffer); + This->local_buffer = NULL; + CoTaskMemFree(This->fmt); + This->fmt = NULL; + HeapFree(GetProcessHeap(), 0, This->vols); + This->vols = NULL; } LeaveCriticalSection(&This->lock);

1 0

Stefan Dösinger : wined3d: Remove d3d8/ 9 palette support.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 496b438ede825fc00daac7a5869e045ae583cec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496b438ede825fc00daac7a58… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 27 09:31:59 2011 -0500 wined3d: Remove d3d8/9 palette support. --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 167 ---------------------------------------- dlls/wined3d/surface.c | 69 +--------------- dlls/wined3d/texture.c | 19 ----- dlls/wined3d/wined3d.spec | 4 - dlls/wined3d/wined3d_private.h | 7 -- include/wine/wined3d.h | 9 +-- 7 files changed, 7 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=496b438ede825fc00daac…

1 0