June 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt/tests: Fix Portuguese locale test on NT4.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 7ac3c8700c677e700a8079a49cc1a8606a09912d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac3c8700c677e700a8079a49… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 11:35:31 2012 +0200 msvcrt/tests: Fix Portuguese locale test on NT4. --- dlls/msvcrt/tests/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 638a3d2..225cbb9 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -475,7 +475,8 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "portuguese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Portuguese_Brazil.1252"), "ret = %s\n", ret); + ok(!strcmp(ret, "Portuguese_Brazil.1252") + || broken(!strcmp(ret, "Portuguese_Portugal.1252")) /* NT4 */, "ret = %s\n", ret); ret = setlocale(LC_ALL, "portuguese-brazil"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 82efcba58e82a4afb68786a7152275e8898d921a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82efcba58e82a4afb68786a71… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jun 14 00:55:47 2012 +0200 po: Update German translation. --- po/de.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/de.po b/po/de.po index 5db2648..4859bee 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 01:03+0200\n" +"PO-Revision-Date: 2012-06-13 22:52+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3435,11 +3435,11 @@ msgstr "Joysticks" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "&Ausschalten" +msgstr "&Deaktivieren" #: joy.rc:37 msgid "&Enable" -msgstr "&Einschalten" +msgstr "&Aktivieren" #: joy.rc:38 msgid "Connected" @@ -3447,7 +3447,7 @@ msgstr "Verbunden" #: joy.rc:40 msgid "Disabled" -msgstr "Ausgeschaltet" +msgstr "Deaktiviert" #: joy.rc:46 msgid "Test Joystick" @@ -3455,19 +3455,19 @@ msgstr "Joystick testen" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Tasten" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" @@ -3475,7 +3475,7 @@ msgstr "Force Feedback testen" #: joy.rc:28 msgid "Game Controllers" -msgstr "Spielsteuerungsgeräte" +msgstr "Gamecontroller" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 3b89ffa2ae5158b165b69bd8b2968a40ebbd6a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b89ffa2ae5158b165b69bd8b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Jun 14 15:56:50 2012 +0200 po: Update Polish translation. --- po/pl.po | 95 +++++++++++++------------------------------------------------- 1 files changed, 20 insertions(+), 75 deletions(-) diff --git a/po/pl.po b/po/pl.po index 4783d7e..abbb6f9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-31 07:45+0200\n" +"PO-Revision-Date: 2012-06-14 15:46+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -163,21 +163,10 @@ msgid "Cancel" msgstr "Anuluj" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Instalator Wine Gecko" +msgstr "Instalator Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -186,12 +175,11 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Nie znaleziono paczki Gecko potrzebnej do prawidłowego działania aplikacji " -"zawierających kod HTML. Wine może automatycznie pobrać i zainstalować tą " -"paczkę dla ciebie.\n" +"Nie znaleziono paczki Mono potrzebnej do prawidłowego działania aplikacji ." +"NET. Wine może automatycznie pobrać i zainstalować tą paczkę dla ciebie.\n" "\n" "Uwaga: Lepiej jednak użyć paczki z twojej dystrybucji. Po szczegóły zajrzyj " -"na <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " +"na <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Mono</a> " "po szczegóły." #: appwiz.rc:28 @@ -3456,59 +3444,51 @@ msgstr "Najwyższy" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Joysticki" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "&Wyłącz bibliotekę" +msgstr "Wyłą&cz " #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&Udostępnij" +msgstr "&Włącz" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Rozłączono" +msgstr "Podłączony" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Wyłącz bibliotekę" +msgstr "Wyłączony" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testuj Joystick" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Przyciski" #: joy.rc:51 msgid "X,Y" -msgstr "" +msgstr "X,Y" #: joy.rc:52 msgid "Rx,Ry" -msgstr "" +msgstr "Rx,Ry" #: joy.rc:53 msgid "Z, Rz" -msgstr "" +msgstr "Z, Rz" #: joy.rc:58 msgid "Test Force Feedback" -msgstr "" +msgstr "Testuj odczucie siły zwrotnej" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Utwórz kontrolkę" +msgstr "Kontrolery gier" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -3639,16 +3619,12 @@ msgid "URI to be decoded is incorrect" msgstr "URI do dekodowania jest niepoprawny" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Wartość typu wyliczeniowego poza zakresem.\n" +msgstr "Ilość cyfr znaczących jest poza zakresem" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indeks dolny poza zakresem" +msgstr "Precyzja jest poza poza zakresem" #: jscript.rc:59 msgid "Array length must be a finite positive integer" @@ -6753,37 +6729,6 @@ msgid "insert disk %s" msgstr "włóż dysk '%s'" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6815,7 +6760,7 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" +"Instalator Windows %s\n" "\n" "Użycie:\n" "polecenie msiexec {wymagany parametr} [opcjonalny parametr]\n"

1 0

Dmitry Timoshkov : windowscodecs: Add a test to show that metadata reader may not rewind the stream after loading the data .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 17a64c4450f4fdb24279278894b1922cdba727af URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a64c4450f4fdb2427927889… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:30:46 2012 +0900 windowscodecs: Add a test to show that metadata reader may not rewind the stream after loading the data. --- dlls/windowscodecs/tests/metadata.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index a4f9ad1..6b25963 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -142,6 +142,8 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) HRESULT hr; IWICPersistStream *persist; IStream *stream; + LARGE_INTEGER pos; + ULARGE_INTEGER cur_pos; stream = create_stream(data, data_size); if (!stream) @@ -158,6 +160,13 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) IWICPersistStream_Release(persist); } + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + /* IFD metadata reader doesn't rewind the stream to the start */ + ok(cur_pos.QuadPart == 0 || cur_pos.QuadPart <= data_size, + "current stream pos is at %x/%x, data size %x\n", cur_pos.u.LowPart, cur_pos.u.HighPart, data_size); + IStream_Release(stream); }

1 0

Dmitry Timoshkov : windowscodecs: Implement partial loading of IFD metadata .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ec43788803648ad689274cb44be5c9434d5f7322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec43788803648ad689274cb44… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:30:54 2012 +0900 windowscodecs: Implement partial loading of IFD metadata. --- dlls/windowscodecs/metadatahandler.c | 127 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 1 - 2 files changed, 124 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index a4dc174..20785b4 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -598,13 +599,133 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } +#include "pshpack2.h" +struct IFD_entry +{ + SHORT id; + SHORT type; + ULONG length; + LONG value; +}; + +struct IFD_rational +{ + LONG numerator; + LONG denominator; +}; +#include "poppack.h" + +#define IFD_BYTE 1 +#define IFD_ASCII 2 +#define IFD_SHORT 3 +#define IFD_LONG 4 +#define IFD_RATIONAL 5 +#define IFD_SBYTE 6 +#define IFD_UNDEFINED 7 +#define IFD_SSHORT 8 +#define IFD_SLONG 9 +#define IFD_SRATIONAL 10 +#define IFD_FLOAT 11 +#define IFD_DOUBLE 12 +#define IFD_IFD 13 + +static HRESULT load_IFD_entry(IStream *input, struct IFD_entry *entry, MetadataItem *item) +{ + item->schema.vt = VT_EMPTY; + item->id.vt = VT_UI2; + item->id.u.uiVal = entry->id; + + switch (entry->type) + { + case IFD_SHORT: + if (entry->length == 1) + { + item->value.vt = VT_UI2; + item->value.u.uiVal = entry->value; + break; + } + FIXME("loading multiple short fields is not implemented\n"); + break; + case IFD_LONG: + if (entry->length == 1) + { + item->value.vt = VT_UI4; + item->value.u.ulVal = entry->value; + break; + } + FIXME("loading multiple long fields is not implemented\n"); + break; + case IFD_RATIONAL: + if (entry->length == 1) + { + HRESULT hr; + LARGE_INTEGER pos; + struct IFD_rational rational; + + pos.QuadPart = entry->value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + item->value.vt = VT_UI8; + hr = IStream_Read(input, &rational , sizeof(rational), NULL); + if (FAILED(hr)) return hr; + item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; + break; + } + FIXME("loading multiple rational fields is not implemented\n"); + break; + default: + FIXME("loading field of type %d is not implemented\n", entry->type); + break; + } + return S_OK; +} + static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, DWORD persist_options, MetadataItem **items, DWORD *item_count) { - FIXME("stub\n"); + HRESULT hr; + MetadataItem *result; + USHORT count, i; + struct IFD_entry *entry; + + TRACE("\n"); + + hr = IStream_Read(input, &count, sizeof(count), NULL); + if (FAILED(hr)) return hr; + + entry = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - *items = NULL; - *item_count = 0; + hr = IStream_Read(input, entry, count * sizeof(*entry), NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, entry); + return hr; + } + + result = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*result)); + if (!result) + { + HeapFree(GetProcessHeap(), 0, entry); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; i++) + { + hr = load_IFD_entry(input, &entry[i], &result[i]); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, entry); + HeapFree(GetProcessHeap(), 0, result); + return hr; + } + } + + HeapFree(GetProcessHeap(), 0, entry); + + *items = result; + *item_count = count; return S_OK; } diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 6b25963..cf00f1f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -386,7 +386,6 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); -todo_wine ok(count == 6, "unexpected count %u\n", count); hr = IWICMetadataReader_GetEnumerator(reader, NULL);

1 0

Dmitry Timoshkov : windowscodecs: Add support for WICPersistOptionsLittleEndian/ WICPersistOptionsBigEndian in the IFD metadata reader.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 5f22fdb86fc6b79a09a35384fa177eb1209a41e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f22fdb86fc6b79a09a35384f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 13 18:31:02 2012 +0900 windowscodecs: Add support for WICPersistOptionsLittleEndian/WICPersistOptionsBigEndian in the IFD metadata reader. --- dlls/windowscodecs/metadatahandler.c | 51 ++++++++++++++++++++++++++------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 20785b4..d2eb8b3 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -1,5 +1,6 @@ /* * Copyright 2012 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "objbase.h" #include "wincodec.h" #include "wincodecsdk.h" @@ -599,12 +601,16 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo return MetadataReader_Create(&UnknownMetadataReader_Vtbl, pUnkOuter, iid, ppv); } +#define SWAP_USHORT(x) do { if (!native_byte_order) (x) = RtlUshortByteSwap(x); } while(0) +#define SWAP_ULONG(x) do { if (!native_byte_order) (x) = RtlUlongByteSwap(x); } while(0) +#define SWAP_ULONGLONG(x) do { if (!native_byte_order) (x) = RtlUlonglongByteSwap(x); } while(0) + #include "pshpack2.h" struct IFD_entry { SHORT id; SHORT type; - ULONG length; + ULONG count; LONG value; }; @@ -629,47 +635,60 @@ struct IFD_rational #define IFD_DOUBLE 12 #define IFD_IFD 13 -static HRESULT load_IFD_entry(IStream *input, struct IFD_entry *entry, MetadataItem *item) +static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, + MetadataItem *item, BOOL native_byte_order) { + ULONG count, value; + SHORT type; + item->schema.vt = VT_EMPTY; item->id.vt = VT_UI2; item->id.u.uiVal = entry->id; + SWAP_USHORT(item->id.u.uiVal); - switch (entry->type) + count = entry->count; + SWAP_ULONG(count); + type = entry->type; + SWAP_USHORT(type); + value = entry->value; + SWAP_ULONG(value); + + switch (type) { case IFD_SHORT: - if (entry->length == 1) + if (count == 1) { item->value.vt = VT_UI2; - item->value.u.uiVal = entry->value; + item->value.u.uiVal = value; break; } FIXME("loading multiple short fields is not implemented\n"); break; case IFD_LONG: - if (entry->length == 1) + if (count == 1) { item->value.vt = VT_UI4; - item->value.u.ulVal = entry->value; + item->value.u.ulVal = value; break; } FIXME("loading multiple long fields is not implemented\n"); break; case IFD_RATIONAL: - if (entry->length == 1) + if (count == 1) { HRESULT hr; LARGE_INTEGER pos; struct IFD_rational rational; - pos.QuadPart = entry->value; + pos.QuadPart = value; hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; item->value.vt = VT_UI8; - hr = IStream_Read(input, &rational , sizeof(rational), NULL); + hr = IStream_Read(input, &rational, sizeof(rational), NULL); if (FAILED(hr)) return hr; item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; + SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); break; } FIXME("loading multiple rational fields is not implemented\n"); @@ -688,12 +707,22 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, MetadataItem *result; USHORT count, i; struct IFD_entry *entry; + BOOL native_byte_order = TRUE; TRACE("\n"); +#ifdef WORDS_BIGENDIAN + if (persist_options & WICPersistOptionsLittleEndian) +#else + if (persist_options & WICPersistOptionsBigEndian) +#endif + native_byte_order = FALSE; + hr = IStream_Read(input, &count, sizeof(count), NULL); if (FAILED(hr)) return hr; + SWAP_USHORT(count); + entry = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*entry)); if (!entry) return E_OUTOFMEMORY; @@ -713,7 +742,7 @@ static HRESULT LoadIfdMetadata(IStream *input, const GUID *preferred_vendor, for (i = 0; i < count; i++) { - hr = load_IFD_entry(input, &entry[i], &result[i]); + hr = load_IFD_entry(input, &entry[i], &result[i], native_byte_order); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, entry);

1 0

Jacek Caban : guiddef.h: REF* types should not depend on CINTERFACE.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 4626db2bb2a61cdceb00e0e346628062ee51aade URL: http://source.winehq.org/git/wine.git/?a=commit;h=4626db2bb2a61cdceb00e0e34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 14 14:10:59 2012 +0200 guiddef.h: REF* types should not depend on CINTERFACE. --- include/guiddef.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index b70175e..26b1ad7 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -113,7 +113,7 @@ typedef GUID FMTID,*LPFMTID; #endif /* ndef __IID_DEFINED__ */ -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #define REFGUID const GUID & #define REFCLSID const CLSID & #define REFIID const IID &

1 0

Hans Leidekker : include: Define WBEM_GENERIC_FLAG_TYPE.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 7a16382cffbd573ec9b0cca862f327adadfd5013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a16382cffbd573ec9b0cca86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 14 16:02:20 2012 +0200 include: Define WBEM_GENERIC_FLAG_TYPE. --- include/wbemcli.idl | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index db6a5ac..ffd2b11 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -214,6 +214,24 @@ interface IWbemStatusCodeText : IUnknown [out] BSTR *MessageText); }; +typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE +{ + WBEM_FLAG_RETURN_WBEM_COMPLETE = 0, + WBEM_FLAG_BIDIRECTIONAL = 0, + WBEM_FLAG_RETURN_ERROR_OBJECT = 0, + WBEM_FLAG_DONT_SEND_STATUS = 0, + WBEM_FLAG_SEND_ONLY_SELECTED = 0, + WBEM_FLAG_RETURN_IMMEDIATELY = 0x10, + WBEM_FLAG_FORWARD_ONLY = 0x20, + WBEM_FLAG_NO_ERROR_OBJECT = 0x40, + WBEM_FLAG_SEND_STATUS = 0x80, + WBEM_FLAG_ENSURE_LOCATABLE = 0x100, + WBEM_FLAG_DIRECT_READ = 0x200, + WBEM_MASK_RESERVED_FLAGS = 0x1f000, + WBEM_FLAG_USE_AMENDED_QUALIFIERS = 0x20000, + WBEM_FLAG_STRONG_VALIDATION = 0x100000 +} WBEM_GENERIC_FLAG_TYPE; + [ object, restricted,

1 0

Hans Leidekker : wbemprox: Add a stub implementation of IWbemServices.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: f817cd7ace13e5d3bd97bc686d22c07069751177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f817cd7ace13e5d3bd97bc686… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 14 16:02:38 2012 +0200 wbemprox: Add a stub implementation of IWbemServices. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/services.c | 500 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemlocator.c | 14 +- dlls/wbemprox/wbemprox_private.h | 1 + 4 files changed, 515 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f817cd7ace13e5d3bd97b…

1 0

Hans Leidekker : include: Define IWbemClassObject.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: de2ee1b39c1bf593ead3aa71d58b68145476ba60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2ee1b39c1bf593ead3aa71d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 14 16:03:07 2012 +0200 include: Define IWbemClassObject. --- include/wbemcli.idl | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 143 insertions(+), 0 deletions(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index ffd2b11..a339ab5 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -19,6 +19,7 @@ cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3A,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") cpp_quote("DEFINE_GUID(CLSID_WbemStatusCode, 0xeb87e1bd,0x3233,0x11d2,0xae,0xc9,0x00,0xc0,0x4f,0xb6,0x88,0x20);") +import "oaidl.idl"; import "objidl.idl"; interface IWbemContext; @@ -28,6 +29,7 @@ interface IWbemCallResult; interface IWbemObjectSink; interface IWbemClassObject; interface IEnumWbemClassObject; +interface IWbemQualifierSet; typedef [v1_enum] enum tag_WBEMSTATUS { @@ -174,6 +176,37 @@ typedef [v1_enum] enum tag_WBEMSTATUS WBEM_E_PROVIDER_DISABLED = 0x8004108a } WBEMSTATUS; +typedef [v1_enum] enum tag_WBEM_TIMEOUT_TYPE +{ + WBEM_NO_WAIT = 0, + WBEM_INFINITE = 0xffffffff +} WBEM_TIMEOUT_TYPE; + +typedef [v1_enum] enum tag_CIMTYPE_ENUMERATION +{ + CIM_ILLEGAL = 0xfff, + CIM_EMPTY = 0, + CIM_SINT16 = 2, + CIM_SINT32 = 3, + CIM_REAL32 = 4, + CIM_REAL64 = 5, + CIM_STRING = 8, + CIM_BOOLEAN = 11, + CIM_OBJECT = 13, + CIM_SINT8 = 16, + CIM_UINT8 = 17, + CIM_UINT16 = 18, + CIM_UINT32 = 19, + CIM_SINT64 = 20, + CIM_UINT64 = 21, + CIM_DATETIME = 101, + CIM_REFERENCE = 102, + CIM_CHAR16 = 103, + CIM_FLAG_ARRAY = 0x2000 +} CIMTYPE_ENUMERATION; + +typedef long CIMTYPE; + [ object, restricted, @@ -411,3 +444,113 @@ interface IEnumWbemClassObject : IUnknown [in] long lTimeout, [in] ULONG nCount); }; + +[ + object, + restricted, + local, + uuid(dc12a681-737f-11cf-884d-00aa004b2e24) +] +interface IWbemClassObject : IUnknown +{ + HRESULT GetQualifierSet( + [out] IWbemQualifierSet **ppQualSet); + + HRESULT Get( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pVal, + [out] CIMTYPE *pType, + [out] long *plFlavor); + + HRESULT Put( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [in] VARIANT *pVal, + [in] CIMTYPE Type); + + HRESULT Delete( + [in,string] LPCWSTR wszName); + + HRESULT GetNames( + [in,string] LPCWSTR wszQualifierName, + [in] long lFlags, + [in] VARIANT *pQualifierVal, + [out] SAFEARRAY *pNames); + + HRESULT BeginEnumeration( + [in] long lEnumFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *strName, + [out] VARIANT *pVal, + [out] CIMTYPE *pType, + [out] long *plFlavor); + + HRESULT EndEnumeration(); + + HRESULT GetPropertyQualifierSet( + [in,string] LPCWSTR wszProperty, + [out] IWbemQualifierSet **ppQualSet); + + HRESULT Clone( + [out] IWbemClassObject **ppCopy); + + HRESULT GetObjectText( + [in] long lFlags, + [out] BSTR *pstrObjectText); + + HRESULT SpawnDerivedClass( + [in] long lFlags, + [out] IWbemClassObject **ppNewClass); + + HRESULT SpawnInstance( + [in] long lFlags, + [out] IWbemClassObject **ppNewInstance); + + HRESULT CompareTo( + [in] long lFlags, + [in] IWbemClassObject *pCompareTo); + + HRESULT GetPropertyOrigin( + [in,string] LPCWSTR wszName, + [out] BSTR *pstrClassName); + + HRESULT InheritsFrom( + [in] LPCWSTR strAncestor); + + HRESULT GetMethod( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [out] IWbemClassObject **ppInSignature, + [out] IWbemClassObject **ppOutSignature); + + HRESULT PutMethod( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [in] IWbemClassObject *pInSignature, + [in] IWbemClassObject *pOutSignature); + + HRESULT DeleteMethod( + [in,string] LPCWSTR wszName); + + HRESULT BeginMethodEnumeration( + [in] long lEnumFlags); + + HRESULT NextMethod( + [in] long lFlags, + [out] BSTR *pstrName, + [out] IWbemClassObject **ppInSignature, + [out] IWbemClassObject **ppOutSignature); + + HRESULT EndMethodEnumeration(); + + HRESULT GetMethodQualifierSet( + [in,string] LPCWSTR wszMethod, + [out] IWbemQualifierSet **ppQualSet); + + HRESULT GetMethodOrigin( + [in,string] LPCWSTR wszMethodName, + [out] BSTR *pstrClassName); +}

1 0