wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Alexander Morozov : include: Add some Shell32 interfaces and coclasses.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 420b48b4c88a867297d55bb3ac8814de6d9e3b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=420b48b4c88a867297d55bb3a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jan 14 20:41:10 2011 +0300 include: Add some Shell32 interfaces and coclasses. --- include/shldisp.idl | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 366 insertions(+), 0 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 07c3059..ce6d555 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -77,6 +77,15 @@ interface IAutoComplete2 : IAutoComplete } [ + uuid(50a7e9b0-70ef-11d1-b75a-00a0c90564fe), + version(1.0) +] +library Shell32 +{ + +importlib("stdole2.tlb"); + +[ object, uuid(9ba05970-f6a8-11cf-a442-00a0c90a8f39), pointer_default(unique) @@ -119,6 +128,363 @@ coclass ShellFolderViewOC [default, source] dispinterface DShellFolderViewEvents; } +interface FolderItem; +interface FolderItems; +interface FolderItemVerb; +interface FolderItemVerbs; + +/***************************************************************************** + * Folder interface + */ +[ + object, + uuid(bbcbde60-c3ff-11ce-8350-444553540000), + oleautomation, + dual +] +interface Folder : IDispatch +{ + [propget, id(DISPID_VALUE)] + HRESULT Title( [out, retval] BSTR *pbs ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT ParentFolder( [out, retval] Folder **ppsf ); + + HRESULT Items( [out, retval] FolderItems **ppid ); + + HRESULT ParseName( [in] BSTR bName, [out, retval] FolderItem **ppid ); + + HRESULT NewFolder( [in] BSTR bName, [in, optional] VARIANT vOptions ); + + HRESULT MoveHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT CopyHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT GetDetailsOf( [in] VARIANT vItem, + [in] int iColumn, + [out, retval] BSTR *pbs ); +} + +/***************************************************************************** + * Folder2 interface + */ +[ + object, + uuid(f0d2d8ef-3890-11d2-bf8b-00c04fb93661), + oleautomation, + dual +] +interface Folder2 : Folder +{ + [propget] + HRESULT Self( [out, retval] FolderItem **ppfi ); + + [propget] + HRESULT OfflineStatus( [out, retval] LONG *pul ); + + HRESULT Synchronize(); + + [propget, id(1)] + HRESULT HaveToShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbHaveToShowWebViewBarricade ); + + HRESULT DismissedWebViewBarricade(); +} + +/***************************************************************************** + * Folder3 interface + */ +[ + object, + uuid(a7ae5f64-c4d7-4d7f-9307-4d24ee54b841), + oleautomation, + dual +] +interface Folder3 : Folder2 +{ + [propget, id(2)] + HRESULT ShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbShowWebViewBarricade ); + + [propput, id(2)] + HRESULT ShowWebViewBarricade( [in] VARIANT_BOOL bShowWebViewBarricade ); +} + +/***************************************************************************** + * FolderItem interface + */ +[ + object, + uuid(fac32c80-cbe4-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItem : IDispatch +{ + typedef FolderItem *LPFOLDERITEM; + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + [propput, id(DISPID_VALUE)] + HRESULT Name( [in] BSTR bs ); + + [propget] + HRESULT Path( [out, retval] BSTR *pbs ); + + [propget] + HRESULT GetLink( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT GetFolder( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT IsLink( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFolder( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFileSystem( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsBrowsable( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT ModifyDate( [out, retval] DATE *pdt ); + + [propput] + HRESULT ModifyDate( [in] DATE dt ); + + [propget] + HRESULT Size( [out, retval] LONG *pul ); + + [propget] + HRESULT Type( [out, retval] BSTR *pbs ); + + HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); + + HRESULT InvokeVerb( [in, optional] VARIANT vVerb ); +} + +/***************************************************************************** + * FolderItems interface + */ +[ + object, + uuid(744129e0-cbe5-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItems : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItem **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * FolderItemVerb interface + */ +[ + object, + uuid(08ec3e00-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerb : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + HRESULT DoIt(); +} + +/***************************************************************************** + * FolderItemVerbs interface + */ +[ + object, + uuid(1f8352c0-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerbs : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItemVerb **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * IShellDispatch interface + */ +[ + object, + uuid(d8f015c0-c278-11ce-a49e-444553540000), + oleautomation, + hidden, + dual +] +interface IShellDispatch : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT NameSpace( [in] VARIANT vDir, [out, retval] Folder **ppsdf ); + + HRESULT BrowseForFolder( [in] long Hwnd, + [in] BSTR Title, + [in] long Options, + [in, optional] VARIANT RootFolder, + [out, retval] Folder **ppsdf ); + + HRESULT Windows( [out, retval] IDispatch **ppid ); + + HRESULT Open( [in] VARIANT vDir ); + + HRESULT Explore( [in] VARIANT vDir ); + + HRESULT MinimizeAll(); + + HRESULT UndoMinimizeALL(); + + HRESULT FileRun(); + + HRESULT CascadeWindows(); + + HRESULT TileVertically(); + + HRESULT TileHorizontally(); + + HRESULT ShutdownWindows(); + + HRESULT Suspend(); + + HRESULT EjectPC(); + + HRESULT SetTime(); + + HRESULT TrayProperties(); + + HRESULT Help(); + + HRESULT FindFiles(); + + HRESULT FindComputer(); + + HRESULT RefreshMenu(); + + HRESULT ControlPanelItem( [in] BSTR szDir ); +} + +[ + uuid(13709620-c279-11ce-a49e-444553540000) +] +coclass Shell +{ + [default] interface IShellDispatch; +} + +[ + uuid(0a89a860-d7b1-11ce-8350-444553540000), + hidden +] +coclass ShellDispatchInproc +{ + interface IUnknown; +} + +typedef +[ + uuid(ca31ea20-48d0-11cf-8350-444553540000) +] +enum ShellSpecialFolderConstants { + ssfDESKTOP = 0x00, + ssfPROGRAMS = 0x02, + ssfCONTROLS = 0x03, + ssfPRINTERS = 0x04, + ssfPERSONAL = 0x05, + ssfFAVORITES = 0x06, + ssfSTARTUP = 0x07, + ssfRECENT = 0x08, + ssfSENDTO = 0x09, + ssfBITBUCKET = 0x0a, + ssfSTARTMENU = 0x0b, + ssfDESKTOPDIRECTORY = 0x10, + ssfDRIVES = 0x11, + ssfNETWORK = 0x12, + ssfNETHOOD = 0x13, + ssfFONTS = 0x14, + ssfTEMPLATES = 0x15, + ssfCOMMONSTARTMENU = 0x16, + ssfCOMMONPROGRAMS = 0x17, + ssfCOMMONSTARTUP = 0x18, + ssfCOMMONDESKTOPDIR = 0x19, + ssfAPPDATA = 0x1a, + ssfPRINTHOOD = 0x1b, + ssfLOCALAPPDATA = 0x1c, + ssfALTSTARTUP = 0x1d, + ssfCOMMONALTSTARTUP = 0x1e, + ssfCOMMONFAVORITES = 0x1f, + ssfINTERNETCACHE = 0x20, + ssfCOOKIES = 0x21, + ssfHISTORY = 0x22, + ssfCOMMONAPPDATA = 0x23, + ssfWINDOWS = 0x24, + ssfSYSTEM = 0x25, + ssfPROGRAMFILES = 0x26, + ssfMYPICTURES = 0x27, + ssfPROFILE = 0x28, + ssfSYSTEMx86 = 0x29, + ssfPROGRAMFILESx86 = 0x30 +} ShellSpecialFolderConstants; + +} /* library Shell32 */ + /***************************************************************************** * IAsyncOperation interface */

1 0

Alexandre Julliard : po: Unify the spelling of some menu entries across programs.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: baeb0d971f1a2bb52e493778491d6bdfe334990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=baeb0d971f1a2bb52e4937784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 17:56:12 2011 +0100 po: Unify the spelling of some menu entries across programs. --- po/ar.po | 38 ++++++++------------------------------ po/bg.po | 37 ++++++++----------------------------- po/ca.po | 35 ++++++++--------------------------- po/cs.po | 34 +++++++--------------------------- po/da.po | 32 +++++++------------------------- po/de.po | 32 +++++++------------------------- po/el.po | 31 ++++++------------------------- po/en.po | 37 ++++++++----------------------------- po/en_US.po | 32 +++++++------------------------- po/eo.po | 38 ++++++++------------------------------ po/es.po | 34 +++++++--------------------------- po/fa.po | 38 ++++++++------------------------------ po/fi.po | 38 ++++++++------------------------------ po/fr.po | 32 +++++++------------------------- po/he.po | 32 +++++++------------------------- po/hi.po | 32 ++++++-------------------------- po/hu.po | 33 +++++++-------------------------- po/it.po | 32 +++++++------------------------- po/ja.po | 34 +++++++--------------------------- po/ko.po | 32 +++++++------------------------- po/lt.po | 32 +++++++------------------------- po/ml.po | 32 ++++++-------------------------- po/nb_NO.po | 32 +++++++------------------------- po/nl.po | 32 +++++++------------------------- po/or.po | 32 ++++++-------------------------- po/pa.po | 32 ++++++-------------------------- po/pl.po | 32 +++++++------------------------- po/pt_BR.po | 32 +++++++------------------------- po/pt_PT.po | 32 +++++++------------------------- po/rm.po | 34 ++++++---------------------------- po/ro.po | 32 +++++++------------------------- po/ru.po | 32 +++++++------------------------- po/sk.po | 33 ++++++--------------------------- po/sl.po | 32 +++++++------------------------- po/sr_RS(a)cyrillic.po | 39 ++++++++------------------------------- po/sr_RS(a)latin.po | 38 ++++++++------------------------------ po/sv.po | 32 +++++++------------------------- po/te.po | 32 ++++++-------------------------- po/th.po | 39 ++++++++------------------------------- po/tr.po | 32 +++++++------------------------- po/uk.po | 33 +++++++-------------------------- po/wa.po | 38 ++++++++------------------------------ po/wine.pot | 31 ++++++------------------------- po/zh_CN.po | 32 +++++++------------------------- po/zh_TW.po | 32 +++++++------------------------- programs/progman/progman.rc | 4 ++-- programs/taskmgr/taskmgr.rc | 4 ++-- programs/winefile/winefile.rc | 2 +- programs/winhlp32/winhlp32.rc | 2 +- programs/wordpad/wordpad.rc | 2 +- 50 files changed, 324 insertions(+), 1202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baeb0d971f1a2bb52e493…

1 0

Alexander Kochetkov : wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 69f88da1879cc850113e5f55d0cb85fd13ea2701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f88da1879cc850113e5f55d… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Fri Jan 14 03:18:19 2011 +0300 wineps.drv: Disable world transform for fonts in GM_COMPATIBLE mode. --- dlls/wineps.drv/download.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 9ad8a2c..52de752 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -20,6 +20,7 @@ #include <string.h> #include <stdlib.h> #include <assert.h> +#include <math.h> #include <stdarg.h> #include <stdio.h> @@ -271,6 +272,12 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) /* Retrieve the world -> device transform */ GetTransform(physDev->hdc, 0x204, &xform); + if(GetGraphicsMode(physDev->hdc) == GM_COMPATIBLE) + { + xform.eM11 = xform.eM22 = fabs(xform.eM22); + xform.eM21 = xform.eM12 = 0; + } + physDev->font.size.xx = ps_round(ppem * xform.eM11); physDev->font.size.xy = ps_round(ppem * xform.eM12); physDev->font.size.yx = ps_round(ppem * xform.eM21);

1 0

Juan Lang : mswsock.h: Fix typo.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 7d21d9361ca99d2870cf73f49bfe8847a89e5baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21d9361ca99d2870cf73f49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 14 07:59:17 2011 -0800 mswsock.h: Fix typo. --- include/mswsock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 1447a8d..610dd2c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -87,7 +87,7 @@ extern "C" { #define SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) #else #define WS_SIO_UDP_CONNRESET _WSAIOW(WS_IOC_VENDOR,12) -#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(IOC_VENDOR,300) +#define WS_SIO_SET_COMPATIBILITY_MODE _WSAIOW(WS_IOC_VENDOR,300) #endif #define DE_REUSE_SOCKET TF_REUSE_SOCKET

1 0

Erich Hoover : urlmon: Fix MK protocol handling of escaped characters.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: aaa9fa711260da7272dc7d2330e6c366fac04904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa9fa711260da7272dc7d233… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:04:25 2011 -0700 urlmon: Fix MK protocol handling of escaped characters. --- dlls/urlmon/mk.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index bfee8e9..46b4ddc 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -205,8 +205,8 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, LPWSTR mime, progid, display_name, colon_ptr; DWORD path_size = INTERNET_MAX_URL_LENGTH; DWORD bindf=0, eaten=0, scheme=0, len; + BSTR url, path_tmp, path = NULL; IParseDisplayName *pdn; - BSTR url, path = NULL; BINDINFO bindinfo; STATSTG statstg; IMoniker *mon; @@ -244,14 +244,22 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, CoTaskMemFree(mime); } - hres = IUri_GetPath(pUri, &path); + hres = IUri_GetPath(pUri, &path_tmp); if(FAILED(hres)) return hres; + path = heap_alloc(path_size); + hres = UrlUnescapeW((LPWSTR)path_tmp, path, &path_size, 0); + SysFreeString(path_tmp); + if (FAILED(hres)) + { + heap_free(path); + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + } progid = path+1; /* skip '@' symbol */ colon_ptr = strchrW(path, ':'); if(!colon_ptr) { - SysFreeString(path); + heap_free(path); return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); } @@ -261,7 +269,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, progid[colon_ptr-progid] = 0; /* overwrite ':' with NULL terminator */ hres = CLSIDFromProgID(progid, &clsid); - SysFreeString(path); + heap_free(path); if(FAILED(hres)) { heap_free(display_name);

1 0

Erich Hoover : urlmon: Update MK protocol handling to IInternetProtocolEx.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 1678a4a673b8dde13754eddf51a08d98f086ba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1678a4a673b8dde13754eddf5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jan 11 12:03:38 2011 -0700 urlmon: Update MK protocol handling to IInternetProtocolEx. --- dlls/urlmon/mk.c | 275 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 159 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1678a4a673b8dde13754e…

1 0

Jörg Höhle : winmm: PlaySound ignores SND_NOWAIT.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 0a81f12ce10f88a06e1a95523c1e4da7587fa3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81f12ce10f88a06e1a95523… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 11 23:30:34 2011 +0100 winmm: PlaySound ignores SND_NOWAIT. --- dlls/winmm/playsound.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 7b6c946..f6416ed 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -472,10 +472,8 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo TRACE("pszSound='%p' hmod=%p fdwSound=%08X\n", pszSound, hmod, fdwSound); - /* FIXME? I see no difference between SND_NOWAIT and SND_NOSTOP ! - * there could be one if several sounds can be played at once... - */ - if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySoundList != NULL) + /* SND_NOWAIT is ignored in w95/2k/xp. */ + if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) return FALSE; /* alloc internal structure, if we need to play something */

1 0

Greg Geldorp : ddraw/tests: Remove some outdated tests.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 1e7c80ba9afb8b442ff2148cd364c149f107cbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c80ba9afb8b442ff2148cd… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 14 15:02:34 2011 +0100 ddraw/tests: Remove some outdated tests. --- dlls/ddraw/tests/d3d.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a8535a3..1b312b5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -766,16 +766,7 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { - /* pow2 is hardware dependent */ - - ok(hal->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal line caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok(hal->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, - "HAL Device %d hal tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcLineCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel line caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); - ok((hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE) == 0, - "HAL Device %d hel tri caps has D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + trace("HAL Device %d\n", ver); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -3622,7 +3613,8 @@ static void FindDevice(void) /* Currently Wine only supports the creation of one Direct3D device * for a given DirectDraw instance. */ todo_wine - ok(SUCCEEDED(hr), "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); + ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDPIXELFORMAT) /* XP/Win2003 Wow64 on VMware */, + "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); if (SUCCEEDED(hr)) IDirect3DDevice_Release(d3dhal);

1 0

Jacek Caban : msxml3: Fixed memory leak (valgrind).
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: 4c6f8989eb27165c1ae90cd01b6ec65e65a027e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6f8989eb27165c1ae90cd01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 14 14:01:57 2011 +0100 msxml3: Fixed memory leak (valgrind). --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 23bc227..4dd4de8 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -543,6 +543,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) list_remove(&header->entry); SysFreeString(header->header); SysFreeString(header->value); + heap_free(header); } /* detach callback object */

1 0

Alexandre Julliard : configure: Add a check for the QuickTime development headers.
by Alexandre Julliard 14 Jan '11

14 Jan '11

Module: wine Branch: master Commit: fa3ddd838b47b047560a893e4e7b314393e3ce62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3ddd838b47b047560a893e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 14 15:59:51 2011 +0100 configure: Add a check for the QuickTime development headers. --- configure | 16 +++++++++++----- configure.ac | 12 +++++++++--- include/config.h.in | 3 +++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 1332a69..c68b1d6 100755 --- a/configure +++ b/configure @@ -653,13 +653,13 @@ CROSSCC CROSSTEST_DISABLE PRELINK CARBONLIB +QUICKTIMELIB LIBOPENCL FRAMEWORK_OPENAL COREAUDIO DISKARBITRATIONLIB LDEXECFLAGS APPLICATIONSERVICESLIB -QUICKTIMELIB IOKITLIB COREFOUNDATIONLIB SECURITYLIB @@ -5772,6 +5772,7 @@ for ac_header in \ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ OpenCL/opencl.h \ + QuickTime/ImageCompression.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -6513,8 +6514,6 @@ fi IOKITLIB="-framework IOKit -framework CoreFoundation" - QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo" - APPLICATIONSERVICESLIB="-framework ApplicationServices" LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000" @@ -6563,11 +6562,18 @@ done LIBS="$ac_save_LIBS" fi - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} case $host_cpu in *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" ;; esac + if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + then + QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo" + + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} + else + as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." + fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then CARBONLIB="-framework Carbon" @@ -10865,7 +10871,7 @@ fi fi CPPFLAGS="$ac_save_CPPFLAGS" fi -if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then : +if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; xno) ;; diff --git a/configure.ac b/configure.ac index fee8e88..4d049b6 100644 --- a/configure.ac +++ b/configure.ac @@ -379,6 +379,7 @@ AC_CHECK_HEADERS(\ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ OpenCL/opencl.h \ + QuickTime/ImageCompression.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -700,7 +701,6 @@ case $host_os in AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") - AC_SUBST(QUICKTIMELIB,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" @@ -731,12 +731,18 @@ case $host_os in AC_CHECK_FUNCS(IOHIDManagerCreate) LIBS="$ac_save_LIBS" fi - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} case $host_cpu in *powerpc*) LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME ;; esac + if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" + then + AC_SUBST(QUICKTIMELIB,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} + else + WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) + fi dnl Enable quartz driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then @@ -1471,7 +1477,7 @@ then fi CPPFLAGS="$ac_save_CPPFLAGS" fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes], +WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], [gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled]) test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} diff --git a/include/config.h.in b/include/config.h.in index 3af1424..2e4370d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -659,6 +659,9 @@ /* Define to 1 if you have the `pwrite' function. */ #undef HAVE_PWRITE +/* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */ +#undef HAVE_QUICKTIME_IMAGECOMPRESSION_H + /* Define to 1 if you have the `readdir' function. */ #undef HAVE_READDIR

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011