April 2013 - Wine-commits - list.winehq.org

Sergey Guralnik : extrac32: Create directory for extracted file if need.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 7925c9b0287e1fe28108afe879d454b18681369b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7925c9b0287e1fe28108afe87… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Apr 11 10:45:58 2013 +0300 extrac32: Create directory for extracted file if need. --- programs/extrac32/extrac32.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 111d2a7..644f885 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -23,6 +23,7 @@ #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> +#include <shlobj.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -31,6 +32,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(extrac32); static BOOL force_mode; +static void create_target_directory(LPWSTR Target) +{ + WCHAR dir[MAX_PATH]; + int res; + + strcpyW(dir, Target); + *PathFindFileNameW(dir) = 0; /* Truncate file name */ + if(!PathIsDirectoryW(dir)) + { + res = SHCreateDirectoryExW(NULL, dir, NULL); + if(res != ERROR_SUCCESS && res != ERROR_ALREADY_EXISTS) + WINE_ERR("Can't create directory: %s\n", wine_dbgstr_w(dir)); + } +} + static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { FILE_IN_CABINET_INFO_W *pInfo; @@ -42,6 +58,9 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par pInfo = (FILE_IN_CABINET_INFO_W*)Param1; lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context); lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet); + /* SetupIterateCabinet() doesn't create full path to target by itself, + so we should do it manually */ + create_target_directory(pInfo->FullTargetName); return FILEOP_DOIT; case SPFILENOTIFY_FILEEXTRACTED: pFilePaths = (FILEPATHS_W*)Param1;

1 0

Sergey Guralnik : extrac32: Avoid appending redundant backslash to path end .
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 80bc3838a73aa057624880758d81e476a58e1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bc3838a73aa057624880758… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Thu Apr 11 10:54:02 2013 +0300 extrac32: Avoid appending redundant backslash to path end. --- programs/extrac32/extrac32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 644f885..2126c04 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -200,7 +200,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho int i; WCHAR check, cmd = 0; WCHAR path[MAX_PATH]; - WCHAR backslash[] = {'\\',0}; LPCWSTR cabfile = NULL; path[0] = 0; @@ -273,7 +272,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); - lstrcatW(path, backslash); + PathAddBackslashW(path); /* Execute the specified command */ switch(cmd)

1 0

Matteo Bruni : wined3d: Use 0 as GL internal format for WINED3DFMT_NULL.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 3e564b1e935ccc39699094903e1666831a70f8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e564b1e935ccc39699094903… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 11 16:34:30 2013 +0200 wined3d: Use 0 as GL internal format for WINED3DFMT_NULL. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d7cec9b..da8fc7b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -925,7 +925,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, ARB_FRAMEBUFFER_OBJECT, NULL}, - {WINED3DFMT_NULL, GL_RGBA8, GL_RGBA8, 0, + {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_FRAMEBUFFER_OBJECT, NULL},

1 0

Matteo Bruni : winex11.drv: Fix attributes conversion in wglCreateContextAttribsARB().
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 6118676c20b2a63cc1fe3597f02c28b4dbc617ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6118676c20b2a63cc1fe3597f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 11 16:34:31 2013 +0200 winex11.drv: Fix attributes conversion in wglCreateContextAttribsARB(). --- dlls/winex11.drv/opengl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bb3b366..2313eca 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1953,27 +1953,30 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg case WGL_CONTEXT_MAJOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_MINOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_LAYER_PLANE_ARB: break; case WGL_CONTEXT_FLAGS_ARB: pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } ret->numAttribs++; attribList += 2; - pContextAttribList += 2; } }

1 0

Jonathan Liu : d3dcompiler.h: Fix typos.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 4936b8e5ec78b9538d08af139cdaf0db4e1f831b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4936b8e5ec78b9538d08af139… Author: Jonathan Liu <net147(a)gmail.com> Date: Thu Apr 11 21:47:24 2013 +1000 d3dcompiler.h: Fix typos. --- include/d3dcompiler.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 7ce83be..2dd0fcf 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -26,8 +26,8 @@ extern "C" { #endif #if defined(__GNUC__) -#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0}; -#elif defined(_MSV_VER) +#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0} +#elif defined(_MSC_VER) #define D3DCOMPILER_DLL_W L"d3dcompiler_43.dll" #else static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','3','.','d','l','l',0};

1 0

Jonathan Liu : d3dcompiler.h: Add function pointer typedefs.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: ff27c49d3c5560eb2adf15e889ab6f76cf689849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff27c49d3c5560eb2adf15e88… Author: Jonathan Liu <net147(a)gmail.com> Date: Thu Apr 11 21:47:28 2013 +1000 d3dcompiler.h: Add function pointer typedefs. --- include/d3dcompiler.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 2dd0fcf..4bbf53f 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -65,6 +65,9 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); +typedef HRESULT (WINAPI *pD3DCompile)(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); typedef enum D3DCOMPILER_STRIP_FLAGS { @@ -94,6 +97,8 @@ typedef enum D3D_BLOB_PART HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **disassembly); +typedef HRESULT (WINAPI *pD3DDisassemble)(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); @@ -107,6 +112,9 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, + ID3DBlob **shader, ID3DBlob **error_messages); #ifdef __cplusplus }

1 0

Piotr Caban : oleaut32: Don' t add stdole2 import when TYPEFLAG_FDISPATCHABLE is set.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: 5e6016e2a7d42bd8a40f3eed61bc4ab0af8f21ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6016e2a7d42bd8a40f3eed6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:54:55 2013 +0200 oleaut32: Don't add stdole2 import when TYPEFLAG_FDISPATCHABLE is set. --- dlls/oleaut32/typelib2.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 97f61a4..a7815a9 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1688,6 +1688,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U TRACE("(%p,0x%x)\n", iface, uTypeFlags); if(uTypeFlags & TYPEFLAG_FDUAL) { + static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + ITypeLib *stdole; + ITypeInfo *dispatch; + HREFTYPE hreftype; + HRESULT hres; + This->typeinfo->typekind |= 0x10; This->typeinfo->typekind &= ~0x0f; This->typeinfo->typekind |= TKIND_DISPATCH; @@ -1719,14 +1725,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U } } else iface = &This->dual->ICreateTypeInfo2_iface; - } - - if (uTypeFlags & (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL)) { - static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; - ITypeLib *stdole; - ITypeInfo *dispatch; - HREFTYPE hreftype; - HRESULT hres; hres = LoadTypeLib(stdole2tlb, &stdole); if(FAILED(hres))

1 0

Piotr Caban : oleaut32: Make typeinfo offsets table dynamic.
by Alexandre Julliard 11 Apr '13

11 Apr '13

Module: wine Branch: master Commit: b0dcf32b85f945de2644e71ee2412fff43156163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dcf32b85f945de2644e71ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 11 13:55:30 2013 +0200 oleaut32: Make typeinfo offsets table dynamic. --- dlls/oleaut32/typelib2.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a7815a9..df25271 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -178,7 +178,8 @@ typedef struct tagICreateTypeLib2Impl int typelib_guids; /* Number of defined typelib guids */ int typeinfo_guids; /* Number of defined typeinfo guids */ - INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */ + INT *typelib_typeinfo_offsets; + int typeinfo_offsets_size; INT *typelib_namehash_segment; INT *typelib_guidhash_segment; @@ -621,6 +622,21 @@ static int ctl2_alloc_typeinfo( int offset; MSFT_TypeInfoBase *typeinfo; + if (!This->typeinfo_offsets_size) { + This->typelib_typeinfo_offsets = heap_alloc(8*sizeof(INT)); + if(!This->typelib_typeinfo_offsets) + return -1; + This->typeinfo_offsets_size = 8; + }else if (This->typelib_header.nrtypeinfos == This->typeinfo_offsets_size) { + INT *new_offsets = heap_realloc(This->typelib_typeinfo_offsets, + 2*This->typeinfo_offsets_size*sizeof(INT)); + if(!new_offsets) + return -1; + + This->typelib_typeinfo_offsets = new_offsets; + This->typeinfo_offsets_size *= 2; + } + offset = ctl2_alloc_segment(This, MSFT_SEG_TYPEINFO, sizeof(MSFT_TypeInfoBase), 0); if (offset == -1) return -1; @@ -4338,6 +4354,7 @@ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) heap_free(This->typelib_segment_data[i]); This->typelib_segment_data[i] = NULL; } + heap_free(This->typelib_typeinfo_offsets); SysFreeString(This->filename); This->filename = NULL;

1 0

Matteo Bruni : wined3d: Update comment on top of format_texture_info[].
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 50a91e11c690b1016fd26cfe6dcd12bd036f99bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a91e11c690b1016fd26cfe6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:43 2013 +0200 wined3d: Update comment on top of format_texture_info[]. --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d2ada07..d7cec9b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -582,10 +582,10 @@ static void convert_s8_uint_d24_float(const BYTE *src, BYTE *dst, UINT pitch, UI * WINED3DFMT_NVHS */ static const struct wined3d_format_texture_info format_texture_info[] = { - /* format id internal srgbInternal rtInternal - format type + /* format id gl_internal gl_srgb_internal gl_rt_internal + gl_format gl_type conv_byte_count flags - extension */ + extension convert */ /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The

1 0

Matteo Bruni : wined3d: Make the entire surface current after clearing a discarded depth buffer.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: f6d2737e621470a3f80e238f49e00b5a54856569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d2737e621470a3f80e238f4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:44 2013 +0200 wined3d: Make the entire surface current after clearing a discarded depth buffer. --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f94d77a..6b5c9dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -501,6 +501,14 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { RECT current_rect, r; + if (ds->flags & SFLAG_DISCARDED) + { + /* Depth buffer was discarded, make it entirely current in its new location since + * there is no other place where we would get data anyway. */ + SetRect(out_rect, 0, 0, ds->resource.width, ds->resource.height); + return; + } + if (ds->flags & location) SetRect(&current_rect, 0, 0, ds->ds_current_size.cx,

1 0