June 2006 - Wine-commits - list.winehq.org

Mike McCormack : msi: Don't define COND_SPACE twice.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 172e183cf396b62a0751999d3a4812d61f94466a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=172e183cf396b62a0751999… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 23:44:42 2006 +0900 msi: Don't define COND_SPACE twice. --- dlls/msi/cond.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 031c489..1809935 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -110,7 +110,7 @@ static BOOL num_from_prop( LPCWSTR p, IN INT value; } -%token COND_SPACE COND_EOF COND_SPACE +%token COND_SPACE COND_EOF %token COND_OR COND_AND COND_NOT COND_XOR COND_IMP COND_EQV %token COND_LT COND_GT COND_EQ COND_NE COND_GE COND_LE %token COND_ILT COND_IGT COND_IEQ COND_INE COND_IGE COND_ILE

1 0

Eric Pouech : mciwave: Fixed a bogus free.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 50c9681a24d8962d88a2baabedc4fe8c197063ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50c9681a24d8962d88a2baa… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jun 14 21:35:18 2006 +0200 mciwave: Fixed a bogus free. --- dlls/mciwave/mciwave.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 11733db..82b49bb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -480,6 +480,8 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wmw->dwStatus = MCI_MODE_NOT_READY; wmw->hFile = 0; memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA)); + /* will be set by WAVE_mciOpenFile */ + wmw->openParms.lpstrElementName = NULL; TRACE("wDevID=%04X (lpParams->wDeviceID=%08X)\n", wDevID, lpOpenParms->wDeviceID);

1 0

Vitaly Lipatov : user32: Fix character conversion in combo box.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 88694be2ad94954c79d0a914357c5489860ac75c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88694be2ad94954c79d0a91… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Jun 14 21:12:16 2006 +0400 user32: Fix character conversion in combo box. Replace toupper/tolower with CharUpper/CharLower functions. --- dlls/user/combo.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user/combo.c b/dlls/user/combo.c index f4b4dba..b8a815a 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -2080,26 +2080,28 @@ static LRESULT ComboWndProc_common( HWND if( unicode ) { if( lphc->dwStyle & CBS_LOWERCASE ) - strlwrW((LPWSTR)lParam); + CharLowerW((LPWSTR)lParam); else if( lphc->dwStyle & CBS_UPPERCASE ) - struprW((LPWSTR)lParam); + CharUpperW((LPWSTR)lParam); return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); } else /* unlike the unicode version, the ansi version does not overwrite the string if converting case */ { - char *p, *string = NULL; + char *string = NULL; LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) { string = strdupA((LPSTR)lParam); - for (p = string; *p; p++) *p = tolower(*p); + CharLowerA(string); } + else if( lphc->dwStyle & CBS_UPPERCASE ) { string = strdupA((LPSTR)lParam); - for (p = string; *p; p++) *p = toupper(*p); + CharUpperA(string); } + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); HeapFree(GetProcessHeap(), 0, string); return ret; @@ -2112,18 +2114,18 @@ static LRESULT ComboWndProc_common( HWND if( unicode ) { if( lphc->dwStyle & CBS_LOWERCASE ) - strlwrW((LPWSTR)lParam); + CharLowerW((LPWSTR)lParam); else if( lphc->dwStyle & CBS_UPPERCASE ) - struprW((LPWSTR)lParam); + CharUpperW((LPWSTR)lParam); return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); } else { - char *p; if( lphc->dwStyle & CBS_LOWERCASE ) - for (p = (LPSTR)lParam; *p; p++) *p = tolower(*p); + CharLowerA((LPSTR)lParam); else if( lphc->dwStyle & CBS_UPPERCASE ) - for (p = (LPSTR)lParam; *p; p++) *p = toupper(*p); + CharUpperA((LPSTR)lParam); + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); } case CB_DELETESTRING16:

1 0

Louis. Lenders : wine.inf: Add fake dll for advpack.dll.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 8cc69977eb4db3fb0571bce188be3e9db57a3d0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cc69977eb4db3fb0571bce… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jun 14 09:58:28 2006 +0100 wine.inf: Add fake dll for advpack.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 04ed3f7..4bdc4bd 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2115,6 +2115,7 @@ HKLM,%CurrentVersion%\Telephony\Country 10,,winhlp32.exe,winhelp.exe 10,command,start.exe 11,,advapi32.dll +11,,advpack.dll 11,,comctl32.dll 11,,comdlg32.dll 11,,control.exe

1 0

appdb/admin adminCommentView.php
by WineHQ 14 Jun '06

14 Jun '06

ChangeSet ID: 25733 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/14 09:57:23 Modified files: admin : adminCommentView.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Get rid of redundant include to fix adminCommentView.php Patch: http://cvs.winehq.org/patch.py?id=25733 Old revision New revision Changes Path 1.8 1.9 +0 -1 appdb/admin/adminCommentView.php Index: appdb/admin/adminCommentView.php diff -u -p appdb/admin/adminCommentView.php:1.8 appdb/admin/adminCommentView.php:1.9 --- appdb/admin/adminCommentView.php:1.8 14 Jun 2006 14:57:23 -0000 +++ appdb/admin/adminCommentView.php 14 Jun 2006 14:57:23 -0000 @@ -6,7 +6,6 @@ include("path.php"); include(BASE."include/incl.php"); -require(BASE."include/comment.php"); apidb_header("Comments");

1 0

Robert Shearman : atl: Add a stub for AtlModuleRegisterWndClassInfoW.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 124c3a8f7c232c7847e9097b099102eb9bff3a2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=124c3a8f7c232c7847e9097… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 02:37:43 2006 +0100 atl: Add a stub for AtlModuleRegisterWndClassInfoW. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 10 ++++++++++ dlls/atl/atlwin.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletions(-) create mode 100644 dlls/atl/atlwin.h diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 9d0b482..faf786a 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -36,7 +36,7 @@ 42 stdcall AtlAxWinInit() 43 stub AtlModuleAddCreateWndData 44 stub AtlModuleExtractCreateWndData -45 stub AtlModuleRegisterWndClassInfoW +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) 46 stub AtlModuleRegisterWndClassInfoA 47 stub AtlAxGetControl 48 stub AtlAxGetHost diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index e3aa9f3..2d87b2e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -33,6 +33,7 @@ #include "objidl.h" #include "ole2.h" #include "atlbase.h" #include "atliface.h" +#include "atlwin.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -359,3 +360,12 @@ HRESULT WINAPI AtlAxCreateControl(LPCOLE FIXME("%s %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer); return E_NOTIMPL; } + +/*********************************************************************** + * AtlModuleRegisterWndClassInfoW [ATL.@] + */ +ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc) +{ + FIXME("%p %p %p)\n", pm, wci, pProc); + return 0; +} diff --git a/dlls/atl/atlwin.h b/dlls/atl/atlwin.h new file mode 100644 index 0000000..8a9357d --- /dev/null +++ b/dlls/atl/atlwin.h @@ -0,0 +1,48 @@ +/* + * Active Template Library Window Functions + * + * Copyright 2006 Robert Shearman for CodeWeavers + * + * 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 + */ + +typedef struct _ATL_WNDCLASSINFOA_TAG +{ + WNDCLASSEXA m_wc; + LPCSTR m_lpszOrigName; + WNDPROC pWndProc; + LPCSTR m_lpszCursorID; + BOOL m_bSystemCursor; + ATOM m_atom; + CHAR m_szAutoName[14]; +} _ATL_WNDCLASSINFOA; + +typedef struct _ATL_WNDCLASSINFOW_TAG +{ + WNDCLASSEXW m_wc; + LPCWSTR m_lpszOrigName; + WNDPROC pWndProc; + LPCWSTR m_lpszCursorID; + BOOL m_bSystemCursor; + ATOM m_atom; + WCHAR m_szAutoName[14]; +} _ATL_WNDCLASSINFOW; + +ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc); +ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc); + +HDC WINAPI AtlCreateTargetDC(HDC hdc, DVTARGETDEVICE *ptd); +void WINAPI AtlHiMetricToPixel(const SIZEL *lpSizeInHiMetric, LPSIZEL lpSizeInPix); +void WINAPI AtlPixelToHiMetric(const SIZEL *lpSizeInPix, LPSIZEL lpSizeInHiMetric);

1 0

Robert Shearman : ntdll: Change the test for no relocation information to use the
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 850ae994c6ca4eb9bd016bf3dfd1c72c918eba1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=850ae994c6ca4eb9bd016bf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 02:38:34 2006 +0100 ntdll: Change the test for no relocation information to use the IMAGE_FILE_RELOCS_STRIPPED flag instead of a zero sized relocations section. This fixes loading of resource-only DLLs that have a load-address of 0x400000. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0a7516f..8f6296f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1038,7 +1038,7 @@ static NTSTATUS map_image( HANDLE hmappi const IMAGE_DATA_DIRECTORY *relocs; relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - if (!relocs->VirtualAddress || !relocs->Size) + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { if (nt->OptionalHeader.ImageBase == 0x400000) { ERR("Image was mapped at %p: standard load address for a Win32 program (0x00400000) not available\n", ptr);

1 0

Robert Shearman : msxml: Text nodes with just whitespace should be stripped .
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: e072d7a0a3c25a4308a835bb204f5a08db3413c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e072d7a0a3c25a4308a835b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 02:38:20 2006 +0100 msxml: Text nodes with just whitespace should be stripped. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 895a093..39e4768 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -865,7 +865,7 @@ #ifdef HAVE_XMLREADMEMORY * writing errors to stderr */ return xmlReadMemory( ptr, len, NULL, NULL, - XML_PARSE_NOERROR | XML_PARSE_NOWARNING ); + XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); #else return xmlParseMemory( ptr, len ); #endif

1 0

Robert Shearman : msxml: Implement IXMLDOMElement for text elements by using
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 1df06e5c4a3f933f307d5cba81599282306186e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1df06e5c4a3f933f307d5cb… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 02:38:09 2006 +0100 msxml: Implement IXMLDOMElement for text elements by using create_element instead of create_basic_node. --- dlls/msxml3/text.c | 100 +++++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1df06e5c4a3f933f307…

1 0

Robert Shearman : msxml: Allow the element implementation to be aggregatable.
by Alexandre Julliard 14 Jun '06

14 Jun '06

Module: wine Branch: refs/heads/master Commit: 09ddab14812613da2811d4771dfd286e606a5d94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=09ddab14812613da2811d47… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 14 02:37:54 2006 +0100 msxml: Allow the element implementation to be aggregatable. --- dlls/msxml3/element.c | 109 ++++++++++++++++++++++++++++++------------- dlls/msxml3/msxml_private.h | 2 - dlls/msxml3/node.c | 2 - 3 files changed, 79 insertions(+), 34 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 89b35d4..7997b2f 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -41,6 +41,8 @@ #ifdef HAVE_LIBXML2 typedef struct _domelem { const struct IXMLDOMElementVtbl *lpVtbl; + const struct IUnknownVtbl *lpInternalUnkVtbl; + IUnknown *pUnkOuter; LONG ref; IUnknown *node_unk; IXMLDOMNode *node; @@ -51,6 +53,11 @@ static inline domelem *impl_from_IXMLDOM return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); } +static inline domelem *impl_from_InternalUnknown( IUnknown *iface ) +{ + return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpInternalUnkVtbl)); +} + static inline xmlNodePtr get_element( domelem *This ) { return xmlNodePtr_from_domnode( This->node, XML_ELEMENT_NODE ); @@ -64,48 +71,21 @@ static HRESULT WINAPI domelem_QueryInter domelem *This = impl_from_IXMLDOMElement( iface ); TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || - IsEqualGUID( riid, &IID_IUnknown ) ) - { - *ppvObject = iface; - } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) - { - return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); - } - else - { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - IXMLDOMElement_AddRef( iface ); - - return S_OK; + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } static ULONG WINAPI domelem_AddRef( IXMLDOMElement *iface ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return InterlockedIncrement( &This->ref ); + return IUnknown_AddRef(This->pUnkOuter); } static ULONG WINAPI domelem_Release( IXMLDOMElement *iface ) { domelem *This = impl_from_IXMLDOMElement( iface ); - ULONG ref; - - ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 ) - { - IUnknown_Release( This->node_unk ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ref; + return IUnknown_Release(This->pUnkOuter); } static HRESULT WINAPI domelem_GetTypeInfoCount( @@ -644,7 +624,66 @@ static const struct IXMLDOMElementVtbl d domelem_normalize, }; -IUnknown* create_element( xmlNodePtr element ) +static HRESULT WINAPI Internal_QueryInterface( + IUnknown *iface, + REFIID riid, + void** ppvObject ) +{ + domelem *This = impl_from_InternalUnknown( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = &This->lpVtbl; + } + else if ( IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + { + return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown*)*ppvObject ); + + return S_OK; +} + +static ULONG WINAPI Internal_AddRef( + IUnknown *iface ) +{ + domelem *This = impl_from_InternalUnknown( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI Internal_Release( + IUnknown *iface ) +{ + domelem *This = impl_from_InternalUnknown( iface ); + ULONG ref; + + ref = InterlockedDecrement( &This->ref ); + if ( ref == 0 ) + { + IUnknown_Release( This->node_unk ); + HeapFree( GetProcessHeap(), 0, This ); + } + + return ref; +} + +static const struct IUnknownVtbl internal_unk_vtbl = +{ + Internal_QueryInterface, + Internal_AddRef, + Internal_Release +}; + +IUnknown* create_element( xmlNodePtr element, IUnknown *pUnkOuter ) { domelem *This; HRESULT hr; @@ -655,6 +694,12 @@ IUnknown* create_element( xmlNodePtr ele This->lpVtbl = &domelem_vtbl; This->ref = 1; + This->lpInternalUnkVtbl = &internal_unk_vtbl; + + if(pUnkOuter) + This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */ + else + This->pUnkOuter = (IUnknown *)&This->lpInternalUnkVtbl; This->node_unk = create_basic_node( element, (IUnknown*)&This->lpVtbl ); if(!This->node_unk) @@ -673,7 +718,7 @@ IUnknown* create_element( xmlNodePtr ele /* The ref on This->node is actually looped back into this object, so release it */ IXMLDOMNode_Release(This->node); - return (IUnknown*) &This->lpVtbl; + return (IUnknown*) &This->lpInternalUnkVtbl; } #endif diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2084b22..5516361 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -32,7 +32,7 @@ extern IUnknown *create_domdoc( extern IUnknown *create_xmldoc( void ); extern IXMLDOMNode *create_node( xmlNodePtr node ); extern IUnknown *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter ); -extern IUnknown *create_element( xmlNodePtr element ); +extern IUnknown *create_element( xmlNodePtr element, IUnknown *pUnkOuter ); extern IUnknown *create_attribute( xmlNodePtr attribute ); extern IUnknown *create_text( xmlNodePtr text ); extern IUnknown *create_comment( xmlNodePtr comment ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 0ec8ec9..312edae 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -868,7 +868,7 @@ IXMLDOMNode *create_node( xmlNodePtr nod switch(node->type) { case XML_ELEMENT_NODE: - pUnk = create_element( node ); + pUnk = create_element( node, NULL ); break; case XML_ATTRIBUTE_NODE: pUnk = create_attribute( node );

1 0