September 2012 - Wine-Commits

Piotr Caban : msvcp80: Make some internal variables static.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 9ebc5f047819fce944ddd0c96ac4a42a91f793bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ebc5f047819fce944ddd0c96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:23:22 2012 +0200 msvcp80: Make some internal variables static. --- dlls/msvcp80/msvcp80.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c index d42614a..a662848 100644 --- a/dlls/msvcp80/msvcp80.c +++ b/dlls/msvcp80/msvcp80.c @@ -88,19 +88,19 @@ typedef struct { const wchar_t *pos; } basic_string_wchar_reverse_iter; -const struct locale* (CDECL *plocale_classic)(void); -MSVCP_size_t (CDECL *pcollate_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcollate_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcollate_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*); +static const struct locale* (CDECL *plocale_classic)(void); +static MSVCP_size_t (CDECL *pcollate_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcollate_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcollate_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*); static BOOL init_funcs(void) {

1 0

Dmitry Timoshkov : windowscodecs: Implement GIF Application Extension metadata reader.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: be28f266ff2a90df66fd886b35cec3fc015cb034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be28f266ff2a90df66fd886b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 17 10:03:15 2012 +0900 windowscodecs: Implement GIF Application Extension metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 109 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 ++++++ dlls/windowscodecs/tests/metadata.c | 1 - dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 6 files changed, 143 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index a42aeab..61ddfd9 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -65,6 +65,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, {&CLSID_WICIMDMetadataReader, IMDReader_CreateInstance}, {&CLSID_WICGCEMetadataReader, GCEReader_CreateInstance}, + {&CLSID_WICAPEMetadataReader, APEReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index a814c1a..14d7d01 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -325,6 +325,115 @@ HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&GCEReader_Vtbl, pUnkOuter, iid, ppv); } +static HRESULT load_APE_metadata(IStream *stream, const GUID *vendor, DWORD options, + MetadataItem **items, DWORD *count) +{ +#include "pshpack1.h" + struct application_extenstion + { + BYTE extension_introducer; + BYTE extension_label; + BYTE block_size; + BYTE application[11]; + } ape_data; +#include "poppack.h" + HRESULT hr; + ULONG bytesread, data_size, i; + MetadataItem *result; + BYTE subblock_size; + BYTE *data; + + *items = NULL; + *count = 0; + + hr = IStream_Read(stream, &ape_data, sizeof(ape_data), &bytesread); + if (FAILED(hr) || bytesread != sizeof(ape_data)) return S_OK; + if (ape_data.extension_introducer != 0x21 || ape_data.extension_label != 0xff || + ape_data.block_size != 11) + return S_OK; + + data = NULL; + data_size = 0; + + for (;;) + { + hr = IStream_Read(stream, &subblock_size, sizeof(subblock_size), &bytesread); + if (FAILED(hr) || bytesread != sizeof(subblock_size)) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + if (!subblock_size) break; + + if (!data) + data = HeapAlloc(GetProcessHeap(), 0, subblock_size + 1); + else + { + BYTE *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size + 1); + if (!new_data) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + data = new_data; + } + data[data_size] = subblock_size; + hr = IStream_Read(stream, data + data_size + 1, subblock_size, &bytesread); + if (FAILED(hr) || bytesread != subblock_size) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + data_size += subblock_size + 1; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 2); + if (!result) + { + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + for (i = 0; i < 2; i++) + { + PropVariantInit(&result[i].schema); + PropVariantInit(&result[i].id); + PropVariantInit(&result[i].value); + } + + result[0].id.vt = VT_LPWSTR; + result[0].id.u.pwszVal = strdupAtoW("Application"); + result[0].value.vt = VT_UI1|VT_VECTOR; + result[0].value.u.caub.cElems = sizeof(ape_data.application); + result[0].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, sizeof(ape_data.application)); + memcpy(result[0].value.u.caub.pElems, ape_data.application, sizeof(ape_data.application)); + + result[1].id.vt = VT_LPWSTR; + result[1].id.u.pwszVal = strdupAtoW("Data"); + result[1].value.vt = VT_UI1|VT_VECTOR; + result[1].value.u.caub.cElems = data_size; + result[1].value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, data_size); + memcpy(result[1].value.u.caub.pElems, data, data_size); + + HeapFree(GetProcessHeap(), 0, data); + + *items = result; + *count = 2; + + return S_OK; +} + +static const MetadataHandlerVtbl APEReader_Vtbl = { + 0, + &CLSID_WICAPEMetadataReader, + load_APE_metadata +}; + +HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&APEReader_Vtbl, pUnkOuter, iid, ppv); +} + static IStream *create_stream(const void *data, int data_size) { HRESULT hr; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index a7ac4b2..47e522c 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1562,6 +1562,21 @@ static const struct reader_containers gce_containers[] = { { NULL } /* list terminator */ }; +static const BYTE ape_magic[] = { 0x21, 0xff, 0x0b }; + +static const struct metadata_pattern ape_metadata_pattern[] = { + { 0, 3, ape_magic, mask_all, 0 }, + { 0 } +}; + +static const struct reader_containers ape_containers[] = { + { + &GUID_ContainerFormatGif, + ape_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1623,6 +1638,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, gce_containers }, + { &CLSID_WICAPEMetadataReader, + "The Wine Project", + "Application Extension Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatAPE, + 0, 0, 0, + ape_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b62b96e..27a8dcf 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1657,7 +1657,6 @@ static void test_metadata_APE(void) hr = CoCreateInstance(&CLSID_WICAPEMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, "CoCreateInstance error %#x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index b712b2f..406a3fa 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -98,5 +98,6 @@ extern HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, voi extern HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index e109bf2..7ca2235 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -163,3 +163,10 @@ coclass WICIMDMetadataReader { interface IWICMetadataReader; } uuid(b92e345d-f52d-41f3-b562-081bc772e3b9) ] coclass WICGCEMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC Application Extension Reader"), + threading(both), + uuid(1767b93a-b021-44ea-920f-863c11f4f768) +] +coclass WICAPEMetadataReader { interface IWICMetadataReader; }

1 0

Dmitry Timoshkov : windowscodecs: Implement GIF Comment Extension metadata reader.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: ec206a843feb489a4a47951a3a1e7f0d7ae439f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec206a843feb489a4a47951a3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 17 10:04:14 2012 +0900 windowscodecs: Implement GIF Comment Extension metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 95 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 +++++++ dlls/windowscodecs/tests/metadata.c | 1 - dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 6 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 61ddfd9..a57d673 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -66,6 +66,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICIMDMetadataReader, IMDReader_CreateInstance}, {&CLSID_WICGCEMetadataReader, GCEReader_CreateInstance}, {&CLSID_WICAPEMetadataReader, APEReader_CreateInstance}, + {&CLSID_WICGifCommentMetadataReader, GifCommentReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 14d7d01..1dba2bb 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -434,6 +434,101 @@ HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&APEReader_Vtbl, pUnkOuter, iid, ppv); } +static HRESULT load_GifComment_metadata(IStream *stream, const GUID *vendor, DWORD options, + MetadataItem **items, DWORD *count) +{ +#include "pshpack1.h" + struct gif_extenstion + { + BYTE extension_introducer; + BYTE extension_label; + } ext_data; +#include "poppack.h" + HRESULT hr; + ULONG bytesread, data_size; + MetadataItem *result; + BYTE subblock_size; + BYTE *data; + + *items = NULL; + *count = 0; + + hr = IStream_Read(stream, &ext_data, sizeof(ext_data), &bytesread); + if (FAILED(hr) || bytesread != sizeof(ext_data)) return S_OK; + if (ext_data.extension_introducer != 0x21 || ext_data.extension_label != 0xfe) + return S_OK; + + data = NULL; + data_size = 0; + + for (;;) + { + hr = IStream_Read(stream, &subblock_size, sizeof(subblock_size), &bytesread); + if (FAILED(hr) || bytesread != sizeof(subblock_size)) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + if (!subblock_size) break; + + if (!data) + data = HeapAlloc(GetProcessHeap(), 0, subblock_size); + else + { + BYTE *new_data = HeapReAlloc(GetProcessHeap(), 0, data, data_size + subblock_size); + if (!new_data) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + data = new_data; + } + hr = IStream_Read(stream, data + data_size, subblock_size, &bytesread); + if (FAILED(hr) || bytesread != subblock_size) + { + HeapFree(GetProcessHeap(), 0, data); + return S_OK; + } + data_size += subblock_size; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + if (!result) + { + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + PropVariantInit(&result->schema); + PropVariantInit(&result->id); + PropVariantInit(&result->value); + + result->id.vt = VT_LPWSTR; + result->id.u.pwszVal = strdupAtoW("TextEntry"); + result->value.vt = VT_LPSTR; + result->value.u.pszVal = HeapAlloc(GetProcessHeap(), 0, data_size + 1); + memcpy(result->value.u.pszVal, data, data_size); + result->value.u.pszVal[data_size] = 0; + + HeapFree(GetProcessHeap(), 0, data); + + *items = result; + *count = 1; + + return S_OK; +} + +static const MetadataHandlerVtbl GifCommentReader_Vtbl = { + 0, + &CLSID_WICGifCommentMetadataReader, + load_GifComment_metadata +}; + +HRESULT GifCommentReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&GifCommentReader_Vtbl, pUnkOuter, iid, ppv); +} + static IStream *create_stream(const void *data, int data_size) { HRESULT hr; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 47e522c..626887f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1577,6 +1577,21 @@ static const struct reader_containers ape_containers[] = { { NULL } /* list terminator */ }; +static const BYTE gif_comment_magic[] = { 0x21, 0xfe }; + +static const struct metadata_pattern gif_comment_metadata_pattern[] = { + { 0, 2, gif_comment_magic, mask_all, 0 }, + { 0 } +}; + +static const struct reader_containers gif_comment_containers[] = { + { + &GUID_ContainerFormatGif, + gif_comment_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1648,6 +1663,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, ape_containers }, + { &CLSID_WICGifCommentMetadataReader, + "The Wine Project", + "Comment Extension Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatGifComment, + 0, 0, 0, + gif_comment_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 27a8dcf..ed02e2f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1727,7 +1727,6 @@ static void test_metadata_GIF_comment(void) hr = CoCreateInstance(&CLSID_WICGifCommentMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, "CoCreateInstance error %#x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 406a3fa..41d2d80 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -99,5 +99,6 @@ extern HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void ** extern HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT GifCommentReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 7ca2235..658ced0 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -170,3 +170,10 @@ coclass WICGCEMetadataReader { interface IWICMetadataReader; } uuid(1767b93a-b021-44ea-920f-863c11f4f768) ] coclass WICAPEMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC Comment Extension Reader"), + threading(both), + uuid(32557d3b-69dc-4f95-836e-f5972b2f6159) +] +coclass WICGifCommentMetadataReader { interface IWICMetadataReader; }

1 0

Piotr Caban : msvcp71: Fixed ctype class virtual functions table.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: da0c0c6bd43447d45aecebdd9e0d729e0dee19dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0c0c6bd43447d45aecebdd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:37 2012 +0200 msvcp71: Fixed ctype class virtual functions table. --- dlls/msvcp71/locale.c | 40 +++++++++++----------------------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index c8fd22e..888a990 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -1366,7 +1366,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) -#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \ char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { @@ -1377,7 +1377,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) -#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \ const char*, (const ctype_char*, const char*, const char*, char, char*), \ (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, @@ -1391,9 +1391,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this, /* ?_Do_narrow_s@?$ctype(a)D@std@@MBEPBDPBD0DPADI(a)Z */ /* ?_Do_narrow_s@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) -#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ - const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ - (this, first, last, unused, dest, size)) const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, const char *last, char unused, char *dest, MSVCP_size_t size) { @@ -1428,7 +1425,7 @@ const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char * const char *last, char dflt, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); + return ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); } /* ?do_widen@?$ctype(a)D@std@@MBEDD(a)Z */ @@ -1459,9 +1456,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this, /* ?_Do_widen_s@?$ctype(a)D@std@@MBEPBDPBD0PADI(a)Z */ /* ?_Do_widen_s@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) -#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ - const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ - (this, first, last, dest, size)) const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { @@ -1496,7 +1490,7 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_char__Do_widen_s(this, first, last, dest, size); + return ctype_char__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ @@ -1988,7 +1982,7 @@ char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char /* ?do_narrow@?$ctype(a)G@std@@MBEDGD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBADGD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \ char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { @@ -2000,7 +1994,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype(a)G@std@@MBEPBGPBG0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) -#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \ const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, @@ -2017,9 +2011,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, /* ?_Do_narrow_s@?$ctype(a)G@std@@MBEPBGPBG0DPADI(a)Z */ /* ?_Do_narrow_s@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) -#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ - const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ - (this, first, last, dflt, dest, size)) const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { @@ -2063,7 +2054,7 @@ const wchar_t* __thiscall ctype_wchar__Narrow_s(const ctype_wchar *this, const w const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); - return call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size); + return ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size); } /* _Mbrtowc */ @@ -2182,9 +2173,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this, /* ?_Do_widen_s@?$ctype(a)G@std@@MBEPBDPBD0PAGI(a)Z */ /* ?_Do_widen_s@?$ctype(a)G@std@@MEBAPEBDPEBD0PEAG_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20) -#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \ - const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \ - (this, first, last, dest, size)) const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this, const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) { @@ -2228,7 +2216,7 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_wchar__Do_widen_s(this, first, last, dest, size); + return ctype_wchar__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ @@ -8577,10 +8565,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_toupper_ch) VTABLE_ADD_FUNC(ctype_char_do_widen) VTABLE_ADD_FUNC(ctype_char_do_widen_ch) - VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8593,10 +8579,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8609,10 +8593,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv)

1 0

Piotr Caban : msvcp71: Fixed basic_streambuf virtual functions table.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: ca171741d05488c4622123c3cc7dea5da8e1afc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca171741d05488c4622123c3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:47 2012 +0200 msvcp71: Fixed basic_streambuf virtual functions table. --- dlls/msvcp71/ios.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index ea07e37..8d15622 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -637,7 +637,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_streambuf_char_seekoff) VTABLE_ADD_FUNC(basic_streambuf_char_seekpos) @@ -682,7 +681,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_char_underflow) VTABLE_ADD_FUNC(basic_filebuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_filebuf_char_seekoff) VTABLE_ADD_FUNC(basic_filebuf_char_seekpos) @@ -727,7 +725,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_stringbuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_stringbuf_char_seekoff) VTABLE_ADD_FUNC(basic_stringbuf_char_seekpos) @@ -826,7 +823,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(strstreambuf_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(strstreambuf_seekoff) VTABLE_ADD_FUNC(strstreambuf_seekpos) @@ -1064,8 +1060,6 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this) /* ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPADIH(a)Z */ /* ?_Xsgetn_s@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA_JPEAD_K_J(a)Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16) -#define call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count) CALL_VTBL_FUNC(this, 28, \ - streamsize, (basic_streambuf_char*, char*, MSVCP_size_t, streamsize), (this, ptr, size, count)) streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { streamsize copied, chunk; @@ -1102,7 +1096,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Sgetn_s, 16) streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, size, count); } /* ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ */ @@ -1172,7 +1166,7 @@ locale* __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this, /* ?imbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEXABVlocale(a)2@@Z */ /* ?imbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAXAEBVlocale(a)2@@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_imbue, 8) -#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 52, \ +#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 48, \ void, (basic_streambuf_char*, const locale*), (this, loc)) void __thiscall basic_streambuf_char_imbue(basic_streambuf_char *this, const locale *loc) { @@ -1244,7 +1238,7 @@ locale* __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, loc /* ?seekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?seekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)_JHH@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekoff, 20) -#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 36, \ +#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 32, \ fpos_int*, (basic_streambuf_char*, fpos_int*, streamoff, int, int), (this, ret, off, way, mode)) fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) @@ -1279,7 +1273,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekoff_old(basic_streambuf_char *t /* ?seekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z */ /* ?seekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekpos, 36) -#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 40, \ +#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 36, \ fpos_int*, (basic_streambuf_char*, fpos_int*, fpos_int, int), (this, ret, pos, mode)) fpos_int* __thiscall basic_streambuf_char_seekpos(basic_streambuf_char *this, fpos_int *ret, fpos_int pos, int mode) @@ -1314,7 +1308,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekpos_old(basic_streambuf_char *t /* ?setbuf@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEPAV12(a)PADH@Z */ /* ?setbuf@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAPEAV12(a)PEAD_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setbuf, 12) -#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 44, \ +#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 40, \ basic_streambuf_char*, (basic_streambuf_char*, char*, streamsize), (this, buf, count)) basic_streambuf_char* __thiscall basic_streambuf_char_setbuf(basic_streambuf_char *this, char *buf, streamsize count) { @@ -1334,7 +1328,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_pubsetbuf(basic_streambuf_ /* ?sync@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ */ /* ?sync@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sync, 4) -#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 48, \ +#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 44, \ int, (basic_streambuf_char*), (this)) int __thiscall basic_streambuf_char_sync(basic_streambuf_char *this) { @@ -1357,7 +1351,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sgetn, 12) streamsize __thiscall basic_streambuf_char_sgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); } /* ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ */ @@ -1478,13 +1472,13 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsgetn, 12) streamsize __thiscall basic_streambuf_char_xsgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); } /* ?xsputn@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHPBDH(a)Z */ /* ?xsputn@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAA_JPEBD_J(a)Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsputn, 12) -#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 32, \ +#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 28, \ streamsize, (basic_streambuf_char*, const char*, streamsize), (this, ptr, count)) streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, const char *ptr, streamsize count) {

1 0

Piotr Caban : msvp71: Copy source files from msvcp90.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 9cf1910db75e5451b84cbc03820424a81dd46663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf1910db75e5451b84cbc038… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:14 2012 +0200 msvp71: Copy source files from msvcp90. --- dlls/msvcp71/Makefile.in | 13 +- dlls/msvcp71/cxx.h | 329 ++ dlls/msvcp71/exception.c | 767 +++ dlls/msvcp71/ios.c |13180 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/locale.c | 8784 ++++++++++++++++++++++++++++++ dlls/msvcp71/math.c | 896 ++++ dlls/msvcp71/memory.c | 338 ++ dlls/msvcp71/misc.c | 221 + dlls/msvcp71/msvcp.h | 469 ++ dlls/msvcp71/msvcp71.c | 402 +-- dlls/msvcp71/string.c | 4421 ++++++++++++++++ 11 files changed, 29504 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cf1910db75e5451b84cb…

1 0

Piotr Caban : msvcp100: Removed unused functions.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: aeafaf691f15b2828d68b78de66fe6bcd8642381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeafaf691f15b2828d68b78de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:23:01 2012 +0200 msvcp100: Removed unused functions. --- dlls/msvcp100/exception.c | 2 +- dlls/msvcp100/ios.c | 6 ++-- dlls/msvcp100/locale.c | 12 ++++---- dlls/msvcp100/memory.c | 12 -------- dlls/msvcp100/msvcp.h | 6 ---- dlls/msvcp100/string.c | 66 ++++++-------------------------------------- 6 files changed, 19 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeafaf691f15b2828d68b…

1 0

Dmitry Timoshkov : windowscodecs: Add support for color table sort flag to the GIF decoder.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: cfdf84b434387c4e0006d7ec8b7b970c74c74df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfdf84b434387c4e0006d7ec8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 17 10:05:20 2012 +0900 windowscodecs: Add support for color table sort flag to the GIF decoder. --- dlls/windowscodecs/gifformat.c | 3 ++- dlls/windowscodecs/ungif.c | 9 +++++++-- dlls/windowscodecs/ungif.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 1dba2bb..06047e7 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -912,7 +912,8 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead IMD_data.packed |= 1 << 7; /* local_color_table_size */ IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel - 1; - /* FIXME: sort_flag */ + /* sort_flag */ + IMD_data.packed |= This->frame->ImageDesc.ColorMap->SortFlag ? 0x20 : 0; } stream = create_stream(&IMD_data, sizeof(IMD_data)); diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index 85cd924..0efe065 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -272,7 +272,7 @@ FreeSavedImages(GifFileType * GifFile) { static int DGifGetScreenDesc(GifFileType * GifFile) { - int i, BitsPerPixel; + int i, BitsPerPixel, SortFlag; GifByteType Buf[3]; /* Put the screen descriptor into the file: */ @@ -284,6 +284,7 @@ DGifGetScreenDesc(GifFileType * GifFile) { return GIF_ERROR; } GifFile->SColorResolution = (((Buf[0] & 0x70) + 1) >> 4) + 1; + SortFlag = (Buf[0] & 0x08) != 0; BitsPerPixel = (Buf[0] & 0x07) + 1; GifFile->SBackGroundColor = Buf[1]; GifFile->SAspectRatio = Buf[2]; @@ -295,6 +296,7 @@ DGifGetScreenDesc(GifFileType * GifFile) { } /* Get the global color map: */ + GifFile->SColorMap->SortFlag = SortFlag; for (i = 0; i < GifFile->SColorMap->ColorCount; i++) { if (READ(GifFile, Buf, 3) != 3) { FreeMapObject(GifFile->SColorMap); @@ -353,7 +355,7 @@ DGifGetRecordType(GifFileType * GifFile, static int DGifGetImageDesc(GifFileType * GifFile) { - int i, BitsPerPixel; + int i, BitsPerPixel, SortFlag; GifByteType Buf[3]; GifFilePrivateType *Private = GifFile->Private; SavedImage *sp; @@ -367,6 +369,7 @@ DGifGetImageDesc(GifFileType * GifFile) { return GIF_ERROR; } BitsPerPixel = (Buf[0] & 0x07) + 1; + SortFlag = (Buf[0] & 0x20) != 0; GifFile->Image.Interlace = (Buf[0] & 0x40); if (Buf[0] & 0x80) { /* Does this image have local color map? */ @@ -381,6 +384,7 @@ DGifGetImageDesc(GifFileType * GifFile) { } /* Get the image local color map: */ + GifFile->Image.ColorMap->SortFlag = SortFlag; for (i = 0; i < GifFile->Image.ColorMap->ColorCount; i++) { if (READ(GifFile, Buf, 3) != 3) { FreeMapObject(GifFile->Image.ColorMap); @@ -417,6 +421,7 @@ DGifGetImageDesc(GifFileType * GifFile) { if (sp->ImageDesc.ColorMap == NULL) { return GIF_ERROR; } + sp->ImageDesc.ColorMap->SortFlag = GifFile->Image.ColorMap->SortFlag; } sp->RasterBits = NULL; sp->ExtensionBlockCount = 0; diff --git a/dlls/windowscodecs/ungif.h b/dlls/windowscodecs/ungif.h index 510b69a..5e377d2 100644 --- a/dlls/windowscodecs/ungif.h +++ b/dlls/windowscodecs/ungif.h @@ -88,6 +88,7 @@ typedef struct GifColorType { typedef struct ColorMapObject { int ColorCount; int BitsPerPixel; + int SortFlag; GifColorType *Colors; } ColorMapObject;

1 0

Christian Costa : dmusic: Rename params in GetMasterClock.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 649a1770074771a3768c2aaaa6a3ccf0a88dad19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649a1770074771a3768c2aaaa… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:24:02 2012 +0200 dmusic: Rename params in GetMasterClock. --- dlls/dmusic/dmusic.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 8f3218d..3bc4901 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -270,17 +270,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) +static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID guid_clock, IReferenceClock** reference_clock) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %p, %p)\n", This, pguidClock, ppReferenceClock); - if (pguidClock) - *pguidClock = This->pMasterClock->pClockInfo.guidClock; - if(ppReferenceClock) - *ppReferenceClock = (IReferenceClock *)This->pMasterClock; + TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); - return S_OK; + if (guid_clock) + *guid_clock = This->pMasterClock->pClockInfo.guidClock; + if (reference_clock) + *reference_clock = (IReferenceClock*)This->pMasterClock; + + return S_OK; } static HRESULT WINAPI IDirectMusic8Impl_SetMasterClock(LPDIRECTMUSIC8 iface, REFGUID rguidClock) @@ -354,19 +355,19 @@ static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock(LPDIRECTMUSIC8 if } static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { - IDirectMusic8Impl_QueryInterface, - IDirectMusic8Impl_AddRef, - IDirectMusic8Impl_Release, - IDirectMusic8Impl_EnumPort, - IDirectMusic8Impl_CreateMusicBuffer, - IDirectMusic8Impl_CreatePort, - IDirectMusic8Impl_EnumMasterClock, - IDirectMusic8Impl_GetMasterClock, - IDirectMusic8Impl_SetMasterClock, - IDirectMusic8Impl_Activate, - IDirectMusic8Impl_GetDefaultPort, - IDirectMusic8Impl_SetDirectSound, - IDirectMusic8Impl_SetExternalMasterClock + IDirectMusic8Impl_QueryInterface, + IDirectMusic8Impl_AddRef, + IDirectMusic8Impl_Release, + IDirectMusic8Impl_EnumPort, + IDirectMusic8Impl_CreateMusicBuffer, + IDirectMusic8Impl_CreatePort, + IDirectMusic8Impl_EnumMasterClock, + IDirectMusic8Impl_GetMasterClock, + IDirectMusic8Impl_SetMasterClock, + IDirectMusic8Impl_Activate, + IDirectMusic8Impl_GetDefaultPort, + IDirectMusic8Impl_SetDirectSound, + IDirectMusic8Impl_SetExternalMasterClock }; /* For ClassFactory */

1 0

Michael Stefaniuc : mshtml: Fix a memory leak on an error path (Smatch).
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: d8d58b238c2abb84f21cd662c558e9105c295498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d58b238c2abb84f21cd662c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 16 15:22:29 2012 +0200 mshtml: Fix a memory leak on an error path (Smatch). --- dlls/mshtml/navigate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a15be0e..15c9e85 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -769,8 +769,10 @@ static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info) return; IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &len, NULL, NULL); - if(!len) + if(!len) { + heap_free(buf); return; + } ptr = strchrW(buf, '\r'); if(ptr && ptr[1] == '\n') {

1 0