wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Francois Gouget : testbot/testagentd: Print the version on startup.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: cbf8daaa998399093b0ca517385caf18784d91f2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbf8daaa998399093b0ca517… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:57:42 2013 +0100 testbot/testagentd: Print the version on startup. --- testbot/src/testagentd/testagentd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 3de9a3c..837ff02 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1139,6 +1139,7 @@ int main(int argc, char** argv) error("listen() failed: %s\n", sockerror()); exit(1); } + printf("Starting %s\n", PROTOCOL_VERSION); while (1) { SOCKET client;

1 0

Francois Gouget : testbot/TestAgent: Fix GetFile()'s error handling.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 00c73ead8962dc69ec1e02a69633c70362c5dfef URL: http://source.winehq.org/git/tools.git/?a=commit;h=00c73ead8962dc69ec1e02a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:53:03 2013 +0100 testbot/TestAgent: Fix GetFile()'s error handling. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f06bd71..7852e41 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -287,7 +287,7 @@ sub _RecvEntryHeader($) return ($Type, $High << 32 | $Low); } -sub _ExpectEntryHeader($$$) +sub _ExpectEntryHeader($$;$) { my ($self, $Type, $Size) = @_; @@ -368,7 +368,7 @@ sub _RecvFile($$$) return undef if (!defined $self->{fd}); debug(" RecvFile($Filename)\n"); - my $Size = $self->_RecvEntryHeader('d'); + my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); my $Success; @@ -988,6 +988,7 @@ sub GetFile($$$) { my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh); close($fh); + unlink $LocalPathName if (!$Success); return $Success; } $self->_SetError($ERROR, "Unable to open '$LocalPathName' for writing: $!");

1 0

Francois Gouget : testbot/build: Rename the wine-git directory to wine to simplify setup.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: a7ab9e840be914c71c7519c6df3c3c85c798949e URL: http://source.winehq.org/git/tools.git/?a=commit;h=a7ab9e840be914c71c7519c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:53 2013 +0100 testbot/build: Rename the wine-git directory to wine to simplify setup. --- testbot/bin/build/Build.pl | 8 ++++---- testbot/bin/build/Reconfig.pl | 6 +++--- testbot/doc/INSTALL.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 8ecbd09..21899af 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,7 @@ sub ApplyPatch } InfoMsg "Applying patch\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) @@ -127,7 +127,7 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " autoconf --output configure configure.ac " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) @@ -141,7 +141,7 @@ sub ApplyPatch if ($NeedImplib) { - if (open (FH, "<$DataDir/wine-git/$PatchType/$BaseName/Makefile.in")) + if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in")) { $NeedImplib = !1; my $Line; @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index cc8e76e..a82d879 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -60,7 +60,7 @@ sub FatalError sub GitPull { - system("cd $DataDir/wine-git && git pull >> $LogDir/Reconfig.log 2>&1"); + system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -115,7 +115,7 @@ sub BuildNative mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -137,7 +137,7 @@ sub BuildCross mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index e8101ab..c8597d2 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -139,10 +139,10 @@ Dependencies: should be available as $HOME/tools/testbot/doc/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Create the $HOME/tools/testbot/var directory and clone the Wine git - repository to wine-git: + repository to wine: mkdir $HOME/tools/testbot/var cd $HOME/tools/testbot/var - git clone git://source.winehq.org/git/wine.git wine-git + git clone git://source.winehq.org/git/wine.git wine - Run $HOME/tools/testbot/bin/build/Reconfig.pl. - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix issues until it works.

1 0

Francois Gouget : testbot/build: Update the build VM configuration documentation.
by Alexandre Julliard 25 Feb '13

25 Feb '13

Module: tools Branch: master Commit: 74bc129c0245b11c1e55c5eb91a358132fff00c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=74bc129c0245b11c1e55c5eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:15 2013 +0100 testbot/build: Update the build VM configuration documentation. --- testbot/doc/INSTALL.txt | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index f57ed17..e8101ab 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -132,18 +132,20 @@ Dependencies: with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to have 64bit VMs then make sure MinGW can generate 64bit PE executables. -- Create a new system group 'winehq' and a system user 'winehq', - make sure to make user winehq a member of group winehq. +- You may also want to install ccache. +- You will also need genisoimage. +- Create a new user, 'testbot' for instance, and log in as that user. - Clone Wine's tools repository to $HOME/tools (so this document should be available as $HOME/tools/testbot/doc/INSTALL.txt). -- Create the $HOME/tools/testbot/var directory and make it writable to - group winehq. + git clone git://source.winehq.org/git/tools.git +- Create the $HOME/tools/testbot/var directory and clone the Wine git + repository to wine-git: mkdir $HOME/tools/testbot/var - chmod g+w $HOME/tools/testbot/var -- Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. -- In the winehq account, run Reconfig.pl. - Check $HOME/tools/testbot/log/Reconfig.log to make sure it - succeeded. + cd $HOME/tools/testbot/var + git clone git://source.winehq.org/git/wine.git wine-git +- Run $HOME/tools/testbot/bin/build/Reconfig.pl. +- Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix + issues until it works. - Start the TestAgent server from the var directory: cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl

1 0

Piotr Caban : oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 209b58c64e6181c9bf448cb4f3130d3ba705c5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209b58c64e6181c9bf448cb4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:46:32 2013 +0100 oleaut32: Fixed VarBstrFromDate behavior on dates before year 1600. --- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/vartype.c | 120 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e925fa5..4411d7d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4952,7 +4952,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); - todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } + BSTR_DATE(-657434.0, "1/1/100"); BSTR_DATE(2958465.0, "12/31/9999"); #undef BSTR_DATE diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 8632055..28795a7 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6576,6 +6576,120 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) return *pbstrOut ? S_OK : E_OUTOFMEMORY; } +static inline int output_int_len(int o, int min_len, WCHAR *date, int date_len) +{ + int len, tmp; + + if(min_len >= date_len) + return -1; + + for(len=0, tmp=o; tmp; tmp/=10) len++; + if(!len) len++; + if(len >= date_len) + return -1; + + for(tmp=min_len-len; tmp>0; tmp--) + *date++ = '0'; + for(tmp=len; tmp>0; tmp--, o/=10) + date[tmp-1] = '0' + o%10; + return min_len>len ? min_len : len; +} + +/* format date string, similar to GetDateFormatW function but works on bigger range of dates */ +static BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, + const WCHAR *fmt, WCHAR *date, int date_len) +{ + static const LCTYPE dayname[] = { + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6 + }; + static const LCTYPE sdayname[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6 + }; + static const LCTYPE monthname[] = { + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 + }; + static const LCTYPE smonthname[] = { + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 + }; + + if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) + FIXME("ignoring flags %x\n", flags); + flags &= LOCALE_NOUSEROVERRIDE; + + while(*fmt && date_len) { + int count = 1; + + switch(*fmt) { + case 'd': + case 'M': + case 'y': + case 'g': + while(*fmt == *(fmt+count)) + count++; + fmt += count-1; + } + + switch(*fmt) { + case 'd': + if(count >= 4) + count = GetLocaleInfoW(lcid, dayname[st->wDayOfWeek] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, sdayname[st->wDayOfWeek] | flags, date, date_len)-1; + else + count = output_int_len(st->wDay, count, date, date_len); + break; + case 'M': + if(count >= 4) + count = GetLocaleInfoW(lcid, monthname[st->wMonth-1] | flags, date, date_len)-1; + else if(count == 3) + count = GetLocaleInfoW(lcid, smonthname[st->wMonth-1] | flags, date, date_len)-1; + else + count = output_int_len(st->wMonth, count, date, date_len); + break; + case 'y': + if(count >= 3) + count = output_int_len(st->wYear, 0, date, date_len); + else + count = output_int_len(st->wYear%100, count, date, date_len); + break; + case 'g': + if(count == 2) { + FIXME("Should be using GetCalendarInfo(CAL_SERASTRING), defaulting to 'AD'\n"); + + *date++ = 'A'; + date_len--; + if(date_len) + *date = 'D'; + else + count = -1; + break; + } + /* fall through */ + default: + *date = *fmt; + } + + if(count < 0) + break; + fmt++; + date += count; + date_len -= count; + } + + if(!date_len) + return FALSE; + *date++ = 0; + return TRUE; +} + /****************************************************************************** * VarBstrFromDate [OLEAUT32.114] * @@ -6596,7 +6710,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst { SYSTEMTIME st; DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; - WCHAR date[128], *time; + WCHAR date[128], fmt_buff[80], *time; TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); @@ -6626,8 +6740,8 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (dwFlags & VAR_TIMEVALUEONLY) date[0] = '\0'; else - if (!GetDateFormatW(lcid, dwFormatFlags|DATE_SHORTDATE, &st, NULL, date, - sizeof(date)/sizeof(WCHAR))) + if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || + !get_date_format(lcid, dwFlags, &st, fmt_buff, date, sizeof(date)/sizeof(WCHAR))) return E_INVALIDARG; if (!(dwFlags & VAR_DATEVALUEONLY))

1 0

Piotr Caban : oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 8f7d1ed520db23c230efb37601b99900add664db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7d1ed520db23c230efb3760… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 22 18:43:26 2013 +0100 oleaut32: Fixed time outputing for dates before 1899 in VarBstrFromDate. --- dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/vartype.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 8ad549e..e925fa5 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4951,6 +4951,7 @@ static void test_VarBstrFromDate(void) BSTR_DATE(365.25, "12/30/1900 6:00:00 AM"); BSTR_DATE(1461.0, "12/31/1903"); BSTR_DATE(1461.5, "12/31/1903 12:00:00 PM"); + BSTR_DATE(-49192.24, "4/24/1765 5:45:36 AM"); todo_wine { BSTR_DATE(-657434.0, "1/1/100"); } BSTR_DATE(2958465.0, "12/31/9999"); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2d27f9d..8632055 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6619,7 +6619,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (whole == 0.0) dwFlags |= VAR_TIMEVALUEONLY; - else if (partial < 1e-12) + else if (partial > -1e-12 && partial < 1e-12) dwFlags |= VAR_DATEVALUEONLY; }

1 0

Jacek Caban : urlmon: Use separated variable for InternetQueryDataAvailable to avoid races.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: b6a7cc91123f1c78e02472e8839c4727d27b67bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a7cc91123f1c78e02472e88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 14:13:19 2013 +0100 urlmon: Use separated variable for InternetQueryDataAvailable to avoid races. --- dlls/urlmon/protocol.c | 55 ++++++++++++++++++++++++++------------------ dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index c7c61da..890d013 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -349,30 +349,35 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { if(!protocol->available_bytes) { - BOOL res; - - /* InternetQueryDataAvailable may immediately fork and perform its asynchronous - * read, so clear the flag _before_ calling so it does not incorrectly get cleared - * after the status callback is called */ - protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); - if(res) { - TRACE("available %u bytes\n", protocol->available_bytes); - if(!protocol->available_bytes) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); + if(protocol->query_available) { + protocol->available_bytes = protocol->query_available; + }else { + BOOL res; + + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); + if(res) { + TRACE("available %u bytes\n", protocol->query_available); + if(!protocol->query_available) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; } + protocol->available_bytes = protocol->query_available; + }else if(GetLastError() != ERROR_IO_PENDING) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } - }else if(GetLastError() != ERROR_IO_PENDING) { - protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - report_result(protocol, INET_E_DATA_NOT_AVAILABLE); - return S_OK; } protocol->flags |= FLAG_REQUEST_COMPLETE; @@ -421,12 +426,14 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret protocol->current_position += len; protocol->available_bytes -= len; + TRACE("current_position %d, available_bytes %d\n", protocol->current_position, protocol->available_bytes); + if(!protocol->available_bytes) { /* InternetQueryDataAvailable may immediately fork and perform its asynchronous * read, so clear the flag _before_ calling so it does not incorrectly get cleared * after the status callback is called */ protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); + res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); if(!res) { if (GetLastError() == ERROR_IO_PENDING) { hres = E_PENDING; @@ -438,10 +445,12 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret break; } - if(!protocol->available_bytes) { + if(!protocol->query_available) { all_data_read(protocol); break; } + + protocol->available_bytes = protocol->query_available; } } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 01de984..ba23e74 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -104,6 +104,7 @@ typedef struct { ULONG current_position; ULONG content_length; ULONG available_bytes; + ULONG query_available; IStream *post_stream;

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 985814599076e591f72c2e019ab8dbb2141826d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985814599076e591f72c2e019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 12:30:07 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 80 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 10 +++++ dlls/vbscript/vbdisp.c | 2 +- 3 files changed, 21 insertions(+), 71 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1a3dae7..a576f08 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,66 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBinaryCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTextCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDatabaseCompare(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGeneralDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbLongTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbShortTime(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbObjectError(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1826,16 +1766,16 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, - {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, - {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, - {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, - {DISPID_GLOBAL_VBDATABASECOMPARE, Global_vbDatabaseCompare, BP_GET}, - {DISPID_GLOBAL_VBGENERALDATE, Global_vbGeneralDate, BP_GET}, - {DISPID_GLOBAL_VBLONGDATE, Global_vbLongDate, BP_GET}, - {DISPID_GLOBAL_VBSHORTDATE, Global_vbShortDate, BP_GET}, - {DISPID_GLOBAL_VBLONGTIME, Global_vbLongTime, BP_GET}, - {DISPID_GLOBAL_VBSHORTTIME, Global_vbShortTime, BP_GET}, - {DISPID_GLOBAL_VBOBJECTERROR, Global_vbObjectError, BP_GET}, + {DISPID_GLOBAL_VBUSEDEFAULT, NULL, BP_GET, -2}, + {DISPID_GLOBAL_VBBINARYCOMPARE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBTEXTCOMPARE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBDATABASECOMPARE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBGENERALDATE, NULL, BP_GET, 0}, + {DISPID_GLOBAL_VBLONGDATE, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBSHORTDATE, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, 3}, + {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, 4}, + {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, 0x80040000}, {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6472b95..ee68e9e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -85,6 +85,16 @@ TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 +TestConstant "vbUseDefault", vbUseDefault, -2 +TestConstant "vbBinaryCompare", vbBinaryCompare, 0 +TestConstant "vbTextCompare", vbTextCompare, 1 +TestConstant "vbDatabaseCompare", vbDatabaseCompare, 2 +TestConstant "vbGeneralDate", vbGeneralDate, 0 +TestConstant "vbLongDate", vbLongDate, 1 +TestConstant "vbShortDate", vbShortDate, 2 +TestConstant "vbLongTime", vbLongTime, 3 +TestConstant "vbShortTime", vbShortTime, 4 +TestConstantI4 "vbObjectError", vbObjectError, &h80040000& Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 843d5c8..5a23c71 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -151,7 +151,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { int val = prop->min_args; - if(val < 0x4000) { + if(val < 0x4000 && (INT16)val == val) { V_VT(res) = VT_I2; V_I2(res) = val; }else {

1 0

Jörg Höhle : winmm: WAVE_OPEN_QUERY causes no WIM /WOM_OPEN notification.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: 4f0743bffabe49db064248881ade24813cbb63ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0743bffabe49db064248881… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 20 22:53:33 2013 +0100 winmm: WAVE_OPEN_QUERY causes no WIM/WOM_OPEN notification. --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9e59e2f..992cca7 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -854,6 +854,16 @@ static void wave_out_test_deviceOut(int device, double duration, rc=WaitForSingleObject(hevent,1500); ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + wout = (HWAVEOUT)0xdeadf00d; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags|WAVE_FORMAT_QUERY); + ok(rc==MMSYSERR_NOERROR, "WAVE_FORMAT_QUERY(%s): rc=%s\n",dev_name(device), + wave_out_error(rc)); + ok(wout==(HWAVEOUT)0xdeadf00d, "WAVE_FORMAT_QUERY handle %p\n", wout); + + rc=WaitForSingleObject(hevent,20); + ok(rc==WAIT_TIMEOUT, "Notification from %s rc=%x\n", + wave_open_flags(flags|WAVE_FORMAT_QUERY),rc); + HeapFree(GetProcessHeap(), 0, buffer); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a5ffbc0..1dceb26 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2726,7 +2726,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WODM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveOut) @@ -3356,7 +3356,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, info.reset = TRUE; res = SendMessageW(g_devices_hwnd, WIDM_OPEN, (DWORD_PTR)&info, 0); - if(res != MMSYSERR_NOERROR) + if(res != MMSYSERR_NOERROR || (dwFlags & WAVE_FORMAT_QUERY)) return res; if(lphWaveIn)

1 0

Dmitry Timoshkov : gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel.
by Alexandre Julliard 22 Feb '13

22 Feb '13

Module: wine Branch: master Commit: c5e129a7e40775ca156c94f01a5aa5260451c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5e129a7e40775ca156c94f01… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 22 19:18:23 2013 +0800 gdiplus: Remove debug traces from GdipBitmapGetPixel and GdipBitmapSetPixel. --- dlls/gdiplus/image.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 59ea41c..ff27334 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -297,7 +297,6 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, BYTE r, g, b, a; BYTE index; BYTE *row; - TRACE("%p %d %d %p\n", bitmap, x, y, color); if(!bitmap || !color || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) @@ -503,7 +502,6 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, { BYTE a, r, g, b; BYTE *row; - TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); if(!bitmap || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) return InvalidParameter;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013