November 2012 - Wine-Commits

Piotr Caban : msvcp60: Added locale::Iscloc implementation.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

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 locale::_Locimp::_Global export.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

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

Henri Verbeet : d3dx9: Avoid LPD3DXSPMESH.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

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 LPD3DXSKININFO.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

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

Nikolay Sivov : xmllite: Support standalone declaration.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 8b8fb88e4ba32e62d5f3c3ff62ae1c54d1e7484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8fb88e4ba32e62d5f3c3ff6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 07:59:57 2012 -0500 xmllite: Support standalone declaration. --- dlls/xmllite/reader.c | 64 +++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 3 +- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 87d7936..ee6a4d7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -510,7 +510,7 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) ptr++; if (ptr2 == ptr) return WC_E_DIGIT; - TRACE("version=%s", debugstr_wn(start, ptr-start)); + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -592,7 +592,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; - if (reader_cmp(reader, encodingW)) return S_OK; + if (reader_cmp(reader, encodingW)) return S_FALSE; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -617,14 +617,55 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) return S_OK; } +/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ +static HRESULT reader_parse_sddecl(xmlreader *reader) +{ + static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; + static const WCHAR yesW[] = {'y','e','s',0}; + static const WCHAR noW[] = {'n','o',0}; + const WCHAR *start, *ptr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, standaloneW)) return S_FALSE; + /* skip 'standalone' */ + reader_skipn(reader, 10); + + 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); + + if (reader_cmp(reader, yesW) && reader_cmp(reader, noW)) + return WC_E_XMLDECL; + + start = reader_get_cur(reader); + /* skip 'yes'|'no' */ + reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); + ptr = reader_get_cur(reader); + TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + + 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}; + static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; /* check if we have "<?xml" */ - if (reader_cmp(reader, xmldeclW)) return S_OK; + if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); hr = reader_parse_versioninfo(reader); @@ -635,7 +676,15 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (FAILED(hr)) return hr; - return E_NOTIMPL; + hr = reader_parse_sddecl(reader); + if (FAILED(hr)) + return hr; + + reader_skipspaces(reader); + if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + reader_skipn(reader, 2); + + return S_OK; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -803,7 +852,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) hr = reader_parse_xmldecl(This); if (FAILED(hr)) return hr; - This->state = XmlReadState_Interactive; + if (hr == S_OK) + { + This->state = XmlReadState_Interactive; + This->nodetype = *node_type = XmlNodeType_XmlDeclaration; + return S_OK; + } } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 729d134..af0ea62 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -611,13 +611,12 @@ static void test_read_xmldeclaration(void) type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); -} /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, 0); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader);

1 0

Huw Davies : sane.ds: Add a missing break.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 0f95508936fdf6706b5d99a17a4a485bfdfd6ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f95508936fdf6706b5d99a17… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 09:26:49 2012 +0000 sane.ds: Add a missing break. --- dlls/sane.ds/ui.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 815478d..07d5a59 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1009,6 +1009,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM InitializeDialog(hwndDlg); break; } + break; } case WM_COMMAND: switch (HIWORD(wParam))

1 0

Christian Costa : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 94bfd24f671677468913b9a09a32ca983aff7fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bfd24f671677468913b9a09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:30 2012 +0100 cabinet: Simplify concatenation of path and filename. --- dlls/cabinet/fdi.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 25156c3..fb675fc 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, idx, i; + int pathlen, filenamelen, i; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2060,23 +2060,21 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) return DECR_NOMEMORY; - + ZeroMemory(cab->next, sizeof(fdi_decomp_state)); /* copy pszCabPath to userpath */ ZeroMemory(userpath, 256); - pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; + pathlen = pszCabPath ? strlen(pszCabPath) : 0; if (pathlen) { - if (pathlen < 256) { - for (i = 0; i <= pathlen; i++) - userpath[i] = pszCabPath[i]; - } /* else we are in a weird place... let's leave it blank and see if the user fixes it */ - } + if (pathlen < 256) /* else we are in a weird place... let's leave it blank and see if the user fixes it */ + strcpy(userpath, pszCabPath); + } /* initial fdintNEXT_CABINET notification */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); - fdin.psz1 = (cab->mii.nextname) ? cab->mii.nextname : &emptystring; - fdin.psz2 = (cab->mii.nextinfo) ? cab->mii.nextinfo : &emptystring; + fdin.psz1 = cab->mii.nextname ? cab->mii.nextname : &emptystring; + fdin.psz2 = cab->mii.nextinfo ? cab->mii.nextinfo : &emptystring; fdin.psz3 = userpath; fdin.fdie = FDIERROR_NONE; fdin.pv = pvUser; @@ -2086,7 +2084,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state do { pathlen = strlen(userpath); - filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0; + filenamelen = cab->mii.nextname ? strlen(cab->mii.nextname) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { @@ -2095,16 +2093,17 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state } /* paste the path and filename together */ - idx = 0; + fullpath[0] = '\0'; if (pathlen) { - for (i = 0; i < pathlen; i++) fullpath[idx++] = userpath[i]; - if (fullpath[idx - 1] != '\\') fullpath[idx++] = '\\'; + strcpy(fullpath, userpath); + if (fullpath[pathlen - 1] != '\\') + strcat(fullpath, "\\"); } - if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = cab->mii.nextname[i]; - fullpath[idx] = '\0'; - + if (filenamelen) + strcat(fullpath, cab->mii.nextname); + TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); - + /* try to get a handle to the cabfile */ cabhf = CAB(fdi)->open(fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { @@ -2113,14 +2112,14 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + if (cabhf == 0) { ERR("PFDI_OPEN returned zero for %s.\n", fullpath); fdin.fdie = FDIERROR_CABINET_NOT_FOUND; if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(CAB(fdi), cabhf, &fdici, &(cab->next->mii))) { WARN("FDIIsCabinet failed.\n");

1 0

Piotr Caban : msvcp60: Added seekoff exports.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: ca88f3624d38cf74747bb5990f02b7725836c7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca88f3624d38cf74747bb5990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:16:05 2012 +0000 msvcp60: Added seekoff exports. --- dlls/msvcp60/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca88f3624d38cf74747bb…

1 0

Nikolay Sivov : msxml3: Actually use skipped entity event data.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 21be19a1dcfab9b74b363fb8173afb5c40ed2355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21be19a1dcfab9b74b363fb81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:54:24 2012 -0500 msxml3: Actually use skipped entity event data. --- dlls/msxml3/tests/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 02bc00c..06fd56a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1191,6 +1191,7 @@ static HRESULT WINAPI contentHandler_skippedEntity( init_call_entry(locator, &call); call.id = CH_SKIPPEDENTITY; call.arg1W = SysAllocStringLen(name, len); + add_call(sequences, CONTENT_HANDLER_INDEX, &call); return get_expected_ret(); }

1 0

Nikolay Sivov : msxml3: Properly store SystemID and PublicID (Coverity).
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 818917a09e71d5459ffe05d6ba067a9302d24b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818917a09e71d5459ffe05d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:45:12 2012 -0500 msxml3: Properly store SystemID and PublicID (Coverity). --- dlls/msxml3/saxreader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 877493d..3b167b7 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -294,8 +294,8 @@ typedef struct saxreader *saxreader; HRESULT ret; xmlParserCtxtPtr pParserCtxt; - WCHAR *publicId; - WCHAR *systemId; + BSTR publicId; + BSTR systemId; int line; int column; BOOL vbInterface; @@ -2132,7 +2132,7 @@ static HRESULT WINAPI isaxlocator_getPublicId( publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt)); if(SysStringLen(publicId)) - This->publicId = (WCHAR*)&publicId; + This->publicId = publicId; else { SysFreeString(publicId); @@ -2154,7 +2154,7 @@ static HRESULT WINAPI isaxlocator_getSystemId( systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt)); if(SysStringLen(systemId)) - This->systemId = (WCHAR*)&systemId; + This->systemId = systemId; else { SysFreeString(systemId);

1 0