May 2009 - Wine-commits - list.winehq.org

Detlef Riekenberg : kernel32/nls: Add missing translations for dea.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: a59c55a568f46295b943d1cb99b01a4a9b90b04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c55a568f46295b943d1cb9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:26:35 2009 +0200 kernel32/nls: Add missing translations for dea.nls. --- dlls/kernel32/nls/dea.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index 39d6b80..777961d 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

1 0

Detlef Riekenberg : kernel32/nls: Add missing translations for del.nls.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 587d6c4e959d7657de966c86056b2c490fe26f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=587d6c4e959d7657de966c860… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 14:28:39 2009 +0200 kernel32/nls: Add missing translations for del.nls. --- dlls/kernel32/nls/del.nls | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/nls/del.nls b/dlls/kernel32/nls/del.nls index a848e0c..396be9f 100644 --- a/dlls/kernel32/nls/del.nls +++ b/dlls/kernel32/nls/del.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Westeuropa und Vereinigte Staaten" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Mitteleuropa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" + LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" + LGRPID_TURKISH+LGRPID_RES_BASE "T�rkisch" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebr�isch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" + LGRPID_INDIC+LGRPID_RES_BASE "Indisch" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenisch" }

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

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

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

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 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 : 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: Use the proper OUT swizzle in handle_ps3_input().
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 7433eb76b5f05ae54702fe9e57ba315407ed651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7433eb76b5f05ae54702fe9e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Use the proper OUT swizzle in handle_ps3_input(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c4b5cca..2385dbc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3405,13 +3405,13 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in semantic_name_out = output_signature[j].semantic_name; semantic_idx_out = output_signature[j].semantic_idx; - shader_glsl_write_mask_to_str(output_signature[i].mask, reg_mask_out); + shader_glsl_write_mask_to_str(output_signature[j].mask, reg_mask_out); if (semantic_idx_in == semantic_idx_out && !strcmp(semantic_name_in, semantic_name_out)) { shader_addline(buffer, "%s%s = OUT[%u]%s;\n", - destination, reg_mask, j, reg_mask); + destination, reg_mask, j, reg_mask_out); found = TRUE; } }

1 0

Gerald Pfeifer : user32/tests: Remove unused SAME macro.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: bb902d68101fcb4a44f4c61d000f4b7c6e2849b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb902d68101fcb4a44f4c61d0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 28 23:22:06 2009 +0200 user32/tests: Remove unused SAME macro. --- dlls/user32/tests/text.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index a55c014..080e5dd 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,7 +28,6 @@ #include "winerror.h" #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) -#define SAME(rect) (rect.left = 10 && rect.right == 100 && rect.top == 10 && rect.bottom == 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) static void test_DrawTextCalcRect(void)

1 0