February 2011 - Wine-commits

Dmitry Timoshkov : user32: Use the windows created by the SetParent() test to get a more predictable active/focus window state.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 798edfec16a2dbdc6f1bdbaf8a5fd817dbd5dc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=798edfec16a2dbdc6f1bdbaf8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 18 12:31:52 2011 +0800 user32: Use the windows created by the SetParent() test to get a more predictable active/focus window state. --- dlls/user32/tests/win.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3de1021..e440a96 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3460,9 +3460,9 @@ static void test_SetParent(void) check_parents(child1, parent, parent, parent, 0, parent, parent); check_parents(popup, desktop, 0, 0, 0, popup, popup); - SetFocus(0); - SetActiveWindow(0); - check_active_state(0, 0, 0); + SetActiveWindow(parent); + SetFocus(parent); + check_active_state(parent, 0, parent); ret = SetParent(popup, child1); ok(ret == desktop, "expected %p, got %p\n", desktop, ret); @@ -3470,17 +3470,14 @@ static void test_SetParent(void) todo_wine check_active_state(popup, 0, popup); - SetFocus(0); - SetActiveWindow(0); - /* NT4 sets active window to 0, other Windows versions - * leave the popup an active window. - check_active_state(popup, 0, 0); */ + SetActiveWindow(parent); + SetFocus(parent); + check_active_state(parent, 0, parent); -todo_wine +todo_wine { ok(SetForegroundWindow(popup), "SetForegroundWindow() failed\n"); - /* NT4 sets focus window to the popup, other Windows versions - * leave the focus set to 0. - check_active_state(popup, 0, 0); */ + check_active_state(popup, 0, popup); + } ok(DestroyWindow(parent), "DestroyWindow() failed\n");

1 0

Gerald Pfeifer : winmm: Simplify MCI_DumpCommandTable a bit.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 1dae68e71bc1e779306a0807bb71e0737aa2da4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dae68e71bc1e779306a0807b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Feb 18 04:03:01 2011 +0100 winmm: Simplify MCI_DumpCommandTable a bit. --- dlls/winmm/mci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 30db363..8a889d2 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -625,7 +625,6 @@ static BOOL MCI_DumpCommandTable(UINT uTbl) { const BYTE* lmem; LPCWSTR str; - DWORD flg; WORD eid; if (!MCI_IsCommandTableValid(uTbl)) { @@ -636,9 +635,10 @@ static BOOL MCI_DumpCommandTable(UINT uTbl) lmem = S_MciCmdTable[uTbl].lpTable; do { do { + /* DWORD flg; */ str = (LPCWSTR)lmem; lmem += (strlenW(str) + 1) * sizeof(WCHAR); - flg = *(const DWORD*)lmem; + /* flg = *(const DWORD*)lmem; */ eid = *(const WORD*)(lmem + sizeof(DWORD)); /* TRACE("cmd=%s %08lx %04x\n", debugstr_w(str), flg, eid); */ lmem += sizeof(DWORD) + sizeof(WORD);

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

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: Add support for MSZIP compression.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: e1a0ef7ef8922a029a0d26c5bb9b37fe131c8f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a0ef7ef8922a029a0d26c5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 00:15:44 2011 +0100 cabinet: Add support for MSZIP compression. --- dlls/cabinet/Makefile.in | 1 + dlls/cabinet/fci.c | 55 ++++++++++++++++++++++++++++++++++++++++++--- dlls/cabinet/tests/fdi.c | 4 +-- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/Makefile.in b/dlls/cabinet/Makefile.in index 7a1ad9d..2876936 100644 --- a/dlls/cabinet/Makefile.in +++ b/dlls/cabinet/Makefile.in @@ -1,5 +1,6 @@ MODULE = cabinet.dll IMPORTLIB = cabinet +EXTRALIBS = @ZLIB@ C_SRCS = \ cabinet_main.c \ diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index f1d6a80..55a024a 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -24,11 +24,9 @@ There is still some work to be done: -- no real compression yet - unknown behaviour if files>=2GB or cabinet >=4GB - check if the maximum size for a cabinet is too small to store any data - call pfnfcignc on exactly the same position as MS FCIAddFile in every case -- probably check err */ @@ -40,6 +38,9 @@ There is still some work to be done: #include <stdarg.h> #include <stdio.h> #include <string.h> +#ifdef HAVE_ZLIB +# include <zlib.h> +#endif #include "windef.h" #include "winbase.h" @@ -166,9 +167,9 @@ typedef struct FCI_Int void *pv; char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ - char* data_in; /* uncompressed data blocks */ + unsigned char *data_in; /* uncompressed data blocks */ cab_UWORD cdata_in; - char* data_out; /* compressed data blocks */ + unsigned char *data_out; /* compressed data blocks */ ULONG cCompressedBytesInFolder; cab_UWORD cFolders; cab_UWORD cFiles; @@ -945,6 +946,46 @@ static cab_UWORD compress_NONE( FCI_Int *fci ) return fci->cdata_in; } +#ifdef HAVE_ZLIB + +static void *zalloc( void *opaque, unsigned int items, unsigned int size ) +{ + FCI_Int *fci = opaque; + return fci->alloc( items * size ); +} + +static void zfree( void *opaque, void *ptr ) +{ + FCI_Int *fci = opaque; + return fci->free( ptr ); +} + +static cab_UWORD compress_MSZIP( FCI_Int *fci ) +{ + z_stream stream; + + stream.zalloc = zalloc; + stream.zfree = zfree; + stream.opaque = fci; + if (deflateInit2( &stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY ) != Z_OK) + { + set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } + stream.next_in = fci->data_in; + stream.avail_in = fci->cdata_in; + stream.next_out = fci->data_out + 2; + stream.avail_out = 2 * CB_MAX_CHUNK - 2; + /* insert the signature */ + fci->data_out[0] = 'C'; + fci->data_out[1] = 'K'; + deflate( &stream, Z_FINISH ); + deflateEnd( &stream ); + return stream.total_out + 2; +} + +#endif /* HAVE_ZLIB */ + /*********************************************************************** * FCICreate (CABINET.10) @@ -1441,6 +1482,12 @@ BOOL __cdecl FCIAddFile( if (!FCIFlushFolder( hfci, pfnfcignc, pfnfcis )) return FALSE; switch (typeCompress) { + case tcompTYPE_MSZIP: +#ifdef HAVE_ZLIB + p_fci_internal->compression = tcompTYPE_MSZIP; + p_fci_internal->compress = compress_MSZIP; + break; +#endif default: FIXME( "compression %x not supported, defaulting to none\n", typeCompress ); /* fall through */ diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 19f9e29..b3f70bf 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -581,11 +581,9 @@ static void test_FDIIsCabinet(void) ok(cabinfo.cFiles == 4, "Expected 4, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 1, "Expected 1, got %d\n", cabinfo.cFolders); ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); todo_wine - { - ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); - } fdi_close(fd); FDIDestroy(hfdi);

1 0

Alexandre Julliard : cabinet: Avoid some memory allocations by storing buffers directly in the FCI structure .
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: 866adf4b50baaeb54018899bb0ecc2df353ba053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866adf4b50baaeb54018899bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 11:32:35 2011 +0100 cabinet: Avoid some memory allocations by storing buffers directly in the FCI structure. --- dlls/cabinet/fci.c | 86 ++++++++++------------------------------------------ 1 files changed, 16 insertions(+), 70 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 55a024a..997760a 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -165,11 +165,11 @@ typedef struct FCI_Int cab_ULONG statusFolderTotal; BOOL fGetNextCabInVain; void *pv; - char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ - char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ - unsigned char *data_in; /* uncompressed data blocks */ + char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ + char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ + unsigned char data_in[CAB_BLOCKMAX]; /* uncompressed data blocks */ + unsigned char data_out[2 * CAB_BLOCKMAX]; /* compressed data blocks */ cab_UWORD cdata_in; - unsigned char *data_out; /* compressed data blocks */ ULONG cCompressedBytesInFolder; cab_UWORD cFolders; cab_UWORD cFiles; @@ -357,18 +357,6 @@ static BOOL add_file_data( FCI_Int *fci, char *sourcefile, char *filename, BOOL INT_PTR handle; struct file *file; - /* make sure we have buffers */ - if (!fci->data_in && !(fci->data_in = fci->alloc( CB_MAX_CHUNK ))) - { - set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - if (!fci->data_out && !(fci->data_out = fci->alloc( 2 * CB_MAX_CHUNK ))) - { - set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - if (!(file = add_file( fci, filename ))) return FALSE; handle = get_open_info( sourcefile, &file->date, &file->time, &file->attribs, &err, fci->pv ); @@ -539,15 +527,9 @@ static BOOL write_folders( FCI_Int *fci, INT_PTR handle, cab_ULONG header_size, { struct folder *folder; int err; - BOOL ret = TRUE; - CFFOLDER *cffolder; + CFFOLDER *cffolder = (CFFOLDER *)fci->data_out; cab_ULONG folder_size = sizeof(CFFOLDER) + fci->ccab.cbReserveCFFolder; - if (!(cffolder = fci->alloc( folder_size ))) - { - set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } memset( cffolder, 0, folder_size ); /* write the folders */ @@ -559,13 +541,10 @@ static BOOL write_folders( FCI_Int *fci, INT_PTR handle, cab_ULONG header_size, if (fci->write( handle, cffolder, folder_size, &err, fci->pv ) != folder_size) { set_error( fci, FCIERR_CAB_FILE, err ); - ret = FALSE; - break; + return FALSE; } } - - fci->free( cffolder ); - return ret; + return TRUE; } /* write all the files to the cabinet file */ @@ -575,14 +554,7 @@ static BOOL write_files( FCI_Int *fci, INT_PTR handle, PFNFCISTATUS status_callb struct folder *folder; struct file *file; int err; - BOOL ret = TRUE; - CFFILE *cffile; - - if (!(cffile = fci->alloc( sizeof(CFFILE) + CB_MAX_FILENAME ))) - { - set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } + CFFILE *cffile = (CFFILE *)fci->data_out; LIST_FOR_EACH_ENTRY( folder, &fci->folders_list, struct folder, entry ) { @@ -599,8 +571,7 @@ static BOOL write_files( FCI_Int *fci, INT_PTR handle, PFNFCISTATUS status_callb if (fci->write( handle, cffile, file_size, &err, fci->pv ) != file_size) { set_error( fci, FCIERR_CAB_FILE, err ); - ret = FALSE; - break; + return FALSE; } if (!fci->fSplitFolder) { @@ -614,14 +585,11 @@ static BOOL write_files( FCI_Int *fci, INT_PTR handle, PFNFCISTATUS status_callb fci->statusFolderTotal, fci->pv ) == -1) { set_error( fci, FCIERR_USER_ABORT, 0 ); - ret = FALSE; - break; + return FALSE; } } } - - fci->free( cffile ); - return ret; + return TRUE; } /* write all data blocks to the cabinet file */ @@ -634,8 +602,6 @@ static BOOL write_data_blocks( FCI_Int *fci, INT_PTR handle, PFNFCISTATUS status void *data; cab_UWORD header_size; - if (!fci->data_out) return TRUE; - header_size = sizeof(CFDATA) + fci->ccab.cbReserveCFData; cfdata = (CFDATA *)fci->data_out; memset( cfdata, 0, header_size ); @@ -683,16 +649,13 @@ static BOOL write_cabinet( FCI_Int *fci, PFNFCISTATUS status_callback ) int err; char *ptr; INT_PTR handle; - CFHEADER *cfheader; + CFHEADER *cfheader = (CFHEADER *)fci->data_out; cab_UWORD flags = 0; cab_ULONG header_size = get_header_size( fci ); - cab_ULONG total_size = header_size + fci->folders_size + fci->placed_files_size + fci->folders_data_size; + cab_ULONG total_size = header_size + fci->folders_size + + fci->placed_files_size + fci->folders_data_size; - if (!(cfheader = fci->alloc( header_size ))) - { - set_error( fci, FCIERR_ALLOC_FAIL, ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } + assert( header_size <= sizeof(fci->data_out) ); memset( cfheader, 0, header_size ); if (fci->fPrevCab) flags |= cfheadPREV_CABINET; @@ -753,7 +716,6 @@ static BOOL write_cabinet( FCI_Int *fci, PFNFCISTATUS status_callback ) _S_IREAD | _S_IWRITE, &err, fci->pv )) == -1) { set_error( fci, FCIERR_CAB_FILE, err ); - fci->free( cfheader ); return FALSE; } @@ -782,7 +744,6 @@ static BOOL write_cabinet( FCI_Int *fci, PFNFCISTATUS status_callback ) goto failed; } fci->close( handle, &err, fci->pv ); - fci->free( cfheader ); reset_cabinet( fci ); status_callback( statusCabinet, fci->estimatedCabinetSize, total_size, fci->pv ); @@ -791,7 +752,6 @@ static BOOL write_cabinet( FCI_Int *fci, PFNFCISTATUS status_callback ) failed: fci->close( handle, &err, fci->pv ); fci->delete( filename, &err, fci->pv ); - fci->free( cfheader ); return FALSE; } @@ -975,7 +935,7 @@ static cab_UWORD compress_MSZIP( FCI_Int *fci ) stream.next_in = fci->data_in; stream.avail_in = fci->cdata_in; stream.next_out = fci->data_out + 2; - stream.avail_out = 2 * CB_MAX_CHUNK - 2; + stream.avail_out = sizeof(fci->data_out) - 2; /* insert the signature */ fci->data_out[0] = 'C'; fci->data_out[1] = 'K'; @@ -1092,9 +1052,7 @@ HFCI __cdecl FCICreate( p_fci_internal->fSplitFolder = FALSE; p_fci_internal->fGetNextCabInVain = FALSE; p_fci_internal->pv = pv; - p_fci_internal->data_in = NULL; p_fci_internal->cdata_in = 0; - p_fci_internal->data_out = NULL; p_fci_internal->cCompressedBytesInFolder = 0; p_fci_internal->cFolders = 0; p_fci_internal->cFiles = 0; @@ -1156,12 +1114,6 @@ static BOOL fci_flush_folder( FCI_Int *p_fci_internal, return TRUE; } - if (p_fci_internal->data_in==NULL || p_fci_internal->data_out==NULL ) { - /* error handling */ - set_error( p_fci_internal, FCIERR_NONE, ERROR_GEN_FAILURE ); - return FALSE; - } - /* FCIFlushFolder has already been called... */ if (p_fci_internal->fSplitFolder && p_fci_internal->placed_files_size!=0) { return TRUE; @@ -1796,12 +1748,6 @@ BOOL __cdecl FCIDestroy(HFCI hfci) close_temp_file( p_fci_internal, &p_fci_internal->data ); - /* data in and out buffers have to be removed */ - if (p_fci_internal->data_in!=NULL) - p_fci_internal->free(p_fci_internal->data_in); - if (p_fci_internal->data_out!=NULL) - p_fci_internal->free(p_fci_internal->data_out); - /* hfci can now be removed */ p_fci_internal->free(hfci); return TRUE;

1 0

Alexandre Julliard : configure: Print a notice if zlib isn't found.
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: ba6a41a4f7256fcf34932cbea385ab24549d5ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6a41a4f7256fcf34932cbea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 13:07:27 2011 +0100 configure: Print a notice if zlib isn't found. --- configure | 16 ++++++++++++++++ configure.ac | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure b/configure index df7e971..14b4caa 100755 --- a/configure +++ b/configure @@ -813,6 +813,7 @@ with_xshape with_xshm with_xslt with_xxf86vm +with_zlib with_wine_tools with_wine64 enable_largefile @@ -1503,6 +1504,7 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension + --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2762,6 +2764,12 @@ if test "${with_xxf86vm+set}" = set; then : fi +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi +fi + + # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -10614,6 +10622,14 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi fi +if test "x$ZLIB" = "x"; then : + case "x$with_zlib" in + x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; + xno) ;; + *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. +This is an error since --with-zlib was requested." "$LINENO" 5 ;; +esac +fi if test "x$enable_tools" != xno then diff --git a/configure.ac b/configure.ac index fa2a6c0..979b1cd 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,8 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), + [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1426,6 +1428,7 @@ then AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).]) AC_SUBST(ZLIB,"-lz")]) fi +WINE_NOTICE_WITH(zlib,[test "x$ZLIB" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for gettextpo **** if test "x$enable_tools" != xno

1 0

Austin English : comctl32/tests: Remove dead assignments (LLVM/Clang).
by Alexandre Julliard 18 Feb '11

18 Feb '11

Module: wine Branch: master Commit: a41a574d3e3794aa9eddd660cd8a870cd410c235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41a574d3e3794aa9eddd660c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:20:04 2011 -0800 comctl32/tests: Remove dead assignments (LLVM/Clang). --- dlls/comctl32/tests/misc.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 8f83260..5aff06f 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -87,18 +87,15 @@ static void test_GetPtrAW(void) * Our implementation also crashes and we should probably leave * it like that. */ - count = -1; count = pStr_GetPtrA(NULL, NULL, destsize); trace("count : %d\n", count); } - count = 0; count = pStr_GetPtrA(source, NULL, 0); ok (count == sourcelen || broken(count == sourcelen - 1), /* win9x */ "Expected count to be %d, it was %d\n", sourcelen, count); - count = 0; strcpy(dest, desttest); count = pStr_GetPtrA(source, dest, 0); ok (count == sourcelen || @@ -108,26 +105,22 @@ static void test_GetPtrAW(void) broken(!lstrcmp(dest, "")), /* Win7 */ "Expected destination to not have changed\n"); - count = 0; count = pStr_GetPtrA(source, NULL, destsize); ok (count == sourcelen || broken(count == sourcelen - 1), /* win9x */ "Expected count to be %d, it was %d\n", sourcelen, count); - count = 0; count = pStr_GetPtrA(source, dest, destsize); ok (count == sourcelen || broken(count == sourcelen - 1), /* win9x */ "Expected count to be %d, it was %d\n", sourcelen, count); ok (!lstrcmp(source, dest), "Expected source and destination to be the same\n"); - count = -1; strcpy(dest, desttest); count = pStr_GetPtrA(NULL, dest, destsize); ok (count == 0, "Expected count to be 0, it was %d\n", count); ok (dest[0] == '\0', "Expected destination to be cut-off and 0 terminated\n"); - count = 0; destsize = 15; count = pStr_GetPtrA(source, dest, destsize); ok (count == 15 ||

1 0

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

18 Feb '11

Module: wine Branch: master Commit: 4803f921e699e9392e8db71509890de5c4466b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4803f921e699e9392e8db7150… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:20:25 2011 -0800 comctl32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 52e16c3..ae6c7b5 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1143,6 +1143,7 @@ static void test_todaylink(void) hwnd = create_monthcal_control(0); res = SendMessage(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r); + expect(1, res); MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

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

18 Feb '11

Module: wine Branch: master Commit: 223c431d90bcb5d18b8a27b9eb17eb0a206e9ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=223c431d90bcb5d18b8a27b9e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 16 18:20:47 2011 -0800 comctl32/tests: Make sure to use a return value (LLVM/Clang). --- dlls/comctl32/tests/status.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 839b138..920d969 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -369,6 +369,7 @@ static void test_status_control(void) /* Set the Unicode format */ r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, FALSE, 0); + expect(FALSE,r); r = SendMessage(hWndStatus, SB_GETUNICODEFORMAT, 0, 0); expect(FALSE,r); r = SendMessage(hWndStatus, SB_SETUNICODEFORMAT, TRUE, 0);

1 0