November 2010 - Wine-commits

Maarten Lankhorst : quartz: Change VideoRenderer_Run to handle EndOfStream slightly better.
by Alexandre Julliard 25 Nov '10

25 Nov '10

Module: wine Branch: master Commit: f63950d023eb9411a117e42ef500f9d0f9e21786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63950d023eb9411a117e42ef… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 24 18:23:55 2010 +0100 quartz: Change VideoRenderer_Run to handle EndOfStream slightly better. --- dlls/quartz/videorenderer.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 112289a..d26ecb5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -821,19 +821,17 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta EnterCriticalSection(&This->filter.csFilter); if (This->filter.state == State_Running) goto out; - if (This->pInputPin->pin.pConnectedTo) + This->filter.rtStreamStart = tStart; + QualityControlRender_Start(&This->qcimpl, tStart); + if (This->pInputPin->pin.pConnectedTo && (This->filter.state == State_Stopped || !This->pInputPin->end_of_stream)) { if (This->filter.state == State_Stopped) { - This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); VideoRenderer_AutoShowWindow(This); + This->pInputPin->end_of_stream = 0; } SetEvent(This->blocked); - - This->filter.rtStreamStart = tStart; - This->filter.state = State_Running; - QualityControlRender_Start(&This->qcimpl, tStart); } else if (This->filter.filterInfo.pGraph) { IMediaEventSink *pEventSink; hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink);

1 0

Austin English : winefile: Add a manpage.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: d2989f0d09254268b557ab18aee572032d450291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2989f0d09254268b557ab18a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 24 06:27:30 2010 -0800 winefile: Add a manpage. --- .gitignore | 1 + programs/winefile/Makefile.in | 12 ++++++++++++ programs/winefile/winefile.man.in | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1f4999a..4c866b9 100644 --- a/.gitignore +++ b/.gitignore @@ -273,6 +273,7 @@ programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg.man +programs/winefile/winefile.man programs/winemine/winemine.man programs/winetest/*_test.exe programs/winetest/*_test.rc diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index dc15104..3d5b47b 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -33,6 +33,18 @@ RC_SRCS = \ Zh.rc \ rsrc.rc +MANPAGES = winefile.man + SVG_SRCS = winefile.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winefile.man $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winefile.$(prog_manext) diff --git a/programs/winefile/winefile.man.in b/programs/winefile/winefile.man.in new file mode 100644 index 0000000..761501d --- /dev/null +++ b/programs/winefile/winefile.man.in @@ -0,0 +1,19 @@ +.TH WINEFILE 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winefile \- Wine File Manager +.SH SYNOPSIS +.BR "winefile \fl[Unix\ path]\fR" + +.BR "winefile \fl[Win32\ path]\fR" +.SH DESCRIPTION +.B winefile +is the Wine file manager, with a similar design to early Microsoft Windows explorer. +.SH USAGE +.B You can pass winefile either a Unix or Win32 path, for example: + +.B Using a Unix path: winefile /mnt/hda1 + +.B Using a Win32 path: winefile C:\(rs\(rswindows\(rs\(rs\ + +.SH "SEE ALSO" +.BR wine(1)

1 0

Austin English : winecfg: Add a manpage.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 68daebb681c1df761a035666217945a23c3c5d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68daebb681c1df761a0356662… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 24 06:43:10 2010 -0800 winecfg: Add a manpage. --- .gitignore | 1 + programs/winecfg/Makefile.in | 12 ++++++++++++ programs/winecfg/winecfg.man.in | 13 +++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 4c866b9..a505761 100644 --- a/.gitignore +++ b/.gitignore @@ -269,6 +269,7 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c +programs/winecfg/winecfg.man programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index a23d8bd..0185196 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -43,8 +43,20 @@ RC_SRCS = \ Zh.rc \ winecfg.rc +MANPAGES = winecfg.man + SVG_SRCS = \ logo.svg \ winecfg.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winecfg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in new file mode 100644 index 0000000..0c56238 --- /dev/null +++ b/programs/winecfg/winecfg.man.in @@ -0,0 +1,13 @@ +.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winecfg \- Wine Configuration Editor +.SH SYNOPSIS +.BR "winecfg" +.SH DESCRIPTION +.B winecfg +is the Wine configuration editor. It allows you to change several settings, such as DLL load order +(native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, +among others. Many of these settings can be made on a per application basis, for example, preferring native +riched20.dll for wordpad.exe, but not for notepad.exe. +.SH "SEE ALSO" +.BR wine(1)

1 0

Matteo Bruni : d3dx9/tests: Fix a D3DXCheckTextureRequirements test failing on Windows.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 9867c39133f260eead2e7a041eae1d1fd775dcf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9867c39133f260eead2e7a041… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 24 16:06:07 2010 +0100 d3dx9/tests: Fix a D3DXCheckTextureRequirements test failing on Windows. --- dlls/d3dx9_36/tests/texture.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c1af04f..1f31d81 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -171,11 +171,17 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) IDirect3DDevice9_GetCreationParameters(device, &params); IDirect3DDevice9_GetDisplayMode(device, 0, &mode); - if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) expected = D3DFMT_R3G3B2; else - expected = D3DFMT_X4R4G4B4; + { + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) + expected = D3DFMT_X4R4G4B4; + else + expected = D3DFMT_X1R5G5B5; + } format = D3DFMT_R3G3B2; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT);

1 0

Alexandre Julliard : oleaut32: Convert dll registration to the new IRegistrar mechanism.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 7769b05858b27e1fbe3d469253bb2777bbdddbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7769b05858b27e1fbe3d46925… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 17:29:27 2010 +0100 oleaut32: Convert dll registration to the new IRegistrar mechanism. --- dlls/oleaut32/Makefile.in | 5 +- dlls/oleaut32/oleaut.c | 56 ++++ dlls/oleaut32/oleaut32.rgs | 110 +++++++ dlls/oleaut32/olepicture.c | 1 + dlls/oleaut32/regsvr.c | 556 --------------------------------- dlls/oleaut32/{version.rc => rsrc.rc} | 3 + 6 files changed, 172 insertions(+), 559 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7769b05858b27e1fbe3d4…

1 0

Damjan Jovanovic : sti: Use IRegistrar instead of regsvr.c.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 33423f3752b322e1a944fdb3e12b2c152d24a50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33423f3752b322e1a944fdb3e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 23 10:11:43 2010 +0200 sti: Use IRegistrar instead of regsvr.c. --- dlls/sti/Makefile.in | 5 +- dlls/sti/regsvr.c | 433 -------------------------------------------------- dlls/sti/rsrc.rc | 20 +++ dlls/sti/sti.rgs | 13 ++ dlls/sti/sti_main.c | 20 +++ 5 files changed, 56 insertions(+), 435 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33423f3752b322e1a944f…

1 0

Borut Razem : ping: Sleep 1 second less.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 814bbc465bf54d7214f0c29261eb96e6f712ac3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814bbc465bf54d7214f0c2926… Author: Borut Razem <borut.razem(a)siol.net> Date: Tue Nov 23 22:14:17 2010 +0100 ping: Sleep 1 second less. --- programs/ping/ping_main.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 70db17f..037fa4d 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -18,6 +18,7 @@ */ #include <unistd.h> +#include <stdio.h> #include <windows.h> #include "wine/debug.h" @@ -26,15 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ping); static void usage(void) { - WINE_MESSAGE( "Usage: ping [-n count] [-w timeout] target_name\n\n" ); - WINE_MESSAGE( "Options:\n" ); - WINE_MESSAGE( " -n Number of echo requests to send.\n" ); - WINE_MESSAGE( " -w Timeout in milliseconds to wait for each reply.\n" ); + printf("Usage: ping [-n count] [-w timeout] target_name\n\n" + "Options:\n" + " -n Number of echo requests to send.\n" + " -w Timeout in milliseconds to wait for each reply.\n"); } int main(int argc, char** argv) { - int n = 0; + unsigned int n = 0; int optc; WINE_FIXME( "this command currently just sleeps based on -n parameter\n" ); @@ -44,7 +45,12 @@ int main(int argc, char** argv) switch(optc) { case 'n': - n = atoi( optarg ); + n = atoi(optarg); + if (n == 0) + { + printf("Bad value for option -n, valid range is from 1 to 4294967295.\n"); + exit(1); + } break; case '?': usage(); @@ -56,6 +62,8 @@ int main(int argc, char** argv) } } - Sleep(n * 1000); + if (n != 0) + Sleep((n - 1) * 1000); + return 0; }

1 0

Hwang YunSong : shdocvw: Update Korean resource.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 2fd48900a2df54b698b49115c415844f22c66945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd48900a2df54b698b49115c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Nov 24 17:45:01 2010 +0900 shdocvw: Update Korean resource. --- dlls/shdocvw/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Ko.rc b/dlls/shdocvw/Ko.rc index 7bcfdf3..0fe1a71 100644 --- a/dlls/shdocvw/Ko.rc +++ b/dlls/shdocvw/Ko.rc @@ -52,6 +52,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "인쇄 미리보기(&W)...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "속성(&P)...", ID_BROWSE_PROPERTIES + MENUITEM "닫기(&C)", ID_BROWSE_QUIT } POPUP "보기(&V)" {

1 0

Michael Stefaniuc : shdocvw: Don't open code CONTAINING_RECORD().
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 9d74e4dec33cd2bac6361e913d9f0d35137d2647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74e4dec33cd2bac6361e913… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 24 14:06:38 2010 +0100 shdocvw: Don't open code CONTAINING_RECORD(). --- dlls/shdocvw/classinfo.c | 2 +- dlls/shdocvw/client.c | 12 ++++++------ dlls/shdocvw/dochost.c | 6 +++--- dlls/shdocvw/events.c | 4 ++-- dlls/shdocvw/frame.c | 2 +- dlls/shdocvw/ie.c | 2 +- dlls/shdocvw/iexplore.c | 2 +- dlls/shdocvw/intshcut.c | 6 +++--- dlls/shdocvw/navigate.c | 8 ++++---- dlls/shdocvw/oleobject.c | 10 +++++----- dlls/shdocvw/persist.c | 6 +++--- dlls/shdocvw/view.c | 4 ++-- dlls/shdocvw/webbrowser.c | 6 +++--- 13 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d74e4dec33cd2bac6361…

1 0

Matteo Bruni : d3dx9/tests: Fix some tests to take into account POW2 texture capability flags.
by Alexandre Julliard 24 Nov '10

24 Nov '10

Module: wine Branch: master Commit: 9517305c03d217ec9300b2b105fc795ad25d6227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9517305c03d217ec9300b2b10… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 24 13:57:24 2010 +0100 d3dx9/tests: Fix some tests to take into account POW2 texture capability flags. --- dlls/d3dx9_36/tests/texture.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 44e7719..c1af04f 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -109,17 +109,22 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); - width = 284; height = 137; - mipmaps = 20; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) + { + width = 284; height = 137; + mipmaps = 20; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); - width = height = 63; - mipmaps = 9; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 6, "Returned mipmaps %d, expected %d\n", mipmaps, 6); + width = height = 63; + mipmaps = 9; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 6, "Returned mipmaps %d, expected %d\n", mipmaps, 6); + } + else + skip("Skipping some tests, npot2 textures unsupported\n"); mipmaps = 20; hr = D3DXCheckTextureRequirements(device, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); @@ -193,7 +198,7 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) { - UINT size, mipmaps; + UINT size, mipmaps, expected; D3DFORMAT format; D3DCAPS9 caps; HRESULT hr; @@ -231,15 +236,17 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) size = 284; mipmaps = 20; + expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 10 : 9; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 10, "Returned mipmaps %d, expected %d\n", mipmaps, 10); + ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected); size = 63; mipmaps = 9; + expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 7 : 6; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected); mipmaps = 0; hr = D3DXCheckCubeTextureRequirements(device, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); @@ -280,7 +287,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) { - UINT width, height, depth, mipmaps; + UINT width, height, depth, mipmaps, expected; D3DFORMAT format; D3DCAPS9 caps; HRESULT hr; @@ -376,9 +383,10 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) height = 143; depth = 55; mipmaps = 20; + expected = caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 ? 10 : 9; hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(mipmaps == 10, "Returned mipmaps %d, expected %d\n", mipmaps, 10); + ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected); mipmaps = 0; hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT);

1 0