October 2016 - Wine-commits

Huw Davies : winemac: Update the keyboard layout data immediately after changing the input source.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: c3dbe443474f305a474b298fa28280965be0e3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dbe443474f305a474b298fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 24 10:15:18 2016 +0100 winemac: Update the keyboard layout data immediately after changing the input source. It would eventually get updated by the keyboard changed event, but only after the message queue was pumped. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 3 ++- dlls/winemac.drv/keyboard.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index dced704..0eaea57 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2426,7 +2426,8 @@ void macdrv_get_input_source_info(CFDataRef* uchr, CGEventSourceKeyboardType* ke *keyboard_type = [WineApplicationController sharedController].keyboardType; *is_iso = (KBGetLayoutType(*keyboard_type) == kKeyboardISO); - *input_source = TISCopyCurrentKeyboardInputSource(); + if (input_source) + *input_source = TISCopyCurrentKeyboardInputSource(); } }); } diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 6680e6b..3e0ebbf 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1186,7 +1186,15 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) if (macdrv_select_input_source(layout->input_source)) { oldHkl = thread_data->active_keyboard_layout; + if (thread_data->keyboard_layout_uchr) + CFRelease(thread_data->keyboard_layout_uchr); + + macdrv_get_input_source_info(&thread_data->keyboard_layout_uchr, &thread_data->keyboard_type, + &thread_data->iso_keyboard, NULL); thread_data->active_keyboard_layout = hkl; + thread_data->dead_key_state = 0; + + macdrv_compute_keyboard_layout(thread_data); } break; }

1 0

Huw Davies : ntdll: Zero-init the buffer for non-linux versions of SystemProcessorPerformanceInformation.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 47303892ac4dcbfd2270a3bb09046b72fde8f9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47303892ac4dcbfd2270a3bb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 24 14:11:55 2016 +0100 ntdll: Zero-init the buffer for non-linux versions of SystemProcessorPerformanceInformation. This ensures that the unused fields are set to zero, which matches the linux version. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 46393a4..e0f6df0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2062,7 +2062,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( int i; cpus = min(cpus,out_cpus); len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), 0,len); + sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); for (i = 0; i < cpus; i++) { sppi[i].IdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; @@ -2118,7 +2118,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); + sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); /* many programs expect these values to change so fake change */ for (n = 0; n < cpus; n++)

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 51ec5c667e2b90036cefd9bdc6b367104e47e04d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ec5c667e2b90036cefd9bdc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 24 22:57:47 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/uk.po b/po/uk.po index a1524c3..f0ed7a8 100644 --- a/po/uk.po +++ b/po/uk.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: 2016-07-16 20:50+0200\n" +"PO-Revision-Date: 2016-10-24 22:55+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -4562,11 +4562,11 @@ msgstr "" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" -msgstr "Ключ реєстру має підключі.\n" +msgstr "Ключ реєстру має підрозділи.\n" #: winerror.mc:1121 msgid "Subkey must be volatile.\n" -msgstr "" +msgstr "Підрозділ має бути непостійним.\n" #: winerror.mc:1126 msgid "Notify change request in progress.\n" @@ -14668,36 +14668,32 @@ msgid "F&ormat" msgstr "Фор&мат" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Список" +msgstr "&Списки" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "&Маркери" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "Номер CRL" +msgstr "Числа" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Літери - малі" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Літери - великі" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Римські цифри - малі" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Римські цифри - великі" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Carlo Bramini : msi: Remove useless code.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: b56899238364454883e33b143db5fc279bbf6227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56899238364454883e33b143… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Oct 22 11:30:35 2016 +0200 msi: Remove useless code. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 32e5a63..34f8d04 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -559,7 +559,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) { LPWSTR postlude, keys, ptr; - DWORD size, key_size, i; + DWORD size, i; static const WCHAR key_fmt[] = {'`','%','s','`',',',' ',0}; static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','%','s',')',0}; @@ -573,9 +573,7 @@ static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) for (i = 0, ptr = keys; i < num_keys; i++) { - key_size = lstrlenW(key_fmt) + lstrlenW(primary_keys[i]) -2; - sprintfW(ptr, key_fmt, primary_keys[i]); - ptr += key_size; + ptr += sprintfW(ptr, key_fmt, primary_keys[i]); } /* remove final ', ' */

1 0

Hans Leidekker : advapi32: Avoid printing control characters in traces.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 8cc98a082f3649409a5f7854ab331951098f7ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc98a082f3649409a5f7854a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:16 2016 +0200 advapi32: Avoid printing control characters in traces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 893f6e5..e97ddc7 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -230,7 +230,7 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi UCHAR level, ULONGLONG anykeyword, ULONGLONG allkeyword, ULONG enableprop, PEVENT_FILTER_DESCRIPTOR filterdesc ) { - FIXME("(%s, %s, %s, %d, %c, %s, %s, %d, %p): stub\n", debugstr_guid(provider), + FIXME("(%s, %s, %s, %u, %u, %s, %s, %u, %p): stub\n", debugstr_guid(provider), debugstr_guid(source), wine_dbgstr_longlong(hSession), enable, level, wine_dbgstr_longlong(anykeyword), wine_dbgstr_longlong(allkeyword), enableprop, filterdesc); @@ -245,7 +245,7 @@ ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, LPCGUID provider, ULONG control ULONGLONG match_any, ULONGLONG match_all, ULONG timeout, PENABLE_TRACE_PARAMETERS params ) { - FIXME("(%s, %s, %u, %c, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle), + FIXME("(%s, %s, %u, %u, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle), debugstr_guid(provider), control, level, wine_dbgstr_longlong(match_any), wine_dbgstr_longlong(match_all), timeout, params);

1 0

Hans Leidekker : davclnt: Return a fake handle from DavRegisterAuthCallback.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 3e9a3f8779dca4f6273438eb5f228a77f8a3742b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9a3f8779dca4f6273438eb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:17 2016 +0200 davclnt: Return a fake handle from DavRegisterAuthCallback. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index ac38697..8e0bf84 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -50,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG version) { FIXME("%p, %u\n", cb, version); - return 0; + return 0xdeadbeef; } /*********************************************************************** @@ -58,5 +58,5 @@ OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG versio */ VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE handle) { - FIXME("%u\n", handle); + FIXME("%08x\n", handle); }

1 0

Hans Leidekker : include: Avoid redefinition of PEVENT_FILTER_DESCRIPTOR.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 0bf8feb6fb6cb6e6c7360f39400f46ef119c2b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf8feb6fb6cb6e6c7360f394… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:18 2016 +0200 include: Avoid redefinition of PEVENT_FILTER_DESCRIPTOR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/evntrace.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/include/evntrace.h b/include/evntrace.h index b54cd11..bb1ce03 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,16 +248,14 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; -typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR; - typedef struct _ENABLE_TRACE_PARAMETERS { - ULONG Version; - ULONG EnableProperty; - ULONG ControlFlags; - GUID SourceId; - PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; - ULONG FilterDescCount; + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; + struct _EVENT_FILTER_DESCRIPTOR *EnableFilterDesc; + ULONG FilterDescCount; } ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0)

1 0

Hans Leidekker : netapi32: Implement DavGetUNCFromHTTPPath.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 199b0bf84eb8f4cc8ab2bc44f8e40f0b42d48575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199b0bf84eb8f4cc8ab2bc44f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:19 2016 +0200 netapi32: Implement DavGetUNCFromHTTPPath. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 85 ++++++++++++++++++++++++ dlls/netapi32/netapi32.spec | 1 + dlls/netapi32/tests/access.c | 153 +++++++++++++++++++++++++++++++++++++++++++ include/davclnt.h | 1 + 4 files changed, 240 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=199b0bf84eb8f4cc8ab2b…

1 0

Hans Leidekker : wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: c8598a7309ae0c6bebdb5fcaa96c8142b8687340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8598a7309ae0c6bebdb5fcaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:20 2016 +0200 wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f411898..e6dc995 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DUSE_WS_PREFIX MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b344a12..c8c2f4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e int physical; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2111,11 +2111,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) { const SOCKET_ADDRESS *sa = &addr->Address; - WCHAR buf[NI_MAXHOST]; + WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, - 0, NI_NAMEREQD )) return NULL; + 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) @@ -2203,11 +2203,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); + ret = GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) + if (GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED;

1 0

Hans Leidekker : wbemprox: Return the hardware UUID for Win32_ComputerSystemProduct.UUID on macOS.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 96c46b1ca7a0718c8b1796770593c4ad9cb3e850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c46b1ca7a0718c8b1796770… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 24 10:04:21 2016 +0200 wbemprox: Return the hardware UUID for Win32_ComputerSystemProduct.UUID on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 51 +++++++++++++++++++++++++++++++++++++++------ dlls/wbemprox/tests/query.c | 40 +++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c8c2f4c..ee47cc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -22,6 +22,9 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -414,7 +417,7 @@ static const struct column col_compsys[] = static const struct column col_compsysproduct[] = { { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, - { prop_uuidW, CIM_STRING } + { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_datafile[] = { @@ -1055,10 +1058,6 @@ static const struct record_bios data_bios[] = { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; -static const struct record_computersystemproduct data_compsysproduct[] = -{ - { compsysproduct_identifyingnumberW, compsysproduct_uuidW } -}; static const struct record_param data_param[] = { { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1321,6 +1320,46 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } +static WCHAR *get_compsysproduct_uuid(void) +{ +#ifdef __APPLE__ + unsigned char uuid[16]; + const struct timespec timeout = {1, 0}; + if (!gethostuuid( uuid, &timeout )) + { + static const WCHAR fmtW[] = + {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; + WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); + if (!ret) return NULL; + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + return ret; + } +#endif + return heap_strdupW( compsysproduct_uuidW ); +} + +static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond ) +{ + struct record_computersystemproduct *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_computersystemproduct *)table->data; + rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->uuid = get_compsysproduct_uuid(); + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + struct dirstack { WCHAR **dirs; @@ -3077,7 +3116,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, - { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, 0, 0, NULL, fill_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_desktopmonitorW, SIZEOF(col_desktopmonitor), col_desktopmonitor, 0, 0, NULL, fill_desktopmonitor }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d41aa11..2513807 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1176,6 +1176,45 @@ static void test_OperatingSystem( IWbemServices *services ) SysFreeString( wql ); } +static void test_ComputerSystemProduct( IWbemServices *services ) +{ + static const WCHAR uuidW[] = {'U','U','I','D',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *service; + VARIANT value; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_ComputerSystemProduct not available\n" ); + return; + } + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, uuidW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + IWbemClassObject_Release( service ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1214,6 +1253,7 @@ START_TEST(query) test_GetNames( services ); test_SystemSecurity( services ); test_OperatingSystem( services ); + test_ComputerSystemProduct( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0