February 2015 - Wine-Commits

Austin English : ktmw32: Add a stub for RollbackTransaction.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 5e8b613397fb4b3df4b02d13b6175b03c6a1f2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8b613397fb4b3df4b02d13b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:36:30 2015 -0600 ktmw32: Add a stub for RollbackTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index 0d549bf..895e990 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -35,7 +35,7 @@ @ stub RenameTransactionManager @ stub RollbackComplete @ stub RollbackEnlistment -@ stub RollbackTransaction +@ stdcall RollbackTransaction(ptr) @ stub RollbackTransactionAsync @ stub RollforwardTransactionManager @ stub SetEnlistmentRecoveryInformation diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 328ddb5..35d1e85 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -49,3 +49,13 @@ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD return (HANDLE) 1; } + +/*********************************************************************** + * Rollback Transaction (ktmw32.@) + */ +BOOL WINAPI RollbackTransaction(HANDLE transaction) +{ + FIXME("stub: %p\n", transaction); + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; +}

1 0

Charles Davis : ntdll: Support 64-bit Mac OS.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 97bda9a05f50018d551776e0801c6604bde3f329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bda9a05f50018d551776e08… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 5 13:28:58 2015 -0700 ntdll: Support 64-bit Mac OS. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_x86_64.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 20 ++++++++++++--- include/winnt.h | 2 +- 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 51de6e7..9355d04 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -146,7 +146,7 @@ @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort -@ stdcall -arch=win32,arm64 NtCurrentTeb() +@ stdcall NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue @ stdcall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 05581c2..c71069d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -236,6 +236,39 @@ static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_ #define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) +#elif defined (__APPLE__) +static pthread_key_t teb_key; + +#define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) +#define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) +#define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) +#define RDX_sig(context) ((context)->uc_mcontext->__ss.__rdx) +#define RSI_sig(context) ((context)->uc_mcontext->__ss.__rsi) +#define RDI_sig(context) ((context)->uc_mcontext->__ss.__rdi) +#define RBP_sig(context) ((context)->uc_mcontext->__ss.__rbp) +#define R8_sig(context) ((context)->uc_mcontext->__ss.__r8) +#define R9_sig(context) ((context)->uc_mcontext->__ss.__r9) +#define R10_sig(context) ((context)->uc_mcontext->__ss.__r10) +#define R11_sig(context) ((context)->uc_mcontext->__ss.__r11) +#define R12_sig(context) ((context)->uc_mcontext->__ss.__r12) +#define R13_sig(context) ((context)->uc_mcontext->__ss.__r13) +#define R14_sig(context) ((context)->uc_mcontext->__ss.__r14) +#define R15_sig(context) ((context)->uc_mcontext->__ss.__r15) + +#define CS_sig(context) ((context)->uc_mcontext->__ss.__cs) +#define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) +#define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) + +#define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) + +#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) +#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) + +#define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) +#define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) + +#define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw) + #else #error You must define the signal context functions for your platform #endif @@ -2506,6 +2539,12 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +#ifdef __APPLE__ +static void init_teb_key(void) +{ + pthread_key_create( &teb_key, NULL ); +} +#endif /********************************************************************** * signal_init_thread @@ -2515,12 +2554,20 @@ void signal_init_thread( TEB *teb ) const WORD fpu_cw = 0x27f; stack_t ss; +#ifdef __APPLE__ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; +#endif + #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) sysarch( X86_64_SET_GSBASE, &teb ); +#elif defined (__APPLE__) + /* FIXME: Actually setting %gs needs support from the OS */ + pthread_once( &init_once, init_teb_key ); + pthread_setspecific( teb_key, teb ); #else # error Please define setting %gs for your architecture #endif @@ -3425,4 +3472,19 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +/********************************************************************** + * NtCurrentTeb (NTDLL.@) + * + * FIXME: This isn't exported from NTDLL on real NT. This should be + * removed if and when we can set the GSBASE MSR on Mac OS X. + */ +#ifdef __APPLE__ +TEB * WINAPI NtCurrentTeb(void) +{ + return pthread_getspecific( teb_key ); +} +#else +__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tret" ) +#endif + #endif /* __x86_64__ */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7dd13f2..3696c8e 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -189,9 +189,9 @@ done: #include <mach/mach.h> #include <mach/mach_error.h> -static ULONG get_dyld_image_info_addr(void) +static ULONG64 get_dyld_image_info_addr(void) { - ULONG ret = 0; + ULONG64 ret = 0; #ifdef TASK_DYLD_INFO struct task_dyld_info dyld_info; mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; @@ -219,6 +219,9 @@ HANDLE thread_init(void) NTSTATUS status; struct ntdll_thread_data *thread_data; static struct debug_info debug_info; /* debug info for initial thread */ +#ifdef __APPLE__ + ULONG64 dyld_image_info; +#endif virtual_init(); @@ -263,7 +266,18 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); #ifdef __APPLE__ - peb->Reserved[0] = get_dyld_image_info_addr(); + dyld_image_info = get_dyld_image_info_addr(); +#ifdef __LP64__ +#ifdef WORDS_BIGENDIAN + peb->Reserved[1] = dyld_image_info & 0xFFFFFFFF; + peb->Reserved[0] = dyld_image_info >> 32; +#else + peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; + peb->Reserved[1] = dyld_image_info >> 32; +#endif +#else + peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; +#endif #endif /* allocate and initialize the initial TEB */ diff --git a/include/winnt.h b/include/winnt.h index 709a93f..4b06b2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2284,7 +2284,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) +#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__APPLE__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb;

1 0

Austin English : cryptui: Add CryptUIDlgSelectCertificateFromStore stub.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 5ed719d590adbb17d72d200e04f8b2a319ae1e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed719d590adbb17d72d200e0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 16:24:00 2015 -0600 cryptui: Add CryptUIDlgSelectCertificateFromStore stub. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index bce5de0..c4b579a 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -3,7 +3,7 @@ 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA 5 stdcall CryptUIDlgSelectCertificateA(ptr) -6 stub CryptUIDlgSelectCertificateFromStore +6 stdcall CryptUIDlgSelectCertificateFromStore(ptr ptr wstr wstr long long ptr) 7 stdcall CryptUIDlgSelectCertificateW(ptr) 8 stdcall CryptUIDlgSelectStoreA(ptr) 9 stdcall CryptUIDlgSelectStoreW(ptr) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 0aea379..9f76456 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7049,3 +7049,11 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S FIXME("%p: stub\n", pcsc); return NULL; } + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore, HWND hwnd, LPCWSTR pwszTitle, + LPCWSTR pwszDisplayString, DWORD dwDontUseColumn, + DWORD dwFlags, void *pvReserved) +{ + FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + return NULL; +}

1 0

Jacek Caban : jscript: Pass 'this' as jsdisp_t to setters.
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 131640377058a35f392a352fd45b2760f4a4b20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=131640377058a35f392a352fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:09:47 2015 +0100 jscript: Pass 'this' as jsdisp_t to setters. --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 11 +++-------- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 12 ++++++------ dlls/jscript/string.c | 2 +- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6092555..a005309 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -126,9 +126,9 @@ static HRESULT Array_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) return S_OK; } -static HRESULT Array_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT Array_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { - ArrayInstance *This = array_from_vdisp(jsthis); + ArrayInstance *This = array_from_jsdisp(jsthis); DOUBLE len = -1; DWORD i; HRESULT hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6f225da..40e1749 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -470,14 +470,9 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->setter) { - vdisp_t vthis; + if(prop->u.p->setter) + return prop->u.p->setter(This->ctx, This, val); - set_jsdisp(&vthis, This); - hres = prop->u.p->setter(This->ctx, &vthis, val); - vdisp_release(&vthis); - return hres; - } if(prop->u.p->setter) { FIXME("getter with no setter\n"); return E_FAIL; @@ -512,7 +507,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi return S_OK; } -HRESULT builtin_set_const(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { TRACE("%p %s\n", jsthis, debugstr_jsval(value)); return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ec610cf..0ac6c61 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -375,7 +375,7 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT Function_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9dd772b..3cfc4ba 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -188,9 +188,9 @@ static inline jsdisp_t *get_jsdisp(vdisp_t *vdisp) typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*); typedef HRESULT (*builtin_getter_t)(script_ctx_t*,jsdisp_t*,jsval_t*); -typedef HRESULT (*builtin_setter_t)(script_ctx_t*,vdisp_t*,jsval_t); +typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); -HRESULT builtin_set_const(script_ctx_t*,vdisp_t*,jsval_t) DECLSPEC_HIDDEN; +HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; typedef struct { const WCHAR *name; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index ed3d0b1..402b527 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -256,7 +256,7 @@ static HRESULT RegExp_get_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_source(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -268,7 +268,7 @@ static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return E_NOTIMPL; } -static HRESULT RegExp_set_global(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -280,7 +280,7 @@ static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ return E_NOTIMPL; } -static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -292,7 +292,7 @@ static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return E_NOTIMPL; } -static HRESULT RegExp_set_multiline(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -322,9 +322,9 @@ static HRESULT RegExp_get_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return jsval_copy(regexp->last_index_val, r); } -static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { - RegExpInstance *regexp = regexp_from_vdisp(jsthis); + RegExpInstance *regexp = regexp_from_jsdisp(jsthis); HRESULT hres; TRACE("\n"); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3f83675..73de517 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -121,7 +121,7 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT String_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT String_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("%p\n", jsthis); return E_NOTIMPL;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetSize().
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 7df055f17fdc3f5b7bdaafc5436cb21b6170d16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df055f17fdc3f5b7bdaafc54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:00 2015 +0100 d2d1: Implement d2d_bitmap_GetSize(). --- dlls/d2d1/bitmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index fd7a7a7..e827e46 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -79,10 +79,12 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Fac static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0.0f; - size->height = 0.0f; + size->width = bitmap->pixel_size.width / (bitmap->dpi_x / 96.0f); + size->height = bitmap->pixel_size.height / (bitmap->dpi_y / 96.0f); return size; }

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetPixelSize().
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: b270384dfb213b058cce72395d93909afe058c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b270384dfb213b058cce72395… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:58 2015 +0100 d2d1: Implement d2d_bitmap_GetPixelSize(). --- dlls/d2d1/bitmap.c | 9 ++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43c4881..b3ba570 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -88,10 +88,11 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2 static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size) { - FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); - pixel_size->width = 0; - pixel_size->height = 0; + *pixel_size = bitmap->pixel_size; return pixel_size; } @@ -158,4 +159,6 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; + + bitmap->pixel_size = size; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e3cb98a..039612b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -152,6 +152,8 @@ struct d2d_bitmap { ID2D1Bitmap ID2D1Bitmap_iface; LONG refcount; + + D2D1_SIZE_U pixel_size; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetDpi().
by Alexandre Julliard Feb. 6, 2015

Feb. 6, 2015

Module: wine Branch: master Commit: 4b0f47cdbc7827b1a263156dba0cb88b57d84824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0f47cdbc7827b1a263156db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:59 2015 +0100 d2d1: Implement d2d_bitmap_GetDpi(). --- dlls/d2d1/bitmap.c | 16 +++++++++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b3ba570..fd7a7a7 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -107,10 +107,12 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitm static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = bitmap->dpi_x; + *dpi_y = bitmap->dpi_y; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, @@ -161,4 +163,12 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->refcount = 1; bitmap->pixel_size = size; + bitmap->dpi_x = desc->dpiX; + bitmap->dpi_y = desc->dpiY; + + if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) + { + bitmap->dpi_x = 96.0f; + bitmap->dpi_y = 96.0f; + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 039612b..0402c8d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -154,6 +154,8 @@ struct d2d_bitmap LONG refcount; D2D1_SIZE_U pixel_size; + float dpi_x; + float dpi_y; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Feb. 5, 2015

Feb. 5, 2015

Module: wine Branch: master Commit: 0cc175c050ec69e5b1d52a7be36bc75f9f622808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc175c050ec69e5b1d52a7be… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 5 01:42:21 2015 +0900 po: Update Japanese translation. --- po/ja.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9d3abd9..75fdca5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-02 23:14+0900\n" +"PO-Revision-Date: 2015-02-05 00:17+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -13076,20 +13076,16 @@ msgid "&Test Sound" msgstr "音をテスト(&T)" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 設定" +msgstr "スピーカー設定" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "デバイス(&V):" +msgstr "デバイス:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "スピーカー:" #: winecfg.rc:286 msgid "Appearance" @@ -13197,21 +13193,19 @@ msgstr "(システムデフォルト)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 サラウンド" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "画像" +msgstr "4 チャンネルステレオ" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "ステレオ" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "モノラル" #: winecfg.rc:54 msgid ""

1 0

Austin English : oleaut32: Add a stub for OleSavePictureFile.
by Alexandre Julliard Feb. 5, 2015

Feb. 5, 2015

Module: wine Branch: master Commit: 08f420d2def49d43d3dd01e5585f04dc91ef0c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f420d2def49d43d3dd01e55… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 4 20:36:22 2015 -0600 oleaut32: Add a stub for OleSavePictureFile. --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/olepicture.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index a68eb0c..f5ad0ef 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -391,7 +391,7 @@ 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) 422 stub OleLoadPictureFile -423 stub OleSavePictureFile +423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) 426 stdcall VarUI4FromUI8(int64 ptr) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 599042c..dfaf6f4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2302,6 +2302,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, } /*********************************************************************** + * OleSavePictureFile (OLEAUT32.423) + */ +HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename) +{ + FIXME("(%p %s): stub\n", picture, debugstr_w(filename)); + return CTL_E_FILENOTFOUND; +} + +/*********************************************************************** * OleLoadPicturePath (OLEAUT32.424) */ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,

1 0

Ken Thomases : winemac: Raise full-screen windows in front of the status items in the Mac menu bar.
by Alexandre Julliard Feb. 5, 2015

Feb. 5, 2015

Module: wine Branch: master Commit: 71b9e022658af4068edd45788508d2a31169006b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b9e022658af4068edd45788… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 4 11:42:03 2015 -0600 winemac: Raise full-screen windows in front of the status items in the Mac menu bar. Status items are the things on the right end of the Mac menu bar, like the clock and volume widget. It turns out that they are displayed at a higher window level than everything else in the menu bar. For the case where the displays are not captured for a full-screen window, the window ends up at the same window level as the status items, and they would sometimes end up on top. They would draw over the full-screen window and could be clicked. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4688687..a937d5d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -791,7 +791,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (captured) level = CGShieldingWindowLevel() + 1; /* Need +1 or we don't get mouse moves */ else - level = NSMainMenuWindowLevel + 1; + level = NSStatusWindowLevel + 1; if (self.floating) level++;

1 0