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

Huw Davies : gdi32: Simplify the code a little by using a separate variable for the return value .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: d947f6ef087b6d2ef39e33a9eddede27e081d52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d947f6ef087b6d2ef39e33a9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:32 2011 +0100 gdi32: Simplify the code a little by using a separate variable for the return value. --- dlls/gdi32/dib.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5d08c6e..af9a9a2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -881,7 +881,7 @@ INT WINAPI GetDIBits( { DC * dc; BITMAPOBJ * bmp; - int i; + int i, ret = 0; LONG width; LONG height; WORD bpp; @@ -916,7 +916,7 @@ INT WINAPI GetDIBits( bpp = dst_info->bmiHeader.biBitCount; if (bpp == 0) /* query bitmap info only */ { - lines = fill_query_info( info, bmp ); + ret = fill_query_info( info, bmp ); goto done; } @@ -1007,7 +1007,7 @@ INT WINAPI GetDIBits( if (startscan >= dst.visrect.bottom) { - lines = 1; /* yes, this is strange */ + ret = 1; /* yes, this is strange */ goto empty_image; } @@ -1053,26 +1053,18 @@ INT WINAPI GetDIBits( } } - if (empty_rect) - { - lines = 0; - goto empty_image; - } + if (empty_rect) goto empty_image; src.x = src.visrect.left; src.y = src.visrect.top; src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; - lines = src.height; - err = funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); - if(err) - { - lines = 0; - goto done; - } + if (err) goto done; + + ret = src.height; if (src_info->bmiHeader.biBitCount <= 8 && src_info->bmiHeader.biClrUsed == 0) { @@ -1090,7 +1082,7 @@ INT WINAPI GetDIBits( convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); } - else lines = abs(height); + else ret = abs( height ); empty_image: if (coloruse == DIB_PAL_COLORS) @@ -1105,7 +1097,7 @@ empty_image: done: release_dc_ptr( dc ); GDI_ReleaseObj( hbitmap ); - return lines; + return ret; }

1 0

Huw Davies : gdi32: If possible use the GetImage driver entry to fill the colour table for GetDIBits .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: b94616864d7627d8e86210dd808bd8c220a5b33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94616864d7627d8e86210dd8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 4 12:38:33 2011 +0100 gdi32: If possible use the GetImage driver entry to fill the colour table for GetDIBits. --- dlls/gdi32/dib.c | 181 ++++++++++++++++++--------------------------- dlls/gdi32/tests/bitmap.c | 4 - 2 files changed, 72 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b94616864d7627d8e8621…

1 0

Alexandre Julliard : gdi32: Create a sanitized BITMAPINFOHEADER in CreateDIBitmap.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 3d0f272a0de152f636da12f96550f753dc263bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0f272a0de152f636da12f96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 12:52:23 2011 +0200 gdi32: Create a sanitized BITMAPINFOHEADER in CreateDIBitmap. --- dlls/gdi32/dib.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eebe3dd..d53289b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1159,32 +1159,24 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD init, LPCVOID bits, const BITMAPINFO *data, UINT coloruse ) { + BITMAPINFOHEADER info; HBITMAP handle; - LONG width; LONG height; - WORD planes, bpp; - DWORD compr, size; - if (!header) return 0; + if (!bitmapinfoheader_from_user_bitmapinfo( &info, header )) return 0; + if (info.biWidth < 0) return 0; - if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &size ) == -1) return 0; - - if (width < 0) - { - TRACE("Bitmap has a negative width\n"); - return 0; - } - /* Top-down DIBs have a negative height */ - if (height < 0) height = -height; + height = abs( info.biHeight ); TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n", - hdc, header, init, bits, data, coloruse, width, height, bpp, compr); - + hdc, header, init, bits, data, coloruse, info.biWidth, info.biHeight, + info.biBitCount, info.biCompression); + if (hdc == NULL) - handle = CreateBitmap( width, height, 1, 1, NULL ); + handle = CreateBitmap( info.biWidth, height, 1, 1, NULL ); else - handle = CreateCompatibleBitmap( hdc, width, height ); + handle = CreateCompatibleBitmap( hdc, info.biWidth, height ); if (handle) {

1 0

Alexandre Julliard : gdi32: Get rid of the DIB_GetBitmapInfo function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: e5ce32e54d3ec34977e9ee7b3cf891b9f983e21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ce32e54d3ec34977e9ee7b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 14:40:34 2011 +0200 gdi32: Get rid of the DIB_GetBitmapInfo function. --- dlls/gdi32/dib.c | 78 +++++++++++---------------------------------- dlls/gdi32/gdi_private.h | 2 - 2 files changed, 19 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index d53289b..5d08c6e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -28,8 +28,7 @@ Most Windows API functions taking a BITMAPINFO* / BITMAPINFOHEADER* also accept the old "core" structures, and so must WINE. - You can distinguish them by looking at the first member (bcSize/biSize), - or use the internal function DIB_GetBitmapInfo. + You can distinguish them by looking at the first member (bcSize/biSize). * The palettes are stored in different formats: @@ -98,70 +97,35 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) } } - -/*********************************************************************** - * DIB_GetBitmapInfo - * - * Get the info from a bitmap header. - * Return 0 for COREHEADER, 1 for INFOHEADER, -1 for error. - */ -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) -{ - if (!header) return -1; - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; - return 0; - } - if (header->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); - return -1; -} - /******************************************************************************************* * Fill out a true BITMAPINFOHEADER from a variable sized BITMAPINFOHEADER / BITMAPCOREHEADER. */ static BOOL bitmapinfoheader_from_user_bitmapinfo( BITMAPINFOHEADER *dst, const BITMAPINFOHEADER *info ) { - LONG width, height; - WORD planes, bpp; - DWORD compr, size; - int bitmap_type = DIB_GetBitmapInfo( info, &width, &height, &planes, &bpp, &compr, &size ); - - if (bitmap_type == -1) return FALSE; + if (!info) return FALSE; - if (bitmap_type == 1) + if (info->biSize == sizeof(BITMAPCOREHEADER)) { - *dst = *info; - } - else - { - dst->biWidth = width; - dst->biHeight = height; - dst->biPlanes = planes; - dst->biBitCount = bpp; - dst->biCompression = compr; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + dst->biWidth = core->bcWidth; + dst->biHeight = core->bcHeight; + dst->biPlanes = core->bcPlanes; + dst->biBitCount = core->bcBitCount; + dst->biCompression = BI_RGB; dst->biXPelsPerMeter = 0; dst->biYPelsPerMeter = 0; dst->biClrUsed = 0; dst->biClrImportant = 0; } + else if (info->biSize >= sizeof(BITMAPINFOHEADER)) /* assume BITMAPINFOHEADER */ + { + *dst = *info; + } + else + { + WARN( "(%u): unknown/wrong size for header\n", info->biSize ); + return FALSE; + } dst->biSize = sizeof(*dst); if (dst->biCompression == BI_RGB || dst->biCompression == BI_BITFIELDS) @@ -928,11 +892,7 @@ INT WINAPI GetDIBits( /* Since info may be a BITMAPCOREINFO or any of the larger BITMAPINFO structures, we'll use our own copy and transfer the colour info back at the end */ - if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) - { - ERR("Invalid bitmap format\n"); - return 0; - } + if (!bitmapinfoheader_from_user_bitmapinfo( &dst_info->bmiHeader, &info->bmiHeader )) return 0; dst_info->bmiHeader.biClrUsed = 0; dst_info->bmiHeader.biClrImportant = 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0111951..b24f4eb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -338,8 +338,6 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; -extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : cmd/tests: Ensure failures are caught in all cases when an expected line ends with a '@'.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 5661e9cdcab065bec30b6dd9ae0805a94daf657e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5661e9cdcab065bec30b6dd9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:44 2011 +0200 cmd/tests: Ensure failures are caught in all cases when an expected line ends with a '@'. --- programs/cmd/tests/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index c4ccaab..67ecd3d 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -186,7 +186,8 @@ static const char *compare_line(const char *out_line, const char *out_end, const && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { exp_ptr = exp_end; continue; - } + }else if(out_ptr == out_end || *out_ptr != *exp_ptr) + err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) { err = out_ptr; }

1 0

Frédéric Delanoy : cmd/tests: Remove redundant ok check in compare_line function.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 7158257fd86cdf1990274cfda30df1b3c04b9d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7158257fd86cdf1990274cfda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:45 2011 +0200 cmd/tests: Remove redundant ok check in compare_line function. --- programs/cmd/tests/batch.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 67ecd3d..da96434 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -178,7 +178,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); - ok(*out_ptr == ' ', "expected space\n"); if(out_ptr < out_end && *out_ptr == ' ') out_ptr++; continue;

1 0

Frédéric Delanoy : cmd/tests: Refactor "broken" keyword handling so all cases are handled correctly.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 8d328ff810fa20fa6243956a7e4c353f9719be0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d328ff810fa20fa6243956a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:46 2011 +0200 cmd/tests: Refactor "broken" keyword handling so all cases are handled correctly. --- programs/cmd/tests/batch.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index da96434..3f8826f 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -152,16 +152,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; - /* Corner case where exp_line directly starts with @or_broken@, on Windowses */ - if(broken(1) - && exp_line+sizeof(or_broken_cmd) <= exp_end - && !memcmp(exp_line, or_broken_cmd, sizeof(or_broken_cmd))) { - if(out_line == out_end) - return NULL; - else - exp_ptr = exp_line + sizeof(or_broken_cmd); - } - while(exp_ptr < exp_end) { if(*exp_ptr == '@') { if(exp_ptr+sizeof(pwd_cmd) <= exp_end @@ -183,8 +173,10 @@ static const char *compare_line(const char *out_line, const char *out_end, const continue; }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { - exp_ptr = exp_end; - continue; + if(out_ptr == out_end) + return NULL; + else + err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) err = out_ptr; }else if(out_ptr == out_end || *out_ptr != *exp_ptr) {

1 0

Frédéric Delanoy : cmd/tests: Add setlocal/ endlocal tests.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 920bdcc4b82b9bb12f0df489296215e997f19c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920bdcc4b82b9bb12f0df4892… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 11:50:47 2011 +0200 cmd/tests: Add setlocal/endlocal tests. --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 +++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2321e12..a27c833 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -650,6 +650,48 @@ call dir /b cd .. rd /s/q foobar +echo ------------ Testing setlocal/endlocal ------------ +call :setError 0 +rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section +mkdir foobar & cd foobar +echo ...enable/disable extensions +setlocal DisableEXTensions +echo ErrLev: %ErrorLevel% +endlocal +echo ErrLev: %ErrorLevel% +echo @echo off> tmp.cmd +echo echo ErrLev: %%ErrorLevel%%>> tmp.cmd +rem Enabled by default +cmd /C tmp.cmd +cmd /E:OfF /C tmp.cmd +cmd /e:oN /C tmp.cmd + +rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) +echo ...setlocal with corresponding endlocal +echo @echo off> test.cmd +echo echo %%VAR%%>> test.cmd +echo setlocal>> test.cmd +echo set VAR=localval>> test.cmd +echo echo %%VAR%%>> test.cmd +echo endlocal>> test.cmd +echo echo %%VAR%%>> test.cmd +set VAR=globalval +call test.cmd +echo %VAR% +set VAR= +echo ...setlocal with no corresponding endlocal +echo @echo off> test.cmd +echo echo %%VAR%%>> test.cmd +echo setlocal>> test.cmd +echo set VAR=localval>> test.cmd +echo echo %%VAR%%>> test.cmd +set VAR=globalval +call test.cmd +echo %VAR% +set VAR= +cd .. +rd /q/s foobar + echo -----------Testing Errorlevel----------- rem WARNING: Do *not* add tests using ErrorLevel after this section should_not_exist 2> nul > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c430883..c4f0d76 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -331,6 +331,22 @@ foo '' @todo_wine(a)1 @todo_wine(a)1 non-builtin dir +------------ Testing setlocal/endlocal ------------ +...enable/disable extensions +(a)todo_wine@ErrLev:@space@ +ErrLev: 0 +ErrLev: 0 +(a)todo_wine@ErrLev:@space@@or_broken(a)ErrLev: 0 +ErrLev: 0 +...setlocal with corresponding endlocal +globalval +localval +globalval +globalval +...setlocal with no corresponding endlocal +globalval +localval +(a)todo_wine@globalval -----------Testing Errorlevel----------- 9009 1

1 0

Kusanagi Kouichi : winex11.drv: Fix a memory leak.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 806e407193a188fbe99420d6f91ce3bb013da59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=806e407193a188fbe99420d6f… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Aug 4 19:38:54 2011 +0900 winex11.drv: Fix a memory leak. --- dlls/winex11.drv/clipboard.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0899815..cda8f9e 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2970,8 +2970,13 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent } else { - TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", - XGetAtomName(display, atype), aformat, cTargetPropList, remain); + if (TRACE_ON(clipboard)) + { + char * const typeName = XGetAtomName(display, atype); + TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", + typeName, aformat, cTargetPropList, remain); + XFree(typeName); + } wine_tsx11_unlock(); /*

1 0

Nikolay Sivov : advapi32/crypt: Fixed some HKEY leaks.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 322049cebf2c08875bfe8fe1d9d62ead6d856079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322049cebf2c08875bfe8fe1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 03:55:56 2011 +0400 advapi32/crypt: Fixed some HKEY leaks. --- dlls/advapi32/crypt.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 26fda66..f0f19ee 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1124,6 +1124,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, 'P','r','o','v','i','d','e','r',0 }; static const WCHAR typeW[] = {'T','y','p','e',0}; + BOOL ret; TRACE("(%d, %p, %d, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); @@ -1145,6 +1146,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, return FALSE; } + ret = TRUE; if (!pszProvName) { DWORD numkeys; @@ -1156,6 +1158,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR)))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); + RegCloseKey(hKey); return FALSE; } @@ -1167,7 +1170,7 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, if (dwIndex >= numkeys) { SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; + ret = FALSE; } } else { DWORD size = sizeof(DWORD); @@ -1178,16 +1181,22 @@ BOOL WINAPI CryptEnumProvidersW (DWORD dwIndex, DWORD *pdwReserved, if (result) { SetLastError(result); + RegCloseKey(hKey); return FALSE; } if (RegOpenKeyW(hKey, pszProvName, &subkey)) + { + RegCloseKey(hKey); return FALSE; + } + if (RegQueryValueExW(subkey, typeW, NULL, NULL, (BYTE*)pdwProvType, &size)) - return FALSE; + ret = FALSE; + RegCloseKey(subkey); } RegCloseKey(hKey); - return TRUE; + return ret; } /****************************************************************************** @@ -1200,7 +1209,7 @@ BOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, { PWSTR str = NULL; DWORD bufsize; - BOOL ret; /* = FALSE; */ + BOOL ret; TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); @@ -1287,19 +1296,24 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, if (dwIndex >= numkeys) { SetLastError(ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); return FALSE; } keylen++; if ( !(keyname = CRYPT_Alloc(keylen*sizeof(WCHAR))) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); + RegCloseKey(hKey); return FALSE; } if ( RegEnumKeyW(hKey, dwIndex, keyname, keylen) ) { CRYPT_Free(keyname); + RegCloseKey(hKey); return FALSE; } RegOpenKeyW(hKey, keyname, &hSubkey); + RegCloseKey(hKey); + ch = keyname + strlenW(keyname); /* Convert "Type 000" to 0, etc/ */ *pdwProvType = *(--ch) - '0'; @@ -1311,11 +1325,11 @@ BOOL WINAPI CryptEnumProviderTypesW (DWORD dwIndex, DWORD *pdwReserved, if (result) { SetLastError(result); + RegCloseKey(hSubkey); return FALSE; } RegCloseKey(hSubkey); - RegCloseKey(hKey); return TRUE; } @@ -1502,6 +1516,8 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, CRYPT_Free(keyname); result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + RegCloseKey(hKey); + if (result) { if (result != ERROR_MORE_DATA) @@ -1512,7 +1528,6 @@ BOOL WINAPI CryptGetDefaultProviderW (DWORD dwProvType, DWORD *pdwReserved, return FALSE; } - RegCloseKey(hKey); return TRUE; } @@ -1526,7 +1541,7 @@ BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved, { PWSTR str = NULL; DWORD bufsize; - BOOL ret = FALSE; + BOOL ret; TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName);

1 0