[akhaldi] 71734: [WBEMPROX] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:06:47 2016
New Revision: 71734

URL: http://svn.reactos.org/svn/reactos?rev=71734&view=rev
Log:
[WBEMPROX] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/reactos/dll/win32/wbemprox/builtin.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wbemprox/builtin.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin....
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] Sat Jul  2 13:06:47 2016
@@ -220,6 +220,8 @@
     {'L','o','c','a','l','D','a','t','e','T','i','m','e',0};
 static const WCHAR prop_localeW[] =
     {'L','o','c','a','l','e',0};
+static const WCHAR prop_locationW[] =
+    {'L','o','c','a','t','i','o','n',0};
 static const WCHAR prop_lockpresentW[] =
     {'L','o','c','k','P','r','e','s','e','n','t',0};
 static const WCHAR prop_macaddressW[] =
@@ -262,6 +264,8 @@
     {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0};
 static const WCHAR prop_pnpdeviceidW[] =
     {'P','N','P','D','e','v','i','c','e','I','D',0};
+static const WCHAR prop_portnameW[] =
+    {'P','o','r','t','N','a','m','e',0};
 static const WCHAR prop_pprocessidW[] =
     {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0};
 static const WCHAR prop_primaryW[] =
@@ -526,7 +530,10 @@
     { prop_horizontalresolutionW, CIM_UINT32 },
     { prop_localW,                CIM_BOOLEAN },
     { prop_nameW,                 CIM_STRING|COL_FLAG_DYNAMIC },
-    { prop_networkW,              CIM_BOOLEAN }
+    { prop_networkW,              CIM_BOOLEAN },
+    { prop_deviceidW,             CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY },
+    { prop_portnameW,             CIM_STRING|COL_FLAG_DYNAMIC },
+    { prop_locationW,             CIM_STRING|COL_FLAG_DYNAMIC },
 };
 static const struct column col_process[] =
 {
@@ -923,6 +930,9 @@
     int          local;
     const WCHAR *name;
     int          network;
+    const WCHAR *device_id;
+    const WCHAR *portname;
+    const WCHAR *location;
 };
 struct record_process
 {
@@ -2268,10 +2278,12 @@

static enum fill_status fill_printer( struct table *table, const struct expr *cond )
 {
+    static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0};
     struct record_printer *rec;
     enum fill_status status = FILL_STATUS_UNFILTERED;
     PRINTER_INFO_2W *info;
     DWORD i, offset = 0, count = 0, size = 0;
+    WCHAR id[20];

EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count );
     if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED;
@@ -2297,6 +2309,10 @@
         rec->local                = -1;
         rec->name                 = heap_strdupW( info[i].pPrinterName );
         rec->network              = 0;
+        sprintfW( id, fmtW, i );
+        rec->device_id            = heap_strdupW( id );
+        rec->portname             = heap_strdupW( info[i].pPortName );
+        rec->location             = heap_strdupW( info[i].pLocation );
         if (!match_row( table, i, cond, &status ))
         {
             free_row_values( table, i );

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jul  2 13:06:47 2016
@@ -199,7 +199,7 @@
 reactos/dll/win32/version             # Synced to WineStaging-1.9.11
 reactos/dll/win32/vssapi              # Synced to WineStaging-1.9.4
 reactos/dll/win32/wbemdisp            # Synced to WineStaging-1.9.4
-reactos/dll/win32/wbemprox            # Synced to WineStaging-1.9.4
+reactos/dll/win32/wbemprox            # Synced to WineStaging-1.9.11
 reactos/dll/win32/windowscodecs       # Synced to WineStaging-1.9.4
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-1.9.4
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-1.9.4