wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Piotr Caban : msvcp100: Removed unused functions.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

Piotr Caban : msvcp90: VTBL_WRAPPER(60) is unused so remove it.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 38d732510634e58b221f04ab391b6cfa27821cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d732510634e58b221f04ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:22:38 2012 +0200 msvcp90: VTBL_WRAPPER(60) is unused so remove it. --- dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/msvcp90_main.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 956675c..ac94032 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -212,7 +212,6 @@ extern void *vtbl_wrapper_44; extern void *vtbl_wrapper_48; extern void *vtbl_wrapper_52; extern void *vtbl_wrapper_56; -extern void *vtbl_wrapper_60; #else diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index a2b37a7..010284e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7284,7 +7284,7 @@ char* __cdecl num_put_wchar__Ifmt(const num_put *this, char *fmt, const char *sp return fmt; } -static ostreambuf_iterator_wchar* __cdecl num_put__Iput(const num_put *this, ostreambuf_iterator_wchar *ret, +static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, MSVCP_size_t count, numpunct_wchar *numpunct) { diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 31a2d82..cb6377f 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -53,7 +53,6 @@ DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); DEFINE_VTBL_WRAPPER(52); DEFINE_VTBL_WRAPPER(56); -DEFINE_VTBL_WRAPPER(60); #endif

1 0

Dmitry Timoshkov : windowscodecs: Add support for color table sort flag to the GIF decoder.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

Dmitry Timoshkov : windowscodecs: Implement GIF Comment Extension metadata reader.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

Dmitry Timoshkov : windowscodecs: Implement GIF Application Extension metadata reader.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

Christian Costa : dmusic: Create the list of available system ports at the beginning and use it to enumerate ports .
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 66a817f067ec8d53337001aff4c399e73c293aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a817f067ec8d53337001aff… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:24:10 2012 +0200 dmusic: Create the list of available system ports at the beginning and use it to enumerate ports. --- dlls/dmusic/dmusic.c | 175 +++++++++++++++++++++++++----------------- dlls/dmusic/dmusic_private.h | 10 ++- dlls/dmusic/port.c | 5 +- 3 files changed, 115 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66a817f067ec8d5333700…

1 0

Christian Costa : dmusic: Rename params in GetMasterClock.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

Christian Costa : dmusic: Rename params in CreateMusicBuffer.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8c07215f3a33a80701ebe754da6dd4bb2464473d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c07215f3a33a80701ebe754d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:23:54 2012 +0200 dmusic: Rename params in CreateMusicBuffer. --- dlls/dmusic/dmusic.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 3e0f9aa..8f3218d 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -168,19 +168,19 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind return S_FALSE; } -static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER* ppBuffer, LPUNKNOWN pUnkOuter) +static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC buffer_desc, LPDIRECTMUSICBUFFER* buffer, LPUNKNOWN unkouter) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %p, %p, %p)\n", This, pBufferDesc, ppBuffer, pUnkOuter); + TRACE("(%p)->(%p, %p, %p)\n", This, buffer_desc, buffer, unkouter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; + if (unkouter) + return CLASS_E_NOAGGREGATION; - if (!pBufferDesc || !ppBuffer) - return E_POINTER; + if (!buffer_desc || !buffer) + return E_POINTER; - return DMUSIC_CreateDirectMusicBufferImpl(pBufferDesc, (LPVOID)ppBuffer); + return DMUSIC_CreateDirectMusicBufferImpl(buffer_desc, (LPVOID)buffer); } static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter)

1 0

Christian Costa : d3dxof: Checkout output pointer and set returned interface to NULL at the beginning .
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 87d7fe68e2ea6a8435238b4ce17dc27c1eaeb67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d7fe68e2ea6a8435238b4ce… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:23:33 2012 +0200 d3dxof: Checkout output pointer and set returned interface to NULL at the beginning. --- dlls/d3dxof/d3dxof.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 02ed593..d8aaf62 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -987,27 +987,25 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileDataImpl* object; HRESULT hr; + if (!ppDataObj) + return E_POINTER; + + *ppDataObj = NULL; + TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); if (This->nb_xobjects >= MAX_OBJECTS) { ERR("Too many objects\n"); - *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; } /* Check if there are templates defined before the object */ if (!parse_templates(&This->buf)) - { - *ppDataObj = NULL; return DXFILEERR_BADVALUE; - } if (!This->buf.rem_bytes) - { - *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; - } hr = IDirectXFileDataImpl_Create(&object); if (FAILED(hr)) @@ -1064,7 +1062,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: IDirectXFileData_Release(&object->IDirectXFileData_iface); - *ppDataObj = NULL; return hr; }

1 0

Michael Stefaniuc : mshtml: Fix a memory leak on an error path (Smatch).
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

← Newer
1
...
44
45
46
47
48
49
50
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012