January 2008 - Wine-Commits

Rob Shearman : credui: Return the state of the dialog' s save checkbox to CredUIPromptForCredentials.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 8bee6946cc7c969efb9b41ee12334231eb9dfe2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bee6946cc7c969efb9b41ee1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 23 16:33:13 2008 +0000 credui: Return the state of the dialog's save checkbox to CredUIPromptForCredentials. --- dlls/credui/credui_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 342e701..42316d6 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -462,6 +462,8 @@ static void CredDialogCommandOk(HWND hwndDlg, struct cred_dialog_params *params) GetDlgItemTextW(hwndDlg, IDC_PASSWORD, params->pszPassword, params->ulPasswordMaxChars); + params->fSave = IsDlgButtonChecked(hwndDlg, IDC_SAVE) == BST_CHECKED; + EndDialog(hwndDlg, IDOK); }

1 0

Rob Shearman : rpcrt4: Check the return value of RPCRT4_ClientAuthorize in RPCRT4_Send.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 7277113af398170073d50170c3d2971e02a95ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7277113af398170073d50170c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 23 16:33:03 2008 +0000 rpcrt4: Check the return value of RPCRT4_ClientAuthorize in RPCRT4_Send. --- dlls/rpcrt4/rpc_message.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index a720199..de6f97d 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -676,9 +676,12 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, } /* tack on a negotiate packet */ - RPCRT4_ClientAuthorize(Connection, NULL, &out); - r = RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, out.pvBuffer, out.cbBuffer); - HeapFree(GetProcessHeap(), 0, out.pvBuffer); + r = RPCRT4_ClientAuthorize(Connection, NULL, &out); + if (r == RPC_S_OK) + { + r = RPCRT4_SendAuth(Connection, Header, Buffer, BufferLength, out.pvBuffer, out.cbBuffer); + HeapFree(GetProcessHeap(), 0, out.pvBuffer); + } return r; }

1 0

Rob Shearman : rpcrt4: Pass the SPN input to RpcBindingSetAuthInfoA/ W into InitializeSecurityContextW instead of AcquireCredentialsHandleA/W.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 2badb4faea2d1256f397ee03950161ec8d7a41e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2badb4faea2d1256f397ee039… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 23 16:32:54 2008 +0000 rpcrt4: Pass the SPN input to RpcBindingSetAuthInfoA/W into InitializeSecurityContextW instead of AcquireCredentialsHandleA/W. --- dlls/rpcrt4/rpc_binding.c | 32 ++++++++++++++++++++++++++------ dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_message.c | 8 ++++---- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index bcf89da..3a8afde 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -937,6 +937,7 @@ static RPC_STATUS RpcAuthInfo_Create(ULONG AuthnLevel, ULONG AuthnSvc, AuthInfo->exp = exp; AuthInfo->cbMaxToken = cbMaxToken; AuthInfo->identity = identity; + AuthInfo->server_principal_name = NULL; /* duplicate the SEC_WINNT_AUTH_IDENTITY structure, if applicable, to * enable better matching in RpcAuthInfo_IsEqual */ @@ -1004,6 +1005,7 @@ ULONG RpcAuthInfo_Release(RpcAuthInfo *AuthInfo) HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->Password); HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity); } + HeapFree(GetProcessHeap(), 0, AuthInfo->server_principal_name); HeapFree(GetProcessHeap(), 0, AuthInfo); } @@ -1415,7 +1417,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, } TRACE("found package %s for service %u\n", packages[i].Name, AuthnSvc); - r = AcquireCredentialsHandleA((SEC_CHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, + r = AcquireCredentialsHandleA(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); cbMaxToken = packages[i].cbMaxToken; FreeContextBuffer(packages); @@ -1426,8 +1428,17 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, AuthIdentity, &new_auth_info); if (r == RPC_S_OK) { - if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); - bind->AuthInfo = new_auth_info; + new_auth_info->server_principal_name = RPCRT4_strdupAtoW((char *)ServerPrincName); + if (new_auth_info->server_principal_name) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = new_auth_info; + } + else + { + RpcAuthInfo_Release(new_auth_info); + r = ERROR_OUTOFMEMORY; + } } else FreeCredentialsHandle(&cred); @@ -1535,7 +1546,7 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, } TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), AuthnSvc); - r = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, + r = AcquireCredentialsHandleW(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); cbMaxToken = packages[i].cbMaxToken; FreeContextBuffer(packages); @@ -1546,8 +1557,17 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, AuthIdentity, &new_auth_info); if (r == RPC_S_OK) { - if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); - bind->AuthInfo = new_auth_info; + new_auth_info->server_principal_name = RPCRT4_strdupW(ServerPrincName); + if (new_auth_info->server_principal_name) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = new_auth_info; + } + else + { + RpcAuthInfo_Release(new_auth_info); + r = ERROR_OUTOFMEMORY; + } } else FreeCredentialsHandle(&cred); diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index e3a3c95..e169a65 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -41,6 +41,7 @@ typedef struct _RpcAuthInfo /* our copy of NT auth identity structure, if the authentication service * takes an NT auth identity */ SEC_WINNT_AUTH_IDENTITY_W *nt_identity; + LPWSTR server_principal_name; } RpcAuthInfo; typedef struct _RpcQualityOfService diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index f56e3a4..a720199 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -581,10 +581,10 @@ static RPC_STATUS RPCRT4_ClientAuthorize(RpcConnection *conn, SecBuffer *in, inp_desc.pBuffers = in; inp_desc.ulVersion = 0; - r = InitializeSecurityContextA(&conn->AuthInfo->cred, in ? &conn->ctx : NULL, - NULL, context_req, 0, SECURITY_NETWORK_DREP, - in ? &inp_desc : NULL, 0, &conn->ctx, &out_desc, &conn->attr, - &conn->exp); + r = InitializeSecurityContextW(&conn->AuthInfo->cred, in ? &conn->ctx : NULL, + in ? NULL : conn->AuthInfo->server_principal_name, context_req, 0, + SECURITY_NETWORK_DREP, in ? &inp_desc : NULL, 0, &conn->ctx, + &out_desc, &conn->attr, &conn->exp); if (FAILED(r)) { WARN("InitializeSecurityContext failed with error 0x%08x\n", r);

1 0

Rob Shearman : rpcrt4: Fix the error handling in RpcBindingSetAuthInfoA/ W when RpcAuthInfo_Create fails.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: fef5ce52ce380c17de68ef1cd7df063e364f2846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef5ce52ce380c17de68ef1cd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 23 16:32:45 2008 +0000 rpcrt4: Fix the error handling in RpcBindingSetAuthInfoA/W when RpcAuthInfo_Create fails. Don't release the old auth info until we successfully have a new auth info and return failure to the caller if RpcAuthInfo_Create fails. --- dlls/rpcrt4/rpc_binding.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 24769e2..bcf89da 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1421,13 +1421,17 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, FreeContextBuffer(packages); if (r == ERROR_SUCCESS) { - if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); - bind->AuthInfo = NULL; + RpcAuthInfo *new_auth_info; r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, cbMaxToken, - AuthIdentity, &bind->AuthInfo); - if (r != RPC_S_OK) + AuthIdentity, &new_auth_info); + if (r == RPC_S_OK) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = new_auth_info; + } + else FreeCredentialsHandle(&cred); - return RPC_S_OK; + return r; } else { @@ -1537,13 +1541,17 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, FreeContextBuffer(packages); if (r == ERROR_SUCCESS) { - if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); - bind->AuthInfo = NULL; + RpcAuthInfo *new_auth_info; r = RpcAuthInfo_Create(AuthnLevel, AuthnSvc, cred, exp, cbMaxToken, - AuthIdentity, &bind->AuthInfo); - if (r != RPC_S_OK) + AuthIdentity, &new_auth_info); + if (r == RPC_S_OK) + { + if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); + bind->AuthInfo = new_auth_info; + } + else FreeCredentialsHandle(&cred); - return RPC_S_OK; + return r; } else {

1 0

Francois Gouget : winemenubuilder: Expand environment variable references in the shortcut's WorkDir, Description and IconPath fields.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 5819b90f9534b220fe3790b7a1cbe45624c0c2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5819b90f9534b220fe3790b7a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 23 18:31:06 2008 +0100 winemenubuilder: Expand environment variable references in the shortcut's WorkDir, Description and IconPath fields. --- programs/winemenubuilder/winemenubuilder.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 92660bb..06ffd45 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -866,6 +866,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *escaped_path = NULL, *escaped_args = NULL, *escaped_description = NULL; + WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; int iIconId = 0, r = -1; @@ -890,20 +891,23 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) } WINE_TRACE("Link : %s\n", wine_dbgstr_a(link_name)); - szWorkDir[0] = 0; - IShellLinkW_GetWorkingDirectory( sl, szWorkDir, MAX_PATH ); + szTmp[0] = 0; + IShellLinkW_GetWorkingDirectory( sl, szTmp, MAX_PATH ); + ExpandEnvironmentStringsW(szTmp, szWorkDir, MAX_PATH); WINE_TRACE("workdir : %s\n", wine_dbgstr_w(szWorkDir)); - szDescription[0] = 0; - IShellLinkW_GetDescription( sl, szDescription, INFOTIPSIZE ); + szTmp[0] = 0; + IShellLinkW_GetDescription( sl, szTmp, INFOTIPSIZE ); + ExpandEnvironmentStringsW(szTmp, szDescription, INFOTIPSIZE); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs)); - szIconPath[0] = 0; - IShellLinkW_GetIconLocation( sl, szIconPath, MAX_PATH, &iIconId ); + szTmp[0] = 0; + IShellLinkW_GetIconLocation( sl, szTmp, MAX_PATH, &iIconId ); + ExpandEnvironmentStringsW(szTmp, szIconPath, MAX_PATH); WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) ); if( !szPath[0] )

1 0

Francois Gouget : advapi32/tests: Add the trailing '\n' to an ok() call.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 269cb45f2571e1afa4fb4e0c6b8612c6ef40a321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269cb45f2571e1afa4fb4e0c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 15:16:40 2008 +0100 advapi32/tests: Add the trailing '\n' to an ok() call. --- dlls/advapi32/tests/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 38df62b..f0b7867 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -950,7 +950,7 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); ok(ret, "expected QueryServiceConfig2A to succeed\n"); ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); - ok(!pConfig->lpDescription, "expected lpDescription to be NULL, got %p", pConfig->lpDescription); + ok(!pConfig->lpDescription, "expected lpDescription to be NULL, got %p\n", pConfig->lpDescription); SetLastError(0xdeadbeef); needed = 0;

1 0

Alexandre Julliard : winex11: Get the icon from the window in case it was changed before the whole window was created .
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: e929e3b603d0f375c4ae986137ae561131cc131e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e929e3b603d0f375c4ae98613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 16:40:54 2008 +0100 winex11: Get the icon from the window in case it was changed before the whole window was created. --- dlls/winex11.drv/window.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index aa860ee..c52d13a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -849,8 +849,10 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data if (data->wm_hints) { + HICON icon = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 ); + if (!icon) icon = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ); data->wm_hints->flags = 0; - set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) ); + set_icon_hints( display, data, icon ); } }

1 0

Dmitry Timoshkov : user32: Make MapVirtualKeyEx(MAPVK_VK_TO_CHAR) behave more like in Windows.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: e5e261f104b88cf703f359ff7ab9da6b88f334ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e261f104b88cf703f359ff7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 23 20:26:57 2008 +0800 user32: Make MapVirtualKeyEx(MAPVK_VK_TO_CHAR) behave more like in Windows. --- dlls/user32/input.c | 13 ++++++++++++- dlls/winex11.drv/keyboard.c | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 7796e96..354272b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -622,7 +622,18 @@ UINT WINAPI MapVirtualKeyW(UINT code, UINT maptype) */ UINT WINAPI MapVirtualKeyExA(UINT code, UINT maptype, HKL hkl) { - return MapVirtualKeyExW(code, maptype, hkl); + UINT ret; + + ret = MapVirtualKeyExW( code, maptype, hkl ); + if (maptype == MAPVK_VK_TO_CHAR) + { + BYTE ch = 0; + WCHAR wch = ret; + + WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL ); + ret = ch; + } + return ret; } /****************************************************************************** diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b38dd34..5196d5e 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2121,17 +2121,15 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) /* let's do vkey -> keycode -> (XLookupString) ansi char */ XKeyEvent e; KeySym keysym; - int keyc; - char s[2]; - e.display = display; + int keyc, len; + char s[10]; - e.state = LockMask; - /* LockMask should behave exactly like caps lock - upercase - * the letter keys and that's about it. */ + e.display = display; + e.state = 0; + e.keycode = 0; wine_tsx11_lock(); - e.keycode = 0; /* We exit on the first keycode found, to speed up the thing. */ for (keyc=min_keycode; (keyc<=max_keycode) && (!e.keycode) ; keyc++) { /* Find a keycode that could have generated this virtual key */ @@ -2159,14 +2157,16 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) } TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); - if (XLookupString(&e, s, 2, &keysym, NULL)) + len = XLookupString(&e, s, sizeof(s), &keysym, NULL); + wine_tsx11_unlock(); + + if (len) { - wine_tsx11_unlock(); - returnMVK (*s); + WCHAR wch; + if (MultiByteToWideChar(CP_UNIXCP, 0, s, len, &wch, 1)) + returnMVK(toupperW(wch)); } - TRACE("returning no ANSI.\n"); - wine_tsx11_unlock(); return 0; } default: /* reserved */

1 0

Francois Gouget : kernel32/tests: Test the expansion of indirect environment variable references.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: e7e998004ac239658e1735d412fa3d35cecfbf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e998004ac239658e1735d41… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 23 15:16:53 2008 +0100 kernel32/tests: Test the expansion of indirect environment variable references. --- dlls/kernel32/tests/environ.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 5f85f5d..632e3bc 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -274,9 +274,19 @@ static void test_ExpandEnvironmentStringsA(void) ret_size1 = GetWindowsDirectoryA(buf1,256); ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n"); ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf)); - if (ERROR_ENVVAR_NOT_FOUND == GetLastError()) - return; - ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size); + if (ERROR_ENVVAR_NOT_FOUND != GetLastError()) + { + ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size); + } + + /* Try with a variable that references another */ + SetEnvironmentVariableA("IndirectVar", "Foo%EnvVar%Bar"); + strcpy(buf, "Indirect-%IndirectVar%-Indirect"); + strcpy(buf2, "Indirect-Foo%EnvVar%Bar-Indirect"); + ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); + ok(ret_size == strlen(buf2)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, strlen(buf2)+1); + ok(!strcmp(buf1, buf2), "ExpandEnvironmentStrings returned [%s]\n", buf1); + SetEnvironmentVariableA("IndirectVar", NULL); SetEnvironmentVariableA("EnvVar", NULL); }

1 0

Alexandre Julliard : winex11: Set icon hints on non-managed windows too, since they may become managed later on.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 12d1d4041a78839b8fb0b260e2531e9d2a15ad3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d1d4041a78839b8fb0b260e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 16:40:19 2008 +0100 winex11: Set icon hints on non-managed windows too, since they may become managed later on. --- dlls/winex11.drv/window.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1d6a060..aa860ee 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -602,12 +602,7 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO data->hWMIconBitmap = 0; data->hWMIconMask = 0; - if (!data->managed) - { - destroy_icon_window( display, data ); - hints->flags &= ~(IconPixmapHint | IconMaskHint | IconWindowHint); - } - else if (!hIcon) + if (!hIcon) { if (!data->icon_window) create_icon_window( display, data ); hints->icon_window = data->icon_window;

1 0