January 2010 - Wine-commits

Nathan Gallaher : msi: Queue dynamically allocated strings in cond.y.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 0c437f558cae5db4aaaaa1dd5670a054fb9b53d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c437f558cae5db4aaaaa1dd5… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Thu Jan 7 22:00:08 2010 -0500 msi: Queue dynamically allocated strings in cond.y. --- dlls/msi/cond.y | 122 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 97 insertions(+), 25 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index c2a1737..f3db635 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -40,6 +40,7 @@ #include "msiserver.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -54,6 +55,7 @@ typedef struct tag_yyinput LPCWSTR str; INT n; MSICONDITION result; + struct list mem; } COND_input; struct cond_str { @@ -61,10 +63,14 @@ struct cond_str { INT len; }; -static LPWSTR COND_GetString( const struct cond_str *str ); -static LPWSTR COND_GetLiteral( const struct cond_str *str ); +static LPWSTR COND_GetString( COND_input *info, const struct cond_str *str ); +static LPWSTR COND_GetLiteral( COND_input *info, const struct cond_str *str ); static int cond_lex( void *COND_lval, COND_input *info); +static void *cond_alloc( COND_input *cond, unsigned int sz ); +static void *cond_track_mem( COND_input *cond, void *ptr, unsigned int sz ); +static void cond_free( void *ptr ); + static INT compare_int( INT a, INT operator, INT b ); static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ); @@ -73,8 +79,8 @@ static INT compare_and_free_strings( LPWSTR a, INT op, LPWSTR b, BOOL convert ) INT r; r = compare_string( a, op, b, convert ); - msi_free( a ); - msi_free( b ); + cond_free( a ); + cond_free( b ); return r; } @@ -189,7 +195,7 @@ boolean_factor: | value_s { $$ = ($1 && $1[0]) ? 1 : 0; - msi_free($1); + cond_free( $1 ); } | value_i operator value_i { @@ -202,7 +208,7 @@ boolean_factor: $$ = compare_int( num, $2, $3 ); else $$ = ($2 == COND_NE || $2 == COND_INE ); - msi_free($1); + cond_free( $1 ); } | value_i operator symbol_s { @@ -211,7 +217,7 @@ boolean_factor: $$ = compare_int( $1, $2, num ); else $$ = ($2 == COND_NE || $2 == COND_INE ); - msi_free($3); + cond_free( $3 ); } | symbol_s operator symbol_s { @@ -232,12 +238,12 @@ boolean_factor: | literal operator value_i { $$ = 0; - msi_free($1); + cond_free( $1 ); } | value_i operator literal { $$ = 0; - msi_free($3); + cond_free( $3 ); } | COND_LPAR expression COND_RPAR { @@ -281,7 +287,8 @@ value_s: literal: COND_LITER { - $$ = COND_GetLiteral(&$1); + COND_input* cond = (COND_input*) info; + $$ = COND_GetLiteral( cond, &$1 ); if( !$$ ) YYABORT; } @@ -299,7 +306,7 @@ value_i: MSI_GetComponentStateW(cond->package, $2, &install, &action ); $$ = action; - msi_free( $2 ); + cond_free( $2 ); } | COND_QUESTION identifier { @@ -308,7 +315,7 @@ value_i: MSI_GetComponentStateW(cond->package, $2, &install, &action ); $$ = install; - msi_free( $2 ); + cond_free( $2 ); } | COND_AMPER identifier { @@ -321,7 +328,7 @@ value_i: else $$ = action; - msi_free( $2 ); + cond_free( $2 ); } | COND_EXCLAM identifier { @@ -330,7 +337,7 @@ value_i: MSI_GetFeatureStateW(cond->package, $2, &install, &action ); $$ = install; - msi_free( $2 ); + cond_free( $2 ); } ; @@ -338,27 +345,37 @@ symbol_s: identifier { COND_input* cond = (COND_input*) info; + UINT len; $$ = msi_dup_property( cond->package, $1 ); - msi_free( $1 ); + if ($$) + { + len = (lstrlenW($$) + 1) * sizeof (WCHAR); + $$ = cond_track_mem( cond, $$, len ); + } + cond_free( $1 ); } | COND_PERCENT identifier { + COND_input* cond = (COND_input*) info; UINT len = GetEnvironmentVariableW( $2, NULL, 0 ); $$ = NULL; if (len++) { - $$ = msi_alloc( len*sizeof (WCHAR) ); + $$ = cond_alloc( cond, len*sizeof (WCHAR) ); + if( !$$ ) + YYABORT; GetEnvironmentVariableW( $2, $$, len ); } - msi_free( $2 ); + cond_free( $2 ); } ; identifier: COND_IDENT { - $$ = COND_GetString(&$1); + COND_input* cond = (COND_input*) info; + $$ = COND_GetString( cond, &$1 ); if( !$$ ) YYABORT; } @@ -367,11 +384,12 @@ identifier: integer: COND_NUMBER { - LPWSTR szNum = COND_GetString(&$1); + COND_input* cond = (COND_input*) info; + LPWSTR szNum = COND_GetString( cond, &$1 ); if( !szNum ) YYABORT; $$ = atoiW( szNum ); - msi_free( szNum ); + cond_free( szNum ); } ; @@ -691,11 +709,11 @@ static int cond_lex( void *COND_lval, COND_input *cond ) return rc; } -static LPWSTR COND_GetString( const struct cond_str *str ) +static LPWSTR COND_GetString( COND_input *cond, const struct cond_str *str ) { LPWSTR ret; - ret = msi_alloc( (str->len+1) * sizeof (WCHAR) ); + ret = cond_alloc( cond, (str->len+1) * sizeof (WCHAR) ); if( ret ) { memcpy( ret, str->data, str->len * sizeof(WCHAR)); @@ -705,11 +723,11 @@ static LPWSTR COND_GetString( const struct cond_str *str ) return ret; } -static LPWSTR COND_GetLiteral( const struct cond_str *str ) +static LPWSTR COND_GetLiteral( COND_input *cond, const struct cond_str *str ) { LPWSTR ret; - ret = msi_alloc( (str->len-1) * sizeof (WCHAR) ); + ret = cond_alloc( cond, (str->len-1) * sizeof (WCHAR) ); if( ret ) { memcpy( ret, str->data+1, (str->len-2) * sizeof(WCHAR) ); @@ -719,6 +737,48 @@ static LPWSTR COND_GetLiteral( const struct cond_str *str ) return ret; } +static void *cond_alloc( COND_input *cond, unsigned int sz ) +{ + struct list *mem; + + mem = msi_alloc( sizeof (struct list) + sz ); + if( !mem ) + return NULL; + + list_add_head( &(cond->mem), mem ); + return mem + 1; +} + +static void *cond_track_mem( COND_input *cond, void *ptr, unsigned int sz ) +{ + void *new_ptr; + + if( !ptr ) + return ptr; + + new_ptr = cond_alloc( cond, sz ); + if( !new_ptr ) + { + msi_free( ptr ); + return NULL; + } + + memcpy( new_ptr, ptr, sz ); + msi_free( ptr ); + return new_ptr; +} + +static void cond_free( void *ptr ) +{ + struct list *mem = (struct list *)ptr - 1; + + if( ptr ) + { + list_remove( mem ); + msi_free( mem ); + } +} + static int cond_error(const char *str) { TRACE("%s\n", str ); @@ -729,6 +789,7 @@ MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *package, LPCWSTR szCondition ) { COND_input cond; MSICONDITION r; + struct list *mem, *safety; TRACE("%s\n", debugstr_w( szCondition ) ); @@ -739,12 +800,23 @@ MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *package, LPCWSTR szCondition ) cond.str = szCondition; cond.n = 0; cond.result = MSICONDITION_ERROR; - + + list_init( &cond.mem ); + if ( !cond_parse( &cond ) ) r = cond.result; else r = MSICONDITION_ERROR; + LIST_FOR_EACH_SAFE( mem, safety, &cond.mem ) + { + /* The tracked memory lives directly after the list struct */ + void *ptr = mem + 1; + if ( r != MSICONDITION_ERROR ) + WARN( "condition parser failed to free up some memory: %p\n", ptr ); + cond_free( ptr ); + } + TRACE("%i <- %s\n", r, debugstr_w(szCondition)); return r; }

1 0

Nikolay Sivov : user32/tests: Forward test proc to default dialog procedure instead of window's one.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: ba51a6c9bc9816c236596020d964aa99cbec1b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba51a6c9bc9816c236596020d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 7 23:46:16 2010 +0300 user32/tests: Forward test proc to default dialog procedure instead of window's one. --- dlls/user32/tests/dialog.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 5879fbc..204d854 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -464,7 +464,6 @@ static BOOL OnTestDlgCreate (HWND hwnd, LPCREATESTRUCT lpcs) static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; switch (uiMsg) { /* Add blank case statements for these to ensure we don't use them @@ -485,20 +484,19 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, break; } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; - DWORD dw; - HWND hwndOk; - switch (uiMsg) { case WM_INITDIALOG: + { + DWORD dw; + HWND hwndOk; + dw = SendMessage(hwnd, DM_GETDEFID, 0, 0); assert(DC_HASDEFID == HIWORD(dw)); hwndOk = GetDlgItem(hwnd, LOWORD(dw)); @@ -508,6 +506,7 @@ static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, PostMessage(hwnd, WM_KEYDOWN, VK_RETURN, 0); PostMessage(hwnd, WM_COMMAND, IDCANCEL, 0); break; + } case WM_COMMAND: if (wParam == IDOK) { @@ -523,14 +522,12 @@ static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, break; } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; switch (uiMsg) { /* Add blank case statements for these to ensure we don't use them @@ -544,8 +541,7 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, (LPCREATESTRUCTA) lParam) ? 0 : (LRESULT) -1); } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefDlgProcA (hwnd, uiMsg, wParam, lParam); } static BOOL RegisterWindowClasses (void)

1 0

Nikolay Sivov : ntdll: Release buffer when it won't be referenced.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: f9b41a7983e7a2696e2a902f608619f98f4fc4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b41a7983e7a2696e2a902f6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 8 18:07:12 2010 +0300 ntdll: Release buffer when it won't be referenced. --- dlls/ntdll/path.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 66d7b7a..8b62a3a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -662,9 +662,11 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) tmp[1] = ':'; tmp[2] = '\\'; ins_str = tmp; + RtlFreeHeap(GetProcessHeap(), 0, val.Buffer); break; default: ERR("Unsupported status code\n"); + RtlFreeHeap(GetProcessHeap(), 0, val.Buffer); break; } mark = 3;

1 0

Alexandre Julliard : server: Don't dump more than 1024 bytes in a trace.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: b824fe05f4348ed6a2af45c4320d6eaf85eb3975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b824fe05f4348ed6a2af45c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 7 20:27:17 2010 +0100 server: Don't dump more than 1024 bytes in a trace. --- server/trace.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/trace.c b/server/trace.c index 6cb4cc9..df47e8f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -373,7 +373,7 @@ static void dump_varargs_user_handles( const char *prefix, data_size_t size ) static void dump_varargs_bytes( const char *prefix, data_size_t size ) { const unsigned char *data = cur_data; - data_size_t len = size; + data_size_t len = min( 1024, size ); fprintf( stderr,"%s{", prefix ); while (len > 0) @@ -381,6 +381,7 @@ static void dump_varargs_bytes( const char *prefix, data_size_t size ) fprintf( stderr, "%02x", *data++ ); if (--len) fputc( ',', stderr ); } + if (size > 1024) fprintf( stderr, "...(total %u)", size ); fputc( '}', stderr ); remove_data( size ); }

1 0

Christian Costa : d3drm: Implement stubbed IDirect3DRM interface.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: a59922ab55b08028a4dd1ea83510756199e2c99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59922ab55b08028a4dd1ea83… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jan 7 22:43:25 2010 +0100 d3drm: Implement stubbed IDirect3DRM interface. --- dlls/d3drm/Makefile.in | 3 +- dlls/d3drm/d3drm.c | 431 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/d3drm_main.c | 6 +- dlls/d3drm/d3drm_private.h | 31 ++++ 4 files changed, 468 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59922ab55b08028a4dd1…

1 0

Marcus Meissner : winex11: Remove more superflous NULL checks (Coverity).
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 6fb5e61afbae235dcabd4552e32ffbcbc29ad8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb5e61afbae235dcabd4552e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 8 09:24:18 2010 +0100 winex11: Remove more superflous NULL checks (Coverity). --- dlls/winex11.drv/palette.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index a02501f..cbdf2d1 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -925,7 +925,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* fall through to RGB */ case 0: /* RGB */ - if (physDev && (physDev->depth == 1) ) + if (physDev->depth == 1) { int white = 1; RGBQUAD table[2]; @@ -981,7 +981,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* fall through to RGB */ case 0: /* RGB */ - if (physDev && (physDev->depth == 1) ) + if (physDev->depth == 1) { int white = 1; RGBQUAD table[2];

1 0

Marcus Meissner : setupapi: Avoid NULL dereference in error path (Coverity) .
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 1b27af164c3682419b636f5eb08647f3f6bb7e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27af164c3682419b636f5eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 8 09:20:34 2010 +0100 setupapi: Avoid NULL dereference in error path (Coverity). --- dlls/setupapi/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 7f581bd..744ee4c 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1024,7 +1024,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD sty UnmapViewOfFile( buffer ); if (err) { - free_inf_file( file ); + if (file) free_inf_file( file ); SetLastError( err ); file = NULL; }

1 0

Paul Vriens : wined3d: Fix use of memset (Coccinelle).
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: c8681f885d18e77ae227768e69a05e7369d45b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8681f885d18e77ae227768e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:18:23 2010 +0100 wined3d: Fix use of memset (Coccinelle). --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dbeb799..e8521bc 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1100,7 +1100,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(patch->has_texcoords) { vtxStride += 4 * sizeof(float); } - memset(&patch->strided, 0, sizeof(&patch->strided)); + memset(&patch->strided, 0, sizeof(patch->strided)); patch->strided.position.format = WINED3DFMT_R32G32B32_FLOAT; patch->strided.position.lpData = (BYTE *) patch->mem; patch->strided.position.dwStride = vtxStride;

1 0

Marcus Meissner : winex11.drv: physDev cannot be NULL (Coverity).
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 065fa22adc39f2cd594ee5c8d9234d3a054af0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=065fa22adc39f2cd594ee5c8d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 18:58:55 2010 +0100 winex11.drv: physDev cannot be NULL (Coverity). --- dlls/winex11.drv/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 81bb73b..a02501f 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -881,7 +881,7 @@ static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { WORD index = 0; - HPALETTE hPal = physDev ? GetCurrentObject(physDev->hdc, OBJ_PAL ) : GetStockObject(DEFAULT_PALETTE); + HPALETTE hPal = GetCurrentObject(physDev->hdc, OBJ_PAL ); unsigned char spec_type = color >> 24; int *mapping = palette_get_mapping( hPal ); PALETTEENTRY entry;

1 0

James Hawkins : cabinet: Fix several file list leaks in the extract tests.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 300cc0fea1ab3570a673c701c1f4662621968d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=300cc0fea1ab3570a673c701c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:27:05 2010 -0800 cabinet: Fix several file list leaks in the extract tests. --- dlls/cabinet/tests/extract.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index c0a0c92..76bd7b7 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -329,6 +329,26 @@ static BOOL check_list(struct FILELIST **node, const char *filename, BOOL do_ext return TRUE; } +static void free_file_node(struct FILELIST *node) +{ + HeapFree(GetProcessHeap(), 0, node->FileName); + HeapFree(GetProcessHeap(), 0, node); +} + +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } + + session->FileList = NULL; +} + static void test_Extract(void) { SESSION session; @@ -370,6 +390,7 @@ static void test_Extract(void) ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* try fill file list operation */ ZeroMemory(&session, sizeof(SESSION)); @@ -454,7 +475,10 @@ static void test_Extract(void) ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); /* remove two of the files in the list */ + node = session.FileList->next; session.FileList->next = session.FileList->next->next; + free_file_node(node); + free_file_node(session.FileList->next->next); session.FileList->next->next = NULL; session.FilterList = NULL; CreateDirectoryA("dest", NULL); @@ -482,6 +506,7 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); session.Operation = EXTRACT_FILLFILELIST; session.FileList = NULL; @@ -564,6 +589,7 @@ static void test_Extract(void) ok(check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(check_list(&node, "a.txt", FALSE), "list entry wrong\n"); + free_file_list(&session); /* cabinet does not exist */ ZeroMemory(&session, sizeof(SESSION)); @@ -593,6 +619,7 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); /* first file exists */ createTestFile("dest\\a.txt"); @@ -631,6 +658,7 @@ static void test_Extract(void) ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); } ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); + free_file_list(&session); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); @@ -670,7 +698,8 @@ static void test_Extract(void) ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); - ok(check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n"); + free_file_list(&session); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\testdir\\c.txt");

1 0