August 2009 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Wrap nsIHttpChannelInternal interface.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 487443a2d1e7e3346ab3f266e94fd41a0552d369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=487443a2d1e7e3346ab3f266e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:37:30 2009 +0200 mshtml: Wrap nsIHttpChannelInternal interface. --- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/nsiface.idl | 18 +++++ dlls/mshtml/nsio.c | 145 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 160 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=487443a2d1e7e3346ab3f…

1 0

Andrew Eikum : ole32: Don' t read past the end of the stream when converting block types.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: a0aaa65507c4f6cc1bd15f31c6e1b54ef83d7f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0aaa65507c4f6cc1bd15f31c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 21 14:33:40 2009 -0500 ole32: Don't read past the end of the stream when converting block types. --- dlls/ole32/storage32.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4a27317..b06578b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3563,7 +3563,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( { resRead = SmallBlockChainStream_ReadAt(*ppsbChain, offset, - This->smallBlockSize, + min(This->smallBlockSize, size.u.LowPart - offset.u.LowPart), buffer, &cbRead); if (FAILED(resRead)) @@ -3582,7 +3582,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( if (FAILED(resWrite)) break; - offset.u.LowPart += This->smallBlockSize; + offset.u.LowPart += cbRead; } } while (cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(),0,buffer); @@ -3663,7 +3663,8 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( do { resRead = BlockChainStream_ReadAt(*ppbbChain, offset, - This->bigBlockSize, buffer, &cbRead); + min(This->bigBlockSize, size.u.LowPart - offset.u.LowPart), + buffer, &cbRead); if(FAILED(resRead)) break; @@ -3678,7 +3679,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( if(FAILED(resWrite)) break; - offset.u.LowPart += This->bigBlockSize; + offset.u.LowPart += cbRead; } }while(cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Jacek Caban : urlmon: Fixed tests on IE older than 8.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: bf5c2e858fdccbfd4192dcf619461c93a64ca7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5c2e858fdccbfd4192dcf61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:22:11 2009 +0200 urlmon: Fixed tests on IE older than 8. --- dlls/urlmon/tests/protocol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b8e6e98..0c7932a 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -672,7 +672,8 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR CHECK_EXPECT2(ReportData); if(short_read) { - ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE), + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE) + || grfBSCF == BSCF_FIRSTDATANOTIFICATION, /* < IE8 */ "grcfBSCF = %08x\n", grfBSCF); CHECK_CALLED(Read); /* Set in Continue */ first_data_notif = FALSE;

1 0

Aric Stewart : msacm32/tests: msacm32 can enumerate drivers that cannot be loaded or have their details queried . Deal with this properly.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: bfe83b22c287fea231e1b1d29d150921e7f1ca6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe83b22c287fea231e1b1d29… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 21 09:22:56 2009 -0500 msacm32/tests: msacm32 can enumerate drivers that cannot be loaded or have their details queried. Deal with this properly. --- dlls/msacm32/tests/msacm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 956b785..c528f78 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -94,7 +94,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, "acmDriverDetails(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); @@ -119,7 +119,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* try valid parameters */ rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, "acmDriverDetails(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); @@ -210,7 +210,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* try valid parameters */ rc = acmDriverOpen(&had, hadid, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, "acmDriverOpen(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR);

1 0

Aric Stewart : msacm32: If a driver load fails and it does not give us another error set the error to MMSYSERR_NODRIVER .
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 6215742c6efc9fed47fa160fdd7718e7950377c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6215742c6efc9fed47fa160fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 21 09:38:53 2009 -0500 msacm32: If a driver load fails and it does not give us another error set the error to MMSYSERR_NODRIVER. --- dlls/msacm32/driver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e481d68..e3d987f 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -555,6 +555,8 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe if (!pad->hDrvr) { ret = adod.dwError; + if (ret == MMSYSERR_NOERROR) + ret = MMSYSERR_NODRIVER; goto gotError; } } @@ -578,6 +580,8 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe if (!pad->pLocalDrvrInst) { ret = adod.dwError; + if (ret == MMSYSERR_NOERROR) + ret = MMSYSERR_NODRIVER; goto gotError; } }

1 0

Aric Stewart : msacm32: In acmDriverDetails if we are unable to load the driver then return MMSYSERR_NOTSUPPORTED as windows does .
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 157c1629c1c9403f7a771b113ff4ea8ac63acc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157c1629c1c9403f7a771b113… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 21 09:39:15 2009 -0500 msacm32: In acmDriverDetails if we are unable to load the driver then return MMSYSERR_NOTSUPPORTED as windows does. --- dlls/msacm32/driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index e3d987f..9ca16dc 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -305,6 +305,8 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D paddw.cbStruct = min(padd->cbStruct, sizeof(*padd)); memcpy(padd, &paddw, paddw.cbStruct); } + else if (mmr == MMSYSERR_NODRIVER) + return MMSYSERR_NOTSUPPORTED; return mmr; }

1 0

Alexandre Julliard : server: Define an architecture-independent structure for process startup info.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: da8acbc47d6e14ca6a1336dfdb9847356c71cc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8acbc47d6e14ca6a1336dfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 20:05:21 2009 +0200 server: Define an architecture-independent structure for process startup info. --- dlls/kernel32/process.c | 222 +++++++++++++++++++++++----------------- dlls/ntdll/thread.c | 129 ++++++++++++++--------- include/wine/server_protocol.h | 50 ++++++++-- server/process.c | 72 +++++++++----- server/protocol.def | 48 +++++++-- server/request.h | 18 ++-- server/trace.c | 93 ++++++----------- 7 files changed, 373 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da8acbc47d6e14ca6a133…

1 0

Maik Schulz : Website: corrected typo in news item
by Maik Schulz 24 Aug '09

24 Aug '09

Module: website Branch: master Commit: 74e5a6aa50bfd130dc684732beced014879a5376 URL: http://source.winehq.org/git/website.git/?a=commit;h=74e5a6aa50bfd130dc6847… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Mon Aug 24 09:29:14 2009 +0200 Website: corrected typo in news item --- news/de/2009082101.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2009082101.xml b/news/de/2009082101.xml index 1e6ac9b..c5bf5d1 100644 --- a/news/de/2009082101.xml +++ b/news/de/2009082101.xml @@ -7,7 +7,7 @@ <ul> <li>Unterstützung für das IRDA Protokoll.</li> <li>Schnelleres initiales Erzeugen des wineprefix.</li> - <li>Zuordnen von Axen für evdev Joysticks.</li> + <li>Zuordnen von Achsen für evdev Joysticks.</li> <li>Weitere Bildformate in den WindowsCodecs.</li> <li>Verschiedenste Fehlerbehebungen.</li> </ul>

1 0

Maik Schulz : Website: German translation of 1.1.28 release news item
by Maik Schulz 24 Aug '09

24 Aug '09

Module: website Branch: master Commit: 52b138f3147ed3747e0a3df67bd69b4062bb2461 URL: http://source.winehq.org/git/website.git/?a=commit;h=52b138f3147ed3747e0a3d… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Mon Aug 24 09:06:03 2009 +0200 Website: German translation of 1.1.28 release news item --- news/de/2009082101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009082101.xml b/news/de/2009082101.xml new file mode 100644 index 0000000..1e6ac9b --- /dev/null +++ b/news/de/2009082101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. August 2009</date> +<title>Wine 1.1.28 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.28 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.28">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für das IRDA Protokoll.</li> + <li>Schnelleres initiales Erzeugen des wineprefix.</li> + <li>Zuordnen von Axen für evdev Joysticks.</li> + <li>Weitere Bildformate in den WindowsCodecs.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.28.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : winetest: Fix syntax error in previous patch.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: tools Branch: master Commit: 397dba8018658b354e6fef44cac0002d0efc8a43 URL: http://source.winehq.org/git/tools.git/?a=commit;h=397dba8018658b354e6fef44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 21 23:21:21 2009 +0200 winetest: Fix syntax error in previous patch. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 8bd7865..4436b26 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -174,7 +174,7 @@ if ($plid==1 && $major==4) { $version = "2003"; } } - } elsif ($major==6) + } elsif ($major==6) { if ($minor == 0) { if ($product==1) { $version = "vista";

1 0