April 2008 - Wine-commits - list.winehq.org

Sergey Khodych : dinput/tests: Add test to show dinput does not use user defined data format for keyboard .
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: c6a7fd44d28bc6c221e870980d260e3acf7ac3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a7fd44d28bc6c221e870980… Author: Sergey Khodych <khodych(a)gmail.com> Date: Fri Apr 18 00:29:24 2008 +0300 dinput/tests: Add test to show dinput does not use user defined data format for keyboard. --- dlls/dinput/tests/keyboard.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 76ecec8..440cd3c 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -71,6 +71,22 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) HRESULT hr; LPDIRECTINPUTDEVICE pKeyboard; BYTE kbd_state[256]; + BYTE custom_state[4]; + DIOBJECTDATAFORMAT dodf[] = + { + { &GUID_Key, 0, DIDFT_MAKEINSTANCE(DIK_Q)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 1, DIDFT_MAKEINSTANCE(DIK_W)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 2, DIDFT_MAKEINSTANCE(DIK_E)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 3, DIDFT_MAKEINSTANCE(DIK_R)|DIDFT_BUTTON, 0 }, + }; + + DIDATAFORMAT df; + df.dwSize = sizeof( df ); + df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); + df.dwFlags = DIDF_RELAXIS; + df.dwDataSize = sizeof( dodf )/sizeof( dodf[0] ); + df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); + df.rgodf = dodf; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); @@ -94,6 +110,19 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Uncquire() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_SetDataFormat( pKeyboard , &df ); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + todo_wine + { + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %s\n", DXGetErrorString8(hr)); + } if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Hwang YunSong(황윤성 : user32: Updated Korean resource.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 5322e742913438ad48176f2ff1ad5b076f90da4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5322e742913438ad48176f2ff… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Fri Apr 18 09:43:12 2008 +0900 user32: Updated Korean resource. --- dlls/user32/resources/user32_Ko.rc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/resources/user32_Ko.rc b/dlls/user32/resources/user32_Ko.rc index 9b2c307..a4aaa3e 100644 --- a/dlls/user32/resources/user32_Ko.rc +++ b/dlls/user32/resources/user32_Ko.rc @@ -51,7 +51,6 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 9, "MS Shell Dlg" BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX

1 0

Hwang YunSong(황윤성 : winecfg: Updated Korean resource.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: f5e69c0e3a5f3a7956bc898d032d7ed1ca1d3d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e69c0e3a5f3a7956bc898d0… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Fri Apr 18 09:43:33 2008 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 842c0e4..97662eb 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -67,7 +67,7 @@ BEGIN CONTROL "DirectX ��α׷� â�� 콺�� ϰ� ��(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "�� â ��ڰ� â�� ٹ̵�� (&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 - + CONTROL " �� â ��ڰ� â�� ϵ�� (&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wineâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", IDC_STATIC,15,37,228,80 CONTROL "â��ڰ� Wineâ�� ϵ�� (&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8

1 0

Hwang YunSong(황윤성 : comdlg32: Updated Korean resource.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: e52fb6c02995bd3e61c83be5383be5e1a9aac800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52fb6c02995bd3e61c83be53… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Fri Apr 18 09:41:31 2008 +0900 comdlg32: Updated Korean resource. --- dlls/comdlg32/cdlg_Ko.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ko.rc b/dlls/comdlg32/cdlg_Ko.rc index a855fb1..705e21c 100644 --- a/dlls/comdlg32/cdlg_Ko.rc +++ b/dlls/comdlg32/cdlg_Ko.rc @@ -445,6 +445,16 @@ STRINGTABLE DISCARDABLE PD32_PRINTER_STATUS_POWER_SAVE "�� ; " } + +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "��ַ�" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "��ڸ�" + IDS_FONT_BOLD_ITALIC "�� ڸ�" +} + + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "��"

1 0

Hwang YunSong(황윤성 : shell32: Updated Korean resource.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 8f5a37dc4df891ba2a8108bc39ad25add9e8d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5a37dc4df891ba2a8108bc3… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Fri Apr 18 09:42:45 2008 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 87eb281..e410bd9 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -138,18 +138,19 @@ ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } - -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "%s ��" +CAPTION " %s ��" FONT 10, "MS Shell Dlg" { -DEFPUSHBUTTON "Ȯ��", IDOK, 153, 133, 50, 12, WS_TABSTOP -LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER + DEFPUSHBUTTON "Ȯ��", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine ��̼��(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 -LTEXT "Wine�� Ǿ��ϴ�.:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 + LTEXT "%s ��", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Eric Pouech : winhelp: Fix regression introduced by Win64 warning fixes.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 975774382b63009ac224ea129b21f17201f2bad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975774382b63009ac224ea129… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 17 21:35:59 2008 +0200 winhelp: Fix regression introduced by Win64 warning fixes. --- programs/winhelp/hlpfile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 8181469..bdb0092 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -158,11 +158,11 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset) static int comp_PageByHash(void *p, const void *key, int leaf, void** next) { - ULONG_PTR lKey = (LONG_PTR)key; - ULONG_PTR lTest = GET_UINT(p, 0); + LONG lKey = (LONG_PTR)key; + LONG lTest = (INT)GET_UINT(p, 0); *next = (char *)p+(leaf?8:6); - WINE_TRACE("Comparing '%lu' with '%lu'\n", lKey, lTest); + WINE_TRACE("Comparing '%d' with '%d'\n", lKey, lTest); if (lTest < lKey) return -1; if (lTest > lKey) return 1; return 0; @@ -184,7 +184,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) if (hlpfile->version <= 16) return HLPFILE_PageByNumber(hlpfile, lHash); - ptr = HLPFILE_BPTreeSearch(hlpfile->Context, ULongToPtr(lHash), comp_PageByHash); + ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); if (!ptr) { WINE_ERR("Page of hash %x not found in file %s\n", lHash, hlpfile->lpszPath);

1 0

Jacek Caban : mshtml: Added possibility to get node object from nsIDOMNode only if available.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 625ed3d0aa631de0b70fef0a96ba4586b7f86df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625ed3d0aa631de0b70fef0a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 22:52:49 2008 +0200 mshtml: Added possibility to get node object from nsIDOMNode only if available. --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmldoc3.c | 2 +- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/txtrange.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 92a7f9a..005c629 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -289,7 +289,7 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo return S_OK; } - *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem)); + *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem, TRUE)); nsIDOMElement_Release(nselem); return S_OK; @@ -331,7 +331,7 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - node = get_node(This, (nsIDOMNode*)nsbody); + node = get_node(This, (nsIDOMNode*)nsbody, TRUE); nsIDOMHTMLElement_Release(nsbody); IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4388000..3b109e9 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -137,7 +137,7 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I ERR("GetDocumentElement failed: %08x\n", nsres); } if(nselem) { - node = get_node(This, (nsIDOMNode *)nselem); + node = get_node(This, (nsIDOMNode *)nselem, TRUE); nsIDOMDocument_Release(nsdoc); IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b7fac23..6dab3a1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1067,7 +1067,7 @@ static void create_child_list(HTMLDocument *doc, HTMLElement *elem, elem_vector nsres = nsIDOMNode_GetNodeType(iter, &node_type); if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) - elem_vector_add(buf, HTMLELEM_NODE_THIS(get_node(doc, iter))); + elem_vector_add(buf, HTMLELEM_NODE_THIS(get_node(doc, iter, TRUE))); } } @@ -1111,7 +1111,7 @@ static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector *b nsres = nsIDOMNode_GetNodeType(iter, &node_type); if(NS_SUCCEEDED(nsres) && node_type == ELEMENT_NODE) { - HTMLDOMNode *node = get_node(doc, iter); + HTMLDOMNode *node = get_node(doc, iter, TRUE); elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); create_all_list(doc, node, buf); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e098a83..a5df575 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -370,7 +370,7 @@ static HTMLDOMNode *create_node(HTMLDocument *doc, nsIDOMNode *nsnode) * (better) find a way to store HTMLDOMelement pointer in nsIDOMNode. */ -HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode) +HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode, BOOL create) { HTMLDOMNode *iter = This->nodes, *ret; @@ -380,7 +380,7 @@ HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode) iter = iter->next; } - if(iter) + if(iter || !create) return iter; ret = create_node(This, nsnode); diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 73af3b0..20a35ae 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -469,7 +469,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory return E_FAIL; } - hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(get_node(This->doc, (nsIDOMNode*)nselem)), + hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(get_node(This->doc, (nsIDOMNode*)nselem, TRUE)), &IID_IHTMLOptionElement, (void**)optelem); nsIDOMElement_Release(nselem); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 67e27a4..f7e1e1e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -464,7 +464,7 @@ void HTMLDOMNode_destructor(HTMLDOMNode*); HRESULT HTMLElement_QI(HTMLDOMNode*,REFIID,void**); void HTMLElement_destructor(HTMLDOMNode*); -HTMLDOMNode *get_node(HTMLDocument*,nsIDOMNode*); +HTMLDOMNode *get_node(HTMLDocument*,nsIDOMNode*,BOOL); void release_nodes(HTMLDocument*); void release_script_hosts(HTMLDocument*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e46b8fa..c172e0d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1073,7 +1073,7 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList FIXME("aContextFlags=%08x\n", aContextFlags); }; - show_context_menu(This->doc, dwID, &pt, (IDispatch*)HTMLDOMNODE(get_node(This->doc, aNode))); + show_context_menu(This->doc, dwID, &pt, (IDispatch*)HTMLDOMNODE(get_node(This->doc, aNode, TRUE))); return NS_OK; } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 72b9ce0..2fbc0bf 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1183,7 +1183,7 @@ static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElem return S_OK; } - node = get_node(This->doc, nsnode); + node = get_node(This->doc, nsnode, TRUE); nsIDOMNode_Release(nsnode); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)parent);

1 0

Jacek Caban : mshtml: Added IHTMLWindow3 stub implementation.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: a009157331320cc52482089fa5eedcd8d9d15bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a009157331320cc52482089fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 22:53:31 2008 +0200 mshtml: Added IHTMLWindow3 stub implementation. --- dlls/mshtml/htmlwindow.c | 181 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 8 ++ 3 files changed, 191 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0f57069..7ae121a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -55,6 +55,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); + }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { + TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); + *ppv = HTMLWINDOW3(This); } if(*ppv) { @@ -762,6 +765,183 @@ static const IHTMLWindow2Vtbl HTMLWindow2Vtbl = { HTMLWindow2_get_external }; +#define HTMLWINDOW3_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow3, iface) + +static HRESULT WINAPI HTMLWindow3_QueryInterface(IHTMLWindow3 *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI HTMLWindow3_AddRef(IHTMLWindow3 *iface) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI HTMLWindow3_Release(IHTMLWindow3 *iface) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + + return IHTMLWindow2_Release(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI HTMLWindow3_GetTypeInfoCount(IHTMLWindow3 *iface, UINT *pctinfo) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_GetTypeInfo(IHTMLWindow3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_GetIDsOfNames(IHTMLWindow3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, long *p) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_get_screenTop(IHTMLWindow3 *iface, long *p) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, long msec, + VARIANT *language, long *timerID) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, long msec, + VARIANT *language, long *timerID) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p %ld %p %p)\n", This, expression, msec, language, timerID); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_print(IHTMLWindow3 *iface) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_put_onbeforeprint(IHTMLWindow3 *iface, VARIANT v) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_get_onbeforeprint(IHTMLWindow3 *iface, VARIANT *p) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_put_onafterprint(IHTMLWindow3 *iface, VARIANT v) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_get_onafterprint(IHTMLWindow3 *iface, VARIANT *p) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_get_clipboardData(IHTMLWindow3 *iface, IHTMLDataTransfer **p) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow3_showModelessDialog(IHTMLWindow3 *iface, BSTR url, + VARIANT *varArgIn, VARIANT *options, IHTMLWindow2 **pDialog) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + FIXME("(%p)->(%s %p %p %p)\n", This, debugstr_w(url), varArgIn, options, pDialog); + return E_NOTIMPL; +} + +#undef HTMLWINDOW3_THIS + +static const IHTMLWindow3Vtbl HTMLWindow3Vtbl = { + HTMLWindow3_QueryInterface, + HTMLWindow3_AddRef, + HTMLWindow3_Release, + HTMLWindow3_GetTypeInfoCount, + HTMLWindow3_GetTypeInfo, + HTMLWindow3_GetIDsOfNames, + HTMLWindow3_Invoke, + HTMLWindow3_get_screenLeft, + HTMLWindow3_get_screenTop, + HTMLWindow3_attachEvent, + HTMLWindow3_detachEvent, + HTMLWindow3_setTimeout, + HTMLWindow3_setInterval, + HTMLWindow3_print, + HTMLWindow3_put_onbeforeprint, + HTMLWindow3_get_onbeforeprint, + HTMLWindow3_put_onafterprint, + HTMLWindow3_get_onafterprint, + HTMLWindow3_get_clipboardData, + HTMLWindow3_showModelessDialog +}; + static const char wineConfig_func[] = "window.__defineGetter__(\"external\",function() {\n" " return window.__wineWindow__.external;\n" @@ -869,6 +1049,7 @@ HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) HTMLWindow *ret = heap_alloc(sizeof(HTMLWindow)); ret->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; + ret->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; ret->ref = 1; ret->nswindow = NULL; ret->doc = doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f7e1e1e..ce75611 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -73,6 +73,7 @@ void init_dispex(DispatchEx*,IUnknown*); typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; + const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; LONG ref; @@ -296,6 +297,7 @@ typedef struct { } HTMLTextContainer; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) +#define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d041a2c..5e2acde 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -169,6 +169,13 @@ static REFIID const location_iids[] = { NULL }; +static REFIID const window_iids[] = { + &IID_IDispatch, + &IID_IHTMLWindow2, + &IID_IHTMLWindow3, + NULL +}; + typedef struct { const char *tag; REFIID *iids; @@ -1038,6 +1045,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "parentWidnow failed: %08x\n", hres); + test_ifaces((IUnknown*)window, window_iids); hres = IHTMLWindow2_get_navigator(window, &navigator); ok(hres == S_OK, "get_navigator failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Store IActiveScriptParseProcedure in ScriptHost.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: dfc84bd9642513558da3d489a1e0e029d3a23187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc84bd9642513558da3d489a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 22:53:52 2008 +0200 mshtml: Store IActiveScriptParseProcedure in ScriptHost. --- dlls/mshtml/script.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6a6442e..4157296 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -51,6 +51,7 @@ typedef struct { IActiveScript *script; IActiveScriptParse *parse; + IActiveScriptParseProcedure *parse_proc; SCRIPTSTATE script_state; @@ -147,7 +148,12 @@ static BOOL init_script_engine(ScriptHost *script_host) if(FAILED(hres)) WARN("AddNamedItem failed: %08x\n", hres); - /* FIXME: QI for IActiveScriptParseProcedure2 and IActiveScriptParseProcedure */ + hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParseProcedure2, + (void**)&script_host->parse_proc); + if(FAILED(hres)) { + /* FIXME: QI for IActiveScriptParseProcedure */ + WARN("Could not get IActiveScriptParseProcedure iface: %08x\n", hres); + } return TRUE; } @@ -167,6 +173,11 @@ static void release_script_engine(ScriptHost *This) IActiveScript_Close(This->script); default: + if(This->parse_proc) { + IActiveScriptParseProcedure_Release(This->parse_proc); + This->parse_proc = NULL; + } + if(This->parse) { IActiveScriptParse_Release(This->parse); This->parse = NULL;

1 0

Aric Stewart : wininet: Correct the case where Content-Length is set as well as Transfer-Encoding == chunked.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: bade2a31a60af7e9520b89aa5c3491eae19b2c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bade2a31a60af7e9520b89aa5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 17 13:05:41 2008 -0500 wininet: Correct the case where Content-Length is set as well as Transfer-Encoding == chunked. --- dlls/wininet/http.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e2ee9af..53e0331 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3239,6 +3239,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, { DWORD dwBufferSize; DWORD dwStatusCode; + WCHAR encoding[20]; + static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -3264,6 +3266,15 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (lpwhr->dwContentLength == 0) HTTP_FinishedReading(lpwhr); + /* Correct the case where both a Content-Length and Transfer-encoding = chuncked are set */ + + dwBufferSize = sizeof(encoding); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &dwBufferSize, NULL) && + !strcmpiW(encoding, szChunked)) + { + lpwhr->dwContentLength = -1; + } + dwBufferSize = sizeof(dwStatusCode); if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwStatusCode,&dwBufferSize,NULL))

1 0