October 2007 - Wine-Commits

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

Oct. 25, 2007

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

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

Oct. 25, 2007

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

Dan Hipschman : widl: Fix a crash in compare_expr.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

Module: wine Branch: master Commit: 9825ac7a1a0e2ac0088efe6ffda30000a9da2dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9825ac7a1a0e2ac0088efe6ff… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 24 18:06:16 2007 -0700 widl: Fix a crash in compare_expr. --- tools/widl/typegen.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9dcffa7..f6d5536 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -228,6 +228,22 @@ static const char *get_context_handle_type_name(const type_t *type) return NULL; } +/* This is actually fairly involved to implement precisely, due to the + effects attributes may have and things like that. Right now this is + only used for optimization, so just check for a very small set of + criteria that guarantee the types are equivalent; assume every thing + else is different. */ +static int compare_type(const type_t *a, const type_t *b) +{ + if (a == b + || (a->name + && b->name + && strcmp(a->name, b->name) == 0)) + return 0; + /* Ordering doesn't need to be implemented yet. */ + return 1; +} + static int compare_expr(const expr_t *a, const expr_t *b) { int ret; @@ -265,12 +281,17 @@ static int compare_expr(const expr_t *a, const expr_t *b) if (ret != 0) return ret; return compare_expr(a->u.ext, b->u.ext); + case EXPR_CAST: + ret = compare_type(a->u.tref, b->u.tref); + if (ret != 0) + return ret; + /* Fall through. */ case EXPR_NOT: case EXPR_NEG: case EXPR_PPTR: - case EXPR_CAST: - case EXPR_SIZEOF: return compare_expr(a->ref, b->ref); + case EXPR_SIZEOF: + return compare_type(a->u.tref, b->u.tref); case EXPR_VOID: return 0; }

1 0

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

Oct. 25, 2007

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 : setupapi: Return FALSE if a NULL buffer is passed in.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

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 : credui: Add proper parameter names to SSO stubs, and use symbolic return values.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

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

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

Oct. 25, 2007

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

Dmitry Timoshkov : shlwapi: Forward SetDlgItemTextWrapW to user32. SetDlgItemTextW.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

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

Dmitry Timoshkov : shlwapi: Forward GetStringType3ExW to GetStringTypeW.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

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

Gerald Pfeifer : rpcrt4: Initialize variable to avoid compiler warning.
by Alexandre Julliard Oct. 25, 2007

Oct. 25, 2007

Module: wine Branch: master Commit: 826a6d09d4e58ff3f18d70b0b24a00f414d318fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=826a6d09d4e58ff3f18d70b0b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Oct 24 14:33:39 2007 +0200 rpcrt4: Initialize variable to avoid compiler warning. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index b62954b..b8fc580 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -167,7 +167,7 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSA RpcServerInterface* sif; RPC_DISPATCH_FUNCTION func; UUID *object_uuid; - RpcPktHdr *response; + RpcPktHdr *response = NULL; void *buf = msg->Buffer; RPC_STATUS status; BOOL exception;

1 0