January 2011 - Wine-commits

Andrew Nguyen : kernel32/tests: Avoid an input buffer overrun in the empty console write test.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: ab8b2cfaa17e5c70d3a0d75a0258805996ef7dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8b2cfaa17e5c70d3a0d75a0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jan 2 21:18:36 2011 -0600 kernel32/tests: Avoid an input buffer overrun in the empty console write test. --- dlls/kernel32/tests/console.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2f8cf84..da446a1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -171,9 +171,9 @@ static void testCursorInfo(HANDLE hCon) static void testEmptyWrite(HANDLE hCon) { + static const char emptybuf[16]; COORD c; DWORD len; - const char* mytest = ""; c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); @@ -197,13 +197,13 @@ static void testEmptyWrite(HANDLE hCon) } len = -1; - ok(WriteConsole(hCon, mytest, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* WriteConsole does not halt on a null terminator and is happy to write * memory contents beyond the actual size of the buffer. */ len = -1; - ok(WriteConsole(hCon, mytest, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + ok(WriteConsole(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); c.X += 16; okCURSOR(hCon, c); }

1 0

Hwang YunSong : regedit: Update Korean resource.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 9d3c1aa9251c822da6c00e35b03f7c12657bc3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3c1aa9251c822da6c00e35b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:36:32 2011 +0900 regedit: Update Korean resource. --- programs/regedit/Ko.rc | 288 ++++++++++++++++++++++++------------------------ 1 files changed, 145 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d3c1aa9251c822da6c00…

1 0

Hwang YunSong : serialui: Update Korean resource.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 91dac8deacdc268908c39ad8554f2ec430cca3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dac8deacdc268908c39ad85… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jan 3 10:37:55 2011 +0900 serialui: Update Korean resource. --- dlls/serialui/Ko.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/serialui/Ko.rc b/dlls/serialui/Ko.rc index ade2735..481bdcd 100644 --- a/dlls/serialui/Ko.rc +++ b/dlls/serialui/Ko.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 YunSong Hwang + * Copyright 2005,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,25 +18,27 @@ #include "serialui.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "�� " +CAPTION "속 " FONT 9, "MS Shell Dlg" BEGIN - LTEXT "��ӵ�", -1,5,20,55,10 + LTEXT "보드속도", -1,5,20,55,10 COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�и�Ƽ", -1,5,40,55,10 + LTEXT "패리티", -1,5,40,55,10 COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�帧 ��", -1,5,60,55,10 + LTEXT "흐름 제어", -1,5,60,55,10 COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "��Ÿ ��Ʈ", -1,5,80,55,10 + LTEXT "데이타 비트", -1,5,80,55,10 COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "�� Ʈ", -1,5,100,55,10 + LTEXT "정지 비트", -1,5,100,55,10 COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ȯ��", IDOK,30,138,50,14 - PUSHBUTTON "��", IDCANCEL,85,138,50,14 + DEFPUSHBUTTON "확인", IDOK,30,138,50,14 + PUSHBUTTON "취소", IDCANCEL,85,138,50,14 /* these two buttons are for testing Get/SetDefaultCommConfig */ /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */

1 0

Damian Dixon : advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: a9bbd7dc86aff14308e0a5491e0f660fe3c49a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9bbd7dc86aff14308e0a5491… Author: Damian Dixon <damian.dixon(a)gmail.com> Date: Sat Jan 1 20:19:55 2011 +0000 advapi32: Implement SetEntriesInAclA by calling SetEntriesInAclW. --- dlls/advapi32/security.c | 57 +++++++++++++++- dlls/advapi32/tests/security.c | 138 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 189 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9bbd7dc86aff14308e0a…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIDOMEventListener iface.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: c8d6a502f0c98c47443136ebb6cfd28bc3e16838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d6a502f0c98c47443136ebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 12:19:35 2011 +0100 mshtml: COM cleanup for the nsIDOMEventListener iface. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/nsevents.c | 55 +++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36ea68e..bc0b5fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,8 +624,6 @@ struct HTMLDocumentNode { struct list plugin_hosts; }; -#define NSEVENTLIST(x) ((nsIDOMEventListener*) &(x)->lpDOMEventListenerVtbl) - #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 85d6e56..f6a1ed6 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; + nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; } nsEventListener; @@ -67,25 +67,28 @@ static LONG release_listener(nsDocumentEventListener *This) return ref; } -#define NSEVENTLIST_THIS(iface) DEFINE_THIS(nsEventListener, DOMEventListener, iface) +static inline nsEventListener *impl_from_nsIDOMEventListener(nsIDOMEventListener *iface) +{ + return CONTAINING_RECORD(iface, nsEventListener, nsIDOMEventListener_iface); +} static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *iface, nsIIDRef riid, void **result) { - nsEventListener *This = NSEVENTLIST_THIS(iface); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); - *result = NSEVENTLIST(This); + *result = &This->nsIDOMEventListener_iface; } if(*result) { - nsIWebBrowserChrome_AddRef(NSEVENTLIST(This)); + nsIWebBrowserChrome_AddRef(&This->nsIDOMEventListener_iface); return NS_OK; } @@ -95,19 +98,19 @@ static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *ifa static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; - LONG ref = InterlockedIncrement(&This->ref); + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + LONG ref = InterlockedIncrement(&This->This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%d\n", This->This, ref); return ref; } static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) { - nsDocumentEventListener *This = NSEVENTLIST_THIS(iface)->This; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); - return release_listener(This); + return release_listener(This->This); } static BOOL is_doc_child_focus(NSContainer *nscontainer) @@ -121,7 +124,8 @@ static BOOL is_doc_child_focus(NSContainer *nscontainer) static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -140,7 +144,8 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; TRACE("(%p)\n", doc); @@ -160,7 +165,8 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj; if(!doc) @@ -220,7 +226,8 @@ static void handle_docobj_load(HTMLDocumentObj *doc) static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; @@ -263,7 +270,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { - HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; + nsEventListener *This = impl_from_nsIDOMEventListener(iface); + HTMLDocumentNode *doc = This->This->doc; const PRUnichar *type; nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; @@ -299,8 +307,6 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } -#undef NSEVENTLIST_THIS - #define EVENTLISTENER_VTBL(handler) \ { \ nsDOMEventListener_QueryInterface, \ @@ -332,7 +338,7 @@ static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, static void init_listener(nsEventListener *This, nsDocumentEventListener *listener, const nsIDOMEventListenerVtbl *vtbl) { - This->lpDOMEventListenerVtbl = vtbl; + This->nsIDOMEventListener_iface.lpVtbl = vtbl; This->This = listener; } @@ -350,7 +356,8 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ return; } - init_event(target, type, NSEVENTLIST(&doc->nsevent_listener->htmlevent_listener), TRUE); + init_event(target, type, &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, + TRUE); nsIDOMEventTarget_Release(target); } @@ -395,10 +402,10 @@ void init_nsevents(HTMLDocumentNode *doc) return; } - init_event(target, wsz_blur, NSEVENTLIST(&listener->blur_listener), TRUE); - init_event(target, wsz_focus, NSEVENTLIST(&listener->focus_listener), TRUE); - init_event(target, wsz_keypress, NSEVENTLIST(&listener->keypress_listener), FALSE); - init_event(target, wsz_load, NSEVENTLIST(&listener->load_listener), TRUE); + init_event(target, wsz_blur, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_focus, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, wsz_keypress, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, wsz_load, &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); }

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed variables.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 64bf7ca869cd6615bf6ecc9eafd9a165938031c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bf7ca869cd6615bf6ecc9ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 31 23:36:08 2010 +0300 oleview: Fix some crashes on unnamed variables. --- programs/oleview/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 2b69ec4..771305f 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -420,7 +420,7 @@ static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) memset(wszAfter, 0, sizeof(wszAfter)); CreateTypeInfo(wszText, wszAfter, pVarDesc->elemdescVar.tdesc, pTypeInfo); AddToStrW(wszText, wszSpace); - AddToStrW(wszText, bstrName); + if (bstrName) AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszSemicolon); @@ -482,7 +482,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszAfter); if (i<cVars-1) AddToTLDataStrW(tld, wszComa);

1 0

Nikolay Sivov : oleview: Fix some crashes on unnamed methods/arguments.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: f88d7bc8ca2e67d4b04870dc6295aaf04661c4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88d7bc8ca2e67d4b04870dc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 16:05:10 2011 +0300 oleview: Fix some crashes on unnamed methods/arguments. --- programs/oleview/typelib.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 771305f..d2d6d00 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -631,7 +631,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszStdCall); AddToTLDataStrW(tld, wszSpace); } - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszOpenBrackets2); for(j=0; j<pFuncDesc->cParams; j++) @@ -701,8 +701,11 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszAfter); AddToTLDataStrW(tld, wszSpace); if (j+1 < namesNo) { - AddToTLDataStrW(tld, bstrParamNames[j+1]); - SysFreeString(bstrParamNames[j+1]); + if (bstrParamNames[j+1]) + { + AddToTLDataStrW(tld, bstrParamNames[j+1]); + SysFreeString(bstrParamNames[j+1]); + } } else { AddToTLDataStrW(tld, szRhs); }

1 0

David Hedberg : shell32: Fix test error on certain w2k8 setups.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 2a809403d94450112b359d58e4cb49bf43051f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a809403d94450112b359d58e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jan 2 22:55:32 2011 +0100 shell32: Fix test error on certain w2k8 setups. --- dlls/shell32/tests/ebrowser.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index a221f97..6d9dbb1 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1706,6 +1706,8 @@ static void test_InputObject(void) process_msgs(); hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); todo_wine ok(hr == (found ? S_OK : S_FALSE), "Got 0x%08x (%04x)\n", hr, i); + if(i == VK_F5) + Sleep(1000); /* Needed for w2k8 (64bit) */ } process_msgs();

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in HTMLFrameBase.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 6b793e94ad94d5f5f69b621286e55cbcb5f07aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b793e94ad94d5f5f69b62128… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 00:59:45 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in HTMLFrameBase. --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 100 ++++++++++++++++++++++-------------------- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +-- 5 files changed, 57 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b793e94ad94d5f5f69b6…

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in HTMLDocumentNode.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: e5214b24bbb6968c02db88f9f7d236747c630063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5214b24bbb6968c02db88f9f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:01:38 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 12 ++------- dlls/mshtml/mutation.c | 52 ++++++++++++++++++++++------------------- dlls/mshtml/npplugin.c | 4 +- dlls/mshtml/pluginhost.c | 4 +- dlls/mshtml/script.c | 3 +- dlls/mshtml/secmgr.c | 21 +++++++++-------- 7 files changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5214b24bbb6968c02db8…

1 0