December 2008 - Wine-commits

Alexandre Julliard : shell32: Make some functions static.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 1abff5afef2b836a8a24bfde0ddc661cd3aa17b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abff5afef2b836a8a24bfde0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:09:38 2008 +0100 shell32: Make some functions static. --- dlls/shell32/dialogs.c | 4 ++-- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/pidl.c | 9 ++++++++- dlls/shell32/pidl.h | 8 -------- dlls/shell32/shell32_main.h | 4 ---- dlls/shell32/shellpath.c | 18 +++++++++--------- dlls/shell32/shellstring.c | 12 ++++++------ dlls/shell32/shlexec.c | 2 +- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/undocshell.h | 4 ---- 10 files changed, 29 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1abff5afef2b836a8a24b…

1 0

Alexandre Julliard : shell32: Remove some unused functions.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 366fcaf1a7c341ee636c6d20cf076d6f3e7deece URL: http://source.winehq.org/git/wine.git/?a=commit;h=366fcaf1a7c341ee636c6d20c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 3 12:09:17 2008 +0100 shell32: Remove some unused functions. --- dlls/shell32/shellole.c | 21 +------------------ dlls/shell32/shellreg.c | 11 ---------- dlls/shell32/shlfsbind.c | 47 ---------------------------------------------- 3 files changed, 2 insertions(+), 77 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index eae8bc3..e67556f 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +extern INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax); /* shlwapi.24 */ /************************************************************************** * Default ClassFactory types @@ -77,23 +77,6 @@ static const struct { }; -/* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */ - -DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str) -{ - WCHAR sFormat[52] = {'{','%','0','8','l','x','-','%','0','4', - 'x','-','%','0','4','x','-','%','0','2', - 'x','%','0','2','x','-','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0', - '2','x','%','0','2','x','%','0','2','x', - '}','\0'}; - - return wsprintfW ( str, sFormat, - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - -} /************************************************************************* * SHCoCreateInstance [SHELL32.102] @@ -153,7 +136,7 @@ HRESULT WINAPI SHCoCreateInstance( } /* we look up the dll path in the registry */ - __SHGUIDToStringW(myclsid, sClassID); + SHStringFromGUIDW(myclsid, sClassID, sizeof(sClassID)/sizeof(WCHAR)); lstrcpyW(sKeyName, sCLSID); lstrcatW(sKeyName, sClassID); lstrcatW(sKeyName, sInProcServer32); diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 9ed8f9a..fe87e96 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -129,17 +129,6 @@ HRESULT WINAPI SHRegQueryValueExW ( } /************************************************************************* - * SHRegDeleteKeyA [SHELL32.?] - */ -HRESULT WINAPI SHRegDeleteKeyA( - HKEY hkey, - LPCSTR pszSubKey) -{ - FIXME("hkey=%p, %s\n", hkey, debugstr_a(pszSubKey)); - return 0; -} - -/************************************************************************* * SHRegDeleteKeyW [SHELL32.512] */ HRESULT WINAPI SHRegDeleteKeyW( diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index aa4ce97..8dbfc45 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -103,53 +103,6 @@ HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC return ret; } -HRESULT WINAPI FileSystemBindData_GetFindData(LPBC pbc, WIN32_FIND_DATAW *pfd) -{ - LPUNKNOWN pUnk; - IFileSystemBindData *pfsbd = NULL; - HRESULT ret; - - TRACE("%p, %p\n", pbc, pfd); - - if (!pfd) - return E_INVALIDARG; - - ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk); - if (SUCCEEDED(ret)) - { - ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd); - if (SUCCEEDED(ret)) - { - ret = IFileSystemBindData_GetFindData(pfsbd, pfd); - IFileSystemBindData_Release(pfsbd); - } - IUnknown_Release(pUnk); - } - return ret; -} - -HRESULT WINAPI FileSystemBindData_SetFindData(LPBC pbc, const WIN32_FIND_DATAW *pfd) -{ - LPUNKNOWN pUnk; - IFileSystemBindData *pfsbd = NULL; - HRESULT ret; - - TRACE("%p, %p\n", pbc, pfd); - - ret = IBindCtx_GetObjectParam(pbc, (LPOLESTR)wFileSystemBindData, &pUnk); - if (SUCCEEDED(ret)) - { - ret = IUnknown_QueryInterface(pUnk, &IID_IFileSystemBindData, (LPVOID *)&pfsbd); - if (SUCCEEDED(ret)) - { - ret = IFileSystemBindData_SetFindData(pfsbd, pfd); - IFileSystemBindData_Release(pfsbd); - } - IUnknown_Release(pUnk); - } - return ret; -} - static HRESULT WINAPI IFileSystemBindData_fnQueryInterface( IFileSystemBindData *iface, REFIID riid, LPVOID *ppV) {

1 0

Aric Stewart : gdi32: Use the substitute name, if it exists, when looking for font system links.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: c0c852247f79042de59ba16e89338613af985f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c852247f79042de59ba16e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 2 08:51:05 2008 -0600 gdi32: Use the substitute name, if it exists, when looking for font system links. Allows double indirection MS ShellDlg -> MS UI Gothic linked to system gothic to work as expected. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9e3ec02..2894dca 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3434,7 +3434,8 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) */ LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, FaceName)) + if(!strcmpiW(font_link->font_name, FaceName) || + (psub && !strcmpiW(font_link->font_name,psub->to.name))) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)

1 0

Konstantin Kondratyuk : include: Add new interfaces to mshtml.idl.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 174cc24fd6a470292fed0d18efd385d80cc1c267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174cc24fd6a470292fed0d18e… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Mon Nov 24 12:54:23 2008 +0300 include: Add new interfaces to mshtml.idl. --- include/mshtml.idl | 294 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 294 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 680748b..8bf3efa 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -1,5 +1,6 @@ /* * Copyright 2004-2007 Jacek Caban for CodeWeavers + * Copyright 2008 Konstantin Kondratyuk (Etersoft) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,61 @@ cpp_quote("DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x cpp_quote("#define SID_SHTMLWindow IID_IHTMLWindow2") cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory") +typedef enum { + POINTER_GRAVITY_Left, + POINTER_GRAVITY_Right, + POINTER_GRAVITY_Max = 2147483647 +} POINTER_GRAVITY; + +typedef enum { + CONTEXT_TYPE_None, + CONTEXT_TYPE_Text, + CONTEXT_TYPE_EnterScope, + CONTEXT_TYPE_ExitScope, + CONTEXT_TYPE_NoScope, + MARKUP_CONTEXT_TYPE_Max = 2147483647 +} MARKUP_CONTEXT_TYPE; + +typedef enum { + ELEM_ADJ_BeforeBegin, + ELEM_ADJ_AfterBegin, + ELEM_ADJ_BeforeEnd, + ELEM_ADJ_AfterEnd, + ELEMENT_ADJACENCY_Max = 2147483647 +} ELEMENT_ADJACENCY; + +typedef enum { + MOVEUNIT_PREVCHAR, + MOVEUNIT_NEXTCHAR, + MOVEUNIT_PREVCLUSTERBEG, + MOVEUNIT_NEXTCLUSTERBEG, + MOVEUNIT_PREVCLUSTEREND, + MOVEUNIT_NEXTCLUSTEREND, + MOVEUNIT_PREVWORDBEG, + MOVEUNIT_NEXTWORDBEG, + MOVEUNIT_PREVWORDEND, + MOVEUNIT_NEXTWORDEND, + MOVEUNIT_PREVPROOFWORD, + MOVEUNIT_NEXTPROOFWORD, + MOVEUNIT_NEXTURLBEG, + MOVEUNIT_PREVURLBEG, + MOVEUNIT_NEXTURLEND, + MOVEUNIT_PREVURLEND, + MOVEUNIT_PREVSENTENCE, + MOVEUNIT_NEXTSENTENCE, + MOVEUNIT_PREVBLOCK, + MOVEUNIT_NEXTBLOCK, + MOVEUNIT_ACTION_Max = 2147483647 +} MOVEUNIT_ACTION; + +typedef enum _SELECTION_TYPE { + SELECTION_TYPE_None, + SELECTION_TYPE_Caret, + SELECTION_TYPE_Text, + SELECTION_TYPE_Control, + SELECTION_TYPE_Max = 2147483647 +} SELECTION_TYPE; + interface IHTMLDocument2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -20032,4 +20088,242 @@ methods: VARIANT width(); } +/***************************************************************************** + * IMarkupContainer interface + */ +[ + object, + pointer_default(unique), + uuid(3050f5f9-98b5-11cf-bb82-00aa00bdce0B) +] +interface IMarkupContainer : IUnknown +{ + HRESULT OwningDoc([out] IHTMLDocument2 **ppDoc); +} + +/***************************************************************************** + * IMarkupPointer interface + */ +[ + object, + pointer_default(unique), + uuid(3050f49f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IMarkupPointer : IUnknown +{ + HRESULT OwningDoc([out] IHTMLDocument2 **ppDoc); + + HRESULT Gravity([out] POINTER_GRAVITY *pGravity); + + HRESULT SetGravity([in] POINTER_GRAVITY Gravity); + + HRESULT Cling([out] BOOL *pfCling); + + HRESULT SetCling([in] BOOL fCLing); + + HRESULT UnPosition(); + + HRESULT IsPositioned([out] BOOL *pfPositioned); + + HRESULT GetContainer([out] IMarkupContainer **ppContainer); + + HRESULT MoveAdjacentToElement( + [in] IHTMLElement *pElement, + [in] ELEMENT_ADJACENCY eAdj); + + HRESULT MoveToPointer([in] IMarkupPointer *pPointer); + + HRESULT MoveToContainer( + [in] IMarkupContainer *pContainer, + [in] BOOL fAtStart); + + HRESULT Left( + [in] BOOL fMove, + [out] MARKUP_CONTEXT_TYPE *pContext, + [out] IHTMLElement **ppElement, + [in, out] long *pcch, + [out, size_is(*pcch)] OLECHAR *pchText); + + HRESULT Right( + [in] BOOL fMove, + [out] MARKUP_CONTEXT_TYPE *pContext, + [out] IHTMLElement **ppElement, + [in, out] long *pcch, + [out, size_is(*pcch)] OLECHAR *pchText); + + HRESULT CurrentScope([out] IHTMLElement **ppElemCurrent); + + HRESULT IsLeftOf( + [in] IMarkupPointer *pPointerThat, + [out] BOOL *pfResult); + + HRESULT IsLeftOfOrEqualTo( + [in] IMarkupPointer *pPointerThat, + [out] BOOL *pfResult); + + HRESULT IsRightOf( + [in] IMarkupPointer *pPointerThat, + [out] BOOL *pfResult); + + HRESULT IsRightOfOrEqualTo( + [in] IMarkupPointer *pPointerThat, + [out] BOOL *pfResult); + + HRESULT IsEqualTo( + [in] IMarkupPointer *pPointerThat, + [out] BOOL *pfAreEqual); + + HRESULT MoveUnit([in] MOVEUNIT_ACTION muAction); + + HRESULT FindText( + [in] OLECHAR *pchFindText, + [in] DWORD dwFlags, + [in] IMarkupPointer *pIEndMatch, + [in] IMarkupPointer *pIEndSearch); +} + +/***************************************************************************** + * ISegment interface + */ +[ + object, + pointer_default(unique), + uuid(83f65030-b598-cf11-bb82-00aa00bdce0b) +] +interface ISegment : IUnknown +{ + HRESULT GetPointers( + [in] IMarkupPointer *pIStart, + [in] IMarkupPointer *pIEnd); +} + +/***************************************************************************** + * IElementSegment interface + */ +[ + object, + pointer_default(unique), + uuid(3050f68f-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementSegment : ISegment +{ + HRESULT GetElement([out] IHTMLElement **ppIElement); + + HRESULT SetPrimary([in] BOOL fPrimary); + + HRESULT IsPrimary([out] BOOL *pfPrimary); +} + +/***************************************************************************** + * ISelectionServicesListener interface + */ +[ + object, + pointer_default(unique), + uuid(99f65030-b598-cf11-bb82-00aa00bdce0b) +] +interface ISelectionServicesListener : IUnknown +{ + HRESULT BeginSelectionUndo(); + + HRESULT EndSelectionUndo(); + + HRESULT OnSelectedElementExit( + [in] IMarkupPointer *pIElementStart, + [in] IMarkupPointer *pIElementEnd, + [in] IMarkupPointer *pIElementContentStart, + [in] IMarkupPointer *pIElementContentEnd); + + HRESULT OnChangeType( + [in] SELECTION_TYPE eType, + [in] ISelectionServicesListener *pIListener); + + HRESULT GetTypeDetail([out] BSTR *pTypeDetail); +} + +/***************************************************************************** + * ISelectionServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f684-98b5-11cf-bb82-00aa00bdce0b) +] +interface ISelectionServices : IUnknown +{ + HRESULT SetSelectionType( + [in] SELECTION_TYPE eType, + [in] ISelectionServicesListener *pIListener); + + HRESULT GetMarkupContainer([out] IMarkupContainer **ppIContainer); + + HRESULT AddSegment( + [in] IMarkupPointer *pIStart, + [in] IMarkupPointer *pIEnd, + [out] ISegment **ppISegmentAdded); + + HRESULT AddElementSegment( + [in] IHTMLElement *pIElement, + [out] IElementSegment **ppISegmentAdded); + + HRESULT RemoveSegment([in] ISegment *pISegment); + + HRESULT GetSelectionServicesListener([out] ISelectionServicesListener **ppISelectionServicesListener); +} + +/***************************************************************************** + * IHTMLEditDesigner interface + */ +[ + object, + pointer_default(unique), + uuid(3050f662-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLEditDesigner : IUnknown +{ + HRESULT PreHandleEvent( + [in] DISPID inEvtDispId, + [in] IHTMLEventObj *pIEventObj); + + HRESULT PostHandleEvent( + [in] DISPID inEvtDispId, + [in] IHTMLEventObj *pIEventObj); + + HRESULT TranslateAccelerator( + [in] DISPID inEvtDispId, + [in] IHTMLEventObj *pIEventObj); + + HRESULT PostEditorEventNotify( + [in] DISPID inEvtDispId, + [in] IHTMLEventObj *pIEventObj); +} + +/***************************************************************************** + * IHTMLEditServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f663-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLEditServices : IUnknown +{ + HRESULT AddDesigner([in] IHTMLEditDesigner *pIDesigner); + + HRESULT RemoveDesigner([in] IHTMLEditDesigner *pIDesigner); + + HRESULT GetSelectionServices( + [in] IMarkupContainer *pIContainer, + [out] ISelectionServices **ppSelSvc); + + HRESULT MoveToSelectionAnchor([in] IMarkupPointer *pIStartAnchor); + + HRESULT MoveToSelectionEnd([in] IMarkupPointer *pIEndAnchor); + + HRESULT SelectRange( + [in] IMarkupPointer* pStart, + [in] IMarkupPointer* pEnd, + [in] SELECTION_TYPE eType); +} + } /* library MSHTML */

1 0

Maarten Lankhorst : user32: Fix dialogs for 64-bits wine.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 7981d6c736278b5f09d463354cf6bdc9afcc43a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7981d6c736278b5f09d463354… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 1 23:04:09 2008 +0100 user32: Fix dialogs for 64-bits wine. --- dlls/user32/controls.h | 5 +---- dlls/user32/defdlg.c | 38 ++++++++++++++++++++++---------------- dlls/user32/dialog16.c | 2 +- dlls/user32/win.h | 2 ++ 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a16d166..974cf5b 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -150,7 +150,7 @@ typedef struct extern BOOL COMBO_FlipListbox( LPHEADCOMBO, BOOL, BOOL ) DECLSPEC_HIDDEN; /* Dialog info structure */ -typedef struct +typedef struct tagDIALOGINFO { HWND hwndFocus; /* Current control with focus */ HFONT hUserFont; /* Dialog font */ @@ -165,9 +165,6 @@ typedef struct #define DF_END 0x0001 #define DF_OWNERENABLED 0x0002 -/* offset of DIALOGINFO ptr in dialog extra bytes */ -#define DWLP_WINE_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR)) - extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; extern void DIALOG_EnableOwner( HWND hOwner ) DECLSPEC_HIDDEN; extern BOOL DIALOG_DisableOwner( HWND hOwner ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index d2305e0..ee1b58e 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -230,8 +230,10 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, return 1; } case WM_NCDESTROY: - if ((dlgInfo = (DIALOGINFO *)SetWindowLongPtrW( hwnd, DWLP_WINE_DIALOGINFO, 0 ))) + if (dlgInfo) { + WND *wndPtr; + /* Free dialog heap (if created) */ if (dlgInfo->hDialogHeap) { @@ -241,6 +243,10 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); + + wndPtr = WIN_GetPtr( hwnd ); + wndPtr->dlgInfo = NULL; + WIN_ReleasePtr( wndPtr ); } /* Window clean-up */ return DefWindowProcA( hwnd, msg, wParam, lParam ); @@ -335,11 +341,18 @@ static LRESULT DEFDLG_Epilog(HWND hwnd, UINT msg, BOOL fResult) DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) { WND* wndPtr; - DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hwnd, DWLP_WINE_DIALOGINFO ); + DIALOGINFO* dlgInfo; - if(!dlgInfo && create) + wndPtr = WIN_GetPtr( hwnd ); + if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) + return NULL; + + dlgInfo = wndPtr->dlgInfo; + + if (!dlgInfo && create) { - if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) return NULL; + if (!(dlgInfo = HeapAlloc( GetProcessHeap(), 0, sizeof(*dlgInfo) ))) + goto out; dlgInfo->hwndFocus = 0; dlgInfo->hUserFont = 0; dlgInfo->hMenu = 0; @@ -348,19 +361,12 @@ DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) dlgInfo->idResult = 0; dlgInfo->flags = 0; dlgInfo->hDialogHeap = 0; - wndPtr = WIN_GetPtr( hwnd ); - if (wndPtr && wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - wndPtr->flags |= WIN_ISDIALOG; - WIN_ReleasePtr( wndPtr ); - SetWindowLongPtrW( hwnd, DWLP_WINE_DIALOGINFO, (ULONG_PTR)dlgInfo ); - } - else - { - HeapFree( GetProcessHeap(), 0, dlgInfo ); - return NULL; - } + wndPtr->dlgInfo = dlgInfo; + wndPtr->flags |= WIN_ISDIALOG; } + +out: + WIN_ReleasePtr( wndPtr ); return dlgInfo; } diff --git a/dlls/user32/dialog16.c b/dlls/user32/dialog16.c index 6850d35..4fcbef4 100644 --- a/dlls/user32/dialog16.c +++ b/dlls/user32/dialog16.c @@ -434,9 +434,9 @@ static HWND DIALOG_CreateIndirect16( HINSTANCE16 hInst, LPCVOID dlgTemplate, } wndPtr = WIN_GetPtr( hwnd ); wndPtr->flags |= WIN_ISDIALOG; + wndPtr->dlgInfo = dlgInfo; WIN_ReleasePtr( wndPtr ); - SetWindowLongPtrW( hwnd, DWLP_WINE_DIALOGINFO, (LONG_PTR)dlgInfo ); SetWindowLong16( HWND_16(hwnd), DWLP_DLGPROC, (LONG)dlgProc ); if (dlgInfo->hUserFont) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index bc024f4..447f4fd 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -31,6 +31,7 @@ #define WND_MAGIC 0x444e4957 /* 'WIND' */ struct tagCLASS; +struct tagDIALOGINFO; typedef struct tagWND { @@ -60,6 +61,7 @@ typedef struct tagWND HMENU hSysMenu; /* window's copy of System Menu */ HICON hIcon; /* window's icon */ HICON hIconSmall; /* window's small icon */ + struct tagDIALOGINFO *dlgInfo;/* Dialog additional info (dialogs only) */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */

1 0

Aric Stewart : comctl32/tab: Return default tab width in TCM_SETMINTABWIDTH if lParam is a negative value .
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 110a6048af1d4e9f5384869b00ced148f7e93eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=110a6048af1d4e9f5384869b0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 2 08:14:35 2008 -0600 comctl32/tab: Return default tab width in TCM_SETMINTABWIDTH if lParam is a negative value. --- dlls/comctl32/tab.c | 5 ++++- dlls/comctl32/tests/tab.c | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 6a9b8e8..0cc8cf9 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2662,7 +2662,10 @@ static inline LRESULT TAB_SetMinTabWidth (TAB_INFO *infoPtr, INT cx) TRACE("(%p,%d)\n", infoPtr, cx); - oldcx = infoPtr->tabMinWidth; + if (infoPtr->tabMinWidth < 0) + oldcx = DEFAULT_MIN_TAB_WIDTH; + else + oldcx = infoPtr->tabMinWidth; infoPtr->tabMinWidth = cx; TAB_SetItemBounds(infoPtr); return oldcx; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9d98e11..61bab44 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -509,6 +509,9 @@ static void test_tab(INT nMinTabWidth) hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); + /* Get System default MinTabWidth */ + if (nMinTabWidth < 0) + nMinTabWidth = SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); hdc = GetDC(hwTab); dpi = GetDeviceCaps(hdc, LOGPIXELSX); @@ -663,10 +666,7 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) "Parent after sequence, adding tab control to parent", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - todo_wine{ - expect(DEFAULT_MIN_TAB_WIDTH, (int)SendMessage(hTab, TCM_SETMINTABWIDTH, 0, -1)); - } - ok_sequence(sequences, TAB_SEQ_INDEX, set_min_tab_width_seq, "Set minTabWidth test sequence", FALSE); + ok(SendMessage(hTab, TCM_SETMINTABWIDTH, 0, -1) > 0,"TCM_SETMINTABWIDTH returned < 0\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Set minTabWidth test parent sequence", FALSE); /* Testing GetItemCount */

1 0

Chris Robinson : wined3d: Make sure a context is set for query object generation.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 7806e4d85a2baa12736b60bf50a7f7e7395e2e04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7806e4d85a2baa12736b60bf5… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Dec 2 23:07:54 2008 -0800 wined3d: Make sure a context is set for query object generation. --- dlls/wined3d/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4db3692..41b4861 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1237,13 +1237,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) { TRACE("(%p) Allocating data for an occlusion query\n", This); + + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); + LEAVE_GL(); break; } case WINED3DQUERYTYPE_EVENT: object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); ((WineQueryEventData *)(object->extendedData))->ctx = This->activeContext; + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); if(GL_SUPPORT(APPLE_FENCE)) { GL_EXTCALL(glGenFencesAPPLE(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesAPPLE"); @@ -1251,6 +1257,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE GL_EXTCALL(glGenFencesNV(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesNV"); } + LEAVE_GL(); break; case WINED3DQUERYTYPE_VCACHE:

1 0

Nikolay Sivov : gdiplus: Added GdipRotateTextureTransform.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: eabb8d169c196f722c68c1140a6a1fb178c376ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabb8d169c196f722c68c1140… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 3 00:33:16 2008 +0300 gdiplus: Added GdipRotateTextureTransform. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index f23eba7..ffba75a 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1198,6 +1198,20 @@ GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) return Ok; } +/****************************************************************************** + * GdipRotateTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture* brush, REAL angle, + GpMatrixOrder order) +{ + TRACE("(%p, %.2f, %d)\n", brush, angle, order); + + if(!brush) + return InvalidParameter; + + return GdipRotateMatrix(brush->transform, angle, order); +} + GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f86e20b..c8569d0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -489,7 +489,7 @@ @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform @ stub GdipRotatePenTransform -@ stub GdipRotateTextureTransform +@ stdcall GdipRotateTextureTransform(ptr long long) @ stdcall GdipRotateWorldTransform(ptr long long) @ stub GdipSaveAdd @ stub GdipSaveAddImage

1 0

Nikolay Sivov : gdiplus: Added GdipMultiplyTextureTransform.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: a886b4743f7efbabe481540be9f9a93ac85eb3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a886b4743f7efbabe481540be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 3 00:49:19 2008 +0300 gdiplus: Added GdipMultiplyTextureTransform. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ffba75a..efcf31d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -929,6 +929,20 @@ GpStatus WINGDIPAPI GdipGetTextureWrapMode(GpTexture *brush, GpWrapMode *wrapmod } /****************************************************************************** + * GdipMultiplyTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipMultiplyTextureTransform(GpTexture* brush, + GDIPCONST GpMatrix *matrix, GpMatrixOrder order) +{ + TRACE("(%p, %p, %d)\n", brush, matrix, order); + + if(!brush || !matrix) + return InvalidParameter; + + return GdipMultiplyMatrix(brush->transform, matrix, order); +} + +/****************************************************************************** * GdipResetTextureTransform [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture* brush) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c8569d0..1dce580 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -446,7 +446,7 @@ @ stdcall GdipMultiplyMatrix(ptr ptr long) @ stub GdipMultiplyPathGradientTransform @ stub GdipMultiplyPenTransform -@ stub GdipMultiplyTextureTransform +@ stdcall GdipMultiplyTextureTransform(ptr ptr long) @ stdcall GdipMultiplyWorldTransform(ptr ptr long) @ stdcall GdipNewInstalledFontCollection(ptr) @ stdcall GdipNewPrivateFontCollection(ptr)

1 0

Nikolay Sivov : gdiplus: Added GdipTranslateTextureTransform.
by Alexandre Julliard 03 Dec '08

03 Dec '08

Module: wine Branch: master Commit: 2d1a9eb3078399eb7f846b82538381ccbdb3b2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1a9eb3078399eb7f846b825… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 3 00:22:52 2008 +0300 gdiplus: Added GdipTranslateTextureTransform. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index edccb10..f23eba7 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1239,6 +1239,20 @@ GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush, return NotImplemented; } +/****************************************************************************** + * GdipTranslateTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipTranslateTextureTransform(GpTexture* brush, REAL dx, REAL dy, + GpMatrixOrder order) +{ + TRACE("(%p, %.2f, %.2f, %d)\n", brush, dx, dy, order); + + if(!brush) + return InvalidParameter; + + return GdipTranslateMatrix(brush->transform, dx, dy, order); +} + GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) { TRACE("(%p, %p)\n", brush, rect); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c77d075..f86e20b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -617,7 +617,7 @@ @ stub GdipTranslatePenTransform @ stdcall GdipTranslateRegion(ptr long long) @ stdcall GdipTranslateRegionI(ptr long long) -@ stub GdipTranslateTextureTransform +@ stdcall GdipTranslateTextureTransform(ptr long long long) @ stdcall GdipTranslateWorldTransform(ptr long long long) @ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) @ stdcall GdipVectorTransformMatrixPointsI(ptr ptr long)

1 0