September 2007 - Wine-Commits

Stefan Dösinger : wined3d: Add D3DSI_TEXLD_PROJECT and BIAS to d3d9types.h.
by Alexandre Julliard Sept. 17, 2007

Sept. 17, 2007

Module: wine Branch: master Commit: 43af9aec19535cb5faf854fcd373379cb8ddf542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43af9aec19535cb5faf854fcd… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Sep 11 00:35:54 2007 +0200 wined3d: Add D3DSI_TEXLD_PROJECT and BIAS to d3d9types.h. --- include/d3d9types.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index e99e134..1a0ebec 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -452,6 +452,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSHADER_INSTRUCTION_PREDICATED (1 << 28) +#define D3DSI_TEXLD_PROJECT 0x00010000 +#define D3DSI_TEXLD_BIAS 0x00020000 + /** for parallelism */ #define D3DSI_COISSUE 0x40000000

1 0

Alexandre Julliard : Wine release 0.9.45
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: website Branch: master Commit: c75f3f62a7caf287ae26f99ecfc712f0bedc6936 URL: http://source.winehq.org/git/website.git/?a=commit;h=c75f3f62a7caf287ae26f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 19:39:46 2007 +0200 Wine release 0.9.45 --- include/winehq.conf | 2 +- news/2007091401.xml | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index 25af175..9862561 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.44 +snapshot_date: 0.9.45 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007091401.xml b/news/2007091401.xml new file mode 100644 index 0000000..ccb48dd --- /dev/null +++ b/news/2007091401.xml @@ -0,0 +1,25 @@ +<news> +<date>September 14, 2007</date> +<title>Wine 0.9.45 Released</title> +<body> +<p>Wine 0.9.45 was released today, with the following main changes:</p> + +<ul> +<li>Many improvements to the crypto dlls (should make iTunes work).</li> +<li>The usual assortment of Direct3D improvements.</li> +<li>A number of fixes to sound support.</li> +<li>Many more WordPad features.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.45.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.45">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.45 : Alexandre Julliard : Release 0.9.45
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: refs/tags/wine-0.9.45 Tag: b425b6e1100ad42039f4cc6173a2949dcb153407 URL: http://source.winehq.org/git/wine.git/?a=tag;h=b425b6e1100ad42039f4cc6173a2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 19:30:55 2007 +0200 Release 0.9.45

1 0

Alexandre Julliard : Release 0.9.45.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 69016cfacb89c7bd33aa59e6e1db27b839ca4434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69016cfacb89c7bd33aa59e6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 19:30:55 2007 +0200 Release 0.9.45. --- ANNOUNCE | 1027 ++++++++++++++++---------------- ChangeLog | 1968 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2498 insertions(+), 517 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69016cfacb89c7bd33aa5…

1 0

Alexandre Julliard : wine_release: Install files by moving them into place to avoid permission issues.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: tools Branch: master Commit: ec1c4547363cdfc735fe717787025f62693de5f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec1c4547363cdfc735fe7177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 18:36:02 2007 +0200 wine_release: Install files by moving them into place to avoid permission issues. --- wine_release | 10 ++++++---- winedoc_release | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/wine_release b/wine_release index e6ae152..482c4d2 100755 --- a/wine_release +++ b/wine_release @@ -6,6 +6,7 @@ # usage: wine_release <old version> <new version> set -e +umask 002 if [ $# -lt 2 ] then @@ -16,7 +17,7 @@ fi oldver=$1 version=$2 -templates_dir="/home/winehq/opt/lostwages/templates" +templates_dir="/home/winehq/opt/website/templates" tools_dir="/home/winehq/opt/git-tools" cd /home/winehq/opt/source @@ -46,7 +47,7 @@ chmod +r fileidx xref ##chmod +r .glimpse* cd ../.. -(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv wine-versions.new wine-versions +(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" @@ -69,16 +70,17 @@ for f in $manpages do name=`basename $f .man` make -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $templates_dir/en/docs/$name.template + nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template done +rm -f ../ds$version.txt git diff -M --stat wine-$oldver wine-$version >../ds$version.txt make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI # Wine API Stats echo "==== UPDATING WINE API STATS PAGE ====" -$tools_dir/winapi_stats > winapi_stats.template && mv winapi_stats.template $templates_dir/en/winapi_stats.template +$tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template # cleanup source tree git clean -q -d -x diff --git a/winedoc_release b/winedoc_release index 165287f..63ae24f 100755 --- a/winedoc_release +++ b/winedoc_release @@ -6,6 +6,7 @@ # usage: winedoc_release <winedoc version> set -e +umask 002 if [ $# -lt 1 ] then @@ -36,7 +37,7 @@ echo "==== BUILDING SGML DOCUMENTATION ====" books="wineusr-guide winedev-guide winelib-guide" langs="en" -site_base_dir="/home/winehq/opt/lostwages" +site_base_dir="/home/winehq/opt/website" tools_dir="/home/winehq/opt/git-tools" guides_base_dir="$site_base_dir/docs" winehq_base_dir="$site_base_dir/templates" @@ -47,7 +48,7 @@ for lang in $langs do [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs - cp $tools_dir/winedoc.css $guides_base_dir/$lang + rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang cd $lang for book in $books @@ -60,7 +61,7 @@ do docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml docbook2ps -d $tools_dir/wineprint.dsl $book.sgml - mv $book.html $book.pdf $book.ps $guides_base_dir/$lang + mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang fi # build the online html version @@ -68,7 +69,8 @@ do [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book for f in $book.web/*.htm do - $tools_dir/html2template -i $f -o $winehq_base_dir/$lang/docs/$book/`basename $f .htm`.template + outfile=`basename $f .htm`.template + $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile done rm -rf $book.web done

1 0

Vincent Povirk : shell32: Add SHPathPrepareForWrite and related constants.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: f6aa17ce280e97b5cdc7089d1daf87a8a11e7831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6aa17ce280e97b5cdc7089d1… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Thu Sep 6 18:01:12 2007 -0400 shell32: Add SHPathPrepareForWrite and related constants. --- include/shlobj.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 414f452..5e88bb4 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -59,6 +59,9 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); +HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); +#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*); @@ -78,6 +81,15 @@ int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); #define SHFMT_OPT_FULL 1 #define SHFMT_OPT_SYSONLY 2 +/* SHPathPrepareForWrite flags */ +#define SHPPFW_NONE 0x00000000 +#define SHPPFW_DIRCREATE 0x00000001 +#define SHPPFW_DEFAULT SHPPFW_DIRCREATE +#define SHPPFW_ASKDIRCREATE 0x00000002 +#define SHPPFW_IGNOREFILENAME 0x00000004 +#define SHPPFW_NOWRITECHECK 0x00000008 +#define SHPPFW_MEDIACHECKONLY 0x00000010 + /* SHObjectProperties flags */ #define SHOP_PRINTERNAME 0x01 #define SHOP_FILEPATH 0x02

1 0

Vincent Povirk : shell32: Add tests for SHPathPrepareForWrite.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 6fe28bbee3d539fdda339b1fa8685832cb95a9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe28bbee3d539fdda339b1fa… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Thu Sep 6 22:49:51 2007 -0400 shell32: Add tests for SHPathPrepareForWrite. --- dlls/shell32/tests/shlfileop.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 7c5354b..964f6ec 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -40,12 +40,16 @@ static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; static HMODULE hshell32; static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); static int (WINAPI *pSHCreateDirectoryExW)(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); +static int (WINAPI *pSHPathPrepareForWriteA)(HWND, IUnknown*, LPCSTR, DWORD); +static int (WINAPI *pSHPathPrepareForWriteW)(HWND, IUnknown*, LPCWSTR, DWORD); static void InitFunctionPointers(void) { hshell32 = GetModuleHandleA("shell32.dll"); pSHCreateDirectoryExA = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExA"); pSHCreateDirectoryExW = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExW"); + pSHPathPrepareForWriteA = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteA"); + pSHPathPrepareForWriteW = (void*)GetProcAddress(hshell32, "SHPathPrepareForWriteW"); } /* creates a file with the specified name for tests */ @@ -1002,6 +1006,113 @@ static void test_sh_create_dir(void) ok(file_exists("c:\\testdir3"), "The directory is not created\n"); } +static void test_sh_path_prepare(void) +{ + HRESULT res; + CHAR path[MAX_PATH]; + + if(!pSHPathPrepareForWriteA) + { + trace("skipping SHPathPrepareForWriteA tests\n"); + return; + } + + /* directory exists, SHPPFW_NONE */ + set_curr_dir_path(path, "\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + + /* directory exists, SHPPFW_IGNOREFILENAME */ + set_curr_dir_path(path, "nonexistent\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + + /* directory exists, SHPPFW_DIRCREATE */ + set_curr_dir_path(path, "\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + + /* directory exists, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE */ + set_curr_dir_path(path, "nonexistent\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + ok(!file_exists("nonexistent\\"), "nonexistent\\ exists but shouldn't\n"); + + /* file exists, SHPPFW_NONE */ + set_curr_dir_path(path, "test1.txt\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + + /* file exists, SHPPFW_DIRCREATE */ + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + + /* file exists, SHPPFW_NONE, trailing \ */ + set_curr_dir_path(path, "test1.txt\\\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_DIRECTORY)\n", res); + + /* relative path exists, SHPPFW_DIRCREATE */ + res = pSHPathPrepareForWriteA(0, 0, ".\\testdir2", SHPPFW_DIRCREATE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + + /* relative path doesn't exist, SHPPFW_DIRCREATE -- Windows does not create the directory in this case */ + res = pSHPathPrepareForWriteA(0, 0, ".\\testdir2\\test4.txt", SHPPFW_DIRCREATE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); + ok(!file_exists(".\\testdir2\\test4.txt\\"), ".\\testdir2\\test4.txt\\ exists but shouldn't\n"); + + /* directory doesn't exist, SHPPFW_NONE */ + set_curr_dir_path(path, "nonexistent\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); + + /* directory doesn't exist, SHPPFW_IGNOREFILENAME */ + set_curr_dir_path(path, "nonexistent\\notreal\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == 0x%08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); + ok(!file_exists("nonexistent\\notreal"), "nonexistent\\notreal exists but shouldn't\n"); + ok(!file_exists("nonexistent\\"), "nonexistent\\ exists but shouldn't\n"); + + /* directory doesn't exist, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE */ + set_curr_dir_path(path, "testdir2\\test4.txt\\\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_IGNOREFILENAME|SHPPFW_DIRCREATE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + todo_wine ok(file_exists("testdir2\\test4.txt\\"), "testdir2\\test4.txt doesn't exist but should\n"); + + /* nested directory doesn't exist, SHPPFW_DIRCREATE */ + set_curr_dir_path(path, "nonexistent\\notreal\0"); + res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); + ok(res == S_OK, "res == 0x%08x, expected S_OK\n", res); + todo_wine ok(file_exists("nonexistent\\notreal"), "nonexistent\\notreal doesn't exist but should\n"); + + /* SHPPFW_ASKDIRCREATE, SHPPFW_NOWRITECHECK, and SHPPFW_MEDIACHECKONLY are untested */ + + if(!pSHPathPrepareForWriteW) + { + skip("Skipping SHPathPrepareForWriteW tests\n"); + return; + } + /* unicode directory doesn't exist, SHPPFW_NONE */ + res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); + todo_wine ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == %08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); + ok(!file_existsW(UNICODE_PATH), "unicode path was created but shouldn't be\n"); + RemoveDirectoryW(UNICODE_PATH); + + /* unicode directory doesn't exist, SHPPFW_DIRCREATE */ + res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); + ok(res == S_OK, "res == %08x, expected S_OK\n", res); + todo_wine ok(file_existsW(UNICODE_PATH), "unicode path should've been created\n"); + + /* unicode directory exists, SHPPFW_NONE */ + res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); + ok(res == S_OK, "ret == %08x, expected S_OK\n", res); + + /* unicode directory exists, SHPPFW_DIRCREATE */ + res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); + ok(res == S_OK, "ret == %08x, expected S_OK\n", res); + RemoveDirectoryW(UNICODE_PATH); +} + static void test_unicode(void) { SHFILEOPSTRUCTW shfoW; @@ -1098,5 +1209,9 @@ START_TEST(shlfileop) test_sh_create_dir(); clean_after_shfo_tests(); + init_shfo_tests(); + test_sh_path_prepare(); + clean_after_shfo_tests(); + test_unicode(); }

1 0

Alexandre Julliard : wininet/tests: Anonymous FTP can succeed without a password.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: b20694e732156d5677d3f5855363ce9997218eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20694e732156d5677d3f5855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 16:59:06 2007 +0200 wininet/tests: Anonymous FTP can succeed without a password. --- dlls/wininet/tests/ftp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 11984da..6d27cb1 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -77,9 +77,14 @@ static void test_connect(void) SetLastError(0xdeadbeef); hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, 0, 0); - ok ( hFtp == NULL, "Expected InternetConnect to fail\n"); - ok ( GetLastError() == ERROR_INTERNET_LOGIN_FAILURE, - "Expected ERROR_INTERNET_LOGIN_FAILURE, got %d\n", GetLastError()); + if (hFtp) /* some servers accept an empty password */ + { + ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); + } + else + ok ( GetLastError() == ERROR_INTERNET_LOGIN_FAILURE, + "Expected ERROR_INTERNET_LOGIN_FAILURE, got %d\n", GetLastError()); SetLastError(0xdeadbeef); hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, NULL, "IEUser@", INTERNET_SERVICE_FTP, 0, 0);

1 0

Vincent Povirk : shell32: Implement SHPathPrepareForWrite.
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: f4a4a1c0543d2a9146eb5c87b53578a06646d3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a4a1c0543d2a9146eb5c87b… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Thu Sep 6 22:52:35 2007 -0400 shell32: Implement SHPathPrepareForWrite. --- dlls/shell32/shell32_main.c | 18 ---------- dlls/shell32/shlfileop.c | 74 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfileop.c | 28 +++++++------- 3 files changed, 88 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4a4a1c0543d2a9146eb5…

1 0

Rob Shearman : server: Add get_token_statistics server call and use it to implement the TokenStatistics and TokenType levels for NtQueryInformationToken .
by Alexandre Julliard Sept. 14, 2007

Sept. 14, 2007

Module: wine Branch: master Commit: 3f431a0646c6bfb333971afcfe0dfeab71a90d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f431a0646c6bfb333971afcf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Sep 13 16:47:56 2007 +0100 server: Add get_token_statistics server call and use it to implement the TokenStatistics and TokenType levels for NtQueryInformationToken. --- dlls/kernel32/tests/pipe.c | 1 - dlls/ntdll/nt.c | 44 ++++++++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 23 ++++++++++++++++++++- server/protocol.def | 13 +++++++++++ server/request.h | 2 + server/token.c | 19 +++++++++++++++++ server/trace.c | 23 ++++++++++++++++++++ 7 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 09f406e..9150e50 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1048,7 +1048,6 @@ static DWORD get_privilege_count(HANDLE hToken) BOOL ret; ret = GetTokenInformation(hToken, TokenStatistics, &Statistics, Size, &Size); - todo_wine ok(ret, "GetTokenInformation(TokenStatistics)\n"); if (!ret) return -1; diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 27a18ef..8354fee 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -230,9 +230,9 @@ NTSTATUS WINAPI NtQueryInformationToken( case TokenImpersonationLevel: len = sizeof(SECURITY_IMPERSONATION_LEVEL); break; -#if 0 case TokenStatistics: -#endif /* 0 */ + len = sizeof(TOKEN_STATISTICS); + break; default: len = 0; } @@ -375,6 +375,46 @@ NTSTATUS WINAPI NtQueryInformationToken( } SERVER_END_REQ; break; + case TokenStatistics: + SERVER_START_REQ( get_token_statistics ) + { + TOKEN_STATISTICS *statistics = tokeninfo; + req->handle = token; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + statistics->TokenId.LowPart = reply->token_id.low_part; + statistics->TokenId.HighPart = reply->token_id.high_part; + statistics->AuthenticationId.LowPart = 0; /* FIXME */ + statistics->AuthenticationId.HighPart = 0; /* FIXME */ + statistics->ExpirationTime.HighPart = 0x7fffffff; + statistics->ExpirationTime.LowPart = 0xffffffff; + statistics->TokenType = reply->primary ? TokenPrimary : TokenImpersonation; + statistics->ImpersonationLevel = reply->impersonation_level; + + /* kernel information not relevant to us */ + statistics->DynamicCharged = 0; + statistics->DynamicAvailable = 0; + + statistics->GroupCount = reply->group_count; + statistics->PrivilegeCount = reply->privilege_count; + statistics->ModifiedId.LowPart = reply->modified_id.low_part; + statistics->ModifiedId.HighPart = reply->modified_id.high_part; + } + } + SERVER_END_REQ; + break; + case TokenType: + SERVER_START_REQ( get_token_statistics ) + { + TOKEN_TYPE *token_type = tokeninfo; + req->handle = token; + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + *token_type = reply->primary ? TokenPrimary : TokenImpersonation; + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b1f48cb..b79fda4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4060,6 +4060,24 @@ struct make_process_system_reply }; + +struct get_token_statistics_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_statistics_reply +{ + struct reply_header __header; + luid_t token_id; + luid_t modified_id; + int primary; + int impersonation_level; + int group_count; + int privilege_count; +}; + + enum request { REQ_new_process, @@ -4281,6 +4299,7 @@ enum request REQ_delete_device, REQ_get_next_device_request, REQ_make_process_system, + REQ_get_token_statistics, REQ_NB_REQUESTS }; @@ -4507,6 +4526,7 @@ union generic_request struct delete_device_request delete_device_request; struct get_next_device_request_request get_next_device_request_request; struct make_process_system_request make_process_system_request; + struct get_token_statistics_request get_token_statistics_request; }; union generic_reply { @@ -4731,8 +4751,9 @@ union generic_reply struct delete_device_reply delete_device_reply; struct get_next_device_request_reply get_next_device_request_reply; struct make_process_system_reply make_process_system_reply; + struct get_token_statistics_reply get_token_statistics_reply; }; -#define SERVER_PROTOCOL_VERSION 312 +#define SERVER_PROTOCOL_VERSION 313 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e210e43..784a9f9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2918,3 +2918,16 @@ enum message_type @REPLY obj_handle_t event; /* event signaled when all user processes have exited */ @END + + +/* Get detailed fixed-size information about a token */ +(a)REQ(get_token_statistics) + obj_handle_t handle; /* handle to the object */ +(a)REPLY + luid_t token_id; /* locally-unique identifier of the token */ + luid_t modified_id; /* locally-unique identifier of the modified version of the token */ + int primary; /* is the token primary or impersonation? */ + int impersonation_level; /* level of impersonation */ + int group_count; /* the number of groups the token is a member of */ + int privilege_count; /* the number of privileges the token has */ +(a)END diff --git a/server/request.h b/server/request.h index 12a7b9c..fe94d2e 100644 --- a/server/request.h +++ b/server/request.h @@ -329,6 +329,7 @@ DECL_HANDLER(create_device); DECL_HANDLER(delete_device); DECL_HANDLER(get_next_device_request); DECL_HANDLER(make_process_system); +DECL_HANDLER(get_token_statistics); #ifdef WANT_REQUEST_HANDLERS @@ -554,6 +555,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_delete_device, (req_handler)req_get_next_device_request, (req_handler)req_make_process_system, + (req_handler)req_get_token_statistics, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/token.c b/server/token.c index a97fbde..655e597 100644 --- a/server/token.c +++ b/server/token.c @@ -1424,6 +1424,25 @@ DECL_HANDLER(get_token_impersonation_level) } } +DECL_HANDLER(get_token_statistics) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + reply->token_id = token->token_id; + reply->modified_id = token->modified_id; + reply->primary = token->primary; + reply->impersonation_level = token->impersonation_level; + reply->group_count = list_count( &token->groups ); + reply->privilege_count = list_count( &token->privileges ); + + release_object( token ); + } +} + DECL_HANDLER(set_security_object) { data_size_t sd_size = get_req_data_size(); diff --git a/server/trace.c b/server/trace.c index 49f4479..e6ff06d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3548,6 +3548,25 @@ static void dump_make_process_system_reply( const struct make_process_system_rep fprintf( stderr, " event=%p", req->event ); } +static void dump_get_token_statistics_request( const struct get_token_statistics_request *req ) +{ + fprintf( stderr, " handle=%p", req->handle ); +} + +static void dump_get_token_statistics_reply( const struct get_token_statistics_reply *req ) +{ + fprintf( stderr, " token_id=" ); + dump_luid( &req->token_id ); + fprintf( stderr, "," ); + fprintf( stderr, " modified_id=" ); + dump_luid( &req->modified_id ); + fprintf( stderr, "," ); + fprintf( stderr, " primary=%d,", req->primary ); + fprintf( stderr, " impersonation_level=%d,", req->impersonation_level ); + fprintf( stderr, " group_count=%d,", req->group_count ); + fprintf( stderr, " privilege_count=%d", req->privilege_count ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3768,6 +3787,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_delete_device_request, (dump_func)dump_get_next_device_request_request, (dump_func)dump_make_process_system_request, + (dump_func)dump_get_token_statistics_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3990,6 +4010,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)0, (dump_func)dump_get_next_device_request_reply, (dump_func)dump_make_process_system_reply, + (dump_func)dump_get_token_statistics_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4212,6 +4233,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "delete_device", "get_next_device_request", "make_process_system", + "get_token_statistics", }; static const struct @@ -4233,6 +4255,7 @@ static const struct { "CANCELLED", STATUS_CANCELLED }, { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, + { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, { "DISK_FULL", STATUS_DISK_FULL },

1 0