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

Robert Shearman : oleaut32: Clean up IFontDisp:: Invoke by using VariantChangeTypeEx to coerce the input parameter into the correct type .
by Alexandre Julliard 27 Jul '06

27 Jul '06

Module: wine Branch: refs/heads/master Commit: 207ec43e70034bb780cb3b76a56c9e0855b1b041 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=207ec43e70034bb780cb3b7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jul 26 15:02:18 2006 +0100 oleaut32: Clean up IFontDisp::Invoke by using VariantChangeTypeEx to coerce the input parameter into the correct type. --- dlls/oleaut32/olefont.c | 235 ++++++++++++++++++++--------------------- dlls/oleaut32/tests/olefont.c | 24 ++++ 2 files changed, 135 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=207ec43e70034bb780c…

1 0

appdb/include comment.php
by WineHQ 26 Jul '06

26 Jul '06

ChangeSet ID: 26846 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/26 14:30:11 Modified files: include : comment.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Comment::grab_comments() should use $iParentId when != NULL, not just !$iParentId as this prevents the use of $iParentId in cases where the value is 0. Fixes duplicate display of every comment for an application version reported by Nick Law. Patch: http://cvs.winehq.org/patch.py?id=26846 Old revision New revision Changes Path 1.29 1.30 +3 -1 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.29 appdb/include/comment.php:1.30 --- appdb/include/comment.php:1.29 26 Jul 2006 19:30:11 -0000 +++ appdb/include/comment.php 26 Jul 2006 19:30:11 -0000 @@ -269,7 +269,9 @@ class Comment { $iParentId = mysql_real_escape_string($iParentId); $sExtra = ""; - if($iParentId) + + /* NOTE: we must compare against NULL here because $iParentId of 0 is valid */ + if($iParentId != NULL) $sExtra = "AND parentId = '".$iParentId."' "; $sQuery = "SELECT from_unixtime(unix_timestamp(appComments.time), \"%W %M %D %Y, %k:%i\") as time, ".

1 0

Ge van Geldorp : winedbg: Change ADDRESS variables to ADDRESS64 so we can handle 64-bit addresses.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 1d04f826c75081a2f4a4ac2ffc6351663c969eb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d04f826c75081a2f4a4ac2… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed Jul 26 11:57:27 2006 +0200 winedbg: Change ADDRESS variables to ADDRESS64 so we can handle 64-bit addresses. --- programs/winedbg/be_alpha.c | 4 +- programs/winedbg/be_cpu.h | 18 +++++------ programs/winedbg/be_i386.c | 19 ++++++----- programs/winedbg/be_ppc.c | 4 +- programs/winedbg/be_x86_64.c | 6 ++-- programs/winedbg/break.c | 22 +++++++------ programs/winedbg/db_disasm.c | 12 ++++--- programs/winedbg/debugger.h | 36 +++++++++++----------- programs/winedbg/memory.c | 65 ++++++++++++++++++++++++++++----------- programs/winedbg/source.c | 4 +- programs/winedbg/stack.c | 17 +++++----- programs/winedbg/symbol.c | 4 +- programs/winedbg/tgt_active.c | 42 +++++++++++++++++-------- programs/winedbg/tgt_minidump.c | 2 + programs/winedbg/types.c | 2 + 15 files changed, 153 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1d04f826c75081a2f4a…

1 0

Vitaliy Margolen : x11drv: Number of fixes for ChangeDisplaySettingsEx with tests.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 334a0719b8ad446d21a593ef8d42fc11b46f5d26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=334a0719b8ad446d21a593e… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jul 25 23:31:22 2006 -0600 x11drv: Number of fixes for ChangeDisplaySettingsEx with tests. --- dlls/user/tests/monitor.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 20 ++++++++++++++--- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/user/tests/monitor.c b/dlls/user/tests/monitor.c index 82831bd..157649a 100644 --- a/dlls/user/tests/monitor.c +++ b/dlls/user/tests/monitor.c @@ -97,9 +97,59 @@ static void test_enumdisplaydevices(void } } +struct vid_mode +{ + DWORD w, h, bpp, freq, fields; + LONG res; +}; + +static struct vid_mode vid_modes_test[] = { + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, DISP_CHANGE_SUCCESSFUL}, + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, DISP_CHANGE_SUCCESSFUL}, + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , DISP_CHANGE_SUCCESSFUL}, + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , DISP_CHANGE_SUCCESSFUL}, + {640, 480, 0, 0, DM_BITSPERPEL , DISP_CHANGE_SUCCESSFUL}, + {640, 480, 0, 0, DM_DISPLAYFREQUENCY, DISP_CHANGE_SUCCESSFUL}, + + {0, 0, 0, 0, DM_PELSWIDTH, DISP_CHANGE_SUCCESSFUL}, + {0, 0, 0, 0, DM_PELSHEIGHT, DISP_CHANGE_SUCCESSFUL}, + + {640, 480, 0, 0, DM_PELSWIDTH, DISP_CHANGE_BADMODE}, + {640, 480, 0, 0, DM_PELSHEIGHT, DISP_CHANGE_BADMODE}, + { 0, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, DISP_CHANGE_BADMODE}, + {640, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, DISP_CHANGE_BADMODE}, + + {0, 0, 0, 10, DM_DISPLAYFREQUENCY, DISP_CHANGE_BADMODE}, +}; +#define vid_modes_cnt (sizeof(vid_modes_test) / sizeof(vid_modes_test[0])) + +static void test_ChangeDisplaySettingsEx(void) +{ + DEVMODE dm; + LONG res; + int i; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + + for (i = 0; i < vid_modes_cnt; i++) + { + dm.dmPelsWidth = vid_modes_test[i].w; + dm.dmPelsHeight = vid_modes_test[i].h; + dm.dmBitsPerPel = vid_modes_test[i].bpp; + dm.dmDisplayFrequency = vid_modes_test[i].freq; + dm.dmFields = vid_modes_test[i].fields; + res = ChangeDisplaySettingsEx(NULL, &dm, NULL, CDS_FULLSCREEN, NULL); + ok(res == vid_modes_test[i].res, "Failed to change resolution[%d]: %ld\n", i, res); + } + res = ChangeDisplaySettingsEx(NULL, NULL, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %ld\n", res); +} + START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); + test_ChangeDisplaySettingsEx(); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 95e88e6..49b8a8d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -237,8 +237,9 @@ #undef _X_FIELD LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - DWORD i, dwBpp; + DWORD i, dwBpp = 0; DEVMODEW dm; + BOOL def_mode = TRUE; TRACE("(%s,%p,%p,0x%08lx,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -248,8 +249,15 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPC TRACE("width=%ld height=%ld bpp=%ld freq=%ld (%s)\n", devmode->dmPelsWidth,devmode->dmPelsHeight, devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name); + + dwBpp = (devmode->dmBitsPerPel == 24) ? 32 : devmode->dmBitsPerPel; + if (devmode->dmFields & DM_BITSPERPEL) def_mode &= !dwBpp; + if (devmode->dmFields & DM_PELSWIDTH) def_mode &= !devmode->dmPelsWidth; + if (devmode->dmFields & DM_PELSHEIGHT) def_mode &= !devmode->dmPelsHeight; + if (devmode->dmFields & DM_DISPLAYFREQUENCY) def_mode &= !devmode->dmDisplayFrequency; } - else + + if (def_mode) { TRACE("Return to original display mode (%s)\n", handler_name); if (!X11DRV_EnumDisplaySettingsEx(devname, dd_mode_default, &dm, 0)) @@ -259,7 +267,10 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPC } devmode = &dm; } - dwBpp = (devmode->dmBitsPerPel == 24) ? 32 : devmode->dmBitsPerPel; + dwBpp = !dwBpp ? dd_modes[dd_mode_default].dwBPP : dwBpp; + + if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + return DISP_CHANGE_BADMODE; for (i = 0; i < dd_mode_count; i++) { @@ -278,7 +289,8 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPC if (devmode->dmPelsHeight != dd_modes[i].dwHeight) continue; } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].wRefreshRate != 0)) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].wRefreshRate != 0) && + devmode->dmDisplayFrequency != 0) { if (devmode->dmDisplayFrequency != dd_modes[i].wRefreshRate) continue;

1 0

Kovács András : wined3d: Fix CopyRects if pDestPointsArray is NULL.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: de051649c3148d307cb356f448a6f5bfeaf443a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de051649c3148d307cb356f… Author: Kovács András <andras(a)csevego.net> Date: Sun Jul 23 20:13:57 2006 +0100 wined3d: Fix CopyRects if pDestPointsArray is NULL. --- dlls/wined3d/device.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 323a2f5..83754c2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6781,8 +6781,38 @@ static HRESULT WINAPI IWineD3DDeviceIm TRACE("Unlocked src and dst\n"); } } else { - FIXME("Wanted to copy partial surfaces not implemented, returning WINED3DERR_INVALIDCALL\n"); - hr = WINED3DERR_INVALIDCALL; + unsigned int i; + int bytesPerPixel = ((IWineD3DSurfaceImpl *) pSourceSurface)->bytesPerPixel; + int copyperline; + int j; + WINED3DLOCKED_RECT lrSrc; + WINED3DLOCKED_RECT lrDst; + RECT dest_rect; + + for(i=0; i < cRects; i++) { + CONST RECT* r = &pSourceRectsArray[i]; + + TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (0, 0)\n", i, r->left, r->top, r->right, r->bottom); + if (srcFormat == WINED3DFMT_DXT1) { + copyperline = ((r->right - r->left) * bytesPerPixel) / 2; /* DXT1 is half byte per pixel */ + } else { + copyperline = ((r->right - r->left) * bytesPerPixel); + } + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, WINED3DLOCK_READONLY); + dest_rect.left = 0; + dest_rect.top = 0; + dest_rect.right = r->right - r->left; + dest_rect.bottom= r->bottom - r->top; + IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, &dest_rect, 0L); + TRACE("Locked src and dst\n"); + /* Find where to start */ + for (j = 0; j < (r->bottom - r->top - 1); ++j) { + memcpy((char*) lrDst.pBits + (j * lrDst.Pitch), (char*) lrSrc.pBits + (j * lrSrc.Pitch), copyperline); + } + IWineD3DSurface_UnlockRect(pSourceSurface); + IWineD3DSurface_UnlockRect(pDestinationSurface); + TRACE("Unlocked src and dst\n"); + } } }

1 0

Thomas Kho : wcmd: Correct handling of quotes and / s flag when a command argument is present.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: bff25ffe7991bde75904d34ca733f2178b088316 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bff25ffe7991bde75904d34… Author: Thomas Kho <tkho(a)ucla.edu> Date: Mon Jul 24 19:20:31 2006 -0500 wcmd: Correct handling of quotes and /s flag when a command argument is present. --- programs/wcmd/wcmd.h | 1 + programs/wcmd/wcmdmain.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/programs/wcmd/wcmd.h b/programs/wcmd/wcmd.h index 97f90db..73b929f 100644 --- a/programs/wcmd/wcmd.h +++ b/programs/wcmd/wcmd.h @@ -74,6 +74,7 @@ char *WCMD_fgets (char *s, int n, HANDLE char *WCMD_parameter (char *s, int n, char **where); char *WCMD_strtrim_leading_spaces (char *string); void WCMD_strtrim_trailing_spaces (char *string); +void WCMD_opt_s_strip_quotes(char *cmd); /* Data structure to hold context when executing batch files */ diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 1af01eb..c0e09a5 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -37,6 +37,7 @@ const char * const inbuilt[] = {"ATTRIB" HINSTANCE hinst; DWORD errorlevel; int echo_mode = 1, verify_mode = 0; +static int opt_c, opt_k, opt_s; const char nyi[] = "Not Yet Implemented\n\n"; const char newline[] = "\n"; const char version_string[] = "WCMD Version " PACKAGE_VERSION "\n\n"; @@ -56,9 +57,9 @@ int main (int argc, char *argv[]) char* cmd=NULL; DWORD count; HANDLE h; - int opt_c, opt_k, opt_q; + int opt_q; - opt_c=opt_k=opt_q=0; + opt_c=opt_k=opt_q=opt_s=0; while (*argv!=NULL) { char c; @@ -74,6 +75,8 @@ int main (int argc, char *argv[]) opt_q=1; } else if (tolower(c)=='k') { opt_k=1; + } else if (tolower(c)=='s') { + opt_s=1; } else if (tolower(c)=='t' || tolower(c)=='x' || tolower(c)=='y') { /* Ignored for compatibility with Windows */ } @@ -92,12 +95,18 @@ int main (int argc, char *argv[]) } if (opt_c || opt_k) { - int len; + int len,qcount; char** arg; char* p; + /* opt_s left unflagged if the command starts with and contains exactly + * one quoted string (exactly two quote characters). The quoted string + * must be an executable name that has whitespace and must not have the + * following characters: &<>()@^| */ + /* Build the command to execute */ len = 0; + qcount = 0; for (arg = argv; *arg; arg++) { int has_space,bcount; @@ -118,6 +127,7 @@ int main (int argc, char *argv[]) * plus escaping of said '"' */ len+=2*bcount+1; + qcount++; } bcount=0; } @@ -125,7 +135,29 @@ int main (int argc, char *argv[]) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) + { len+=2; /* for the quotes */ + qcount+=2; + } + } + + if (qcount!=2) + opt_s=1; + + /* check argv[0] for a space and invalid characters */ + if (!opt_s) { + opt_s=1; + p=*argv; + while (*p!='\0') { + if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')' + || *p=='@' || *p=='^' || *p=='|') { + opt_s=1; + break; + } + if (*p==' ') + opt_s=0; + p++; + } } cmd = HeapAlloc(GetProcessHeap(), 0, len); @@ -194,6 +226,11 @@ int main (int argc, char *argv[]) if (p > cmd) p--; /* remove last space */ *p = '\0'; + + /* strip first and last quote characters if opt_s; check for invalid + * executable is done later */ + if (opt_s && *cmd=='\"') + WCMD_opt_s_strip_quotes(cmd); } if (opt_c) { @@ -614,6 +651,14 @@ char filetorun[MAX_PATH]; status = CreateProcess (NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe); + if ((opt_c || opt_k) && !opt_s && !status + && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { + /* strip first and last quote characters and try again */ + WCMD_opt_s_strip_quotes(command); + opt_s=1; + WCMD_run_program(command, called); + return; + } if (!status) { WCMD_print_error (); return; @@ -897,6 +942,26 @@ char *ptr; } /************************************************************************* + * WCMD_opt_s_strip_quotes + * + * Remove first and last quote characters, preserving all other text + */ + +void WCMD_opt_s_strip_quotes(char *cmd) { + char *src = cmd + 1, *dest = cmd, *lastq = NULL; + while((*dest=*src) != '\0') { + if (*src=='\"') + lastq=dest; + dest++, src++; + } + if (lastq) { + dest=lastq++; + while ((*dest++=*lastq++) != 0) + ; + } +} + +/************************************************************************* * WCMD_pipe * * Handle pipes within a command - the DOS way using temporary files.

1 0

Stefan Dösinger : ddraw: Support using an application-provided surface pointer.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 06106e2810d110b9137f30d61bbed0917cde39fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06106e2810d110b9137f30d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jul 25 16:38:02 2006 +0200 ddraw: Support using an application-provided surface pointer. --- dlls/ddraw/ddraw.c | 17 ++++++++----- dlls/ddraw/surface.c | 9 +++++++ dlls/wined3d/surface.c | 50 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 13 ++++++++++ dlls/wined3d/wined3d_private.h | 6 +++-- include/wine/wined3d_interface.h | 2 ++ 6 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index bd13d56..44fe5a0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1790,13 +1790,6 @@ IDirectDrawImpl_CreateNewSurface(IDirect } } - /* Get the surface parameters */ - if ( pDDSD->dwFlags & DDSD_LPSURFACE) - { - ERR("(%p) Using a passed surface pointer is not yet supported\n", This); - assert(0); - } - /* Get the correct wined3d usage */ if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER | @@ -1995,6 +1988,16 @@ IDirectDrawImpl_CreateNewSurface(IDirect DDCKEY_SRCBLT, &pDDSD->ddckCKSrcBlt); } + if ( pDDSD->dwFlags & DDSD_LPSURFACE) + { + hr = IWineD3DSurface_SetMem((*ppSurf)->WineD3DSurface, pDDSD->lpSurface); + if(hr != WINED3D_OK) + { + /* No need for a trace here, wined3d does that for us */ + IDirectDrawSurface7_Release(ICOM_INTERFACE((*ppSurf), IDirectDrawSurface7)); + return hr; + } + } return DD_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a9086d2..587a3e9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1933,6 +1933,15 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(ID DDCKEY_SRCBLT, &DDSD->ddckCKSrcBlt); } + if (DDSD->dwFlags & DDSD_LPSURFACE) + { + hr = IWineD3DSurface_SetMem(This->WineD3DSurface, DDSD->lpSurface); + if(hr != WINED3D_OK) + { + /* No need for a trace here, wined3d does that for us */ + return hr; + } + } This->surface_desc = *DDSD; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c2ed60..df35fc6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -102,6 +102,7 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release This->dib.bitmap_data = NULL; This->resource.allocatedMemory = NULL; } + IWineD3DSurface_SetMem(iface, NULL); IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); if(iface == device->ddraw_primary) @@ -1161,6 +1162,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC TRACE("(%p)->(%p)\n",This,pHDC); + if(This->Flags & SFLAG_USERPTR) { + ERR("Not supported on surfaces with an application-provided surfaces\n"); + return DDERR_NODC; + } + /* Give more detailed info for ddraw */ if (This->Flags & SFLAG_DCINUSE) return DDERR_DCALREADYCREATED; @@ -2104,6 +2110,49 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFo return WINED3D_OK; } +HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + /* Render targets depend on their hdc, and we can't create a hdc on a user pointer */ + if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { + ERR("Not supported on render targets\n"); + return WINED3DERR_INVALIDCALL; + } + + if(This->Flags & (SFLAG_LOCKED | SFLAG_DCINUSE)) { + WARN("Surface is locked or the HDC is in use\n"); + return WINED3DERR_INVALIDCALL; + } + + if(Mem && Mem != This->resource.allocatedMemory) { + + /* Do I have to copy the old surface content? */ + if(This->Flags & SFLAG_DIBSECTION) { + /* Release the DC. No need to hold the critical section for the update + * Thread because this thread runs only on front buffers, but this method + * fails for render targets in the check above. + */ + 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; + This->hDC = NULL; + This->Flags &= ~SFLAG_DIBSECTION; + } else if(!(This->Flags & SFLAG_USERPTR)) { + HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + } + This->resource.allocatedMemory = Mem; + This->Flags |= SFLAG_USERPTR; + } else if(This->Flags & SFLAG_USERPTR) { + /* Lockrect and GetDC will re-create the dib section and allocated memory */ + This->resource.allocatedMemory = NULL; + This->Flags &= ~SFLAG_USERPTR; + } + return WINED3D_OK; +} + /* TODO: replace this function with context management routines */ HRESULT WINAPI IWineD3DSurfaceImpl_SetPBufferState(IWineD3DSurface *iface, BOOL inPBuffer, BOOL inTexture) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -2975,6 +3024,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_RealizePalette, IWineD3DSurfaceImpl_SetColorKey, IWineD3DSurfaceImpl_GetPitch, + IWineD3DSurfaceImpl_SetMem, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index bb07afa..9609ebd 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -178,6 +178,18 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSur TRACE("(%p) : rect@%p flags(%08lx), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); + if(!This->resource.allocatedMemory) { + HDC hdc; + HRESULT hr; + /* This happens on gdi surfaces if the application set a user pointer and resets it. + * Recreate the DIB section + */ + hr = IWineD3DSurface_GetDC(iface, &hdc); /* will recursively call lockrect, do not set the LOCKED flag to this line */ + if(hr != WINED3D_OK) return hr; + hr = IWineD3DSurface_ReleaseDC(iface, hdc); + if(hr != WINED3D_OK) return hr; + } + pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); if (NULL == pRect) @@ -1570,6 +1582,7 @@ const IWineD3DSurfaceVtbl IWineGDISurfac IWineD3DSurfaceImpl_RealizePalette, IWineD3DSurfaceImpl_SetColorKey, IWineD3DSurfaceImpl_GetPitch, + IWineD3DSurfaceImpl_SetMem, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f51e3b..d0fb485 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -929,6 +929,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC hDC); DWORD WINAPI IWineD3DSurfaceImpl_GetPitch(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface); +HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem); /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ @@ -948,7 +949,7 @@ #define SFLAG_DCINUSE 0x00002000 /* #define SFLAG_GLDIRTY 0x00004000 /* The opengl texture is more up to date than the surface mem */ #define SFLAG_LOST 0x00008000 /* Surface lost flag for DDraw */ #define SFLAG_FORCELOAD 0x00010000 /* To force PreLoading of a scratch cursor */ - +#define SFLAG_USERPTR 0x00020000 /* The application allocated the memory for this surface */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL @@ -967,7 +968,8 @@ #define SFLAG_DONOTFREE (SFLAG_OVERSIZE SFLAG_LOCKED | \ SFLAG_ACTIVELOCK | \ SFLAG_DYNLOCK | \ - SFLAG_DYNCHANGE ) + SFLAG_DYNCHANGE | \ + SFLAG_USERPTR) BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 1c97114..2104aaa 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1130,6 +1130,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(RealizePalette)(THIS) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE; STDMETHOD_(DWORD,GetPitch)(THIS) PURE; + STDMETHOD(SetMem)(THIS_ void *mem) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1181,6 +1182,7 @@ #define IWineD3DSurface_SetPalette(p, a) #define IWineD3DSurface_RealizePalette(p) (p)->lpVtbl->RealizePalette(p) #define IWineD3DSurface_SetColorKey(p, a, b) (p)->lpVtbl->SetColorKey(p, a, b) #define IWineD3DSurface_GetPitch(p) (p)->lpVtbl->GetPitch(p) +#define IWineD3DSurface_SetMem(p, a) (p)->lpVtbl->SetMem(p, a) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Stefan Dösinger : wined3d: More efficient color keying dirtifying.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 3b10a021db902bdacea78afec656be5e37401a9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b10a021db902bdacea78af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 25 16:41:41 2006 +0200 wined3d: More efficient color keying dirtifying. Instead of blindly dirtifying the surface LoadTexture keeps track of the color key that was used when creating the opengl texture and reloads the surface if the color key has changed. --- dlls/wined3d/surface.c | 58 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df35fc6..8a5a8a8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1402,9 +1402,9 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceI *type = GL_UNSIGNED_BYTE; *target_bpp = 4; if(colorkey_active) { - *convert = CONVERT_PALETTED; - } else { *convert = CONVERT_PALETTED_CK; + } else { + *convert = CONVERT_PALETTED; } } @@ -1632,7 +1632,18 @@ static HRESULT WINAPI IWineD3DSurfaceImp TRACE("Surface already in texture\n"); return WINED3D_OK; } - if (!(This->Flags & SFLAG_DIRTY)) { + if (This->Flags & SFLAG_DIRTY) { + TRACE("Reloading because surface is dirty\n"); + } else if(/* Reload: gl texture has ck, now no ckey is set OR */ + (This->Flags & SFLAG_GLCKEY && !(This->CKeyFlags & DDSD_CKSRCBLT)) || + /* Reload: vice versa OR */ + (!(This->Flags & SFLAG_GLCKEY) && !This->CKeyFlags & DDSD_CKSRCBLT) || + /* Also reload: Color key is active AND the color key has changed */ + (This->CKeyFlags & DDSD_CKSRCBLT) && ( + This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue || + This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)) { + TRACE("Reloading because of color keying\n"); + } else { TRACE("surface isn't dirty\n"); return WINED3D_OK; } @@ -1731,6 +1742,11 @@ static HRESULT WINAPI IWineD3DSurfaceImp int bpp; BYTE *mem; + if(This->CKeyFlags & DDSD_CKSRCBLT) { + This->Flags |= SFLAG_GLCKEY; + This->glCKey = This->SrcBltCKey; + } + else This->Flags &= ~SFLAG_GLCKEY; d3dfmt_get_conv(This, TRUE /* We need color keying */, &format, &internal, &type, &convert, &bpp); if((convert != NO_CONVERSION) && @@ -2323,11 +2339,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOv oldCKey = Src->CKeyFlags; if(!(Flags & DDBLT_KEYSRC) && Src->CKeyFlags & DDSD_CKSRCBLT) { - /* Ok, the surface has a color key, but we shall not use it - - * Deactivate it for now and dirtify the surface to reload it + /* Ok, the surface has a color key, but we shall not use it - + * Deactivate it for now, LoadTexture will catch this */ Src->CKeyFlags &= ~DDSD_CKSRCBLT; - Src->Flags |= SFLAG_DIRTY; } /* Now load the surface */ @@ -2494,7 +2509,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOv /* Restore the color key */ if(oldCKey != Src->CKeyFlags) { Src->CKeyFlags = oldCKey; - Src->Flags |= SFLAG_DIRTY; } LEAVE_GL(); @@ -2847,7 +2861,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetPa HRESULT WINAPI IWineD3DSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, DDCOLORKEY *CKey) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - BOOL dirtify = FALSE; TRACE("(%p)->(%08lx,%p)\n", This, Flags, CKey); if ((Flags & DDCKEY_COLORSPACE) != 0) { @@ -2859,41 +2872,21 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetCo if(CKey) { switch (Flags & ~DDCKEY_COLORSPACE) { case DDCKEY_DESTBLT: - if(!(This->CKeyFlags & DDSD_CKDESTBLT)) { - dirtify = TRUE; - } else { - dirtify = memcmp(&This->DestBltCKey, CKey, sizeof(*CKey) ) != 0; - } This->DestBltCKey = *CKey; This->CKeyFlags |= DDSD_CKDESTBLT; break; case DDCKEY_DESTOVERLAY: - if(!(This->CKeyFlags & DDSD_CKDESTOVERLAY)) { - dirtify = TRUE; - } else { - dirtify = memcmp(&This->DestOverlayCKey, CKey, sizeof(*CKey)) != 0; - } This->DestOverlayCKey = *CKey; This->CKeyFlags |= DDSD_CKDESTOVERLAY; break; case DDCKEY_SRCOVERLAY: - if(!(This->CKeyFlags & DDSD_CKSRCOVERLAY)) { - dirtify = TRUE; - } else { - dirtify = memcmp(&This->SrcOverlayCKey, CKey, sizeof(*CKey)) != 0; - } This->SrcOverlayCKey = *CKey; This->CKeyFlags |= DDSD_CKSRCOVERLAY; break; case DDCKEY_SRCBLT: - if(!(This->CKeyFlags & DDSD_CKSRCBLT)) { - dirtify = TRUE; - } else { - dirtify = memcmp(&This->SrcBltCKey, CKey, sizeof(*CKey)) != 0; - } This->SrcBltCKey = *CKey; This->CKeyFlags |= DDSD_CKSRCBLT; break; @@ -2902,32 +2895,23 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetCo else { switch (Flags & ~DDCKEY_COLORSPACE) { case DDCKEY_DESTBLT: - dirtify = This->CKeyFlags & DDSD_CKDESTBLT; This->CKeyFlags &= ~DDSD_CKDESTBLT; break; case DDCKEY_DESTOVERLAY: - dirtify = This->CKeyFlags & DDSD_CKDESTOVERLAY; This->CKeyFlags &= ~DDSD_CKDESTOVERLAY; break; case DDCKEY_SRCOVERLAY: - dirtify = This->CKeyFlags & DDSD_CKSRCOVERLAY; This->CKeyFlags &= ~DDSD_CKSRCOVERLAY; break; case DDCKEY_SRCBLT: - dirtify = This->CKeyFlags & DDSD_CKSRCBLT; This->CKeyFlags &= ~DDSD_CKSRCBLT; break; } } - if(dirtify) { - TRACE("Color key changed, dirtifying surface\n"); - This->Flags |= SFLAG_DIRTY; - } - return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0fb485..f4ae19d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -885,6 +885,7 @@ #endif DDCOLORKEY SrcBltCKey; DWORD CKeyFlags; + DDCOLORKEY glCKey; }; extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl; @@ -950,6 +951,7 @@ #define SFLAG_GLDIRTY 0x00004000 /* #define SFLAG_LOST 0x00008000 /* Surface lost flag for DDraw */ #define SFLAG_FORCELOAD 0x00010000 /* To force PreLoading of a scratch cursor */ #define SFLAG_USERPTR 0x00020000 /* The application allocated the memory for this surface */ +#define SFLAG_GLCKEY 0x00040000 /* The gl texture was created with a color key */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Mike McCormack : msi: Fix an off by one error in MsiRecordGetString.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: aff9f4c1ed4ee2b5b16af44e189b4e0715d73591 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aff9f4c1ed4ee2b5b16af44… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jul 26 17:43:57 2006 +0900 msi: Fix an off by one error in MsiRecordGetString. --- dlls/msi/record.c | 4 ++-- dlls/msi/tests/record.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 5b6e38f..159fc0b 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -321,7 +321,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec break; } - if( *pcchValue < len ) + if( *pcchValue <= len ) ret = ERROR_MORE_DATA; *pcchValue = len; @@ -389,7 +389,7 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec break; } - if( *pcchValue < len ) + if( *pcchValue <= len ) ret = ERROR_MORE_DATA; *pcchValue = len; diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 253d558..f6e11a9 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -51,7 +51,9 @@ static void test_msirecord(void) INT i; MSIHANDLE h; char buf[10]; + WCHAR bufW[10]; const char str[] = "hello"; + const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -147,6 +149,42 @@ static void test_msirecord(void) ok(0==strncmp(buf,str,sizeof str-3), "MsiRecordGetString returned the wrong string\n"); ok(buf[sizeof str - 3]==0, "string wasn't nul terminated\n"); + buf[0]=0; + sz = sizeof str; + r = MsiRecordGetString(h,0,buf,&sz); + ok(r == ERROR_SUCCESS, "wrong error\n"); + ok(sz == sizeof str-1, "MsiRecordGetString returned the wrong length\n"); + ok(0==strcmp(buf,str), "MsiRecordGetString returned the wrong string\n"); + + + memset(bufW, 0, sizeof bufW); + sz = 5; + r = MsiRecordGetStringW(h,0,bufW,&sz); + ok(r == ERROR_MORE_DATA, "wrong error\n"); + ok(sz == 5, "MsiRecordGetString returned the wrong length\n"); + ok(0==memcmp(bufW,strW,8), "MsiRecordGetString returned the wrong string\n"); + + sz = 0; + bufW[0] = 'x'; + r = MsiRecordGetStringW(h,0,bufW,&sz); + ok(r == ERROR_MORE_DATA, "wrong error\n"); + ok(sz == 5, "MsiRecordGetString returned the wrong length\n"); + ok('x'==bufW[0], "MsiRecordGetString returned the wrong string\n"); + + memset(buf, 0, sizeof buf); + sz = 5; + r = MsiRecordGetStringA(h,0,buf,&sz); + ok(r == ERROR_MORE_DATA, "wrong error\n"); + ok(sz == 5, "MsiRecordGetString returned the wrong length\n"); + ok(0==memcmp(buf,str,4), "MsiRecordGetString returned the wrong string\n"); + + sz = 0; + buf[0] = 'x'; + r = MsiRecordGetStringA(h,0,buf,&sz); + ok(r == ERROR_MORE_DATA, "wrong error\n"); + ok(sz == 5, "MsiRecordGetString returned the wrong length\n"); + ok('x'==buf[0], "MsiRecordGetString returned the wrong string\n"); + /* same record, check we can wipe all the data */ r = MsiRecordClearData(h); ok(r == ERROR_SUCCESS, "Failed to clear record\n");

1 0

Alexandre Julliard : crypt32/tests: Clean up temp files.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Module: wine Branch: refs/heads/master Commit: 37bf722401de695c0b87fa42a886496a818bd760 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37bf722401de695c0b87fa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 26 14:51:10 2006 +0200 crypt32/tests: Clean up temp files. --- dlls/crypt32/tests/store.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index d0186e2..6971d61 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1356,6 +1356,7 @@ static void testFileNameStore(void) compareFile(filename, serializedStoreWithCertAndCRL, sizeof(serializedStoreWithCertAndCRL)); } + DeleteFileW(filename); } static void testCertOpenSystemStore(void)

1 0