November 2011 - Wine-Commits

Jacek Caban : jscript: Use bytecode for regexp literals.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: e4f92ef473726a4a9bf86487985fc9b96aeb99fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f92ef473726a4a9bf864879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 14:23:39 2011 +0100 jscript: Use bytecode for regexp literals. --- dlls/jscript/compile.c | 26 +++++++++++++++++++++----- dlls/jscript/engine.c | 23 +++++++++++++++++++++-- dlls/jscript/engine.h | 35 ++++++++++++++++++----------------- 3 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f4381a..9542912 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -168,10 +168,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) return S_OK; } -static HRESULT compile_literal(compiler_ctx_t *ctx, literal_expression_t *expr) +static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { - literal_t *literal = expr->literal; - switch(literal->type) { case LT_BOOL: return push_instr_int(ctx, OP_bool, literal->u.bval); @@ -183,8 +181,26 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_expression_t *expr) return push_instr(ctx, OP_null); case LT_STRING: return push_instr_str(ctx, OP_str, literal->u.wstr); + case LT_REGEXP: { + unsigned instr; + WCHAR *str; + + str = compiler_alloc(ctx->code, (literal->u.regexp.str_len+1)*sizeof(WCHAR)); + if(!str) + return E_OUTOFMEMORY; + memcpy(str, literal->u.regexp.str, literal->u.regexp.str_len*sizeof(WCHAR)); + str[literal->u.regexp.str_len] = 0; + + instr = push_instr(ctx, OP_regexp); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.str = str; + instr_ptr(ctx, instr)->arg2.lng = literal->u.regexp.flags; + return S_OK; + } default: - return compile_interp_fallback(ctx, &expr->expr); + assert(0); } } @@ -200,7 +216,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); case EXPR_LITERAL: - return compile_literal(ctx, (literal_expression_t*)expr); + return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 66d10d6..e004ffa 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1788,6 +1788,25 @@ HRESULT interp_str(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8 */ +HRESULT interp_regexp(exec_ctx_t *ctx) +{ + const WCHAR *source = ctx->parser->code->instrs[ctx->ip].arg1.str; + const LONG flags = ctx->parser->code->instrs[ctx->ip].arg2.lng; + jsdisp_t *regexp; + VARIANT v; + HRESULT hres; + + TRACE("%s %x\n", debugstr_w(source), flags); + + hres = create_regexp(ctx->parser->script, source, strlenW(source), flags, &regexp); + if(FAILED(hres)) + return hres; + + var_set_jsdisp(&v, regexp); + return stack_push(ctx, &v); +} + +/* ECMA-262 3rd Edition 7.8 */ HRESULT literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { literal_expression_t *expr = (literal_expression_t*)_expr; @@ -3382,13 +3401,13 @@ static HRESULT interp_tree(exec_ctx_t *ctx) typedef HRESULT (*op_func_t)(exec_ctx_t*); static const op_func_t op_funcs[] = { -#define X(x,a,b) interp_##x, +#define X(x,a,b,c) interp_##x, OP_LIST #undef X }; static const unsigned op_move[] = { -#define X(a,x,b) x, +#define X(a,x,b,c) x, OP_LIST #undef X }; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b48f04c..eb67050 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -41,24 +41,25 @@ typedef struct _func_stack { struct _func_stack *next; } func_stack_t; -#define OP_LIST \ - X(add, 1, 0) \ - X(bool, 1, 0) \ - X(bneg, 1, 0) \ - X(double, 1, 0) \ - X(eq2, 1, 0) \ - X(in, 1, 0) \ - X(int, 1, ARG_INT) \ - X(neg, 1, 0) \ - X(neq2, 1, 0) \ - X(null, 1, 0) \ - X(str, 1, 0) \ - X(tonum, 1, 0) \ - X(tree, 1, ARG_EXPR) \ - X(ret, 0, 0) +#define OP_LIST \ + X(add, 1, 0,0) \ + X(bool, 1, ARG_INT, 0) \ + X(bneg, 1, 0,0) \ + X(double, 1, ARG_SBL, 0) \ + X(eq2, 1, 0,0) \ + X(in, 1, 0,0) \ + X(int, 1, ARG_INT, 0) \ + X(neg, 1, 0,0) \ + X(neq2, 1, 0,0) \ + X(null, 1, 0,0) \ + X(regexp, 1, ARG_STR, ARG_INT) \ + X(str, 1, ARG_STR, 0) \ + X(tonum, 1, 0,0) \ + X(tree, 1, ARG_EXPR, 0) \ + X(ret, 0, 0,0) typedef enum { -#define X(x,a,b) OP_##x, +#define X(x,a,b,c) OP_##x, OP_LIST #undef X OP_LAST @@ -80,6 +81,7 @@ typedef enum { typedef struct { jsop_t op; instr_arg_t arg1; + instr_arg_t arg2; } instr_t; typedef struct { @@ -199,7 +201,6 @@ typedef struct { double dval; const WCHAR *wstr; VARIANT_BOOL bval; - IDispatch *disp; struct { const WCHAR *str; DWORD str_len;

1 0

Jacek Caban : mshtml: Properly remove event listeners.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: ea0ebbfeb2c513e41d0ebf1812ff3f40bd728dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0ebbfeb2c513e41d0ebf181… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 12:48:31 2011 +0100 mshtml: Properly remove event listeners. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlevent.c | 14 ++++++++++++++ dlls/mshtml/htmlevent.h | 2 ++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/nsevents.c | 30 +++++++++++++++++++++++++++++- 5 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32cbde4..45a7986 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2032,6 +2032,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) heap_free(This->elem_vars[i]); heap_free(This->elem_vars); + detach_events(This); if(This->body_event_target) release_event_target(This->body_event_target); if(This->nsevent_listener) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2b9e62e..74e8069 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1184,6 +1184,20 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve return S_OK; } +void detach_events(HTMLDocumentNode *doc) +{ + int i; + + if(!doc->event_vector) + return; + + for(i=0; i < EVENTID_LAST; i++) { + if(doc->event_vector[i]) + detach_nsevent(doc, event_info[i].name); + } +} + + static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) { if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 9072482..b3ff251 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -54,10 +54,12 @@ HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPE HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; +void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; +void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e9bb8eb..f907776 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -46,6 +46,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) if(window->doc) { if(window->doc_obj && window == window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; + detach_events(window->doc); abort_document_bindings(window->doc); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 89684fe..d4cdc10 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -281,7 +281,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * eventid_t eid; nsresult nsres; - TRACE("\n"); + TRACE("%p\n", This->This); nsAString_Init(&type_str, NULL); nsIDOMEvent_GetType(event, &type_str); @@ -363,8 +363,34 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ nsIDOMEventTarget_Release(target); } +void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +{ + nsIDOMEventTarget *target; + nsAString type_str; + nsresult nsres; + + if(!doc->basedoc.window) + return; + + nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + return; + } + + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, + &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, TRUE); + nsAString_Finish(&type_str); + nsIDOMEventTarget_Release(target); + if(NS_FAILED(nsres)) + ERR("RemoveEventTarget failed: %08x\n", nsres); +} + void release_nsevents(HTMLDocumentNode *doc) { + TRACE("%p %p\n", doc, doc->nsevent_listener); + if(doc->nsevent_listener) { doc->nsevent_listener->doc = NULL; release_listener(doc->nsevent_listener); @@ -387,6 +413,8 @@ void init_nsevents(HTMLDocumentNode *doc) if(!listener) return; + TRACE("%p %p\n", doc, listener); + listener->ref = 1; listener->doc = doc;

1 0

Marcus Meissner : mshtml: Switch two checks (Coverity).
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: da2089fed4c6bea03997973447d8a469bdd3242d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2089fed4c6bea0399797344… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 02:25:25 2011 +0100 mshtml: Switch two checks (Coverity). --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2d8bcd8..9556a00 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2069,7 +2069,7 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base } } - if(window->doc_obj->is_webbrowser && window->doc_obj && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { BOOL cancel = FALSE; IUri *uri;

1 0

Marcus Meissner : winhttp: Added missing LeaveCriticalSection (Coverity).
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: e410f3fc663a9932fd1480ef0994b9e81e95f7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e410f3fc663a9932fd1480ef0… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 02:20:56 2011 +0100 winhttp: Added missing LeaveCriticalSection (Coverity). --- dlls/winhttp/request.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 257fc97..a56572d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2973,7 +2973,10 @@ static HRESULT WINAPI winhttp_request_Send( return S_OK; } VariantClear( &request->data ); - if ((hr = VariantCopyInd( &request->data, &body )) != S_OK) return hr; + if ((hr = VariantCopyInd( &request->data, &body )) != S_OK) { + LeaveCriticalSection( &request->cs ); + return hr; + } if (request->wait) /* async request */ {

1 0

Francois Gouget : include: Update winuser.rh.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: 8342d5049f01eb96fe7aaf004a8c02325cd01194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8342d5049f01eb96fe7aaf004… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 24 00:25:14 2011 +0100 include: Update winuser.rh. --- include/winuser.rh | 84 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 70 insertions(+), 14 deletions(-) diff --git a/include/winuser.rh b/include/winuser.rh index f8f99fb..1d2a0bb 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -56,6 +56,13 @@ #define SW_MAX 11 #define SW_NORMALNA 0xCC /* Undocumented. Flag in MinMaximize */ +/* Obsolete ShowWindow() codes for compatibility */ +#define HIDE_WINDOW SW_HIDE +#define SHOW_OPENWINDOW SW_SHOWNORMAL +#define SHOW_ICONWINDOW SW_SHOWMINIMIZED +#define SHOW_FULLSCREEN SW_SHOWMAXIMIZED +#define SHOW_OPENNOACTIVATE SW_SHOWNOACTIVATE + /* WM_SHOWWINDOW lParam codes */ #define SW_PARENTCLOSING 1 #define SW_OTHERZOOM 2 @@ -223,12 +230,24 @@ #define VK_ICO_HELP 0xE3 /* Help key on ICO */ #define VK_ICO_00 0xE4 /* 00 key on ICO */ #define VK_PROCESSKEY 0xE5 -/* 0xE6 OEM specific */ +#define VK_ICO_CLEAR 0xE6 #define VK_PACKET 0xE7 /* 0xE8 Unassigned */ -/* 0xE9-0xF5 OEM specific */ +#define VK_OEM_RESET 0xE9 +#define VK_OEM_JUMP 0xEA +#define VK_OEM_PA1 0xEB +#define VK_OEM_PA2 0xEC +#define VK_OEM_PA3 0xED +#define VK_OEM_WSCTRL 0xEE +#define VK_OEM_CUSEL 0xEF +#define VK_OEM_ATTN 0xF0 +#define VK_OEM_FINISH 0xF1 +#define VK_OEM_COPY 0xF2 +#define VK_OEM_AUTO 0xF3 +#define VK_OEM_ENLW 0xF4 +#define VK_OEM_BACKTAB 0xF5 #define VK_ATTN 0xF6 #define VK_CRSEL 0xF7 #define VK_EXSEL 0xF8 @@ -274,7 +293,7 @@ #define WM_ENDSESSION 0x0016 #define WM_SYSTEMERROR 0x0017 /* DDK / Win16 */ #define WM_SHOWWINDOW 0x0018 -#define WM_CTLCOLOR 0x0019 +#define WM_CTLCOLOR 0x0019 /* Added from windowsx.h */ #define WM_WININICHANGE 0x001a #define WM_SETTINGCHANGE WM_WININICHANGE #define WM_DEVMODECHANGE 0x001b @@ -322,6 +341,13 @@ #define WM_POWER 0x0048 +/* For WM_POWER */ +#define PWR_OK 1 +#define PWR_FAIL (-1) +#define PWR_SUSPENDREQUEST 1 +#define PWR_SUSPENDRESUME 2 +#define PWR_CRITICALRESUME 3 + /* Win32 4.0 messages */ #define WM_COPYDATA 0x004a #define WM_CANCELJOURNAL 0x004b @@ -412,6 +438,8 @@ /* Menu messages */ #define WM_INITMENU 0x0116 #define WM_INITMENUPOPUP 0x0117 +#define WM_GESTURE 0x0119 +#define WM_GESTURENOTIFY 0x011A #define WM_MENUSELECT 0x011F #define WM_MENUCHAR 0x0120 @@ -474,6 +502,9 @@ #define GET_WHEEL_DELTA_WPARAM(wParam) ((short)HIWORD(wParam)) #define WHEEL_PAGESCROLL (UINT_MAX) +#define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam)) +#define GET_NCHITTEST_WPARAM(wParam) ((short)LOWORD(wParam)) +#define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam)) #define XBUTTON1 0x0001 #define XBUTTON2 0x0002 @@ -514,6 +545,8 @@ #define WM_EXITSIZEMOVE 0x0232 #define WM_DROPFILES 0x0233 +#define WM_TOUCH 0x0240 + /* Win32 4.0 messages for IME */ #define WM_IME_SETCONTEXT 0x0281 #define WM_IME_NOTIFY 0x0282 @@ -574,6 +607,8 @@ #define WM_DWMNCRENDERINGCHANGED 0x031F #define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320 #define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321 +#define WM_DWMSENDICONICTHUMBNAIL 0x0323 +#define WM_DWMSENDICONICLIVEPREVIEWBITMAP 0x0326 #define WM_GETTITLEBARINFOEX 0x033F @@ -609,12 +644,16 @@ #define HTCAPTION 2 #define HTSYSMENU 3 #define HTSIZE 4 +#define HTGROWBOX HTSIZE #define HTMENU 5 #define HTHSCROLL 6 #define HTVSCROLL 7 #define HTMINBUTTON 8 +#define HTREDUCE HTMINBUTTON #define HTMAXBUTTON 9 +#define HTZOOM HTMAXBUTTON #define HTLEFT 10 +#define HTSIZEFIRST HTLEFT #define HTRIGHT 11 #define HTTOP 12 #define HTTOPLEFT 13 @@ -622,21 +661,18 @@ #define HTBOTTOM 15 #define HTBOTTOMLEFT 16 #define HTBOTTOMRIGHT 17 +#define HTSIZELAST HTBOTTOMRIGHT #define HTBORDER 18 -#define HTGROWBOX HTSIZE -#define HTREDUCE HTMINBUTTON -#define HTZOOM HTMAXBUTTON #define HTOBJECT 19 #define HTCLOSE 20 #define HTHELP 21 -#define HTSIZEFIRST HTLEFT -#define HTSIZELAST HTBOTTOMRIGHT /* SendMessageTimeout flags */ #define SMTO_NORMAL 0x0000 #define SMTO_BLOCK 0x0001 #define SMTO_ABORTIFHUNG 0x0002 #define SMTO_NOTIMEOUTIFNOTHUNG 0x0008 +#define SMTO_ERRORONEXIT 0x0020 /* WM_MOUSEACTIVATE return values */ #define MA_ACTIVATE 1 @@ -754,8 +790,8 @@ #define WS_EX_COMPOSITED __MSABI_LONG(0x02000000) #define WS_EX_NOACTIVATE __MSABI_LONG(0x08000000) -#define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE|WS_EX_CLIENTEDGE) -#define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_TOPMOST) +#define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE) +#define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST) #endif /* NOWINSTYLES */ @@ -908,6 +944,9 @@ #define SC_CONTEXTHELP 0xf180 #define SC_SEPARATOR 0xf00f +#define GET_SC_WPARAM(wParam) ((int)wParam & 0xfff0) +#define SCF_ISSECURE 0x0001 + /* Obsolete names */ #define SC_ICON SC_MINIMIZE #define SC_ZOOM SC_MAXIMIZE @@ -916,6 +955,9 @@ /*** OEM Resource Ordinal Numbers ***/ #ifdef OEMRESOURCE +#define OBM_RDRVERT 32559 +#define OBM_RDRHORZ 32660 +#define OBM_RDR2DIM 32661 #define OBM_TRTYPE 32732 /* FIXME: Wine-only */ #define OBM_LFARROWI 32734 #define OBM_RGARROWI 32735 @@ -969,7 +1011,18 @@ #define OCR_HAND 32649 #define OCR_APPSTARTING 32650 #define OCR_HELP 32651 /* DDK / Win16 */ -#define OCR_DRAGOBJECT 32653 /* FIXME: Wine-only */ +#define OCR_RDRVERT 32652 /* DDK / Win16 */ +#define OCR_RDRHORZ 32653 /* DDK / Win16 */ +#define OCR_DRAGOBJECT OCR_RDRHORZ /* FIXME: Wine-only */ +#define OCR_RDR2DIM 32654 /* DDK / Win16 */ +#define OCR_RDRNORTH 32655 /* DDK / Win16 */ +#define OCR_RDRSOUTH 32656 /* DDK / Win16 */ +#define OCR_RDRWEST 32657 /* DDK / Win16 */ +#define OCR_RDREAST 32658 /* DDK / Win16 */ +#define OCR_RDRNORTHWEST 32659 /* DDK / Win16 */ +#define OCR_RDRNORTHEAST 32660 /* DDK / Win16 */ +#define OCR_RDRSOUTHWEST 32661 /* DDK / Win16 */ +#define OCR_RDRSOUTHEAST 32662 /* DDK / Win16 */ #define OIC_SAMPLE 32512 #define OIC_HAND 32513 @@ -980,6 +1033,7 @@ #define OIC_NOTE 32516 #define OIC_INFORMATION OIC_NOTE #define OIC_WINLOGO 32517 +#define OIC_SHIELD 32518 #endif /* OEMRESOURCE */ @@ -991,6 +1045,7 @@ #define IDI_EXCLAMATION MAKEINTRESOURCE(32515) #define IDI_ASTERISK MAKEINTRESOURCE(32516) #define IDI_WINLOGO MAKEINTRESOURCE(32517) +#define IDI_SHIELD MAKEINTRESOURCE(32518) #define IDI_WARNING IDI_EXCLAMATION #define IDI_ERROR IDI_HAND @@ -1052,10 +1107,10 @@ #define EM_SETHANDLE 0x00bc #define EM_GETHANDLE 0x00bd #define EM_GETTHUMB 0x00be -/* FIXME : missing from specs 0x00bf and 0x00c0 */ +/* Unassigned 0x00bf and 0x00c0 */ #define EM_LINELENGTH 0x00c1 #define EM_REPLACESEL 0x00c2 -/* FIXME : missing from specs 0x00c3 */ +#define EM_SETFONT 0x00c3 /* DDK / Win16 */ #define EM_GETLINE 0x00c4 #define EM_LIMITTEXT 0x00c5 #define EM_SETLIMITTEXT EM_LIMITTEXT @@ -1063,7 +1118,7 @@ #define EM_UNDO 0x00c7 #define EM_FMTLINES 0x00c8 #define EM_LINEFROMCHAR 0x00c9 -/* FIXME : missing from specs 0x00ca */ +#define EM_SETWORDBREAK 0x00ca /* DDK / Win16 */ #define EM_SETTABSTOPS 0x00cb #define EM_SETPASSWORDCHAR 0x00cc #define EM_EMPTYUNDOBUFFER 0x00cd @@ -1137,6 +1192,7 @@ #define BM_CLICK 0x00f5 #define BM_GETIMAGE 0x00f6 #define BM_SETIMAGE 0x00f7 +#define BM_SETDONTCLICK 0x00f8 /* Button states */ #define BST_UNCHECKED 0x0000

1 0

Francois Gouget : taskmgr: Fix a string resource so its format placeholders can be reordered.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

1 0

Frédéric Delanoy : cmd: Avoid dead assignment ( clang).
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: 3d028ab67c6e3f53009bc57513e34a68d834f835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d028ab67c6e3f53009bc5751… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 24 12:02:40 2011 +0100 cmd: Avoid dead assignment (clang). --- programs/cmd/builtins.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 56961a3..6703cef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -517,7 +517,6 @@ void WCMD_copy (void) { } while (FindNextFileW(hff, &fd) != 0); FindClose (hff); } else { - status = ERROR_FILE_NOT_FOUND; WCMD_print_error (); } }

1 0

Marcus Meissner : winhttp: Check return value of CLSIDFromProgID (Coverity) .
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: ad5340f63a2e313265308cbc01abd8d10d0536d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5340f63a2e313265308cbc0… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Nov 24 03:04:27 2011 +0100 winhttp: Check return value of CLSIDFromProgID (Coverity). --- dlls/winhttp/session.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f33508e..110de80 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -423,6 +423,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server, colon - session->proxy_server - 1 )) { heap_free( connect->servername ); + connect->sockaddr.ss_family = 0xffff; if (!(connect->servername = heap_alloc( (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) { @@ -444,6 +445,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT session->proxy_server )) { heap_free( connect->servername ); + connect->sockaddr.ss_family = 0xffff; if (!(connect->servername = strdupW( session->proxy_server ))) { ret = FALSE; @@ -456,6 +458,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT else if (server) { heap_free( connect->servername ); + connect->sockaddr.ss_family = 0xffff; if (!(connect->servername = strdupW( server ))) { ret = FALSE; @@ -1837,7 +1840,9 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO hostname[uc.dwHostNameLength] = 0; init = CoInitialize( NULL ); - CLSIDFromProgID( jscriptW, &clsid ); + hr = CLSIDFromProgID( jscriptW, &clsid ); + if (hr != S_OK) goto done; + hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void **)&engine ); if (hr != S_OK) goto done;

1 0

Huw Davies : gdi32: Avoid reading past the end of the indices array.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: 0ab46cd5e98e4d588e16425d55165e9c4475190b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab46cd5e98e4d588e16425d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 24 09:26:45 2011 +0000 gdi32: Avoid reading past the end of the indices array. Spotted by Marcus Meissner. --- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 590a816..d0c0afe 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -192,8 +192,9 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS indices[0] = index; - for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i]) + for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++) { + index = indices[i]; ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, 0, NULL, &identity ); if (ret != GDI_ERROR) break; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0f01a92..5b7d500 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1640,8 +1640,9 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, indices[0] = index; - for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i]) + for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++) { + index = indices[i]; ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, 0, NULL, &identity ); if (ret != GDI_ERROR) break; }

1 0

Huw Davies : gdi32: Add an option to allow pen_lines to draw a closed figure.
by Alexandre Julliard Nov. 24, 2011

Nov. 24, 2011

Module: wine Branch: master Commit: 224e51fcf55ee4b4c34550084c39b63365cdffa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=224e51fcf55ee4b4c34550084… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 24 09:26:44 2011 +0000 gdi32: Add an option to allow pen_lines to draw a closed figure. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 11 +++++------ dlls/gdi32/dibdrv/objects.c | 10 +++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 3e3ab21..4068b54 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -87,7 +87,7 @@ typedef struct dibdrv_physdev DWORD pen_color, pen_and, pen_xor; dash_pattern pen_pattern; dash_pos dash_pos; - BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts); + BOOL (* pen_lines)(struct dibdrv_physdev *pdev, int num, POINT *pts, BOOL close); /* brush */ UINT brush_style; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d5e4730..590a816 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -431,7 +431,7 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts)) + if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE)) return next->funcs->pLineTo( next, x, y ); return TRUE; @@ -528,7 +528,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO LPtoDP( dev->hdc, points, counts[i] ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, counts[i], points ); + pdev->pen_lines( pdev, counts[i], points, FALSE ); } HeapFree( GetProcessHeap(), 0, points ); @@ -553,7 +553,7 @@ BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) LPtoDP( dev->hdc, points, count ); reset_dash_origin( pdev ); - pdev->pen_lines( pdev, count, points ); + pdev->pen_lines( pdev, count, points, FALSE ); HeapFree( GetProcessHeap(), 0, points ); return TRUE; @@ -567,7 +567,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); - POINT pts[5]; + POINT pts[4]; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -583,9 +583,8 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; pts[2].y = pts[3].y = rect.bottom - 1; - pts[4] = pts[0]; - pdev->pen_lines(pdev, 5, pts); + pdev->pen_lines(pdev, 4, pts, TRUE); /* FIXME: Will need updating when we support wide pens */ diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 51e1fdc..0baafdb 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -696,7 +696,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { int i; @@ -705,6 +705,8 @@ static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) if (!solid_pen_line( pdev, pts + i, pts + i + 1 )) return FALSE; + if (close) return solid_pen_line( pdev, pts + num - 1, pts ); + return TRUE; } @@ -996,7 +998,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } -static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { int i; @@ -1005,10 +1007,12 @@ static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) return FALSE; + if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + return TRUE; } -static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts) +static BOOL null_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { return TRUE; }

1 0