August 2007 - Wine-commits - list.winehq.org

Rob Shearman : secur32: Split the NTLM credential and context handles into separate objects.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 888a8e27b8d00c23c298533e252c93381c455ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a8e27b8d00c23c298533e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Aug 7 17:12:32 2007 +0100 secur32: Split the NTLM credential and context handles into separate objects. This prevents races with two threads using the helper object at the same time on two different context handles, eliminates the need to free the credential handle after freeing the context handles and also prevents a crash caused by not clearing session_key in DeleteSecurityContext. --- dlls/secur32/dispatcher.c | 1 - dlls/secur32/ntlm.c | 327 +++++++++++++++++++++++++++---------------- dlls/secur32/secur32_priv.h | 2 - 3 files changed, 209 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=888a8e27b8d00c23c2985…

1 0

Stefan Dösinger : wined3d: Store the position_transformed flag in the vdecl.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: b8dd5839efe0d40d1e85a826f127f5034b800135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dd5839efe0d40d1e85a826f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 12:35:33 2007 +0200 wined3d: Store the position_transformed flag in the vdecl. --- dlls/wined3d/drawprim.c | 11 +++-------- dlls/wined3d/vertexdeclaration.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 98cc4ec..c35ce69 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -160,14 +160,9 @@ void primitiveDeclarationConvertToStridedData( DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ - strided->u.s.position_transformed = FALSE; - for (i = 0; i < vertexDeclaration->declarationWNumElements - 1; ++i) { - element = vertexDeclaration->pDeclarationWine + i; - - if (element->Usage == WINED3DDECLUSAGE_POSITIONT) { - strided->u.s.position_transformed = TRUE; - useVertexShaderFunction = FALSE; - } + strided->u.s.position_transformed = vertexDeclaration->position_transformed; + if(vertexDeclaration->position_transformed) { + useVertexShaderFunction = FALSE; } /* Translate the declaration into strided data */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 2bbca7d..292f1f0 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -143,14 +143,18 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte /* Do some static analysis on the elements to make reading the declaration more comfortable * for the drawing code - * - * First, find the Streams used in the declaration. The vertex buffers have to be loaded - * when drawing. */ This->num_streams = 0; + This->position_transformed = FALSE; for (i = 0; i < element_count; ++i) { - /* Filter tesselation pseudo streams*/ + if(This->pDeclarationWine[i].Usage == WINED3DDECLUSAGE_POSITIONT) { + This->position_transformed = TRUE; + } + + /* Find the Streams used in the declaration. The vertex buffers have to be loaded + * when drawing, but filter tesselation pseudo streams + */ if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; if(!isPreLoaded[This->pDeclarationWine[i].Stream]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 240dca5..83915ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1228,6 +1228,7 @@ typedef struct IWineD3DVertexDeclarationImpl { DWORD streams[MAX_STREAMS]; UINT num_streams; + BOOL position_transformed; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

1 0

Stefan Dösinger : wined3d: Remove link collection from vertexdeclaration.c.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: ca0d92f3bc1c3d15e566c7e84fbf2dfba1be39f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0d92f3bc1c3d15e566c7e84… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 11:45:28 2007 +0200 wined3d: Remove link collection from vertexdeclaration.c. --- dlls/wined3d/vertexdeclaration.c | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index bdf07b6..be5d542 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -26,38 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); -/** - * DirectX9 SDK download - * http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.a… - * - * Exploring D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Using Vertex Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Dx9 New - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * FVF - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * NVIDIA: DX8 Vertex Shader to NV Vertex Program - * http://developer.nvidia.com/view.asp?IO=vstovp - * - * NVIDIA: Memory Management with VAR - * http://developer.nvidia.com/view.asp?IO=var_memory_management - */ - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" Stream: %d\n", element->Stream); TRACE(" Offset: %d\n", element->Offset);

1 0

Stefan Dösinger : wined3d: Determine used streams at vdecl creation.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 06e51c21e1fce91079a7d6bd3e2621d687522ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e51c21e1fce91079a7d6bd3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 3 19:53:25 2007 +0200 wined3d: Determine used streams at vdecl creation. --- dlls/wined3d/drawprim.c | 13 +++---------- dlls/wined3d/vertexdeclaration.c | 23 ++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dc9e761..98cc4ec 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -156,10 +156,8 @@ void primitiveDeclarationConvertToStridedData( WINED3DVERTEXELEMENT *element; DWORD stride; int reg; - char isPreLoaded[MAX_STREAMS]; - DWORD preLoadStreams[MAX_STREAMS], numPreloadStreams = 0; - - memset(isPreLoaded, 0, sizeof(isPreLoaded)); + DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; + DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ strided->u.s.position_transformed = FALSE; @@ -191,11 +189,6 @@ void primitiveDeclarationConvertToStridedData( data = (BYTE *)This->stateBlock->streamSource[element->Stream]; } else { TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); - if(!isPreLoaded[element->Stream]) { - preLoadStreams[numPreloadStreams] = element->Stream; - numPreloadStreams++; - isPreLoaded[element->Stream] = 1; - } data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); if(fixup) { if( streamVBO != 0) *fixup = TRUE; @@ -242,7 +235,7 @@ void primitiveDeclarationConvertToStridedData( * once in there. */ for(i=0; i < numPreloadStreams; i++) { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[i]]); + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[streams[i]]); } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index be5d542..2bbca7d 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -120,11 +120,13 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte const WINED3DVERTEXELEMENT *elements, size_t element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; + int i; + char isPreLoaded[MAX_STREAMS]; TRACE("(%p) : d3d version %d\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); + memset(isPreLoaded, 0, sizeof(isPreLoaded)); if (TRACE_ON(d3d_decl)) { - int i; for (i = 0; i < element_count; ++i) { dump_wined3dvertexelement(elements+i); } @@ -139,6 +141,25 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte CopyMemory(This->pDeclarationWine, elements, sizeof(WINED3DVERTEXELEMENT) * element_count); } + /* Do some static analysis on the elements to make reading the declaration more comfortable + * for the drawing code + * + * First, find the Streams used in the declaration. The vertex buffers have to be loaded + * when drawing. + */ + This->num_streams = 0; + for (i = 0; i < element_count; ++i) { + + /* Filter tesselation pseudo streams*/ + if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; + + if(!isPreLoaded[This->pDeclarationWine[i].Stream]) { + This->streams[This->num_streams] = This->pDeclarationWine[i].Stream; + This->num_streams++; + isPreLoaded[This->pDeclarationWine[i].Stream] = 1; + } + } + TRACE("Returning\n"); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 548c337..240dca5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1225,6 +1225,9 @@ typedef struct IWineD3DVertexDeclarationImpl { WINED3DVERTEXELEMENT *pDeclarationWine; UINT declarationWNumElements; + + DWORD streams[MAX_STREAMS]; + UINT num_streams; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

1 0

Stefan Dösinger : d3d: Add a simple offscreen rendering test.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 2d15cb8b278afd14f33bc5015806061a8bdec4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d15cb8b278afd14f33bc5015… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 16:47:08 2007 +0200 d3d: Add a simple offscreen rendering test. --- dlls/d3d8/tests/visual.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 114 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 101 +++++++++++++++++++++++++++++++++++++ 3 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d15cb8b278afd14f33bc…

1 0

Alexandre Julliard : user32: Fixed the return value of DispatchMessageA/W.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: c4245a7fb6a1b4fdaffa7db8c55ec083edbcc75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4245a7fb6a1b4fdaffa7db8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 7 17:45:10 2007 +0200 user32: Fixed the return value of DispatchMessageA/W. --- dlls/user32/message.c | 8 ++++---- include/winuser.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index bfdd807..a665b12 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2961,10 +2961,10 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) * * See DispatchMessageW. */ -LONG WINAPI DispatchMessageA( const MSG* msg ) +LRESULT WINAPI DispatchMessageA( const MSG* msg ) { WND * wndPtr; - LONG retval; + LRESULT retval; WNDPROC winproc; /* Process timer messages */ @@ -3033,10 +3033,10 @@ LONG WINAPI DispatchMessageA( const MSG* msg ) * ECMA-234, Win32 * */ -LONG WINAPI DispatchMessageW( const MSG* msg ) +LRESULT WINAPI DispatchMessageW( const MSG* msg ) { WND * wndPtr; - LONG retval; + LRESULT retval; WNDPROC winproc; /* Process timer messages */ diff --git a/include/winuser.h b/include/winuser.h index 1c650bc..4297a8d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4475,8 +4475,8 @@ INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC, INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); #define DialogBoxParam WINELIB_NAME_AW(DialogBoxParam) -LONG WINAPI DispatchMessageA(const MSG*); -LONG WINAPI DispatchMessageW(const MSG*); +LRESULT WINAPI DispatchMessageA(const MSG*); +LRESULT WINAPI DispatchMessageW(const MSG*); #define DispatchMessage WINELIB_NAME_AW(DispatchMessage) INT WINAPI DlgDirListA(HWND,LPSTR,INT,INT,UINT); INT WINAPI DlgDirListW(HWND,LPWSTR,INT,INT,UINT);

1 0

Alexandre Julliard : user32: Get rid of winproc. h and move definitions in user_private.h.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: d00d54ebeb71ddaec5213954397ff96a4406f4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00d54ebeb71ddaec52139543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 7 21:01:55 2007 +0200 user32: Get rid of winproc.h and move definitions in user_private.h. --- dlls/user32/class.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/hook16.c | 1 - dlls/user32/message.c | 1 - dlls/user32/msg16.c | 1 - dlls/user32/user_private.h | 22 ++++++++++++++++++ dlls/user32/win.c | 1 - dlls/user32/winproc.c | 1 - dlls/user32/winproc.h | 52 -------------------------------------------- dlls/user32/wnd16.c | 1 - 10 files changed, 23 insertions(+), 60 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 4f6c7b5..51801bc 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -36,7 +36,6 @@ #include "win.h" #include "user_private.h" #include "controls.h" -#include "winproc.h" #include "wine/server.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 794ae0e..911e0ce 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -26,7 +26,7 @@ #include "wine/winuser16.h" #include "controls.h" #include "win.h" -#include "winproc.h" +#include "user_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dialog); diff --git a/dlls/user32/hook16.c b/dlls/user32/hook16.c index f44ba12..436a168 100644 --- a/dlls/user32/hook16.c +++ b/dlls/user32/hook16.c @@ -30,7 +30,6 @@ #include "wine/winuser16.h" #include "win.h" #include "user_private.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(hook); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a665b12..2c0f6fb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -39,7 +39,6 @@ #include "user_private.h" #include "win.h" #include "controls.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index ffc01e2..ec42ae9 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -23,7 +23,6 @@ #include "winerror.h" #include "win.h" #include "user_private.h" -#include "winproc.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67be8f5..692eca9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -225,6 +225,28 @@ extern BOOL USER_IsExitingThread( DWORD tid ); extern BOOL USER_SetWindowPos( WINDOWPOS * winpos ); +typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + LRESULT *result, void *arg ); +typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, + LRESULT *result, void *arg ); + +extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); +extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ); +extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ); +extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ); +extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ); + +extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, + WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); +extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); + +extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); + /* message spy definitions */ #define SPY_DISPATCHMESSAGE16 0x0100 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d9b3a2e..0ef021a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -33,7 +33,6 @@ #include "wine/server.h" #include "wine/unicode.h" #include "win.h" -#include "winproc.h" #include "user_private.h" #include "controls.h" #include "winerror.h" diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 27b31a1..50b5858 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -33,7 +33,6 @@ #include "wine/winuser16.h" #include "controls.h" #include "win.h" -#include "winproc.h" #include "user_private.h" #include "dde.h" #include "winternl.h" diff --git a/dlls/user32/winproc.h b/dlls/user32/winproc.h deleted file mode 100644 index 69b6d76..0000000 --- a/dlls/user32/winproc.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Window procedure callbacks definitions - * - * Copyright 1996 Alexandre Julliard - * - * 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 - */ - -#ifndef __WINE_WINPROC_H -#define __WINE_WINPROC_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/winbase16.h" - -typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ); -typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp, - LRESULT *result, void *arg ); - -extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ); -extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func ); -extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode ); -extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW ); -extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val ); - -extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg, - WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ); -extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ); - -extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); -extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); - -#endif /* __WINE_WINPROC_H */ diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index f29124c..0b0d0c1 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -21,7 +21,6 @@ #include "wine/winuser16.h" #include "wownt32.h" #include "win.h" -#include "winproc.h" #include "user_private.h" /* handle <--> handle16 conversions */

1 0

Paul Vriens : shlwapi/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 3de1c55dc6b8a29a1dc0717c66f940caa1bc93b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de1c55dc6b8a29a1dc0717c6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 15:16:32 2007 +0200 shlwapi/tests: Use GetModuleHandleA instead of LoadLibraryA. --- dlls/shlwapi/tests/clist.c | 54 ++++++++++++++++++----------------------- dlls/shlwapi/tests/clsid.c | 13 ++------- dlls/shlwapi/tests/ordinal.c | 7 +---- dlls/shlwapi/tests/path.c | 3 +- 4 files changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index e6e4b05..5f94b4f 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -214,33 +214,30 @@ static HRESULT (WINAPI *pSHLWAPI_214)(_IDummyStream*,ULARGE_INTEGER*); static void InitFunctionPtrs(void) { - SHLWAPI_hshlwapi = LoadLibraryA("shlwapi.dll"); - ok(SHLWAPI_hshlwapi != 0, "LoadLibrary failed\n"); - if (SHLWAPI_hshlwapi) - { - pSHLWAPI_17 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)17); - ok(pSHLWAPI_17 != 0, "No Ordinal 17\n"); - pSHLWAPI_18 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)18); - ok(pSHLWAPI_18 != 0, "No Ordinal 18\n"); - pSHLWAPI_19 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)19); - ok(pSHLWAPI_19 != 0, "No Ordinal 19\n"); - pSHLWAPI_20 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)20); - ok(pSHLWAPI_20 != 0, "No Ordinal 20\n"); - pSHLWAPI_21 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)21); - ok(pSHLWAPI_21 != 0, "No Ordinal 21\n"); - pSHLWAPI_22 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)22); - ok(pSHLWAPI_22 != 0, "No Ordinal 22\n"); - pSHLWAPI_166 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)166); - ok(pSHLWAPI_166 != 0, "No Ordinal 166\n"); - pSHLWAPI_184 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)184); - ok(pSHLWAPI_184 != 0, "No Ordinal 184\n"); - pSHLWAPI_212 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)212); - ok(pSHLWAPI_212 != 0, "No Ordinal 212\n"); - pSHLWAPI_213 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)213); - ok(pSHLWAPI_213 != 0, "No Ordinal 213\n"); - pSHLWAPI_214 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)214); - ok(pSHLWAPI_214 != 0, "No Ordinal 214\n"); - } + SHLWAPI_hshlwapi = GetModuleHandleA("shlwapi.dll"); + + pSHLWAPI_17 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)17); + ok(pSHLWAPI_17 != 0, "No Ordinal 17\n"); + pSHLWAPI_18 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)18); + ok(pSHLWAPI_18 != 0, "No Ordinal 18\n"); + pSHLWAPI_19 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)19); + ok(pSHLWAPI_19 != 0, "No Ordinal 19\n"); + pSHLWAPI_20 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)20); + ok(pSHLWAPI_20 != 0, "No Ordinal 20\n"); + pSHLWAPI_21 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)21); + ok(pSHLWAPI_21 != 0, "No Ordinal 21\n"); + pSHLWAPI_22 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)22); + ok(pSHLWAPI_22 != 0, "No Ordinal 22\n"); + pSHLWAPI_166 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)166); + ok(pSHLWAPI_166 != 0, "No Ordinal 166\n"); + pSHLWAPI_184 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)184); + ok(pSHLWAPI_184 != 0, "No Ordinal 184\n"); + pSHLWAPI_212 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)212); + ok(pSHLWAPI_212 != 0, "No Ordinal 212\n"); + pSHLWAPI_213 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)213); + ok(pSHLWAPI_213 != 0, "No Ordinal 213\n"); + pSHLWAPI_214 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)214); + ok(pSHLWAPI_214 != 0, "No Ordinal 214\n"); } static void InitDummyStream(_IDummyStream* iface) @@ -637,7 +634,4 @@ START_TEST(clist) test_SHLWAPI_213(); test_SHLWAPI_214(); } - - if (SHLWAPI_hshlwapi) - FreeLibrary(SHLWAPI_hshlwapi); } diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 8f0830c..74ad6e5 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -182,17 +182,10 @@ static void test_CLSIDFromProgIDWrap(void) START_TEST(clsid) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - ok(hShlwapi != 0, "LoadLibraryA failed\n"); - if (hShlwapi) - { - pSHLWAPI_269 = (void*)GetProcAddress(hShlwapi, (LPSTR)269); - pSHLWAPI_23 = (void*)GetProcAddress(hShlwapi, (LPSTR)23); - } + hShlwapi = GetModuleHandleA("shlwapi.dll"); + pSHLWAPI_269 = (void*)GetProcAddress(hShlwapi, (LPSTR)269); + pSHLWAPI_23 = (void*)GetProcAddress(hShlwapi, (LPSTR)23); test_ClassIDs(); test_CLSIDFromProgIDWrap(); - - if (hShlwapi) - FreeLibrary(hShlwapi); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0d98ec8..c948274 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -433,10 +433,7 @@ static void test_GetShellSecurityDescriptor(void) START_TEST(ordinal) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - ok(hShlwapi != 0, "LoadLibraryA failed\n"); - if (!hShlwapi) - return; + hShlwapi = GetModuleHandleA("shlwapi.dll"); pGetAcceptLanguagesA = (void*)GetProcAddress(hShlwapi, (LPSTR)14); pSHSearchMapInt = (void*)GetProcAddress(hShlwapi, (LPSTR)198); @@ -450,6 +447,4 @@ START_TEST(ordinal) test_alloc_shared(); test_fdsa(); test_GetShellSecurityDescriptor(); - - FreeLibrary(hShlwapi); } diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index bde40b2..d4ed84d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1833,8 +1833,7 @@ static void test_PathUnquoteSpaces(void) START_TEST(path) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - if (!hShlwapi) return; + hShlwapi = GetModuleHandleA("shlwapi.dll"); test_UrlHash(); test_UrlGetPart();

1 0

Paul Vriens : kernel32/tests: Changed skip message.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: e90f1e3568504d5384c457c198637e8987943305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90f1e3568504d5384c457c19… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 16:45:26 2007 +0200 kernel32/tests: Changed skip message. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 054f034..2992c38 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1044,7 +1044,7 @@ START_TEST(actctx) init_paths(); if (!init_funcs()) { - skip("Couldn't load kernel32\n"); + skip("Needed functions are not available\n"); return; }

1 0

Paul Vriens : kernel32/tests: Create paths after checking availability of functions.
by Alexandre Julliard 08 Aug '07

08 Aug '07

Module: wine Branch: master Commit: 5cb50202a0445b031689c26d33ccb2eb50892aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb50202a0445b031689c26d3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 8 08:46:14 2007 +0200 kernel32/tests: Create paths after checking availability of functions. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2992c38..5686089 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1041,12 +1041,12 @@ START_TEST(actctx) argc = winetest_get_mainargs(&argv); - init_paths(); if (!init_funcs()) { skip("Needed functions are not available\n"); return; } + init_paths(); if(argc > 2 && !strcmp(argv[2], "manifest1")) { test_app_manifest();

1 0