wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Thomas Petazzoni : configure: Allow to override the location of the *-config scripts.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 4ab21edfb10d0a910e24709aab9f3afff8a84ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab21edfb10d0a910e24709aa… Author: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Date: Tue Dec 22 22:29:20 2015 +0100 configure: Allow to override the location of the *-config scripts. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++-------------- configure.ac | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab21edfb10d0a910e247…

1 0

Austin English : api-ms-win-core-path-l1-1-0: Add stub dll.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 88b1a5fa21e3d799153f7fe12683d92d7e35d777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b1a5fa21e3d799153f7fe12… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:12:26 2015 -0600 api-ms-win-core-path-l1-1-0: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-path-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-path-l1-1-0.spec | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/configure b/configure index 8fe1910..a1b7247 100755 --- a/configure +++ b/configure @@ -901,6 +901,7 @@ enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 +enable_api_ms_win_core_path_l1_1_0 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -17294,6 +17295,7 @@ wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 +wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 diff --git a/configure.ac b/configure.ac index ffeecf4..01c481b 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) diff --git a/dlls/api-ms-win-core-path-l1-1-0/Makefile.in b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in new file mode 100644 index 0000000..af2c5f6 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-path-l1-1-0.dll diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec new file mode 100644 index 0000000..cb10d89 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stub PathAllocCanonicalize +@ stub PathAllocCombine +@ stub PathCchAddBackslash +@ stub PathCchAddBackslashEx +@ stub PathCchAddExtension +@ stub PathCchAppend +@ stub PathCchAppendEx +@ stub PathCchCanonicalize +@ stub PathCchCanonicalizeEx +@ stub PathCchCombine +@ stub PathCchCombineEx +@ stub PathCchFindExtension +@ stub PathCchIsRoot +@ stub PathCchRemoveBackslash +@ stub PathCchRemoveBackslashEx +@ stub PathCchRemoveExtension +@ stub PathCchRemoveFileSpec +@ stub PathCchRenameExtension +@ stub PathCchSkipRoot +@ stub PathCchStripPrefix +@ stub PathCchStripToRoot +@ stub PathIsUNCEx

1 0

Alex Henrie : kernel32: Add TRACE to SetCommState.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 60226ee37de52b470b98efa13f9a5e065cedc77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60226ee37de52b470b98efa13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 18 21:51:21 2015 -0700 kernel32: Add TRACE to SetCommState. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 1c6f1af..f6c1270 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -808,6 +808,8 @@ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) SERIAL_CHARS sc; DWORD dwBytesReturned; + TRACE("handle %p, ptr %p\n", handle, lpdcb); + if (lpdcb == NULL) { SetLastError(ERROR_INVALID_PARAMETER);

1 0

Andrew Eikum : maintainers: Alphabetize.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 101d70fd48b7f62d7f34427ef7d74017f55fb502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101d70fd48b7f62d7f34427ef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 23 09:03:19 2015 -0600 maintainers: Alphabetize. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a32c686..f622df0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -28,6 +28,13 @@ Maintainers List ----------------------------------- +ARM, ARM64 +M: André Hentschel <nerv(a)dawncrow.de> +F: dlls/dbghelp/cpu_arm* +F: dlls/msvcrt/except_arm.c +F: dlls/ntdll/signal_arm* +F: programs/winedbg/be_arm* + Audio I/O M: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dsound/ @@ -42,13 +49,6 @@ F: dlls/x3daudio*/ F: dlls/xapofx*/ F: dlls/xaudio*/ -ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> -F: dlls/dbghelp/cpu_arm* -F: dlls/msvcrt/except_arm.c -F: dlls/ntdll/signal_arm* -F: programs/winedbg/be_arm* - Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ @@ -113,8 +113,8 @@ F: dlls/hidclass.sys/ HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/mshtml/ F: dlls/ieframe/ +F: dlls/mshtml/ F: dlls/shdocvw/ Input methods @@ -131,8 +131,8 @@ F: dlls/winemac.drv/ Media format conversion M: Andrew Eikum <aeikum(a)codeweavers.com> -F: dlls/msacm32/ F: dlls/*.acm/ +F: dlls/msacm32/ Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com>

1 0

André Hentschel : winmm: Respect return value from joyGetPos (Coverity).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 64f600fe2266f964c912eb4d08a6fc1247a47eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f600fe2266f964c912eb4d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:52 2015 +0100 winmm: Respect return value from joyGetPos (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 6ac67f4..8a52942 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -84,6 +84,7 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi { int i; WINE_JOYSTICK* joy; + MMRESULT res; JOYINFO ji; LONG pos; unsigned buttonChange; @@ -93,7 +94,12 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi if (joy->hCapture != hWnd) continue; - joyGetPos(i, &ji); + res = joyGetPos(i, &ji); + if (res != JOYERR_NOERROR) { + WARN("joyGetPos failed: %08x\n", res); + continue; + } + pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged ||

1 0

André Hentschel : mmdevapi: Skip device if GetId fails (Coverity).
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: bbc42a2341c9eb3181d3b9e845bb3c551667a95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc42a2341c9eb3181d3b9e84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 23:18:46 2015 +0100 mmdevapi: Skip device if GetId fails (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d50d206..e63a199 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1065,9 +1065,15 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { + HRESULT hr; WCHAR *str; dev = &MMDevice_head[i]->IMMDevice_iface; - IMMDevice_GetId(dev, &str); + hr = IMMDevice_GetId(dev, &str); + if (FAILED(hr)) + { + WARN("GetId failed: %08x\n", hr); + continue; + } if (str && !lstrcmpW(str, name)) {

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.SettingID.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: fafab917517bc76909d9a24383531710be92139a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fafab917517bc76909d9a2438… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:42 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.SettingID. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 3b17afb..f411898 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d20ef82..a3cf673 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -305,6 +305,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_settingidW[] = + {'S','e','t','t','i','n','g','I','D',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = @@ -485,7 +487,8 @@ static const struct column col_networkadapterconfig[] = { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_settingidW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -880,6 +883,7 @@ struct record_networkadapterconfig UINT32 ipconnectionmetric; int ipenabled; const WCHAR *mac_address; + const WCHAR *settingid; }; struct record_operatingsystem { @@ -2189,6 +2193,17 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li ret->ptr = ptr; return ret; } +static WCHAR *get_settingid( UINT32 index ) +{ + GUID guid; + WCHAR *ret, *str; + memset( &guid, 0, sizeof(guid) ); + guid.Data1 = index; + UuidToStringW( &guid, &str ); + ret = heap_strdupW( str ); + RpcStringFreeW( &str ); + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2230,6 +2245,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec->ipconnectionmetric = 20; rec->ipenabled = -1; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->settingid = get_settingid( rec->index ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSServerSearchOrder.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 0c38f7083e84b26eeff33747c085a00a2dcb0586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c38f7083e84b26eeff33747c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:41 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DNSServerSearchOrder. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 70 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index baa161b..d20ef82 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -183,6 +183,8 @@ static const WCHAR prop_diskindexW[] = {'D','i','s','k','I','n','d','e','x',0}; static const WCHAR prop_dnshostnameW[] = {'D','N','S','H','o','s','t','N','a','m','e',0}; +static const WCHAR prop_dnsserversearchorderW[] = + {'D','N','S','S','e','r','v','e','r','S','e','a','r','c','h','O','r','d','e','r',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = @@ -475,14 +477,15 @@ static const struct column col_networkadapter[] = }; static const struct column col_networkadapterconfig[] = { - { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_dhcpenabledW, CIM_BOOLEAN }, - { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, - { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, - { prop_ipenabledW, CIM_BOOLEAN }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dhcpenabledW, CIM_BOOLEAN }, + { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dnsserversearchorderW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, + { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_os[] = { @@ -872,6 +875,7 @@ struct record_networkadapterconfig const WCHAR *description; int dhcpenabled; const WCHAR *dnshostname; + const struct array *dnsserversearchorder; UINT32 index; UINT32 ipconnectionmetric; int ipenabled; @@ -2152,6 +2156,39 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) ret->ptr = ptr; return ret; } +static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *list ) +{ + IP_ADAPTER_DNS_SERVER_ADDRESS *server; + struct array *ret; + ULONG buflen, i = 0, count = 0; + WCHAR **ptr, *p, buf[54]; /* max IPv6 address length */ + + if (!list) return NULL; + for (server = list; server; server = server->Next) count++; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + { + heap_free( ret ); + return NULL; + } + for (server = list; server; server = server->Next) + { + buflen = sizeof(buf)/sizeof(buf[0]); + if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, + NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) + { + for (; i > 0; i--) heap_free( ptr[i - 1] ); + heap_free( ptr ); + heap_free( ret ); + return NULL; + } + if ((p = strrchrW( ptr[i - 1], ':' ))) *p = 0; + } + ret->count = count; + ret->ptr = ptr; + return ret; +} static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { @@ -2184,14 +2221,15 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); - rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); - rec->description = heap_strdupW( aa->Description ); - rec->dhcpenabled = -1; - rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); - rec->index = aa->u.s.IfIndex; - rec->ipconnectionmetric = 20; - rec->ipenabled = -1; - rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); + rec->description = heap_strdupW( aa->Description ); + rec->dhcpenabled = -1; + rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); + rec->dnsserversearchorder = get_dnsserversearchorder( aa->FirstDnsServerAddress ); + rec->index = aa->u.s.IfIndex; + rec->ipconnectionmetric = 20; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: dd04d232d3610bb5c8d7734ab3c38604091cb4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd04d232d3610bb5c8d7734ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:40 2015 +0100 wbemprox: Implement Win32_NetworkAdapterConfiguration.DHCPEnabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 345437d..baa161b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -173,6 +173,8 @@ 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_dhcpenabledW[] = + {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = @@ -475,6 +477,7 @@ static const struct column col_networkadapterconfig[] = { { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_dhcpenabledW, CIM_BOOLEAN }, { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, @@ -867,6 +870,7 @@ struct record_networkadapterconfig { const struct array *defaultipgateway; const WCHAR *description; + int dhcpenabled; const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; @@ -2182,6 +2186,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st rec = (struct record_networkadapterconfig *)(table->data + offset); rec->defaultipgateway = get_defaultipgateway( aa->FirstGatewayAddress ); rec->description = heap_strdupW( aa->Description ); + rec->dhcpenabled = -1; rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20;

1 0

Hans Leidekker : wbemprox: Set correct variant type if array property value is NULL.
by Alexandre Julliard 24 Dec '15

24 Dec '15

Module: wine Branch: master Commit: 086a1a4ed2cf776c01130c02a13565fff9cbcf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=086a1a4ed2cf776c01130c02a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 23 11:07:39 2015 +0100 wbemprox: Set correct variant type if array property value is NULL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7fedf89..53e1044 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -841,7 +841,8 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK; val_ptr = to_safearray( (const struct array *)(INT_PTR)val, basetype ); - if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; + if (!val_ptr) vartype = VT_NULL; + else if (!vartype) vartype = to_vartype( basetype ) | VT_ARRAY; goto done; } switch (view->table->columns[column].type & COL_TYPE_MASK)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

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 December 2015