October 2009 - Wine-Commits

Henri Verbeet : wined3d: Remove some unused code.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 2be38232ea46b9042a6ef5a904c5d91a64d0aff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be38232ea46b9042a6ef5a90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:57 2009 +0200 wined3d: Remove some unused code. --- dlls/wined3d/directx.c | 10 ---------- dlls/wined3d/wined3d_private.h | 40 ---------------------------------------- 2 files changed, 0 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d494ec..18ac560 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4454,16 +4454,6 @@ static HRESULT WINAPI IWineD3DImpl_GetParent(IWineD3D *iface, IUnknown **pParent return WINED3D_OK; } -ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { - IUnknown* volumeParent; - TRACE("(%p) call back\n", pVolume); - - /* Now, release the parent, which will take care of cleaning up the volume for us */ - IWineD3DVolume_GetParent(pVolume, &volumeParent); - IUnknown_Release(volumeParent); - return IUnknown_Release(volumeParent); -} - static void WINE_GLAPI invalid_func(const void *data) { ERR("Invalid vertex attribute function called\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03b5b51..87e752e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -240,10 +240,6 @@ static inline float float_24_to_32(DWORD in) #define VBO_NONE 0 #define VBO_HW 1 -#define NP2_NONE 0 -#define NP2_REPACK 1 -#define NP2_NATIVE 2 - #define ORM_BACKBUFFER 0 #define ORM_PBUFFER 1 #define ORM_FBO 2 @@ -325,13 +321,6 @@ enum wined3d_immconst_type WINED3D_IMMCONST_FLOAT4, }; -typedef enum _WINED3DVS_RASTOUT_OFFSETS -{ - WINED3DSRO_POSITION = 0, - WINED3DSRO_FOG = 1, - WINED3DSRO_POINT_SIZE = 2, -} WINED3DVS_RASTOUT_OFFSETS; - #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE @@ -766,7 +755,6 @@ extern int num_lock DECLSPEC_HIDDEN; #define GL_SUPPORT(ExtName) (GLINFO_LOCATION.supported[ExtName] != 0) #define GL_LIMITS(ExtName) (GLINFO_LOCATION.max_##ExtName) #define GL_EXTCALL(FuncName) (GLINFO_LOCATION.FuncName) -#define GL_VEND(_VendName) (GLINFO_LOCATION.gl_vendor == VENDOR_##_VendName ? TRUE : FALSE) #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) @@ -788,8 +776,6 @@ extern int num_lock DECLSPEC_HIDDEN; /* DirectX Device Limits */ /* --------------------- */ #define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ -#define MAX_STREAMS 16 /* Maximum possible streams - used for fixed size arrays - See MaxStreams in MSDN under GetDeviceCaps */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */ @@ -826,29 +812,12 @@ do { memcpy(gl_mat, (mat), 16 * sizeof(float)); \ } while (0) -/* Macro to dump out the current state of the light chain */ -#define DUMP_LIGHT_CHAIN() \ -do { \ - PLIGHTINFOEL *el = This->stateBlock->lights;\ - while (el) { \ - TRACE("Light %p (glIndex %ld, d3dIndex %ld, enabled %d)\n", el, el->glIndex, el->OriginalIndex, el->lightEnabled);\ - el = el->next; \ - } \ -} while(0) - /* Trace vector and strided data information */ -#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) #define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ si->elements[name].data, si->elements[name].stride, si->elements[name].format_desc->format, \ si->elements[name].buffer_object, si->elements[name].stream_idx); } while(0) -/* Defines used for optimizations */ - -/* Only reapply what is necessary */ -#define REAPPLY_ALPHAOP 0x0001 -#define REAPPLY_ALL 0xFFFF - /* Advance declaration of structures to satisfy compiler */ typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; @@ -1231,9 +1200,6 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * #define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) #define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) -/* Default callbacks for implicit object destruction */ -extern ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pSurface) DECLSPEC_HIDDEN; - /***************************************************************************** * Internal representation of a light */ @@ -2066,7 +2032,6 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DVertexDeclaration implementation structure */ -#define MAX_ATTRIBS 16 struct wined3d_vertex_declaration_element { @@ -2268,12 +2233,7 @@ typedef struct IWineD3DQueryImpl LONG ref; /* Note: Ref counting not required */ IUnknown *parent; - /*TODO: replace with iface usage */ -#if 0 - IWineD3DDevice *wineD3DDevice; -#else IWineD3DDeviceImpl *wineD3DDevice; -#endif /* IWineD3DQuery fields */ enum query_state state;

1 0

Alexandre Julliard : msvcrt: Use strict function prototypes.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 5af33ee06f67aba6033bd45a460c476b96d29cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af33ee06f67aba6033bd45a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:18:50 2009 +0200 msvcrt: Use strict function prototypes. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/cppexcept.c | 2 +- dlls/msvcrt/cppexcept.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index b262718..569452c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -36,7 +36,7 @@ typedef struct { #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) #define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(); \ + extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b203e1c..2ac9b8f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -74,7 +74,7 @@ typedef struct _rtti_object_locator #define THISCALL(func) __thiscall_ ## func #define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func) #define DEFINE_THISCALL_WRAPPER(func,args) \ - extern void THISCALL(func)(); \ + extern void THISCALL(func)(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index a777025..4bdd59c 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -199,7 +199,7 @@ static void copy_exception( void *object, cxx_exception_frame *frame, /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { - void (*handler)(); + void (*handler)(void); int trylevel = frame->trylevel; while (trylevel != last_level) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 1a3919e..7afb078 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -24,7 +24,7 @@ #define CXX_FRAME_MAGIC 0x19930520 #define CXX_EXCEPTION 0xe06d7363 -typedef void (*vtable_ptr)(); +typedef void (*vtable_ptr)(void); /* type_info object, see cpp.c for implementation */ typedef struct __type_info @@ -56,7 +56,7 @@ typedef struct __catchblock_info UINT flags; /* flags (see below) */ const type_info *type_info; /* C++ type caught by this block */ int offset; /* stack offset to copy exception object to */ - void (*handler)(); /* catch block handler code */ + void (*handler)(void);/* catch block handler code */ } catchblock_info; #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -76,7 +76,7 @@ typedef struct __tryblock_info typedef struct __unwind_info { int prev; /* prev trylevel unwind handler, to run after this one */ - void (*handler)(); /* unwind handler */ + void (*handler)(void);/* unwind handler */ } unwind_info; /* descriptor of all try blocks of a given function */ @@ -128,7 +128,7 @@ typedef DWORD (*cxx_exc_custom_handler)( PEXCEPTION_RECORD, cxx_exception_frame* typedef struct __cxx_exception_type { UINT flags; /* TYPE_FLAG flags */ - void (*destructor)(); /* exception object destructor */ + void (*destructor)(void);/* exception object destructor */ cxx_exc_custom_handler custom_handler; /* custom handler for this exception */ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type;

1 0

Henri Verbeet : wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock () as well.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 5c229715610532373525c1736090ff344d51e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c229715610532373525c1736… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:55 2009 +0200 wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 01783c5..8bbde2f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1653,6 +1653,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); } + if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Keep references to the textures initially captured by CreateStateBlock() as well.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: b5de2fcb1c331a22a5166bee00700516eb415a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5de2fcb1c331a22a5166bee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:54 2009 +0200 wined3d: Keep references to the textures initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ef33a2a..01783c5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1648,6 +1648,11 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); + } + if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Move the SM1 opcode enum to shader_sm1.c.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 92d22ce535a560ea203ed779b34458b77d5ca201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d22ce535a560ea203ed779b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:56 2009 +0200 wined3d: Move the SM1 opcode enum to shader_sm1.c. --- dlls/wined3d/shader_sm1.c | 379 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 91 ---------- 2 files changed, 235 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92d22ce535a560ea203ed…

1 0

Andrey Turkin : kernel32: Send debug strings to system-wide monitor.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 02ce96f425642e7863f15350dad2139ab5c040c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ce96f425642e7863f15350d… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 21:42:36 2009 +0400 kernel32: Send debug strings to system-wide monitor. --- dlls/kernel32/debugger.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index f0dae2d..50a7428 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -240,6 +240,10 @@ BOOL WINAPI DebugActiveProcessStop( DWORD pid ) */ void WINAPI OutputDebugStringA( LPCSTR str ) { + static HANDLE DBWinMutex = NULL; + static BOOL mutex_inited = FALSE; + + /* send string to attached debugger */ SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); @@ -247,7 +251,82 @@ void WINAPI OutputDebugStringA( LPCSTR str ) wine_server_call( req ); } SERVER_END_REQ; + WARN("%s\n", str); + + /* send string to a system-wide monitor */ + /* FIXME should only send to monitor if no debuggers are attached */ + + if (!mutex_inited) + { + /* first call to OutputDebugString, initialize mutex handle */ + static const WCHAR mutexname[] = {'D','B','W','i','n','M','u','t','e','x',0}; + HANDLE mutex = CreateMutexExW( NULL, mutexname, 0, SYNCHRONIZE ); + if (mutex) + { + if (InterlockedCompareExchangePointer( &DBWinMutex, mutex, 0 ) != 0) + { + /* someone beat us here... */ + CloseHandle( mutex ); + } + } + mutex_inited = TRUE; + } + + if (DBWinMutex) + { + static const WCHAR shmname[] = {'D','B','W','I','N','_','B','U','F','F','E','R',0}; + static const WCHAR eventbuffername[] = {'D','B','W','I','N','_','B','U','F','F','E','R','_','R','E','A','D','Y',0}; + static const WCHAR eventdataname[] = {'D','B','W','I','N','_','D','A','T','A','_','R','E','A','D','Y',0}; + HANDLE mapping; + + mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, shmname ); + if (mapping) + { + LPVOID buffer; + HANDLE eventbuffer, eventdata; + + buffer = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); + eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, eventbuffername ); + eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, eventdataname ); + + if (buffer && eventbuffer && eventdata) + { + /* monitor is present, synchronize with other OutputDebugString invokations */ + WaitForSingleObject( DBWinMutex, INFINITE ); + + /* acquire control over the buffer */ + if (WaitForSingleObject( eventbuffer, 10000 ) == WAIT_OBJECT_0) + { + int str_len; + struct _mon_buffer_t { + DWORD pid; + char buffer[1]; + } *mon_buffer = (struct _mon_buffer_t*) buffer; + + str_len = strlen( str ); + if (str_len > (4096 - sizeof(DWORD) - 1)) + str_len = 4096 - sizeof(DWORD) - 1; + + mon_buffer->pid = GetCurrentProcessId(); + memcpy( mon_buffer->buffer, str, str_len ); + mon_buffer->buffer[str_len] = 0; + + /* signal data ready */ + SetEvent( eventdata ); + } + ReleaseMutex( DBWinMutex ); + } + + if (buffer) + UnmapViewOfFile( buffer ); + if (eventbuffer) + CloseHandle( eventbuffer ); + if (eventdata) + CloseHandle( eventdata ); + CloseHandle( mapping ); + } + } }

1 0

Alexandre Julliard : oleaut32: Use an assembly wrapper to implement DispCallFunc, and make it i386-only.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: ceac768adf8edcacfcb1a0b4a0a8ba3e09fbe549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceac768adf8edcacfcb1a0b4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 12:07:23 2009 +0200 oleaut32: Use an assembly wrapper to implement DispCallFunc, and make it i386-only. --- dlls/oleaut32/tmarshal.c | 5 ++ dlls/oleaut32/typelib.c | 145 ++++++++++++++-------------------------------- 2 files changed, 49 insertions(+), 101 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 7235850..e7d7b89 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2037,6 +2037,7 @@ static HRESULT WINAPI TMStubImpl_Invoke( LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { +#ifdef __i386__ int i; const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; @@ -2201,6 +2202,10 @@ exit: TRACE("returning\n"); return hres; +#else + FIXME( "not implemented on non-i386\n" ); + return E_FAIL; +#endif } static LPRPCSTUBBUFFER WINAPI diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8fe6ce9..0bd9b19 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5621,6 +5621,41 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, return DISP_E_UNKNOWNNAME; } + +#ifdef __i386__ + +extern DWORD CDECL call_method( void *func, int nb_args, const DWORD *args ); +__ASM_GLOBAL_FUNC( call_method, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "movl 12(%ebp),%edx\n\t" + "shll $2,%edx\n\t" + "jz 1f\n\t" + "subl %edx,%esp\n\t" + "andl $~15,%esp\n\t" + "movl 12(%ebp),%ecx\n\t" + "movl 16(%ebp),%esi\n\t" + "movl %esp,%edi\n\t" + "cld\n\t" + "rep; movsl\n" + "1:\tcall *8(%ebp)\n\t" + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) + /* ITypeInfo::Invoke * * Invokes a method, or accesses a property of an object, that implements the @@ -5639,106 +5674,8 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { switch (callconv) { case CC_STDCALL: - - switch (nrargs) { - case 0: - res = func(); - break; - case 1: - res = func(args[0]); - break; - case 2: - res = func(args[0],args[1]); - break; - case 3: - res = func(args[0],args[1],args[2]); - break; - case 4: - res = func(args[0],args[1],args[2],args[3]); - break; - case 5: - res = func(args[0],args[1],args[2],args[3],args[4]); - break; - case 6: - res = func(args[0],args[1],args[2],args[3],args[4],args[5]); - break; - case 7: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6]); - break; - case 8: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7]); - break; - case 9: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]); - break; - case 10: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9]); - break; - case 11: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10]); - break; - case 12: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11]); - break; - case 13: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12]); - break; - case 14: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13]); - break; - case 15: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14]); - break; - case 16: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15]); - break; - case 17: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16]); - break; - case 18: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17]); - break; - case 19: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18]); - break; - case 20: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19]); - break; - case 21: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20]); - break; - case 22: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21]); - break; - case 23: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22]); - break; - case 24: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23]); - break; - case 25: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24]); - break; - case 26: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25]); - break; - case 27: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26]); - break; - case 28: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27]); - break; - case 29: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27],args[28]); - break; - case 30: - res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16],args[17],args[18],args[19],args[20],args[21],args[22],args[23],args[24],args[25],args[26],args[27],args[28],args[29]); - break; - default: - FIXME("unsupported number of arguments %d in stdcall\n",nrargs); - res = -1; - break; - } + case CC_CDECL: + res = call_method( func, nrargs, args ); break; default: FIXME("unsupported calling convention %d\n",callconv); @@ -5775,6 +5712,7 @@ static int _dispargsize(VARTYPE vt) return 1; } } +#endif /* __i386__ */ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { @@ -5954,6 +5892,7 @@ DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { +#ifdef __i386__ int argsize, argspos; UINT i; DWORD *args; @@ -6009,9 +5948,13 @@ DispCallFunc( V_VT(pvargResult) = vtReturn; V_UI4(pvargResult) = hres; } - HeapFree(GetProcessHeap(),0,args); return S_OK; +#else + FIXME( "(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d)): not implemented for this CPU\n", + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); + return E_NOTIMPL; +#endif } #define INVBUF_ELEMENT_SIZE \

1 0

Ge van Geldorp : schannel/tests: Fix crash on Win7.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 875d3b9799dc15cab2c075f22e4a4778f09980fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=875d3b9799dc15cab2c075f22… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 schannel/tests: Fix crash on Win7. --- dlls/schannel/lsamode.c | 14 +++++++++++++- dlls/schannel/tests/main.c | 35 ++++++++++++++++++++++++++++++++--- include/ntsecpkg.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 23d8599..f43150e 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -109,6 +109,12 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -139,6 +145,12 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ } }; @@ -150,7 +162,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_3; + *PackageVersion = SECPKG_INTERFACE_VERSION_6; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d05275f..b576848 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -37,7 +37,13 @@ SetContextAttributes) #define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + ChangeAccountPassword) +#define SECPKG_FUNCTION_TABLE_SIZE_4 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + QueryMetaData) +#define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + ValidateTargetInfo) +#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); @@ -121,6 +127,7 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, ULONG Version) { size_t size; + PSECPKG_FUNCTION_TABLE pNextTable; if (Version == SECPKG_INTERFACE_VERSION) size = SECPKG_FUNCTION_TABLE_SIZE_1; @@ -128,12 +135,32 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_2; else if (Version == SECPKG_INTERFACE_VERSION_3) size = SECPKG_FUNCTION_TABLE_SIZE_3; + else if (Version == SECPKG_INTERFACE_VERSION_4) + size = SECPKG_FUNCTION_TABLE_SIZE_4; + else if (Version == SECPKG_INTERFACE_VERSION_5) + size = SECPKG_FUNCTION_TABLE_SIZE_5; + else if (Version == SECPKG_INTERFACE_VERSION_6) + size = SECPKG_FUNCTION_TABLE_SIZE_6; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; } - return (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + /* Win7 function tables appear to be SECPKG_INTERFACE_VERSION_6 format, + but unfortunately SpLsaModeInitialize returns SECPKG_INTERFACE_VERSION_3. + We detect that by comparing the "Initialize" pointer from the old table + to the "FreeCredentialsHandle" pointer of the new table. These functions + have different numbers of arguments, so they can't possibly point to the + same implementation */ + if (broken((void *) pTable->Initialize == (void *) pNextTable->FreeCredentialsHandle && + pNextTable->FreeCredentialsHandle != NULL)) + { + win_skip("Invalid function pointers for next package\n"); + return NULL; + } + + return pNextTable; } static void testGetInfo(void) @@ -181,7 +208,9 @@ static void testGetInfo(void) PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); - ok(PackageInfo.cbMaxToken == 0x4000, "cbMaxToken: 0x%x\n", + ok(PackageInfo.cbMaxToken == 0x4000 || + PackageInfo.cbMaxToken == 0x6000, /* Win7 */ + "cbMaxToken: 0x%x\n", PackageInfo.cbMaxToken); } } diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index e887360..b83d364 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -34,6 +34,9 @@ extern "C" { #define SECPKG_INTERFACE_VERSION 0x10000 #define SECPKG_INTERFACE_VERSION_2 0x20000 #define SECPKG_INTERFACE_VERSION_3 0x40000 +#define SECPKG_INTERFACE_VERSION_4 0x80000 +#define SECPKG_INTERFACE_VERSION_5 0x100000 +#define SECPKG_INTERFACE_VERSION_6 0x200000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -144,6 +147,11 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; +typedef struct _SECPKG_TARGETINFO { + PSID DomainSid; + PCWSTR ComputerName; +} SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; + /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); @@ -345,6 +353,18 @@ typedef NTSTATUS (NTAPI SpSetContextAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, ULONG); typedef NTSTATUS (NTAPI SpSetCredentialsAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, ULONG); +typedef NTSTATUS (NTAPI SpChangeAccountPasswordFn)(PUNICODE_STRING, + PUNICODE_STRING, PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PSecBufferDesc); +typedef NTSTATUS (NTAPI SpQueryMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, PULONG, PUCHAR *, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpExchangeMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, ULONG, PUCHAR, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpGetCredUIContextFn)(LSA_SEC_HANDLE, GUID *, PULONG, + PUCHAR *); +typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, + PUCHAR); +typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, + PVOID, ULONG, PSECPKG_TARGETINFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -406,6 +426,15 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */ SpSetCredentialsAttributesFn *SetCredentialsAttributes; /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */ + SpChangeAccountPasswordFn *ChangeAccountPassword; + /* Packages with version SECPKG_INTERFACE_VERSION_4 end here */ + SpQueryMetaDataFn *QueryMetaData; + SpExchangeMetaDataFn *ExchangeMetaData; + SpGetCredUIContextFn *GetCredUIContext; + SpUpdateCredentialsFn *UpdateCredentials; + /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ + SpValidateTargetInfoFn *ValidateTargetInfo; + /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Michael Stefaniuc : ws2_32/tests: Use LONG instead of long.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 6edb5dd0c621a73fa5db30043d4ed8ff086bce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6edb5dd0c621a73fa5db30043… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 6 10:35:19 2009 +0200 ws2_32/tests: Use LONG instead of long. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 37cd740..56ae78f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -721,7 +721,7 @@ static void WINAPI event_client ( client_params *par ) HANDLE event; WSANETWORKEVENTS wsa_events; char *send_last, *recv_last, *send_p, *recv_p; - long mask = FD_READ | FD_WRITE | FD_CLOSE; + LONG mask = FD_READ | FD_WRITE | FD_CLOSE; trace ( "event_client (%x): starting\n", id ); client_start ( par );

1 0

Michael Stefaniuc : kernel32/tests: Use better types than long.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 73d38b047bdef8b6297f51dd722b4fdccf1f6f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d38b047bdef8b6297f51dd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 6 00:53:32 2009 +0200 kernel32/tests: Use better types than long. --- dlls/kernel32/tests/file.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5219f79..d59315e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -77,9 +77,9 @@ static void test__hread( void ) { HFILE filehandle; char buffer[10000]; - long bytes_read; - long bytes_wanted; - long i; + LONG bytes_read; + LONG bytes_wanted; + LONG i; BOOL ret; SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); /* be sure to remove stale files */ @@ -124,10 +124,10 @@ static void test__hwrite( void ) { HFILE filehandle; char buffer[10000]; - long bytes_read; - long bytes_written; - long blocks; - long i; + LONG bytes_read; + LONG bytes_written; + ULONG blocks; + LONG i; char *contents; HLOCAL memory_object; char checksum[1]; @@ -159,7 +159,7 @@ static void test__hwrite( void ) srand( (unsigned)time( NULL ) ); for (blocks = 0; blocks < 100; blocks++) { - for (i = 0; i < (long)sizeof( buffer ); i++) + for (i = 0; i < (LONG)sizeof( buffer ); i++) { buffer[i] = rand( ); checksum[0] = checksum[0] + buffer[i]; @@ -355,7 +355,7 @@ static void test__llseek( void ) INT i; HFILE filehandle; char buffer[1]; - long bytes_read; + LONG bytes_read; BOOL ret; filehandle = _lcreat( filename, 0 ); @@ -432,7 +432,7 @@ static void test__lread( void ) { HFILE filehandle; char buffer[10000]; - long bytes_read; + UINT bytes_read; UINT bytes_wanted; UINT i; BOOL ret; @@ -477,10 +477,10 @@ static void test__lwrite( void ) { HFILE filehandle; char buffer[10000]; - long bytes_read; - long bytes_written; - long blocks; - long i; + UINT bytes_read; + UINT bytes_written; + UINT blocks; + INT i; char *contents; HLOCAL memory_object; char checksum[1]; @@ -512,7 +512,7 @@ static void test__lwrite( void ) srand( (unsigned)time( NULL ) ); for (blocks = 0; blocks < 100; blocks++) { - for (i = 0; i < (long)sizeof( buffer ); i++) + for (i = 0; i < (INT)sizeof( buffer ); i++) { buffer[i] = rand( ); checksum[0] = checksum[0] + buffer[i];

1 0