October 2008 - Wine-Commits

Alexandre Julliard : user32/test: Fix a couple of message test failures on Windows.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 881e30b4d1118a73526182e22e6e277c8f7d4dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881e30b4d1118a73526182e22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 19:05:11 2008 +0200 user32/test: Fix a couple of message test failures on Windows. --- dlls/user32/tests/msg.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c78401a..1580b14 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -626,6 +626,9 @@ static const struct message WmCreateMaxPopupSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -5620,7 +5623,9 @@ static void test_paint_messages(void) trace("testing ValidateRgn(0, NULL)\n"); SetLastError(0xdeadbeef); ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail\n"); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error code %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || + broken( GetLastError() == 0xdeadbeef ) /* win9x */, + "wrong error code %d\n", GetLastError()); check_update_rgn( hwnd, 0 ); flush_events(); ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); @@ -8907,10 +8912,12 @@ static void test_PeekMessage(void) /* pass invalid QS_xxxx flags */ SetLastError(0xdeadbeef); qstatus = GetQueueStatus(0xffffffff); - ok(qstatus == 0, "GetQueueStatus should fail: %08x\n", qstatus); - ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %d\n", GetLastError()); - - qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0 || broken(qstatus) /* win9x */, "GetQueueStatus should fail: %08x\n", qstatus); + if (!qstatus) + { + ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %d\n", GetLastError()); + qstatus = GetQueueStatus(qs_all_input); + } ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), "wrong qstatus %08x\n", qstatus); @@ -8950,6 +8957,11 @@ static void test_PeekMessage(void) msg.message = 0; ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (qs_input << 16)); + if (ret && msg.message == WM_CHAR) + { + win_skip( "PM_QS_* flags not supported in PeekMessage\n" ); + goto done; + } ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message); @@ -9200,6 +9212,7 @@ todo_wine { ok(qstatus == 0, "wrong qstatus %08x\n", qstatus); +done: trace("signalling to exit\n"); SetEvent(info.hevent[EV_STOP]);

1 0

Alexandre Julliard : mountmgr: Enforce a minimal length for the mount point id.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: a12789e97ef3b34d82ec6eae1643449d5c8db111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12789e97ef3b34d82ec6eae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 19:57:43 2008 +0200 mountmgr: Enforce a minimal length for the mount point id. --- dlls/mountmgr.sys/mountmgr.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index e24394a..6df9528 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); +#define MIN_ID_LEN 4 #define MAX_DOS_DRIVES 26 #define MAX_MOUNT_POINTS (2 * MAX_DOS_DRIVES) @@ -167,6 +168,18 @@ static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OB } +static void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) +{ + RtlFreeHeap( GetProcessHeap(), 0, mount->id ); + mount->id_len = max( MIN_ID_LEN, id_len ); + if ((mount->id = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, mount->id_len ))) + { + memcpy( mount->id, id, id_len ); + RegSetValueExW( mount_key, mount->link.Buffer, 0, REG_BINARY, mount->id, mount->id_len ); + } + else mount->id_len = 0; +} + static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, const void *id, unsigned int id_len ) { @@ -219,12 +232,8 @@ static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, } mount_volume->device = mount_drive->device; /* FIXME: incr ref count */ - mount_drive->id = RtlAllocateHeap( GetProcessHeap(), 0, id_len ); - mount_drive->id_len = id_len; - memcpy( mount_drive->id, id, id_len ); - mount_volume->id = RtlAllocateHeap( GetProcessHeap(), 0, id_len ); - mount_volume->id_len = id_len; - memcpy( mount_volume->id, id, id_len ); + set_mount_point_id( mount_drive, id, id_len ); + set_mount_point_id( mount_volume, id, id_len ); IoCreateSymbolicLink( &mount_drive->link, get_device_name(mount_drive->device) ); IoCreateSymbolicLink( &mount_volume->link, get_device_name(mount_volume->device) ); @@ -232,11 +241,6 @@ static NTSTATUS add_mount_point( DRIVER_OBJECT *driver, DWORD type, int drive, TRACE( "created device %s symlinks %s %s\n", debugstr_w(get_device_name(mount_drive->device)->Buffer), debugstr_w(mount_drive->link.Buffer), debugstr_w(mount_volume->link.Buffer) ); - RegSetValueExW( mount_key, mount_drive->link.Buffer, 0, REG_BINARY, - mount_drive->id, mount_drive->id_len ); - RegSetValueExW( mount_key, mount_volume->link.Buffer, 0, REG_BINARY, - mount_volume->id, mount_volume->id_len ); - return STATUS_SUCCESS; } @@ -291,7 +295,7 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, if (!matching_mount_point( &mount_points[i], input )) continue; size += get_device_name(mount_points[i].device)->Length; size += mount_points[i].link.Length; - size += strlen(mount_points[i].id) + 1; + size += mount_points[i].id_len; size = (size + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); j++; } @@ -323,9 +327,9 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, pos += mount_points[i].link.Length; info->MountPoints[j].UniqueIdOffset = pos; - info->MountPoints[j].UniqueIdLength = strlen(mount_points[i].id) + 1; + info->MountPoints[j].UniqueIdLength = mount_points[i].id_len; memcpy( (char *)out_buff + pos, mount_points[i].id, strlen(mount_points[i].id) + 1 ); - pos += strlen(mount_points[i].id) + 1; + pos += mount_points[i].id_len; pos = (pos + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); j++; }

1 0

Alexandre Julliard : wine_release: Fix cleanup of git tree when not building documentation.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: tools Branch: master Commit: 2a027089332c582144459c8fd643471f61708fa1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a027089332c582144459c8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 19:03:16 2008 +0200 wine_release: Fix cleanup of git tree when not building documentation. --- wine_release | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wine_release b/wine_release index f02434b..0375494 100755 --- a/wine_release +++ b/wine_release @@ -58,11 +58,12 @@ cd ../.. (echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions +cd wine-$version + if [ "$branch" = "master" ] then # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" - cd wine-$version ./configure --quiet --without-x --without-freetype manpages="\ @@ -89,10 +90,11 @@ then # Wine API Stats echo "==== UPDATING WINE API STATS PAGE ====" $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 -f fi -# cleanup source tree -git clean -q -d -x -f rm -rf .git # end

1 0

Alexandre Julliard : Wine release 1.0.1
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: website Branch: master Commit: e0e9d376e088a8acc611de22ba4e4c3339fdc9e1 URL: http://source.winehq.org/git/website.git/?a=commit;h=e0e9d376e088a8acc611de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 17:54:13 2008 +0200 Wine release 1.0.1 --- news/en/2008101701.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/news/en/2008101701.xml b/news/en/2008101701.xml new file mode 100644 index 0000000..26b4cc9 --- /dev/null +++ b/news/en/2008101701.xml @@ -0,0 +1,9 @@ +<news> +<date>October 17, 2008</date> +<title>Wine 1.0.1 Released</title> +<body> + The Wine maintenance release 1.0.1 is now available. + This is a maintenance release from the 1.0 stable branch. It contains only translation updates and small bug fixes. +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.0.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.0.1 : Alexandre Julliard : Release 1.0.1
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: refs/tags/wine-1.0.1 Tag: 78fbbbfd7c67cb51389e30de1aa676c69e67b4cd URL: http://source.winehq.org/git/wine.git/?a=tag;h=78fbbbfd7c67cb51389e30de1aa6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 17:45:25 2008 +0200 Release 1.0.1

1 0

Alexandre Julliard : Release 1.0.1.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: stable Commit: 30815a50ed6a1b7ede26a1f0685bf687bf56e0ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=30815a50ed6a1b7ede26a1f06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 17:45:25 2008 +0200 Release 1.0.1. --- ANNOUNCE | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 224 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30815a50ed6a1b7ede26a…

1 0

Rob Shearman : msvcmaker: Generate rules for IDL_C_SRCS, IDL_S_SRCS, IDL_P_SRCS and IDL_TLB_SRCS.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 9898d437ef289543d3786fb17ea28b742ab719ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9898d437ef289543d3786fb17… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 17 13:17:15 2008 +0100 msvcmaker: Generate rules for IDL_C_SRCS, IDL_S_SRCS, IDL_P_SRCS and IDL_TLB_SRCS. --- tools/winapi/msvcmaker | 115 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 89 insertions(+), 26 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index c84b703..957e232 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -271,6 +271,26 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $idl_h_files = [sort(@{$vars{IDL_H_SRCS}})]; } + my $idl_c_files = []; + if(exists($vars{IDL_C_SRCS})) { + $idl_c_files = [sort(@{$vars{IDL_C_SRCS}})]; + } + + my $idl_s_files = []; + if(exists($vars{IDL_S_SRCS})) { + $idl_s_files = [sort(@{$vars{IDL_S_SRCS}})]; + } + + my $idl_p_files = []; + if(exists($vars{IDL_P_SRCS})) { + $idl_p_files = [sort(@{$vars{IDL_P_SRCS}})]; + } + + my $idl_tlb_files = []; + if(exists($vars{IDL_TLB_SRCS})) { + $idl_tlb_files = [sort(@{$vars{IDL_TLB_SRCS}})]; + } + my $extradefs; if(exists($vars{EXTRADEFS})) { $extradefs = $vars{EXTRADEFS}; @@ -321,6 +341,10 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{resource_files} = $local_resource_files; $modules{$module}{imports} = []; $modules{$module}{idl_h_files} = $local_idl_h_files; + $modules{$module}{idl_c_files} = []; + $modules{$module}{idl_s_files} = []; + $modules{$module}{idl_p_files} = []; + $modules{$module}{idl_tlb_files} = []; $modules{$module}{extradefs} = $extradefs if $extradefs; } } @@ -336,6 +360,10 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { $modules{$module}{resource_files} = $resource_files; $modules{$module}{imports} = [@imports]; $modules{$module}{idl_h_files} = $idl_h_files; + $modules{$module}{idl_c_files} = $idl_c_files; + $modules{$module}{idl_s_files} = $idl_s_files; + $modules{$module}{idl_p_files} = $idl_p_files; + $modules{$module}{idl_tlb_files} = $idl_tlb_files; $modules{$module}{extradefs} = $extradefs if $extradefs; } @@ -412,6 +440,10 @@ foreach my $dsp_file (keys(%wine_test_dsp_files)) { $modules{$module}{resource_files} = $resource_files; $modules{$module}{imports} = [@imports]; $modules{$module}{idl_h_files} = []; + $modules{$module}{idl_c_files} = []; + $modules{$module}{idl_s_files} = []; + $modules{$module}{idl_p_files} = []; + $modules{$module}{idl_tlb_files} = []; $modules{$module}{tests} = [@tests]; } @@ -440,6 +472,52 @@ foreach my $module (@modules) { replace_file("$wine_dir/$dsp_file", \&_generate_dsp, $module); } +sub output_dsp_idl_rules($$$) { + my $wine_include_dir = shift; + my $ext = shift; + my @idl_src_files = @{(shift)}; + + foreach my $idl_src_file (@idl_src_files) { + $idl_src_file =~ s%/%\\%g; + if($idl_src_file !~ /^\./) { + $idl_src_file = ".\\$idl_src_file"; + } + + print OUT "# Begin Source File\r\n"; + print OUT "\r\n"; + + print OUT "SOURCE=$idl_src_file\r\n"; + + my $basename = $idl_src_file; + $basename =~ s/\.idl$//; + + print OUT "# PROP Ignore_Default_Tool 1\r\n"; + print OUT "# Begin Custom Build\r\n"; + print OUT "InputPath=$idl_src_file\r\n"; + print OUT "\r\n"; + print OUT "BuildCmds= \\\r\n"; + print OUT "\tmidl /nologo /I $wine_include_dir $idl_src_file "; + if ($ext eq ".h") { + print OUT "/client none /server none /notlb /h "; + } elsif ($ext eq "_c.c") { + print OUT "/server none /notlb /cstub "; + } elsif ($ext eq "_s.c") { + print OUT "/client none /notlb /sstub "; + } elsif ($ext eq "_p.c") { + print OUT "/client none /server none /notlb /proxy "; + } elsif ($ext eq ".tlb") { + print OUT "/client none /server none /tlb "; + } + print OUT "$basename$ext\r\n"; + print OUT "\r\n"; + print OUT "\"$basename$ext\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; + print OUT " \$(BuildCmds)\r\n"; + print OUT "# End Custom Build\r\n"; + + print OUT "# End Source File\r\n"; + } +} + sub _generate_dsp($$) { local *OUT = shift; @@ -478,6 +556,10 @@ sub _generate_dsp($$) { my @header_files = @{$modules{$module}{header_files}}; my @resource_files = @{$modules{$module}{resource_files}}; my @idl_h_files = @{$modules{$module}{idl_h_files}}; + my @idl_c_files = @{$modules{$module}{idl_c_files}}; + my @idl_s_files = @{$modules{$module}{idl_s_files}}; + my @idl_p_files = @{$modules{$module}{idl_p_files}}; + my @idl_tlb_files = @{$modules{$module}{idl_tlb_files}}; if ($project !~ /^wine(?:build|runtests|test)?$/ && $project !~ /^(?:gdi32)_.+?$/ && @@ -908,32 +990,13 @@ sub _generate_dsp($$) { print OUT "# End Source File\r\n"; } - foreach my $idl_h_file (@idl_h_files) { - $idl_h_file =~ s%/%\\%g; - if($idl_h_file !~ /^\./) { - $idl_h_file = ".\\$idl_h_file"; - } - - print OUT "# Begin Source File\r\n"; - print OUT "\r\n"; - - print OUT "SOURCE=$idl_h_file\r\n"; - - my $basename = $idl_h_file; - $basename =~ s/\.idl$//; - - print OUT "# PROP Ignore_Default_Tool 1\r\n"; - print OUT "# Begin Custom Build\r\n"; - print OUT "InputPath=$idl_h_file\r\n"; - print OUT "\r\n"; - print OUT "BuildCmds= \\\r\n"; - print OUT "\tmidl /nologo /I $wine_include_dir /client none /server none /notlb $idl_h_file /h $basename.h\r\n"; - print OUT "\r\n"; - print OUT "\"$basename.h\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; - print OUT " \$(BuildCmds)\r\n"; - print OUT "# End Custom Build\r\n"; - - print OUT "# End Source File\r\n"; + output_dsp_idl_rules $wine_include_dir, ".h", \@idl_h_files; + output_dsp_idl_rules $wine_include_dir, "_c.c", \@idl_c_files; + output_dsp_idl_rules $wine_include_dir, "_s.c", \@idl_s_files; + output_dsp_idl_rules $wine_include_dir, "_p.c", \@idl_p_files; + # Hack - stdole2.idl cannot be compiled with midl + if($project ne "include") { + output_dsp_idl_rules $wine_include_dir, ".tlb", \@idl_tlb_files; } print OUT "# End Group\r\n";

1 0

Hans Leidekker : wininet: Add a test for basic authentication.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 4a6b856ff235dbb72bef2e43b26c0cb0ce0c94b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6b856ff235dbb72bef2e43b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 17 13:46:52 2008 +0200 wininet: Add a test for basic authentication. --- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 93752bd..e01ef20 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1287,6 +1287,8 @@ static const char notokmsg[] = static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" +"Connection: close\r\n" +"WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; static const char proxymsg[] = @@ -1838,6 +1840,35 @@ static void test_cookie_header(int port) InternetCloseHandle(ses); } +static void test_basic_authentication(int port) +{ + HINTERNET session, connect, request; + DWORD size, status; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, "user", "pwd", INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok(ret, "HttpQueryInfo failed\n"); + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_http_connection(void) { struct server_info si; @@ -1864,6 +1895,7 @@ static void test_http_connection(void) test_connection_header(si.port); test_http1_1(si.port); test_cookie_header(si.port); + test_basic_authentication(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Hans Leidekker : wininet: Don' t destroy authentication data when closing the connection.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: d5dca63cb6f820cfd39c2a153e6d48b815e950e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5dca63cb6f820cfd39c2a153… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 17 13:46:25 2008 +0200 wininet: Don't destroy authentication data when closing the connection. Fixes basic authentication in combination with connection close semantics. Spotted by Vincent Povirk. --- dlls/wininet/http.c | 51 ++++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0cdbfb3..8729df3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1380,31 +1380,6 @@ static void HTTPREQ_Destroy(WININETHANDLEHEADER *hdr) WININET_Release(&lpwhr->lpHttpSession->hdr); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVersion); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszStatusText); - - for (i = 0; i < lpwhr->nCustHeaders; i++) - { - HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszField); - HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszValue); - } - - HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders); - HeapFree(GetProcessHeap(), 0, lpwhr); -} - -static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) -{ - LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr; - - TRACE("%p\n",lpwhr); - - if (!NETCON_connected(&lpwhr->netConnection)) - return; - if (lpwhr->pAuthInfo) { if (SecIsValidHandle(&lpwhr->pAuthInfo->ctx)) @@ -1417,6 +1392,7 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwhr->pAuthInfo); lpwhr->pAuthInfo = NULL; } + if (lpwhr->pProxyAuthInfo) { if (SecIsValidHandle(&lpwhr->pProxyAuthInfo->ctx)) @@ -1430,6 +1406,31 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) lpwhr->pProxyAuthInfo = NULL; } + HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVersion); + HeapFree(GetProcessHeap(), 0, lpwhr->lpszStatusText); + + for (i = 0; i < lpwhr->nCustHeaders; i++) + { + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszField); + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszValue); + } + + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders); + HeapFree(GetProcessHeap(), 0, lpwhr); +} + +static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) +{ + LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr; + + TRACE("%p\n",lpwhr); + + if (!NETCON_connected(&lpwhr->netConnection)) + return; + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);

1 0

Alexandre Julliard : kernel32: Delete the . windows-label file if the label is empty.
by Alexandre Julliard Oct. 17, 2008

Oct. 17, 2008

Module: wine Branch: master Commit: 1873ebdddc9d0656c593fd1aa2b3cd1df4dc2b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1873ebdddc9d0656c593fd1aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 14:12:19 2008 +0200 kernel32: Delete the .windows-label file if the label is empty. Add a trailing \n to the label file. --- dlls/kernel32/volume.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4214cca..823d163 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -723,6 +723,10 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label ) WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; labelW[0] = device[4]; + + if (!label[0]) /* delete label file when setting an empty label */ + return DeleteFileW( labelW ) || GetLastError() == ERROR_FILE_NOT_FOUND; + handle = CreateFileW( labelW, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) @@ -730,8 +734,9 @@ BOOL WINAPI SetVolumeLabelW( LPCWSTR root, LPCWSTR label ) char buffer[64]; DWORD size; - if (!WideCharToMultiByte( CP_UNIXCP, 0, label, -1, buffer, sizeof(buffer), NULL, NULL )) - buffer[sizeof(buffer)-1] = 0; + if (!WideCharToMultiByte( CP_UNIXCP, 0, label, -1, buffer, sizeof(buffer)-1, NULL, NULL )) + buffer[sizeof(buffer)-2] = 0; + strcat( buffer, "\n" ); WriteFile( handle, buffer, strlen(buffer), &size, NULL ); CloseHandle( handle ); return TRUE;

1 0