December 2011 - Wine-Commits

Jacek Caban : jscript: Use byte code for deleting identifier expressions.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 3fd2979fba51dc21faf03d5ebdb093e0353749f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd2979fba51dc21faf03d5eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:42:27 2011 +0100 jscript: Use byte code for deleting identifier expressions. --- dlls/jscript/compile.c | 2 + dlls/jscript/engine.c | 79 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 1 + 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ff53c90..7188f4c1 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -487,6 +487,8 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t return E_OUTOFMEMORY; break; } + case EXPR_IDENT: + return push_instr_bstr(ctx, OP_delete_ident, ((identifier_expression_t*)expr->expression)->identifier); default: expr->expr.eval = delete_expression_eval; return compile_interp_fallback(ctx, &expr->expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e399aa8..2dcdd44 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1399,15 +1399,6 @@ HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -static HRESULT return_bool(exprval_t *ret, DWORD b) -{ - ret->type = EXPRVAL_VARIANT; - V_VT(&ret->u.var) = VT_BOOL; - V_BOOL(&ret->u.var) = b ? VARIANT_TRUE : VARIANT_FALSE; - - return S_OK; -} - /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -2377,39 +2368,8 @@ static HRESULT interp_mod(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.2 */ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - unary_expression_t *expr = (unary_expression_t*)_expr; - VARIANT_BOOL b = VARIANT_FALSE; - exprval_t exprval; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - switch(exprval.type) { - case EXPRVAL_IDREF: { - IDispatchEx *dispex; - - hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); - b = VARIANT_TRUE; - IDispatchEx_Release(dispex); - } - break; - } - default: - FIXME("unsupported type %d\n", exprval.type); - hres = E_NOTIMPL; - } - - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - return return_bool(ret, b); + FIXME("\n"); + return E_NOTIMPL; } /* ECMA-262 3rd Edition 11.4.2 */ @@ -2460,6 +2420,41 @@ static HRESULT interp_delete(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.2 */ +static HRESULT interp_delete_ident(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + IDispatchEx *dispex; + exprval_t exprval; + BOOL ret = FALSE; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = identifier_eval(ctx->parser->script, arg, 0, &ctx->ei, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type != EXPRVAL_IDREF) { + FIXME("Unsupported exprval\n"); + exprval_release(&exprval); + return E_NOTIMPL; + } + + hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); + IDispatch_Release(exprval.u.idref.disp); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); + IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; + + ret = TRUE; + } + + return stack_push_bool(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.2 */ static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0c46383..3147092 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,7 @@ typedef struct _func_stack { X(call_member,1, ARG_UINT, ARG_UINT) \ X(carray, 1, ARG_UINT, 0) \ X(delete, 1, 0,0) \ + X(delete_ident,1,ARG_BSTR, 0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \

1 0

Piotr Caban : urlmon: Added stub for 444 and 445 function.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: dc8467fefedc55c8449f71e1c78a3c0a96bd6de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8467fefedc55c8449f71e1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:12:01 2011 +0100 urlmon: Added stub for 444 and 445 function. --- dlls/urlmon/urlmon.spec | 6 ++++-- dlls/urlmon/urlmon_main.c | 35 +++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 2f38346..575bdc0 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -101,5 +101,7 @@ 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString -410 stdcall @(long long) URLMON_410 -423 stdcall @(long long long long) URLMON_423 +410 stdcall @(long long) LogSqmBits +423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal +444 stdcall @(long long long) MapUriToBrowserEmulationState +445 stdcall @(long long) MapBrowserEmulationModeToUserAgent diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index cfd0918..13c61de 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -921,23 +921,42 @@ BOOL WINAPI IsProtectedModeURL(const WCHAR *url) } /*********************************************************************** - * URLMON_410 (URLMON.410) + * LogSqmBits (URLMON.410) * Undocumented, added in IE8 */ -BOOL WINAPI URLMON_410(DWORD unknown1, DWORD unknown2) +int WINAPI LogSqmBits(DWORD unk1, DWORD unk2) { - FIXME("stub: %d %d\n", unknown1, unknown2); - return FALSE; + FIXME("stub: %d %d\n", unk1, unk2); + return 0; } /*********************************************************************** - * URLMON_423 (URLMON.423) + * LogSqmUXCommandOffsetInternal (URLMON.423) * Undocumented, added in IE8 */ -BOOL WINAPI URLMON_423(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) +void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DWORD unk4) { - FIXME("stub: %d %d %d %d\n", unknown1, unknown2, unknown3, unknown4); - return FALSE; + FIXME("stub: %d %d %d %d\n", unk1, unk2, unk3, unk4); +} + +/*********************************************************************** + * MapUriToBrowserEmulationState (URLMON.444) + * Undocumented, added in IE8 + */ +int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) +{ + FIXME("stub: %d %d %d\n", unk1, unk2, unk3); + return 0; +} + +/*********************************************************************** + * MapBrowserEmulationModeToUserAgent (URLMON.445) + * Undocumented, added in IE8 + */ +int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) +{ + FIXME("stub: %d %d\n", unk1, unk2); + return 0; } /***********************************************************************

1 0

Alexandre Julliard : user32: Always use the default alignment when displaying submenu popups.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 755abced55b85632e0e32c1fb9567446d047ff96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755abced55b85632e0e32c1fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 17:44:03 2011 +0100 user32: Always use the default alignment when displaying submenu popups. --- dlls/user32/menu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3ec682f..349adc6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2395,6 +2395,9 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, } } + /* use default alignment for submenus */ + wFlags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN); + MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, wFlags, rect.left, rect.top, rect.right, rect.bottom ); if (selectFirst)

1 0

Alexandre Julliard : user32: Cache the global key state to avoid performance issues in applications that poll constantly .
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: cb3b7237925a24ba4c5696dd079fdc5d99a48577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3b7237925a24ba4c5696dd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 14:30:41 2011 +0100 user32: Cache the global key state to avoid performance issues in applications that poll constantly. --- dlls/user32/hook.c | 4 ++++ dlls/user32/input.c | 10 ++++++++++ dlls/user32/message.c | 4 ++++ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 4 +++- dlls/user32/winstation.c | 1 + 6 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 2e36801..1ba5dda 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -385,6 +385,10 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA thread_info->hook_unicode = prev_unicode; } } + + if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) + get_user_thread_info()->key_state_time = 0; /* force refreshing the key state cache */ + return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1ffce8d..d9fb7c0 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -374,21 +374,31 @@ HWND WINAPI GetCapture(void) */ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { + struct user_thread_info *thread_info = get_user_thread_info(); SHORT ret; if (key < 0 || key >= 256) return 0; if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { + if (thread_info->key_state) + { + if (GetTickCount() - thread_info->key_state_time < 50) + return (thread_info->key_state[key] & 0x80) ? 0x8000 : 0; + } + else thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); + ret = 0; SERVER_START_REQ( get_key_state ) { req->tid = 0; req->key = key; + if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; + thread_info->key_state_time = GetTickCount(); } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7661e3e..a38d77b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3112,6 +3112,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO */ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) { + struct user_thread_info *thread_info = get_user_thread_info(); struct send_message_info info; NTSTATUS ret; BOOL wait; @@ -3149,11 +3150,14 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); break; } + if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); ret = wine_server_call( req ); wait = reply->wait; } SERVER_END_REQ; + if (!ret && thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if (wait) { LRESULT ignored; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a42efb0..790ba92 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -312,6 +312,7 @@ static void thread_detach(void) if (thread_info->msg_window) WIN_DestroyThreadWindows( thread_info->msg_window ); CloseHandle( thread_info->server_queue ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); + HeapFree( GetProcessHeap(), 0, thread_info->key_state ); exiting_thread_id = 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 399974e..1a63bad 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -176,10 +176,12 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ UINT active_hooks; /* Bitmap of active hooks */ + UINT key_state_time; /* Time of last key state refresh */ + BYTE *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ - ULONG pad[11]; /* Available for more data */ + ULONG pad[9]; /* Available for more data */ }; struct hook_extra_info diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c6c52b7..8126b31 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -401,6 +401,7 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) struct user_thread_info *thread_info = get_user_thread_info(); thread_info->top_window = 0; thread_info->msg_window = 0; + thread_info->key_state_time = 0; } return ret; }

1 0

Alexandre Julliard : server: Optionally return the global key state when queueing a hardware message.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 5a30e31806b8b2c2917670aaf9e2c5038bc625c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a30e31806b8b2c2917670aaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 14:29:46 2011 +0100 server: Optionally return the global key state when queueing a hardware message. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/queue.c | 12 ++++++++++-- server/trace.c | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ab239f3..5880b47 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2796,6 +2796,7 @@ struct send_hardware_message_reply { struct reply_header __header; int wait; + /* VARARG(keystate,bytes); */ char __pad_12[4]; }; #define SEND_HWMSG_INJECTED 0x01 @@ -5639,6 +5640,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 428 +#define SERVER_PROTOCOL_VERSION 429 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a59bb6e..91a59b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2032,6 +2032,7 @@ enum message_type unsigned int flags; /* flags (see below) */ @REPLY int wait; /* do we need to wait for a reply? */ + VARARG(keystate,bytes); /* global state array for all the keys */ @END #define SEND_HWMSG_INJECTED 0x01 diff --git a/server/queue.c b/server/queue.c index 7de6d88..20d3e41 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2189,13 +2189,20 @@ DECL_HANDLER(send_hardware_message) struct thread *thread = NULL; struct desktop *desktop; struct msg_queue *sender = get_current_queue(); + data_size_t size = min( 256, get_reply_max_size() ); + + if (!(desktop = get_thread_desktop( current, 0 ))) return; if (req->win) { if (!(thread = get_window_thread( req->win ))) return; - desktop = (struct desktop *)grab_object( thread->queue->input->desktop ); + if (desktop != thread->queue->input->desktop) + { + /* don't allow queuing events to a different desktop */ + release_object( desktop ); + return; + } } - else if (!(desktop = get_thread_desktop( current, 0 ))) return; switch (req->input.type) { @@ -2212,6 +2219,7 @@ DECL_HANDLER(send_hardware_message) set_error( STATUS_INVALID_PARAMETER ); } if (thread) release_object( thread ); + set_reply_data( desktop->keystate, size ); release_object( desktop ); } diff --git a/server/trace.c b/server/trace.c index e463229..4a50232 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2452,6 +2452,7 @@ static void dump_send_hardware_message_request( const struct send_hardware_messa static void dump_send_hardware_message_reply( const struct send_hardware_message_reply *req ) { fprintf( stderr, " wait=%d", req->wait ); + dump_varargs_bytes( ", keystate=", cur_size ); } static void dump_get_message_request( const struct get_message_request *req )

1 0

Piotr Caban : msvcp90: Removed __ASM_EXCEPTION_VTABLE macro.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 07a9909ccaea1e9626731c4b259f555877d50bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a9909ccaea1e9626731c4b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:16:08 2011 +0100 msvcp90: Removed __ASM_EXCEPTION_VTABLE macro. --- dlls/msvcp90/exception.c | 23 ++++++----------------- dlls/msvcp90/msvcp90.h | 4 ++++ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 0008f43..f2ff017 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -61,17 +61,6 @@ typedef struct __cxx_exception_type void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ - -#ifdef _WIN64 - -#define __ASM_EXCEPTION_VTABLE(name, what_func) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) ) -#else - -#define __ASM_EXCEPTION_VTABLE(name, what_func) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) ) -#endif /* _WIN64 */ - extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; @@ -806,12 +795,12 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception); - __ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what); - __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); - __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); - __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); - __ASM_EXCEPTION_VTABLE(runtime_error, MSVCP_runtime_error_what); + __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); + __ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(length_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(out_of_range, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(invalid_argument, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(runtime_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index ed66d23..5d61779 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -66,6 +66,8 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); #ifdef _WIN64 +#define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ "\t.align 8\n" \ @@ -77,6 +79,8 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); #else +#define VTABLE_ADD_FUNC(name) "\t.long " THISCALL_NAME(name) "\n" + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ "\t.align 4\n" \

1 0

Francois Gouget : include: Add a couple of missing include directives in windows.h.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 3c3a4740cae7c853451f62653fe2535301fe134b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3a4740cae7c853451f62653… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 10:09:39 2011 +0100 include: Add a couple of missing include directives in windows.h. Rename a variable to avoid a conflict with the Unknown enumeration value. Define WIN32_LEAN_AND_MEAN to avoid conflicts caused by the SetPort macro. --- dlls/ole32/tests/ole2.c | 5 +++-- dlls/urlmon/tests/uri.c | 1 + include/windows.h | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f38af3b..6641683 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -20,6 +20,7 @@ #define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN #include <stdarg.h> @@ -1841,13 +1842,13 @@ static const IUnknownVtbl UnknownVtbl = Unknown_Release }; -static IUnknown Unknown = { &UnknownVtbl }; +static IUnknown unknown = { &UnknownVtbl }; static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&Unknown, TRUE, FALSE); + hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ad63ccf..2332926 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -24,6 +24,7 @@ #define COBJMACROS #define CONST_VTABLE +#define WIN32_LEAN_AND_MEAN #include "windef.h" #include "winbase.h" diff --git a/include/windows.h b/include/windows.h index 7cd8a83..14f6ce9 100644 --- a/include/windows.h +++ b/include/windows.h @@ -60,7 +60,7 @@ #include <nb30.h> #include <rpc.h> #include <shellapi.h> -/* #include <winperf.h> */ +#include <winperf.h> #ifndef WINE_NOWINSOCK #include <winsock.h> @@ -69,7 +69,7 @@ #ifndef NOCRYPT #include <wincrypt.h> /* #include <winefs.h> */ -/* #include <winscard.h> */ +#include <winscard.h> #endif /* !NOCRYPT */ #ifndef NOGDI

1 0

Alexandre Julliard : comctl32: Don' t try to mask out the image for palette-based bitmaps.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 129f48a69224c7fa7d46577483a7351ceb5b0a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129f48a69224c7fa7d4657748… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 21:38:10 2011 +0100 comctl32: Don't try to mask out the image for palette-based bitmaps. --- dlls/comctl32/imagelist.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index db59104..0914c09 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -543,8 +543,6 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) SetBkColor (hdcBitmap, bkColor); BitBlt (hdcMask, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); - SetBkColor(hdcBitmap, RGB(255,255,255)); - /* * Remove the background from the image * @@ -558,7 +556,11 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) * * Blt mode 0x220326 is NOTSRCAND */ - BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); + if (bmp.bmBitsPixel > 8) /* NOTSRCAND can't work with palettes */ + { + SetBkColor(hdcBitmap, RGB(255,255,255)); + BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); + } DeleteDC(hdcBitmap); DeleteDC(hdcMask);

1 0

Dmitry Timoshkov : kernel32: Add the tests for various combinations of CreateFileMapping/ MapViewOfFile protections.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 5379a75baf32415618f8d650c0f1c35faee8aea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5379a75baf32415618f8d650c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 15 16:06:37 2011 +0800 kernel32: Add the tests for various combinations of CreateFileMapping/MapViewOfFile protections. --- dlls/kernel32/tests/virtual.c | 292 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 291 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5379a75baf32415618f8d…

1 0

Piotr Caban : msvcp90: Added collate<unsigned short> class stub.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 59b2639e39ec15475947797840954cb0e90cc025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b2639e39ec1547594779784… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 10:17:28 2011 +0100 msvcp90: Added collate<unsigned short> class stub. --- dlls/msvcp90/locale.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 56 ++++++++++++------------ 2 files changed, 137 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b2639e39ec154759477…

1 0