wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 1f01355dbaa5ddf23e8e665cf319a7bdd5eaef0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f01355dbaa5ddf23e8e665cf… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jun 29 19:53:40 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1728542..ee51bf1 100644 --- a/po/lt.po +++ b/po/lt.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-20 09:00+0300\n" +"PO-Revision-Date: 2012-06-29 19:51+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -9672,6 +9672,33 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Paleisti programą ar atverti dokumentą programoje, paprastai naudojamoje " +"failams su tuo prievardžiu.\n" +"Naudojimas:\n" +"start [parametrai] programos_failo_vardas [...]\n" +"start [parametrai] dokumento_failo_vardas\n" +"\n" +"Parametrai:\n" +"\"antraštė\" Nustato polangių pavadinimą.\n" +"/d katalogas Paleisti programą nurodytame kataloge.\n" +"/b Nesukurti naujo pulto programai.\n" +"/i Paleisti programą su šviežiais aplinkos kintamaisiais.\n" +"/min Paleisti programą suskleistą.\n" +"/max Paleisti programą išskleistą.\n" +"/low Paleisti programą neveikos prioriteto klasėje.\n" +"/normal Paleisti programą normalioje prioriteto klasėje.\n" +"/high Paleisti programą aukštoje prioriteto klasėje.\n" +"/realtime Paleisti programą tikralaikėje prioriteto klasėje.\n" +"/abovenormal Paleisti programą prioriteto klasėje virš normalios.\n" +"/belownormal Paleisti programą prioriteto klasėje žemiau normalios.\n" +"/node n Paleisti programą nurodytame NUMA mazge.\n" +"/affinity mask Paleisti programą su nurodyta atitikimo kauke.\n" +"/wait Laukti kol paleista programa baigs darbą, tada išeiti su jos " +"išėjimo kodu.\n" +"/unix Naudoti Unix failo vardą ir paleisti failą kaip windows " +"naršyklėje.\n" +"/ProgIDOpen Atverti dokumentą naudojant nurodytą progID.\n" +"/? Parodyti šį pranešimą ir išeiti.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n"

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHScale.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: e3888ec87cd4d2ca359a4145e7b3460953f0fb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3888ec87cd4d2ca359a4145e… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Fri Jun 29 14:57:44 2012 +0800 d3dx9_36: Implementation of D3DXSHScale. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 12 ++++++++++++ dlls/d3dx9_36/tests/math.c | 29 +++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 62 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3888ec87cd4d2ca359a4…

1 0

Dmitry Timoshkov : gdiplus: Add GdipSaveAdd stub.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 91cf72f00fdd77e70b9fa87f84bb39b1e771a5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cf72f00fdd77e70b9fa87f8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 29 18:48:50 2012 +0900 gdiplus: Add GdipSaveAdd stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 01e8dd7..7d6c51f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -471,7 +471,7 @@ 471 stdcall GdipRotatePenTransform(ptr float long) 472 stdcall GdipRotateTextureTransform(ptr float long) 473 stdcall GdipRotateWorldTransform(ptr float long) -474 stub GdipSaveAdd +474 stdcall GdipSaveAdd(ptr ptr) 475 stub GdipSaveAddImage 476 stdcall GdipSaveGraphics(ptr ptr) 477 stdcall GdipSaveImageToFile(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d1affae..fe56377 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3459,6 +3459,15 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, } /***************************************************************************** + * GdipSaveAdd [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipSaveAdd(GpImage *image, GDIPCONST EncoderParameters *params) +{ + FIXME("(%p,%p): stub\n", image, params); + return Ok; +} + +/***************************************************************************** * GdipGetImagePalette [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, INT size)

1 0

Austin English : shell32: Add a stub for SHSetUnreadMailCountW.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: cfa1813e1bd2f08cfa7d6013335e9bc19173cc38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa1813e1bd2f08cfa7d60133… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 28 17:56:13 2012 -0700 shell32: Add a stub for SHSetUnreadMailCountW. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6fcd5e8..dc09187 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -403,6 +403,7 @@ @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHSetLocalizedName(wstr wstr long) +@ stdcall SHSetUnreadMailCountW(wstr long wstr) @ stdcall SHUpdateRecycleBinIcon() @ stdcall SheChangeDirA(str) @ stub SheChangeDirExA diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 97d8e98..5553e55 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1282,14 +1282,29 @@ LRESULT CALLBACK ShellHookProc(DWORD a, DWORD b, DWORD c) return 0; } +/*********************************************************************** + * SHGetLocalizedName (SHELL32.@) + */ HRESULT WINAPI SHGetLocalizedName(LPCWSTR path, LPWSTR module, UINT size, INT *res) { FIXME("%s %p %u %p: stub\n", debugstr_w(path), module, size, res); return E_NOTIMPL; } +/*********************************************************************** + * SetCurrentProcessExplicitAppUserModelID (SHELL32.@) + */ HRESULT WINAPI SetCurrentProcessExplicitAppUserModelID(PCWSTR appid) { FIXME("%s: stub\n", debugstr_w(appid)); return E_NOTIMPL; } + +/*********************************************************************** + * SHSetUnreadMailCountW (SHELL32.@) + */ +HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR executecommand) +{ + FIXME("%s %x %s: stub\n", debugstr_w(mailaddress), count, debugstr_w(executecommand)); + return E_NOTIMPL; +}

1 0

Huw Davies : oleaut32: If the records' guids are equal then the records match.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: befa44246cb7910404118a2b911a50cc690fa6c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befa44246cb7910404118a2b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 29 13:35:09 2012 +0100 oleaut32: If the records' guids are equal then the records match. --- dlls/oleaut32/recinfo.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 54413eb..f6f5653 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -439,11 +439,18 @@ static HRESULT WINAPI IRecordInfoImpl_GetFieldNames(IRecordInfo *iface, ULONG *p return S_OK; } -static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInfo *pRecordInfo) +static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); + GUID guid2; - FIXME("(%p)->(%p) stub\n", This, pRecordInfo); + TRACE( "(%p)->(%p)\n", This, info2 ); + + IRecordInfo_GetGuid( info2, &guid2 ); + if (IsEqualGUID( &This->guid, &guid2 )) return TRUE; + + FIXME( "records have different guids (%s %s) but could still match\n", + debugstr_guid( &This->guid ), debugstr_guid( &guid2 ) ); return FALSE; }

1 0

Hans Leidekker : wbemprox: Add a partial Win32_LogicalDisk class implementation.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 8dcc3b9d5664deefd2a7eecc763b26097f2d27a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcc3b9d5664deefd2a7eecc7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:41:07 2012 +0200 wbemprox: Add a partial Win32_LogicalDisk class implementation. Based on a patch by John Yani. --- dlls/wbemprox/builtin.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1776d23..b564f19 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "d3d10.h" #include "winternl.h" +#include "winioctl.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -42,6 +43,8 @@ static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_logicaldiskW[] = + {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR class_osW[] = @@ -73,6 +76,12 @@ static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; +static const WCHAR prop_drivetypeW[] = + {'D','r','i','v','e','T','y','p','e',0}; +static const WCHAR prop_filesystemW[] = + {'F','i','l','e','S','y','s','t','e','m',0}; +static const WCHAR prop_freespaceW[] = + {'F','r','e','e','S','p','a','c','e',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = @@ -103,6 +112,8 @@ static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_sizeW[] = + {'S','i','z','e',0}; static const WCHAR prop_speedW[] = {'S','p','e','e','d',0}; static const WCHAR prop_systemdirectoryW[] = @@ -129,6 +140,14 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_logicaldisk[] = +{ + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_drivetypeW, CIM_UINT32 }, + { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_freespaceW, CIM_UINT64 }, + { prop_sizeW, CIM_UINT64 } +}; static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -216,6 +235,14 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_logicaldisk +{ + const WCHAR *device_id; + UINT32 drivetype; + const WCHAR *filesystem; + UINT64 freespace; + UINT64 size; +}; struct record_networkadapter { const WCHAR *device_id; @@ -299,6 +326,79 @@ static void fill_compsys( struct table *table ) table->num_rows = 1; } +static WCHAR *get_filesystem( const WCHAR *root ) +{ + static const WCHAR ntfsW[] = {'N','T','F','S',0}; + WCHAR buffer[MAX_PATH + 1]; + + if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) + return heap_strdupW( buffer ); + return heap_strdupW( ntfsW ); +} + +static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) +{ + WCHAR root[] = {'\\','\\','.','\\','A',':',0}; + ULARGE_INTEGER free; + DISK_GEOMETRY_EX info; + HANDLE handle; + + free.QuadPart = 512 * 1024 * 1024; + GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); + + root[4] = dir[0]; + handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + *disksize = info.DiskSize.QuadPart; + CloseHandle( handle ); + } + return free.QuadPart; +} + +static void fill_logicaldisk( struct table *table ) +{ + static const WCHAR fmtW[] = {'%','c',':',0}; + WCHAR device_id[3], root[] = {'A',':','\\',0}; + struct record_logicaldisk *rec; + UINT i, num_rows = 0, offset = 0, count = 4, type; + UINT64 size = 1024 * 1024 * 1024; + DWORD drives = GetLogicalDrives(); + + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) return; + + for (i = 0; i < sizeof(drives); i++) + { + if (drives & (1 << i)) + { + root[0] = 'A' + i; + type = GetDriveTypeW( root ); + if (type != DRIVE_FIXED && type != DRIVE_CDROM && type != DRIVE_REMOVABLE) + continue; + + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) return; + table->data = data; + } + rec = (struct record_logicaldisk *)(table->data + offset); + sprintfW( device_id, fmtW, 'A' + i ); + rec->device_id = heap_strdupW( device_id ); + rec->drivetype = type; + rec->filesystem = get_filesystem( root ); + rec->freespace = get_freespace( root, &size ); + rec->size = size; + offset += sizeof(*rec); + num_rows++; + } + } + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; +} + static UINT16 get_connection_status( IF_OPER_STATUS status ) { switch (status) @@ -534,6 +634,7 @@ static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, + { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process },

1 0

Hans Leidekker : wbemprox: Avoid an exception when tracing the principal name in IClientSecurity:: SetBlanket.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 796dd428c257d8790d39b6a7d0b12c330064bf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796dd428c257d8790d39b6a7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:40:35 2012 +0200 wbemprox: Avoid an exception when tracing the principal name in IClientSecurity::SetBlanket. --- dlls/wbemprox/services.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 2e8a34a..8edd2f6 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -106,8 +106,12 @@ static HRESULT WINAPI client_security_SetBlanket( void *pAuthInfo, DWORD Capabilities ) { + static const OLECHAR defaultW[] = + {'<','C','O','L','E','_','D','E','F','A','U','L','T','_','P','R','I','N','C','I','P','A','L','>',0}; + const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ? defaultW : pServerPrincName; + FIXME("%p, %p, %u, %u, %s, %u, %u, %p, 0x%08x\n", iface, pProxy, AuthnSvc, AuthzSvc, - debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); + debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); return WBEM_NO_ERROR; }

1 0

Hans Leidekker : wbemprox: Return 64-bit property values as strings.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: d2661b802556e073760af5d70869fb55a8d93b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2661b802556e073760af5d70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:40:11 2012 +0200 wbemprox: Return 64-bit property values as strings. --- dlls/wbemprox/query.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0ac5a3e..f54fcc3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -702,12 +702,12 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_UI4( ret ) = val; break; case CIM_SINT64: - V_VT( ret ) = VT_I8; - V_I8( ret ) = val; + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = get_value_bstr( view->table, row, column ); break; case CIM_UINT64: - V_VT( ret ) = VT_UI8; - V_UI8( ret ) = val; + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = get_value_bstr( view->table, row, column ); break; default: ERR("unhandled column type %u\n", view->table->columns[column].type);

1 0

Hans Leidekker : wbemprox: Win32_NetworkAdapter.InterfaceIndex is unsigned.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 2821ae474309353fc1d6fddfcb157b7b49ef4914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2821ae474309353fc1d6fddfc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:39:50 2012 +0200 wbemprox: Win32_NetworkAdapter.InterfaceIndex is unsigned. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 800b034..1776d23 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -132,7 +132,7 @@ static const struct column col_compsys[] = static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_interfaceindexW, CIM_SINT32 }, + { prop_interfaceindexW, CIM_UINT32 }, { prop_netconnectionstatusW, CIM_UINT16 }, { prop_speedW, CIM_UINT64 } };

1 0

Hans Leidekker : wbemprox: Fix returned variant type and flavor for system properties.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: fe79fea731bd31a5e07f6151ff165ac58f64a51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe79fea731bd31a5e07f6151f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:39:34 2012 +0200 wbemprox: Fix returned variant type and flavor for system properties. --- dlls/wbemprox/class.c | 7 +------ dlls/wbemprox/query.c | 18 +++++++++++------- dlls/wbemprox/wbemprox_private.h | 2 +- include/wbemcli.idl | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d60f726..ff729f2 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -290,12 +290,7 @@ static HRESULT WINAPI class_object_Get( TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - if (plFlavor) - { - FIXME("flavor parameter not supported\n"); - *plFlavor = 0; - } - return get_propval( view, co->index, wszName, pVal, pType ); + return get_propval( view, co->index, wszName, pVal, pType, plFlavor ); } static HRESULT WINAPI class_object_Put( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7e5872a..0ac5a3e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -597,7 +597,7 @@ static UINT count_selected_props( const struct view *view ) } static HRESULT get_system_propval( const struct view *view, UINT index, const WCHAR *name, - VARIANT *ret, CIMTYPE *type ) + VARIANT *ret, CIMTYPE *type, LONG *flavor ) { static const WCHAR classW[] = {'_','_','C','L','A','S','S',0}; static const WCHAR genusW[] = {'_','_','G','E','N','U','S',0}; @@ -607,6 +607,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC static const WCHAR relpathW[] = {'_','_','R','E','L','P','A','T','H',0}; static const WCHAR serverW[] = {'_','_','S','E','R','V','E','R',0}; + if (flavor) *flavor = WBEM_FLAVOR_ORIGIN_SYSTEM; + if (!strcmpiW( name, classW )) { V_VT( ret ) = VT_BSTR; @@ -616,8 +618,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC } if (!strcmpiW( name, genusW )) { - V_VT( ret ) = VT_INT; - V_INT( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ + V_VT( ret ) = VT_I4; + V_I4( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ if (type) *type = CIM_SINT32; return S_OK; } @@ -637,8 +639,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC } if (!strcmpiW( name, propcountW )) { - V_VT( ret ) = VT_INT; - V_INT( ret ) = count_selected_props( view ); + V_VT( ret ) = VT_I4; + V_I4( ret ) = count_selected_props( view ); if (type) *type = CIM_SINT32; return S_OK; } @@ -660,13 +662,14 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC return WBEM_E_NOT_FOUND; } -HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type ) +HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, + CIMTYPE *type, LONG *flavor ) { HRESULT hr; UINT column, row = view->result[index]; LONGLONG val; - if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); + if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); @@ -711,6 +714,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR return WBEM_E_FAILED; } if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; + if (flavor) *flavor = 0; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index e2ffce1..437da28 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -120,7 +120,7 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * void destroy_view( struct view * ) DECLSPEC_HIDDEN; struct table *get_table( const WCHAR * ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, - CIMTYPE * ) DECLSPEC_HIDDEN; + CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 1cd76eb..c76d465 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -201,6 +201,24 @@ typedef [v1_enum] enum tag_WBEM_CONDITION_FLAG_TYPE WBEM_MASK_CLASS_CONDITION = 0x300 } WBEM_CONDITION_FLAG_TYPE; +typedef [v1_enum] enum tag_WBEM_FLAVOR_TYPE +{ + WBEM_FLAVOR_DONT_PROPAGATE = 0, + WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE = 0x1, + WBEM_FLAVOR_FLAG_PROPAGATE_TO_DERIVED_CLASS = 0x2, + WBEM_FLAVOR_MASK_PROPAGATION = 0xf, + WBEM_FLAVOR_OVERRIDABLE = 0, + WBEM_FLAVOR_NOT_OVERRIDABLE = 0x10, + WBEM_FLAVOR_MASK_PERMISSIONS = 0x10, + WBEM_FLAVOR_ORIGIN_LOCAL = 0, + WBEM_FLAVOR_ORIGIN_PROPAGATED = 0x20, + WBEM_FLAVOR_ORIGIN_SYSTEM = 0x40, + WBEM_FLAVOR_MASK_ORIGIN = 0x60, + WBEM_FLAVOR_NOT_AMENDED = 0, + WBEM_FLAVOR_AMENDED = 0x80, + WBEM_FLAVOR_MASK_AMENDED = 0x80 +} WBEM_FLAVOR_TYPE; + typedef [v1_enum] enum tag_WBEM_GENUS_TYPE { WBEM_GENUS_CLASS = 1,

1 0

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 June 2012