February 2007 - Wine-commits

Dmitry Timoshkov : user32: Dump contents of CREATESTRUCT in WM_[NC] CREATE of the message spy.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 8ec3423e76bdd95e3cb743383dc6ae7418a3bc58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec3423e76bdd95e3cb743383… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Jan 27 17:57:13 2007 +0800 user32: Dump contents of CREATESTRUCT in WM_[NC]CREATE of the message spy. --- dlls/user32/spy.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 164101e..290c6c3 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2411,6 +2411,23 @@ static void SPY_DumpStructure(const SPY_ TRACE("itemData=0x%08lx\n", lpmis->itemData); } break; + case WM_NCCREATE: + case WM_CREATE: + { + BOOL unicode; + CREATESTRUCTA *cs; + + if (!enter) break; + + unicode = IsWindowUnicode(sp_e->msg_hwnd); + cs = (CREATESTRUCTA *)sp_e->lParam; + TRACE("%s %s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + unicode ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), + unicode ? debugstr_w((LPCWSTR)cs->lpszClass) : debugstr_a(cs->lpszClass), + cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, + cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams); + break; + } case WM_SIZE: if (!enter) break; TRACE("cx=%d cy=%d\n", LOWORD(sp_e->lParam), HIWORD(sp_e->lParam));

1 0

Thomas Weidenmueller : comctl32: Fix the TAB_ITEM_SIZE macro.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 2c620c82697a67293549ac70f1a3377966c3cbff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c620c82697a67293549ac70f… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sat Jan 27 14:27:38 2007 +0100 comctl32: Fix the TAB_ITEM_SIZE macro. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5ccc059..d17f6a7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -96,7 +96,7 @@ typedef struct } TAB_ITEM; /* The size of a tab item depends on how much extra data is requested */ -#define TAB_ITEM_SIZE(infoPtr) (sizeof(TAB_ITEM) - sizeof(BYTE) + infoPtr->cbInfo) +#define TAB_ITEM_SIZE(infoPtr) (FIELD_OFFSET(TAB_ITEM, extra[(infoPtr)->cbInfo])) typedef struct {

1 0

Rob Shearman : credui: Set the focus to the username edit control.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 4ca5d44ce51cdd667a3c32430a0c84d7715adb08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca5d44ce51cdd667a3c32430… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 26 19:53:54 2007 +0000 credui: Set the focus to the username edit control. --- dlls/credui/credui_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 48ba132..6bd6330 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -73,7 +73,8 @@ static INT_PTR CALLBACK CredDialogProc(H SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); if (params->pszCaptionText) SetWindowTextW(hwndDlg, params->pszCaptionText); - return TRUE; + SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + return FALSE; } case WM_COMMAND: switch (wParam)

1 0

Rob Shearman : credui: Implement CredUIParseUserName.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: c9c328c12202385d9405517ed6311389d2a1b9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c328c12202385d9405517ed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 26 19:54:19 2007 +0000 credui: Implement CredUIParseUserName. --- dlls/credui/credui.spec | 2 +- dlls/credui/credui_main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index ce54235..20146c7 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -4,7 +4,7 @@ @ stdcall CredUIConfirmCredentialsW(wstr long) @ stub CredUIInitControls @ stub CredUIParseUserNameA -@ stub CredUIParseUserNameW +@ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA @ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) @ stub CredUIReadSSOCredA diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 6bd6330..5294b21 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -29,6 +29,7 @@ #include "credui_resources.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(credui); @@ -177,3 +178,57 @@ DWORD WINAPI CredUIConfirmCredentialsW(P bConfirm ? "TRUE" : "FALSE"); return ERROR_SUCCESS; } + +/****************************************************************************** + * CredUIParseUserNameW [CREDUI.@] + */ +DWORD WINAPI CredUIParseUserNameW(PCWSTR pszUserName, PWSTR pszUser, + ULONG ulMaxUserChars, PWSTR pszDomain, + ULONG ulMaxDomainChars) +{ + PWSTR p; + + TRACE("(%s, %p, %d, %p, %d)\n", debugstr_w(pszUserName), pszUser, + ulMaxUserChars, pszDomain, ulMaxDomainChars); + + if (!pszUserName || !pszUser || !ulMaxUserChars || !pszDomain || + !ulMaxDomainChars) + return ERROR_INVALID_PARAMETER; + + /* FIXME: handle marshaled credentials */ + + p = strchrW(pszUserName, '\\'); + if (p) + { + if (p - pszUserName > ulMaxDomainChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + if (strlenW(p + 1) > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszUser, p + 1); + memcpy(pszDomain, pszUserName, (p - pszUserName)*sizeof(WCHAR)); + pszDomain[p - pszUserName] = '\0'; + + return ERROR_SUCCESS; + } + + p = strrchrW(pszUserName, '@'); + if (p) + { + if (p + 1 - pszUserName > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + if (strlenW(p + 1) > ulMaxDomainChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszDomain, p + 1); + memcpy(pszUser, pszUserName, (p - pszUserName)*sizeof(WCHAR)); + pszUser[p - pszUserName] = '\0'; + + return ERROR_SUCCESS; + } + + if (strlenW(pszUserName) > ulMaxUserChars - 1) + return ERROR_INSUFFICIENT_BUFFER; + strcpyW(pszUser, pszUserName); + pszDomain[0] = '\0'; + + return ERROR_SUCCESS; +}

1 0

Rob Shearman : credui: Fill out the username, password and domain edit boxes from the values input to CredUIPromptForCredentialsW .
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 7ed705eb2e0fe4b36cbcc10ee778ad44156d0faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed705eb2e0fe4b36cbcc10ee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 26 19:54:24 2007 +0000 credui: Fill out the username, password and domain edit boxes from the values input to CredUIPromptForCredentialsW. Set the focus to the password edit box, unless the user edit box is empty. --- dlls/credui/credui_main.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 5294b21..8c21d13 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -71,10 +71,26 @@ static INT_PTR CALLBACK CredDialogProc(H case WM_INITDIALOG: { struct cred_dialog_params *params = (struct cred_dialog_params *)lParam; + DWORD ret; + WCHAR user[256]; + WCHAR domain[256]; + SetWindowLongPtrW(hwndDlg, DWLP_USER, (LONG_PTR)params); + ret = CredUIParseUserNameW(params->pszUsername, user, 256, domain, 256); + if (ret == ERROR_SUCCESS) + { + SetDlgItemTextW(hwndDlg, IDC_USERNAME, user); + SetDlgItemTextW(hwndDlg, IDC_DOMAIN, domain); + } + SetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword); + + if (ret == ERROR_SUCCESS && user[0]) + SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); + else + SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + if (params->pszCaptionText) SetWindowTextW(hwndDlg, params->pszCaptionText); - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); return FALSE; } case WM_COMMAND:

1 0

Jacek Caban : shlwapi: Don' t unescape url in UrlCombineW with URL_FILE_USE_PATHURL flag.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: dae390d90b8a6415f44e4dcc3d10076f97d31597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae390d90b8a6415f44e4dcc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 26 18:50:21 2007 +0100 shlwapi: Don't unescape url in UrlCombineW with URL_FILE_USE_PATHURL flag. --- dlls/shlwapi/tests/path.c | 5 ++++- dlls/shlwapi/url.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 95f7e3f..41f9f14 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -195,7 +195,10 @@ const TEST_URL_COMBINE TEST_COMBINE[] = {"http://www.winehq.org/tests/#example", "tests9", 0, S_OK, "http://www.winehq.org/tests/tests9"}, {"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."}, {"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"}, - {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"} + {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}, + {"http://www.winehq.org/test/", "test%20file.txt", 0, S_OK, "http://www.winehq.org/test/test%20file.txt"}, + {"http://www.winehq.org/test/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/test/test%20file.txt"}, + {"http://www.winehq.org%2ftest/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org%2ftest/test%20file.txt"} }; struct { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index e844e6e..e89113f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -803,7 +803,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBa if (ret == S_OK) { /* Reuse mrelative as temp storage as its already allocated and not needed anymore */ - ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, dwFlags); + ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL)); if(SUCCEEDED(ret) && pszCombined) { lstrcpyW(pszCombined, mrelative); }

1 0

Jacek Caban : urlmon: Call AddRef in CoInternetGetSession.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 76b821bdd70d11d6161611f55b43d99c2cd8d64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b821bdd70d11d6161611f55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 26 18:49:59 2007 +0100 urlmon: Call AddRef in CoInternetGetSession. --- dlls/urlmon/session.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 670b0f5..f66b22e 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -331,6 +331,7 @@ HRESULT WINAPI CoInternetGetSession(DWOR if(dwReserved) ERR("dwReserved=%d\n", dwReserved); + IInternetSession_AddRef(&InternetSession); *ppIInternetSession = &InternetSession; return S_OK; }

1 0

Jacek Caban : urlmon: Code clean up.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 1ba20d3b8b030e00d476cd2fe2050eda486b1797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba20d3b8b030e00d476cd2fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 26 18:50:43 2007 +0100 urlmon: Code clean up. --- dlls/urlmon/umon.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index c8cef9c..49260ab 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -339,7 +339,7 @@ static ULONG WINAPI URLMonikerImpl_AddRe URLMonikerImpl *This = (URLMonikerImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); + TRACE("(%p) ref=%u\n",This, refCount); return refCount; } @@ -352,7 +352,7 @@ static ULONG WINAPI URLMonikerImpl_Relea URLMonikerImpl *This = (URLMonikerImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); + TRACE("(%p) ref=%u\n",This, refCount); /* destroy the object if there's no more reference on it */ if (!refCount) { @@ -1167,7 +1167,6 @@ HRESULT WINAPI CreateURLMoniker(IMoniker { URLMonikerImpl *obj; HRESULT hres; - IID iid = IID_IMoniker; LPOLESTR lefturl = NULL; TRACE("(%p, %s, %p)\n", pmkContext, debugstr_w(szURL), ppmk); @@ -1189,7 +1188,7 @@ HRESULT WINAPI CreateURLMoniker(IMoniker hres = URLMonikerImpl_Construct(obj, lefturl, szURL); CoTaskMemFree(lefturl); if(SUCCEEDED(hres)) - hres = URLMonikerImpl_QueryInterface((IMoniker*)obj, &iid, (void**)ppmk); + hres = URLMonikerImpl_QueryInterface((IMoniker*)obj, &IID_IMoniker, (void**)ppmk); else HeapFree(GetProcessHeap(), 0, obj); return hres;

1 0

Mike McCormack : oleview: Remove many casts.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: b858b78990cfad446120b9224941dd4c221fe5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b858b78990cfad446120b9224… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 23:48:42 2007 +0900 oleview: Remove many casts. --- programs/oleview/typelib.c | 322 +++++++++++++++++++++---------------------- 1 files changed, 157 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b858b78990cfad446120b…

1 0

Francois Gouget : winapi_check: Print a warning when 'long' is used in an API file as this type is not Win64 compatible.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: dffe626a9c58b79930076adf83f9d3570f274fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffe626a9c58b79930076adf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 18:21:54 2007 +0100 winapi_check: Print a warning when 'long' is used in an API file as this type is not Win64 compatible. --- tools/winapi/winapi.pm | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 8fcaa41..e5ed445 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -192,6 +192,10 @@ sub parse_api_file($$) { } } elsif(defined($kind)) { my $type = $_; + if ($type =~ /^long\b/) + { + $output->write("$file:$linenum: type ($type) is not Win64 compatible\n"); + } if(!$forbidden) { if(defined($module)) { if($$allowed_modules_unlimited{$type}) {

1 0