September 2012 - Wine-commits

James Eder : ntdll: Add more complete implementation of NtPowerInformation.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 2a71712b51a7c17645f98dd6fdd377ecea7f7026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a71712b51a7c17645f98dd6f… Author: James Eder <jimportal(a)gmail.com> Date: Thu Sep 13 15:12:15 2012 -0600 ntdll: Add more complete implementation of NtPowerInformation. --- dlls/ntdll/nt.c | 169 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 139 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ca05203..878c58b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -810,7 +810,6 @@ NTSTATUS WINAPI NtSetIntervalProfile( } static SYSTEM_CPU_INFORMATION cached_sci; -static ULONGLONG cpuHz = 1000000000; /* default to a 1GHz */ #define AUTH 0x68747541 /* "Auth" */ #define ENTI 0x69746e65 /* "enti" */ @@ -901,7 +900,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) * fill_cpu_info * * inits a couple of places with CPU related information: - * - cached_sci & cpuHZ in this file + * - cached_sci in this file * - Peb->NumberOfProcessors * - SharedUserData->ProcessFeatures[] array */ @@ -1019,16 +1018,6 @@ void fill_cpu_info(void) cached_sci.Revision = cached_sci.Revision | x; continue; } - if (!strcasecmp(line, "cpu MHz")) - { - double cmz; - if (sscanf( value, "%lf", &cmz ) == 1) - { - /* SYSTEMINFO doesn't have a slot for cpu speed, so store in a global */ - cpuHz = cmz * 1000 * 1000; - } - continue; - } if (!strcasecmp(line, "fdiv_bug")) { if (!strncasecmp(value, "yes",3)) @@ -1190,10 +1179,6 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); if (!ret) NtCurrentTeb()->Peb->NumberOfProcessors = num; - - len = sizeof(num); - if (!sysctlbyname("hw.clockrate", &num, &len, NULL, 0)) - cpuHz = num * 1000 * 1000; } #elif defined(__sun) { @@ -1219,7 +1204,6 @@ void fill_cpu_info(void) #elif defined (__APPLE__) { size_t valSize; - unsigned long long longVal; int value; int cputype; char buffer[1024]; @@ -1300,9 +1284,6 @@ void fill_cpu_info(void) default: break; } /* switch (cputype) */ } - valSize = sizeof(longVal); - if (!sysctlbyname("hw.cpufrequency", &longVal, &valSize, NULL, 0)) - cpuHz = longVal; } #else FIXME("not yet supported on this system\n"); @@ -2261,7 +2242,35 @@ NTSTATUS WINAPI NtInitiatePowerAction( SystemAction,MinSystemState,Flags,Asynchronous); return STATUS_NOT_IMPLEMENTED; } - + +#ifdef linux +/* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For + * most distributions on recent enough hardware, this is only likely to + * happen while running in virtualized environments such as QEMU. */ +static ULONG mhz_from_cpuinfo(void) +{ + char line[512]; + char *s, *value; + double cmz = 0; + FILE* f = fopen("/proc/cpuinfo", "r"); + if(f) { + while (fgets(line, sizeof(line), f) != NULL) { + if (!(value = strchr(line,':'))) + continue; + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + value++; + if (!strcasecmp(line, "cpu MHz")) { + sscanf(value, " %lf", &cmz); + break; + } + } + fclose(f); + } + return cmz; +} +#endif /****************************************************************************** * NtPowerInformation [NTDLL.@] @@ -2326,24 +2335,124 @@ NTSTATUS WINAPI NtPowerInformation( return STATUS_SUCCESS; } case ProcessorInformation: { + const int cannedMHz = 1000; /* We fake a 1GHz processor if we can't conjure up real values */ PROCESSOR_POWER_INFORMATION* cpu_power = lpOutputBuffer; - int i; - - WARN("semi-stub: ProcessorInformation\n"); + int i, out_cpus; if ((lpOutputBuffer == NULL) || (nOutputBufferSize == 0)) return STATUS_INVALID_PARAMETER; - if ((nOutputBufferSize / sizeof(PROCESSOR_POWER_INFORMATION)) < NtCurrentTeb()->Peb->NumberOfProcessors) + out_cpus = NtCurrentTeb()->Peb->NumberOfProcessors; + if ((nOutputBufferSize / sizeof(PROCESSOR_POWER_INFORMATION)) < out_cpus) return STATUS_BUFFER_TOO_SMALL; - - for(i = 0; i < NtCurrentTeb()->Peb->NumberOfProcessors; i++) { +#if defined(linux) + { + char filename[128]; + FILE* f; + + for(i = 0; i < out_cpus; i++) { + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_cur_freq", i); + f = fopen(filename, "r"); + if (f && (fscanf(f, "%d", &cpu_power[i].CurrentMhz) == 1)) { + cpu_power[i].CurrentMhz /= 1000; + fclose(f); + } + else { + if(i == 0) { + cpu_power[0].CurrentMhz = mhz_from_cpuinfo(); + if(cpu_power[0].CurrentMhz == 0) + cpu_power[0].CurrentMhz = cannedMHz; + } + else + cpu_power[i].CurrentMhz = cpu_power[0].CurrentMhz; + if(f) fclose(f); + } + + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/cpuinfo_max_freq", i); + f = fopen(filename, "r"); + if (f && (fscanf(f, "%d", &cpu_power[i].MaxMhz) == 1)) { + cpu_power[i].MaxMhz /= 1000; + fclose(f); + } + else { + cpu_power[i].MaxMhz = cpu_power[i].CurrentMhz; + if(f) fclose(f); + } + + sprintf(filename, "/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq", i); + f = fopen(filename, "r"); + if(f && (fscanf(f, "%d", &cpu_power[i].MhzLimit) == 1)) { + cpu_power[i].MhzLimit /= 1000; + fclose(f); + } + else + { + cpu_power[i].MhzLimit = cpu_power[i].MaxMhz; + if(f) fclose(f); + } + + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) + { + int num; + size_t valSize = sizeof(num); + if (sysctlbyname("hw.clockrate", &num, &valSize, NULL, 0)) + num = cannedMHz; + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = num; + cpu_power[i].MaxMhz = num; + cpu_power[i].MhzLimit = num; + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#elif defined (__APPLE__) + { + size_t valSize; + unsigned long long currentMhz; + unsigned long long maxMhz; + + valSize = sizeof(currentMhz); + if (!sysctlbyname("hw.cpufrequency", &currentMhz, &valSize, NULL, 0)) + currentMhz /= 1000000; + else + currentMhz = cannedMHz; + + valSize = sizeof(maxMhz); + if (!sysctlbyname("hw.cpufrequency_max", &maxMhz, &valSize, NULL, 0)) + maxMhz /= 1000000; + else + maxMhz = currentMhz; + + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = currentMhz; + cpu_power[i].MaxMhz = maxMhz; + cpu_power[i].MhzLimit = maxMhz; + cpu_power[i].Number = i; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + } +#else + for(i = 0; i < out_cpus; i++) { + cpu_power[i].CurrentMhz = cannedMHz; + cpu_power[i].MaxMhz = cannedMHz; + cpu_power[i].MhzLimit = cannedMHz; cpu_power[i].Number = i; - cpu_power[i].MaxMhz = cpuHz / 1000000; - cpu_power[i].CurrentMhz = cpuHz / 1000000; - cpu_power[i].MhzLimit = cpuHz / 1000000; cpu_power[i].MaxIdleState = 0; /* FIXME */ cpu_power[i].CurrentIdleState = 0; /* FIXME */ } + WARN("Unable to detect CPU MHz for this platform. Reporting %d MHz.\n", cannedMHz); +#endif + for(i = 0; i < out_cpus; i++) { + TRACE("cpu_power[%d] = %u %u %u %u %u %u\n", i, cpu_power[i].Number, + cpu_power[i].MaxMhz, cpu_power[i].CurrentMhz, cpu_power[i].MhzLimit, + cpu_power[i].MaxIdleState, cpu_power[i].CurrentIdleState); + } return STATUS_SUCCESS; } default:

1 0

Bernhard Übelacker : mshtml: Check parameter load_group before calling RemoveRequest.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: fdb7286a2c61ad1404f14771bf9c2bd66a716423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb7286a2c61ad1404f14771b… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Sep 7 13:56:25 2012 +0200 mshtml: Check parameter load_group before calling RemoveRequest. --- dlls/mshtml/navigate.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4bed605..a15be0e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1310,10 +1310,12 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAs } if(old_nschannel) { - nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, - (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); + if(old_nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(old_nschannel->load_group, + (nsIRequest*)&old_nschannel->nsIHttpChannel_iface, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } nsIHttpChannel_Release(&old_nschannel->nsIHttpChannel_iface); }

1 0

Michael Stefaniuc : dsound: Get rid of an unused macro.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: bee1573cb748a20531cbbafe5f5d65fcc98b9dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee1573cb748a20531cbbafe5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 12:11:52 2012 +0200 dsound: Get rid of an unused macro. --- dlls/dsound/propset.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index d14a388..6c0b9f4 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -41,12 +41,6 @@ #include "propkey.h" #include "devpkey.h" -#ifdef NONAMELESSSTRUCT -# define S(x) (x).s -#else -# define S(x) (x) -#endif - WINE_DEFAULT_DEBUG_CHANNEL(dsound); static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 };

1 0

Charles Davis : d3dxof: Don't release a garbage object pointer (Clang).
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: b8243b01b5461a029fde50a6dd5a15a5178836eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8243b01b5461a029fde50a6d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Sep 13 23:35:20 2012 -0600 d3dxof: Don't release a garbage object pointer (Clang). --- dlls/d3dxof/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 3ba92e2..02ed593 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -999,8 +999,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE /* Check if there are templates defined before the object */ if (!parse_templates(&This->buf)) { - hr = DXFILEERR_BADVALUE; - goto error; + *ppDataObj = NULL; + return DXFILEERR_BADVALUE; } if (!This->buf.rem_bytes)

1 0

Charles Davis : advapi32: Fix memory leak on Mac OS (Clang).
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 4d22d685030c86c3b73dd4a4cf78efcc4812c919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d22d685030c86c3b73dd4a4c… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Sep 13 23:35:24 2012 -0600 advapi32: Fix memory leak on Mac OS (Clang). --- dlls/advapi32/cred.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index d15feb7..3da71bf 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -273,6 +273,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require if (!user_name_present) { WARN("no kSecAccountItemAttr for item\n"); + SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); return ERROR_NOT_FOUND; }

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for GIF Application Extension metadata reader.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 32a5a11b5e201c19ad6c482d22dac0832998e389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a5a11b5e201c19ad6c482d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:05:05 2012 +0900 windowscodecs: Add a bunch of tests for GIF Application Extension metadata reader. --- dlls/windowscodecs/tests/metadata.c | 73 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 3 + 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 11db5cb..45ff717 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1486,6 +1486,78 @@ static void test_metadata_GCE(void) IStream_Release(stream); } +static void test_metadata_APE(void) +{ + static const WCHAR APE_name[] = {'A','p','p','l','i','c','a','t','i','o','n',' ','E','x','t','e','n','s','i','o','n',' ','R','e','a','d','e','r',0}; + static const char APE_data[] = { 0x21,0xff,0x0b,'H','e','l','l','o',' ','W','o','r','l','d', + /*sub-block*/1,0x11, + /*sub-block*/2,0x22,0x33, + /*sub-block*/4,0x44,0x55,0x66,0x77, + /*terminator*/0 }; + static const struct test_data td[2] = + { + { VT_UI1|VT_VECTOR, 0, 11, { 'H','e','l','l','o',' ','W','o','r','l','d' }, NULL, { 'A','p','p','l','i','c','a','t','i','o','n',0 } }, + { VT_UI1|VT_VECTOR, 0, 10, { 1,0x11,2,0x22,0x33,4,0x44,0x55,0x66,0x77 }, NULL, { 'D','a','t','a',0 } } + }; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + 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); + + stream = create_stream(APE_data, sizeof(APE_data)); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatAPE), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICAPEMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, APE_name) == 0, "wrong APE reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1500,6 +1572,7 @@ START_TEST(metadata) test_metadata_LSD(); test_metadata_IMD(); test_metadata_GCE(); + test_metadata_APE(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 2a5b389..31333c5 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -46,6 +46,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatXMPStruct, 0x22383cf1,0xed17,0x4e2e,0x cpp_quote("DEFINE_GUID(GUID_MetadataFormatIMD, 0xbd2bb086,0x4d52,0x48dd,0x96,0x77,0xdb,0x48,0x3e,0x85,0xae,0x8f);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatLSD, 0xe256031e,0x6299,0x4929,0xb9,0x8d,0x5a,0xc8,0x84,0xaf,0xba,0x92);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatGCE, 0x2a25cad8,0xdeeb,0x4c69,0xa7,0x88,0x0e,0xc2,0x26,0x6d,0xca,0xfd);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatAPE, 0x2e043dc2,0xc967,0x4e05,0x87,0x5e,0x61,0x8b,0xf6,0x7e,0x85,0xc3);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") @@ -63,6 +64,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataReader, 0x7447a267,0x0015,0x42c8,0xa8 cpp_quote("DEFINE_GUID(CLSID_WICIMDMetadataWriter, 0x8c89071f,0x452e,0x4e95,0x96,0x82,0x9d,0x10,0x24,0x62,0x71,0x72);") cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataReader, 0xb92e345d,0xf52d,0x41f3,0xb5,0x62,0x08,0x1b,0xc7,0x72,0xe3,0xb9);") cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataWriter, 0xaf95dc76,0x16b2,0x47f4,0xb3,0xea,0x3c,0x31,0x79,0x66,0x93,0xe7);") +cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataReader, 0x1767b93a,0xb021,0x44ea,0x92,0x0f,0x86,0x3c,0x11,0xf4,0xf7,0x68);") +cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataWriter, 0xbd6edfca,0x2890,0x482f,0xb2,0x33,0x8d,0x73,0x39,0xa1,0xcf,0x8d);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for GIF Comment Extenstion metadata reader.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8ec1008fc7bcb73065a0818edc334c5eb8866a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec1008fc7bcb73065a0818ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:06:42 2012 +0900 windowscodecs: Add a bunch of tests for GIF Comment Extenstion metadata reader. --- dlls/windowscodecs/tests/metadata.c | 72 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 3 + 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 45ff717..684def8 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1558,6 +1558,77 @@ todo_wine IStream_Release(stream); } +static void test_metadata_GIF_comment(void) +{ + static const WCHAR GIF_comment_name[] = {'C','o','m','m','e','n','t',' ','E','x','t','e','n','s','i','o','n',' ','R','e','a','d','e','r',0}; + static const char GIF_comment_data[] = { 0x21,0xfe, + /*sub-block*/5,'H','e','l','l','o', + /*sub-block*/1,' ', + /*sub-block*/6,'W','o','r','l','d','!', + /*terminator*/0 }; + static const struct test_data td[1] = + { + { VT_LPSTR, 0, 12, { 0 }, "Hello World!", { 'T','e','x','t','E','n','t','r','y',0 } } + }; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + 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); + + stream = create_stream(GIF_comment_data, sizeof(GIF_comment_data)); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICGifCommentMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, GIF_comment_name) == 0, "wrong APE reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1573,6 +1644,7 @@ START_TEST(metadata) test_metadata_IMD(); test_metadata_GCE(); test_metadata_APE(); + test_metadata_GIF_comment(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 31333c5..e43f864 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -47,6 +47,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatIMD, 0xbd2bb086,0x4d52,0x48dd,0x96,0x7 cpp_quote("DEFINE_GUID(GUID_MetadataFormatLSD, 0xe256031e,0x6299,0x4929,0xb9,0x8d,0x5a,0xc8,0x84,0xaf,0xba,0x92);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatGCE, 0x2a25cad8,0xdeeb,0x4c69,0xa7,0x88,0x0e,0xc2,0x26,0x6d,0xca,0xfd);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatAPE, 0x2e043dc2,0xc967,0x4e05,0x87,0x5e,0x61,0x8b,0xf6,0x7e,0x85,0xc3);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatGifComment, 0xc4b6e0e0,0xcfb4,0x4ad3,0xab,0x33,0x9a,0xad,0x23,0x55,0xa3,0x4a);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") @@ -66,6 +67,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataReader, 0xb92e345d,0xf52d,0x41f3,0xb5 cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataWriter, 0xaf95dc76,0x16b2,0x47f4,0xb3,0xea,0x3c,0x31,0x79,0x66,0x93,0xe7);") cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataReader, 0x1767b93a,0xb021,0x44ea,0x92,0x0f,0x86,0x3c,0x11,0xf4,0xf7,0x68);") cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataWriter, 0xbd6edfca,0x2890,0x482f,0xb2,0x33,0x8d,0x73,0x39,0xa1,0xcf,0x8d);") +cpp_quote("DEFINE_GUID(CLSID_WICGifCommentMetadataReader, 0x32557d3b,0x69dc,0x4f95,0x83,0x6e,0xf5,0x97,0x2b,0x2f,0x61,0x59);") +cpp_quote("DEFINE_GUID(CLSID_WICGifCommentMetadataWriter, 0xa02797fc,0xc4ae,0x418c,0xaf,0x95,0xe6,0x37,0xc7,0xea,0xd2,0xa1);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

Dmitry Timoshkov : windowscodecs: Fix calculation of GIF local color table size from decoder data.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: fd0cbf9ebee253fe0511771fe0be1836c6b1e285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0cbf9ebee253fe0511771fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:07:34 2012 +0900 windowscodecs: Fix calculation of GIF local color table size from decoder data. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4414f36..a814c1a 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -707,7 +707,7 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead /* local_color_table_flag */ IMD_data.packed |= 1 << 7; /* local_color_table_size */ - IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel; + IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel - 1; /* FIXME: sort_flag */ }

1 0

Dmitry Timoshkov : windowscodecs: Test GIF metadata using a specially created GIF image with a bunch of extensions .
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 6881ca771e2858cfb5f098100ab97ed6f41b1d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6881ca771e2858cfb5f098100… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:08:24 2012 +0900 windowscodecs: Test GIF metadata using a specially created GIF image with a bunch of extensions. --- dlls/windowscodecs/tests/metadata.c | 178 +++++++++++++++++++++++++++++++--- 1 files changed, 162 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6881ca771e2858cfb5f09…

1 0

Thomas Faber : msxml3: Do not directly write to resource section.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: c9d389c311b9177ac1838faed9d3935d67c50a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d389c311b9177ac1838faed… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Sep 14 09:03:39 2012 +0200 msxml3: Do not directly write to resource section. --- dlls/msxml3/schema.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2f31016..5d971f9 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -68,7 +68,7 @@ static const xmlChar XDR_schema[] = "Schema"; static const xmlChar XDR_nsURI[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; -static xmlChar const* datatypes_src; +static xmlChar * datatypes_src; static int datatypes_len; static HGLOBAL datatypes_handle; static HRSRC datatypes_rsrc; @@ -728,7 +728,6 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, void schemasInit(void) { - int len; xmlChar* buf; if (!(datatypes_rsrc = FindResourceA(MSXML_hInstance, "DATATYPES", "XML"))) { @@ -742,14 +741,14 @@ void schemasInit(void) return; } buf = LockResource(datatypes_handle); - len = SizeofResource(MSXML_hInstance, datatypes_rsrc) - 1; + datatypes_len = SizeofResource(MSXML_hInstance, datatypes_rsrc); /* Resource is loaded as raw data, * need a null-terminated string */ - while (buf[len] != '>') - buf[len--] = 0; - datatypes_src = buf; - datatypes_len = len + 1; + while (buf[datatypes_len - 1] != '>') datatypes_len--; + datatypes_src = HeapAlloc(GetProcessHeap(), 0, datatypes_len + 1); + memcpy(datatypes_src, buf, datatypes_len); + datatypes_src[datatypes_len] = 0; if (xmlGetExternalEntityLoader() != external_entity_loader) { @@ -761,6 +760,7 @@ void schemasInit(void) void schemasCleanup(void) { xmlSchemaFree(datatypes_schema); + HeapFree(GetProcessHeap(), 0, datatypes_src); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0