October 2013 - Wine-Commits

Alexandre Julliard : tools: Upgrade the install-sh script.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 2808ba2108eafca6a665e262f31bf3020b55b9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2808ba2108eafca6a665e262f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 22:09:18 2013 +0200 tools: Upgrade the install-sh script. --- tools/install-sh | 538 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 371 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2808ba2108eafca6a665e…

1 0

Łukasz Wojniłowicz : Polish translation for Wine 1.7.3
by Jeremy Newman Oct. 7, 2013

Oct. 7, 2013

Module: website Branch: master Commit: 53a5e332bd9530483c77bf0cbb02fd78a2f25870 URL: http://source.winehq.org/git/website.git/?a=commit;h=53a5e332bd9530483c77bf… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 7 16:25:59 2013 +0200 Polish translation for Wine 1.7.3 --- news/pl/2013092701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2013092701.xml b/news/pl/2013092701.xml new file mode 100644 index 0000000..7205e51 --- /dev/null +++ b/news/pl/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>Wrzesień 27, 2013</date> +<title>Wydano Wine 1.7.3</title> +<body> + Wydanie rozwojowe Wine 1.7.3 jest już dostępne. + <a href="{$root}/announce/1.7.3">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko oparta o Firefox 24.</li> + <li>Prace przygotowawcze dla strumienia poleceń Direct3D.</li> + <li>Poprawki w zarządzaniu oknami w sterowniku Mac.</li> + <li>Wsparcie dla funkcji IPHLPAPI na Androidzie.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Volkan Gezer : Turkish Translation for version 1.7.3
by Jeremy Newman Oct. 7, 2013

Oct. 7, 2013

Module: website Branch: master Commit: 30bbbc655b2ccae0a13545ba588e88488bb93838 URL: http://source.winehq.org/git/website.git/?a=commit;h=30bbbc655b2ccae0a13545… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Sat Oct 5 16:41:21 2013 +0200 Turkish Translation for version 1.7.3 --- news/tr/2013083001.xml | 18 ++++++++++++++++++ news/tr/2013091301.xml | 17 +++++++++++++++++ news/tr/2013092701.xml | 16 ++++++++++++++++ templates/tr/home.template | 4 ++-- 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/news/tr/2013083001.xml b/news/tr/2013083001.xml new file mode 100644 index 0000000..fb429f3 --- /dev/null +++ b/news/tr/2013083001.xml @@ -0,0 +1,18 @@ +<news> +<date>30 Ağustos 2013</date> +<title>Wine 1.7.1 Yayınlandı</title> +<body> + Wine geliştirme sürümü 1.7.1 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.1">yenilikler</a>: +<ul> + <li>Tuşlu olay nesneleri için destek.</li> + <li>"bir kez başlat" eşitleme mekanizması için destek.</li> + <li>DLL, typelib ve COM sınıfları için etkinleştirme bağlam desteği.</li> + <li>64-bit üzerinde 32-bit typelib yükleme desteği.</li> + <li>Çeşitli Mac sürücü onarımları.</li> + <li>Seri port cihazları için bazı onarımlar.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news> diff --git a/news/tr/2013091301.xml b/news/tr/2013091301.xml new file mode 100644 index 0000000..3e4adc4 --- /dev/null +++ b/news/tr/2013091301.xml @@ -0,0 +1,17 @@ +<news> +<date>13 Eylül 2013</date> +<title>Wine 1.7.2 Yayınlandı</title> +<body> + Wine geliştirme sürümü 1.7.2 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.2">yenilikler</a>: +<ul> + <li>Sağdan sola metin yerleşim iyileştirmeleri.</li> + <li>HTTP üzerinden RPC için NTLM ve Anlaşma kimlik doğrulaması.</li> + <li>Dahili Wingdings yazı tipi üzerinde daha iyi kabartmalar.</li> + <li>Mac sürücüsünde daha iyi sistem çekmece desteği.</li> + <li>Etkinleştirme bağlamı iyileştirmeleri.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news> diff --git a/news/tr/2013092701.xml b/news/tr/2013092701.xml new file mode 100644 index 0000000..432c53c --- /dev/null +++ b/news/tr/2013092701.xml @@ -0,0 +1,16 @@ +<news> +<date>27 Eylül 2013</date> +<title>Wine 1.7.3 Yayınlandı</title> +<body> + Wine geliştirme sürümü 1.7.3 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.3">yenilikler</a>: +<ul> + <li>Firefox 24 tabanlı Gecko motorunun yeni sürümü.</li> + <li>Direct3D komut akışı için hazırlık çalışması.</li> + <li>Mac sürücüsünde pencere yönetim onarımları.</li> + <li>Android üzerinde IPHLPAPI fonksiyonları desteği.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.3.tar.bz2">artık indirilebilir</a>. +İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. +</body></news> diff --git a/templates/tr/home.template b/templates/tr/home.template index c81a882..5d42b0f 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -1,5 +1,5 @@ - - + +

1 0

Francois Gouget : testbot: Disable support for taking screenshots.
by Alexandre Julliard Oct. 6, 2013

Oct. 6, 2013

Module: tools Branch: master Commit: 25f69ff0f2b20ff60abcede0bd07554ea7622a74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25f69ff0f2b20ff60abcede0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 6 01:36:03 2013 +0200 testbot: Disable support for taking screenshots. This does not work with the current WineTestBot configuration and causes libvirt connections to be leaked. --- testbot/lib/WineTestBot/VMs.pm | 3 +++ testbot/web/JobDetails.pl | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 5913f2c..7c403cd 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -417,6 +417,9 @@ sub CaptureScreenImage($) { my ($self) = @_; + # FIXME: Disable screenshots for now + return ("Screenshotting has been disabled for the time being", undef, undef); + my ($ErrMessage, $Domain) = $self->_GetDomain(); return ($ErrMessage, undef, undef) if (defined $ErrMessage); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 1525636..0e5166a 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -257,7 +257,8 @@ sub GenerateBody my $LogName = "$TaskDir/log"; my $ErrName = "$TaskDir/err"; print "<div class='TaskMoreInfoLinks'>\n"; - if ($Item->Status eq "running" && + # FIXME: Disable live screenshots for now + if (0 && $Item->Status eq "running" && ($Item->Type eq "single" || $Item->Type eq "suite")) { if (defined($self->GetParam($ScreenshotParamName)))

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 6d03ce8d08e68dbd71fc5530add669f9ad7cd243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d03ce8d08e68dbd71fc5530a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Oct 4 22:31:50 2013 +0300 po: Update Finnish translation. --- po/fi.po | 36 +++++++----------------------------- 1 files changed, 7 insertions(+), 29 deletions(-) diff --git a/po/fi.po b/po/fi.po index 773d103..c775176 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8520,16 +8520,12 @@ msgstr "" "uudelleen." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Nykyiset MIDI Mapper -asetukset viittaavat laitteeseen, jota ei ole " -"asennettu järjestelmään. Avaa MIDI Mapper muokataksesi asetuksia." +"asennettu järjestelmään." #: winmm.rc:53 msgid "" @@ -9337,10 +9333,6 @@ msgstr "" "tiedostosta takaisin kutsujalle.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9349,8 +9341,6 @@ msgstr "" "oletushakemiston.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <hakemisto> vaihtaa tämänhetkisen oletushakemiston.\n" @@ -9403,11 +9393,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <tiedostonimi> poistaa tiedoston tai joukon tiedostoja.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9417,7 +9402,9 @@ msgid "" msgstr "" "FOR-komentoa käytetään komennon suorittamiseen joukolle tiedostoja.\n" "\n" -"Syntaksi: FOR %muuttuja IN (joukko) DO komento\n" +"Käyttö: FOR %muuttuja IN (joukko) DO komento\n" +"\n" +"Kun FOR esiintyy komentojonotiedostossa, %-merkki täytyy kahdentaa.\n" #: cmd.rc:80 msgid "" @@ -9603,16 +9590,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <tiedostonimi> nimeää tiedoston uudelleen.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <hakemisto> on RMDIR-komennon lyhenne. Se poistaa alihakemiston.\n" +msgstr "RD <hakemisto> on RMDIR-komennon lyhenne. Se poistaa hakemiston.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <dir> poistaa alihakemiston.\n" +msgstr "RMDIR <hakemisto> poistaa hakemiston.\n" #: cmd.rc:203 msgid "" @@ -9785,16 +9768,11 @@ msgstr "" "ympäristöasetukset palautetaan.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <hakemistonnimi> tallentaa nykyisen hakemiston pinoon ja muuttaa " -"sitten\n" +"PUSHD <hakemisto> tallentaa nykyisen hakemiston pinoon ja muuttaa sitten\n" "nykyisen hakemiston annetuksi.\n" #: cmd.rc:247

1 0

Dmitry Timoshkov : ntdll: Make it possible to store FILE_APPEND_DATA access bit in the server fd cache .
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: ba372b92b55c05a85c3b051eefcba952b32ea014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba372b92b55c05a85c3b051ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 2 14:00:40 2013 +0900 ntdll: Make it possible to store FILE_APPEND_DATA access bit in the server fd cache. --- dlls/ntdll/server.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f77bacf..9b3aeef 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -790,8 +790,8 @@ static int receive_fd( obj_handle_t *handle ) struct fd_cache_entry { int fd; - enum server_fd_type type : 6; - unsigned int access : 2; + enum server_fd_type type : 5; + unsigned int access : 3; unsigned int options : 24; }; @@ -899,7 +899,7 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, *unix_fd = -1; *needs_close = 0; - wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA; + wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; server_enter_uninterrupted_section( &fd_cache_section, &sigset );

1 0

Alexandre Julliard : wmc: Load translations from mo files instead of po.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 9b86c6a9b81d9eb4d073cef6cb72bef6a3f33bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b86c6a9b81d9eb4d073cef6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 19:39:39 2013 +0200 wmc: Load translations from mo files instead of po. --- Make.rules.in | 2 +- tools/wmc/po.c | 246 +++++++++++++++++++++++++++++++++++++--------------- tools/wmc/utils.c | 11 +++ tools/wmc/utils.h | 1 + 4 files changed, 188 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b86c6a9b81d9eb4d073c…

1 0

Dmitry Timoshkov : server: Add FILE_APPEND_DATA to the access rights that require unix file write permission .
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 6bd983c97756e5925397626af331a16985d73255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd983c97756e5925397626af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 2 14:01:28 2013 +0900 server: Add FILE_APPEND_DATA to the access rights that require unix file write permission. --- server/file.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.h b/server/file.h index aae8b20..493d30b 100644 --- a/server/file.h +++ b/server/file.h @@ -171,7 +171,7 @@ extern void fd_copy_completion( struct fd *src, struct fd *dst ); #define FILE_UNIX_READ_ACCESS (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA) /* access rights that require Unix write permission */ -#define FILE_UNIX_WRITE_ACCESS (FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA) +#define FILE_UNIX_WRITE_ACCESS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA) /* magic file access rights for mappings */ #define FILE_MAPPING_IMAGE 0x80000000 /* set for SEC_IMAGE mappings */

1 0

Alexandre Julliard : wmc: Add support for long command-line options.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: d6057e641118a5966869ed78b4e522e48bbae4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6057e641118a5966869ed78b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 19:38:46 2013 +0200 wmc: Add support for long command-line options. --- tools/wmc/wmc.c | 52 +++++++++++++++++++++++++++++++------------------ tools/wmc/wmc.man.in | 14 ++++++------ 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index c9ad9c4..a08d733 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -25,6 +25,9 @@ #include <stdlib.h> #include <string.h> #include <signal.h> +#ifdef HAVE_GETOPT_H +# include <getopt.h> +#endif #include "wmc.h" #include "utils.h" @@ -33,28 +36,28 @@ static const char usage[] = "Usage: wmc [options...] [inputfile.mc]\n" - " -B x Set output byte-order x={n[ative], l[ittle], b[ig]}\n" - " (default is n[ative] which equals " + " -B x Set output byte-order x={n[ative], l[ittle], b[ig]}\n" + " (default is n[ative] which equals " #ifdef WORDS_BIGENDIAN "big" #else "little" #endif "-endian)\n" - " -c Set 'custom-bit' in values\n" - " -d Use decimal values in output\n" - " -D Set debug flag\n" - " -h This message\n" - " -H file Write headerfile to file (default is inputfile.h)\n" - " -i Inline messagetable(s)\n" - " -o file Output to file (default is inputfile.rc)\n" - " -O fmt Set output format (rc, res, pot)\n" - " -P dir Directory where to find po files\n" - " -u Inputfile is in unicode\n" - " -U Output unicode messagetable(s)\n" - " -v Show supported codepages and languages\n" - " -V Print version end exit\n" - " -W Enable pedantic warnings\n" + " -c Set 'custom-bit' in values\n" + " -d Use decimal values in output\n" + " -D Set debug flag\n" + " -h, --help Print this message\n" + " -H FILE Write header file to FILE (default is inputfile.h)\n" + " -i Inline messagetable(s)\n" + " -o, --output=FILE Output to FILE (default is infile.rc)\n" + " -O, --output-format=FORMAT The output format (`rc', `res', or `pot')\n" + " -P, --po-dir=DIR Directory containing po files for translations\n" + " -u Input file is in unicode\n" + " -U Output unicode messagetable(s)\n" + " -v Show supported codepages and languages\n" + " -V, --version Print version end exit\n" + " -W, --pedantic Enable pedantic warnings\n" "Input is taken from stdin if no inputfile is specified.\n" "Byteorder of unicode input is based upon the first couple of\n" "bytes read, which should be 0x0000..0x00ff.\n" @@ -128,7 +131,17 @@ static enum FORMAT_POT } output_format; -int getopt (int argc, char *const *argv, const char *optstring); +static const char short_options[] = "B:cdDhH:io:O:P:uUvVW"; +static const struct option long_options[] = +{ + { "help", 0, NULL, 'h' }, + { "output", 1, NULL, 'o' }, + { "output-format", 1, NULL, 'O' }, + { "pedantic", 0, NULL, 'W' }, + { "po-dir", 1, NULL, 'P' }, + { "version", 0, NULL, 'v' } +}; + static void segvhandler(int sig); static void cleanup_files(void) @@ -147,6 +160,7 @@ int main(int argc,char *argv[]) extern char* optarg; extern int optind; int optc; + int opti = 0; int lose = 0; int ret; int i; @@ -176,7 +190,7 @@ int main(int argc,char *argv[]) strcat(cmdline, " "); } - while((optc = getopt(argc, argv, "B:cdDhH:io:O:P:uUvVW")) != EOF) + while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { switch(optc) { @@ -325,7 +339,7 @@ int main(int argc,char *argv[]) write_bin_files(); break; case FORMAT_RES: - if (po_dir) add_translations( po_dir ); + add_translations( po_dir ); write_res_file( output_name ); break; case FORMAT_POT: diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 890f716..39356d6 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -34,8 +34,8 @@ NON-FUNCTIONAL; Use decimal values in output .B \-D Set debug flag. This results is a parser trace and a lot of extra messages. .TP -.B \-h -Print an informative usage message. +.BR \-h ,\ \-\-help +Print an informative usage message and exits. .TP .BI \-H\ file Write headerfile to \fIfile\fR. Default is \fIinputfile.h\fR. @@ -45,14 +45,14 @@ Inline messagetable(s). This option skips the generation of all \fI.bin\fR files and writes all output into the \fI.rc\fR file. This encoding is parsable with wrc(1). .TP -.BI \-o\ file +.BR \-o ,\ \-\-output =\fIfile Output to \fIfile\fR. Default is \fIinputfile.rc\fR. .TP -.BI \-O\ format +.BR \-O ,\ \-\-output\-format =\fIformat Set the output format. Supported formats are \fBrc\fR (the default), \fBres\fR, and \fBpot\fR. .TP -.BI \-P\ directory +.BR \-P ,\ \-\-po-dir =\fIdirectory Enable the generation of resource translations based on po files loaded from the specified directory. That directory must follow the gettext convention, in particular in must contain one \fI.po\fR file for @@ -67,10 +67,10 @@ Write resource output in unicode formatted messagetable(s). .B \-v Show all supported codepages and languages. .TP -.B \-V +.BR \-V ,\ \-\-version Print version end exit. .TP -.B \-W +.BR \-W ,\ \-\-pedantic Enable pedantic warnings. .SH EXTENSIONS The original syntax is extended to support codepages more smoothly. Normally,

1 0

Jacek Caban : wininet: Added InternetLockRequestFile tests.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 1458856c638a233d13639376bf0a7e358f55f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1458856c638a233d13639376b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:53:34 2013 +0200 wininet: Added InternetLockRequestFile tests. --- dlls/wininet/tests/http.c | 78 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 12eab57..2cc4b47 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1403,9 +1403,12 @@ static void test_http_cache(void) ok(file_size == 106, "file size = %u\n", file_size); CloseHandle(file); + ret = DeleteFileA(file_name); + ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); + ok(InternetCloseHandle(request), "Close request handle failed\n"); - file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + file = CreateFile(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); @@ -1458,6 +1461,78 @@ static void test_http_cache(void) test_cache_read(); } +static void InternetLockRequestFile_test(void) +{ + HINTERNET session, connect, request; + char file_name[MAX_PATH]; + HANDLE lock, lock2; + DWORD size; + BOOL ret; + + static const char *types[] = { "*", "", NULL }; + + session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(session != NULL ,"Unable to open Internet session\n"); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); + + request = HttpOpenRequestA(connect, NULL, "/tests/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE|INTERNET_FLAG_RELOAD, 0); + if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) + { + skip( "Network unreachable, skipping test\n" ); + + ok(InternetCloseHandle(connect), "Close connect handle failed\n"); + ok(InternetCloseHandle(session), "Close session handle failed\n"); + + return; + } + ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); + + size = sizeof(file_name); + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(!ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_ITEM_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); + ok(!size, "size = %d\n", size); + + lock = NULL; + ret = InternetLockRequestFile(request, &lock); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + size = sizeof(file_name); + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed: %u\n", GetLastError()); + + ret = InternetLockRequestFile(request, &lock); + ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock != NULL, "lock == NULL\n"); + + ret = InternetLockRequestFile(request, &lock2); + ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock == lock2, "lock != lock2\n"); + + ret = InternetUnlockRequestFile(lock2); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + + ret = DeleteFileA(file_name); + ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + + ret = DeleteFileA(file_name); + ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); + + ret = InternetUnlockRequestFile(lock); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + + ret = DeleteFileA(file_name); + ok(ret, "Deleting file returned %x(%u)\n", ret, GetLastError()); +} + static void HttpHeaders_test(void) { HINTERNET hSession; @@ -5133,6 +5208,7 @@ START_TEST(http) test_async_HttpSendRequestEx(&notification_data[3]); InternetOpenRequest_test(); test_http_cache(); + InternetLockRequestFile_test(); InternetOpenUrlA_test(); HttpHeaders_test(); test_http_connection();

1 0