January 2012 - Wine-Commits

André Hentschel : winedbg: Also adjust the detailed crash dialog controls when maximized.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: c8dd507b62d37268c8fcf1ee32fce3075ef8fe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8dd507b62d37268c8fcf1ee3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 22:03:59 2012 +0100 winedbg: Also adjust the detailed crash dialog controls when maximized. --- programs/winedbg/crashdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 39e9bce..1f73979 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -310,7 +310,7 @@ static INT_PTR WINAPI details_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPAR return TRUE; case WM_SIZE: - if (wparam == SIZE_RESTORED) + if (wparam == SIZE_RESTORED || wparam == SIZE_MAXIMIZED) { int off_x = (short)LOWORD( lparam ) - orig_size.x; int off_y = (short)HIWORD( lparam ) - orig_size.y;

1 0

Henri Verbeet : ddraw: Just pin all version 1 surfaces.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: 67d4be0347f39e5c6b8536dcaa91b405ed359b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d4be0347f39e5c6b8536dca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:20 2012 +0100 ddraw: Just pin all version 1 surfaces. --- dlls/ddraw/surface.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 60f29dc..595d141 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5474,15 +5474,16 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; } + /* Some applications assume surfaces will always be mapped at the same + * address. Some of those also assume that this address is valid even when + * the surface isn't mapped, and that updates done this way will be + * visible on the screen. The game Nox is such an application, + * Commandos: Behind Enemy Lines is another. */ + if (version == 1) + flags |= WINED3D_SURFACE_PIN_SYSMEM; + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Some applications assume that the primary surface will always be - * mapped at the same address. Some of those also assume that this - * address is valid even when the surface isn't mapped, and that - * updates done this way will be visible on the screen. The game Nox - * is such an application. */ - if (version == 1) - flags |= WINED3D_SURFACE_PIN_SYSMEM; usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: ddeff9815cbf5266ee38d476d3f417cc7b176017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeff9815cbf5266ee38d476d… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 18 22:31:37 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 381571b..ba307b9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-17 22:20+0300\n" +"PO-Revision-Date: 2012-01-18 22:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -13250,7 +13250,7 @@ msgstr "Nepavyko išsaugoti" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Įkeliama išsami informacija, prašome palaukti..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDECLUSAGE typedef.
by Alexandre Julliard Jan. 19, 2012

Jan. 19, 2012

Module: wine Branch: master Commit: bee9adbd05b083d628d5c1030db1c1ea244eb095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee9adbd05b083d628d5c1030… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:22 2012 +0100 wined3d: Get rid of the WINED3DDECLUSAGE typedef. --- dlls/d3d8/vertexdeclaration.c | 37 ++++++++------- dlls/wined3d/arb_program_shader.c | 35 ++++++++------- dlls/wined3d/device.c | 20 ++++---- dlls/wined3d/glsl_shader.c | 18 ++++---- dlls/wined3d/shader.c | 91 +++++++++++++++++++----------------- dlls/wined3d/utils.c | 34 +++++++------- dlls/wined3d/vertexdeclaration.c | 59 +++++++++++++----------- dlls/wined3d/wined3d_private.h | 8 ++-- include/wine/wined3d.h | 34 +++++++------- 9 files changed, 176 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bee9adbd05b083d628d5c…

1 0

Jacek Caban : mshtml: Added ITargetContainer stub implementation.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: b18ff8b3b0c697556107e515281a42b1b6422dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18ff8b3b0c697556107e5152… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 19:52:34 2012 +0100 mshtml: Added ITargetContainer stub implementation. --- dlls/mshtml/htmldoc.c | 4 +++ dlls/mshtml/mshtml_private.h | 4 +++ dlls/mshtml/oleobj.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 2 + 4 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 45a7986..039893e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2249,6 +2249,9 @@ static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, v if(IsEqualGUID(&IID_ICustomDoc, riid)) { TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppv); *ppv = &This->ICustomDoc_iface; + }else if(IsEqualGUID(&IID_ITargetContainer, riid)) { + TRACE("(%p)->(IID_ITargetContainer %p)\n", This, ppv); + *ppv = &This->ITargetContainer_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -2386,6 +2389,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); init_doc(&doc->basedoc, (IUnknown*)&doc->ICustomDoc_iface, &doc->dispex.IDispatchEx_iface); + TargetContainer_Init(doc); doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; doc->ref = 1; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5480435..684d396 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -26,6 +26,7 @@ #include "perhist.h" #include "dispex.h" #include "objsafe.h" +#include "htiframe.h" #include "wine/list.h" #include "wine/unicode.h" @@ -437,6 +438,7 @@ struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; ICustomDoc ICustomDoc_iface; + ITargetContainer ITargetContainer_iface; LONG ref; @@ -638,6 +640,8 @@ void HTMLDocument_Window_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN; +void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN; + void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT HTMLCurrentStyle_Create(HTMLElement*,IHTMLCurrentStyle**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e207066..9d50347 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -891,6 +891,56 @@ static const IOleContainerVtbl OleContainerVtbl = { OleContainer_LockContainer }; +static inline HTMLDocumentObj *impl_from_ITargetContainer(ITargetContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, ITargetContainer_iface); +} + +static HRESULT WINAPI TargetContainer_QueryInterface(ITargetContainer *iface, REFIID riid, void **ppv) +{ + HTMLDocumentObj *This = impl_from_ITargetContainer(iface); + return ICustomDoc_QueryInterface(&This->ICustomDoc_iface, riid, ppv); +} + +static ULONG WINAPI TargetContainer_AddRef(ITargetContainer *iface) +{ + HTMLDocumentObj *This = impl_from_ITargetContainer(iface); + return ICustomDoc_AddRef(&This->ICustomDoc_iface); +} + +static ULONG WINAPI TargetContainer_Release(ITargetContainer *iface) +{ + HTMLDocumentObj *This = impl_from_ITargetContainer(iface); + return ICustomDoc_Release(&This->ICustomDoc_iface); +} + +static HRESULT WINAPI TargetContainer_GetFrameUrl(ITargetContainer *iface, LPWSTR *ppszFrameSrc) +{ + HTMLDocumentObj *This = impl_from_ITargetContainer(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameSrc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetContainer_GetFramesContainer(ITargetContainer *iface, IOleContainer **ppContainer) +{ + HTMLDocumentObj *This = impl_from_ITargetContainer(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static const ITargetContainerVtbl TargetContainerVtbl = { + TargetContainer_QueryInterface, + TargetContainer_AddRef, + TargetContainer_Release, + TargetContainer_GetFrameUrl, + TargetContainer_GetFramesContainer +}; + +void TargetContainer_Init(HTMLDocumentObj *This) +{ + This->ITargetContainer_iface.lpVtbl = &TargetContainerVtbl; +} + /********************************************************** * IObjectSafety implementation */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6cc1733..710b1f5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -33,6 +33,7 @@ #include "dispex.h" #include "mshtml_test.h" #include "objsafe.h" +#include "htiface.h" static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); @@ -148,6 +149,7 @@ static const IID * const doc_obj_iids[] = { &IID_IOleContainer, &IID_IObjectSafety, &IID_IProvideClassInfo, + &IID_ITargetContainer, NULL };

1 0

Jacek Caban : ieframe: Call appropriate functions in response to toolbar icons.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 3b8c977a74ddf3d4fb66fa6cb4fbcf1060334dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8c977a74ddf3d4fb66fa6cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 18:48:08 2012 +0100 ieframe: Call appropriate functions in response to toolbar icons. --- dlls/ieframe/iexplore.c | 24 ++++++++++++++++++++---- dlls/ieframe/resource.h | 4 ++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 2d9bca3..91337c4 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -461,10 +461,10 @@ static void create_rebar(HWND hwnd) SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)imagelist); SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - add_tb_button(hwndToolbar, 0, 0, IDS_TB_BACK); - add_tb_button(hwndToolbar, 1, 0, IDS_TB_FORWARD); - add_tb_button(hwndToolbar, 2, 0, IDS_TB_STOP); - add_tb_button(hwndToolbar, 3, 0, IDS_TB_REFRESH); + add_tb_button(hwndToolbar, 0, ID_BROWSE_BACK, IDS_TB_BACK); + add_tb_button(hwndToolbar, 1, ID_BROWSE_FORWARD, IDS_TB_FORWARD); + add_tb_button(hwndToolbar, 2, ID_BROWSE_STOP, IDS_TB_STOP); + add_tb_button(hwndToolbar, 3, ID_BROWSE_REFRESH, IDS_TB_REFRESH); add_tb_button(hwndToolbar, 4, ID_BROWSE_HOME, IDS_TB_HOME); add_tb_separator(hwndToolbar); add_tb_button(hwndToolbar, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); @@ -594,6 +594,22 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR IWebBrowser2_GoHome(&This->IWebBrowser2_iface); break; + case ID_BROWSE_BACK: + IWebBrowser2_GoBack(&This->IWebBrowser2_iface); + break; + + case ID_BROWSE_FORWARD: + IWebBrowser2_GoForward(&This->IWebBrowser2_iface); + break; + + case ID_BROWSE_STOP: + IWebBrowser2_Stop(&This->IWebBrowser2_iface); + break; + + case ID_BROWSE_REFRESH: + IWebBrowser2_Refresh(&This->IWebBrowser2_iface); + break; + case ID_BROWSE_ABOUT: ie_dialog_about(hwnd); break; diff --git a/dlls/ieframe/resource.h b/dlls/ieframe/resource.h index 33559cc..da24048 100644 --- a/dlls/ieframe/resource.h +++ b/dlls/ieframe/resource.h @@ -42,6 +42,10 @@ #define ID_BROWSE_ADDFAV 1200 #define ID_BROWSE_HOME 1201 +#define ID_BROWSE_BACK 1202 +#define ID_BROWSE_FORWARD 1203 +#define ID_BROWSE_STOP 1204 +#define ID_BROWSE_REFRESH 1205 #define ID_BROWSE_BAR_STD 1300 #define ID_BROWSE_BAR_ADDR 1301

1 0

Jacek Caban : mshtml: Added a test showing that HTMLDocument does not support ITargetFrame interface .
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 44aa20720d82a02805120a5ed9c57f832b0bd7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa20720d82a02805120a5ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 18:41:02 2012 +0100 mshtml: Added a test showing that HTMLDocument does not support ITargetFrame interface. --- dlls/mshtml/tests/htmldoc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index fb615fb..736e60f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6288,6 +6288,11 @@ static void test_QueryInterface(IHTMLDocument2 *doc) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(doc, &IID_ITargetFrame, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); + hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); ok(qi != (IUnknown*)doc, "disp == doc\n");

1 0

Jacek Caban : htiface.idl: Added ITargetFrame declaration.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: e5558c5ca3e4717a5432e1acbed528edebac3c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5558c5ca3e4717a5432e1acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 18:40:47 2012 +0100 htiface.idl: Added ITargetFrame declaration. --- include/htiface.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/include/htiface.idl b/include/htiface.idl index 2c98ec2..e82a7b4 100644 --- a/include/htiface.idl +++ b/include/htiface.idl @@ -24,6 +24,50 @@ cpp_quote("#include <htiframe.h>") /***************************************************************************** + * ITargetFrame interface + */ +[ + object, + uuid(d5f78c80-5252-11cf-90fa-00aa0042106e), + pointer_default(unique) +] +interface ITargetFrame: IUnknown +{ + typedef [unique] ITargetFrame *LPTARGETFRAME; + + typedef enum { + NAVIGATEFRAME_FL_RECORD = 0x01, + NAVIGATEFRAME_FL_POST = 0x02, + NAVIGATEFRAME_FL_NO_DOC_CACHE = 0x04, + NAVIGATEFRAME_FL_NO_IMAGE_CACHE = 0x08, + NAVIGATEFRAME_FL_AUTH_FAIL_CACHE_OK = 0x10, + NAVIGATEFRAME_FL_SENDING_FROM_FORM = 0x20, + NAVIGATEFRAME_FL_REALLY_SENDING_FROM_FORM = 0x40 + } NAVIGATEFRAME_FLAGS; + + typedef struct tagNavigateData { + ULONG ulTarget; + ULONG ulURL; + ULONG ulRefURL; + ULONG ulPostData; + DWORD dwFlags; + } NAVIGATEDATA; + + HRESULT SetFrameName([in] LPCWSTR pszFrameName); + HRESULT GetFrameName([out] LPWSTR *ppszFrameName); + HRESULT GetParentFrame([out] IUnknown **ppunkParent); + + HRESULT FindFrame( + [in] LPCWSTR pszTargetName, + [in] IUnknown *ppunkContextFrame, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT SetFrameSrc([in] LPCWSTR pszFrameSrc); + HRESULT GetFrameSrc([out] LPWSTR *ppszFrameSrc); +} + +/***************************************************************************** * ITargetFramePriv interface */ [

1 0

Jörg Höhle : msacm32: Add missing acmStreamClose (Valgrind).
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

Module: wine Branch: master Commit: 72f8c64889099dcade4449f2b07a37d6ab073d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f8c64889099dcade4449f2b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 18 00:08:12 2012 +0100 msacm32: Add missing acmStreamClose (Valgrind). --- dlls/msacm32/stream.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 10ce79b..0b336dd 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -257,6 +257,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret); if (ret == MMSYSERR_NOERROR) { if (fdwOpen & ACM_STREAMOPENF_QUERY) { + MSACM_Message((HACMDRIVER)wad, ACMDM_STREAM_CLOSE, (LPARAM)&was->drvInst, 0); acmDriverClose(had, 0L); } break;

1 0

Francois Gouget : comdlg32: Remove the font sample characters string.
by Alexandre Julliard Jan. 18, 2012

Jan. 18, 2012

1 0