January 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Return correct IDispatch Interface.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: af15cfefcdd2aa1b516f37ad9d5a1d1c87523107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af15cfefcdd2aa1b516f37ad9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 22 13:19:13 2008 +1100 msxml3: Return correct IDispatch Interface. --- dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/pi.c | 4 ++-- dlls/msxml3/text.c | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 2409aa6..805bafe 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domattr_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMAttribute ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 4589896..186b9e4 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domcdata_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) || + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || IsEqualGUID( riid, &IID_IXMLDOMElement ) ) { return IUnknown_QueryInterface(This->element_unk, riid, ppvObject); diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 6359885..702a339 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domcomment_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMComment ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 7b3ff62..c741f24 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domfrag_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMDocumentFragment ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1bfeab1..cb63922 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -354,13 +354,13 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii *ppvObject = NULL; if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMDocument ) || IsEqualGUID( riid, &IID_IXMLDOMDocument2 ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || - IsEqualGUID( riid, &IID_IDispatch ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 814a987..ba01247 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -652,12 +652,12 @@ static HRESULT WINAPI Internal_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = &This->lpVtbl; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 9671fa1..8902152 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -59,12 +59,12 @@ static HRESULT WINAPI entityref_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMEntityReference ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index ec70746..054d7f8 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -59,12 +59,12 @@ static HRESULT WINAPI dom_pi_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMProcessingInstruction ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 7c0f42e..0d402a4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -59,12 +59,12 @@ static HRESULT WINAPI domtext_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) || + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) || IsEqualGUID( riid, &IID_IXMLDOMElement ) ) { return IUnknown_QueryInterface(This->element_unk, riid, ppvObject);

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMEntityReference interface .
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: a81d22d423239dce98e84a36a5a53bd52292c341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81d22d423239dce98e84a36a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 22 08:33:32 2008 +1100 msxml3: Implement IXMLDOMEntityReference interface. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/domdoc.c | 25 ++- dlls/msxml3/entityref.c | 511 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 42 ++++ 5 files changed, 578 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a81d22d423239dce98e84…

1 0

Andrew Talbot : user32: Remove unneeded casts.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 3dfaef3729b26193fc0650e841f4562fcba23e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dfaef3729b26193fc0650e84… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 21 20:06:59 2008 +0000 user32: Remove unneeded casts. --- dlls/user32/dialog16.c | 2 +- dlls/user32/edit.c | 3 +-- dlls/user32/exticon.c | 10 ++++------ dlls/user32/msgbox.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/win.c | 4 ++-- dlls/user32/wnd16.c | 2 +- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/user32/dialog16.c b/dlls/user32/dialog16.c index 72bec00..6850d35 100644 --- a/dlls/user32/dialog16.c +++ b/dlls/user32/dialog16.c @@ -548,7 +548,7 @@ INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len ) void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned ) { SetDlgItemInt( WIN_Handle32(hwnd), (UINT)(UINT16)id, - (UINT)(fSigned ? (INT16) value : (UINT16) value), fSigned ); + (UINT)(fSigned ? (INT16) value : value), fSigned ); } diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7f9f24e..a3eb1d8 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2165,8 +2165,7 @@ static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend) e = li + EDIT_EM_LineLength(es, li); } } else { - e = li + (INT)EDIT_CallWordBreakProc(es, - li, e - li, ll, WB_LEFT); + e = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_LEFT); } if (!extend) s = e; diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 2b54df4..8e9f938 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -486,10 +486,10 @@ static UINT ICO_ExtractIconExW( if (pCIDir) { - RetPtr[icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, + RetPtr[icon] = CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, cx1, cy1, flags); if (cx2 && cy2) - RetPtr[++icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, + RetPtr[++icon] = CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, cx2, cy2, flags); } else @@ -674,11 +674,9 @@ static UINT ICO_ExtractIconExW( RetPtr[i]=0; continue; } - RetPtr[i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, - cx1, cy1, flags); + RetPtr[i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx1, cy1, flags); if (cx2 && cy2) - RetPtr[++i] = (HICON) CreateIconFromResourceEx(idata,idataent->Size,TRUE,0x00030000, - cx2, cy2, flags); + RetPtr[++i] = CreateIconFromResourceEx(idata, idataent->Size, TRUE, 0x00030000, cx2, cy2, flags); } ret = i; /* return number of retrieved icons */ } /* if(sig == IMAGE_NT_SIGNATURE) */ diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 3331ef5..6aa9a95 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -474,7 +474,7 @@ INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) if (!(hRes = FindResourceExW(user32_module, (LPWSTR)RT_DIALOG, msg_box_res_nameW, msgbox->dwLanguageId))) return 0; - if (!(tmplate = (LPVOID)LoadResource(user32_module, hRes))) + if (!(tmplate = LoadResource(user32_module, hRes))) return 0; if ((msgbox->dwStyle & MB_TASKMODAL) && (msgbox->hwndOwner==NULL)) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3b2785e..b323a9b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -609,7 +609,7 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, LPBYTE lpBuf if ((RegOpenKeyW( get_volatile_regkey(), lpRegKey, &hKey ) == ERROR_SUCCESS) || (RegOpenKeyW( HKEY_CURRENT_USER, lpRegKey, &hKey ) == ERROR_SUCCESS)) { - ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, (LPBYTE)lpBuf, &count); + ret = !RegQueryValueExW( hKey, lpValName, NULL, &type, lpBuf, &count); RegCloseKey( hKey ); } return ret; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9730df2..d42c155 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1723,7 +1723,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod case GWLP_USERDATA: retvalue = wndPtr->userdata; break; case GWL_STYLE: retvalue = wndPtr->dwStyle; break; case GWL_EXSTYLE: retvalue = wndPtr->dwExStyle; break; - case GWLP_ID: retvalue = (ULONG_PTR)wndPtr->wIDmenu; break; + case GWLP_ID: retvalue = wndPtr->wIDmenu; break; case GWLP_HINSTANCE: retvalue = (ULONG_PTR)wndPtr->hInstance; break; case GWLP_WNDPROC: /* This looks like a hack only for the edit control (see tests). This makes these controls @@ -2072,7 +2072,7 @@ LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); - return (LONG)WINPROC_GetProc16( (WNDPROC)old_proc, FALSE ); + return (LONG)WINPROC_GetProc16( old_proc, FALSE ); } else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); } diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 0b0d0c1..4090245 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -690,7 +690,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); WNDPROC old_proc = (WNDPROC)SetClassLongA( WIN_Handle32(hwnd16), offset, (LONG_PTR)new_proc ); - return (LONG)WINPROC_GetProc16( (WNDPROC)old_proc, FALSE ); + return (LONG)WINPROC_GetProc16( old_proc, FALSE ); } case GCLP_MENUNAME: newval = (LONG)MapSL( newval );

1 0

Marcus Meissner : cmd: Include <time.h> for time().
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 53f5d673649d5d0dcfeb962c74de6f234a4d42d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f5d673649d5d0dcfeb962c7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jan 21 23:38:09 2008 +0100 cmd: Include <time.h> for time(). --- programs/cmd/wcmdmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 24efebf..2966bcc 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -26,6 +26,7 @@ */ #include "config.h" +#include <time.h> #include "wcmd.h" #include "wine/debug.h"

1 0

Alexander Dorofeyev : wined3d: Fix not released swapchain in some codepaths .
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: d9567b762759f58b52eb649ba068002790f5316f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9567b762759f58b52eb649ba… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 20 20:18:12 2008 -0800 wined3d: Fix not released swapchain in some codepaths. --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9243777..c6aa7a9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1121,13 +1121,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain); if(swapchain || (myDevice->render_targets && iface == myDevice->render_targets[0])) { + if(swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { static BOOL warned = FALSE; if(!warned) { ERR("The application tries to write to the render target, but render target locking is disabled\n"); warned = TRUE; } - if(swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); goto unlock_end; }

1 0

Andrew Talbot : urlmon: Remove unneeded cast.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 41ed9106049eba89b9985ca72b204a99e7139f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ed9106049eba89b9985ca72… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 21 20:06:53 2008 +0000 urlmon: Remove unneeded cast. --- dlls/urlmon/umstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 5403735..7523781 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, if ( !pcbRead) pcbRead = &dwBytesRead; - if ( ! ReadFile( This->handle, pv, cb, (LPDWORD)pcbRead, NULL ) ) + if ( ! ReadFile( This->handle, pv, cb, pcbRead, NULL ) ) return S_FALSE; if (!*pcbRead)

1 0

Andrew Talbot : user32: Remove unneeded casts.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: ba596d30ce95502982aa35b573b4b0e6930b94df URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba596d30ce95502982aa35b57… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 21 20:06:56 2008 +0000 user32: Remove unneeded casts. --- dlls/user32/button.c | 2 +- dlls/user32/class.c | 8 ++++---- dlls/user32/combo.c | 2 +- dlls/user32/cursoricon.c | 6 +++--- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_server.c | 4 ++-- dlls/user32/ddeml16.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 74720a0..27f10b7 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -672,7 +672,7 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) empty_rect: rc->right = r.left; rc->bottom = r.top; - return (UINT)(LONG)-1; + return (UINT)-1; } /* Position label inside bounding rectangle according to diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 733dfa1..eee9c1d 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -1116,10 +1116,10 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) wc->cbClsExtra = classPtr->cbClsExtra; wc->cbWndExtra = classPtr->cbWndExtra; wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; - wc->hIcon = (HICON)classPtr->hIcon; - wc->hIconSm = (HICON)classPtr->hIconSm; - wc->hCursor = (HCURSOR)classPtr->hCursor; - wc->hbrBackground = (HBRUSH)classPtr->hbrBackground; + wc->hIcon = classPtr->hIcon; + wc->hIconSm = classPtr->hIconSm; + wc->hCursor = classPtr->hCursor; + wc->hbrBackground = classPtr->hbrBackground; wc->lpszMenuName = CLASS_GetMenuNameA( classPtr ); wc->lpszClassName = name; atom = classPtr->atomName; diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 6f0fd84..c39d08b 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1155,7 +1155,7 @@ static void CBRollUp( LPHEADCOMBO lphc, BOOL ok, BOOL bButton ) HWND hWnd = lphc->self; TRACE("[%p]: sel ok? [%i] dropped? [%i]\n", - lphc->self, (INT)ok, (INT)(lphc->wState & CBF_DROPPED)); + lphc->self, ok, (INT)(lphc->wState & CBF_DROPPED)); CB_NOTIFY( lphc, (ok) ? CBN_SELENDOK : CBN_SELENDCANCEL ); diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7c197ed..88fdd65 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -687,7 +687,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, hotspot.y = ICON_HOTSPOT; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", - bits, cbSize, (unsigned)dwVersion, width, height, + bits, cbSize, dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); if (dwVersion == 0x00020000) { @@ -869,7 +869,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, DeleteObject( hAndBits ); DeleteObject( hXorBits ); - return HICON_32((HICON16)hObj); + return HICON_32(hObj); } @@ -1132,7 +1132,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType, } else { - pDirEntry = (CURSORICONDIRENTRY *)CURSORICON_FindBestCursorRes( + pDirEntry = CURSORICON_FindBestCursorRes( pDir, iDesiredCX, iDesiredCY, 1); } diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 56e42fe..adec249 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -717,7 +717,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD if (cbData == (DWORD)-1) { - hglobal = (HGLOBAL)pData; + hglobal = pData; dh = (DDE_DATAHANDLE_HEAD *)GlobalLock(hglobal); cbData = GlobalSize(hglobal) - sizeof(DDE_DATAHANDLE_HEAD); pData = (LPVOID)(dh + 1); diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index cd32e4a..a1c2425 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -98,7 +98,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) hDdeData = WDML_InvokeCallback(pInstance, XTYP_ADVREQ, pLink->uFmt, pLink->hConv, hszTopic, hszItem, 0, --count, 0); - if (hDdeData == (HDDEDATA)CBR_BLOCK) + if (hDdeData == CBR_BLOCK) { /* MS doc is not consistent here */ FIXME("CBR_BLOCK returned for ADVREQ\n"); @@ -463,7 +463,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w hDdeData = WDML_InvokeCallback(pInstance, XTYP_WILDCONNECT, 0, 0, hszTop, hszApp, 0, (ULONG_PTR)pcc, self); - if (hDdeData == (HDDEDATA)CBR_BLOCK) + if (hDdeData == CBR_BLOCK) { /* MS doc is not consistent here */ FIXME("CBR_BLOCK returned for WILDCONNECT\n"); diff --git a/dlls/user32/ddeml16.c b/dlls/user32/ddeml16.c index 82648f2..4d14e03 100644 --- a/dlls/user32/ddeml16.c +++ b/dlls/user32/ddeml16.c @@ -281,7 +281,7 @@ BOOL16 WINAPI DdeFreeDataHandle16(HDDEDATA hData) */ BOOL16 WINAPI DdeKeepStringHandle16(DWORD idInst, HSZ hsz) { - return (BOOL)DdeKeepStringHandle(idInst, hsz); + return DdeKeepStringHandle(idInst, hsz); } /*****************************************************************

1 0

Aric Stewart : wineps.drv: Properly handle NULL LPLOGFONT in PSDRV_EnumDeviceFonts.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: dde7ca22c2aed1866b5bb5329dc05e0aa5d9b4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde7ca22c2aed1866b5bb5329… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 21 10:46:20 2008 -0600 wineps.drv: Properly handle NULL LPLOGFONT in PSDRV_EnumDeviceFonts. --- dlls/wineps.drv/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 01547db..c075049 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -413,7 +413,7 @@ BOOL PSDRV_EnumDeviceFonts( PSDRV_PDEVICE *physDev, LPLOGFONTW plf, FONTFAMILY *family; char FaceName[LF_FACESIZE]; - if( plf->lfFaceName[0] ) { + if( plf && plf->lfFaceName[0] ) { WideCharToMultiByte(CP_ACP, 0, plf->lfFaceName, -1, FaceName, sizeof(FaceName), NULL, NULL); TRACE("lfFaceName = '%s'\n", FaceName);

1 0

Jason Green : d3d9 tests: Correct some typos.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: e11d7c63b4aad6057d4e1388d519f27d9f370b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11d7c63b4aad6057d4e1388d… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jan 21 10:49:39 2008 -0500 d3d9 tests: Correct some typos. --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4cc07c8..d20d337 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -260,10 +260,10 @@ static void lighting_test(IDirect3DDevice9 *device) ok(color == 0x00ff0000, "Unlit quad without normals has color %08x\n", color); color = getPixelColor(device, 160, 120); /* upper left quad - lit without normals */ ok(color == 0x00000000, "Lit quad without normals has color %08x\n", color); - color = getPixelColor(device, 480, 360); /* lower left quad - unlit width normals */ - ok(color == 0x000000ff, "Unlit quad width normals has color %08x\n", color); - color = getPixelColor(device, 480, 120); /* upper left quad - lit width normals */ - ok(color == 0x00000000, "Lit quad width normals has color %08x\n", color); + color = getPixelColor(device, 480, 360); /* lower left quad - unlit with normals */ + ok(color == 0x000000ff, "Unlit quad with normals has color %08x\n", color); + color = getPixelColor(device, 480, 120); /* upper left quad - lit with normals */ + ok(color == 0x00000000, "Lit quad with normals has color %08x\n", color); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr));

1 0

Alexander Dorofeyev : ddraw/tests: Add test for D3DTBLEND_MODULATE.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 320e2538054af2dcdb9ebe21650edc1225ea6bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=320e2538054af2dcdb9ebe216… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 20 20:18:03 2008 -0800 ddraw/tests: Add test for D3DTBLEND_MODULATE. --- dlls/ddraw/tests/visual.c | 781 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 781 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=320e2538054af2dcdb9eb…

1 0