wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Alexandre Julliard : cabinet: Create temp files only once we have data to store into them.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 527c8263a17fdf2d4cb7eaaabb8409f0a1e5ee5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=527c8263a17fdf2d4cb7eaaab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 21:23:03 2011 +0100 cabinet: Create temp files only once we have data to store into them. --- dlls/cabinet/fci.c | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index b5d187d..f1d6a80 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -108,7 +108,6 @@ typedef struct { struct temp_file { INT_PTR handle; - cab_ULONG size; char name[CB_MAX_FILENAME]; }; @@ -183,9 +182,10 @@ typedef struct FCI_Int struct list files_list; struct list blocks_list; cab_ULONG folders_size; - cab_ULONG files_size; - cab_ULONG placed_files_size; - cab_ULONG folders_data_size; + cab_ULONG files_size; /* size of files not yet assigned to a folder */ + cab_ULONG placed_files_size; /* size of files already placed into a folder */ + cab_ULONG pending_data_size; /* size of data not yet assigned to a folder */ + cab_ULONG folders_data_size; /* total size of data contained in the current folders */ TCOMP compression; cab_UWORD (*compress)(struct FCI_Int *); } FCI_Int; @@ -244,7 +244,6 @@ static BOOL create_temp_file( FCI_Int *fci, struct temp_file *file ) set_error( fci, FCIERR_TEMP_FILE, err ); return FALSE; } - file->size = 0; return TRUE; } @@ -317,6 +316,8 @@ static BOOL add_data_block( FCI_Int *fci, PFNFCISTATUS status_callback ) if (!fci->cdata_in) return TRUE; + if (fci->data.handle == -1 && !create_temp_file( fci, &fci->data )) return FALSE; + if (!(block = fci->alloc( sizeof(*block) ))) { set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); @@ -334,7 +335,7 @@ static BOOL add_data_block( FCI_Int *fci, PFNFCISTATUS status_callback ) } fci->cdata_in = 0; - fci->data.size += sizeof(CFDATA) + fci->ccab.cbReserveCFData + block->compressed; + fci->pending_data_size += sizeof(CFDATA) + fci->ccab.cbReserveCFData + block->compressed; fci->cCompressedBytesInFolder += block->compressed; fci->cDataBlocks++; list_add_tail( &fci->blocks_list, &block->entry ); @@ -518,7 +519,7 @@ static BOOL copy_data_blocks( FCI_Int *fci, INT_PTR handle, cab_ULONG start_pos, set_error( fci, FCIERR_TEMP_FILE, err ); return FALSE; } - temp->size += sizeof(CFDATA) + fci->ccab.cbReserveCFData + block->compressed; + fci->pending_data_size += sizeof(CFDATA) + fci->ccab.cbReserveCFData + block->compressed; fci->statusFolderCopied += block->compressed; if (status_callback( statusFolder, fci->statusFolderCopied, @@ -808,6 +809,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG * /* move the temp file into the folder structure */ folder->data = fci->data; fci->data.handle = -1; + fci->pending_data_size = 0; LIST_FOR_EACH_ENTRY_SAFE( block, next, &fci->blocks_list, struct data_block, entry ) { @@ -865,6 +867,7 @@ static BOOL add_data_to_folder( FCI_Int *fci, struct folder *folder, cab_ULONG * fci->cDataBlocks--; } + if (list_empty( &fci->blocks_list )) return TRUE; return copy_data_blocks( fci, folder->data.handle, start_pos, &fci->data, status_callback ); } @@ -1062,6 +1065,7 @@ HFCI __cdecl FCICreate( p_fci_internal->folders_size = 0; p_fci_internal->files_size = 0; p_fci_internal->placed_files_size = 0; + p_fci_internal->pending_data_size = 0; p_fci_internal->folders_data_size = 0; p_fci_internal->compression = tcompTYPE_NONE; p_fci_internal->compress = compress_NONE; @@ -1073,7 +1077,6 @@ HFCI __cdecl FCICreate( memcpy(p_fci_internal->szPrevCab, pccab->szCab, CB_MAX_CABINET_NAME); memcpy(p_fci_internal->szPrevDisk, pccab->szDisk, CB_MAX_DISK_NAME); - if (!create_temp_file( p_fci_internal, &p_fci_internal->data )) return NULL; return (HFCI)p_fci_internal; } @@ -1085,7 +1088,6 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, PFNFCIGETNEXTCABINET pfnfcignc, PFNFCISTATUS pfnfcis) { - int err; cab_ULONG payload; cab_ULONG read_result; struct folder *folder; @@ -1105,7 +1107,7 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, /* If there was no FCIAddFile or FCIFlushFolder has already been called */ /* this function will return TRUE */ if( p_fci_internal->files_size == 0 ) { - if ( p_fci_internal->data.size != 0 ) { + if ( p_fci_internal->pending_data_size != 0 ) { /* error handling */ set_error( p_fci_internal, FCIERR_NONE, ERROR_GEN_FAILURE ); return FALSE; @@ -1139,7 +1141,7 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, sizeof(CFFOLDER) + p_fci_internal->ccab.cbReserveCFFolder + p_fci_internal->placed_files_size+ p_fci_internal->folders_data_size + p_fci_internal->files_size+ - p_fci_internal->data.size + p_fci_internal->folders_size; + p_fci_internal->pending_data_size + p_fci_internal->folders_size; p_fci_internal->statusFolderCopied = 0; /* report status with pfnfcis about copied size of folder */ @@ -1171,7 +1173,7 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, ( ( p_fci_internal->ccab.cb < read_result + - p_fci_internal->data.size + + p_fci_internal->pending_data_size + p_fci_internal->files_size + CB_MAX_CABINET_NAME + /* next cabinet name */ CB_MAX_DISK_NAME /* next disk name */ @@ -1199,7 +1201,7 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, ( ( p_fci_internal->ccab.cb < read_result + - p_fci_internal->data.size + + p_fci_internal->pending_data_size + p_fci_internal->files_size + strlen(p_fci_internal->pccab->szCab)+1 + /* next cabinet name */ strlen(p_fci_internal->pccab->szDisk)+1 /* next disk name */ @@ -1233,17 +1235,7 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, } } - /* set seek of p_fci_internal->data.handle to 0 */ - if( p_fci_internal->seek(p_fci_internal->data.handle,0,SEEK_SET,&err, - p_fci_internal->pv) !=0 ) { - /* wrong return value */ - set_error( p_fci_internal, FCIERR_NONE, ERROR_SEEK ); - return FALSE; - } - /* TODO error handling of err */ - if (!(folder = add_folder( p_fci_internal ))) return FALSE; - if (!add_data_to_folder( p_fci_internal, folder, &payload, pfnfcis )) return FALSE; if (!add_files_to_folder( p_fci_internal, folder, payload )) return FALSE; @@ -1300,7 +1292,7 @@ static BOOL fci_flush_cabinet( FCI_Int *p_fci_internal, if (p_fci_internal->fNextCab) { p_fci_internal->fNextCab=FALSE; - if (p_fci_internal->files_size==0 && p_fci_internal->data.size!=0) { + if (p_fci_internal->files_size==0 && p_fci_internal->pending_data_size!=0) { /* THIS CAN NEVER HAPPEN */ /* set error code */ set_error( p_fci_internal, FCIERR_NONE, ERROR_GEN_FAILURE ); @@ -1321,7 +1313,7 @@ static BOOL fci_flush_cabinet( FCI_Int *p_fci_internal, if(p_fci_internal->files_size!=0) { read_result+=p_fci_internal->ccab.cbReserveCFFolder; } - read_result+= p_fci_internal->data.size + + read_result+= p_fci_internal->pending_data_size + p_fci_internal->files_size + p_fci_internal->folders_data_size + p_fci_internal->placed_files_size + p_fci_internal->folders_size + sizeof(CFFOLDER); /* set size of new CFFolder entry */ @@ -1378,7 +1370,7 @@ static BOOL fci_flush_cabinet( FCI_Int *p_fci_internal, } } else { p_fci_internal->fNewPrevious=FALSE; - if( p_fci_internal->files_size>0 || p_fci_internal->data.size) { + if( p_fci_internal->files_size>0 || p_fci_internal->pending_data_size) { /* THIS MAY NEVER HAPPEN */ /* set error structures */ set_error( p_fci_internal, FCIERR_NONE, ERROR_GEN_FAILURE ); @@ -1541,7 +1533,7 @@ BOOL __cdecl FCIAddFile( /* REUSE the variable read_result */ read_result = get_header_size( p_fci_internal ) + p_fci_internal->ccab.cbReserveCFFolder; - read_result+= p_fci_internal->data.size + + read_result+= p_fci_internal->pending_data_size + p_fci_internal->files_size + p_fci_internal->folders_data_size + p_fci_internal->placed_files_size + p_fci_internal->folders_size + sizeof(CFFOLDER); /* set size of new CFFolder entry */

1 0

Alexandre Julliard : cabinet: Cleanup file loading and add infrastructure for plugging in real compression .
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: d651fbe4d1c676ec521592c582ea2917d32f8f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d651fbe4d1c676ec521592c58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 21:08:28 2011 +0100 cabinet: Cleanup file loading and add infrastructure for plugging in real compression. --- dlls/cabinet/fci.c | 258 +++++++++++++++++++++++----------------------------- 1 files changed, 113 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d651fbe4d1c676ec52159…

1 0

André Hentschel : wineusr: Teach how to run Wine before how to configure it.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: docs Branch: master Commit: e99a076b45c1b0ccacf28038de2d1b3bd49272cd URL: http://source.winehq.org/git/docs.git/?a=commit;h=e99a076b45c1b0ccacf28038d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 16 19:34:39 2011 +0100 wineusr: Teach how to run Wine before how to configure it. --- en/wineusr-guide.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-guide.sgml b/en/wineusr-guide.sgml index 7a6bc75..13698b4 100644 --- a/en/wineusr-guide.sgml +++ b/en/wineusr-guide.sgml @@ -83,8 +83,8 @@ &introduction; &getting; - &configuring; &running; + &configuring; &bugs; &glossary;

1 0

André Hentschel : wineusr: Fix more typos.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: docs Branch: master Commit: 0b01467a56abee4062ff996a0e3cd67b173d9fff URL: http://source.winehq.org/git/docs.git/?a=commit;h=0b01467a56abee4062ff996a0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 16 19:08:56 2011 +0100 wineusr: Fix more typos. As spotted by Andrew Singleton. --- en/wineusr-configuring.sgml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 6bfc27e..56f7923 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -294,7 +294,7 @@ see buttons to add and remove available drives. When you choose to add a drive, a new entry will be made and a default drive mapping will appear. You can change where - this drives points to by changing what's in the + this drive points to by changing what's in the <emphasis>Path:</emphasis> box. If you're unsure of the exact path you can choose "Browse" to search for it. Removing a drive is as easy as selecting the drive and @@ -390,13 +390,13 @@ of applications and the operating system. Likewise, Wine implements a registry and some settings not found in Winecfg can be changed within it. (There's actually more of a chance - you'll need to dip into the registry to change an applications' + you'll need to dip into the registry to change an application's settings than Wine itself.) </para> <para> Now, the fact that Wine itself uses the registry to store settings has been controversial. Some people argue that it's too much like - Windows. To counter this, there's several things to consider. + Windows. To counter this there are several things to consider. First, it's impossible to avoid implementing a registry simply because applications expect to be able to store their settings there. In order for Wine to store and access settings in a separate

1 0

Jörg Höhle : msvcrt/tests: sizeof(long double) is 12 with MS.
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: d9d43231371171ba128d391cfb37cc167e7651cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d43231371171ba128d391cf… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Dec 28 23:02:12 2010 +0100 msvcrt/tests: sizeof(long double) is 12 with MS. --- dlls/msvcrt/tests/misc.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a4a1bd3..d93dccf 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -170,17 +170,28 @@ static const I10_OUTPUT_test I10_OUTPUT_tests[] = { static void test_I10_OUTPUT(void) { I10_OUTPUT_data out; - int i, j, ret; + int i, j = sizeof(long double), ret; if(!pI10_OUTPUT) { win_skip("I10_OUTPUT not available\n"); return; } + if (j != 12) + trace("sizeof(long double) = %d on this machine\n", j); for(i=0; i<sizeof(I10_OUTPUT_tests)/sizeof(I10_OUTPUT_test); i++) { memset(out.str, '#', sizeof(out.str)); - ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + if (sizeof(long double) == 12) + ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + else { + /* MS' "long double" is an 80 bit FP that takes 12 bytes*/ + typedef struct { ULONG x80[3]; } uld; /* same calling convention */ + union { long double ld; uld ld12; } fp80; + int (__cdecl *pI10_OUTPUT12)(uld, int, int, void*) = (void*)pI10_OUTPUT; + fp80.ld = I10_OUTPUT_tests[i].d; + ret = pI10_OUTPUT12(fp80.ld12, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); + } ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret); ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos); ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign);

1 0

Jörg Höhle : msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX.
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: c6d67fad8f6d0ac199d0945314564e39aa64644f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d67fad8f6d0ac199d094531… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 1 22:26:26 2010 +0100 msvcrt: sizeof(long double) is 12 with MS, but not necessarily so on UNIX. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/string.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c878c08..1c7120f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -86,7 +86,7 @@ typedef int (*__cdecl MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, unsigned, MSVCRT_uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); -typedef struct {long double x;} MSVCRT__LDOUBLE; +typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ struct MSVCRT_tm { int tm_sec; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 031c3d0..2b9d41e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -561,8 +561,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) { /* FIXME needs error checking for huge/small values */ #ifdef HAVE_STRTOLD + long double ld; TRACE("str %s value %p\n",str,value); - value->x = strtold(str,0); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("stub, str %s value %p\n",str,value); #endif @@ -575,8 +577,10 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, int flags ) { #ifdef HAVE_STRTOLD + long double ld; FIXME("%p %p %s %x partial stub\n", value, endptr, str, flags ); - value->x = strtold(str,endptr); + ld = strtold(str,0); + memcpy(value, &ld, 10); #else FIXME("%p %p %s %x stub\n", value, endptr, str, flags ); #endif @@ -1281,7 +1285,7 @@ struct _I10_OUTPUT_DATA { /********************************************************************* * $I10_OUTPUT (MSVCRT.@) - * ld - long double to be printed to data + * ld80 - long double (Intel 80 bit FP in 12 bytes) to be printed to data * prec - precision of part, we're interested in * flag - 0 for first prec digits, 1 for fractional part * data - data to be populated @@ -1294,16 +1298,22 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { static const char inf_str[] = "1#INF"; static const char nan_str[] = "1#QNAN"; - double d = ld.x; + /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. + * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. + * Assume long double uses 80 bit FP, never seen 128 bit FP. */ + long double ld = 0; + double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; + memcpy(&ld, &ld80, 10); + d = ld; TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) {

1 0

Austin English : jscript/tests: Remove a dead assignment (LLVM/Clang).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 4dc81b65180504f124b6634005be841a1f5d791f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc81b65180504f124b663400… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:43:24 2011 -0800 jscript/tests: Remove a dead assignment (LLVM/Clang). --- dlls/jscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 326b327..18252be 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1276,7 +1276,7 @@ static void run_from_res(const char *name) len = MultiByteToWideChar(CP_ACP, 0, data, size, NULL, 0); str = SysAllocStringLen(NULL, len); - len = MultiByteToWideChar(CP_ACP, 0, data, size, str, len); + MultiByteToWideChar(CP_ACP, 0, data, size, str, len); SET_EXPECT(global_success_d); SET_EXPECT(global_success_i);

1 0

Austin English : d3d9/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 66f5234f3e4d2e5cc2ddaa3b8938c92996db277d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f5234f3e4d2e5cc2ddaa3b8… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:37:45 2011 -0800 d3d9/tests: Make sure to use return values (LLVM/Clang). --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0800892..9a40891 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11290,7 +11290,9 @@ static void clip_planes_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed, hr=%08x\n", hr); IDirect3DDevice9_SetClipPlane(device, 0, plane0); @@ -11328,6 +11330,7 @@ static void clip_planes_test(IDirect3DDevice9 *device) IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0); hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); IDirect3DVertexShader9_Release(shader); hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr);

1 0

Austin English : crypt32/tests: Make sure to use return values (LLVM/Clang) .
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: b9179032918e0d651a252e1f906b008b65639c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9179032918e0d651a252e1f9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:35:07 2011 -0800 crypt32/tests: Make sure to use return values (LLVM/Clang). --- dlls/crypt32/tests/msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index ddb94bd..d5d5309 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1838,6 +1838,7 @@ static void test_signed_msg_encoding(void) CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyEmptyContent, sizeof(signedWithCertWithValidPubKeyEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("signedWithCertWithValidPubKeyContent", msg, CMSG_CONTENT_PARAM, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent)); @@ -2868,6 +2869,7 @@ static void test_decode_msg_get_param(void) ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, dataContent, sizeof(dataContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("data content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); CryptMsgClose(msg); @@ -2885,6 +2887,7 @@ static void test_decode_msg_get_param(void) CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("hash content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); check_param("hash hash data", msg, CMSG_HASH_DATA_PARAM, hashParam, @@ -2904,6 +2907,7 @@ static void test_decode_msg_get_param(void) if (buf) { ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, buf, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(size == sizeof(hashParam), "Unexpected size %d\n", size); ok(!memcmp(buf, hashParam, size), "Unexpected value\n"); CryptMemFree(buf); @@ -3249,6 +3253,7 @@ static void test_msg_control(void) "Expected E_INVALIDARG, got %08x\n", GetLastError()); } ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* or after an update. */ for (i = 1; !old_crypt32 && (i <= CMSG_CTRL_ADD_CMS_SIGNER_INFO); i++) {

1 0

Austin English : crypt32/tests: Make sure to use a return value (LLVM/Clang ).
by Alexandre Julliard 17 Feb '11

17 Feb '11

Module: wine Branch: master Commit: 498d8738e392493d2953dfc0e1a677d21b31f3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498d8738e392493d2953dfc0e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:34:28 2011 -0800 crypt32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/crypt32/tests/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index b1a993d..e338740 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1834,6 +1834,7 @@ static void testCertSigs(void) CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); } static const BYTE md5SignedEmptyCert[] = {

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011