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

Alexandre Julliard : kernel32: Make event/mutex/ semaphore functions hotpatchable.
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: d8c72febc823c6076a58a7d1bb166ff240db8326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c72febc823c6076a58a7d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 23:54:08 2013 +0200 kernel32: Make event/mutex/semaphore functions hotpatchable. --- dlls/kernel32/sync.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c72febc823c6076a58a…

1 0

Matteo Bruni : winex11.drv: Fix attributes conversion in wglCreateContextAttribsARB().
by Alexandre Julliard April 11, 2013

April 11, 2013

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: Add function pointer typedefs.
by Alexandre Julliard April 11, 2013

April 11, 2013

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 April 11, 2013

April 11, 2013

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

Matteo Bruni : wined3d: Use 0 as GL internal format for WINED3DFMT_NULL.
by Alexandre Julliard April 11, 2013

April 11, 2013

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

Sergey Guralnik : extrac32: Create directory for extracted file if need.
by Alexandre Julliard April 11, 2013

April 11, 2013

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

Alexandre Julliard : server: Add a helper function to compute an SID length .
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 62beef5a72dc6895d07c850140945d9d4dffe79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62beef5a72dc6895d07c85014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 12:52:08 2013 +0200 server: Add a helper function to compute an SID length. --- server/file.c | 38 +++++++++++++++----------------------- server/object.c | 4 ++-- server/security.h | 7 ++++++- server/token.c | 26 ++++++++++++-------------- 4 files changed, 35 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62beef5a72dc6895d07c8…

1 0

Ken Thomases : winemac: Don't order the window on-screen in -[ WineWindow adjustWindowLevel].
by Alexandre Julliard April 11, 2013

April 11, 2013

Module: wine Branch: master Commit: 2e226b9ad8cd86b4ad6b5a73effa9fa7d5d03958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e226b9ad8cd86b4ad6b5a73e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 10 15:32:23 2013 -0500 winemac: Don't order the window on-screen in -[WineWindow adjustWindowLevel]. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6a85d74..c13a57d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -437,7 +437,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) Also, any windows which are supposed to be in front of it had better have the same or higher window level. If not, bump them up. */ - if (index != NSNotFound) + if (index != NSNotFound && [self isVisible]) { for (; index > 0; index--) {

1 0

Matteo Bruni : wined3d: Make the entire surface current after clearing a discarded depth buffer.
by Alexandre Julliard April 10, 2013

April 10, 2013

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

Francois Gouget : wininet: Make urlcache_{entry_create, get_entry_info}() static.
by Alexandre Julliard April 10, 2013

April 10, 2013

Module: wine Branch: master Commit: cabbc4d983aa167076fa9b6ebaaa93485ef541bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabbc4d983aa167076fa9b6eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 10 16:50:21 2013 +0200 wininet: Make urlcache_{entry_create,get_entry_info}() static. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ce74577..7f58a69 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1780,7 +1780,7 @@ static BOOL urlcache_hash_entry_is_locked(struct hash_entry *hash_entry, entry_u return TRUE; } -BOOL urlcache_get_entry_info(const char *url, void *entry_info, +static BOOL urlcache_get_entry_info(const char *url, void *entry_info, DWORD *size, DWORD flags, BOOL unicode) { urlcache_header *header; @@ -2622,7 +2622,7 @@ BOOL WINAPI UnlockUrlCacheEntryFileW(LPCWSTR lpszUrlName, DWORD dwReserved) return ret; } -BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) +static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_path) { cache_container *container; urlcache_header *header;

1 0