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

← Newer
1
...
13
14
15
16
17
18
19
...
71
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