September 2007 - Wine-commits

Stefan Dösinger : wined3d: Use GL_NV_depth_clamp to implement clipping disable.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: c5410a6f2274cf332b91836eb93869b5852ecd17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5410a6f2274cf332b91836eb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Sep 11 16:41:01 2007 +0200 wined3d: Use GL_NV_depth_clamp to implement clipping disable. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 8 ++++++++ include/wine/wined3d_gl.h | 6 ++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c6f4ed0..3eaff3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -117,6 +117,7 @@ static const struct { {"GL_NV_vertex_program1_1", NV_VERTEX_PROGRAM1_1}, {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2}, {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3}, + {"GL_NV_depth_clamp", NV_DEPTH_CLAMP}, /* SGI */ {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 493be88..da2fb3c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -439,9 +439,17 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine if (stateblock->renderState[WINED3DRS_CLIPPING]) { enable = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; disable = ~stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + if(GL_SUPPORT(NV_DEPTH_CLAMP)) { + glDisable(GL_DEPTH_CLAMP_NV); + checkGLcall("glDisable(GL_DEPTH_CLAMP_NV)"); + } } else { disable = 0xffffffff; enable = 0x00; + if(GL_SUPPORT(NV_DEPTH_CLAMP)) { + glEnable(GL_DEPTH_CLAMP_NV); + checkGLcall("glEnable(GL_DEPTH_CLAMP_NV)"); + } } if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 4861262..18ddf6a 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2847,6 +2847,11 @@ typedef int (WINE_GLAPI * PGLXFNWAITVIDEOSYNCSGIPROC) (int, int, unsigned int *) #define GLX_SGIS_generate_mipmap #endif +/* GL_NV_depth_clamp */ +#ifndef GL_NV_depth_clamp +#define GL_DEPTH_CLAMP_NV 0x864F +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3184,6 +3189,7 @@ typedef enum _GL_SupportedExt { NV_VERTEX_PROGRAM2, NV_VERTEX_PROGRAM3, NV_FENCE, + NV_DEPTH_CLAMP, /* ATI */ ATI_SEPARATE_STENCIL, ATI_TEXTURE_ENV_COMBINE3,

1 0

Alexandre Julliard : Wine release 0.9.45
by Alexandre Julliard 14 Sep '07

14 Sep '07

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

Alexandre Julliard : Release 0.9.45.
by Alexandre Julliard 14 Sep '07

14 Sep '07

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

Tag wine-0.9.45 : Alexandre Julliard : Release 0.9.45
by Alexandre Julliard 14 Sep '07

14 Sep '07

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 : wine_release: Install files by moving them into place to avoid permission issues.
by Alexandre Julliard 14 Sep '07

14 Sep '07

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 14 Sep '07

14 Sep '07

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 14 Sep '07

14 Sep '07

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

Vincent Povirk : shell32: Implement SHPathPrepareForWrite.
by Alexandre Julliard 14 Sep '07

14 Sep '07

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

Alexandre Julliard : wininet/tests: Anonymous FTP can succeed without a password.
by Alexandre Julliard 14 Sep '07

14 Sep '07

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

Andrew Talbot : comdlg32: Fix some memory leaks.
by Alexandre Julliard 14 Sep '07

14 Sep '07

Module: wine Branch: master Commit: 1ca7435754793af982a880cd354752222a180fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca7435754793af982a880cd3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 14 00:16:11 2007 +0100 comdlg32: Fix some memory leaks. --- dlls/comdlg32/printdlg.c | 14 ++++++++++++-- dlls/comdlg32/printdlg16.c | 9 +++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f3736ce..8e334c3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2059,7 +2059,10 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),pbuf->pPrinterName); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2206,7 +2209,10 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName)); + ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", + GetLastError(),debugstr_w(pbuf->pPrinterName)); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -2615,6 +2621,8 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed); if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n", lpPrinterInfo->pPrinterName); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } ClosePrinter(hprn); @@ -2622,6 +2630,8 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){ needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0); if(needed == -1) { ERR("DocumentProperties fails on %s\n", debugstr_a(name)); + HeapFree(GetProcessHeap(), 0, lpDriverInfo); + HeapFree(GetProcessHeap(), 0, lpPrinterInfo); return FALSE; } pDevMode = HeapAlloc(GetProcessHeap(), 0, needed); diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index 6aa8c6c..65921f6 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -390,9 +390,10 @@ BOOL16 WINAPI PrintDlg16( GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed); dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { - ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", - pbuf->pPrinterName,GetLastError()); - HeapFree(GetProcessHeap(), 0, dbuf); + ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n", + pbuf->pPrinterName,GetLastError()); + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE); return FALSE; } @@ -506,7 +507,7 @@ BOOL16 WINAPI PrintDlg16( HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode); HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo); HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo); - HeapFree(GetProcessHeap(), 0, PrintStructures); + HeapFree(GetProcessHeap(), 0, ptr16); } if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags & PD_RETURNIC)) bRet = PRINTDLG_CreateDC16(lppd);

1 0