wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : d3dx9: Avoid LPD3DXPRTCOMPBUFFER.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 4159758c9786264313c26c55e22123a31d5c2065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4159758c9786264313c26c55e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:37 2012 +0100 d3dx9: Avoid LPD3DXPRTCOMPBUFFER. --- include/d3dx9mesh.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index a5fc6cc..586aa63 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -708,7 +708,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh); HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); -HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE quality, UINT cluster_count, UINT pca_count, + LPD3DXSHPRTSIMCB cb, void *ctx, ID3DXPRTBuffer *input, ID3DXPRTCompBuffer **buffer); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, @@ -739,8 +740,8 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *file_data, DWORD fl HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *); #define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile) -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(LPCSTR, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(const char *filename, ID3DXPRTCompBuffer **buffer); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(const WCHAR *filename, ID3DXPRTCompBuffer **buffer); #define D3DXLoadPRTCompBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTCompBufferFromFile) HRESULT WINAPI D3DXSaveMeshToXA(LPCSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); @@ -748,8 +749,8 @@ HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMA HRESULT WINAPI D3DXSavePRTBufferToFileA(LPCSTR, LPD3DXPRTBUFFER); HRESULT WINAPI D3DXSavePRTBufferToFileW(LPCWSTR, LPD3DXPRTBUFFER); #define D3DXSavePRTBufferToFile WINELIB_NAME_AW(D3DXSavePRTBufferToFile) -HRESULT WINAPI D3DXSavePRTCompBufferToFileA(LPCSTR, LPD3DXPRTCOMPBUFFER); -HRESULT WINAPI D3DXSavePRTCompBufferToFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER); +HRESULT WINAPI D3DXSavePRTCompBufferToFileA(const char *filename, ID3DXPRTCompBuffer *buffer); +HRESULT WINAPI D3DXSavePRTCompBufferToFileW(const WCHAR *filename, ID3DXPRTCompBuffer *buffer); #define D3DXSavePRTCompBufferToFile WINELIB_NAME_AW(D3DXSavePRTCompBufferToFile) UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);

1 0

Andrew Talbot : msvcp60: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 1f221e87eb77247aae754aca27e855fa9fd7172c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f221e87eb77247aae754aca2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:22 2012 +0000 msvcp60: Remove superfluous semicolons. --- dlls/msvcp60/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index 761075e..b8c6921 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -137,7 +137,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise@bad_alloc@std@@MBEXXZ */ /* ?_Doraise@bad_alloc@std@@MEBAXXZ */ @@ -234,7 +234,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_assign(bad_alloc *this, const bad_alloc *a } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct { @@ -331,7 +331,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -376,7 +376,7 @@ length_error* __thiscall MSVCP_length_error_assign(length_error *this, const len } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -421,7 +421,7 @@ out_of_range* __thiscall MSVCP_out_of_range_assign(out_of_range *this, const out } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -446,7 +446,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument@std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef logic_error runtime_error; @@ -499,7 +499,7 @@ runtime_error* __thiscall MSVCP_runtime_error_assign(runtime_error *this, const } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error@std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* ?what@runtime_error@std@@UBEPBDXZ */ /* ?what@runtime_error@std@@UEBAPEBDXZ */ @@ -555,7 +555,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure@std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* ?_Nomemory@std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp71: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: b4c4bae7a3ac72dbe191c6528c342963aa45aa91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c4bae7a3ac72dbe191c6528… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:25 2012 +0000 msvcp71: Remove superfluous semicolons. --- dlls/msvcp71/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp71/exception.c b/dlls/msvcp71/exception.c index 6482463..3701fb4 100644 --- a/dlls/msvcp71/exception.c +++ b/dlls/msvcp71/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument@std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error@std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure@std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory@std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp90: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: c25d7f1b3c21aa79c2c231ae5ea9f76c1b861a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25d7f1b3c21aa79c2c231ae5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:28 2012 +0000 msvcp90: Remove superfluous semicolons. --- dlls/msvcp90/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 6247616..1e33301 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument@std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error@std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure@std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory@std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp100: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 2808433a7a7eb1fb5f7cc05948fe3d3bf0da96f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2808433a7a7eb1fb5f7cc0594… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:31 2012 +0000 msvcp100: Remove superfluous semicolons. --- dlls/msvcp100/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 6482463..3701fb4 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc@std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument@std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error@std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure@std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory@std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Ing. Simone Giustetti : The Slackware release number was upgraded to 14.0
by Jeremy Newman 27 Nov '12

27 Nov '12

Module: website Branch: master Commit: e5d7c6a8f657baa780eb4ac2bdc43ba6934db144 URL: http://source.winehq.org/git/website.git/?a=commit;h=e5d7c6a8f657baa780eb4a… Author: Ing. Simone Giustetti <studiosg(a)giustetti.net> Date: Mon Nov 26 23:55:54 2012 +0100 The Slackware release number was upgraded to 14.0 Hi all, The download page entry for Slackware was updated. The release was upgraded to latest 14.0 as Wine packages will be built against it starting from 1.5.18. Bye Simone -- ---- Ing. Simone Giustetti e-mail: studiosg(a)giustetti.net mob: 340-3425647 >From f9af61376277ce1b87d02a0a9960e84cd2b63575 Mon Sep 17 00:00:00 2001 From: twinstar <studiosg(a)giustetti.net> Date: Mon, 26 Nov 2012 23:25:55 +0100 Subject: The Slackware release was updated from the old 13.37 to new 14.0. --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- templates/pt/download.template | 2 +- templates/tr/download.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index b31731e..7546090 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -117,7 +117,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a> - binär txz (Slackware 13.37), und tgz (für ältere Versionen)</td> + binär txz (Slackware 14.0), und tgz (für ältere Versionen)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 2e65cff..0caab63 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -114,7 +114,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Download Slackware packages</a> - - binary txz (Slackware 13.37), and tgz (for older versions)</td> + - binary txz (Slackware 14.0), and tgz (for older versions)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 08d3be1..4f6513b 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -122,7 +122,7 @@ Spring. Téléchargez les paquets 2010.0 si votre Mandriva est la première vers <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Paquets Slackware</a> - - .txz binaires (Slackware 13.37) ou .tgz (pour les versions antérieures)</td> + - .txz binaires (Slackware 14.0) ou .tgz (pour les versions antérieures)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index 2e6cd76..d92c07b 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -114,7 +114,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">הורדת חבילות ל־Slackware</a> - - txz בינרי (ל־Slackware 13.1) ו־tgz (לגרסאות ישנות יותר)</td> + - txz בינרי (ל־Slackware 14.01) ו־tgz (לגרסאות ישנות יותר)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 2bdb14f..e0dbdc7 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -113,7 +113,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Pobierz paczki dla Slackware</a> - - binarne paczki txz (Slackware 13.37), i tgz (dla starszych wersji)</td> + - binarne paczki txz (Slackware 14.0), i tgz (dla starszych wersji)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index d1cf046..0b6ed2c 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -110,7 +110,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Descarregar pacotes para Slackware</a> - - binários txz (Slackware 13.37), e tgz (para versões antigas)</td> + - binários txz (Slackware 14.0), e tgz (para versões antigas)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 0aa1547..e9ccd2d 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -114,7 +114,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware paketleri indirin</a> - - binary txz (Slackware 13.37), and tgz (for older versions)</td> + - binary txz (Slackware 14.0), and tgz (for older versions)</td> <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr>

1 0

Hans Leidekker : ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 7895eae15be4f1f7e2f3f1eba3a5be368ad8cd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7895eae15be4f1f7e2f3f1eba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:48 2012 +0100 ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers. --- dlls/ole32/comcat.c | 52 +++++++++++++++++++------------------------ dlls/ole32/compobj.c | 8 +++--- dlls/ole32/ole2.c | 21 +++-------------- dlls/ole32/storage32.c | 3 +- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7895eae15be4f1f7e2f3f…

1 0

Hans Leidekker : ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: a82c49028d1450aaa60c8e1b059c460ab3fab9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82c49028d1450aaa60c8e1b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:13 2012 +0100 ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid. --- dlls/ole32/compobj.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/compobj_private.h | 3 + dlls/ole32/tests/compobj.c | 2 +- 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9c92c32..70508b6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -47,6 +47,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -135,6 +137,121 @@ static CRITICAL_SECTION_DEBUG class_cs_debug = }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, NULL, 0, NULL ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + HANDLE subkey, root = attr->RootDirectory; + WCHAR *buffer = attr->ObjectName->Buffer; + DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + UNICODE_STRING str; + + while (i < len && buffer[i] != '\\') i++; + if (i == len) return status; + + attrs = attr->Attributes; + attr->ObjectName = &str; + + while (i < len) + { + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &subkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + if (status) return status; + attr->RootDirectory = subkey; + while (i < len && buffer[i] == '\\') i++; + pos = i; + while (i < len && buffer[i] != '\\') i++; + } + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + } + return status; +} + +static const WCHAR classes_rootW[] = + {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; + +static HKEY classes_root_hkey; + +/* create the special HKEY_CLASSES_ROOT key */ +static HKEY create_classes_root_hkey(void) +{ + HKEY hkey, ret = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name, classes_rootW ); + if (create_key( &hkey, MAXIMUM_ALLOWED, &attr )) return 0; + TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + + if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) + ret = hkey; + else + NtClose( hkey ); /* somebody beat us to it */ + return ret; +} + +/* map the hkey from special root to normal key if necessary */ +static inline HKEY get_classes_root_hkey( HKEY hkey ) +{ + HKEY ret = hkey; + + if (hkey == HKEY_CLASSES_ROOT && !(ret = classes_root_hkey)) + ret = create_classes_root_hkey(); + + return ret; +} + +LSTATUS create_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( create_key( retkey, access, &attr ) ); +} + +LSTATUS open_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( NtOpenKey( (HANDLE *)retkey, access, &attr ) ); +} + /***************************************************************************** * This section contains OpenDllList definitions * @@ -2055,7 +2172,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); /* Open the key.. */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &hkey)) + if (open_classes_key(HKEY_CLASSES_ROOT, path, KEY_READ, &hkey)) { WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); return REGDB_E_IIDNOTREG; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0039655..b76e3a7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -309,4 +309,7 @@ extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; +extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; +extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 048b082..714feee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -755,7 +755,7 @@ static void test_CoGetPSClsid(void) ok(!res, "RegOverridePredefKey returned %d\n", res); hr = CoGetPSClsid(&IID_IClassFactory, &clsid); - todo_wine ok_ole_success(hr, "CoGetPSClsid"); + ok_ole_success(hr, "CoGetPSClsid"); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, NULL); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0

Alexandre Julliard : user32: Send WM_MOVING instead of WM_SIZING when moving a window.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: e2c61baba0ceb0ca50d5a6506108d34af8a69122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c61baba0ceb0ca50d5a6506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:01:30 2012 +0100 user32: Send WM_MOVING instead of WM_SIZING when moving a window. --- dlls/user32/winpos.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0ce3ddd..308e7ea 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2771,8 +2771,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - WPARAM wpSizingHit = 0; - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; @@ -2782,9 +2780,16 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; /* determine the hit location */ - if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) - wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); - SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + if (syscommand == SC_SIZE) + { + WPARAM wpSizingHit = 0; + + if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) + wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); + SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + } + else + SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); if (!iconic) {

1 0

Daniel Jelinski : wine.inf: Add registry info for lanmanserver service.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: ba4de80ee373b08be3ebcd2bf73e98bef88e40aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4de80ee373b08be3ebcd2bf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Nov 1 22:00:56 2012 +0100 wine.inf: Add registry info for lanmanserver service. --- tools/wine.inf.in | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4704fd6..9d0650f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -125,6 +125,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -135,6 +136,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -145,6 +147,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2987,6 +2990,19 @@ ServiceType=16 StartType=3 ErrorControl=1 +[LanmanServerService] +AddReg=LanmanServerServiceKeys +Description="Lanman Server" +DisplayName="Lanman Server" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=4 +ErrorControl=1 + +[LanmanServerServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" +;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

Alexandre Julliard : setupapi: Fix total size when appending multi-string values.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4b7085fdd499ca39a7e0ae47bd27323876103df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7085fdd499ca39a7e0ae47b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 12:31:59 2012 +0100 setupapi: Fix total size when appending multi-string values. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e216e8c..dda1396 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -242,7 +242,7 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s { memcpy( p, strings, len * sizeof(WCHAR) ); p[len] = 0; - total += len; + total += len * sizeof(WCHAR); } strings += len; }

1 0

Dmitry Timoshkov : oleaut32: Add support for saving an empty picture.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 97e2c24cc7e065f67aae099941a47a541380a35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2c24cc7e065f67aae09994… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 19:54:23 2012 +0800 oleaut32: Add support for saving an empty picture. --- dlls/oleaut32/olepicture.c | 6 ++++++ dlls/oleaut32/tests/olepicture.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index db3b852..3fdb1c7 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1757,6 +1757,12 @@ static HRESULT WINAPI OLEPictureImpl_Save( TRACE("%p %p %d\n", This, pStm, fClearDirty); switch (This->desc.picType) { + case PICTYPE_NONE: + header[0] = 0x0000746c; + header[1] = 0; + hResult = IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + break; + case PICTYPE_ICON: if (This->bIsDirty || !This->data) { if (!serializeIcon(This->desc.u.icon.hicon, &pIconData, &iDataSize)) { diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ee97fe2..db10baa 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1095,11 +1095,9 @@ static void test_load_save_empty_picture(void) ok(hr == S_OK, "QueryInterface error %#x\n", hr); hr = IPersistStream_Save(src_stream, dst_stream, TRUE); -todo_wine ok(hr == S_OK, "Save error %#x\n", hr); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); GlobalUnlock(hmem);

1 0

Dmitry Timoshkov : oleaut32: Add a test for loading/saving an empty picture .
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 6c53c4ee036c849f80104c0116f779946d19670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c53c4ee036c849f80104c011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 17:49:58 2012 +0800 oleaut32: Add a test for loading/saving an empty picture. --- dlls/oleaut32/tests/olepicture.c | 53 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 696f8cd..ee97fe2 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1059,6 +1059,58 @@ todo_wine IPicture_Release(pic); } +static void test_load_save_empty_picture(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + memset(&pic, 0, sizeof(pic)); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_NONE; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void **)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); +todo_wine + ok(hr == S_OK, "Save error %#x\n", hr); + + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); + GlobalUnlock(hmem); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + GlobalFree(hmem); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1097,6 +1149,7 @@ START_TEST(olepicture) test_himetric(); test_load_save_bmp(); test_load_save_icon(); + test_load_save_empty_picture(); }

1 0

Nikolay Sivov : ole32: Fix OleDraw() regarding passed rectangle handling.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 6a8b4f11a876f16090591f1c4b834e56cc783b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8b4f11a876f16090591f1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 12:49:59 2012 -0500 ole32: Fix OleDraw() regarding passed rectangle handling. --- dlls/ole32/ole2.c | 14 +------ dlls/ole32/tests/ole2.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6a91ba6..7e55fb2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2554,7 +2554,7 @@ HRESULT WINAPI OleDraw( IUnknown *pUnk, DWORD dwAspect, HDC hdcDraw, - LPCRECT lprcBounds) + LPCRECT rect) { HRESULT hres; IViewObject *viewobject; @@ -2562,24 +2562,14 @@ HRESULT WINAPI OleDraw( hres = IUnknown_QueryInterface(pUnk, &IID_IViewObject, (void**)&viewobject); - if (SUCCEEDED(hres)) { - RECTL rectl; - - rectl.left = lprcBounds->left; - rectl.right = lprcBounds->right; - rectl.top = lprcBounds->top; - rectl.bottom = lprcBounds->bottom; - hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, &rectl, 0, 0, 0); - + hres = IViewObject_Draw(viewobject, dwAspect, -1, 0, 0, 0, hdcDraw, (RECTL*)rect, 0, 0, 0); IViewObject_Release(viewobject); return hres; } else - { return DV_E_NOIVIEWOBJECT; - } } /*********************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8dd3606..eb8e6d3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -726,6 +726,84 @@ static IRunnableObject OleObjectRunnable = { &OleObjectRunnableVtbl }; static const CLSID CLSID_Equation3 = {0x0002CE02, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; +static HRESULT WINAPI viewobject_QueryInterface(IViewObject *iface, REFIID riid, void **obj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IViewObject)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI viewobject_AddRef(IViewObject *iface) +{ + return 2; +} + +static ULONG WINAPI viewobject_Release(IViewObject *iface) +{ + return 1; +} + +static HRESULT WINAPI viewobject_Draw(IViewObject *iface, DWORD aspect, LONG index, + void *paspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, + LPCRECTL bounds, LPCRECTL wbounds, BOOL (STDMETHODCALLTYPE *pfnContinue)(ULONG_PTR dwContinue), + ULONG_PTR dwContinue) +{ + ok(index == -1, "index=%d\n", index); + return S_OK; +} + +static HRESULT WINAPI viewobject_GetColorSet(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **colorset) +{ + ok(0, "unexpected call GetColorSet\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Freeze(IViewObject *iface, DWORD draw_aspect, LONG index, + void *aspect, DWORD *freeze) +{ + ok(0, "unexpected call Freeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_Unfreeze(IViewObject *iface, DWORD freeze) +{ + ok(0, "unexpected call Unfreeze\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_SetAdvise(IViewObject *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) +{ + ok(0, "unexpected call SetAdvise\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI viewobject_GetAdvise(IViewObject *iface, DWORD *aspects, DWORD *advf, + IAdviseSink **sink) +{ + ok(0, "unexpected call GetAdvise\n"); + return E_NOTIMPL; +} + +static const struct IViewObjectVtbl viewobjectvtbl = { + viewobject_QueryInterface, + viewobject_AddRef, + viewobject_Release, + viewobject_Draw, + viewobject_GetColorSet, + viewobject_Freeze, + viewobject_Unfreeze, + viewobject_SetAdvise, + viewobject_GetAdvise +}; + +static IViewObject viewobject = { &viewobjectvtbl }; + static void test_OleCreate(IStorage *pStorage) { HRESULT hr; @@ -1853,6 +1931,14 @@ static void test_OleLockRunning(void) ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); } +static void test_OleDraw(void) +{ + HRESULT hr; + + hr = OleDraw((IUnknown*)&viewobject, 0, (HDC)0x1, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1889,6 +1975,7 @@ START_TEST(ole2) test_default_handler(); test_runnable(); test_OleLockRunning(); + test_OleDraw(); CoUninitialize(); }

1 0

Nikolay Sivov : xmllite: Add partial support for xml declaration parsing.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: acb56b0796ec53b37789977e600c2839156d0da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb56b0796ec53b37789977e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 21:59:49 2012 -0500 xmllite: Add partial support for xml declaration parsing. --- dlls/xmllite/reader.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 142 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b0ceac4..0d21e79 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010 Nikolay Sivov + * Copyright 2010, 2012 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,7 +48,7 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; struct xml_encoding_data { - const WCHAR *encoding; + const WCHAR *name; xml_encoding enc; UINT cp; }; @@ -213,11 +213,11 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *encoding) +static xml_encoding parse_encoding_name(const WCHAR *name) { int min, max, n, c; - if (!encoding) return XmlEncoding_Unknown; + if (!name) return XmlEncoding_Unknown; min = 0; max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; @@ -226,7 +226,7 @@ static xml_encoding parse_encoding_name(const WCHAR *encoding) { n = (min+max)/2; - c = strcmpiW(xml_encoding_map[n].encoding, encoding); + c = strcmpiW(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -431,6 +431,136 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding readerinput->buffer->code_page = cp; } +static inline const WCHAR *reader_get_cur(xmlreader *reader) +{ + return (WCHAR*)reader->input->buffer->utf16.cur; +} + +static int reader_cmp(xmlreader *reader, const WCHAR *str) +{ + const WCHAR *ptr = reader_get_cur(reader); + int i = 0; + + return strncmpW(str, ptr, strlenW(str)); + + while (str[i]) { + if (ptr[i] != str[i]) return 0; + i++; + } + + return 1; +} + +/* moves cursor n WCHARs forward */ +static void reader_skipn(xmlreader *reader, int n) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader); + + while (*ptr++ && n--) + { + buffer->cur += sizeof(WCHAR); + reader->pos++; + } +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ +static int reader_skipspaces(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + + while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + { + buffer->cur += sizeof(WCHAR); + if (*ptr == '\r') + reader->pos = 0; + else if (*ptr == '\n') + { + reader->line++; + reader->pos = 0; + } + else + reader->pos++; + ptr++; + } + + return ptr - start; +} + +/* [26] VersionNum ::= '1.' [0-9]+ */ +static HRESULT reader_parse_versionnum(xmlreader *reader) +{ + const WCHAR *ptr, *start = reader_get_cur(reader); + static const WCHAR onedotW[] = {'1','.',0}; + + if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; + /* skip "1." */ + reader_skipn(reader, 2); + + ptr = reader_get_cur(reader); + while (*ptr >= '0' && *ptr <= '9') + ptr++; + + if (ptr == start) return WC_E_DIGIT; + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + reader_skipn(reader, ptr-start); + return S_OK; +} + +/* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ +static HRESULT reader_parse_versioninfo(xmlreader *reader) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static const WCHAR dblquoteW[] = {'\"',0}; + static const WCHAR quoteW[] = {'\'',0}; + static const WCHAR eqW[] = {'=',0}; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + /* skip 'version' */ + reader_skipn(reader, 7); + + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_versionnum(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return S_OK; +} + +/* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ +static HRESULT reader_parse_xmldecl(xmlreader *reader) +{ + static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + HRESULT hr; + + /* check if we have "<?xml" */ + if (reader_cmp(reader, xmldeclW)) return S_OK; + + reader_skipn(reader, 5); + hr = reader_parse_versioninfo(reader); + if (FAILED(hr)) + return hr; + + return E_NOTIMPL; +} + static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { xmlreader *This = impl_from_IXmlReader(iface); @@ -586,11 +716,17 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(This->input, &enc); - TRACE("detected encoding %d, 0x%08x\n", enc, hr); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; /* always switch first time cause we have to put something in */ readerinput_switchencoding(This->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(This); + if (FAILED(hr)) return hr; + + This->state = XmlReadState_Interactive; } return E_NOTIMPL;

1 0

Nikolay Sivov : xmllite: Implement initial encoding switching.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: eddd7fcf29994645e4047fe9738109defa78100d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddd7fcf29994645e4047fe97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 25 00:10:46 2012 -0500 xmllite: Implement initial encoding switching. --- dlls/xmllite/reader.c | 127 +++++++++++++++++++++++++++++++++++-------- dlls/xmllite/tests/reader.c | 2 +- 2 files changed, 106 insertions(+), 23 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8ad78d8..b0ceac4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -61,6 +61,7 @@ static const struct xml_encoding_data xml_encoding_map[] = { typedef struct { char *data; + char *cur; unsigned int allocated; unsigned int written; } encoded_buffer; @@ -187,6 +188,7 @@ static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer if (!buffer->data) return E_OUTOFMEMORY; memset(buffer->data, 0, 4); + buffer->cur = buffer->data; buffer->allocated = initial_len; buffer->written = 0; @@ -198,18 +200,15 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) { - const struct xml_encoding_data *data; - if (encoding == XmlEncoding_Unknown) { FIXME("unsupported encoding %d\n", encoding); return E_NOTIMPL; } - data = &xml_encoding_map[encoding]; - input->buffer->code_page = data->cp; + *cp = xml_encoding_map[encoding].cp; return S_OK; } @@ -324,31 +323,112 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) return hr; } -static xml_encoding readerinput_detectencoding(xmlreaderinput *readerinput) +/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +static void readerinput_grow(xmlreaderinput *readerinput, int length) +{ + encoded_buffer *buffer = &readerinput->buffer->utf16; + + /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ + if (buffer->allocated < buffer->written + length + 4) + { + int grown_size = max(2*buffer->allocated, buffer->allocated + length); + buffer->data = readerinput_realloc(readerinput, buffer->data, grown_size); + buffer->allocated = grown_size; + } +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + + *enc = XmlEncoding_Unknown; + + if (buffer->written <= 3) return MX_E_INPUTEND; /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (buffer->written >= 4) + if (!memcmp(buffer->data, startA, sizeof(startA))) + *enc = XmlEncoding_UTF8; + else if (!memcmp(buffer->data, startW, sizeof(startW))) + *enc = XmlEncoding_UTF16; + /* try with BOM now */ + else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) { - static char startA[] = {'<','?','x','m'}; - static WCHAR startW[] = {'<','?'}; - - if (!memcmp(buffer->data, startA, sizeof(startA))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, startW, sizeof(startW))) return XmlEncoding_UTF16; + buffer->cur += sizeof(utf8bom); + *enc = XmlEncoding_UTF8; + } + else if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) + { + buffer->cur += sizeof(utf16lebom); + *enc = XmlEncoding_UTF16; } - /* try with BOM now */ - if (buffer->written >= 3) + return S_OK; +} + +static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + /* complete single byte char */ + if (!(buffer->data[len-1] & 0x80)) return len; + + /* find start byte of multibyte char */ + while (--len && !(buffer->data[len] & 0xc0)) + ; + + return len; +} + +/* returns byte length of complete char sequence for specified code page, */ +static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + if (cp == CP_UTF8) + len = readerinput_get_utf8_convlen(readerinput); + else + len = buffer->written; + + return len - (buffer->cur - buffer->data); +} + +/* note that raw buffer content is kept */ +static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) +{ + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + int len, dest_len; + HRESULT hr; + UINT cp; + + hr = get_code_page(enc, &cp); + if (FAILED(hr)) return; + + len = readerinput_get_convlen(readerinput, cp); + + TRACE("switching to cp %d\n", cp); + + /* just copy in this case */ + if (enc == XmlEncoding_UTF16) { - static char utf8bom[] = {0xef,0xbb,0xbf}; - static char utf16lebom[] = {0xff,0xfe}; - if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) return XmlEncoding_UTF8; - if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) return XmlEncoding_UTF16; + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + readerinput->buffer->code_page = cp; + return; } - return XmlEncoding_Unknown; + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); + dest->data[dest_len] = 0; + readerinput->buffer->code_page = cp; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -505,9 +585,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) if (FAILED(hr)) return hr; /* try to detect encoding by BOM or data and set input code page */ - enc = readerinput_detectencoding(This->input); - TRACE("detected encoding %d\n", enc); - get_code_page(enc, This->input); + hr = readerinput_detectencoding(This->input, &enc); + TRACE("detected encoding %d, 0x%08x\n", enc, hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(This->input, enc); } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7d77fe9..729d134 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -52,7 +52,7 @@ static const char *debugstr_guid(REFIID riid) return buf; } -static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) {

1 0

Nikolay Sivov : dwrite: Add a separate function to copy text format data.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: cfaf8be90645513a4677f79f66c752745ebe553a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaf8be90645513a4677f79f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:01:58 2012 -0500 dwrite: Add a separate function to copy text format data. --- dlls/dwrite/layout.c | 61 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8e63f5c..d9e4a99 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,8 @@ struct dwrite_textformat { struct dwrite_textformat_data format; }; +static const IDWriteTextFormatVtbl dwritetextformatvtbl; + static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); @@ -79,6 +81,11 @@ static inline struct dwrite_textformat *impl_from_IDWriteTextFormat(IDWriteTextF return CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat_iface); } +static inline struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) +{ + return iface->lpVtbl == &dwritetextformatvtbl ? impl_from_IDWriteTextFormat(iface) : NULL; +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); @@ -672,10 +679,46 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; +static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) +{ + struct dwrite_textformat *f; + + memset(&layout->format, 0, sizeof(layout->format)); + + if ((f = unsafe_impl_from_IDWriteTextFormat(format))) + { + layout->format = f->format; + layout->format.locale = heap_strdupW(f->format.locale); + layout->format.family_name = heap_strdupW(f->format.family_name); + } + else + { + UINT32 locale_len, family_len; + + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); + layout->format.style = IDWriteTextFormat_GetFontStyle(format); + layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); + layout->format.size = IDWriteTextFormat_GetFontSize(format); + + /* locale name and length */ + locale_len = IDWriteTextFormat_GetLocaleNameLength(format); + layout->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetLocaleName(format, layout->format.locale, locale_len+1); + layout->format.locale_len = locale_len; + + /* font family name and length */ + family_len = IDWriteTextFormat_GetFontFamilyNameLength(format); + layout->format.family_name = heap_alloc((family_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetFontFamilyName(format, layout->format.family_name, family_len+1); + layout->format.family_len = family_len; + } + + IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); +} + HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; - UINT32 locale_len; *layout = NULL; @@ -686,21 +729,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->ref = 1; This->str = heap_strdupnW(str, len); This->len = len; - memset(&This->format, 0, sizeof(This->format)); - - /* reference is not kept here, instead copy all underlying data */ - IDWriteTextFormat_GetFontCollection(format, &This->format.collection); - - /* locale name and length */ - locale_len = IDWriteTextFormat_GetLocaleNameLength(format); - This->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); - IDWriteTextFormat_GetLocaleName(format, This->format.locale, locale_len+1); - This->format.locale_len = locale_len; - - This->format.weight = IDWriteTextFormat_GetFontWeight(format); - This->format.style = IDWriteTextFormat_GetFontStyle(format); - This->format.stretch = IDWriteTextFormat_GetFontStretch(format); - This->format.size = IDWriteTextFormat_GetFontSize(format); + layout_format_from_textformat(This, format); *layout = &This->IDWriteTextLayout_iface;

1 0

Nikolay Sivov : dwrite: Implement family name access methods for IDWriteTextFormat.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 22f19708342572182735bd2738dc39ebb25cdd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f19708342572182735bd273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 10:43:49 2012 -0500 dwrite: Implement family name access methods for IDWriteTextFormat. --- dlls/dwrite/layout.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f6bc421..8e63f5c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textformat_data { WCHAR *family_name; + UINT32 family_len; WCHAR *locale; UINT32 locale_len; @@ -880,15 +881,19 @@ static HRESULT WINAPI dwritetextformat_GetFontCollection(IDWriteTextFormat *ifac static UINT32 WINAPI dwritetextformat_GetFontFamilyNameLength(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.family_len; } static HRESULT WINAPI dwritetextformat_GetFontFamilyName(IDWriteTextFormat *iface, WCHAR *name, UINT32 size) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.family_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.family_name); + return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritetextformat_GetFontWeight(IDWriteTextFormat *iface) @@ -981,6 +986,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; This->format.family_name = heap_strdupW(family_name); + This->format.family_len = strlenW(family_name); This->format.locale = heap_strdupW(locale); This->format.locale_len = strlenW(locale); This->format.weight = weight;

1 0

Andrew Talbot : xmllite: Void functions should not return a value.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 40300b24ccb1a1aeeed7de9e8c5ad4afcacfe1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40300b24ccb1a1aeeed7de9e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:32 2012 +0000 xmllite: Void functions should not return a value. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 3f22152..8ad78d8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -146,7 +146,7 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) static inline void reader_free(xmlreader *reader, void *mem) { - return m_free(reader->imalloc, mem); + m_free(reader->imalloc, mem); } /* reader input memory allocation functions */ @@ -162,7 +162,7 @@ static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t static inline void readerinput_free(xmlreaderinput *input, void *mem) { - return m_free(input->imalloc, mem); + m_free(input->imalloc, mem); } static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str)

1 0

Andrew Talbot : imagehlp: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4a79345d919e9ef41b79755afd32919f70675bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a79345d919e9ef41b79755af… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:35 2012 +0000 imagehlp: Remove unused variable. --- dlls/imagehlp/access.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index cf19e6c..9e1f187 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); */ static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; -static PLOADED_IMAGE IMAGEHLP_pLastLoadedImage=NULL; static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { NULL, /* ModuleName */ @@ -136,9 +135,6 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) if(pCurrent->Flink) pCurrent->Flink->Blink = pCurrent->Blink; - else - IMAGEHLP_pLastLoadedImage = pCurrent->Blink?CONTAINING_RECORD( - pCurrent->Blink, LOADED_IMAGE, Links):NULL; return FALSE; }

1 0

Andrew Talbot : inkobj: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 16b43ef0721406acb82c353765db482e7d26f3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b43ef0721406acb82c35376… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:39 2012 +0000 inkobj: Remove unused variable. --- dlls/inkobj/inkobj.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index 4120144..f199f56 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -20,7 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj); static LONG INKOBJ_refCount; -static HINSTANCE INKOBJ_hInstance; /***************************************************** * DllMain (INKOBJ.init) @@ -35,7 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); - INKOBJ_hInstance = hinst; break; } return TRUE;

1 0

Andrew Talbot : ntprint: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 2d50946e069c3988ad400e14e1585fb4818f2471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d50946e069c3988ad400e14e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:42 2012 +0000 ntprint: Remove unused variable. --- dlls/ntprint/ntprint.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index b816666..a5431b6 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntprint); -static HINSTANCE NTPRINT_hInstance = NULL; - typedef struct { LPMONITOR_INFO_2W mi2; /* Buffer for installed Monitors */ DWORD installed; /* Number of installed Monitors */ @@ -56,7 +54,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - NTPRINT_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; }

1 0

Andrew Talbot : opengl32: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 538a0e4a9ea04b979a14a32cffcedb0b40554908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538a0e4a9ea04b979a14a32cf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:46 2012 +0000 opengl32: Remove unused variable. --- dlls/opengl32/wgl.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 798a0e5..1317ff5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(fps); -static HMODULE opengl32_handle; - extern struct opengl_funcs null_opengl_funcs; /* handle management */ @@ -1719,7 +1717,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - opengl32_handle = hinst; DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break;

1 0

Andrew Talbot : printui: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 8bf312d40e218785918b65ebfde5baaeb4829208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf312d40e218785918b65ebf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:50 2012 +0000 printui: Remove unused variable. --- dlls/printui/printui.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 7a2b466..c6e610d 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(printui); -static HINSTANCE PRINTUI_hInstance = NULL; - /* ################################# */ /* Must be in order with OPT_* */ @@ -227,7 +225,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - PRINTUI_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; }

1 0

Henri Verbeet : winex11: Detect broken NVIDIA RandR setups.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 8776e1c0e1597fec169d169888660deb5bb08c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8776e1c0e1597fec169d16988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:09 2012 +0100 winex11: Detect broken NVIDIA RandR setups. --- dlls/winex11.drv/xrandr.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 1093541..5b2dede 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,6 +24,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR @@ -419,6 +420,21 @@ static int xrandr12_init_modes(void) goto done; } + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + goto done; + } + if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n");

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

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 November 2012