wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Henri Verbeet : d3d9: Having a NULL rendertarget isn't a failure.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 59268f792413e69081502f22d33b9cea55c6880d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59268f792413e69081502f22d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 d3d9: Having a NULL rendertarget isn't a failure. --- dlls/d3d9/device.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e5ca4c4..9508ff5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -851,8 +851,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX iface, DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr = D3D_OK; IWineD3DSurface *pRenderTarget; + HRESULT hr; TRACE("(%p) Relay\n" , This); @@ -863,13 +863,20 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX EnterCriticalSection(&d3d9_cs); hr=IWineD3DDevice_GetRenderTarget(This->WineD3DDevice,RenderTargetIndex,&pRenderTarget); - if (hr == D3D_OK && pRenderTarget != NULL) { - IWineD3DSurface_GetParent(pRenderTarget,(IUnknown**)ppRenderTarget); - IWineD3DSurface_Release(pRenderTarget); - } else { - FIXME("Call to IWineD3DDevice_GetRenderTarget failed\n"); + if (FAILED(hr)) + { + FIXME("Call to IWineD3DDevice_GetRenderTarget failed, hr %#x\n", hr); + } + else if (!pRenderTarget) + { *ppRenderTarget = NULL; } + else + { + IWineD3DSurface_GetParent(pRenderTarget, (IUnknown **)ppRenderTarget); + IWineD3DSurface_Release(pRenderTarget); + } + LeaveCriticalSection(&d3d9_cs); return hr;

1 0

Henri Verbeet : wined3d: Add device resources from resource_init().
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 5654544725ed01f365707ae41764fee054c54281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5654544725ed01f365707ae41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Add device resources from resource_init(). This is consistent with removing them from resource_cleanup(). --- dlls/wined3d/device.c | 42 +++++++++++---------------------------- dlls/wined3d/resource.c | 6 ++++- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 19 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5654544725ed01f365707…

1 0

Henri Verbeet : wined3d: Remove ResourceReleased() from the public device interface.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 5e0f54162168fcbf8a77eedc2fc478f8e3bb9468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0f54162168fcbf8a77eedc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Remove ResourceReleased() from the public device interface. --- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/resource.c | 5 +---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 --- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b022755..2b4a461 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7786,23 +7786,21 @@ static void IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResour list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } -static void IWineD3DDeviceImpl_RemoveResource(IWineD3DDevice *iface, IWineD3DResource *resource){ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - +static void device_resource_remove(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +{ TRACE("(%p) : Removing resource %p\n", This, resource); list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } - -static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IWineD3DResource *resource){ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +{ WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); int counter; TRACE("(%p) : resource %p\n", This, resource); - context_resource_released(iface, resource, type); + context_resource_released((IWineD3DDevice *)This, resource, type); switch (type) { /* TODO: check front and back buffers, rendertargets etc.. possibly swapchains? */ @@ -7917,7 +7915,7 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* Remove the resource from the resourceStore */ - IWineD3DDeviceImpl_RemoveResource(iface, resource); + device_resource_remove(This, resource); TRACE("Resource released\n"); @@ -8089,7 +8087,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_UpdateSurface, IWineD3DDeviceImpl_GetFrontBufferData, /*** object tracking ***/ - IWineD3DDeviceImpl_ResourceReleased, IWineD3DDeviceImpl_EnumResources }; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 807240b..658a735 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -96,10 +96,7 @@ void resource_cleanup(IWineD3DResource *iface) This->resource.allocatedMemory = 0; This->resource.heapMemory = 0; - if (This->resource.wineD3DDevice != NULL) { - IWineD3DDevice_ResourceReleased((IWineD3DDevice *)This->resource.wineD3DDevice, iface); - }/* NOTE: this is not really an error for system memory resources */ - return; + if (This->resource.wineD3DDevice) device_resource_released(This->resource.wineD3DDevice, iface); } HRESULT resource_get_device(IWineD3DResource *iface, IWineD3DDevice** ppDevice) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cac748c..f062c97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1578,6 +1578,7 @@ struct IWineD3DDeviceImpl extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl; +void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource); void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup); void device_stream_info_from_strided(IWineD3DDeviceImpl *This, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 48938cb..51d886c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3468,9 +3468,6 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT swapchain_idx, [in] IWineD3DSurface *dst_surface ); - void ResourceReleased( - [in] IWineD3DResource *resource - ); HRESULT EnumResources( [in] D3DCB_ENUMRESOURCES callback, [in] void *data

1 0

Henri Verbeet : wined3d: Add missing ActivateContext calls to shader_destroy() implementations.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: d37472f27b8c91f8d92f3286e5a53ca4c473df83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37472f27b8c91f8d92f3286e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:20 2009 +0200 wined3d: Add missing ActivateContext calls to shader_destroy() implementations. --- dlls/wined3d/arb_program_shader.c | 5 ++++- dlls/wined3d/glsl_shader.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 922f62b..5d37440 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2503,7 +2503,10 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *baseShader = (IWineD3DBaseShaderImpl *) iface; - const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)baseShader->baseShader.device)->adapter->gl_info; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)baseShader->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 08bcaa6..c4b5cca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4295,6 +4295,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { */ char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(pshader) { struct glsl_pshader_private *shader_data; ps = (IWineD3DPixelShaderImpl *) This;

1 0

Aric Stewart : msctf: Define compartment guids.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 4ada967d16ffdc2806c6796e7057ff000201d87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ada967d16ffdc2806c6796e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 28 15:01:19 2009 -0500 msctf: Define compartment guids. --- dlls/uuid/uuid.c | 9 +++++++++ include/msctf.idl | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 35d4ae8..840a346 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -118,3 +118,12 @@ DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71a5b253,0x1951,0x466b,0x9f,0xbc,0x9c,0x88,0x08,0xfa,0x84,0xf2); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273aad,0x01bb,0x4164,0x95,0xc6,0x75,0x5b,0xa0,0xb5,0x16,0x2d); +DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xf9ae2c6b,0x1866,0x4361,0xaf,0x72,0x7a,0xa3,0x09,0x48,0x89,0x0e); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_DISABLED, 0x56c5c607,0x0703,0x4e59,0x8e,0x52,0xcb,0xc8,0x4e,0x8b,0xbe,0x35); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544d6a63,0xe2e8,0x4752,0xbb,0xd1,0x00,0x09,0x60,0xbc,0xa0,0x83); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2a54fe8e,0x0d08,0x460c,0xa7,0x5d,0x87,0x03,0x5f,0xf4,0x36,0xc5); +DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); +DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); +DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); diff --git a/include/msctf.idl b/include/msctf.idl index fc87c0a..0a441a6 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -33,6 +33,17 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") +/* GUIDs for Compartments */ +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_DISABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_KEYBOARD_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_HANDWRITING_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_DISABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_OPENCLOSE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_SPEECH_GLOBALSTATE;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_PERSISTMENUENABLED;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_EMPTYCONTEXT;") +cpp_quote("EXTERN_C const GUID GUID_COMPARTMENT_TIPUISTATUS;") + /* GUIDs for Categories */ cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_KEYBOARD;") cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_SPEECH;")

1 0

Jacek Caban : wininet.h: Added more error codes.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 6ecb686dbd401a7d8dece8fd957cc3a5de7df612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecb686dbd401a7d8dece8fd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 21:35:34 2009 +0200 wininet.h: Added more error codes. --- include/wininet.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 6ce8ae0..e37700a 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1464,7 +1464,10 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170) #define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171) #define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172) -#define INTERNET_ERROR_LAST ERROR_INTERNET_NOT_INITIALIZED +#define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) +#define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) +#define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) +#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED #define NORMAL_CACHE_ENTRY 0x00000001

1 0

Gerald Pfeifer : gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 96929d151ec5ddc162131d8bd4618371886588bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=96929d151ec5ddc162131d8bd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 28 21:25:35 2009 +0200 gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2. --- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index ab4f392..5d80d4c 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -37,12 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +#ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) { char* dst = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); strcpy(dst, str); return dst; } +#endif static void load_filesystem(const char *folder) {

1 0

Paul Vriens : oleaut32/tests: Spelling fixes.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 31bb9219d6197475d1dde6e9c47bf5429a01413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bb9219d6197475d1dde6e9c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu May 28 19:49:15 2009 +0200 oleaut32/tests: Spelling fixes. --- dlls/oleaut32/tests/vartest.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f0a6deb..662c0a0 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5468,7 +5468,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with NUMBER returned inncorrect result\n"); + "VarCat: NUMBER concat with NUMBER returned incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5482,7 +5482,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with VT_BSTR, inncorrect result\n"); + "VarCat: NUMBER concat with VT_BSTR, incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5495,7 +5495,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with NUMBER, inncorrect result\n"); + "VarCat: VT_BSTR concat with NUMBER, incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5512,7 +5512,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with VT_DATE returned inncorrect result\n"); + "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5528,7 +5528,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_DATE concat with VT_BSTR returned inncorrect result\n"); + "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); VariantClear(&left); VariantClear(&right);

1 0

Alexandre Julliard : wininet: Add a critical section to protect the read-ahead buffer.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 5c227a9d8adeb2541008ef50ac99aa5dba114041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c227a9d8adeb2541008ef50a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 23:01:28 2009 +0200 wininet: Add a critical section to protect the read-ahead buffer. --- dlls/wininet/http.c | 91 +++++++++++++++++++++++++++++++++++------------ dlls/wininet/internet.h | 6 ++- 2 files changed, 72 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c227a9d8adeb2541008e…

1 0

Alexandre Julliard : rpcrt4/tests: Disable some tests that crash on Windows .
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 47d927f704c94341880f08e7aa501ab479a681b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d927f704c94341880f08e7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 22:27:51 2009 +0200 rpcrt4/tests: Disable some tests that crash on Windows. --- dlls/rpcrt4/tests/server.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 18cfa59..0d41a62 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -33,6 +33,7 @@ #define INT_CODE 4198 static const char *progname; +static BOOL old_windows_version; static HANDLE stop_event; @@ -48,6 +49,8 @@ static void InitFunctionPointers(void) pNDRSContextMarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextMarshall2"); pNDRSContextUnmarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextUnmarshall2"); pRpcServerRegisterIfEx = (void *)GetProcAddress(hrpcrt4, "RpcServerRegisterIfEx"); + + if (!pNDRSContextMarshall2) old_windows_version = TRUE; } void __RPC_FAR *__RPC_USER @@ -616,13 +619,13 @@ s_context_handle_test(void) ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); + /* raises ERROR_INVALID_HANDLE exception on Vista upwards */ + if (0) + { h = pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xdeadbeef, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); - /* raises ERROR_INVALID_HANDLE exception on Vista upwards */ - if (0) - { /* marshal a context handle with an interface specified */ h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); @@ -1096,12 +1099,15 @@ pointer_tests(void) free_list(list); - name.size = 10; - name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); - get_name(&name); - ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); - ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); - HeapFree(GetProcessHeap(), 0, name.name); + if (!old_windows_version) + { + name.size = 10; + name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); + get_name(&name); + ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); + ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); + HeapFree(GetProcessHeap(), 0, name.name); + } pa2 = a; ok(sum_pcarr2(4, &pa2) == 10, "RPC sum_pcarr2\n"); @@ -1134,7 +1140,6 @@ free_pyramid_doub_carr(doub_carr_t *dc) static void array_tests(void) { - const char str1[25] = "Hello"; int m[2][3][4] = { {{1, 2, 3, 4}, {-1, -3, -5, -7}, {0, 2, 4, 6}}, @@ -1153,7 +1158,11 @@ array_tests(void) pints_t api[5]; numbers_struct_t *ns; - ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); + if (!old_windows_version) + { + const char str1[25] = "Hello"; + ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); + } ok(sum_fixed_int_3d(m) == 4116, "RPC sum_fixed_int_3d\n"); @@ -1240,15 +1249,17 @@ array_tests(void) ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); - ns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(numbers_struct_t, numbers[5])); - ns->length = 5; - ns->size = 5; - ns->numbers[0].pi = pi; - get_numbers_struct(&ns); - ok(ns->numbers[0].pi == pi, "RPC conformant varying struct embedded pointer changed from %p to %p\n", pi, ns->numbers[0].pi); - ok(*ns->numbers[0].pi == 5, "pi unmarshalled incorrectly %d\n", *ns->numbers[0].pi); - - HeapFree(GetProcessHeap(), 0, ns); + if (!old_windows_version) + { + ns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(numbers_struct_t, numbers[5])); + ns->length = 5; + ns->size = 5; + ns->numbers[0].pi = pi; + get_numbers_struct(&ns); + ok(ns->numbers[0].pi == pi, "RPC conformant varying struct embedded pointer changed from %p to %p\n", pi, ns->numbers[0].pi); + ok(*ns->numbers[0].pi == 5, "pi unmarshalled incorrectly %d\n", *ns->numbers[0].pi); + HeapFree(GetProcessHeap(), 0, ns); + } HeapFree(GetProcessHeap(), 0, pi); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009