August 2011 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Trust wined3d to give us what we asked for.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: caff742d413bb3579101654bd18d1aa0c7f5bfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caff742d413bb3579101654bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 26 02:12:10 2011 +0200 ddraw: Trust wined3d to give us what we asked for. --- dlls/ddraw/surface.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1f25437..64a8e15 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5112,8 +5112,6 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) { - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; WINED3DPOOL pool = WINED3DPOOL_DEFAULT; enum wined3d_format_id format; DWORD usage = 0; @@ -5215,15 +5213,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr return hr; } - wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); - - format = wined3d_desc.format; - if (format == WINED3DFMT_UNKNOWN) - { - FIXME("IWineD3DSurface::GetDesc returned WINED3DFMT_UNKNOWN.\n"); - } - /* Anno 1602 stores the pitch right after surface creation, so make sure * it's there. TODO: Test other fourcc formats. */ if (format == WINED3DFMT_DXT1 || format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 @@ -5232,11 +5221,11 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; if (format == WINED3DFMT_DXT1) { - surface->surface_desc.u1.dwLinearSize = max(4, wined3d_desc.width) * max(4, wined3d_desc.height) / 2; + surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; } else { - surface->surface_desc.u1.dwLinearSize = max(4, wined3d_desc.width) * max(4, wined3d_desc.height); + surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); } } else

1 0

Frédéric Delanoy : cmd: Avoid reading garbage when looking for redirection handle.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 93a68fa6594907078d69d813f6b58cee35abe8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a68fa6594907078d69d813f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:31 2011 +0200 cmd: Avoid reading garbage when looking for redirection handle. --- programs/cmd/wcmdmain.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2c1c2e5..b282e99 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1354,11 +1354,10 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, while (redir != NULL && ((p = strchrW(redir,'>')) != NULL)) { int handle = 0; - if (*(p-1)!='2') { - handle = 1; - } else { + if (p > redir && (*(p-1)=='2')) handle = 2; - } + else + handle = 1; p++; if ('>' == *p) {

1 0

Frédéric Delanoy : cmd: Fix redirection handle parsing.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: bbdaed2f33157eaf7ac6eefbade697f2967965ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbdaed2f33157eaf7ac6eefba… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:30 2011 +0200 cmd: Fix redirection handle parsing. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 27 +++++++++++++++------------ programs/cmd/wcmdmain.c | 9 +++++---- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7a264d4..0f78376 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -81,6 +81,12 @@ echo foo>foo type foo echo foo 1> foo type foo +echo foo(a)tab@1> foo +type foo +echo foo 1>@tab(a)foo +type foo +echo foo(a)tab@1>@tab(a)foo +type foo echo foo7 7> foo type foo echo foo9 9> foo @@ -91,6 +97,9 @@ echo foo11> foo type foo echo foo12> foo type foo +del foo +echo1>foo +type foo echo ...stdout appending echo foo>foo echo foo >>foo diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2f9471b..1869117 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -120,11 +120,14 @@ word ...stdout redirection foo foo(a)space@ -foo7(a)space@@or_broken(a)foo@space@ -foo9(a)space@@or_broken(a)foo@space@ -(a)todo_wine@foo1 -(a)todo_wine@foo11 -(a)todo_wine@foo12 +foo(a)tab@ +foo(a)space@ +foo(a)tab@ +foo7(a)space@@or_broken(a)foo@tab@ +foo9(a)space@@or_broken(a)foo@tab@ +foo1 +foo11 +foo12 ...stdout appending foo foo(a)space@ @@ -133,12 +136,12 @@ foob(a)space@ fooc(a)space@ foob(a)space@ fooc(a)space@ -(a)todo_wine@food1 -(a)todo_wine@foob(a)space@ -(a)todo_wine@fooc(a)space@ -(a)todo_wine@food1 -(a)todo_wine@food2 -(a)todo_wine@food21 +food1 +foob(a)space@ +fooc(a)space@ +food1 +food2 +food21 @todo_wine(a)foo7@space@@space@@or_broken(a)not supported(a)space@ @todo_wine(a)foo@or_broken(a)not supported @todo_wine(a)------------ Testing ^ escape character -------------- @@ -621,7 +624,7 @@ lulu file created in read-only dir ------------ Testing CALL -------------- foo(a)space@ -(a)todo_wine@foo 8 +foo 8 foo(a)space@@space@ foo bar(a)space@ @todo_wine(a)foo ""@space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 04e1391..2c1c2e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1944,10 +1944,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } /* See if 1>, 2> etc, in which case we have some patching up - to do */ - if (curPos != extraSpace && - *(curPos-1)>='1' && *(curPos-1)<='9') { - + to do (provided there's a preceding whitespace, and enough + chars read so far) */ + if (curStringLen > 2 + && (*(curPos-1)>='1') && (*(curPos-1)<='9') + && ((*(curPos-2)==' ') || (*(curPos-2)=='\t'))) { curStringLen--; curString[curStringLen] = 0x00; curCopyTo[(*curLen)++] = *(curPos-1);

1 0

Frédéric Delanoy : cmd/tests: Add tests for mixed echo modes.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 745fbe084f37d280b96115f580b129c8e6610d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745fbe084f37d280b96115f58… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:33 2011 +0200 cmd/tests: Add tests for mixed echo modes. --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bce966b..1250e89 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -54,6 +54,17 @@ echo @tab(a)word echo @tab(a)word echo(a)tab@@tab(a)word +echo ------------ Testing mixed echo modes -------------- +echo @echo on> mixedEchoModes.cmd +echo if 1==1 echo foo>> mixedEchoModes.cmd +echo if 1==1 @echo bar>> mixedEchoModes.cmd +echo @echo off>> mixedEchoModes.cmd +echo if 1==1 echo foo2>> mixedEchoModes.cmd +echo if 1==1 @echo bar2>> mixedEchoModes.cmd +type mixedEchoModes.cmd +cmd /c mixedEchoModes.cmd +del mixedEchoModes.cmd + echo ------------ Testing rem -------------- rem Hello rem Hello diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eb7784f..5c545ed 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -99,6 +99,21 @@ word @tab(a)word @space@@tab(a)word @tab(a)word +------------ Testing mixed echo modes -------------- +(a)echo on +if 1==1 echo foo +if 1==1 @echo bar +(a)echo off +if 1==1 echo foo2 +if 1==1 @echo bar2 + +(a)todo_wine@@pwd@>if 1 == 1 echo foo(a)space@ +foo + +(a)todo_wine@@pwd@>if 1 == 1(a)space@ +bar +foo2 +bar2 ------------ Testing rem -------------- @pwd@>rem Hello(a)space@

1 0

Frédéric Delanoy : cmd/tests: Add tests for redirections within IF statements.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: a2eb505d2c4be6afe1301c364a5b6e9c8784ebc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2eb505d2c4be6afe1301c364… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:32 2011 +0200 cmd/tests: Add tests for redirections within IF statements. --- programs/cmd/tests/test_builtins.cmd | 29 +++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0f78376..bce966b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -120,6 +120,35 @@ del foo echo foo> foo echo foo7 7>> foo || (echo not supported & del foo) if exist foo (type foo) else echo not supported +echo ...redirections within IF statements +if 1==1 echo foo1>bar +type bar & del bar +if 1==1 (echo foo2>bar) else echo baz2>bar +type bar & del bar +if 1==1 (echo foo3) else echo baz3>bar +type bar || echo file does not exist, ok +if 1==1 (echo foo4>bar) else echo baz4>bar +type bar & del bar +if 1==0 (echo foo5>bar) else echo baz5>bar +type bar & del bar +if 1==0 (echo foo6) else echo baz6 1>bar +type bar & del bar +if 1==0 (echo foo7 1>bar) else echo baz7>bar +type bar & del bar +if 1==0 (echo foo8 1>bar) else echo baz8>bak +type bak +if 1==1 (echo foo>bar & echo baz) +type bar +if 1==1 ( + echo foo>bar + echo baz +) +type bar +(if 1==1 (echo A) else echo B) > C +type C +(if 1==0 (echo A) else echo B) > C +type C +(if 1==0 (echo A > B) else echo C) cd .. & rd /s/q foobar echo ------------ Testing ^^ escape character -------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1869117..eb7784f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -144,6 +144,23 @@ food2 food21 @todo_wine(a)foo7@space@@space@@or_broken(a)not supported(a)space@ @todo_wine(a)foo@or_broken(a)not supported +...redirections within IF statements +(a)todo_wine@foo1 +(a)todo_wine@foo2 +(a)todo_wine@foo3 +file does not exist, ok +foo4 +baz5 +baz6(a)space@ +baz7 +baz8 +baz +foo(a)space@ +baz +foo +A +B +C @todo_wine(a)------------ Testing ^ escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world

1 0

Louis Lenders : ieframe: Add stub for IEGetWriteableHKCU.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: bb6b19ba880944c3390e424f61dfddc8c9790dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6b19ba880944c3390e424f6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 11 10:25:01 2011 +0200 ieframe: Add stub for IEGetWriteableHKCU. --- dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/ieframe.spec b/dlls/ieframe/ieframe.spec index 59e783f..60965dc 100644 --- a/dlls/ieframe/ieframe.spec +++ b/dlls/ieframe/ieframe.spec @@ -5,4 +5,5 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall IEGetWriteableHKCU(ptr) @ stdcall OpenURL(long long str long) diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 0296e5b..cb810cc 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -290,3 +290,12 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("()\n"); return __wine_unregister_resources(ieframe_instance); } + +/*********************************************************************** + * IEGetWriteableHKCU (ieframe.@) + */ +HRESULT WINAPI IEGetWriteableHKCU(HKEY *pkey) +{ + FIXME("(%p) stub\n", pkey); + return E_NOTIMPL; +}

1 0

Frédéric Delanoy : cmd: Ignore trailing whitespace when using cd.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 003bdf8e6909732a96ea0563a8f26b7ec801b36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=003bdf8e6909732a96ea0563a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:28 2011 +0200 cmd: Ignore trailing whitespace when using cd. --- programs/cmd/builtins.c | 2 ++ programs/cmd/tests/test_builtins.cmd | 30 ++++++++++-------------------- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5d7df82..a2c5eec 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2118,6 +2118,8 @@ void WCMD_setshow_default (const WCHAR *command) { if (*command != '"') *pos++ = *command; command++; } + while (pos > command && (*(pos-1) == ' ' || *(pos-1) == '\t')) + pos--; *pos = 0x00; /* Search for appropriate directory */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 78eea97..1f9bb78 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -103,8 +103,7 @@ type foo del foo echo food21>>foo type foo -cd .. -rd /s/q foobar +cd .. & rd /s/q foobar echo ------------ Testing ^^ escape character -------------- rem Using something like "echo foo^" asks for an additional char after a "More?" prompt on the following line; it's not possible to currently test that non-interactively @@ -494,8 +493,7 @@ if exist foo ( ) else ( echo *** ) -cd .. -rd foobar +cd .. & rd foobar echo ------------ Testing if/else -------------- echo if/else should work with blocks @@ -594,8 +592,7 @@ rem del tmp rem for /d %%i in (*) do echo %%i>> tmp rem sort < tmp rem del tmp -cd .. -rd /s/Q foobar +cd .. & rd /s/Q foobar echo ...for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i @@ -899,8 +896,7 @@ if exist foo (echo foo created) else echo foo not created! if exist bar (echo bar created) else echo bar not created! if exist foobar (echo foobar created) else echo foobar not created! if exist bar\baz (echo bar\baz created) else echo bar\baz not created! -cd .. -rd /s/q foobaz +cd .. & rd /s/q foobaz call :setError 0 mkdir foo\* echo mkdir foo\* errorlevel %ErrorLevel% @@ -970,8 +966,7 @@ if not exist foo (echo foo removed) else echo foo not removed! if not exist bar (echo bar removed) else echo bar not removed! if not exist foobar (echo foobar removed) else echo foobar not removed! if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! -cd .. -rd /s/q foobaz +cd .. & rd /s/q foobaz echo ------------ Testing attrib -------------- rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications @@ -1000,8 +995,7 @@ if not exist foo ( attrib -r foo del foo ) -cd .. -rd /s/q foobar +cd .. & rd /s/q foobar echo ... recursive behaviour mkdir foobar\baz & cd foobar echo > level1 @@ -1015,8 +1009,7 @@ attrib level1 attrib baz\level2 echo > bar attrib bar -cd .. -rd /s/q foobar +cd .. & rd /s/q foobar echo ... folders processing mkdir foobar attrib foobar @@ -1031,8 +1024,7 @@ type baz\toto echo > baz\lala rem Oddly windows allows file creation in a read-only directory... if exist baz\lala (echo file created in read-only dir) else echo file not created -cd .. -rd /s/q foobar +cd .. & rd /s/q foobar echo ------------ Testing CALL -------------- mkdir foobar & cd foobar @@ -1091,8 +1083,7 @@ echo %ErrorLevel% rem First look for programs in the path before trying a builtin echo echo non-builtin dir> dir.cmd call dir /b -cd .. -rd /s/q foobar +cd .. & rd /s/q foobar echo ------------ Testing setlocal/endlocal ------------ call :setError 0 @@ -1133,8 +1124,7 @@ set VAR=globalval call test.cmd echo %VAR% set VAR= -cd .. -rd /q/s foobar +cd .. & rd /q/s foobar echo -----------Testing Errorlevel----------- rem WARNING: Do *not* add tests using ErrorLevel after this section diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 85afd34..17d828c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -300,7 +300,7 @@ foo foo1 bar2(a)space@ foo2 -(a)todo_wine@foobar deleted +foobar deleted @todo_wine(a)...on success conditional && @todo_wine(a)foo3 not created bar4(a)space@ @@ -317,8 +317,8 @@ Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ @pwd@ @pwd@\foobar @pwd@ -(a)todo_wine@@pwd@ -(a)todo_wine@@pwd@ +(a)pwd@ +(a)pwd@ @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@\foobar\bar bak

1 0

Frédéric Delanoy : cmd/tests: Add tests for redirections using non stdout/stderr handles.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 523683d78858419df6edee80710b5ffafcecd127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523683d78858419df6edee807… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 27 02:11:29 2011 +0200 cmd/tests: Add tests for redirections using non stdout/stderr handles. --- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1f9bb78..7a264d4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -81,6 +81,10 @@ echo foo>foo type foo echo foo 1> foo type foo +echo foo7 7> foo +type foo +echo foo9 9> foo +type foo echo foo1> foo type foo echo foo11> foo @@ -103,6 +107,10 @@ type foo del foo echo food21>>foo type foo +del foo +echo foo> foo +echo foo7 7>> foo || (echo not supported & del foo) +if exist foo (type foo) else echo not supported cd .. & rd /s/q foobar echo ------------ Testing ^^ escape character -------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 17d828c..2f9471b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -120,6 +120,8 @@ word ...stdout redirection foo foo(a)space@ +foo7(a)space@@or_broken(a)foo@space@ +foo9(a)space@@or_broken(a)foo@space@ @todo_wine(a)foo1 @todo_wine(a)foo11 @todo_wine(a)foo12 @@ -137,6 +139,8 @@ fooc(a)space@ @todo_wine(a)food1 @todo_wine(a)food2 @todo_wine(a)food21 +(a)todo_wine@foo7(a)space@@space@@or_broken(a)not supported(a)space@ +(a)todo_wine@foo(a)or_broken@not supported @todo_wine(a)------------ Testing ^ escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world

1 0

Louis Lenders : dpnet: Add missing IDirectPlay8Peer methods.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: e772a2b51f7b68ae6372066f65094791aefa5ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e772a2b51f7b68ae6372066f6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 18 10:30:19 2011 +0200 dpnet: Add missing IDirectPlay8Peer methods. --- dlls/dpnet/peer.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 2da5175..751b93b 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -3,6 +3,7 @@ * * Copyright 2004 Raphael Junqueira * Copyright 2008 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2011 Louis Lenders * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -271,6 +272,107 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Close(IDirectPlay8Peer *iface, const return DPN_OK; } +static HRESULT WINAPI IDirectPlay8PeerImpl_EnumHosts(IDirectPlay8Peer *iface, + PDPN_APPLICATION_DESC const pApplicationDesc, IDirectPlay8Address * const pAddrHost, + IDirectPlay8Address * const pDeviceInfo, void * const pUserEnumData, + const DWORD dwUserEnumDataSize, const DWORD dwEnumCount, const DWORD dwRetryInterval, + const DWORD dwTimeOut, void * const pvUserContext, DPNHANDLE * const pAsyncHandle, const DWORD dwFlags) +{ + FIXME("(%p)->(%p,%p,%p,%p,%x,%x,%x,%x,%p,%p,%x): stub\n", + iface, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, + dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_DestroyPeer(IDirectPlay8Peer *iface, const DPNID dpnidClient, + const void * const pvDestroyData, const DWORD dwDestroyDataSize, const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x,%x): stub\n", iface, dpnidClient, pvDestroyData, dwDestroyDataSize, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_ReturnBuffer(IDirectPlay8Peer *iface, const DPNHANDLE hBufferHandle, + const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%x): stub\n", iface, hBufferHandle, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_GetPlayerContext(IDirectPlay8Peer *iface, const DPNID dpnid, + void ** const ppvPlayerContext, const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, ppvPlayerContext, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_GetGroupContext(IDirectPlay8Peer *iface, const DPNID dpnid, + void ** const ppvGroupContext, const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, ppvGroupContext, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_GetCaps(IDirectPlay8Peer *iface, DPN_CAPS * const pdpCaps, + const DWORD dwFlags) +{ + FIXME("(%p)->(%p,%x): stub\n", iface, pdpCaps, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_SetCaps(IDirectPlay8Peer *iface, const DPN_CAPS * const pdpCaps, + const DWORD dwFlags) +{ + FIXME("(%p)->(%p,%x): stub\n", iface, pdpCaps, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_SetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, + const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags ) +{ + FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_GetSPCaps(IDirectPlay8Peer *iface, const GUID * const pguidSP, + DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) +{ + FIXME("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_GetConnectionInfo(IDirectPlay8Peer *iface, const DPNID dpnid, + DPN_CONNECTION_INFO * const pdpConnectionInfo, const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnid, pdpConnectionInfo, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_RegisterLobby(IDirectPlay8Peer *iface, const DPNHANDLE dpnHandle, + struct IDirectPlay8LobbiedApplication * const pIDP8LobbiedApplication, const DWORD dwFlags) +{ + FIXME("(%p)->(%x,%p,%x): stub\n", iface, dpnHandle, pIDP8LobbiedApplication, dwFlags); + + return DPNERR_GENERIC; +} + +static HRESULT WINAPI IDirectPlay8PeerImpl_TerminateSession(IDirectPlay8Peer *iface, void * const pvTerminateData, + const DWORD dwTerminateDataSize, const DWORD dwFlags) +{ + FIXME("(%p)->(%p,%x,%x): stub\n", iface, pvTerminateData, dwTerminateDataSize, dwFlags); + + return DPNERR_GENERIC; +} + static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = { IDirectPlay8PeerImpl_QueryInterface, @@ -297,7 +399,19 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_GetPeerInfo, IDirectPlay8PeerImpl_GetPeerAddress, IDirectPlay8PeerImpl_GetLocalHostAddresses, - IDirectPlay8PeerImpl_Close + IDirectPlay8PeerImpl_Close, + IDirectPlay8PeerImpl_EnumHosts, + IDirectPlay8PeerImpl_DestroyPeer, + IDirectPlay8PeerImpl_ReturnBuffer, + IDirectPlay8PeerImpl_GetPlayerContext, + IDirectPlay8PeerImpl_GetGroupContext, + IDirectPlay8PeerImpl_GetCaps, + IDirectPlay8PeerImpl_SetCaps, + IDirectPlay8PeerImpl_SetSPCaps, + IDirectPlay8PeerImpl_GetSPCaps, + IDirectPlay8PeerImpl_GetConnectionInfo, + IDirectPlay8PeerImpl_RegisterLobby, + IDirectPlay8PeerImpl_TerminateSession }; HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) {

1 0

Alexandre Julliard : msi: Avoid dynamic stack allocation.
by Alexandre Julliard Aug. 29, 2011

Aug. 29, 2011

Module: wine Branch: master Commit: 2fcf1220eb0750dc03a1be25b308333188e6ce3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcf1220eb0750dc03a1be25b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 13:52:32 2011 +0200 msi: Avoid dynamic stack allocation. --- dlls/msi/where.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 16b6c03..cc80a71 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -610,7 +610,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; UINT r; JOINTABLE *table = wv->tables; - UINT rows[wv->table_count]; + UINT *rows; TRACE("%p %p\n", wv, record); @@ -638,6 +638,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) } while ((table = table->next)); + rows = msi_alloc( wv->table_count * sizeof(*rows) ); r = check_condition(wv, record, wv->tables, rows); if (wv->order_info) @@ -647,7 +648,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (wv->order_info) r = wv->order_info->error; - + msi_free( rows ); return r; }

1 0