May 2010 - Wine-commits - list.winehq.org

David Hedberg : include: Add IExplorerBrowserEvents, IExplorerPaneVisibility and IExplorerBrowser interface declarations and related GUID 's.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: a72b1eff0e1d27d87662c0bc0f09bc027999a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72b1eff0e1d27d87662c0bc0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon May 24 16:40:42 2010 +0200 include: Add IExplorerBrowserEvents, IExplorerPaneVisibility and IExplorerBrowser interface declarations and related GUID's. --- include/shlguid.h | 12 +++++ include/shobjidl.idl | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/shtypes.idl | 2 + 3 files changed, 143 insertions(+), 0 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index 0055d38..bd75cc3 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -164,4 +164,16 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* IExplorerBrowser */ +DEFINE_GUID(CLSID_ExplorerBrowser, 0x71F96385, 0xDDD6, 0x48D3, 0xA0, 0xC1, 0xAE, 0x06, 0xE8, 0xB0, 0x55, 0xFB); + +DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); +DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); +DEFINE_GUID(EP_Commands_Organize, 0x72E81700, 0xE3EC, 0x4660, 0xBF, 0x24, 0x3C, 0x3B, 0x7B, 0x64, 0x88, 0x06); +DEFINE_GUID(EP_Commands_View, 0x21F7C32D, 0xEEAA, 0x439B, 0xBB, 0x51, 0x37, 0xB9, 0x6F, 0xD6, 0xA9, 0x43); +DEFINE_GUID(EP_DetailsPane, 0x43ABF98B, 0x89B8, 0x472D, 0xB9, 0xCE, 0xE6, 0x9B, 0x82, 0x29, 0xF0, 0x19); +DEFINE_GUID(EP_PreviewPane, 0x893C63D1, 0x45C8, 0x4D17, 0xBE, 0x19, 0x22, 0x3B, 0xE7, 0x1B, 0xE3, 0x65); +DEFINE_GUID(EP_QueryPane, 0x65BCDE4F, 0x4F07, 0x4F27, 0x83, 0xA7, 0x1A, 0xFC, 0xA4, 0xDF, 0x7D, 0xDD); +DEFINE_GUID(EP_AdvQueryPane, 0xB4E9DB8B, 0x34BA, 0x4C39, 0xB5, 0xCC, 0x16, 0xA1, 0xBD, 0x2C, 0x41, 0x1C); + #endif /* __WINE_SHLGUID_H */ diff --git a/include/shobjidl.idl b/include/shobjidl.idl index a106248..cf05b33 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1569,3 +1569,132 @@ interface IProfferService : IUnknown HRESULT RevokeService([in] DWORD cookie); } + +/***************************************************************************** + * IExplorerBrowserEvents interface + */ +[ + object, + uuid(361BBDC7-E6EE-4E13-BE58-58E2240C810F) +] +interface IExplorerBrowserEvents : IUnknown +{ + HRESULT OnNavigationPending( + [in] PCIDLIST_ABSOLUTE pidlFolder); + + HRESULT OnViewCreated( + [in] IShellView *psv); + + HRESULT OnNavigationComplete( + [in] PCIDLIST_ABSOLUTE pidlFolder); + + HRESULT OnNavigationFailed( + [in] PCIDLIST_ABSOLUTE pidlFolder); +} + +typedef GUID EXPLORERPANE; +typedef EXPLORERPANE *REFEXPLORERPANE; + +/***************************************************************************** + * IExplorerPaneVisibility interface + */ +[ + object, + uuid(E07010EC-BC17-44C0-97B0-46C7C95B9EDC) +] +interface IExplorerPaneVisibility : IUnknown +{ + typedef enum tagEXPLORERPANESTATE { + EPS_DONTCARE = 0x0, + EPS_DEFAULT_ON = 0x1, + EPS_DEFAULT_OFF = 0x2, + EPS_STATE_MASK = 0xffff, + EPS_INITIALSTATE = 0x10000, + EPS_FORCE = 0x20000 + } EXPLORERPANESTATE; + + HRESULT GetPaneState( + [in] REFEXPLORERPANE ep, + [out] EXPLORERPANESTATE *peps); +} + +typedef [v1_enum] enum tagEXPLORER_BROWSER_FILL_FLAGS { + EBF_NONE = 0, + EBF_SELECTFROMDATAOBJECT = 0x100, + EBF_NODROPTARGET = 0x200 +} EXPLORER_BROWSER_FILL_FLAGS; + +typedef [v1_enum] enum tagEXPLORER_BROWSER_OPTIONS { + EBO_NONE = 0x00, + EBO_NAVIGATEONCE = 0x01, + EBO_SHOWFRAMES = 0x02, + EBO_ALWAYSNAVIGATE = 0x04, + EBO_NOTRAVELLOG = 0x08, + EBO_NOWRAPPERWINDOW = 0x10, + EBO_HTMLSHAREPOINTVIEW = 0x20 +} EXPLORER_BROWSER_OPTIONS; + +cpp_quote("#define SID_SExplorerBrowserFrame IID_ICommDlgBrowser") + +/***************************************************************************** + * IExplorerBrowser interface + */ +[ + object, + uuid(DFD3B6B5-C10C-4BE9-85F6-A66969F402F6), + pointer_default(unique) +] +interface IExplorerBrowser : IUnknown +{ + + [local] HRESULT Initialize( + [in] HWND hwndParent, + [in] const RECT *prc, + [in, unique] const FOLDERSETTINGS *pfs); + + HRESULT Destroy(); + + [local] HRESULT SetRect( + [in,out,unique] HDWP *phdwp, + [in] RECT rcBrowser); + + HRESULT SetPropertyBag( + [in, string] LPCWSTR pszPropertyBag); + + HRESULT SetEmptyText( + [in, string] LPCWSTR pszEmptyText); + + HRESULT SetFolderSettings( + [in] const FOLDERSETTINGS *pfs); + + HRESULT Advise( + [in] IExplorerBrowserEvents *psbe, + [out] DWORD *pdwCookie); + + HRESULT Unadvise( + [in] DWORD dwCookie); + + HRESULT SetOptions( + [in] EXPLORER_BROWSER_OPTIONS dwFlag); + + HRESULT GetOptions( + [out] EXPLORER_BROWSER_OPTIONS *pdwFlag); + + HRESULT BrowseToIDList( + [in] PCUIDLIST_RELATIVE pidl, + [in] UINT uFlags); + + HRESULT BrowseToObject( + [in] IUnknown *punk, + [in] UINT uFlags); + + HRESULT FillFromObject( + [in] IUnknown *punk, + [in] EXPLORER_BROWSER_FILL_FLAGS dwFlags); + + HRESULT RemoveAll(); + + HRESULT GetCurrentView( + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppv); +} diff --git a/include/shtypes.idl b/include/shtypes.idl index dd908e3..5ed8daf 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -38,6 +38,8 @@ typedef LPITEMIDLIST PITEMID_CHILD; typedef const PITEMID_CHILD PCITEMID_CHILD; typedef LPCITEMIDLIST PCUITEMID_CHILD; typedef LPCITEMIDLIST *PCUITEMID_CHILD_ARRAY; +typedef LPCITEMIDLIST PCUIDLIST_RELATIVE; +typedef LPCITEMIDLIST PCIDLIST_ABSOLUTE; cpp_quote("#include <poppack.h>") #ifndef MAX_PATH

1 0

David Hedberg : include: Add ICommDlgBrowser2 and ICommDlgBrowser3 interfaces.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 75c146510e4b19ff4486ace8cc3d34d1b4631a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c146510e4b19ff4486ace8c… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon May 24 16:40:43 2010 +0200 include: Add ICommDlgBrowser2 and ICommDlgBrowser3 interfaces. --- include/shobjidl.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index cf05b33..002ec3e 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1012,6 +1012,55 @@ cpp_quote("#define CDBOSC_STATECHANGE 0x00000004") /***************************************************************************** + * ICommDlgBrowser2 interface + */ +[ + object, + uuid(10339516-2894-11D2-9039-00C04F8EEB3E), + pointer_default(unique) +] +interface ICommDlgBrowser2 : ICommDlgBrowser +{ + + HRESULT Notify( + [in] IShellView *ppshv, + [in] DWORD dwNotifyType); + + HRESULT GetDefaultMenuText( + [in] IShellView *ppshv, + [out, string, size_is(cchMax)] LPWSTR pszText, + [in] int cchMax); + + HRESULT GetViewFlags( + [out] DWORD *pdwFlags); +} + + +/***************************************************************************** + * ICommDlgBrowser3 interface + */ +[ + object, + uuid(C8AD25A1-3294-41EE-8165-71174BD01C57), + pointer_default(unique) +] +interface ICommDlgBrowser3 : ICommDlgBrowser2 +{ + + HRESULT OnColumnClicked( + [in] IShellView *ppshv, + [in] int iColumn); + + HRESULT GetCurrentFilter( + [out, string, size_is(cchFileSpec)] LPWSTR pszFileSpec, + [in] int cchFileSpec); + + HRESULT OnPreviewCreated( + [in] IShellView *ppshv); +} + + +/***************************************************************************** * IDockingWindowFrame interface */ [

1 0

Alexandre Julliard : msi: Ignore min/max versions if their values are null.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 598a25de82ca6c86340c8bffbaaef2d8a432cd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598a25de82ca6c86340c8bffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 20:33:28 2010 +0200 msi: Ignore min/max versions if their values are null. --- dlls/msi/upgrade.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index f9e35a4..b131d66 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -151,26 +151,30 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) (LPBYTE)&check, &sz); /* check min */ ver = MSI_RecordGetString(rec,2); - comp_ver = msi_version_str_to_dword(ver); - r = check - comp_ver; - if (r < 0 || (r == 0 && !(attributes & - msidbUpgradeAttributesVersionMinInclusive))) + if (ver) { - RegCloseKey(hukey); - index ++; - continue; + comp_ver = msi_version_str_to_dword(ver); + r = check - comp_ver; + if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive))) + { + RegCloseKey(hukey); + index ++; + continue; + } } /* check max */ ver = MSI_RecordGetString(rec,3); - comp_ver = msi_version_str_to_dword(ver); - r = check - comp_ver; - if (r > 0 || (r == 0 && !(attributes & - msidbUpgradeAttributesVersionMaxInclusive))) + if (ver) { - RegCloseKey(hukey); - index ++; - continue; + comp_ver = msi_version_str_to_dword(ver); + r = check - comp_ver; + if (r > 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMaxInclusive))) + { + RegCloseKey(hukey); + index ++; + continue; + } } /* check language*/

1 0

Sven Baars : sane.ds: Fix Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 54132d97e324b486c0341f6e10cf7d02643539fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=54132d97e324b486c0341f6e1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 23 12:23:10 2010 +0200 sane.ds: Fix Dutch translation. --- dlls/sane.ds/sane_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index ded7061..8f3f347 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -27,7 +27,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "Scannen" FONT 8, "MS Sans Serif" BEGIN - LTEXT "SCANNEN... Even geduld",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "SCANNEN... Even geduld a.u.b.",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : user.exe: Make sure 16-bit user and gdi never get unloaded.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 5d9801bc7f8404734cee7f505d768e463ff42b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9801bc7f8404734cee7f505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 13:43:00 2010 +0200 user.exe: Make sure 16-bit user and gdi never get unloaded. --- dlls/user.exe16/user.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index ba90db4..c536a6d 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1763,7 +1763,7 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) HINSTANCE16 gdi_inst; int userPercent, gdiPercent; - if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0; + if ((gdi_inst = GetModuleHandle16( "gdi" )) < 32) return 0; switch(resType) { @@ -1793,7 +1793,6 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) userPercent = gdiPercent = 0; break; } - FreeLibrary16( gdi_inst ); TRACE("<- userPercent %d, gdiPercent %d\n", userPercent, gdiPercent); return (WORD)min( userPercent, gdiPercent ); } @@ -2061,9 +2060,11 @@ BOOL WINAPI DllEntryPoint( DWORD reason, HINSTANCE16 inst, WORD ds, USER_HeapSel = ds; register_wow_handlers(); + LoadLibrary16( "gdi.exe" ); LoadLibrary16( "display.drv" ); LoadLibrary16( "keyboard.drv" ); LoadLibrary16( "mouse.drv" ); + LoadLibrary16( "user.exe" ); /* make sure it never gets unloaded */ return TRUE; }

1 0

Michael Stefaniuc : mapi32: Add the Romanian translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6db1531ad756df23196544753e397e1430236d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db1531ad756df23196544753… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 24 11:16:01 2010 +0200 mapi32: Add the Romanian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Ro.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 5f334d3..ba38288 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -20,6 +20,7 @@ RC_SRCS = \ Fr.rc \ Lt.rc \ Nl.rc \ + Ro.rc \ Ru.rc \ Si.rc \ version.rc diff --git a/dlls/mapi32/Ro.rc b/dlls/mapi32/Ro.rc new file mode 100644 index 0000000..84ad35f --- /dev/null +++ b/dlls/mapi32/Ro.rc @@ -0,0 +1,31 @@ +/* +* Copyright 2009 Owen Rudge for CodeWeavers +* Copyright 2010 Michael Stefaniuc +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Eroare la trimiterea emailului. Nu aveți un client de email MAPI instalat." + IDS_SEND_MAIL, "Trimite emailul" +}

1 0

David Adam : d3drm: Remove a useless include.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6448987253cc04c0786c0b48634f7228beee7139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6448987253cc04c0786c0b486… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:24:44 2010 +0200 d3drm: Remove a useless include. --- dlls/d3drm/d3drm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a14226c..30d2a4a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "d3drm_private.h" -#include "d3drm.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm);

1 0

David Adam : d3drm: Do not redefine already defined guids.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: c042f935b1a2defdc2c2dedda64a32ddcc87f8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c042f935b1a2defdc2c2dedda… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:27:28 2010 +0200 d3drm: Do not redefine already defined guids. --- dlls/d3drm/meshbuilder.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a2013f4..c1874bd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -28,9 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "dxfile.h" +#include "rmxfguid.h" #include "d3drm_private.h" -#include "d3drm.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); @@ -61,12 +61,6 @@ typedef struct { static const struct IDirect3DRMMeshBuilderVtbl Direct3DRMMeshBuilder_Vtbl; -static const GUID GUID_Header = { 0x3D82AB43, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_Mesh = { 0x3D82AB44, 0x62DA, 0x11CF, { 0xAB, 0x39, 0x00, 0x20, 0xAF, 0x71, 0xE4, 0x33 } }; -static const GUID GUID_MeshTextureCoords = { 0xF6F23F40, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; -static const GUID GUID_MeshMaterialList = { 0xF6F23F42, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; -static const GUID GUID_MeshNormals = { 0xF6F23F43, 0x7686, 0x11CF, { 0x8F, 0x52, 0x00, 0x40, 0x33, 0x35, 0x94, 0xA3 } }; - static char templates[] = { "xof 0302txt 0064" "template Header" @@ -489,7 +483,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_Header)) + if (!IsEqualGUID(pGuid, &TID_DXFILEHeader)) { ret = D3DRMERR_BADFILE; goto end; @@ -524,7 +518,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_Mesh)) + if (!IsEqualGUID(pGuid, &TID_D3DRMMesh)) { ret = D3DRMERR_NOTFOUND; goto end; @@ -571,7 +565,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &GUID_MeshNormals)) + if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) { DWORD tmp; @@ -587,7 +581,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); } - else if(!IsEqualGUID(pGuid, &GUID_MeshTextureCoords)) + else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) { hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) @@ -601,7 +595,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); } - else if(!IsEqualGUID(pGuid, &GUID_MeshMaterialList)) + else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { FIXME("MeshMaterialList not supported yet, ignoring...\n"); }

1 0

David Adam : d3drm: Remove a useless comment.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 668ddfba33091891b16c49ab0eb10038229c8f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668ddfba33091891b16c49ab0… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun May 23 05:29:06 2010 +0200 d3drm: Remove a useless comment. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c1874bd..bd5af1b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -563,7 +563,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilderImpl_Load(IDirect3DRMMeshBuilder* if goto end; } - FIXME("toto: Found object type whose GUID = %s\n", debugstr_guid(pGuid)); + FIXME("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) {

1 0

Alexandre Julliard : winex11: Unmap zero-size windows also while processing a PropertyNotify event.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 2cf9cdd3d81af3f26dc6b81d86c3fd094aa6aae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf9cdd3d81af3f26dc6b81d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 16:41:20 2010 +0200 winex11: Unmap zero-size windows also while processing a PropertyNotify event. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fa72ada..ef6c442 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2330,7 +2330,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && !is_window_rect_mapped( rectWindow ))) unmap_window( display, data ); }

1 0