February 2013 - Wine-commits

Jacek Caban : urlmon: Use separated variable for InternetQueryDataAvailable to avoid races.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: b6a7cc91123f1c78e02472e8839c4727d27b67bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a7cc91123f1c78e02472e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 14:13:19 2013 +0100 urlmon: Use separated variable for InternetQueryDataAvailable to avoid races. --- dlls/urlmon/protocol.c | 55 ++++++++++++++++++++++++++------------------ dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index c7c61da..890d013 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -349,30 +349,35 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { - BOOL res; - - /* InternetQueryDataAvailable may immediately fork and perform its asynchronous - * read, so clear the flag _before_ calling so it does not incorrectly get cleared - * after the status callback is called */ - protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); - if(res) { - TRACE("available %u bytes\n", protocol->available_bytes); - if(!protocol->available_bytes) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); + if(protocol->query_available) { + protocol->available_bytes = protocol->query_available; + }else { + BOOL res; + + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) { + TRACE("available %u bytes\n", protocol->query_available); + if(!protocol->query_available) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; } + protocol->available_bytes = protocol->query_available; + }else if(GetLastError() != ERROR_IO_PENDING) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } - }else if(GetLastError() != ERROR_IO_PENDING) { - protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - report_result(protocol, INET_E_DATA_NOT_AVAILABLE); - return S_OK; } protocol->flags |= FLAG_REQUEST_COMPLETE; @@ -421,12 +426,14 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret protocol->current_position += len; protocol->available_bytes -= len; + TRACE("current_position %d, available_bytes %d\n", protocol->current_position, protocol->available_bytes); + if(!protocol->available_bytes) { /* InternetQueryDataAvailable may immediately fork and perform its asynchronous * read, so clear the flag _before_ calling so it does not incorrectly get cleared * after the status callback is called */ protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); if(!res) { if (GetLastError() == ERROR_IO_PENDING) { hres = E_PENDING; @@ -438,10 +445,12 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret break; } - if(!protocol->available_bytes) { + if(!protocol->query_available) { all_data_read(protocol); break; } + + protocol->available_bytes = protocol->query_available; } } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 01de984..ba23e74 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -104,6 +104,7 @@ typedef struct { ULONG current_position; ULONG content_length; ULONG available_bytes; + ULONG query_available; IStream *post_stream;

1 0

Piotr Caban : oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 8f7d1ed520db23c230efb37601b99900add664db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7d1ed520db23c230efb3760… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:43:26 2013 +0100 oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate. --- dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/vartype.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8ad549e..e925fa5 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4951,6 +4951,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(365.25, "12/30/1900 6:00:00 AM"); BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); + BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } BSTR_DATE(2958465.0, "12/31/9999"); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d27f9d..8632055 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6619,7 +6619,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (whole == 0.0) dwFlags |= VAR_TIMEVALUEONLY; - else if (partial < 1e-12) + else if (partial > -1e-12 && partial < 1e-12) dwFlags |= VAR_DATEVALUEONLY; }

1 0

Piotr Caban : oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 209b58c64e6181c9bf448cb4f3130d3ba705c5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209b58c64e6181c9bf448cb4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:46:32 2013 +0100 oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600. --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 120 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e925fa5..4411d7d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4952,7 +4952,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); - todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } + BSTR_DATE(-657434.0, "1/1/100"); BSTR_DATE(2958465.0, "12/31/9999"); #undef BSTR_DATE diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 8632055..28795a7 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6576,6 +6576,120 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) return *pbstrOut ? S_OK : E_OUTOFMEMORY; } +static inline int output_int_len(int o, int min_len, WCHAR *date, int date_len) +{ + int len, tmp; + + if(min_len >= date_len) + return -1; + + for(len=0, tmp=o; tmp; tmp/=10) len++; + if(!len) len++; + if(len >= date_len) + return -1; + + for(tmp=min_len-len; tmp>0; tmp--) + *date++ = '0'; + for(tmp=len; tmp>0; tmp--, o/=10) + date[tmp-1] = '0' + o%10; + return min_len>len ? min_len : len; +} + +/* format date string, similar to GetDateFormatW function but works on bigger range of dates */ +static BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, + const WCHAR *fmt, WCHAR *date, int date_len) +{ + static const LCTYPE dayname[] = { + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6 + }; + static const LCTYPE sdayname[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6 + }; + static const LCTYPE monthname[] = { + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 + }; + static const LCTYPE smonthname[] = { + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 + }; + + if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) + FIXME("ignoring flags %x\n", flags); + flags &= LOCALE_NOUSEROVERRIDE; + + while(*fmt && date_len) { + int count = 1; + + switch(*fmt) { + case 'd': + case 'M': + case 'y': + case 'g': + while(*fmt == *(fmt+count)) + count++; + fmt += count-1; + } + + switch(*fmt) { + case 'd': + if(count >= 4) + count = GetLocaleInfoW(lcid, dayname[st->wDayOfWeek] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, sdayname[st->wDayOfWeek] | flags, date, date_len)-1; + else + count = output_int_len(st->wDay, count, date, date_len); + break; + case 'M': + if(count >= 4) + count = GetLocaleInfoW(lcid, monthname[st->wMonth-1] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, smonthname[st->wMonth-1] | flags, date, date_len)-1; + else + count = output_int_len(st->wMonth, count, date, date_len); + break; + case 'y': + if(count >= 3) + count = output_int_len(st->wYear, 0, date, date_len); + else + count = output_int_len(st->wYear%100, count, date, date_len); + break; + case 'g': + if(count == 2) { + FIXME("Should be using GetCalendarInfo(CAL_SERASTRING), defaulting to 'AD'\n"); + + *date++ = 'A'; + date_len--; + if(date_len) + *date = 'D'; + else + count = -1; + break; + } + /* fall through */ + default: + *date = *fmt; + } + + if(count < 0) + break; + fmt++; + date += count; + date_len -= count; + } + + if(!date_len) + return FALSE; + *date++ = 0; + return TRUE; +} + /****************************************************************************** * VarBstrFromDate [OLEAUT32.114] * @@ -6596,7 +6710,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst { SYSTEMTIME st; DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; - WCHAR date[128], *time; + WCHAR date[128], fmt_buff[80], *time; TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); @@ -6626,8 +6740,8 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (dwFlags & VAR_TIMEVALUEONLY) date[0] = '\0'; else - if (!GetDateFormatW(lcid, dwFormatFlags|DATE_SHORTDATE, &st, NULL, date, - sizeof(date)/sizeof(WCHAR))) + if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || + !get_date_format(lcid, dwFlags, &st, fmt_buff, date, sizeof(date)/sizeof(WCHAR))) return E_INVALIDARG; if (!(dwFlags & VAR_DATEVALUEONLY))

1 0

Daniel Jelinski : comctl32/listview: Fix incorrect message parameters.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 75d774a43b53c934ae3b848f618a9be21bef655d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d774a43b53c934ae3b848f6… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Feb 20 22:36:23 2013 +0100 comctl32/listview: Fix incorrect message parameters. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a22b2da..83bdf56 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3549,8 +3549,8 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iFrom = nFirst; nmlv.iTo = nLast; - nmlv.uNewState = 0; - nmlv.uOldState = item.state; + nmlv.uOldState = 0; + nmlv.uNewState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); if (!IsWindow(hwndSelf))

1 0

André Hentschel : comctl32/tests: Mark win8 behaviour as broken.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 2c966be6c3bd8121ef87f65f9a3e3e7ac446e0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c966be6c3bd8121ef87f65f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 23:37:45 2013 +0100 comctl32/tests: Mark win8 behaviour as broken. --- dlls/comctl32/tests/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d8b3dbe..4870910 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -492,7 +492,7 @@ static void test_gettext(void) expect(4, r); /* A size of 0 returns the length of the text */ r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0); - expect(4, r); + ok( r == 4 || broken(r == 2) /* win8 */, "Expected 4 got %d\n", r ); /* A size of 1 only stores the NULL terminator */ buf[0] = 0xa; r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf);

1 0

Dmitry Timoshkov : gdiplus: Correct the GdipDrawString .spec entry.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 668cfb1c5ae75e0e1eed919117a2010f442f03af URL: http://source.winehq.org/git/wine.git/?a=commit;h=668cfb1c5ae75e0e1eed91911… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 21 13:31:44 2013 +0800 gdiplus: Correct the GdipDrawString .spec entry. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ccf47f9..920d78e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -187,7 +187,7 @@ 187 stdcall GdipDrawRectangleI(ptr ptr long long long long) 188 stdcall GdipDrawRectangles(ptr ptr ptr long) 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) -190 stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) +190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) 193 stub GdipEnumerateMetafileDestPoint

1 0

Andrew Talbot : ntdll: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: d0d28b96a4ee1c370ee48f12328e91883c77afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d28b96a4ee1c370ee48f123… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 20 21:25:56 2013 +0000 ntdll: Avoid signed-unsigned integer comparisons. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/nt.c | 6 +++--- dlls/ntdll/sync.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 863a320..c552a8b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -145,7 +145,7 @@ struct file_identity }; static struct file_identity ignored_files[MAX_IGNORED_FILES]; -static int ignored_files_count; +static unsigned int ignored_files_count; union file_directory_info { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a2e0716..ee89bb7 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1166,7 +1166,7 @@ void fill_cpu_info(void) static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, DWORD proc) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1192,7 +1192,7 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, DWORD *len, DWORD max_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache) { - int i; + DWORD i; for(i=0; i<*len; i++) { @@ -1891,7 +1891,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - int n; + unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 09151a9..58dde65 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1091,7 +1091,8 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN const LARGE_INTEGER *timeout, HANDLE signal_object ) { NTSTATUS ret; - int i, cookie; + UINT i; + int cookie; BOOL user_apc = FALSE; obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0;

1 0

Hans Leidekker : wmiutils: Add support for for parsing and serializing a key list.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 7b00683d6e4fdaccd5aede140e32a9c84f1dff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b00683d6e4fdaccd5aede140… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:17 2013 +0100 wmiutils: Add support for for parsing and serializing a key list. --- dlls/wmiutils/path.c | 180 +++++++++++++++++++++++++++++++++----- dlls/wmiutils/tests/path.c | 48 ++++++++++- dlls/wmiutils/wmiutils_private.h | 6 ++ 3 files changed, 210 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b00683d6e4fdaccd5aed…

1 0

Hans Leidekker : wmiutils: Implement IWbemPathKeyList::GetCount.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 13974194709e678e82144e1dc7aa0f8b84e8f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=13974194709e678e82144e1dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:46:19 2013 +0100 wmiutils: Implement IWbemPathKeyList::GetCount. --- dlls/wmiutils/path.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 5f64aa0..98f22db 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -116,8 +116,19 @@ static HRESULT WINAPI keylist_GetCount( IWbemPathKeyList *iface, ULONG *puKeyCount ) { - FIXME("%p, %p\n", iface, puKeyCount); - return E_NOTIMPL; + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + struct path *parent = impl_from_IWbemPath( keylist->parent ); + + TRACE("%p, %p\n", iface, puKeyCount); + + if (!puKeyCount) return WBEM_E_INVALID_PARAMETER; + + EnterCriticalSection( &parent->cs ); + + *puKeyCount = parent->num_keys; + + LeaveCriticalSection( &parent->cs ); + return S_OK; } static HRESULT WINAPI keylist_SetKey(

1 0

Hans Leidekker : wmiutils: Add a stub implementation of IWbemPathKeyList.
by Alexandre Julliard 21 Feb '13

21 Feb '13

Module: wine Branch: master Commit: 39a1b7050f532d37e3db2df25397f3944179ee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1b7050f532d37e3db2df25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 21 10:45:51 2013 +0100 wmiutils: Add a stub implementation of IWbemPathKeyList. --- dlls/wmiutils/path.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 221 insertions(+), 12 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 7b7e46f..5f64aa0 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -32,12 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); -struct key +struct keylist { - WCHAR *name; - int len_name; - WCHAR *value; - int len_value; + IWbemPathKeyList IWbemPathKeyList_iface; + IWbemPath *parent; + LONG refs; }; struct path @@ -59,6 +58,207 @@ struct path ULONGLONG flags; }; +static inline struct keylist *impl_from_IWbemPathKeyList( IWbemPathKeyList *iface ) +{ + return CONTAINING_RECORD(iface, struct keylist, IWbemPathKeyList_iface); +} + +static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) +{ + return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); +} + +static ULONG WINAPI keylist_AddRef( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + return InterlockedIncrement( &keylist->refs ); +} + +static ULONG WINAPI keylist_Release( + IWbemPathKeyList *iface ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + LONG refs = InterlockedDecrement( &keylist->refs ); + if (!refs) + { + TRACE("destroying %p\n", keylist); + IWbemPath_Release( keylist->parent ); + heap_free( keylist ); + } + return refs; +} + +static HRESULT WINAPI keylist_QueryInterface( + IWbemPathKeyList *iface, + REFIID riid, + void **ppvObject ) +{ + struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); + + TRACE("%p, %s, %p\n", keylist, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID( riid, &IID_IWbemPathKeyList ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemPathKeyList_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI keylist_GetCount( + IWbemPathKeyList *iface, + ULONG *puKeyCount ) +{ + FIXME("%p, %p\n", iface, puKeyCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + LPVOID pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_SetKey2( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags, + ULONG uCimType, + VARIANT *pKeyVal ) +{ + FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + ULONG *puKeyValBufSize, + LPVOID pKeyVal, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetKey2( + IWbemPathKeyList *iface, + ULONG uKeyIx, + ULONG uFlags, + ULONG *puNameBufSize, + LPWSTR pszKeyName, + VARIANT *pKeyValue, + ULONG *puApparentCimType ) +{ + FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + pszKeyName, pKeyValue, puApparentCimType); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveKey( + IWbemPathKeyList *iface, + LPCWSTR wszName, + ULONG uFlags ) +{ + FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_RemoveAllKeys( + IWbemPathKeyList *iface, + ULONG uFlags ) +{ + FIXME("%p, 0x%x\n", iface, uFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_MakeSingleton( + IWbemPathKeyList *iface, + boolean bSet ) +{ + FIXME("%p, %d\n", iface, bSet); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetInfo( + IWbemPathKeyList *iface, + ULONG uRequestedInfo, + ULONGLONG *puResponse ) +{ + FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + return E_NOTIMPL; +} + +static HRESULT WINAPI keylist_GetText( + IWbemPathKeyList *iface, + LONG lFlags, + ULONG *puBuffLength, + LPWSTR pszText ) +{ + FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + return E_NOTIMPL; +} + +static const struct IWbemPathKeyListVtbl keylist_vtbl = +{ + keylist_QueryInterface, + keylist_AddRef, + keylist_Release, + keylist_GetCount, + keylist_SetKey, + keylist_SetKey2, + keylist_GetKey, + keylist_GetKey2, + keylist_RemoveKey, + keylist_RemoveAllKeys, + keylist_MakeSingleton, + keylist_GetInfo, + keylist_GetText +}; + +static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +{ + struct keylist *keylist; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; + + keylist->IWbemPathKeyList_iface.lpVtbl = &keylist_vtbl; + keylist->refs = 1; + keylist->parent = parent; + IWbemPath_AddRef( keylist->parent ); + + *ppObj = &keylist->IWbemPathKeyList_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} + +struct key +{ + WCHAR *name; + int len_name; + WCHAR *value; + int len_value; +}; + static void init_path( struct path *path ) { path->text = NULL; @@ -93,11 +293,6 @@ static void clear_path( struct path *path ) init_path( path ); } -static inline struct path *impl_from_IWbemPath( IWbemPath *iface ) -{ - return CONTAINING_RECORD(iface, struct path, IWbemPath_iface); -} - static ULONG WINAPI path_AddRef( IWbemPath *iface ) { @@ -922,8 +1117,22 @@ static HRESULT WINAPI path_GetKeyList( IWbemPath *iface, IWbemPathKeyList **pOut) { - FIXME("%p, %p\n", iface, pOut); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + HRESULT hr; + + TRACE("%p, %p\n", iface, pOut); + + EnterCriticalSection( &path->cs ); + + if (!path->class) + { + LeaveCriticalSection( &path->cs ); + return WBEM_E_INVALID_PARAMETER; + } + hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + + LeaveCriticalSection( &path->cs ); + return hr; } static HRESULT WINAPI path_CreateClassPart(

1 0