July 2006 - Wine-Commits - list.winehq.org

Roderick Colenbrander : wined3d: Optimize d3dfmt_convert_surface.
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: dc743d82fff84743e09a1c86d5e803ca8a7c375d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc743d82fff84743e09a1c8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 28 13:57:49 2006 +0200 wined3d: Optimize d3dfmt_convert_surface. --- dlls/wined3d/surface.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a763537..fffcc82 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -936,7 +936,7 @@ static void flush_to_framebuffer_drawpix case WINED3DFMT_P8: { UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ - int row; + int height = This->glRect.bottom - This->glRect.top; type = GL_UNSIGNED_BYTE; fmt = GL_RGBA; @@ -945,12 +945,11 @@ static void flush_to_framebuffer_drawpix ERR("Out of memory\n"); return; } - for(row = This->dirtyRect.top; row < This->dirtyRect.bottom; row++) { - d3dfmt_convert_surface(This->resource.allocatedMemory + row * pitch + This->lockedRect.left, - (BYTE *) mem + row * pitch * 4 + This->lockedRect.left * 4, - This->lockedRect.right - This->lockedRect.left, - CONVERT_PALETTED, This); - } + d3dfmt_convert_surface(This->resource.allocatedMemory, + mem, + pitch*height, + CONVERT_PALETTED, + This); } break; @@ -1813,11 +1812,10 @@ static HRESULT WINAPI IWineD3DSurfaceImp else This->Flags &= ~SFLAG_GLCKEY; d3dfmt_get_conv(This, TRUE /* We need color keying */, &format, &internal, &type, &convert, &bpp); - if((convert != NO_CONVERSION) && - This->resource.allocatedMemory) { + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int width = This->glRect.right - This->glRect.left; int height = This->glRect.bottom - This->glRect.top; - int row; + int pitch = IWineD3DSurface_GetPitch(iface); mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); if(!mem) { @@ -1825,14 +1823,14 @@ static HRESULT WINAPI IWineD3DSurfaceImp return WINED3DERR_OUTOFVIDEOMEMORY; } - for(row = This->glRect.top; row < This->glRect.bottom; row++) { - BYTE *cur = This->resource.allocatedMemory + row * This->pow2Width * This->bytesPerPixel; - d3dfmt_convert_surface(cur + This->glRect.left * This->bytesPerPixel, - mem + row * width * bpp, - width, - convert, - This); - } + d3dfmt_convert_surface(This->resource.allocatedMemory, + mem, + pitch*height, + convert, + This); + /* Make sure the correct pitch is used */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); + This->Flags |= SFLAG_CONVERTED; } else { This->Flags &= ~SFLAG_CONVERTED;

1 0

Roderick Colenbrander : winex11.drv: Kill DGA support.
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: 98179f06565b7f681d3cddcce69e25801e3a521f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98179f06565b7f681d3cddc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 28 01:26:07 2006 +0200 winex11.drv: Kill DGA support. --- configure | 93 ----------- configure.ac | 12 - dlls/winex11.drv/Makefile.in | 1 dlls/winex11.drv/dga2.c | 331 ---------------------------------------- dlls/winex11.drv/dga2.h | 42 ----- dlls/winex11.drv/event.c | 3 dlls/winex11.drv/mouse.c | 49 ------ dlls/winex11.drv/x11ddraw.c | 8 - dlls/winex11.drv/x11drv.h | 6 - dlls/winex11.drv/x11drv_main.c | 13 -- include/config.h.in | 6 - 11 files changed, 1 insertions(+), 563 deletions(-) delete mode 100644 dlls/winex11.drv/dga2.c delete mode 100644 dlls/winex11.drv/dga2.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=98179f06565b7f681d3…

1 0

Jacek Caban : stdole2.tlb: Move stdole2. tlb generation to include to allow importlib from other IDLs.
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: 385247b3d65c1faaec1f0423ed186e997241cf97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=385247b3d65c1faaec1f042… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 27 20:45:14 2006 +0200 stdole2.tlb: Move stdole2.tlb generation to include to allow importlib from other IDLs. --- dlls/stdole2.tlb/std_ole_v2.idl | 415 ------------------------------------- include/Makefile.in | 13 + include/stdole2.idl | 434 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 444 insertions(+), 418 deletions(-) create mode 100644 include/stdole2.idl Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=385247b3d65c1faaec1…

1 0

Alexandre Julliard : Make.rules: Replace RC_TLB by IDL_TLB_SRCS as tlb files can be used for other things than resources .
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: 853d193782055703e316a82ce88e31196839c8ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=853d193782055703e316a82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 29 11:45:24 2006 +0200 Make.rules: Replace RC_TLB by IDL_TLB_SRCS as tlb files can be used for other things than resources. --- Make.rules.in | 6 +++--- dlls/stdole2.tlb/Makefile.in | 2 +- dlls/stdole32.tlb/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 4facbe5..ee8754b 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -169,7 +169,7 @@ # Rules for resources $(RC_BINARIES): $(BIN2RES) $(RC_BINSRC) $(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC) -$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(RC_TLB) +$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(IDL_TLB_SRCS:.idl=.tlb) # Rules for makefile @@ -221,7 +221,7 @@ # Rules for cleaning testclean:: $(SUBDIRS:%=%/__testclean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(PROGRAMS) $(RC_BINARIES) $(RC_TLB) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) @@ -270,7 +270,7 @@ # Misc. rules $(IDL_SRCS:.idl=.h): $(WIDL) -$(RC_TLB:.idl=.tlb): $(WIDL) +$(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in index d09ab61..802243c 100644 --- a/dlls/stdole2.tlb/Makefile.in +++ b/dlls/stdole2.tlb/Makefile.in @@ -6,7 +6,7 @@ MODULE = stdole2.tlb IMPORTS = kernel32 RC_SRCS = rsrc.rc -RC_TLB = std_ole_v2.tlb +IDL_TLB_SRCS = std_ole_v2.idl @MAKE_DLL_RULES@ diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in index 3ca6149..7cd0882 100644 --- a/dlls/stdole32.tlb/Makefile.in +++ b/dlls/stdole32.tlb/Makefile.in @@ -6,7 +6,7 @@ MODULE = stdole32.tlb IMPORTS = kernel32 RC_SRCS = rsrc.rc -RC_TLB = std_ole_v1.tlb +IDL_TLB_SRCS = std_ole_v1.idl @MAKE_DLL_RULES@

1 0

Alexandre Julliard : user: Abort WaitForUserIdle if the target process died .
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: 293d7ab6885e5e4a0e20503d14ce775db69292ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=293d7ab6885e5e4a0e20503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 28 18:01:50 2006 +0200 user: Abort WaitForUserIdle if the target process died. --- dlls/user/message.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 6351ff3..c7a9a6c 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -3179,27 +3179,30 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) { DWORD start_time, elapsed, ret; - HANDLE idle_event = (HANDLE)-1; + HANDLE handles[2]; + handles[0] = hProcess; SERVER_START_REQ( get_process_idle_event ) { req->handle = hProcess; - if (!(ret = wine_server_call_err( req ))) idle_event = reply->event; + if (!(ret = wine_server_call_err( req ))) handles[1] = reply->event; } SERVER_END_REQ; if (ret) return WAIT_FAILED; /* error */ - if (!idle_event) return 0; /* no event to wait on */ + if (!handles[1]) return 0; /* no event to wait on */ start_time = GetTickCount(); elapsed = 0; - TRACE("waiting for %p\n", idle_event ); + TRACE("waiting for %p\n", handles[1] ); do { - ret = MsgWaitForMultipleObjects ( 1, &idle_event, FALSE, dwTimeOut - elapsed, QS_SENDMESSAGE ); + ret = MsgWaitForMultipleObjects ( 2, handles, FALSE, dwTimeOut - elapsed, QS_SENDMESSAGE ); switch (ret) { - case WAIT_OBJECT_0+1: + case WAIT_OBJECT_0: + return WAIT_FAILED; + case WAIT_OBJECT_0+2: process_sent_messages(); break; case WAIT_TIMEOUT:

1 0

appdb/. testResults.php
by WineHQ July 29, 2006

July 29, 2006

ChangeSet ID: 26921 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/28 23:08:14 Modified files: . : testResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix some text in the test results form Patch: http://cvs.winehq.org/patch.py?id=26921 Old revision New revision Changes Path 1.17 1.18 +2 -2 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.17 appdb/testResults.php:1.18 --- appdb/testResults.php:1.17 29 Jul 2006 4: 8:14 -0000 +++ appdb/testResults.php 29 Jul 2006 4: 8:14 -0000 @@ -119,10 +119,10 @@ if ($aClean['sSub']) //help - echo "This is the Screen for inputting testing information so that others looking at the database will know \n"; + echo "This is the screen for inputting testing information so that others looking at the database will know \n"; echo "what was working or a particular release of Wine.\n"; echo "Please be as detailed as you can.\n"; - echo "If you can not find your distribution on the list of existing Distributions please add it add it in the \n"; + echo "If you can not find your distribution in the list of existing distributions, please add it in the \n"; echo "field provided.\n\n"; if(!empty($errors))

1 0

lostwages/templates/en status_changelog.templa ...
by Jeremy Newman July 28, 2006

July 28, 2006

ChangeSet ID: 26920 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/07/28 09:50:16 Modified files: templates/en : status_changelog.template status_directx.template Log message: Tom Wickline <twickline(a)gmail.com> direct X status update Patch: http://cvs.winehq.org/patch.py?id=26920 Old revision New revision Changes Path 1.46 1.47 +10 -0 lostwages/templates/en/status_changelog.template 1.19 1.20 +4 -4 lostwages/templates/en/status_directx.template Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.46 lostwages/templates/en/status_changelog.template:1.47 --- lostwages/templates/en/status_changelog.template:1.46 28 Jul 2006 14:50:16 -0000 +++ lostwages/templates/en/status_changelog.template 28 Jul 2006 14:50:16 -0000 @@ -2,6 +2,16 @@ <h1>Wine Status - ChangeLog</h1> +Changes since July 27, 2006: + + <ul> + <li>ADD - Roderick Colenbrander as worker to ddraw.dll </li> + <li>ADD - Roderick Colenbrander as worker to dinput8.dll </li> + <li>ADD - Vitaliy Margolen as worker to dinput.dll </li> + <li>dinput8.dll 25% -> 50%</li> + </ul> + + Changes since July 17, 2006: <ul> Index: lostwages/templates/en/status_directx.template diff -u -p lostwages/templates/en/status_directx.template:1.19 lostwages/templates/en/status_directx.template:1.20 --- lostwages/templates/en/status_directx.template:1.19 28 Jul 2006 14:50:16 -0000 +++ lostwages/templates/en/status_directx.template 28 Jul 2006 14:50:16 -0000 @@ -94,15 +94,15 @@ <a href="{$root}/site/?issue=311#DirectDraw%20Update">#311</a>, <a href="{$root}/site/?issue=314#DirectDraw%20Patch">#314</a></td> <td class="pct85">85% complete</a></td> - <td>Stefan Dösinger, Lionel Ulmer</td> + <td>Stefan Dösinger, R.Colenbrander, Lionel Ulmer</td> </tr> <td colspan="5">DirectInput</td> <tr> <td>dinput8.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dx81_vb/di…">MSDN: DInput8</a></td> <td>None</td> - <td class="pct25">25% complete</td> - <td></td> + <td class="pct50">50% complete</td> + <td>R.Colenbrander</td> </tr> <tr> <td>dinput.dll</td> @@ -110,7 +110,7 @@ <td><a href="{$root}/site/?issue=116#DirectInput%20Key%20Mapping">#116</a>, <a href="{$root}/site/?issue=137#MS%20Write%20Support%20(con't)">#137</a></td> <td class="pct70">70% complete</a></td> - <td>Christoph Frick</td> + <td>Vitaliy Margolen, Christoph Frick</td> </tr> <td colspan="5">DirectMusic</td> <tr>

1 0

Jason Green : wined3d: More shader fixes / new instructions.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 72bfe131d1a1c4087dcc4b00405f7c612300378b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72bfe131d1a1c4087dcc4b0… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jul 28 04:14:14 2006 -0400 wined3d: More shader fixes / new instructions. - Replace gl_FragColor with gl_FragData[0] for GLSL pixel shader output. - Subtract 1 more constant from total GLSL allowed float constants to accommodate the PROJECTION matrix row that we reference. --- dlls/wined3d/arb_program_shader.c | 1 dlls/wined3d/directx.c | 4 + dlls/wined3d/glsl_shader.c | 127 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/pixelshader.c | 18 ++--- dlls/wined3d/vertexshader.c | 8 +- dlls/wined3d/wined3d_private.h | 6 ++ 6 files changed, 140 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=72bfe131d1a1c4087dc…

1 0

Roderick Colenbrander : wined3d: Render target texturing.
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 6d16eff9a6f501c9893c155fd3b2a163256ce43d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d16eff9a6f501c9893c155… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 28 00:43:38 2006 +0200 wined3d: Render target texturing. --- dlls/wined3d/surface.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5856404..a763537 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -737,7 +737,8 @@ static HRESULT WINAPI IWineD3DSurfaceImp case RTL_TEXDRAW: case RTL_TEXTEX: - ERR("Reading from render target with a texture isn't implemented yet\n"); + read_from_framebuffer(This, &This->lockedRect, pLockedRect->pBits, pLockedRect->Pitch); + FIXME("Reading from render target with a texture isn't implemented yet, falling back to framebuffer reading\n"); break; case RTL_DISABLE: @@ -985,6 +986,69 @@ static void flush_to_framebuffer_drawpix return; } +static void flush_to_framebuffer_texture(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + float glTexCoord[4]; + + glTexCoord[0] = 0.0; /* left */ + glTexCoord[1] = (float) This->currentDesc.Width / (float) This->pow2Width; /* right */ + glTexCoord[2] = 0.0; /* top */ + glTexCoord[3] = (float) This->currentDesc.Height / (float) This->pow2Height; /* bottom */ + + IWineD3DSurface_PreLoad(iface); + + ENTER_GL(); + + /* Disable some fancy graphics effects */ + glDisable(GL_LIGHTING); + checkGLcall("glDisable GL_LIGHTING"); + glDisable(GL_DEPTH_TEST); + checkGLcall("glDisable GL_DEPTH_TEST"); + glDisable(GL_FOG); + checkGLcall("glDisable GL_FOG"); + glDisable(GL_CULL_FACE); + checkGLcall("glDisable GL_CULL_FACE"); + glDisable(GL_BLEND); + checkGLcall("glDisable GL_BLEND"); + glDisable(GL_STENCIL_TEST); + checkGLcall("glDisable GL_STENCIL_TEST"); + + glEnable(GL_TEXTURE_2D); + glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); + checkGLcall("glEnable glBindTexture"); + + /* No filtering for blts */ + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + + /* Start drawing a quad */ + glBegin(GL_QUADS); + + glColor3d(1.0f, 1.0f, 1.0f); + glTexCoord2f(glTexCoord[0], glTexCoord[2]); + glVertex3f(0, 0, 0.0); + + glTexCoord2f(glTexCoord[0], glTexCoord[3]); + glVertex3f(0, This->currentDesc.Height, 0.0); + + glTexCoord2f(glTexCoord[1], glTexCoord[3]); + glVertex3d(This->currentDesc.Width, This->currentDesc.Height, 0.0); + + glTexCoord2f(glTexCoord[1], glTexCoord[2]); + glVertex3f(This->currentDesc.Width, 0, 0.0); + + glEnd(); + checkGLcall("glEnd"); + + /* Unbind the texture */ + glBindTexture(GL_TEXTURE_2D, 0); + checkGLcall("glEnable glBindTexture"); + + LEAVE_GL(); +} + static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; @@ -1098,7 +1162,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp case RTL_READTEX: case RTL_TEXTEX: - ERR("Writing to the render target with textures is not implemented yet\n"); + flush_to_framebuffer_texture(iface); break; case RTL_DISABLE:

1 0

Stefan Leichter : msi: Native DllGetVersion does not fail if the supplied buffer is bigger than required .
by Alexandre Julliard July 28, 2006

July 28, 2006

Module: wine Branch: refs/heads/master Commit: 055b23b125ed9e573115ad80cfed90f9fc907640 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=055b23b125ed9e573115ad8… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jul 28 00:26:42 2006 +0200 msi: Native DllGetVersion does not fail if the supplied buffer is bigger than required. --- dlls/msi/msi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 1cd36a0..fcb6f5d 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -160,13 +160,13 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONI { TRACE("%p\n",pdvi); - if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) + if (pdvi->cbSize < sizeof(DLLVERSIONINFO)) return E_INVALIDARG; pdvi->dwMajorVersion = MSI_MAJORVERSION; pdvi->dwMinorVersion = MSI_MINORVERSION; pdvi->dwBuildNumber = MSI_BUILDNUMBER; - pdvi->dwPlatformID = 1; + pdvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS; return S_OK; }

1 0