August 2011 - Wine-commits - list.winehq.org

Louis Lenders : shell32: Define icon resource 319.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 51beb857bd99edecbeb4eecf0df50902d903a0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51beb857bd99edecbeb4eecf0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 15 22:11:02 2011 +0200 shell32: Define icon resource 319. --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index eae541d..9eeaea7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -353,6 +353,10 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* @makedep: mydocs.ico */ IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: mydocs.ico */ +IDI_SHELL_FAVORITES ICON mydocs.ico + /* @makedep: idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 526b984..1c3a381 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -217,6 +217,7 @@ #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_FAVORITES 319 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170

1 0

André Hentschel : shell32/tests: Initial directory tests for ShellExecuteEx.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 176555354c956c0496cea23109f4315c46397c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=176555354c956c0496cea2310… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 14 19:19:11 2011 +0200 shell32/tests: Initial directory tests for ShellExecuteEx. --- dlls/shell32/tests/shlexec.c | 56 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 252aed7..31b0930 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -527,7 +527,7 @@ static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time static void doChild(int argc, char** argv) { - char* filename; + char *filename, longpath[MAX_PATH] = ""; HANDLE hFile, map; int i; int rc; @@ -553,6 +553,8 @@ static void doChild(int argc, char** argv) trace("argvA%d=%s\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } + GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); + childPrintf(hFile, "longPath=%s\r\n", encodeA(longpath)); map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) @@ -778,6 +780,26 @@ static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD lon /*** * + * PathFindFileNameA equivalent that supports WinNT + * + ***/ + +static LPSTR path_find_file_name(LPCSTR lpszPath) +{ + LPCSTR lastSlash = lpszPath; + + while (lpszPath && *lpszPath) + { + if ((*lpszPath == '\\' || *lpszPath == '/' || *lpszPath == ':') && + lpszPath[1] && lpszPath[1] != '\\' && lpszPath[1] != '/') + lastSlash = lpszPath + 1; + lpszPath = CharNext(lpszPath); + } + return (LPSTR)lastSlash; +} + +/*** + * * Tests * ***/ @@ -2179,6 +2201,37 @@ static void test_commandline(void) } } +static void test_directory(void) +{ + char path[MAX_PATH], newdir[MAX_PATH]; + char params[1024]; + int rc; + + /* copy this executable to a new folder and cd to it */ + sprintf(newdir, "%s\\newfolder", tmpdir); + rc = CreateDirectoryA( newdir, NULL ); + ok( rc, "failed to create %s err %u\n", path, GetLastError() ); + sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); + CopyFileA(argv0, path, FALSE); + SetCurrentDirectory(tmpdir), + + sprintf(params, "shlexec \"%s\" Exec", child_file); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path_find_file_name(argv0), params, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %d\n", shell_call, rc); + + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path_find_file_name(argv0), params, newdir); + ok(rc > 32, "%s returned %d\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + todo_wine okChildPath("longPath", path); + + DeleteFile(path); + RemoveDirectoryA(newdir); +} + START_TEST(shlexec) { @@ -2201,6 +2254,7 @@ START_TEST(shlexec) test_dde(); test_dde_default_app(); test_commandline(); + test_directory(); cleanup_test(); }

1 0

Aric Stewart : usp10/tests: Refactor test_ScriptXtoX to make testing varying datasets easier.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 126c779832059575f9f8126c1d413ef7aa07d445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126c779832059575f9f8126c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 22 07:18:39 2011 -0500 usp10/tests: Refactor test_ScriptXtoX to make testing varying datasets easier. --- dlls/usp10/tests/usp10.c | 227 ++++++++++++++++++---------------------------- 1 files changed, 88 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=126c779832059575f9f81…

1 0

Frédéric Delanoy : cmd: Fix FOR tab handling.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 20fa3fe8021a6ac667e542160e0ffdfdf379c16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20fa3fe8021a6ac667e542160… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 23 22:54:50 2011 +0200 cmd: Fix FOR tab handling. --- programs/cmd/builtins.c | 30 ++++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 11 +++++++---- programs/cmd/wcmdmain.c | 24 +++++++++++++++++------- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c4ad231..7aaa900 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -902,8 +902,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WIN32_FIND_DATAW fd; HANDLE hff; int i; - const WCHAR inW[] = {'i', 'n', ' ', '\0'}; - const WCHAR doW[] = {'d', 'o', ' ', '\0'}; + const WCHAR inW[] = {'i', 'n', ' ', '\0'}; + const WCHAR inTabW[] = {'i', 'n', '\t', '\0'}; + const WCHAR doW[] = {'d', 'o', ' ', '\0'}; + const WCHAR doTabW[] = {'d', 'o', '\t', '\0'}; CMD_LIST *setStart, *thisSet, *cmdStart, *cmdEnd; WCHAR variable[4]; WCHAR *firstCmd; @@ -938,7 +940,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Skip whitespace */ curPos++; - while (*curPos && *curPos==' ') curPos++; + while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; /* Next parm is either qualifier, path/options or variable - only care about it if it is the path/options */ @@ -954,11 +956,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } /* Skip whitespace between qualifiers */ - while (*curPos && *curPos==' ') curPos++; + while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; } /* Skip whitespace before variable */ - while (*curPos && *curPos==' ') curPos++; + while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; /* Ensure line continues with variable */ if (!*curPos || *curPos != '%') { @@ -968,19 +970,21 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Variable should follow */ i = 0; - while (curPos[i] && curPos[i]!=' ') i++; + while (curPos[i] && curPos[i]!=' ' && curPos[i]!='\t') i++; memcpy(&variable[0], curPos, i*sizeof(WCHAR)); variable[i] = 0x00; WINE_TRACE("Variable identified as %s\n", wine_dbgstr_w(variable)); curPos = &curPos[i]; /* Skip whitespace before IN */ - while (*curPos && *curPos==' ') curPos++; + while (*curPos && (*curPos==' ' || *curPos=='\t')) curPos++; /* Ensure line continues with IN */ if (!*curPos - || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, inW, -1) != CSTR_EQUAL) { + || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, inW, -1) != CSTR_EQUAL + && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, inTabW, -1) != CSTR_EQUAL)) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1005,9 +1009,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Syntax error if missing close bracket, or nothing following it and once we have the complete set, we expect a DO */ WINE_TRACE("Looking for 'do' in %p\n", *cmdList); - if ((*cmdList == NULL) || - (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 3, doW, -1) != CSTR_EQUAL)) { + if ((*cmdList == NULL) + || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + (*cmdList)->command, 3, doW, -1) != CSTR_EQUAL + && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + (*cmdList)->command, 3, doTabW, -1) != CSTR_EQUAL)) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b815e77..0d2f983 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -386,6 +386,7 @@ for %%i in(a)tab@(X3) do echo %%i for %%i in (@tab@ foo(a)tab@) do echo %%i for(a)tab@ %%i in(a)tab@(@tab(a)M) do echo %%i for %%i(a)tab@in (X)@tab(a)do@tab(a)echo %%i +for(a)tab@ %%j in(a)tab@(@tab(a)M, N, O(a)tab@) do echo %%j goto :endForTestFun1 :forTestFun1 echo %1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b86c012..1138485 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -275,11 +275,14 @@ A B C X -(a)todo_wine@X2 -(a)todo_wine@X3 +X2 +X3 foo -(a)todo_wine@M -(a)todo_wine@X +M +X +M +N +O ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d758857..67b6ef4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1742,7 +1742,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ const WCHAR remCmd[] = {'r','e','m',' ','\0'}; - const WCHAR forCmd[] = {'f','o','r',' ','\0'}; + const WCHAR forCmd[] = {'f','o','r',' ' ,'\0'}; + const WCHAR forTabCmd[] = {'f','o','r','\t','\0'}; const WCHAR ifCmd[] = {'i','f',' ','\0'}; const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; BOOL inRem = FALSE; @@ -1826,7 +1827,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { - const WCHAR forDO[] = {'d','o',' ','\0'}; + const WCHAR forDO[] = {'d','o',' ' ,'\0'}; + const WCHAR forDOTab[] = {'d','o','\t','\0'}; /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, @@ -1835,7 +1837,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* If command starts with 'for', handle ('s mid line after IN or DO */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, forCmd, -1) == CSTR_EQUAL) { + curPos, 4, forCmd, -1) == CSTR_EQUAL + || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 4, forTabCmd, -1) == CSTR_EQUAL) { inFor = TRUE; /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this @@ -1863,7 +1867,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE is then 0, and all whitespace is skipped */ } else if (inFor && (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forDO, -1) == CSTR_EQUAL)) { + curPos, 3, forDO, -1) == CSTR_EQUAL + || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, forDOTab, -1) == CSTR_EQUAL)) { WINE_TRACE("Found DO\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1876,12 +1882,15 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Special handling for the 'FOR' command */ if (inFor && lastWasWhiteSpace) { - const WCHAR forIN[] = {'i','n',' ','\0'}; + const WCHAR forIN[] = {'i','n',' ' ,'\0'}; + const WCHAR forINTab[] = {'i','n','\t','\0'}; WINE_TRACE("Found 'FOR', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forIN, -1) == CSTR_EQUAL) { + curPos, 3, forIN, -1) == CSTR_EQUAL + || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, forINTab, -1) == CSTR_EQUAL) { WINE_TRACE("Found IN\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE; @@ -2106,7 +2115,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* At various times we need to know if we have only skipped whitespace, so reset this variable and then it will remain true until a non whitespace is found */ - if ((thisChar != ' ') && (thisChar != '\n')) onlyWhiteSpace = FALSE; + if ((thisChar != ' ') && (thisChar != '\t') && (thisChar != '\n')) + onlyWhiteSpace = FALSE; /* Flag end of interest in FOR DO and IN parms once something has been processed */ if (!lastWasWhiteSpace) {

1 0

André Hentschel : winex11: Reject too bright gamma ramps.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 56e804eea4c5976b59cb6adc94baa67dd83886c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e804eea4c5976b59cb6adc9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 23 23:16:26 2011 +0200 winex11: Reject too bright gamma ramps. --- dlls/gdi32/tests/dc.c | 7 +++++++ dlls/winex11.drv/xvidmode.c | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 0bc218c..9f26f41 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -644,6 +644,13 @@ static void test_gamma(void) ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n"); + /* try a bright gamma ramp */ + ramp[0][0] = 0; + ramp[0][1] = 0x7FFF; + for (i = 2; i < 256; i++) ramp[0][i] = 0xFFFF; + ret = SetDeviceGammaRamp(hdc, &ramp); + ok(!ret, "SetDeviceGammaRamp succeeded\n"); + /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); ok(ret, "SetDeviceGammaRamp failed\n"); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 732a2d7..2d8a4eb 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -339,6 +339,11 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) ERR("ramp not uniform (max=%f, min=%f, avg=%f), rejected\n", g_max, g_min, g_avg); return FALSE; } + /* check that the gamma is not too bright */ + if (g_avg < 0.2) { + ERR("too bright gamma ( %5.3f), rejected\n", g_avg); + return FALSE; + } /* ok, now we're pretty sure we can set the desired gamma ramp, * so go for it */ *gamma = 1/g_avg;

1 0

Thomas Mullaly : include: Added declarations for IInternetSecurityManagerEx and IInternetSecurityManagerEx2 .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 309af7274281b90d81d70b73f0da2994dc9e6cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309af7274281b90d81d70b73f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 20 18:42:32 2011 -0400 include: Added declarations for IInternetSecurityManagerEx and IInternetSecurityManagerEx2. --- include/urlmon.idl | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a8a0a71..bbe85f0 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -28,6 +28,7 @@ cpp_quote("#undef SetPort") cpp_quote("#endif") interface IInternetProtocolSink; +interface IUri; /***************************************************************************** * IInternet interface @@ -1067,6 +1068,76 @@ cpp_quote("#define MAX_SIZE_SECURITY_ID 512") } /***************************************************************************** + * IInternetSecurityManagerEx interface + */ +cpp_quote("#define SID_SInternetSecurityManagerEx IID_IInternetSecurityManagerEx") + +[ + object, + uuid(f164edf1-cc7c-4f0d-9a94-34222625C393), + pointer_default(unique) +] +interface IInternetSecurityManagerEx : IInternetSecurityManager +{ + HRESULT ProcessUrlActionEx( + [in] LPCWSTR pwszUrl, + [in] DWORD dwAction, + [out] BYTE *pPolicy, + [in] DWORD cbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwFlags, + [in] DWORD dwReserved, + [out] DWORD *pdwOutFlags); +} + +/***************************************************************************** + * IInternetSecurityManagerEx2 interface + */ +cpp_quote("#define SID_SInternetSecurityManagerEx2 IID_IInternetSecurityManagerEx2") + +[ + object, + uuid(f1e50292-a795-4117-8e09-2b560a72ac60), + pointer_default(unique) +] +interface IInternetSecurityManagerEx2 : IInternetSecurityManagerEx +{ + HRESULT MapUrlToZoneEx2( + [in] IUri *pUri, + [out] DWORD *pdwZone, + [in] DWORD dwFlags, + [out] LPWSTR *ppwszMappedUrl, + [out] DWORD *pdwOutFlags); + + HRESULT ProcessUrlActionEx2( + [in] IUri *pUri, + [in] DWORD dwAction, + [out] BYTE *pPolicy, + [in] DWORD cbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] DWORD *pdwOutFlags); + + HRESULT GetSecurityIdEx2( + [in] IUri *pUri, + [out] BYTE *pbSecurityId, + [in, out] DWORD *pcbSecurityId, + [in] DWORD_PTR dwReserved); + + HRESULT QueryCustomPolicyEx2( + [in] IUri *pUri, + [in] REFGUID guidKey, + [out] BYTE **ppPolicy, + [out] DWORD *pcbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD_PTR dwReserved); +} + +/***************************************************************************** * IInternetHostSecurityManager interface */ cpp_quote("#define SID_SInternetHostSecurityManager IID_IInternetHostSecurityManager")

1 0

Thomas Mullaly : urlmon: Added stubs for IInternetSecurityManagerEx{2}.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 912aa4a49910bb4d590072fb6197f81457b63f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=912aa4a49910bb4d590072fb6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Aug 20 23:58:44 2011 -0400 urlmon: Added stubs for IInternetSecurityManagerEx{2}. --- dlls/urlmon/sec_mgr.c | 111 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 82 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=912aa4a49910bb4d59007…

1 0

Thomas Mullaly : urlmon/tests: Added tests for MapUrlToZoneEx2.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: efe68dcde125b90ffd525eb9ddc8ad5708f58cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe68dcde125b90ffd525eb9d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Aug 21 20:44:40 2011 -0400 urlmon/tests: Added tests for MapUrlToZoneEx2. --- dlls/urlmon/tests/sec_mgr.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2ba9f0c..3d630b8 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1609,6 +1609,88 @@ static void test_InternetGetSecurityUrlEx_Pluggable(void) if(uri) IUri_Release(uri); } +static const struct { + const char *uri; + DWORD create_flags; + HRESULT map_hres; + DWORD zone; + BOOL map_todo; +} sec_mgr_ex2_tests[] = { + {"res://mshtml.dll/blank.htm",0,S_OK,URLZONE_LOCAL_MACHINE,TRUE}, + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,0,URLZONE_INTERNET,TRUE}, + {"file://c:\\Index.html",0,0,URLZONE_LOCAL_MACHINE,TRUE}, + {"http://www.zone3.winetest/",0,0,URLZONE_INTERNET,TRUE}, + {"about:blank",0,0,URLZONE_INTERNET,TRUE}, + {"ftp://zone3.winetest/file.test",0,0,URLZONE_INTERNET,TRUE} +}; + +static void test_SecurityManagerEx2(void) +{ + HRESULT hres; + DWORD i, zone; + IInternetSecurityManager *sec_mgr; + IInternetSecurityManagerEx2 *sec_mgr2; + IUri *uri = NULL; + + if(!pCreateUri) { + win_skip("Skipping SecurityManagerEx2, IE is too old\n"); + return; + } + + trace("Testing SecurityManagerEx2...\n"); + + hres = pCoInternetCreateSecurityManager(NULL, &sec_mgr, 0); + ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); + + hres = IInternetSecurityManager_QueryInterface(sec_mgr, &IID_IInternetSecurityManagerEx2, (void**)&sec_mgr2); + ok(hres == S_OK, "QueryInterface(IID_IInternetSecurityManagerEx2) failed: %08x\n", hres); + + zone = 0xdeadbeef; + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, NULL, &zone, 0, NULL, NULL); + todo_wine ok(hres == E_INVALIDARG, "MapUrlToZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + todo_wine ok(zone == URLZONE_INVALID, "zone was %d\n", zone); + + hres = pCreateUri(url5, 0, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, NULL, 0, NULL, NULL); + todo_wine ok(hres == E_INVALIDARG, "MapToUrlZoneEx2 returned %08x, expected E_INVALIDARG\n", hres); + + IUri_Release(uri); + + for(i = 0; i < sizeof(sec_mgr_ex2_tests)/sizeof(sec_mgr_ex2_tests[0]); ++i) { + LPWSTR uriW = a2w(sec_mgr_ex2_tests[i].uri); + + uri = NULL; + zone = URLZONE_INVALID; + + hres = pCreateUri(uriW, sec_mgr_ex2_tests[i].create_flags, 0, &uri); + ok(hres == S_OK, "CreateUri returned %08x on test %d\n", hres, i); + + hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); + if(sec_mgr_ex2_tests[i].map_todo) { + todo_wine + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x on test %d\n", + hres, sec_mgr_ex2_tests[i].map_hres, i); + todo_wine + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, + zone, i); + } else { + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x on test %d\n", + hres, sec_mgr_ex2_tests[i].map_hres, i); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, + zone, i); + } + + heap_free(uriW); + IUri_Release(uri); + } + + IInternetSecurityManagerEx2_Release(sec_mgr2); + IInternetSecurityManager_Release(sec_mgr); +} + START_TEST(sec_mgr) { HMODULE hurlmon; @@ -1648,6 +1730,7 @@ START_TEST(sec_mgr) } test_SecurityManager(); + test_SecurityManagerEx2(); test_polices(); test_zone_domains(); test_CoInternetCreateZoneManager();

1 0

Damjan Jovanovic : winemenubuilder: Use the command from the "open" verb.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 3c7b08be2703233408612f241920fc9772e52b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7b08be2703233408612f241… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 24 04:47:07 2011 +0200 winemenubuilder: Use the command from the "open" verb. --- programs/winemenubuilder/winemenubuilder.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e6dc504..f42f3b1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -974,6 +974,7 @@ end: static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) { + static const WCHAR openW[] = {'o','p','e','n',0}; WCHAR *extension; WCHAR *icon = NULL; WCHAR *comma; @@ -999,7 +1000,7 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) } else { - executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, NULL); + executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, openW); if (executable) hr = open_icon(executable, 0, FALSE, ppStream); } @@ -2612,7 +2613,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); - friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, NULL); + friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, openW); if (friendlyAppNameW) { friendlyAppNameA = wchars_to_utf8_chars(friendlyAppNameW);

1 0

Nikolay Sivov : kernel32/nls: Added placeholder for LOCALE_SNATIVEDISPLAYNAME, header updated with new locale entries.
by Alexandre Julliard 24 Aug '11

24 Aug '11

1 0