February 2011 - Wine-Commits

Alexandre Julliard : cabarc: Add support for listing and extracting cabinets.
by Alexandre Julliard Feb. 3, 2011

Feb. 3, 2011

Module: wine Branch: master Commit: 8ebff12b0513efd541b459ed3858452a0f5c9fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebff12b0513efd541b459ed3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 22:48:40 2011 +0100 cabarc: Add support for listing and extracting cabinets. --- programs/cabarc/cabarc.c | 204 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 200 insertions(+), 4 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 5a10d21..2aeb88e 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -69,6 +69,7 @@ static int opt_recurse; static int opt_preserve_paths; static int opt_reserve_space; static int opt_verbose; +static WCHAR *opt_dest_dir; static WCHAR **opt_files; static void * CDECL cab_alloc( ULONG size ) @@ -258,6 +259,194 @@ static INT_PTR CDECL fci_get_open_info( char *name, USHORT *date, USHORT *time, return (INT_PTR)handle; } +static INT_PTR CDECL fdi_open( char *file, int oflag, int pmode ) +{ + int err; + return fci_open( file, oflag, pmode, &err, NULL ); +} + +static UINT CDECL fdi_read( INT_PTR hf, void *pv, UINT cb ) +{ + int err; + return fci_read( hf, pv, cb, &err, NULL ); +} + +static UINT CDECL fdi_write( INT_PTR hf, void *pv, UINT cb ) +{ + int err; + return fci_write( hf, pv, cb, &err, NULL ); +} + +static int CDECL fdi_close( INT_PTR hf ) +{ + int err; + return fci_close( hf, &err, NULL ); +} + +static LONG CDECL fdi_lseek( INT_PTR hf, LONG dist, int whence ) +{ + int err; + return fci_lseek( hf, dist, whence, &err, NULL ); +} + + +/* create directories leading to a given file */ +static void create_directories( const WCHAR *name ) +{ + WCHAR *path, *p; + + /* create the directory/directories */ + path = cab_alloc( (strlenW(name) + 1) * sizeof(WCHAR) ); + strcpyW(path, name); + + p = strchrW(path, '\\'); + while (p != NULL) + { + *p = 0; + if (!CreateDirectoryW( path, NULL )) + WINE_TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); + *p = '\\'; + p = strchrW(p+1, '\\'); + } + cab_free( path ); +} + +/* check if file name matches against one of the files specification */ +static BOOL match_files( const WCHAR *name ) +{ + int i; + + if (!*opt_files) return TRUE; + for (i = 0; opt_files[i]; i++) + { + unsigned int len = strlenW( opt_files[i] ); + /* FIXME: do smarter matching, and wildcards */ + if (!len) continue; + if (strncmpiW( name, opt_files[i], len )) continue; + if (opt_files[i][len - 1] == '\\' || !name[len] || name[len] == '\\') return TRUE; + } + return FALSE; +} + +static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin ) +{ + WCHAR *nameW; + + switch (fdint) + { + case fdintCABINET_INFO: + return 0; + case fdintCOPY_FILE: + nameW = strdupAtoW( (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP, pfdin->psz1 ); + if (match_files( nameW )) + { + char *nameU = strdupWtoA( CP_UNIXCP, nameW ); + if (opt_verbose) + { + char attrs[] = "rxash"; + if (!(pfdin->attribs & _A_RDONLY)) attrs[0] = '-'; + if (!(pfdin->attribs & _A_EXEC)) attrs[1] = '-'; + if (!(pfdin->attribs & _A_ARCH)) attrs[2] = '-'; + if (!(pfdin->attribs & _A_SYSTEM)) attrs[3] = '-'; + if (!(pfdin->attribs & _A_HIDDEN)) attrs[4] = '-'; + printf( " %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, + (pfdin->date >> 9) + 1980, (pfdin->date >> 5) & 0x0f, pfdin->date & 0x1f, + pfdin->time >> 11, (pfdin->time >> 5) & 0x3f, (pfdin->time & 0x1f) * 2 ); + } + printf( "%s\n", nameU ); + cab_free( nameU ); + } + cab_free( nameW ); + return 0; + default: + WINE_FIXME( "Unexpected notification type %d.\n", fdint ); + return 0; + } +} + +static int list_cabinet( char *cab_dir, char *cab_file ) +{ + ERF erf; + int ret = 0; + HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, + fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); + + if (!FDICopy( fdi, cab_file, cab_dir, 0, list_notify, NULL, NULL )) ret = GetLastError(); + FDIDestroy( fdi ); + return ret; +} + +static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin ) +{ + WCHAR *file, *nameW, *path = NULL; + INT_PTR ret; + + switch (fdint) + { + case fdintCABINET_INFO: + return 0; + + case fdintCOPY_FILE: + nameW = strdupAtoW( (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP, pfdin->psz1 ); + if (opt_preserve_paths) + { + file = nameW; + while (*file == '\\') file++; /* remove leading backslashes */ + } + else + { + if ((file = strrchrW( nameW, '\\' ))) file++; + else file = nameW; + } + + if (opt_dest_dir) + { + path = cab_alloc( (strlenW(opt_dest_dir) + strlenW(file) + 1) * sizeof(WCHAR) ); + strcpyW( path, opt_dest_dir ); + strcatW( path, file ); + } + else path = file; + + if (match_files( file )) + { + if (opt_verbose) + { + char *nameU = strdupWtoA( CP_UNIXCP, path ); + printf( "extracting %s\n", nameU ); + cab_free( nameU ); + } + create_directories( path ); + /* FIXME: check for existing file and overwrite mode */ + ret = (INT_PTR)CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + } + else ret = 0; + + cab_free( nameW ); + if (path != file) cab_free( path ); + return ret; + + case fdintCLOSE_FILE_INFO: + CloseHandle( (HANDLE)pfdin->hf ); + return 0; + + default: + WINE_FIXME( "Unexpected notification type %d.\n", fdint ); + return 0; + } +} + +static int extract_cabinet( char *cab_dir, char *cab_file ) +{ + ERF erf; + int ret = 0; + HFDI fdi = FDICreate( cab_alloc, cab_free, fdi_open, fdi_read, + fdi_write, fdi_close, fdi_lseek, cpuUNKNOWN, &erf ); + + if (!FDICopy( fdi, cab_file, cab_dir, 0, extract_notify, NULL, NULL )) ret = GetLastError(); + FDIDestroy( fdi ); + return ret; +} static BOOL add_file( HFCI fci, WCHAR *name ) { @@ -468,15 +657,22 @@ int wmain( int argc, WCHAR *argv[] ) { case 'l': case 'L': - WINE_FIXME( "list not implemented\n" ); - return 1; + return list_cabinet( buffer, file_part ); case 'n': case 'N': return new_cabinet( buffer, file_part ); case 'x': case 'X': - WINE_FIXME( "extraction not implemented\n" ); - return 1; + if (argc > 1) /* check for destination dir as last argument */ + { + WCHAR *last = argv[argc - 1]; + if (last[0] && last[strlenW(last) - 1] == '\\') + { + opt_dest_dir = last; + argv[--argc] = NULL; + } + } + return extract_cabinet( buffer, file_part ); default: usage(); return 1;

1 0

Alexandre Julliard : cabarc: Initial version of the cabarc.exe tool, with support for creating a cabinet.
by Alexandre Julliard Feb. 3, 2011

Feb. 3, 2011

Module: wine Branch: master Commit: 30bdbedc2dc2628c1d8b23f2204027c8aea69d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bdbedc2dc2628c1d8b23f22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 22:44:47 2011 +0100 cabarc: Initial version of the cabarc.exe tool, with support for creating a cabinet. --- configure | 1 + configure.ac | 1 + programs/cabarc/Makefile.in | 8 + programs/cabarc/cabarc.c | 484 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 494 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30bdbedc2dc2628c1d8b2…

1 0

Henri Verbeet : wined3d: Remove COM from the vertex declaration.
by Alexandre Julliard Feb. 3, 2011

Feb. 3, 2011

Module: wine Branch: master Commit: 5765632d9fee3e2acd268a3d1642779f420767ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5765632d9fee3e2acd268a3d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 2 20:22:50 2011 +0100 wined3d: Remove COM from the vertex declaration. --- dlls/d3d10core/Makefile.in | 2 +- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/inputlayout.c | 4 +- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 6 ++-- dlls/d3d8/vertexdeclaration.c | 4 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 6 ++-- dlls/d3d9/vertexdeclaration.c | 4 +- dlls/ddraw/ddraw.c | 13 +++---- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/surface.c | 4 +- dlls/ddraw/vertexbuffer.c | 4 +- dlls/wined3d/device.c | 10 ++++-- dlls/wined3d/stateblock.c | 6 ++-- dlls/wined3d/vertexdeclaration.c | 68 ++++++++++------------------------- dlls/wined3d/wined3d.spec | 8 +++- dlls/wined3d/wined3d_private.h | 16 +++----- include/wine/wined3d.idl | 24 +++++------- 19 files changed, 81 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5765632d9fee3e2acd268…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DVertexDeclaration typedefs.
by Alexandre Julliard Feb. 3, 2011

Feb. 3, 2011

Module: wine Branch: master Commit: fe3cfb3e8ef85ee299bcf723bcb1cbbac220c27e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3cfb3e8ef85ee299bcf723b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 2 20:22:51 2011 +0100 wined3d: Get rid of the IWineD3DVertexDeclaration typedefs. --- dlls/wined3d/device.c | 37 +++++++++++++++++++++---------------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 8 +++----- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74023e1..4a1aa62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -177,7 +177,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) { /* We need to deal with frequency data! */ - IWineD3DVertexDeclarationImpl *declaration = This->stateBlock->state.vertex_declaration; + struct wined3d_vertex_declaration *declaration = This->stateBlock->state.vertex_declaration; unsigned int i; stream_info->use_map = 0; @@ -1325,14 +1325,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, U static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice *iface, const WINED3DVERTEXELEMENT *elements, UINT element_count, void *parent, - const struct wined3d_parent_ops *parent_ops, IWineD3DVertexDeclaration **declaration) + const struct wined3d_parent_ops *parent_ops, struct wined3d_vertex_declaration **declaration) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVertexDeclarationImpl *object = NULL; + struct wined3d_vertex_declaration *object; HRESULT hr; - TRACE("iface %p, declaration %p, parent %p, elements %p, element_count %u.\n", - iface, declaration, parent, elements, element_count); + TRACE("iface %p, elements %p, element_count %u, parent %p, parent_ops %p, declaration %p.\n", + iface, elements, element_count, parent, parent_ops, declaration); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if(!object) @@ -1350,7 +1350,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice } TRACE("Created vertex declaration %p.\n", object); - *declaration = (IWineD3DVertexDeclaration *)object; + *declaration = object; return WINED3D_OK; } @@ -1494,14 +1494,15 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3DDevice *iface, DWORD fvf, void *parent, const struct wined3d_parent_ops *parent_ops, - IWineD3DVertexDeclaration **declaration) + struct wined3d_vertex_declaration **declaration) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; WINED3DVERTEXELEMENT *elements; unsigned int size; DWORD hr; - TRACE("iface %p, declaration %p, parent %p, fvf %#x.\n", iface, declaration, parent, fvf); + TRACE("iface %p, fvf %#x, parent %p, parent_ops %p, declaration %p.\n", + iface, fvf, parent, parent_ops, declaration); size = ConvertFvfToDeclaration(This, fvf, &elements); if (size == ~0U) return E_OUTOFMEMORY; @@ -3290,18 +3291,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, R return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration* pDecl) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice *iface, + struct wined3d_vertex_declaration *pDecl) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DVertexDeclaration *oldDecl = (IWineD3DVertexDeclaration *)This->updateStateBlock->state.vertex_declaration; + struct wined3d_vertex_declaration *oldDecl = This->updateStateBlock->state.vertex_declaration; - TRACE("(%p) : pDecl=%p\n", This, pDecl); + TRACE("iface %p, declaration %p.\n", iface, pDecl); if (pDecl) wined3d_vertex_declaration_incref(pDecl); if (oldDecl) wined3d_vertex_declaration_decref(oldDecl); - This->updateStateBlock->state.vertex_declaration = (IWineD3DVertexDeclarationImpl *)pDecl; + This->updateStateBlock->state.vertex_declaration = pDecl; This->updateStateBlock->changed.vertexDecl = TRUE; if (This->isRecordingState) { @@ -3317,12 +3320,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* if return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppDecl) { +static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexDeclaration(IWineD3DDevice *iface, + struct wined3d_vertex_declaration **ppDecl) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : ppDecl=%p\n", This, ppDecl); + TRACE("iface %p, declaration %p.\n", iface, ppDecl); - *ppDecl = (IWineD3DVertexDeclaration *)This->stateBlock->state.vertex_declaration; + *ppDecl = This->stateBlock->state.vertex_declaration; if (*ppDecl) wined3d_vertex_declaration_incref(*ppDecl); @@ -4266,7 +4271,7 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn /* Do not call while under the GL lock. */ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, - UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD flags, + UINT VertexCount, IWineD3DBuffer *pDestBuffer, struct wined3d_vertex_declaration *pVertexDecl, DWORD flags, DWORD DestFVF) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 170b11e..bc5cf79 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -991,7 +991,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration) { - IWineD3DDevice_SetVertexDeclaration(device, (IWineD3DVertexDeclaration *)stateblock->state.vertex_declaration); + IWineD3DDevice_SetVertexDeclaration(device, stateblock->state.vertex_declaration); } if (stateblock->changed.material) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9b04e5e..ef10523 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -157,7 +157,7 @@ static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element) } } -HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *declaration, IWineD3DDeviceImpl *device, +HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declaration, IWineD3DDeviceImpl *device, const WINED3DVERTEXELEMENT *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7fb3571..2465ba3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -59,8 +59,6 @@ typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; struct IWineD3DResourceImpl; -typedef struct wined3d_vertex_declaration IWineD3DVertexDeclaration; -typedef struct wined3d_vertex_declaration IWineD3DVertexDeclarationImpl; /* Texture format fixups */ @@ -2326,8 +2324,8 @@ struct wined3d_vertex_declaration BOOL half_float_conv_needed; }; -HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *declaration, IWineD3DDeviceImpl *device, - const WINED3DVERTEXELEMENT *elements, UINT element_count, +HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declaration, + IWineD3DDeviceImpl *device, const WINED3DVERTEXELEMENT *elements, UINT element_count, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; /* Internal state Block for Begin/End/Capture/Create/Apply info */ @@ -2375,7 +2373,7 @@ struct wined3d_stream_state struct wined3d_state { - IWineD3DVertexDeclarationImpl *vertex_declaration; + struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; BOOL user_stream; struct wined3d_buffer *index_buffer;

1 0

Iain Arnell : gdiplus: Qualify reference to Gdiplus::Pixelformat.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: 9d7277df7a5a9fb3cb548f8d29413126aeaad30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7277df7a5a9fb3cb548f8d2… Author: Iain Arnell <iarnell(a)gmail.com> Date: Wed Feb 2 10:20:31 2011 +0100 gdiplus: Qualify reference to Gdiplus::Pixelformat. --- include/gdiplusimaging.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 42a00cb..7c199c3 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -110,7 +110,7 @@ public: UINT Width; UINT Height; INT Stride; - PixelFormat PixelFormat; + Gdiplus::PixelFormat PixelFormat; VOID* Scan0; UINT_PTR Reserved; };

1 0

Alexandre Julliard : setupapi: Fix access rights for cabinet creation.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: fcf8e164c3772d7e10df9829c6ff622127b7f3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf8e164c3772d7e10df9829c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 18:11:36 2011 +0100 setupapi: Fix access rights for cabinet creation. --- dlls/setupapi/setupcab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 4a54ae4..77f2b59 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -149,7 +149,7 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) ioflag |= GENERIC_WRITE; break; case _O_RDWR: - ioflag |= GENERIC_READ & GENERIC_WRITE; + ioflag |= GENERIC_READ | GENERIC_WRITE; break; case _O_WRONLY | _O_RDWR: /* hmmm.. */ ERR("_O_WRONLY & _O_RDWR in oflag?\n");

1 0

Hans Leidekker : msi: Try harder to remove non-persistent directories.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: 181beef870f0a76880b23f687c2bcf98456c18b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181beef870f0a76880b23f687… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 2 13:00:59 2011 +0100 msi: Try harder to remove non-persistent directories. --- dlls/msi/files.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index a044ec7..2ad7874 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -986,6 +986,33 @@ done: return ret; } +static BOOL has_persistent_dir( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + MSIQUERY *view; + UINT r = ERROR_FUNCTION_FAILED; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','r','e','a','t','e','F','o','l','d','e','r','`',' ','W','H','E','R','E',' ', + '`','C','o','m','p','o','n','e','n','t','_','`',' ','=','\'','%','s','\'',' ','A','N','D',' ', + '`','D','i','r','e','c','t','o','r','y','_','`',' ','=','\'','%','s','\'',0}; + + if (!MSI_OpenQuery( package->db, &view, query, comp->Component, comp->Directory )) + { + if (!MSI_ViewExecute( view, NULL )) + { + MSIRECORD *rec; + if (!(r = MSI_ViewFetch( view, &rec ))) + { + TRACE("directory %s is persistent\n", debugstr_w(comp->Directory)); + msiobj_release( &rec->hdr ); + } + } + msiobj_release( &view->hdr ); + } + return (r == ERROR_SUCCESS); +} + UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { MSIQUERY *view; @@ -995,9 +1022,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','R','e','m','o','v','e','F','i','l','e','`',0}; - static const WCHAR folder_query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','C','r','e','a','t','e','F','o','l','d','e','r','`',0}; r = MSI_DatabaseOpenViewW(package->db, query, &view); if (r == ERROR_SUCCESS) @@ -1006,10 +1030,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msiobj_release(&view->hdr); } - r = MSI_DatabaseOpenViewW(package->db, folder_query, &view); - if (r == ERROR_SUCCESS) - msiobj_release(&view->hdr); - LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { MSIRECORD *uirow; @@ -1054,12 +1074,14 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } - /* FIXME: check persistence for each directory */ - else if (r && (dir = strdupW( file->TargetPath ))) + else if (!has_persistent_dir( package, file->Component )) { - if ((p = strrchrW( dir, '\\' ))) *p = 0; - RemoveDirectoryW( dir ); - msi_free( dir ); + if ((dir = strdupW( file->TargetPath ))) + { + if ((p = strrchrW( dir, '\\' ))) *p = 0; + RemoveDirectoryW( dir ); + msi_free( dir ); + } } file->state = msifs_missing;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put_borderTopColor.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: 63fe5d848918969bdcd027dc071681cb32ed7239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fe5d848918969bdcd027dc0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 27 16:07:45 2011 +1100 mshtml: Implement IHTMLStyle put_borderTopColor. --- dlls/mshtml/htmlstyle.c | 12 +++++++++--- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7ca763f..3a976cd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -351,8 +351,12 @@ HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, static const WCHAR format[] = {'%','d',0}; static const WCHAR px_format[] = {'%','d','p','x',0}; + static const WCHAR hex_format[] = {'#','%','0','6','x',0}; - wsprintfW(str, flags&ATTR_FIX_PX ? px_format : format, V_I4(value)); + if(flags & ATTR_HEX_INT) + wsprintfW(str, hex_format, V_I4(value)); + else + wsprintfW(str, flags&ATTR_FIX_PX ? px_format : format, V_I4(value)); return set_nsstyle_attr(nsstyle, sid, str, flags & ~ATTR_FIX_PX); } default: @@ -1537,8 +1541,10 @@ static HRESULT WINAPI HTMLStyle_get_borderColor(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_borderTopColor(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 044718b..ea4ece3 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -108,3 +108,4 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, #define ATTR_FIX_PX 1 #define ATTR_FIX_URL 2 #define ATTR_STR_TO_INT 4 +#define ATTR_HEX_INT 8 diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c883a70..9cc25a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5443,6 +5443,24 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_letterSpacing: %08x\n", hres); VariantClear(&vDefault); + /* borderTopColor */ + hres = IHTMLStyle_get_borderTopColor(style, &vDefault); + ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("red"); + hres = IHTMLStyle_put_borderTopColor(style, v); + ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderTopColor(style, &v); + ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "expecte red = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderTopColor(style, vDefault); + ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Vitaliy Margolen : dinput: Ignore EV_MSC events instead of printing fixme.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: 670d54a6379bf5542fc8d00ef386482247e09649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670d54a6379bf5542fc8d00ef… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Feb 1 21:02:14 2011 -0700 dinput: Ignore EV_MSC events instead of printing fixme. --- dlls/dinput/joystick_linuxinput.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 7e70912..9b0c52c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -840,6 +840,11 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) /* there is nothing to do */ break; #endif +#ifdef EV_MSC + case EV_MSC: + /* Ignore */ + break; +#endif default: FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); break;

1 0

Huw Davies : widl: Initialise [out] only parameters if they are user types or interface pointers.
by Alexandre Julliard Feb. 2, 2011

Feb. 2, 2011

Module: wine Branch: master Commit: 5ae2b0f219cb5aed2bdf32746a57a699a32767a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae2b0f219cb5aed2bdf32746… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 2 12:16:29 2011 +0000 widl: Initialise [out] only parameters if they are user types or interface pointers. --- tools/widl/typegen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 244baea..32a0b16 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4055,12 +4055,15 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char case TGT_ENUM: case TGT_POINTER: case TGT_RANGE: + case TGT_IFACE_POINTER: print_file(file, indent, "%s_W%u = 0;\n", local_var_prefix, i); break; + case TGT_USER_TYPE: + print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", + local_var_prefix, i, local_var_prefix, i); + break; case TGT_STRUCT: case TGT_UNION: - case TGT_USER_TYPE: - case TGT_IFACE_POINTER: case TGT_ARRAY: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER:

1 0