July 2010 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : shdocvw: Add a statusbar to IE.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: e532b1c3bd7e8da23b0fc75955670888a4bcd5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e532b1c3bd7e8da23b0fc7595… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 29 11:35:42 2010 +0200 shdocvw: Add a statusbar to IE. --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/iexplore.c | 16 ++++++++++++++++ dlls/shdocvw/resource.h | 1 + dlls/shdocvw/shdocvw.h | 1 + 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index fa2b3ac..9e2d8e1 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shdocvw.dll IMPORTLIB = shdocvw -IMPORTS = uuid shell32 shlwapi user32 gdi32 advapi32 +IMPORTS = uuid shell32 comctl32 shlwapi user32 gdi32 advapi32 DELAYIMPORTS = version urlmon ole32 oleaut32 C_SRCS = \ diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index b2359ca..52cde1b 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -50,10 +50,19 @@ static const WCHAR wszWineInternetExplorer[] = void adjust_ie_docobj_rect(HWND frame, RECT* rc) { HWND hwndRebar = GetDlgItem(frame, IDC_BROWSE_REBAR); + HWND hwndStatus = GetDlgItem(frame, IDC_BROWSE_STATUSBAR); INT barHeight = SendMessageW(hwndRebar, RB_GETBARHEIGHT, 0, 0); rc->top += barHeight; rc->bottom -= barHeight; + + if(IsWindowVisible(hwndStatus)) + { + RECT statusrc; + + GetClientRect(hwndStatus, &statusrc); + rc->bottom -= statusrc.bottom - statusrc.top; + } } static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -145,7 +154,12 @@ static void create_rebar(HWND hwnd) static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) { + InternetExplorer* This = (InternetExplorer*)lpcs->lpCreateParams; SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); + + This->status_hwnd = CreateStatusWindowW(CCS_NODIVIDER|WS_CHILD|WS_VISIBLE, NULL, hwnd, IDC_BROWSE_STATUSBAR); + SendMessageW(This->status_hwnd, SB_SIMPLE, TRUE, 0); + create_rebar(hwnd); return 0; @@ -157,6 +171,8 @@ static LRESULT iewnd_OnSize(InternetExplorer *This, INT width, INT height) INT barHeight = SendMessageW(hwndRebar, RB_GETBARHEIGHT, 0, 0); RECT docarea = {0, 0, width, height}; + SendMessageW(This->status_hwnd, WM_SIZE, 0, 0); + adjust_ie_docobj_rect(This->frame_hwnd, &docarea); if(This->doc_host.hwnd) diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 7283b71..91e9a11 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -26,6 +26,7 @@ #define IDC_BROWSE_OPEN_URL 1002 #define IDC_BROWSE_REBAR 1003 #define IDC_BROWSE_ADDRESSBAR 1004 +#define IDC_BROWSE_STATUSBAR 1005 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256 diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 2bdf436..151b48b 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -189,6 +189,7 @@ struct InternetExplorer { LONG ref; HWND frame_hwnd; + HWND status_hwnd; DocHost doc_host; };

1 0

Andrew Nguyen : krnl386.exe: Fix last error check for DOS compatibility hack.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 4e49518a38cf0447f7b60813e100c4857ffb0537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e49518a38cf0447f7b60813e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jul 30 07:42:55 2010 -0500 krnl386.exe: Fix last error check for DOS compatibility hack. --- dlls/krnl386.exe16/int21.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 39e195a..f32c3a4 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -1092,7 +1092,8 @@ static BOOL INT21_CreateFile( CONTEXT86 *context, winMode, winAttributes, 0 ); /* DOS allows to open files on a CDROM R/W */ if( winHandle == INVALID_HANDLE_VALUE && - GetLastError()== ERROR_WRITE_PROTECT) { + (GetLastError() == ERROR_WRITE_PROTECT || + GetLastError() == ERROR_ACCESS_DENIED)) { winHandle = CreateFileW( pathW, winAccess & ~GENERIC_WRITE, winSharing, NULL, winMode, winAttributes, 0 ); }

1 0

Jacek Caban : wscript.exe: Added support for IHost type info.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 5cc0d1ee80c56c9645cb291414c9ede4951d0cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc0d1ee80c56c9645cb29141… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 14:01:55 2010 +0200 wscript.exe: Added support for IHost type info. --- programs/wscript/main.c | 27 +++++++++++++++++++++++++-- programs/wscript/wscript.h | 2 ++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d5631a2..612bb54 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wscript); static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; static const WCHAR wshW[] = {'W','S','H',0}; +ITypeInfo *host_ti; + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -83,8 +85,8 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, return E_FAIL; if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { - WINE_FIXME("SCRIPTINFO_ITYPEINFO not supported\n"); - return E_NOTIMPL; + ITypeInfo_AddRef(host_ti); + *ppti = host_ti; } if(dwReturnMask & SCRIPTINFO_IUNKNOWN) { @@ -151,6 +153,23 @@ static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; +static BOOL load_typelib(void) +{ + ITypeLib *typelib; + HRESULT hres; + + static const WCHAR wscript_exeW[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; + + hres = LoadTypeLib(wscript_exeW, &typelib); + if(FAILED(hres)) + return FALSE; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHost, &host_ti); + + ITypeLib_Release(typelib); + return SUCCEEDED(hres); +} + static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) { WCHAR fileid[64], progid[64]; @@ -222,6 +241,9 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) { HRESULT hres; + if(!load_typelib()) + return FALSE; + hres = IActiveScript_SetScriptSite(script, &script_site); if(FAILED(hres)) return FALSE; @@ -327,6 +349,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm if(init_engine(script, parser)) { run_script(cmdline, script, parser); IActiveScript_Close(script); + ITypeInfo_Release(host_ti); }else { WINE_FIXME("Script initialization failed\n"); } diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index cd29ed4..a5c642d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -19,3 +19,5 @@ #include "ihost.h" extern IHost host_obj; + +extern ITypeInfo *host_ti;

1 0

Alexandre Julliard : gdi32: Replicate a Windows bug in StretchDIBits for top-down bitmaps in the non-stretching case .
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: c68589e3dddcd93171b8af12e55b540689946d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68589e3dddcd93171b8af12e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 14:19:25 2010 +0200 gdi32: Replicate a Windows bug in StretchDIBits for top-down bitmaps in the non-stretching case. Found by Mathias Kosch. --- dlls/gdi32/dib.c | 8 ++++++++ dlls/gdi32/tests/bitmap.c | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index bf36986..c799ea3 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -227,6 +227,14 @@ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, return 0; } + if (xSrc == 0 && ySrc == 0 && widthDst == widthSrc && heightDst == heightSrc && + info->bmiHeader.biCompression == BI_RGB) + { + /* Windows appears to have a fast case optimization + * that uses the wrong origin for top-down DIBs */ + if (height < 0 && heightSrc < abs(height)) ySrc = abs(height) - heightSrc; + } + hBitmap = GetCurrentObject(hdc, OBJ_BITMAP); if (xDst == 0 && yDst == 0 && xSrc == 0 && ySrc == 0 && diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 3be5734..aa723bd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2813,7 +2813,7 @@ static void test_StretchDIBits(void) expected[2] = 0x00000000, expected[3] = 0x00000000; legacy_expected[0] = 0xFEDCBA98, legacy_expected[1] = 0x00000000; legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; - todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 1, 1, expected, legacy_expected, __LINE__); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98;

1 0

Andrey Turkin : imagehlp: Implement ImageGetDigestStream.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: d9cc69be5b489a49c5edb95f308848df0dd43ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cc69be5b489a49c5edb95f3… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Jul 18 14:39:07 2010 +0400 imagehlp: Implement ImageGetDigestStream. Mostly based on patch from Juan Lang. --- dlls/imagehlp/integrity.c | 250 ++++++++++++++++++++++++++++++++++++++++++- dlls/imagehlp/tests/image.c | 19 ++-- 2 files changed, 253 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9cc69be5b489a49c5edb…

1 0

Jacek Caban : wscript.exe: Added missing vararg attribute.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 4dc9711ffa3623fc4ae21f9b9d4dc0b121106c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc9711ffa3623fc4ae21f9b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:56:37 2010 +0200 wscript.exe: Added missing vararg attribute. --- programs/wscript/ihost.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wscript/ihost.idl b/programs/wscript/ihost.idl index 8e05f5a..ccfa173 100644 --- a/programs/wscript/ihost.idl +++ b/programs/wscript/ihost.idl @@ -153,7 +153,7 @@ library IHost [in, optional, defaultvalue("")] BSTR Prefix, [out, retval] IDispatch **out_Dispatch); - [id(IHOST_ECHO_DISPID)] + [id(IHOST_ECHO_DISPID), vararg] HRESULT Echo([in] SAFEARRAY(VARIANT) pArgs); [id(IHOST_GETOBJECT_DISPID)]

1 0

Jacek Caban : wscript.exe: Added IHost's IDispatch functions implementation .
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 68a3f4eb3c1134eaf5761078b6c29dc02453be36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a3f4eb3c1134eaf5761078b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 30 13:56:49 2010 +0200 wscript.exe: Added IHost's IDispatch functions implementation. --- programs/wscript/host.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index b22bff6..9634100 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -66,24 +66,30 @@ static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo) static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WINE_FIXME("(%x %x %p\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(host_ti); + *ppTInfo = host_ti; + return S_OK; } static HRESULT WINAPI Host_GetIDsOfNames(IHost *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WINE_FIXME("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + return ITypeInfo_GetIDsOfNames(host_ti, rgszNames, cNames, rgDispId); } static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WINE_FIXME("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); - return E_NOTIMPL; + WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + + return ITypeInfo_Invoke(host_ti, iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name)

1 0

Nikolay Sivov : shlwapi/tests: Fix some test failures on RTL enabled boxes.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 93985e70a84b718a6a5b6ff32a88f67f1ed09adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93985e70a84b718a6a5b6ff32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 30 13:37:00 2010 +0400 shlwapi/tests: Fix some test failures on RTL enabled boxes. --- dlls/shlwapi/tests/ordinal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0089a43..7b02031 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2390,13 +2390,15 @@ static void test_SHCreateWorkerWindowA(void) /* test exstyle */ ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == WS_EX_WINDOWEDGE, "0x%08lx\n", ret); + ok(ret == WS_EX_WINDOWEDGE || + ret == (WS_EX_WINDOWEDGE|WS_EX_LAYOUTRTL) /* systems with RTL locale */, "0x%08lx\n", ret); DestroyWindow(hwnd); hwnd = pSHCreateWorkerWindowA(0, NULL, WS_EX_TOOLWINDOW, 0, 0, 0); ret = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08lx\n", ret); + ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW) || + ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_LAYOUTRTL) /* systems with RTL locale */, "0x%08lx\n", ret); DestroyWindow(hwnd); }

1 0

Maarten Lankhorst : mciqtz32: Fix mciOpen.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 910b95d328c18be4a168e080127b28d36fb2139c URL: http://source.winehq.org/git/wine.git/?a=commit;h=910b95d328c18be4a168e0801… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 26 15:54:22 2010 +0200 mciqtz32: Fix mciOpen. --- dlls/mciqtz32/mciqtz.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 9d90957..d610c19 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -225,6 +225,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, } else if (style) IVideoWindow_put_WindowStyle(wma->vidwin, style); + IBasicVideo_GetVideoSize(wma->vidbasic, &rc.right, &rc.bottom); wma->opened = TRUE; if (dwFlags & MCI_NOTIFY) @@ -251,6 +252,7 @@ err: if (wma->uninit) CoUninitialize(); + wma->uninit = 0; return MCIERR_INTERNAL; }

1 0

Maarten Lankhorst : mciqtz32: Fix mciPlay.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 6d8d3d74fa7db59a5c000c4f76f04341fa456168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8d3d74fa7db59a5c000c4f7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 26 15:55:11 2010 +0200 mciqtz32: Fix mciPlay. --- dlls/mciqtz32/mciqtz.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d610c19..35a2f17 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -293,6 +293,9 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms { WINE_MCIQTZ* wma; HRESULT hr; + REFERENCE_TIME time1 = 0, time2 = 0; + GUID format; + DWORD pos1; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -303,6 +306,24 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (!wma) return MCIERR_INVALID_DEVICE_ID; + IMediaSeeking_GetTimeFormat(wma->seek, &format); + if (dwFlags & MCI_FROM) { + if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) + time1 = lpParms->dwFrom * 10000; + else + time1 = lpParms->dwFrom; + pos1 = AM_SEEKING_AbsolutePositioning; + } else + pos1 = AM_SEEKING_NoPositioning; + if (dwFlags & MCI_TO) { + if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) + time2 = lpParms->dwTo * 10000; + else + time2 = lpParms->dwTo; + } else + IMediaSeeking_GetDuration(wma->seek, &time2); + IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { TRACE("Cannot run filtergraph (hr = %x)\n", hr); @@ -312,6 +333,8 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (!wma->parent) IVideoWindow_put_Visible(wma->vidwin, OATRUE); + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); return 0; }

1 0