November 2012 - Wine-commits

Henri Verbeet : d3dx9: Avoid LPD3DXSKININFO.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 361cf636cc6d2a4cb7c382f70887ff62aa9337b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361cf636cc6d2a4cb7c382f70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:56 2012 +0100 d3dx9: Avoid LPD3DXSKININFO. --- dlls/d3dx9_36/skin.c | 8 ++++---- dlls/d3dx9_36/tests/mesh.c | 6 +++--- include/d3dx9anim.h | 10 +++++----- include/d3dx9mesh.h | 10 ++++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 8ef7fbe..2c4ab60 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -297,7 +297,7 @@ static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo * return &This->bones[bone_num].transform; } -static HRESULT WINAPI ID3DXSkinInfoImpl_Clone(ID3DXSkinInfo *iface, LPD3DXSKININFO *skin_info) +static HRESULT WINAPI ID3DXSkinInfoImpl_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo **skin_info) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); @@ -449,8 +449,8 @@ static const struct ID3DXSkinInfoVtbl ID3DXSkinInfoImpl_Vtbl = ID3DXSkinInfoImpl_ConvertToIndexedBlendedMesh }; -HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, CONST D3DVERTEXELEMENT9 *declaration, - DWORD num_bones, LPD3DXSKININFO *skin_info) +HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, const D3DVERTEXELEMENT9 *declaration, + DWORD num_bones, ID3DXSkinInfo **skin_info) { HRESULT hr; ID3DXSkinInfoImpl *object = NULL; @@ -490,7 +490,7 @@ error: return hr; } -HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, LPD3DXSKININFO *skin_info) +HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, ID3DXSkinInfo **skin_info) { HRESULT hr; D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 97d7e2d..35e38e4 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1859,9 +1859,9 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAll } static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, - LPCSTR name, CONST D3DXMESHDATA *mesh_data, CONST D3DXMATERIAL *materials, - CONST D3DXEFFECTINSTANCE *effects, DWORD num_materials, CONST DWORD *adjacency, - LPD3DXSKININFO skin_info, LPD3DXMESHCONTAINER *new_mesh_container) + const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials, + const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, + ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container) { LPD3DXMESHCONTAINER mesh_container = NULL; int i; diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 62fa6c0..71a18f0 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -98,7 +98,7 @@ typedef struct _D3DXMESHCONTAINER LPD3DXEFFECTINSTANCE pEffects; DWORD NumMaterials; DWORD *pAdjacency; - LPD3DXSKININFO pSkinInfo; + ID3DXSkinInfo *pSkinInfo; struct _D3DXMESHCONTAINER *pNextMeshContainer; } D3DXMESHCONTAINER, *LPD3DXMESHCONTAINER; @@ -171,10 +171,10 @@ typedef interface ID3DXAnimationController *LPD3DXANIMATIONCONTROLLER; DECLARE_INTERFACE(ID3DXAllocateHierarchy) { STDMETHOD(CreateFrame)(THIS_ LPCSTR Name, LPD3DXFRAME *new_frame) PURE; - STDMETHOD(CreateMeshContainer)(THIS_ LPCSTR Name, CONST D3DXMESHDATA *mesh_data, - CONST D3DXMATERIAL *materials, CONST D3DXEFFECTINSTANCE *effect_instances, - DWORD num_materials, CONST DWORD *adjacency, LPD3DXSKININFO skin_info, - LPD3DXMESHCONTAINER *new_mesh_container) PURE; + STDMETHOD(CreateMeshContainer)(THIS_ const char *name, const D3DXMESHDATA *mesh_data, + const D3DXMATERIAL *materials, const D3DXEFFECTINSTANCE *effect_instances, + DWORD num_materials, const DWORD *adjacency, ID3DXSkinInfo *skin_info, + D3DXMESHCONTAINER **new_mesh_container) PURE; STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME frame) PURE; STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER mesh_container) PURE; }; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 3a26b54..5545568 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE; STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE; STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; - STDMETHOD(Clone)(THIS_ LPD3DXSKININFO* skin_info) PURE; + STDMETHOD(Clone)(THIS_ ID3DXSkinInfo **skin_info) PURE; STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE; STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE; STDMETHOD(SetDeclaration)(THIS_ CONST D3DVERTEXELEMENT9* declaration) PURE; @@ -700,9 +700,11 @@ HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWE HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXPMesh **mesh); -HRESULT WINAPI D3DXCreateSkinInfo(DWORD, CONST D3DVERTEXELEMENT9 *, DWORD, LPD3DXSKININFO *); -HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD, DWORD, DWORD, LPD3DXSKININFO *); -HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3DXBONECOMBINATION *, LPD3DXSKININFO *); +HRESULT WINAPI D3DXCreateSkinInfo(DWORD vertex_count, const D3DVERTEXELEMENT9 *declaration, + DWORD bone_count, ID3DXSkinInfo **skin_info); +HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD vertex_count, DWORD fvf, DWORD bone_count, ID3DXSkinInfo **skin_info); +HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(ID3DXBaseMesh *mesh, DWORD bone_count, + const D3DXBONECOMBINATION *bone_combination_table, ID3DXSkinInfo **skin_info); HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_count, DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXSPMESH.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 181d4a229696d751aada1ec499243f819930505d URL: http://source.winehq.org/git/wine.git/?a=commit;h=181d4a229696d751aada1ec49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:57 2012 +0100 d3dx9: Avoid LPD3DXSPMESH. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 5545568..9b68a94 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -696,7 +696,8 @@ HRESULT WINAPI D3DXCreateMesh(DWORD face_count, DWORD vertex_count, DWORD flags, HRESULT WINAPI D3DXCreateMeshFVF(DWORD face_count, DWORD vertex_count, DWORD flags, DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); -HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, LPD3DXSPMESH *); +HRESULT WINAPI D3DXCreateSPMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, ID3DXSPMesh **spmesh); HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXPMesh **mesh);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPMESH.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 35a88f5ea291fa17d69f52c50fb9d32c0fb1e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a88f5ea291fa17d69f52c50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:58 2012 +0100 d3dx9: Avoid LPD3DXPMESH. --- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 71a18f0..40bf47d 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -85,7 +85,7 @@ typedef struct _D3DXMESHDATA union { LPD3DXMESH pMesh; - LPD3DXPMESH pPMesh; + ID3DXPMesh *pPMesh; ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 9b68a94..f5bbd7f 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -783,7 +783,9 @@ HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWOR HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *); -HRESULT WINAPI D3DXGeneratePMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS *, CONST FLOAT *, DWORD, DWORD, LPD3DXPMESH *); +HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, + DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);

1 0

Henri Verbeet : d3d10core/tests: Don't reuse the device.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: be65d6ab3cc6e02a338282a9f548c20e88db432a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be65d6ab3cc6e02a338282a9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:59 2012 +0100 d3d10core/tests: Don't reuse the device. --- dlls/d3d10core/tests/device.c | 118 +++++++++++++++++++++++++++++++--------- 1 files changed, 91 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 865dde6..0dd96f1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -74,11 +74,19 @@ cleanup: return device; } -static void test_device_interfaces(ID3D10Device *device) +static void test_device_interfaces(void) { + ID3D10Device *device; + ULONG refcount; IUnknown *obj; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown\n"); @@ -94,15 +102,26 @@ static void test_device_interfaces(ID3D10Device *device) if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); } -static void test_create_texture2d(ID3D10Device *device) +static void test_create_texture2d(void) { D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 512; desc.Height = 512; desc.MipLevels = 1; @@ -154,15 +173,26 @@ static void test_create_texture2d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_texture3d(ID3D10Device *device) +static void test_create_texture3d(void) { D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 64; desc.Height = 64; desc.Depth = 64; @@ -200,16 +230,27 @@ static void test_create_texture3d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture3D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_depthstencil_view(ID3D10Device *device) +static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10DepthStencilView *dsview; ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 1; @@ -236,9 +277,12 @@ static void test_create_depthstencil_view(ID3D10Device *device) ID3D10DepthStencilView_Release(dsview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_rendertarget_view(ID3D10Device *device) +static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -246,8 +290,16 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView *rtview; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_RENDER_TARGET; @@ -295,9 +347,12 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader_resource_view(ID3D10Device *device) +static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -305,8 +360,16 @@ static void test_create_shader_resource_view(ID3D10Device *device) D3D10_BUFFER_DESC buffer_desc; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -358,9 +421,12 @@ static void test_create_shader_resource_view(ID3D10Device *device) ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader(ID3D10Device *device) +static void test_create_shader(void) { #if 0 float4 light; @@ -471,8 +537,16 @@ float4 main(const float4 color : COLOR) : SV_TARGET ID3D10VertexShader *vs = NULL; ID3D10PixelShader *ps = NULL; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (vs) @@ -491,28 +565,18 @@ float4 main(const float4 color : COLOR) : SV_TARGET ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (ps) ID3D10PixelShader_Release(ps); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } START_TEST(device) { - ID3D10Device *device; - ULONG refcount; - - device = create_device(); - if (!device) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_device_interfaces(device); - test_create_texture2d(device); - test_create_texture3d(device); - test_create_depthstencil_view(device); - test_create_rendertarget_view(device); - test_create_shader_resource_view(device); - test_create_shader(device); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_device_interfaces(); + test_create_texture2d(); + test_create_texture3d(); + test_create_depthstencil_view(); + test_create_rendertarget_view(); + test_create_shader_resource_view(); + test_create_shader(); }

1 0

Henri Verbeet : d3d10core/tests: Use the correct enum in test_create_shader_resource_view().
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 7c722bea2866b274c47f97006de937934273fc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c722bea2866b274c47f97006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:11:00 2012 +0100 d3d10core/tests: Use the correct enum in test_create_shader_resource_view(). --- dlls/d3d10core/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd96f1..a0df22a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -383,7 +383,7 @@ static void test_create_shader_resource_view(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; - srv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; U(srv_desc).Buffer.ElementOffset = 0; U(srv_desc).Buffer.ElementWidth = 64;

1 0

Piotr Caban : msvcp60: Forward bad_cast functions to msvcrt.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: e6e0da609da495e739f5123d5bb3bb8327c13b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0da609da495e739f5123d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:22 2012 +0000 msvcp60: Forward bad_cast functions to msvcrt. --- dlls/msvcp60/exception.c | 2 ++ dlls/msvcp60/msvcp60.spec | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index b8c6921..1dcce4e 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise(a)out_of_range@std@@MEBAXXZ */ /* ?_Doraise(a)runtime_error@std@@MBEXXZ */ /* ?_Doraise(a)runtime_error@std@@MEBAXXZ */ +/* ?_Doraise(a)bad_cast@std@@MBEXXZ */ +/* ?_Doraise(a)bad_cast@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 137f09c..27cae4b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -845,10 +845,10 @@ @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)PEBD@Z(ptr str) MSVCP_bad_alloc_ctor @ thiscall -arch=win32 ??0bad_alloc(a)std@@QAE(a)XZ(ptr) MSVCP_bad_alloc_default_ctor @ cdecl -arch=win64 ??0bad_alloc(a)std@@QEAA(a)XZ(ptr) MSVCP_bad_alloc_default_ctor -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0bad_exception(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0bad_exception(a)std@@QAE(a)PBD@Z @@ -1049,8 +1049,8 @@ @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ @ thiscall -arch=win32 ??1bad_alloc(a)std@@UAE(a)XZ(ptr) MSVCP_bad_alloc_dtor @ cdecl -arch=win64 ??1bad_alloc(a)std@@UEAA(a)XZ(ptr) MSVCP_bad_alloc_dtor -@ stub -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ +@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ stub -arch=win32 ??1bad_exception(a)std@@UAE(a)XZ @ stub -arch=win64 ??1bad_exception(a)std@@UEAA(a)XZ @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ @@ -1235,8 +1235,8 @@ @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4bad_alloc(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign @ cdecl -arch=win64 ??4bad_alloc(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign -@ stub -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4bad_exception(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4bad_exception(a)std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z @@ -1815,7 +1815,7 @@ # extern ??_7?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@6B@ # extern ??_7__non_rtti_object(a)std@@6B@ @ extern ??_7bad_alloc(a)std@@6B@ MSVCP_bad_alloc_vtable -# extern ??_7bad_cast(a)std@@6B@ +@ extern ??_7bad_cast(a)std@@6B@ msvcrt.??_7bad_cast@@6B@ # extern ??_7bad_exception(a)std@@6B@ # extern ??_7bad_typeid(a)std@@6B@ @ extern ??_7codecvt_base(a)std@@6B@ MSVCP_codecvt_base_vtable @@ -1979,8 +1979,8 @@ @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) _Locinfo_ctor @ thiscall -arch=win32 ??_F_Timevec(a)std@@QAEXXZ(ptr) _Timevec_ctor @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) _Timevec_ctor -@ stub -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_exception(a)std@@QAEXXZ @ stub -arch=win64 ??_Fbad_exception(a)std@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ @@ -2029,8 +2029,8 @@ @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@QEAAPEAV123(a)XZ(ptr) locale_facet__Decref @ thiscall -arch=win32 ?_Doraise(a)bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise(a)bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise -@ stub -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise(a)bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise(a)bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise(a)bad_exception@std@@MBEXXZ @ stub -arch=win64 ?_Doraise(a)bad_exception@std@@MEBAXXZ @ stub -arch=win32 ?_Doraise(a)bad_typeid@std@@MBEXXZ

1 0

Piotr Caban : msvcp60: Added locale::_Locimp::_Global export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 200cb7d3ac19fb1b1105228e1508471691c5d3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200cb7d3ac19fb1b1105228e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:47 2012 +0000 msvcp60: Added locale::_Locimp::_Global export. --- dlls/msvcp60/locale.c | 5 ++++- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 9b71334..f225b4d 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -98,9 +98,12 @@ typedef struct { /* ?_Id_cnt(a)id@locale(a)std@@0HA */ int locale_id__Id_cnt = 0; -static locale__Locimp *global_locale; static locale classic_locale; +/* ?_Global(a)_Locimp@locale(a)std@@0PAV123(a)A */ +/* ?_Global(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ +locale__Locimp *global_locale = NULL; + /* ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A */ /* ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 27cae4b..121cf11 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2184,8 +2184,8 @@ @ cdecl -arch=win64 ?_Gettrue(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue @ stub -arch=win32 ?_Getyes(a)_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getyes(a)_Locinfo@std@@QEBAPEBDXZ -# extern -arch=win32 ?_Global(a)_Locimp@locale(a)std@@0PAV123(a)A -# extern -arch=win64 ?_Global(a)_Locimp@locale(a)std@@0PEAV123(a)EA +@ extern -arch=win32 ?_Global(a)_Locimp@locale(a)std@@0PAV123(a)A global_locale +@ extern -arch=win64 ?_Global(a)_Locimp@locale(a)std@@0PEAV123(a)EA global_locale @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec @ cdecl -arch=win64 ?_Gndec@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec

1 0

Piotr Caban : msvcp60: Added locale::_Getfacet export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 08280758dd84a7bfac239371896201b65c0b06ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=08280758dd84a7bfac2393718… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:04 2012 +0000 msvcp60: Added locale::_Getfacet export. --- dlls/msvcp60/locale.c | 42 ++++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index f225b4d..d6bd542 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -42,7 +42,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); -static const locale_facet* locale__Getfacet(const locale*, MSVCP_size_t); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t, MSVCP_bool); typedef int category; @@ -1318,7 +1318,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -1965,7 +1965,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -1993,7 +1993,7 @@ ctype_wchar* ctype_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2460,7 +2460,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -2698,7 +2698,7 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -2750,7 +2750,7 @@ codecvt_wchar* codecvt_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -3120,7 +3120,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3456,7 +3456,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3504,7 +3504,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3866,7 +3866,7 @@ static num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -3906,7 +3906,7 @@ num_get* num_get_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -4878,7 +4878,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5632,7 +5632,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6242,7 +6242,7 @@ static num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6270,7 +6270,7 @@ num_put* num_put_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -7559,16 +7559,18 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ return this; } -/* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I(a)Z */ -/* ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K(a)Z */ -static const locale_facet* locale__Getfacet(const locale *this, MSVCP_size_t id) +/* ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z */ +/* ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z */ +DEFINE_THISCALL_WRAPPER(locale__Getfacet, 12) +const locale_facet* __thiscall locale__Getfacet(const locale *this, + MSVCP_size_t id, MSVCP_bool allow_transparent) { locale_facet *fac; TRACE("(%p %lu)\n", this, id); fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; - if(fac || !this->ptr->transparent) + if(fac || !this->ptr->transparent || !allow_transparent) return fac; return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 121cf11..6e8bddd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2148,8 +2148,8 @@ @ cdecl -arch=win64 ?_Getcvt(a)_Locinfo@std@@QEBA?AU_Cvtvec@@XZ(ptr ptr) _Locinfo__Getcvt @ thiscall -arch=win32 ?_Getdays(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getdays @ cdecl -arch=win64 ?_Getdays(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getdays -@ stub -arch=win32 ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z -@ stub -arch=win64 ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z +@ thiscall -arch=win32 ?_Getfacet(a)locale@std@@QBEPBVfacet(a)12@I_N(a)Z(ptr long long) locale__Getfacet +@ cdecl -arch=win64 ?_Getfacet(a)locale@std@@QEBAPEBVfacet(a)12@_K_N(a)Z(ptr long long) locale__Getfacet @ thiscall -arch=win32 ?_Getfalse(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getfalse @ cdecl -arch=win64 ?_Getfalse(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getfalse @ stub -arch=win32 ?_Getffld@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@CAHPADAAV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)1ABVlocale@2@@Z

1 0

Piotr Caban : msvcp60: Added locale::Iscloc implementation.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 81853405b12ad0125c678a8894bf08615c36fc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81853405b12ad0125c678a889… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:19 2012 +0000 msvcp60: Added locale::Iscloc implementation. --- dlls/msvcp60/locale.c | 9 +++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index d6bd542..2517326 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7396,6 +7396,15 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Iscloc(a)locale@std@@QBE_NXZ */ +/* ?_Iscloc(a)locale@std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(locale__Iscloc, 4) +MSVCP_bool __thiscall locale__Iscloc(const locale *this) +{ + TRACE("(%p)\n", this); + return this->ptr == locale__Locimp__Clocptr; +} + /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ /* ??0locale(a)std@@QEAA(a)AEBV01@0H(a)Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 6e8bddd..e8f2ccc 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2291,8 +2291,8 @@ @ stub -arch=win64 ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEAD_K(a)Z @ stub -arch=win32 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPADI(a)Z @ stub -arch=win64 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEAD_K(a)Z -@ stub -arch=win32 ?_Iscloc(a)locale@std@@QBE_NXZ -@ stub -arch=win64 ?_Iscloc(a)locale@std@@QEBA_NXZ +@ thiscall -arch=win32 ?_Iscloc(a)locale@std@@QBE_NXZ(ptr) locale__Iscloc +@ cdecl -arch=win64 ?_Iscloc(a)locale@std@@QEBA_NXZ(ptr) locale__Iscloc @ stub ?_Isinf@?$_Ctr(a)M@std@@SA_NM(a)Z @ stub ?_Isinf@?$_Ctr(a)N@std@@SA_NN(a)Z @ stub ?_Isinf@?$_Ctr(a)O@std@@SA_NO(a)Z

1 0

Piotr Caban : msvcp60: Added basic_filebuf<short>::_Initcvt export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: dea74b4da36dfe37d2eb54debdcad724ecd00e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea74b4da36dfe37d2eb54deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:15:48 2012 +0000 msvcp60: Added basic_filebuf<short>::_Initcvt export. --- dlls/msvcp60/msvcp60.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e8f2ccc..ec7380d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2285,8 +2285,8 @@ @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt @ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt @ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt -@ stub -arch=win32 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IAEXXZ -@ stub -arch=win64 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt +@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt @ stub -arch=win32 ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPADI(a)Z @ stub -arch=win64 ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEAD_K(a)Z @ stub -arch=win32 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPADI(a)Z

1 0