April 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : cabinet: Make sure we don' t try to close an invalid file handle.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: a14920e50fc82f832ff75c27e53ec87defe0d000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14920e50fc82f832ff75c27e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 26 14:25:42 2007 +0200 cabinet: Make sure we don't try to close an invalid file handle. --- dlls/cabinet/fdi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index cb58949..c4278de 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2690,6 +2690,7 @@ BOOL __cdecl FDICopy( PFDI_INT(hfdi)->perf->erfOper = FDIERROR_USER_ABORT; PFDI_INT(hfdi)->perf->erfType = 0; PFDI_INT(hfdi)->perf->fError = TRUE; + filehf = 0; goto bail_and_fail; } }

1 0

Stefan Dösinger : wined3d: Do not allocate surfaces unless needed.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 61d1abb1c17a4e8918ff0b685573e4af9235ac95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d1abb1c17a4e8918ff0b685… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 22 02:02:29 2007 +0200 wined3d: Do not allocate surfaces unless needed. --- dlls/wined3d/surface.c | 20 ++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4067ac8..909ee84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -236,6 +236,8 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); } LEAVE_GL(); + + This->Flags |= SFLAG_ALLOCATED; } /* In D3D the depth stencil dimensions have to be greater than or equal to the @@ -556,6 +558,7 @@ void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT te } This->glDescription.textureName = textureName; This->glDescription.target = target; + This->Flags &= ~SFLAG_ALLOCATED; } void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) { @@ -1903,8 +1906,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { glReadBuffer(This->resource.wineD3DDevice->offscreenBuffer); vcheckGLcall("glReadBuffer"); - surface_allocate_surface(This, internal, This->pow2Width, - This->pow2Height, format, type); + if(!(This->Flags & SFLAG_ALLOCATED)) { + surface_allocate_surface(This, internal, This->pow2Width, + This->pow2Height, format, type); + } glCopyTexSubImage2D(This->glDescription.target, This->glDescription.level, @@ -1969,7 +1974,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { if ((This->Flags & SFLAG_NONPOW2) && !(This->Flags & SFLAG_OVERSIZE)) { TRACE("non power of two support\n"); - surface_allocate_surface(This, internal, This->pow2Width, This->pow2Height, format, type); + if(!(This->Flags & SFLAG_ALLOCATED)) { + surface_allocate_surface(This, internal, This->pow2Width, This->pow2Height, format, type); + } if (mem) { surface_upload_data(This, This->currentDesc.Width, This->currentDesc.Height, format, type, mem); } @@ -1977,7 +1984,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { /* When making the realloc conditional, keep in mind that GL_APPLE_client_storage may be in use, and This->resource.allocatedMemory * changed. So also keep track of memory changes. In this case the texture has to be reallocated */ - surface_allocate_surface(This, internal, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, format, type); + if(!(This->Flags & SFLAG_ALLOCATED)) { + surface_allocate_surface(This, internal, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, format, type); + } if (mem) { surface_upload_data(This, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, format, type, mem); } @@ -2241,6 +2250,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM } This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; + This->Flags &= ~SFLAG_ALLOCATED; This->resource.format = format; @@ -2291,6 +2301,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { /* For client textures opengl has to be notified */ if(This->Flags & SFLAG_CLIENT) { + This->Flags &= ~SFLAG_ALLOCATED; IWineD3DSurface_PreLoad(iface); /* And hope that the app behaves correctly and did not free the old surface memory before setting a new pointer */ } @@ -2303,6 +2314,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { This->Flags &= ~SFLAG_USERPTR; if(This->Flags & SFLAG_CLIENT) { + This->Flags &= ~SFLAG_ALLOCATED; /* This respecifies an empty texture and opengl knows that the old memory is gone */ IWineD3DSurface_PreLoad(iface); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 88174ca..0ae11f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1131,6 +1131,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *S #define SFLAG_USERPTR 0x00004000 /* The application allocated the memory for this surface */ #define SFLAG_GLCKEY 0x00008000 /* The gl texture was created with a color key */ #define SFLAG_CLIENT 0x00010000 /* GL_APPLE_client_storage is used on that texture */ +#define SFLAG_ALLOCATED 0x00020000 /* A gl texture is allocated for this surface */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Alexandre Julliard : winedbg: Properly handle EOF on input.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 55a57c21306577c3ec82b8d638f19819602cfdb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a57c21306577c3ec82b8d63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 26 14:25:32 2007 +0200 winedbg: Properly handle EOF on input. --- programs/winedbg/dbg.y | 7 ++++--- programs/winedbg/debug.l | 7 ++++--- programs/winedbg/symbol.c | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index aea48bd..4679986 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -472,7 +472,8 @@ int input_fetch_entire_line(const char* pfx, char** line) do { if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0) - break; + return -1; + if (len + 2 > alloc) { while (len + 2 > alloc) alloc *= 2; @@ -489,9 +490,9 @@ int input_fetch_entire_line(const char* pfx, char** line) int input_read_line(const char* pfx, char* buf, int size) { char* line = NULL; - size_t len = 0; - len = input_fetch_entire_line(pfx, &line); + int len = input_fetch_entire_line(pfx, &line); + if (len < 0) return 0; /* remove trailing \n */ if (len > 0 && line[len - 1] == '\n') len--; len = min(size - 1, len); diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 6be0f4c..d3b3b36 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -33,9 +33,9 @@ static int read_input(const char* pfx, char* buf, int size) { - size_t len; -static char* last_line = NULL; -static size_t last_line_idx = 0; + int len; + static char* last_line = NULL; + static size_t last_line_idx = 0; /* try first to fetch the remaining of an existing line */ if (last_line_idx == 0) @@ -44,6 +44,7 @@ static size_t last_line_idx = 0; /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ lexeme_flush(); len = input_fetch_entire_line(pfx, &tmp); + if (len < 0) return 0; /* eof */ /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 15e7093..d33e9e8 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -360,6 +360,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, if (i < 1 || i > sgv.num) dbg_printf("Invalid choice %d\n", i); } + else return sglv_aborted; } while (i < 1 || i > sgv.num); /* The array is 0-based, but the choices are 1..n,

1 0

Paul Vriens : kernel32/tests: Resource functions are not implemented on win98.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 87e82043658ce1124ce6e48a795e2a9ce5cdaa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e82043658ce1124ce6e48a7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 26 10:08:10 2007 +0200 kernel32/tests: Resource functions are not implemented on win98. --- dlls/kernel32/tests/resource.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index ee83203..f0c2e3e 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const char filename[] = "test_.exe"; +static DWORD GLE; static int build_exe( void ) { @@ -107,7 +108,9 @@ static void update_missing_exe( void ) { HANDLE res; + SetLastError(0xdeadbeef); res = BeginUpdateResource( filename, TRUE ); + GLE = GetLastError(); ok( res == NULL, "BeginUpdateResource should fail\n"); } @@ -264,6 +267,13 @@ START_TEST(resource) { DeleteFile( filename ); update_missing_exe(); + + if (GLE == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("Resource calls are not implemented\n"); + return; + } + update_empty_exe(); build_exe(); update_resources_none();

1 0

Hans Leidekker : expand.exe: Add support for cabinet files.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 3d2670ea3215cfd0b827b62b284e0fe4034df2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2670ea3215cfd0b827b62b2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 25 20:50:13 2007 +0200 expand.exe: Add support for cabinet files. --- programs/expand/Makefile.in | 2 +- programs/expand/expand.c | 117 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 95 insertions(+), 24 deletions(-) diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in index ac35d43..7e4f982 100644 --- a/programs/expand/Makefile.in +++ b/programs/expand/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = expand.exe APPMODE = -mconsole -IMPORTS = lz32 kernel32 +IMPORTS = setupapi kernel32 C_SRCS = expand.c diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 9f2af8e..6022fe2 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -1,6 +1,7 @@ /* * Copyright 1997 Victor Schneider * Copyright 2002 Alexandre Julliard + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,30 +24,100 @@ #include <string.h> #include <windows.h> #include <lzexpand.h> +#include <setupapi.h> + +static UINT CALLBACK extract_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPCSTR targetname = context; + + strcpy( info->FullTargetName, targetname ); + return FILEOP_DOIT; + } + default: return NO_ERROR; + } +} int main(int argc, char *argv[]) { - OFSTRUCT SourceOpenStruct1, SourceOpenStruct2; - LONG ret; - HFILE hSourceFile, hDestFile; - - if (argc < 2) - { - fprintf( stderr, "Usage: %s infile [outfile]\n", argv[0] ); - return 1; - } - hSourceFile = LZOpenFile(argv[1], &SourceOpenStruct1, OF_READ); - if (argv[2]) - hDestFile = LZOpenFile(argv[2], &SourceOpenStruct2, OF_CREATE | OF_WRITE); - else - { - char OriginalName[MAX_PATH]; - GetExpandedName(argv[1], OriginalName); - hDestFile = LZOpenFile(OriginalName, &SourceOpenStruct2, OF_CREATE | OF_WRITE); - } - ret = LZCopy(hSourceFile, hDestFile); - LZClose(hSourceFile); - LZClose(hDestFile); - if (ret <= 0) fprintf(stderr,"LZCopy failed: return is %d\n",ret); - return (ret <= 0); + int ret = 0; + char infile[MAX_PATH], outfile[MAX_PATH], actual_name[MAX_PATH]; + UINT comp; + + if (argc < 3) + { + fprintf( stderr, "Usage: %s infile outfile\n", argv[0] ); + return 1; + } + + GetFullPathNameA( argv[1], sizeof(infile), infile, NULL ); + GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); + + if (!lstrcmpiA( infile, outfile )) + { + fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + return 1; + } + if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) + { + fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + return 1; + } + + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + { + if (!SetupIterateCabinetA( infile, 0, extract_callback, (PVOID)outfile )) + { + fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); + return 1; + } + break; + } + case FILE_COMPRESSION_WINLZA: + { + INT hin, hout; + OFSTRUCT ofin, ofout; + LONG error; + + if ((hin = LZOpenFile( infile, &ofin, OF_READ )) < 0) + { + fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + return 1; + } + if ((hout = LZOpenFile( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) + { + LZClose( hin ); + fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); + return 1; + } + error = LZCopy( hin, hout ); + + LZClose( hin ); + LZClose( hout ); + + if (error < 0) + { + fprintf( stderr, "%s: LZCopy failed, error is %d\n", argv[0], error ); + return 1; + } + break; + } + default: + { + if (!CopyFileA( infile, outfile, FALSE )) + { + fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); + return 1; + } + break; + } + } + return ret; }

1 0

Andrew Talbot : dplayx: Fix a typo.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 2d9685db773afe8e8c2ead34e94bea802e5baaac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9685db773afe8e8c2ead34e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 25 21:41:14 2007 +0100 dplayx: Fix a typo. --- dlls/dplayx/dplayx_global.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 28b462b..13bf1e2 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -798,8 +798,8 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src ) /* Session names may or may not exist */ if( src->lpSessionDesc->u1.lpszSessionName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, dest->lpSessionDesc->u1.lpszSessionName ); - src->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace; + strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); + dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * ( strlenW( (LPWSTR)dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); }

1 0

Andrew Talbot : dnsapi: Constify some variables.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 275e104a57395c9e65051a415079ae21b7f811c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275e104a57395c9e65051a415… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 25 21:41:05 2007 +0100 dnsapi: Constify some variables. --- dlls/dnsapi/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 5d9d6db..1366b0b 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -199,7 +199,7 @@ static char *dns_str_from_rdata( const unsigned char *rdata ) return str; } -static unsigned int dns_get_record_size( ns_rr *rr ) +static unsigned int dns_get_record_size( const ns_rr *rr ) { const unsigned char *pos = rr->rdata; unsigned int num = 0, size = sizeof(DNS_RECORDA); @@ -250,7 +250,7 @@ static unsigned int dns_get_record_size( ns_rr *rr ) return size; } -static DNS_STATUS dns_copy_rdata( ns_msg msg, ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) +static DNS_STATUS dns_copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD *dlen ) { DNS_STATUS ret = ERROR_SUCCESS; const unsigned char *pos = rr->rdata; @@ -560,7 +560,7 @@ exit: /* The resolver lock must be held and res_init() must have been * called before calling these three functions. */ -static DNS_STATUS dns_set_serverlist( PIP4_ARRAY addrs ) +static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { unsigned int i;

1 0

Clinton Stimpson : riched20: Set modify state when removing text.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 552bc81f1ec7fc1a15d8c4e6304d1cb0ef42060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=552bc81f1ec7fc1a15d8c4e63… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Apr 25 16:54:53 2007 -0600 riched20: Set modify state when removing text. --- dlls/riched20/caret.c | 2 ++ dlls/riched20/tests/editor.c | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3f9547e..5f3259e 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -366,6 +366,8 @@ void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) { assert(nCursor>=0 && nCursor<editor->nCursors); + /* text operations set modified state */ + editor->nModifyStep = 1; ME_InternalDeleteText(editor, ME_GetCursorOfs(editor, nCursor), nChars); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4f95bfe..caf32f9 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1322,6 +1322,14 @@ static void test_EM_GETMODIFY(void) result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for WM_CHAR\n"); + + /* press del */ + SendMessage(hwndRichEdit, WM_CHAR, 'A', 0); + SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); + SendMessage(hwndRichEdit, WM_KEYDOWN, VK_BACK, 0); + result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); + ok (result != 0, + "EM_GETMODIFY returned zero, instead of non-zero for backspace\n"); /* set char format */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0);

1 0

Paul Vriens : setupapi/tests: SetupCopyOEMInfA is not available on NT4.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: 4b34ba65d99b7e04da6f7278a80982ffeaf490f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b34ba65d99b7e04da6f7278a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 26 10:07:19 2007 +0200 setupapi/tests: SetupCopyOEMInfA is not available on NT4. --- dlls/setupapi/tests/misc.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 9368540..e6beba5 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -43,6 +43,8 @@ static CHAR CURR_DIR[MAX_PATH]; */ static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); +static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); + static void append_str(char **str, const char *data) { @@ -112,21 +114,21 @@ static void test_SetupCopyOEMInf(void) /* try NULL SourceInfFileName */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(NULL, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* try empty SourceInfFileName */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA("nonexistent", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -135,7 +137,7 @@ static void test_SetupCopyOEMInf(void) lstrcpy(path, CURR_DIR); lstrcat(path, "\\nonexistent"); SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -144,7 +146,7 @@ static void test_SetupCopyOEMInf(void) memset(toolong, 'a', MAX_PATH * 2); toolong[MAX_PATH * 2 - 1] = '\0'; SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(toolong, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -154,7 +156,7 @@ static void test_SetupCopyOEMInf(void) /* try a relative SourceInfFileName */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -162,7 +164,7 @@ static void test_SetupCopyOEMInf(void) /* try SP_COPY_REPLACEONLY, dest does not exist */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); @@ -173,28 +175,28 @@ static void test_SetupCopyOEMInf(void) lstrcat(path, "\\"); lstrcat(path, tmpfile); SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); /* try SP_COPY_REPLACEONLY, dest exists */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_REPLACEONLY, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); /* try SP_COPY_NOOVERWRITE */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_EXISTS, "Expected ERROR_FILE_EXISTS, got %d\n", GetLastError()); /* get the DestinationInfFileName */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) != 0, "Expected a non-zero length string\n"); @@ -211,7 +213,7 @@ static void test_SetupCopyOEMInf(void) lstrcpy(dest, "aaa"); size = 0; SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, 5, &size, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -222,7 +224,7 @@ static void test_SetupCopyOEMInf(void) /* get the DestinationInfFileName and DestinationInfFileNameSize */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); @@ -233,7 +235,7 @@ static void test_SetupCopyOEMInf(void) /* get the DestinationInfFileName, DestinationInfFileNameSize, and DestinationInfFileNameComponent */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(lstrlen(dest) + 1 == size, "Expected sizes to match, got (%d, %d)\n", lstrlen(dest), size); @@ -244,7 +246,7 @@ static void test_SetupCopyOEMInf(void) /* try SP_COPY_DELETESOURCE */ SetLastError(0xdeadbeef); - res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); + res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!file_exists(path), "Expected source inf to not exist\n"); @@ -527,10 +529,15 @@ START_TEST(misc) HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); + pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - test_SetupCopyOEMInf(); + if (pSetupCopyOEMInfA) + test_SetupCopyOEMInf(); + else + skip("SetupCopyOEMInfA is not available\n"); + test_SetupGetFileCompressionInfo(); if (pSetupGetFileCompressionInfoExA)

1 0

Jacek Caban : hhctrl.ocx: Don' t insert content item that could not be merged.
by Alexandre Julliard April 26, 2007

April 26, 2007

Module: wine Branch: master Commit: b2aae66f1ab495480861f0e0b559739654d8f171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2aae66f1ab495480861f0e0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 15:37:36 2007 +0200 hhctrl.ocx: Don't insert content item that could not be merged. --- dlls/hhctrl.ocx/content.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index c572baf..a34c853 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -32,6 +32,24 @@ typedef enum { INSERT_CHILD } insert_type_t; +static void free_content_item(ContentItem *item) +{ + ContentItem *next; + + while(item) { + next = item->next; + + free_content_item(item->child); + + hhctrl_free(item->name); + hhctrl_free(item->local); + hhctrl_free(item->merge.chm_file); + hhctrl_free(item->merge.chm_index); + + item = next; + } +} + typedef struct { char *buf; int size; @@ -207,6 +225,9 @@ static ContentItem *insert_item(ContentItem *item, ContentItem *new_item, insert if(!item) return new_item; + if(!new_item) + return item; + switch(insert_type) { case INSERT_NEXT: item->next = new_item; @@ -265,6 +286,11 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content }else { WARN("Could not get %s::%s stream\n", debugstr_w(item->merge.chm_file), debugstr_w(item->merge.chm_file)); + + if(!item->name) { + free_content_item(item); + item = NULL; + } } } @@ -411,24 +437,6 @@ void InitContent(HHInfo *info) fill_content_tree(info->tabs[TAB_CONTENTS].hwnd, NULL, info->content); } -static void free_content_item(ContentItem *item) -{ - ContentItem *next; - - while(item) { - next = item->next; - - free_content_item(item->child); - - hhctrl_free(item->name); - hhctrl_free(item->local); - hhctrl_free(item->merge.chm_file); - hhctrl_free(item->merge.chm_index); - - item = next; - } -} - void ReleaseContent(HHInfo *info) { free_content_item(info->content);

1 0