September 2007 - Wine-Commits

Juan Lang : msi: Initialize nested.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: a3331c6f2278489826be35a46620cead4f9c3c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3331c6f2278489826be35a46… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 08:03:40 2007 -0700 msi: Initialize nested. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 5760e45..41d4a47 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -428,7 +428,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, DWORD sz; LPBYTE newdata = NULL; const WCHAR* progress = NULL; - BOOL nested; + BOOL nested = FALSE; if (ptr==NULL) {

1 0

Juan Lang : wininet: Create a TCP connection if FLAG_ICC_FORCE_CONNECTION is specified.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: ba45902dafc8fabd93ce49e2d8bcf4cc9d946e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba45902dafc8fabd93ce49e2d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 08:40:04 2007 -0700 wininet: Create a TCP connection if FLAG_ICC_FORCE_CONNECTION is specified. --- dlls/wininet/internet.c | 49 +++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9910955..345b2aa 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2739,6 +2739,7 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe CHAR *command = NULL; WCHAR hostW[1024]; DWORD len; + INTERNET_PORT port; int status = -1; FIXME("\n"); @@ -2770,26 +2771,46 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe goto End; TRACE("host name : %s\n",debugstr_w(components.lpszHostName)); + port = components.nPort; + TRACE("port: %d\n", port); } - /* - * Build our ping command - */ - len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL); - command = HeapAlloc( GetProcessHeap(), 0, strlen(ping)+len+strlen(redirect) ); - strcpy(command,ping); - WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL); - strcat(command,redirect); + if (dwFlags & FLAG_ICC_FORCE_CONNECTION) + { + struct sockaddr_in sin; + int fd; + + if (!GetAddress(hostW, port, &sin)) + goto End; + fd = socket(sin.sin_family, SOCK_STREAM, 0); + if (fd != -1) + { + if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == 0) + rc = TRUE; + close(fd); + } + } + else + { + /* + * Build our ping command + */ + len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL); + command = HeapAlloc( GetProcessHeap(), 0, strlen(ping)+len+strlen(redirect) ); + strcpy(command,ping); + WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL); + strcat(command,redirect); - TRACE("Ping command is : %s\n",command); + TRACE("Ping command is : %s\n",command); - status = system(command); + status = system(command); - TRACE("Ping returned a code of %i\n",status); + TRACE("Ping returned a code of %i\n",status); - /* Ping return code of 0 indicates success */ - if (status == 0) - rc = TRUE; + /* Ping return code of 0 indicates success */ + if (status == 0) + rc = TRUE; + } End:

1 0

Juan Lang : msi: Make sure nested is initialized.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 71a78c4478aa277333e71c36a88a1c0297093c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a78c4478aa277333e71c36a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 08:03:08 2007 -0700 msi: Make sure nested is initialized. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 73ee056..5760e45 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -315,13 +315,13 @@ static BOOL find_next_outermost_key(LPCWSTR source, DWORD len_remaining, INT total_count = 0; int i; + *nested = FALSE; *mark = scanW(source,'[',len_remaining); if (!*mark) return FALSE; count = 1; total_count = 1; - *nested = FALSE; for (i = 1; (*mark - source) + i < len_remaining && count > 0; i++) { if ((*mark)[i] == '[' && (*mark)[i-1] != '\\')

1 0

Stefan Dösinger : wined3d: Move the software blitting to the base surface class.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 46e2d795089953693fd2889de9275ab63ac16726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e2d795089953693fd2889de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 16:03:21 2007 +0200 wined3d: Move the software blitting to the base surface class. --- dlls/wined3d/surface.c | 4 +- dlls/wined3d/surface_base.c | 957 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 959 +--------------------------------------- dlls/wined3d/wined3d_private.h | 4 +- 4 files changed, 963 insertions(+), 961 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46e2d795089953693fd28…

1 0

Juan Lang : msi: Don't crash if record has no fields.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: c2d66da665984e6dbfa462baa935b211c1c8b146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d66da665984e6dbfa462baa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 08:02:18 2007 -0700 msi: Don't crash if record has no fields. --- dlls/msi/format.c | 4 ++-- dlls/msi/tests/format.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 06ef676..73ee056 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -626,8 +626,8 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, TRACE("(%s)\n",debugstr_w(rec)); - len = deformat_string_internal(package,rec,&deformated,strlenW(rec), - record, NULL); + len = deformat_string_internal(package,rec,&deformated, + rec ? strlenW(rec) : 0, record, NULL); if (buffer) { diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 23438bb..acaa2db 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -388,6 +388,17 @@ static void test_formatrecord(void) r = MsiFormatRecord(0, 0, NULL, NULL ); ok( r == ERROR_INVALID_HANDLE, "wrong error\n"); + hrec = MsiCreateRecord(0); + ok( hrec, "failed to create record\n"); + + /* format an empty record on a record with no parameters */ + sz = sizeof(buffer); + r = MsiFormatRecordA(0, hrec, buffer, &sz ); + ok( r == ERROR_SUCCESS, "format failed\n"); + ok( sz == 0, "size wrong\n"); + + MsiCloseHandle( hrec ); + hrec = MsiCreateRecord(4); ok( hrec, "failed to create record\n");

1 0

Stefan Dösinger : wined3d: Move lastActiveRenderTarget cleanup to the device.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 3f0ea3d082342d62ede57383bf896751d4353c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0ea3d082342d62ede57383b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 14:55:08 2007 +0200 wined3d: Move lastActiveRenderTarget cleanup to the device. --- dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 729acf7..30b80cd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6869,6 +6869,37 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* Cleanup any FBO attachments if d3d is enabled */ if(This->d3d_initialized) { + if((IWineD3DSurface *)resource == This->lastActiveRenderTarget) { + IWineD3DSwapChainImpl *swapchain = This->swapchains ? (IWineD3DSwapChainImpl *) This->swapchains[0] : NULL; + + TRACE("Last active render target destroyed\n"); + /* Find a replacement surface for the currently active back buffer. The context manager does not do NULL + * checks, so switch to a valid target as long as the currently set surface is still valid. Use the + * surface of the implicit swpchain. If that is the same as the destroyed surface the device is destroyed + * and the lastActiveRenderTarget member shouldn't matter + */ + if(swapchain) { + if(swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) { + TRACE("Activating primary back buffer\n"); + ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + } else if(!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) { + /* Single buffering environment */ + TRACE("Activating primary front buffer\n"); + ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } else { + TRACE("Device is being destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); + /* Implicit render target destroyed, that means the device is being destroyed + * whatever we set here, it shouldn't matter + */ + This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + } + } else { + /* May happen during ddraw uninitialization */ + TRACE("Render target set, but swapchain does not exist!\n"); + This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadcafe; + } + } + for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6675f4e..e42c80b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -343,37 +343,6 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { renderbuffer_entry_t *entry, *entry2; TRACE("(%p) : cleaning up\n", This); - if(iface == device->lastActiveRenderTarget) { - IWineD3DSwapChainImpl *swapchain = device->swapchains ? (IWineD3DSwapChainImpl *) device->swapchains[0] : NULL; - - TRACE("Last active render target destroyed\n"); - /* Find a replacement surface for the currently active back buffer. The context manager does not do NULL - * checks, so switch to a valid target as long as the currently set surface is still valid. Use the - * surface of the implicit swpchain. If that is the same as the destroyed surface the device is destroyed - * and the lastActiveRenderTarget member shouldn't matter - */ - if(swapchain) { - if(swapchain->backBuffer && swapchain->backBuffer[0] != iface) { - TRACE("Activating primary back buffer\n"); - ActivateContext(device, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - } else if(!swapchain->backBuffer && swapchain->frontBuffer != iface) { - /* Single buffering environment */ - TRACE("Activating primary front buffer\n"); - ActivateContext(device, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } else { - TRACE("Device is being destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); - /* Implicit render target destroyed, that means the device is being destroyed - * whatever we set here, it shouldn't matter - */ - device->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; - } - } else { - /* May happen during ddraw uninitialization */ - TRACE("Render target set, but swapchain does not exist!\n"); - device->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadcafe; - } - } - if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ /* Need a context to destroy the texture. Use the currently active render target, but only if

1 0

Stefan Dösinger : wined3d: Give GDI surfaces their own release implementation.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 09b7d3bb44e5db8716d7dd83546f5bf2c4a4533e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b7d3bb44e5db8716d7dd835… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 15:04:46 2007 +0200 wined3d: Give GDI surfaces their own release implementation. --- dlls/wined3d/surface_gdi.c | 41 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9cc8a99..d23ce2a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -129,6 +129,45 @@ x11_copy_to_screen(IWineD3DSurfaceImpl *This, } /***************************************************************************** + * IWineD3DSurface::Release, GDI version + * + * In general a normal COM Release method, but the GDI version doesn't have + * to destroy all the GL things. + * + *****************************************************************************/ +ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + ULONG ref = InterlockedDecrement(&This->resource.ref); + TRACE("(%p) : Releasing from %d\n", This, ref + 1); + if (ref == 0) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; + TRACE("(%p) : cleaning up\n", This); + + if(This->Flags & SFLAG_DIBSECTION) { + /* Release the DC */ + SelectObject(This->hDC, This->dib.holdbitmap); + DeleteDC(This->hDC); + /* Release the DIB section */ + DeleteObject(This->dib.DIBsection); + This->dib.bitmap_data = NULL; + This->resource.allocatedMemory = NULL; + } + if(This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem(iface, NULL); + + HeapFree(GetProcessHeap(), 0, This->palette9); + + IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); + if(iface == device->ddraw_primary) + device->ddraw_primary = NULL; + + TRACE("(%p) Released\n", This); + HeapFree(GetProcessHeap(), 0, This); + + } + return ref; +} + +/***************************************************************************** * IWineD3DSurface::PreLoad, GDI version * * This call is unsupported on GDI surfaces, if it's called something went @@ -1698,7 +1737,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = /* IUnknown */ IWineD3DBaseSurfaceImpl_QueryInterface, IWineD3DBaseSurfaceImpl_AddRef, - IWineD3DSurfaceImpl_Release, + IWineGDISurfaceImpl_Release, /* IWineD3DResource */ IWineD3DBaseSurfaceImpl_GetParent, IWineD3DBaseSurfaceImpl_GetDevice, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c17f2d..cd21179 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1171,7 +1171,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORMAT format); HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface); -ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); HRESULT WINAPI IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter);

1 0

Stefan Dösinger : wined3d: Give GDI surfaces their own GetDC copy.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 9701f118508b8cd7ff03247f4405e6ca74797501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701f118508b8cd7ff03247f4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 14:23:13 2007 +0200 wined3d: Give GDI surfaces their own GetDC copy. --- dlls/wined3d/surface_gdi.c | 72 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 3dd9483..9cc8a99 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1490,6 +1490,76 @@ const char* filename) return WINED3D_OK; } +HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + WINED3DLOCKED_RECT lock; + HRESULT hr; + RGBQUAD col[256]; + + TRACE("(%p)->(%p)\n",This,pHDC); + + if(This->Flags & SFLAG_USERPTR) { + ERR("Not supported on surfaces with an application-provided surfaces\n"); + return WINEDDERR_NODC; + } + + /* Give more detailed info for ddraw */ + if (This->Flags & SFLAG_DCINUSE) + return WINEDDERR_DCALREADYCREATED; + + /* Can't GetDC if the surface is locked */ + if (This->Flags & SFLAG_LOCKED) + return WINED3DERR_INVALIDCALL; + + memset(&lock, 0, sizeof(lock)); /* To be sure */ + + /* Should have a DIB section already */ + + /* Lock the surface */ + hr = IWineD3DSurface_LockRect(iface, + &lock, + NULL, + 0); + if(FAILED(hr)) { + ERR("IWineD3DSurface_LockRect failed with hr = %08x\n", hr); + /* keep the dib section */ + return hr; + } + + if(This->resource.format == WINED3DFMT_P8 || + This->resource.format == WINED3DFMT_A8P8) { + unsigned int n; + if(This->palette) { + PALETTEENTRY ent[256]; + + GetPaletteEntries(This->palette->hpal, 0, 256, ent); + for (n=0; n<256; n++) { + col[n].rgbRed = ent[n].peRed; + col[n].rgbGreen = ent[n].peGreen; + col[n].rgbBlue = ent[n].peBlue; + col[n].rgbReserved = 0; + } + } else { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + for (n=0; n<256; n++) { + col[n].rgbRed = device->palettes[device->currentPalette][n].peRed; + col[n].rgbGreen = device->palettes[device->currentPalette][n].peGreen; + col[n].rgbBlue = device->palettes[device->currentPalette][n].peBlue; + col[n].rgbReserved = 0; + } + + } + SetDIBColorTable(This->hDC, 0, 256, col); + } + + *pHDC = This->hDC; + TRACE("returning %p\n",*pHDC); + This->Flags |= SFLAG_DCINUSE; + + return WINED3D_OK; +} + HRESULT WINAPI IWineGDISurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1644,7 +1714,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_GetDesc, IWineGDISurfaceImpl_LockRect, IWineGDISurfaceImpl_UnlockRect, - IWineD3DSurfaceImpl_GetDC, + IWineGDISurfaceImpl_GetDC, IWineGDISurfaceImpl_ReleaseDC, IWineGDISurfaceImpl_Flip, IWineGDISurfaceImpl_Blt, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86860cb..1c17f2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1172,9 +1172,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface); ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface); -HRESULT WINAPI IWineD3DSurfaceImpl_SetPixelFormat(IWineD3DSurface *iface, WINED3DFORMAT Format, BYTE *Surface, DWORD Size); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); -HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC); HRESULT WINAPI IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter); HRESULT WINAPI IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans);

1 0

Stefan Dösinger : wined3d: Move DIB section creation to the base surface implementation.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: 5a7756447bea1b01f08428c177d7fa42d11adb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7756447bea1b01f08428c17… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 13:48:11 2007 +0200 wined3d: Move DIB section creation to the base surface implementation. --- dlls/wined3d/surface.c | 134 +-------------------------------------- dlls/wined3d/surface_base.c | 135 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 21 +------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 141 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a7756447bea1b01f0842…

1 0

Stefan Dösinger : wined3d: Remove a pbo check.
by Alexandre Julliard Sept. 18, 2007

Sept. 18, 2007

Module: wine Branch: master Commit: e324da14940fdb6e894b739c2f43a481fd7852fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e324da14940fdb6e894b739c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 17 12:56:33 2007 +0200 wined3d: Remove a pbo check. --- dlls/wined3d/surface.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 05303d3..4e42990 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1427,10 +1427,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { TRACE("DIBSection at : %p\n", This->dib.bitmap_data); /* copy the existing surface to the dib section */ if(This->resource.allocatedMemory) { - /* In case of a PBO, allocatedMemory=NULL, it isn't NULL between a LockRect and a UnlockRect */ - if(!(This->Flags & SFLAG_PBO)) - memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, b_info->bmiHeader.biSizeImage); - /* We won't need that any more */ + memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, b_info->bmiHeader.biSizeImage); } else { /* This is to make LockRect read the gl Texture although memory is allocated */ This->Flags &= ~SFLAG_INSYSMEM;

1 0