wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Dan Hipschman : widl: Allow void pointers with iid_is attributes.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: f974facf5a7a04e27462ab83f3109fa50abec537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f974facf5a7a04e27462ab83f… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 24 18:05:48 2007 -0700 widl: Allow void pointers with iid_is attributes. --- tools/widl/typegen.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dd21fe4..9dcffa7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2110,7 +2110,9 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f int out_attr = is_attr(var->attrs, ATTR_OUT); const type_t *base = type->ref; - if (base->type == RPC_FC_IP) + if (base->type == RPC_FC_IP + || (base->type == 0 + && is_attr(var->attrs, ATTR_IIDIS))) { return write_ip_tfs(file, var->attrs, type, typeformat_offset); } @@ -2152,7 +2154,9 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty { type_t *ref = type->ref; - if (ref->type == RPC_FC_IP) + if (ref->type == RPC_FC_IP + || (ref->type == 0 + && is_attr(attrs, ATTR_IIDIS))) { write_ip_tfs(file, attrs, type, tfsoff); }

1 0

Aric Stewart : iphlpapi: Correct GetBestRoute when there is no route.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 04b4dd02272b39c1f18d5bc814dd1cbc8a1e4d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b4dd02272b39c1f18d5bc81… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 24 14:47:42 2007 -0500 iphlpapi: Correct GetBestRoute when there is no route. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 96e16bf..74fa938 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -854,7 +854,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO ret = AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0); if (table && !ret) { - DWORD ndx, matchedBits, matchedNdx = 0; + DWORD ndx, matchedBits, matchedNdx = table->dwNumEntries; for (ndx = 0, matchedBits = 0; ndx < table->dwNumEntries; ndx++) { if (table->table[ndx].dwForwardType != MIB_IPROUTE_TYPE_INVALID &&

1 0

Juan Lang : crypt32: Avoid misleading fixme when no data are passed to CryptUnprotectData.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 62f4022563b0b61868b0c928973d352c2a93a079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f4022563b0b61868b0c9289… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 24 12:46:31 2007 -0700 crypt32: Avoid misleading fixme when no data are passed to CryptUnprotectData. --- dlls/crypt32/protectdata.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index a1a3369..3ecd35b 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -1015,6 +1015,11 @@ BOOL WINAPI CryptUnprotectData(DATA_BLOB* pDataIn, SetLastError(ERROR_INVALID_PARAMETER); goto finished; } + if (!pDataIn->cbData) + { + SetLastError(ERROR_INVALID_DATA); + goto finished; + } /* debug: show our arguments */ report(pDataIn,pOptionalEntropy,pPromptStruct,dwFlags);

1 0

Juan Lang : setupapi: Return FALSE if a NULL buffer is passed in.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 4d3853ce9f6e55a2a8431bc1610e3aa382ff2e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3853ce9f6e55a2a8431bc16… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 24 10:37:29 2007 -0700 setupapi: Return FALSE if a NULL buffer is passed in. --- dlls/setupapi/devinst.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index bd58791..531597d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3065,7 +3065,9 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( if (RequiredSize) *RequiredSize = size; - if (!l) + if (!PropertyBuffer) + ; /* do nothing, ret is already FALSE, last error is already set */ + else if (!l) ret = TRUE; else SetLastError(l); @@ -3119,7 +3121,9 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( if (RequiredSize) *RequiredSize = size; - if (!l) + if (!PropertyBuffer) + ; /* do nothing, ret is already FALSE, last error is already set */ + else if (!l) ret = TRUE; else SetLastError(l);

1 0

Juan Lang : advapi32: Add stubs for CredEnumerateA/W.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 1fd2bc5215117e3a4129d33f288a5048e8c6e8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd2bc5215117e3a4129d33f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 24 09:57:54 2007 -0700 advapi32: Add stubs for CredEnumerateA/W. --- dlls/advapi32/advapi.c | 17 +++++++++++++++++ dlls/advapi32/advapi32.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index b92d3de..1a2c7da 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winternl.h" #include "winerror.h" +#include "wincred.h" #include "wine/library.h" #include "wine/debug.h" @@ -292,3 +293,19 @@ DWORD WINAPI CommandLineFromMsiDescriptor( WCHAR *szDescriptor, FreeLibrary( hmsi ); return r; } + +BOOL WINAPI CredEnumerateA(LPCSTR filter, DWORD flags, DWORD *count, + PCREDENTIALA **credentials) +{ + FIXME("(%s, %08x, %p, %p)\n", debugstr_a(filter), flags, count, + credentials); + return FALSE; +} + +BOOL WINAPI CredEnumerateW(LPCWSTR filter, DWORD flags, DWORD *count, + PCREDENTIALW **credentials) +{ + FIXME("(%s, %08x, %p, %p)\n", debugstr_w(filter), flags, count, + credentials); + return FALSE; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 6cb8846..deed87a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -104,8 +104,8 @@ @ stdcall CreateWellKnownSid(long ptr ptr ptr) # @ stub CredDeleteA # @ stub CredDeleteW -# @ stub CredEnumerateA -# @ stub CredEnumerateW +@ stdcall CredEnumerateA(str long ptr ptr) +@ stdcall CredEnumerateW(wstr long ptr ptr) # @ stub CredFree # @ stub CredGetSessionTypes # @ stub CredGetTargetInfoA

1 0

Juan Lang : credui: Add proper parameter names to SSO stubs, and use symbolic return values.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: aa657e93bed3f2252d37d8f77afde584004e8335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa657e93bed3f2252d37d8f77… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 24 09:53:33 2007 -0700 credui: Add proper parameter names to SSO stubs, and use symbolic return values. --- dlls/credui/credui_main.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 8d958c4..66bbaa8 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -378,39 +378,43 @@ DWORD WINAPI CredUIParseUserNameW(PCWSTR pszUserName, PWSTR pszUser, /****************************************************************************** * CredUIStoreSSOCredA [CREDUI.@] */ -DWORD WINAPI CredUIStoreSSOCredA(PCSTR a, PCSTR b, PCSTR c, BOOL f) +DWORD WINAPI CredUIStoreSSOCredA(PCSTR pszRealm, PCSTR pszUsername, + PCSTR pszPassword, BOOL bPersist) { - FIXME("(%s, %s, %s, %d)\n", debugstr_a(a), debugstr_a(b), debugstr_a(c), f); - return 0; + FIXME("(%s, %s, %p, %d)\n", debugstr_a(pszRealm), debugstr_a(pszUsername), + pszPassword, bPersist); + return ERROR_SUCCESS; } /****************************************************************************** * CredUIStoreSSOCredW [CREDUI.@] */ -DWORD WINAPI CredUIStoreSSOCredW(PCWSTR a, PCWSTR b, PCWSTR c, BOOL f) +DWORD WINAPI CredUIStoreSSOCredW(PCWSTR pszRealm, PCWSTR pszUsername, + PCWSTR pszPassword, BOOL bPersist) { - FIXME("(%s, %s, %s, %d)\n", debugstr_w(a), debugstr_w(b), debugstr_w(c), f); - return 0; + FIXME("(%s, %s, %p, %d)\n", debugstr_w(pszRealm), debugstr_w(pszUsername), + pszPassword, bPersist); + return ERROR_SUCCESS; } /****************************************************************************** * CredUIReadSSOCredA [CREDUI.@] */ -DWORD WINAPI CredUIReadSSOCredA(PCSTR a, PSTR *b) +DWORD WINAPI CredUIReadSSOCredA(PCSTR pszRealm, PSTR *ppszUsername) { - FIXME("(%s, %p)\n", debugstr_a(a), b); - if (b) - *b = NULL; - return 0; + FIXME("(%s, %p)\n", debugstr_a(pszRealm), ppszUsername); + if (ppszUsername) + *ppszUsername = NULL; + return ERROR_NOT_FOUND; } /****************************************************************************** * CredUIReadSSOCredW [CREDUI.@] */ -DWORD WINAPI CredUIReadSSOCredW(PCWSTR a, PWSTR *b) +DWORD WINAPI CredUIReadSSOCredW(PCWSTR pszRealm, PWSTR *ppszUsername) { - FIXME("(%s, %p)\n", debugstr_w(a), b); - if (b) - *b = NULL; - return 0; + FIXME("(%s, %p)\n", debugstr_w(pszRealm), ppszUsername); + if (ppszUsername) + *ppszUsername = NULL; + return ERROR_NOT_FOUND; }

1 0

Dmitry Timoshkov : shlwapi: Forward GetStringType3ExW to GetStringTypeW.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: ae89239cde34e192557ee5c0a7d8b1c794fe84fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae89239cde34e192557ee5c0a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 25 14:11:26 2007 +0900 shlwapi: Forward GetStringType3ExW to GetStringTypeW. --- dlls/shlwapi/ordinal.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 643268a..c3f5371 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -732,10 +732,9 @@ BOOL WINAPI IsCharXDigitW(WCHAR wc) * @ [SHLWAPI.35] * */ -BOOL WINAPI GetStringType3ExW(LPWSTR lpszStr, DWORD dwLen, LPVOID p3) +BOOL WINAPI GetStringType3ExW(LPWSTR src, INT count, LPWORD type) { - FIXME("(%s,0x%08x,%p): stub\n", debugstr_w(lpszStr), dwLen, p3); - return TRUE; + return GetStringTypeW(CT_CTYPE3, src, count, type); } /*************************************************************************

1 0

Dmitry Timoshkov : shlwapi: Forward SetDlgItemTextWrapW to user32. SetDlgItemTextW.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: f7a7e6d9f97fa2219a3978e9d3b386731d0ccb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a7e6d9f97fa2219a3978e9d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Oct 25 14:10:51 2007 +0900 shlwapi: Forward SetDlgItemTextWrapW to user32.SetDlgItemTextW. --- dlls/shlwapi/ordinal.c | 22 ---------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertions(+), 23 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index ee60ea9..643268a 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -739,28 +739,6 @@ BOOL WINAPI GetStringType3ExW(LPWSTR lpszStr, DWORD dwLen, LPVOID p3) } /************************************************************************* - * @ [SHLWAPI.138] - * - * Set the text of a given dialog item. - * - * PARAMS - * hWnd [I] Handle of dialog - * iItem [I] Index of item - * lpszText [O] Text to set - * - * RETURNS - * Success: TRUE. The text of the dialog is set to lpszText. - * Failure: FALSE, Otherwise. - */ -BOOL WINAPI SetDlgItemTextWrapW(HWND hWnd, INT iItem, LPCWSTR lpszText) -{ - HWND hWndItem = GetDlgItem(hWnd, iItem); - if (hWndItem) - return SetWindowTextW(hWndItem, lpszText); - return FALSE; -} - -/************************************************************************* * @ [SHLWAPI.151] * * Compare two Ascii strings up to a given length. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ffde04c..1a0d327 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -135,7 +135,7 @@ 135 stdcall @(long long long long long) user32.SendDlgItemMessageW 136 stdcall @(long long long long) user32.SendMessageW 137 stdcall @(wstr) kernel32.SetCurrentDirectoryW -138 stdcall -noname SetDlgItemTextWrapW(long long wstr) +138 stdcall -noname SetDlgItemTextWrapW(long long wstr) user32.SetDlgItemTextW 139 stdcall @(long long long ptr) user32.SetMenuItemInfoW 140 stdcall @(long wstr long) user32.SetPropW 141 stdcall @(long long long) user32.SetWindowLongW

1 0

Dan Kegel : wine.inf: Add fake DLL for mshtml.dll.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 374db6371ca0cd17fea47685489ad6cb99b475b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=374db6371ca0cd17fea476854… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Oct 24 20:15:51 2007 -0700 wine.inf: Add fake DLL for mshtml.dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index e61d4fb..e6f3dbd 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2224,6 +2224,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,kernel32.dll 11,,msadp32.acm 11,,msg711.acm +11,,mshtml.dll 11,,msi.dll 11,,msiexec.exe 11,,msvcrt.dll

1 0

Aric Stewart : iphlpapi: For platforms that do not implement /proc, return Unimplemented for the functions trying to read from there.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: 80969f53033c294b744eb0584be1b3d959495cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=80969f53033c294b744eb0584… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 24 11:15:39 2007 -0500 iphlpapi: For platforms that do not implement /proc, return Unimplemented for the functions trying to read from there. --- dlls/iphlpapi/iphlpapi_main.c | 6 +++--- dlls/iphlpapi/ipstats.c | 27 +++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c89af67..96e16bf 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -852,8 +852,8 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO if (!pBestRoute) return ERROR_INVALID_PARAMETER; - AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0); - if (table) { + ret = AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0); + if (table && !ret) { DWORD ndx, matchedBits, matchedNdx = 0; for (ndx = 0, matchedBits = 0; ndx < table->dwNumEntries; ndx++) { @@ -881,7 +881,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO } HeapFree(GetProcessHeap(), 0, table); } - else + else if (!ret) ret = ERROR_OUTOFMEMORY; TRACE("returning %d\n", ret); return ret; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 69dd978..1ba57b1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -182,7 +182,10 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) fclose(fp); } else + { ERR ("unimplemented!\n"); + return ERROR_NOT_SUPPORTED; + } return NO_ERROR; } @@ -312,7 +315,10 @@ DWORD getICMPStats(MIB_ICMP *stats) fclose(fp); } else + { ERR ("unimplemented!\n"); + return ERROR_NOT_SUPPORTED; + } return NO_ERROR; } @@ -426,7 +432,10 @@ DWORD getIPStats(PMIB_IPSTATS stats) fclose(fp); } else + { ERR ("unimplemented!\n"); + return ERROR_NOT_SUPPORTED; + } return NO_ERROR; } @@ -519,7 +528,10 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) fclose(fp); } else + { ERR ("unimplemented!\n"); + return ERROR_NOT_SUPPORTED; + } return NO_ERROR; } @@ -575,7 +587,10 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) fclose(fp); } else + { ERR ("unimplemented!\n"); + return ERROR_NOT_SUPPORTED; + } return NO_ERROR; } @@ -963,7 +978,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, else { ERR ("unimplemented!\n"); - return ERROR_INVALID_PARAMETER; + return ERROR_NOT_SUPPORTED; } #endif } @@ -984,7 +999,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) #if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) ERR ("unimplemented!\n"); - return ERROR_INVALID_PARAMETER; + return ERROR_NOT_SUPPORTED; #endif if (!ppIpNetTable) @@ -1064,6 +1079,8 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) } fclose(fp); } + else + ret = ERROR_NOT_SUPPORTED; } else ret = ERROR_OUTOFMEMORY; @@ -1082,7 +1099,7 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) #if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) ERR ("unimplemented!\n"); - return ERROR_INVALID_PARAMETER; + return ERROR_NOT_SUPPORTED; #endif if (!ppUdpTable) @@ -1132,6 +1149,8 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) } fclose(fp); } + else + ret = ERROR_NOT_SUPPORTED; } else ret = ERROR_OUTOFMEMORY; @@ -1294,7 +1313,7 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, DWORD maxEntries, HANDLE heap, /* get from /proc/net/tcp, no error if can't */ fp = fopen("/proc/net/tcp", "r"); if (!fp) - return NO_ERROR; + return ERROR_NOT_SUPPORTED; /* skip header line */ ptr = fgets(buf, sizeof(buf), fp);

1 0

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 October 2007