wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Jacek Caban : atl100: Added AtlWinModuleInit implementation.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: a650ce110485f77e22aad235b8274989acd0e77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a650ce110485f77e22aad235b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 18 11:48:37 2012 +0100 atl100: Added AtlWinModuleInit implementation. --- dlls/atl100/atl.c | 15 +++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index c0bc2ae..bd3fbf1 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -288,6 +288,21 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } /*********************************************************************** + * AtlWinModuleInit [atl100.65] + */ +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *winmod) +{ + TRACE("(%p\n", winmod); + + if(winmod->cbSize != sizeof(*winmod)) + return E_INVALIDARG; + + InitializeCriticalSection(&winmod->m_csWindowCreate); + winmod->m_pCreateWndList = NULL; + return S_OK; +} + +/*********************************************************************** * AtlWinModuleAddCreateWndData [atl100.43] */ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData *pData, void *pvObject) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 6c959d6..11cac7d 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -46,7 +46,7 @@ 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr) -65 stub AtlWinModuleInit +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration 68 stub AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 6c29ad9..95b1f2a 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -221,6 +221,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE*); void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*);

1 0

Piotr Caban : msvcrt: Use CompareString in wcscoll functions.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 1f784a100125a4511729b3dae110f3893c638c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f784a100125a4511729b3dae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:57:00 2012 +0100 msvcrt: Use CompareString in wcscoll functions. --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e7bf0e4..a0b1cb6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -74,8 +74,8 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - /* FIXME: handle collates */ - return strcmpiW( str1, str2 ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -83,8 +83,8 @@ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st */ INT CDECL MSVCRT__wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count ) { - /* FIXME: handle collates */ - return strncmpiW( str1, str2, count ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; } /********************************************************************* @@ -1010,8 +1010,8 @@ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, */ int CDECL MSVCRT_wcscoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - /* FIXME: handle collates */ - return strcmpW( str1, str2 ); + return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], + 0, str1, -1, str2, -1)-CSTR_EQUAL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Use LC_COLLATE category in strcoll functions.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 0c91daee8bd7e65f2354b544fb9bc9c3163f638a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91daee8bd7e65f2354b544f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:56:35 2012 +0100 msvcrt: Use LC_COLLATE category in strcoll functions. --- dlls/msvcrt/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f166865..a254158 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -489,7 +489,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -512,7 +512,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -536,7 +536,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, count, str2, count)-CSTR_EQUAL; } /********************************************************************* @@ -559,7 +559,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; }

1 0

Piotr Caban : msvcrt: Added more setlocale tests.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 2cb51d9f4a400da72c7601547d7f02b1ea306217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb51d9f4a400da72c7601547… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:39:10 2012 +0100 msvcrt: Added more setlocale tests. --- dlls/msvcrt/tests/locale.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 6b09cdf..fba2462 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -575,6 +575,27 @@ static void test_setlocale(void) ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "English_United States.ACP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTANSICODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.OCP"); + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) { + strcpy(buf, "English_United States."); + GetLocaleInfoA(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), + LOCALE_IDEFAULTCODEPAGE, buf+strlen(buf), 80); + ok(!strcmp(ret, buf), "ret = %s, expected %s\n", ret, buf); + } + + ret = setlocale(LC_ALL, "English_United States.UTF8"); + ok(ret == NULL, "ret != NULL\n"); } static void test_crtGetStringTypeW(void)

1 0

Piotr Caban : msvcrt: Fixed locale matching code.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: a406d538bbeaab392e64d43088e8a2572818cff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a406d538bbeaab392e64d4308… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:39:00 2012 +0100 msvcrt: Fixed locale matching code. --- dlls/msvcrt/locale.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 707b8f1..4540e9a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -130,9 +130,12 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO { int len; + if(!cmp[0]) + return 0; + buff[0] = 0; GetLocaleInfoA(lcid, flags|LOCALE_NOUSEROVERRIDE, buff, MAX_ELEM_LEN); - if (!buff[0] || !cmp[0]) + if (!buff[0]) return 0; /* Partial matches are only allowed on language/country names */ @@ -175,7 +178,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO TRACE("Found country:%s->%s\n", res->search_country, buff); flags |= FOUND_COUNTRY; } - else if (res->match_flags & FOUND_COUNTRY) + else if (!flags && (res->match_flags & FOUND_COUNTRY)) { return CONTINUE_LOOKING; } @@ -188,7 +191,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO flags |= FOUND_CODEPAGE; memcpy(res->found_codepage,res->search_codepage,MAX_ELEM_LEN); } - else if (res->match_flags & FOUND_CODEPAGE) + else if (!flags && (res->match_flags & FOUND_CODEPAGE)) { return CONTINUE_LOOKING; }

1 0

Piotr Caban : msvcrt: Fixed codepage setting code in create_locale.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 7afc98a7f7af0dcafcb2c8624cbd56ef235eb78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afc98a7f7af0dcafcb2c8624… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:38:33 2012 +0100 msvcrt: Fixed codepage setting code in create_locale. --- dlls/msvcrt/locale.c | 76 +++++++++++++++++++++++++++++--------------------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 46 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7afc98a7f7af0dcafcb2c…

1 0

Piotr Caban : wined3d: Recognize Nvidia GT610 card.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: b71af96b9c3c9fa02edeaca3b90312b0bc539aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71af96b9c3c9fa02edeaca3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 18 11:38:19 2012 +0100 wined3d: Recognize Nvidia GT610 card. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 336c1e7..5d32345 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1093,6 +1093,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1499,6 +1500,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ + {"GT 610", CARD_NVIDIA_GEFORCE_GT610}, /* Geforce 600 - lowend */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77d3e03..dbff407 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1423,6 +1423,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GT610 = 0x104a, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1,

1 0

Hans Leidekker : winhttp: Use the hostname instead of the IPv4 address in the URL returned from WinHttpDetectAutoProxyConfigUrl .
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 161112326734531004c38a2f17ff4f67207af64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=161112326734531004c38a2f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:23:20 2012 +0100 winhttp: Use the hostname instead of the IPv4 address in the URL returned from WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/session.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8a5c457..c360a7e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1170,18 +1170,34 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) ); } -static WCHAR *build_wpad_url( const struct addrinfo *ai ) +static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - static const WCHAR fmtW[] = - {'h','t','t','p',':','/','/','%','u','.','%','u','.','%','u','.','%','u', - '/','w','p','a','d','.','d','a','t',0}; - WCHAR *ret; + int ret = -1; +#ifdef HAVE_GETNAMEINFO + ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); +#endif + return ret; +} - while (ai && ai->ai_family != AF_INET) ai = ai->ai_next; +static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) +{ + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; + char name[NI_MAXHOST]; + WCHAR *ret, *p; + int len; + + while (ai && ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ai = ai->ai_next; if (!ai) return NULL; - if (!(ret = GlobalAlloc( 0, sizeof(fmtW) + 12 * sizeof(WCHAR) ))) return NULL; - printf_addr( fmtW, ret, (struct sockaddr_in *)ai->ai_addr ); + if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; + + len = strlenW( httpW ) + strlen( hostname ) + strlenW( wpadW ); + if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + strcpyW( p, httpW ); + p += strlenW( httpW ); + while (*hostname) { *p++ = *hostname++; } + strcpyW( p, wpadW ); return ret; } @@ -1234,7 +1250,7 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) heap_free( name ); if (!res) { - *url = build_wpad_url( ai ); + *url = build_wpad_url( name, ai ); freeaddrinfo( ai ); if (*url) {

1 0

Hans Leidekker : winhttp: Check the server response when downloading a PAC script.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: e6ab87ccfa78cffae5bcbe2c1dfc58b5ef7fb2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ab87ccfa78cffae5bcbe2c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:22:50 2012 +0100 winhttp: Check the server response when downloading a PAC script. --- dlls/winhttp/session.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3889922..8a5c457 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1939,7 +1939,7 @@ static BSTR download_script( const WCHAR *url ) HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; - DWORD size = 4096, offset, to_read, bytes_read, flags = 0; + DWORD status, size = sizeof(status), offset, to_read, bytes_read, flags = 0; char *tmp, *buffer = NULL; BSTR script = NULL; int len; @@ -1956,8 +1956,12 @@ static BSTR download_script( const WCHAR *url ) if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; if (!WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 )) goto done; + if (!(WinHttpReceiveResponse( req, 0 ))) goto done; + if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, + &size, NULL ) || status != HTTP_STATUS_OK) goto done; + size = 4096; if (!(buffer = heap_alloc( size ))) goto done; to_read = size; offset = 0;

1 0

Hans Leidekker : wbemprox: Avoid a crash in get_propval when the query returned no results.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 035315c45c49053cfefbbe0856966af5aee63ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035315c45c49053cfefbbe085… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:20:53 2012 +0100 wbemprox: Avoid a crash in get_propval when the query returned no results. --- 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 3fdee00..1123159 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -644,22 +644,22 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE *type, LONG *flavor ) { HRESULT hr; - UINT column, row = view->result[index]; + UINT column, row; VARTYPE vartype; void *val_ptr = NULL; LONGLONG val; 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; + if (!view->result || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND; - vartype = view->table->columns[column].vartype; - + row = view->result[index]; hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; + vartype = view->table->columns[column].vartype; if (view->table->columns[column].type & CIM_FLAG_ARRAY) { CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
55
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 2012