October 2011 - Wine-commits

Huw Davies : gdi32: The text extents functions fail if passed a negative count.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 5bd304bd0e78a0ea8cd37cedb0b1ed39683f4509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd304bd0e78a0ea8cd37cedb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 15:46:19 2011 +0100 gdi32: The text extents functions fail if passed a negative count. --- dlls/gdi32/font.c | 37 ++++++++++++++++++++++++++----------- dlls/gdi32/tests/font.c | 9 +++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f5e479..263d064 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -920,9 +920,14 @@ BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count, { BOOL ret = FALSE; INT wlen; - LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, NULL); + LPWSTR p; + + if (count < 0) return FALSE; - if (p) { + p = FONT_mbtowc(hdc, str, count, &wlen, NULL); + + if (p) + { ret = GetTextExtentPoint32W( hdc, p, wlen, size ); HeapFree( GetProcessHeap(), 0, p ); } @@ -975,10 +980,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT LPINT nfit, LPINT dxs, LPSIZE size ) { BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; + + if (count < 0) return FALSE; + + dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if(dc->gdiFont) { + if(dc->gdiFont) + { ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); @@ -1051,11 +1061,15 @@ BOOL WINAPI GetTextExtentExPointA( HDC hdc, LPCSTR str, INT count, INT wlen; INT *walpDx = NULL; LPWSTR p = NULL; - - if (alpDx && - NULL == (walpDx = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)))) - return FALSE; - + + if (count < 0) return FALSE; + + if (alpDx) + { + walpDx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(INT) ); + if (!walpDx) return FALSE; + } + p = FONT_mbtowc(hdc, str, count, &wlen, NULL); ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, walpDx, size); if (walpDx) @@ -1118,9 +1132,10 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, TRACE("(%p, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt); + if (count < 0) return FALSE; + dc = get_dc_ptr(hdc); - if (! dc) - return FALSE; + if (!dc) return FALSE; GetTextMetricsW(hdc, &tm); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 097a6c3..f127743 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1054,6 +1054,7 @@ static void test_text_extents(void) HFONT hfont; SIZE sz; SIZE sz1, sz2; + BOOL ret; memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); @@ -1110,6 +1111,14 @@ static void test_text_extents(void) "GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n"); HeapFree(GetProcessHeap(), 0, extents); + /* extents functions fail with -ve counts (the interesting case being -1) */ + ret = GetTextExtentPointA(hdc, "o", -1, &sz); + ok(ret == FALSE, "got %d\n", ret); + ret = GetTextExtentExPointA(hdc, "o", -1, 0, NULL, NULL, &sz); + ok(ret == FALSE, "got %d\n", ret); + ret = GetTextExtentExPointW(hdc, wt, -1, 0, NULL, NULL, &sz1); + ok(ret == FALSE, "got %d\n", ret); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont); ReleaseDC(NULL, hdc);

1 0

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

11 Oct '11

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

Henri Verbeet : gameux/tests: Run the game explorer tests in a multithreaded apartment as well.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 7679d96c86176d43d85ef303e19cdb6a50355e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7679d96c86176d43d85ef303e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 11 17:24:52 2011 +0200 gameux/tests: Run the game explorer tests in a multithreaded apartment as well. --- dlls/gameux/tests/gameexplorer.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 7be9c69..462fb8f 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -656,30 +656,42 @@ static void test_install_uninstall_game(void) } } -START_TEST(gameexplorer) +static void run_tests(void) { - HRESULT r; BOOL gameExplorerAvailable = FALSE; BOOL gameExplorer2Available = FALSE; + test_create(&gameExplorerAvailable, &gameExplorer2Available); + + if(gameExplorerAvailable) + test_add_remove_game(); + + if(gameExplorer2Available) + test_install_uninstall_game(); +} + +START_TEST(gameexplorer) +{ if(_loadDynamicRoutines()) { - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init COM\n"); - - test_create(&gameExplorerAvailable, &gameExplorer2Available); + HRESULT hr; - if(gameExplorerAvailable) - test_add_remove_game(); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running apartment threaded tests.\n"); + run_tests(); + if(SUCCEEDED(hr)) + CoUninitialize(); - if(gameExplorer2Available) - test_install_uninstall_game(); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running multithreaded tests.\n"); + run_tests(); + if(SUCCEEDED(hr)) + CoUninitialize(); } else /* this is not a failure, because both procedures loaded by address * are always available on systems which has gameux.dll */ win_skip("too old system, cannot load required dynamic procedures\n"); - - - CoUninitialize(); }

1 0

Charles Davis : ntdll: Also set CPU_FEATURE_HTT on Mac OS.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: fe6140e0fd6418e13ce515a1c788d7856d2528c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6140e0fd6418e13ce515a1c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 10 15:34:55 2011 -0600 ntdll: Also set CPU_FEATURE_HTT on Mac OS. --- dlls/ntdll/nt.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 000c62a..6a919aa 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1280,6 +1280,7 @@ void fill_cpu_info(void) if (strstr(buffer, "SSE2")) user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "SSE3")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "PAE")) user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = TRUE; + if (strstr(buffer, "HTT")) cached_sci.FeatureSet |= CPU_FEATURE_HTT; } break; /* CPU_TYPE_I386 */ default: break;

1 0

Andrew Talbot : windowscodecs: Mark some fall-throughs in switch statements .
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 2e27be37c3b8c8bd09e4c1779be925505df2728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e27be37c3b8c8bd09e4c1779… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 10 22:47:15 2011 +0100 windowscodecs: Mark some fall-throughs in switch statements. --- dlls/windowscodecs/pngformat.c | 1 + dlls/windowscodecs/tiffformat.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index b3d92fd..c7c3cab 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -364,6 +364,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case PNG_COLOR_TYPE_GRAY_ALPHA: /* WIC does not support grayscale alpha formats so use RGBA */ ppng_set_gray_to_rgb(This->png_ptr); + /* fall through */ case PNG_COLOR_TYPE_RGB_ALPHA: This->bpp = bit_depth * 4; switch (bit_depth) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 6422b62..79e5c60 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -295,6 +295,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { case 0: /* WhiteIsZero */ decode_info->invert_grayscale = 1; + /* fall through */ case 1: /* BlackIsZero */ if (samples != 1) {

1 0

Stefan Dösinger : d3d8: Remove the palette implementation methods.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 054ec0b42b31d6eb15b150c965ca889a124c2572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054ec0b42b31d6eb15b150c96… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 27 08:34:51 2011 -0500 d3d8: Remove the palette implementation methods. --- dlls/d3d8/device.c | 45 ++++++++++----------------------------------- 1 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8aeca94..1c8829f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1838,61 +1838,36 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(IDirect3DDevice8 *iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(IDirect3DDevice8 *iface, UINT PaletteNumber, const PALETTEENTRY *pEntries) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); + /* GPUs stopped supporting palettized textures with the Shader Model 1 generation. Wined3d + * does not have a d3d8/9-style palette API */ - wined3d_mutex_lock(); - hr = wined3d_device_set_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(IDirect3DDevice8 *iface, UINT PaletteNumber, PALETTEENTRY *pEntries) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - wined3d_mutex_lock(); - hr = wined3d_device_get_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT PaletteNumber) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber); + FIXME("iface %p, palette_idx %u unimplemented.\n", iface, PaletteNumber); - wined3d_mutex_lock(); - hr = wined3d_device_set_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(IDirect3DDevice8 *iface, UINT *PaletteNumber) { - IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; - - TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_get_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); + FIXME("iface %p, palette_idx %p unimplemented.\n", iface, PaletteNumber); - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(IDirect3DDevice8 *iface,

1 0

Stefan Dösinger : d3d9: Remove the palette implementation methods.
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 4365d2905c6d1b5f530b077bec0d152e327be23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4365d2905c6d1b5f530b077be… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 27 09:17:18 2011 -0500 d3d9: Remove the palette implementation methods. --- dlls/d3d9/device.c | 44 ++++++++------------------------------------ 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 33c443a..8dc7334 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1790,61 +1790,33 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(IDirect3DDevice9Ex *if static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(IDirect3DDevice9Ex *iface, UINT PaletteNumber, const PALETTEENTRY *pEntries) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); - - wined3d_mutex_lock(); - hr = wined3d_device_set_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(IDirect3DDevice9Ex *iface, UINT PaletteNumber, PALETTEENTRY *pEntries) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u, entries %p unimplemented.\n", iface, PaletteNumber, pEntries); - TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); - - wined3d_mutex_lock(); - hr = wined3d_device_get_palette_entries(This->wined3d_device, PaletteNumber, pEntries); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT PaletteNumber) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %u unimplemented.\n", iface, PaletteNumber); - TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_set_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(IDirect3DDevice9Ex *iface, UINT *PaletteNumber) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + FIXME("iface %p, palette_idx %p.\n", iface, PaletteNumber); - TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber); - - wined3d_mutex_lock(); - hr = wined3d_device_get_current_texture_palette(This->wined3d_device, PaletteNumber); - wined3d_mutex_unlock(); - - return hr; + return D3DERR_INVALIDCALL; } static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(IDirect3DDevice9Ex *iface,

1 0

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

11 Oct '11

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

Michael Stefaniuc : msi: Move a TRACE before the continue (Smatch).
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 0c5f83040a72bffebe04caae076104c0552e0e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5f83040a72bffebe04caae0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 23:58:59 2011 +0200 msi: Move a TRACE before the continue (Smatch). --- dlls/msi/upgrade.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 8e843aa..9480661 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -185,8 +185,8 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) if (!check_language(check, language, attributes)) { index ++; - continue; TRACE("language doesn't match\n"); + continue; } TRACE("found related product\n");

1 0

Michael Stefaniuc : msi: Remove a break after return (Smatch).
by Alexandre Julliard 11 Oct '11

11 Oct '11

Module: wine Branch: master Commit: 958eff8e94525ea3717f71c6ea822894f2de12a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958eff8e94525ea3717f71c6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 11 00:00:09 2011 +0200 msi: Remove a break after return (Smatch). --- dlls/msi/where.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index e70a8bc..2d9241f 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -205,7 +205,6 @@ static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column, column->parsed.column = i; column->parsed.table = table; return ERROR_SUCCESS; - break; } } while ((table = table->next));

1 0