March 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : libwine: Update the Unicode tables to version 5.0. 1 of the standard.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: a44d1e5f6e7b3b65a158c89c7e0d0d40c104459d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44d1e5f6e7b3b65a158c89c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 16:22:46 2007 +0100 libwine: Update the Unicode tables to version 5.0.1 of the standard. --- libs/wine/casemap.c | 200 ++++++++++++++++++++++++++++++++++----------------- libs/wine/compose.c | 163 ++++++++++++++++++++++++----------------- libs/wine/wctype.c | 158 ++++++++++++++++++++++++---------------- 3 files changed, 324 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44d1e5f6e7b3b65a158c…

1 0

Aric Stewart : wineps.drv: Values for DC_MINEXTENT and DC_MAXEXTENT are returned, not placed in the data pointer.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: f1172cd4460972cf6cc000b91845e924ecc11c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1172cd4460972cf6cc000b91… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 14 07:31:20 2007 -0500 wineps.drv: Values for DC_MINEXTENT and DC_MAXEXTENT are returned, not placed in the data pointer. --- dlls/wineps.drv/driver.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 30bc0b3..9c3136b 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -603,28 +603,26 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP if(ps->PaperDimension->y > ptMax.y) ptMax.y = ps->PaperDimension->y; } - *((POINT*)lpszOutput) = ptMax; - return 1; + return MAKELONG(ptMax.x * 254.0 / 72.0, ptMax.y * 254.0 / 72.0 ); } case DC_MINEXTENT: { PAGESIZE *ps; - POINT ptMax; - ptMax.x = ptMax.y = 0; + POINT ptMin; + ptMin.x = ptMin.y = -1; if(lpszOutput == NULL) return -1; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { - if(ps->PaperDimension->x > ptMax.x) - ptMax.x = ps->PaperDimension->x; - if(ps->PaperDimension->y > ptMax.y) - ptMax.y = ps->PaperDimension->y; + if(ptMin.x == -1 || ps->PaperDimension->x < ptMin.x) + ptMin.x = ps->PaperDimension->x; + if(ptMin.y == -1 || ps->PaperDimension->y < ptMin.y) + ptMin.y = ps->PaperDimension->y; } - *((POINT*)lpszOutput) = ptMax; - return 1; + return MAKELONG(ptMin.x * 254.0 / 72.0, ptMin.y * 254.0 / 72.0); } case DC_SIZE:

1 0

Alexandre Julliard : ntdll: Fixed typo in previous patch, spotted by Ken Thomases.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 42050fbf91460f6135e503a4bcaa2904eb74796b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42050fbf91460f6135e503a4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:02:22 2007 +0100 ntdll: Fixed typo in previous patch, spotted by Ken Thomases. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d0871a1..1fb0db6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -364,7 +364,7 @@ __ASM_GLOBAL_FUNC(call_thread_entry_point, #else static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) { - LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; + LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)entry; return func( arg ); } #endif

1 0

bugzilla/. defparams.pl
by Jeremy Newman 14 Mar '07

14 Mar '07

ChangeSet ID: 30970 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2007/03/14 13:43:53 Modified files: . : defparams.pl Log message: adding some new default params from patch: https://bugzilla.mozilla.org/attachment.cgi?id=192338 Patch: http://cvs.winehq.org/patch.py?id=30970 Old revision New revision Changes Path 1.1.1.1 1.2 +2 -0 bugzilla/defparams.pl Index: bugzilla/defparams.pl diff -u -p bugzilla/defparams.pl:1.1.1.1 bugzilla/defparams.pl:1.2 --- bugzilla/defparams.pl:1.1.1.1 14 Mar 2007 18:43:53 -0000 +++ bugzilla/defparams.pl 14 Mar 2007 18:43:53 -0000 @@ -494,6 +494,8 @@ To use the wonders of Bugzilla, you can To: %to% Subject: [Bug %bugid%] %neworchanged%%summary% X-Bugzilla-Reason: %reasonsheader% +X-Bugzilla-Product: %product% +X-Bugzilla-Component: %component% %urlbase%show_bug.cgi?id=%bugid%

1 0

Louis Lenders : winex11.drv: Small spelling fix.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: d9445ce76b77a743b1f1acb29ac55cf54481941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9445ce76b77a743b1f1acb29… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Mar 12 20:34:22 2007 +0000 winex11.drv: Small spelling fix. --- dlls/winex11.drv/dib_convert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/dib_convert.c b/dlls/winex11.drv/dib_convert.c index d946918..5d90f68 100644 --- a/dlls/winex11.drv/dib_convert.c +++ b/dlls/winex11.drv/dib_convert.c @@ -40,8 +40,8 @@ * of the image. This is always >0. * - srcbits * Points to the first byte containing data to be copied. If the source - * surface starts are coordinates (x,y) then this is: - * image_ptr+x*bytes_pre_pixel+y*bytes_per_line + * surface starts at coordinates (x,y) then this is: + * image_ptr+x*bytes_per_pixel+y*bytes_per_line * (with further adjustments for top-down/bottom-up images) * - srclinebytes * This is the number of bytes per line. It may be >0 or <0 depending on

1 0

Kanit Therdsteerasukdi : comctl32: datetime: Reject out of range dates in DTM_SETSYSTEMTIME.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: fe5471e717e2712a10f528e4b39d081f956c3e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5471e717e2712a10f528e4b… Author: Kanit Therdsteerasukdi <therdste(a)cs.ucla.edu> Date: Mon Mar 12 14:19:16 2007 -0800 comctl32: datetime: Reject out of range dates in DTM_SETSYSTEMTIME. --- dlls/comctl32/datetime.c | 11 +++++++++++ dlls/comctl32/tests/datetime.c | 6 ++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 7b24403..08e0d58 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -160,6 +160,17 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysT lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay, lprgSysTimeArray->wHour, lprgSysTimeArray->wMinute, lprgSysTimeArray->wSecond); + if (lprgSysTimeArray->wYear < 1601 || lprgSysTimeArray->wYear > 30827 || + lprgSysTimeArray->wMonth < 1 || lprgSysTimeArray->wMonth > 12 || + lprgSysTimeArray->wDayOfWeek > 6 || + lprgSysTimeArray->wDay < 1 || lprgSysTimeArray->wDay > 31 || + lprgSysTimeArray->wHour > 23 || + lprgSysTimeArray->wMinute > 59 || + lprgSysTimeArray->wSecond > 59 || + lprgSysTimeArray->wMilliseconds > 999 + ) + return 0; + if (flag == GDT_VALID) { infoPtr->dateValid = TRUE; MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 18c5a32..3751862 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -509,10 +509,8 @@ static void test_dtm_set_and_get_system_time(HWND hWndDateTime) /* set st to invalid value */ fill_systime_struct(&st, 0, 0, 7, 0, 24, 60, 60, 1000); - todo_wine { - r = SendMessage(hWndDateTime, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); - expect_unsuccess(0, r); - } + r = SendMessage(hWndDateTime, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect_unsuccess(0, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_system_time_seq, "test_dtm_set_and_get_system_time", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Erich Hoover : wined3d: Allow SetCursorProperties on existing cursor.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 9795e6839fd61883b8d3a6f69f1696f978be610f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9795e6839fd61883b8d3a6f69… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Mar 12 20:44:22 2007 -0600 wined3d: Allow SetCursorProperties on existing cursor. --- dlls/wined3d/device.c | 52 +++++++++++++++++++++++++++++++++------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +-- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4adb0cb..460a255 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5241,6 +5241,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i } if(pCursorBitmap) { + WINED3DLOCKED_RECT rect; + /* MSDN: Cursor must be A8R8G8B8 */ if (WINED3DFMT_A8R8G8B8 != pSur->resource.format) { ERR("(%p) : surface(%p) has an invalid format\n", This, pCursorBitmap); @@ -5255,20 +5257,54 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i } /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* This is to tell our texture code to load a SCRATCH surface. This allows us to use out - * Texture and Blitting code to draw the cursor - */ - pSur->Flags |= SFLAG_FORCELOAD; - IWineD3DSurface_PreLoad(pCursorBitmap); - pSur->Flags &= ~SFLAG_FORCELOAD; + /* Do not store the surface's pointer because the application may release * it after setting the cursor image. Windows doesn't addref the set surface, so we can't * do this either without creating circular refcount dependencies. Copy out the gl texture instead. */ - This->cursorTexture = pSur->glDescription.textureName; This->cursorWidth = pSur->currentDesc.Width; This->cursorHeight = pSur->currentDesc.Height; - pSur->glDescription.textureName = 0; /* Prevent the texture from being changed or deleted */ + if (SUCCEEDED(IWineD3DSurface_LockRect(pCursorBitmap, &rect, NULL, WINED3DLOCK_READONLY))) + { + const PixelFormatDesc *tableEntry = getFormatDescEntry(WINED3DFMT_A8R8G8B8); + char *mem, *bits = (char *)rect.pBits; + GLint intfmt = tableEntry->glInternal; + GLint format = tableEntry->glFormat; + GLint type = tableEntry->glType; + INT height = This->cursorHeight; + INT width = This->cursorWidth; + INT bpp = tableEntry->bpp; + INT i; + + /* Reformat the texture memory (pitch and width can be different) */ + mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); + for(i = 0; i < height; i++) + memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); + IWineD3DSurface_UnlockRect(pCursorBitmap); + ENTER_GL(); + /* Make sure that a proper texture unit is selected */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(0)); + /* Create a new cursor texture */ + glGenTextures(1, &This->cursorTexture); + checkGLcall("glGenTextures"); + glBindTexture(GL_TEXTURE_2D, This->cursorTexture); + checkGLcall("glBindTexture"); + /* Copy the bitmap memory into the cursor texture */ + glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, format, type, mem); + HeapFree(GetProcessHeap(), 0, mem); + checkGLcall("glTexImage2D"); + LEAVE_GL(); + } + else + { + FIXME("A cursor texture was not returned.\n"); + This->cursorTexture = 0; + } + } This->xHotSpot = XHotSpot; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac59758..30ae169 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1744,7 +1744,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. * However, these resources can always be created, locked, and copied. */ - if (This->resource.pool == WINED3DPOOL_SCRATCH && !(This->Flags & SFLAG_FORCELOAD) ) + if (This->resource.pool == WINED3DPOOL_SCRATCH ) { FIXME("(%p) Operation not supported for scratch textures\n",This); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7b9dbd..fe2b8ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1116,9 +1116,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *S #define SFLAG_DYNCHANGE 0x00000C00 /* Surface contents are changed very often, implies DYNLOCK */ #define SFLAG_DCINUSE 0x00001000 /* Set between GetDC and ReleaseDC calls */ #define SFLAG_LOST 0x00002000 /* Surface lost flag for DDraw */ -#define SFLAG_FORCELOAD 0x00004000 /* To force PreLoading of a scratch cursor */ -#define SFLAG_USERPTR 0x00008000 /* The application allocated the memory for this surface */ -#define SFLAG_GLCKEY 0x00010000 /* The gl texture was created with a color key */ +#define SFLAG_USERPTR 0x00004000 /* The application allocated the memory for this surface */ +#define SFLAG_GLCKEY 0x00008000 /* 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

Jason Edmeades : cmd.exe: Add DIR /O ordering support.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 98e37021ab312892381ec318edab0a18deda51d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e37021ab312892381ec318e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 20:27:46 2007 +0000 cmd.exe: Add DIR /O ordering support. --- programs/cmd/directory.c | 113 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 0c8c5af..1c4d056 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -46,10 +46,20 @@ typedef enum _DISPLAYTIME Written } DISPLAYTIME; +typedef enum _DISPLAYORDER +{ + Name = 0, + Extension, + Size, + Date +} DISPLAYORDER; + static int file_total, dir_total, recurse, wide, bare, max_width, lower; static int shortname, usernames; static ULONGLONG byte_total; static DISPLAYTIME dirTime; +static DISPLAYORDER dirOrder; +static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse; /***************************************************************************** * WCMD_directory @@ -69,6 +79,10 @@ void WCMD_directory (void) { byte_total = 0; file_total = dir_total = 0; dirTime = Written; + dirOrder = Name; + orderReverse = FALSE; + orderGroupDirs = FALSE; + orderGroupDirsReverse = FALSE; /* Handle args */ paged_mode = (strstr(quals, "/P") != NULL); @@ -96,6 +110,28 @@ void WCMD_directory (void) { } } + if ((p = strstr(quals, "/O")) != NULL) { + p = p + 2; + if (*p==':') p++; /* Skip optional : */ + while (*p && *p != '/') { + switch (*p) { + case 'N': dirOrder = Name; break; + case 'E': dirOrder = Extension; break; + case 'S': dirOrder = Size; break; + case 'D': dirOrder = Date; break; + case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; + else orderReverse = TRUE; + break; + case 'G': orderGroupDirs = TRUE; break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + p++; + } + } + /* Handle conflicting args and initialization */ if (bare || shortname) wide = FALSE; if (bare) shortname = FALSE; @@ -410,10 +446,83 @@ char * WCMD_strrev (char *buff) { } +/***************************************************************************** + * WCMD_dir_sort + * + * Sort based on the /O options supplied on the command line + */ int WCMD_dir_sort (const void *a, const void *b) { - return (lstrcmpi(((const WIN32_FIND_DATA *)a)->cFileName, - ((const WIN32_FIND_DATA *)b)->cFileName)); + WIN32_FIND_DATA *filea = (WIN32_FIND_DATA *)a; + WIN32_FIND_DATA *fileb = (WIN32_FIND_DATA *)b; + int result = 0; + + /* If /OG or /O-G supplied, dirs go at the top or bottom, ignoring the + requested sort order for the directory components */ + if (orderGroupDirs && + ((filea->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || + (fileb->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))) + { + BOOL aDir = filea->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; + if (aDir) result = -1; + else result = 1; + if (orderGroupDirsReverse) result = -result; + return result; + + /* Order by Name: */ + } else if (dirOrder == Name) { + result = lstrcmpi(filea->cFileName, fileb->cFileName); + + /* Order by Size: */ + } else if (dirOrder == Size) { + ULONG64 sizea = (((ULONG64)filea->nFileSizeHigh) << 32) + filea->nFileSizeLow; + ULONG64 sizeb = (((ULONG64)fileb->nFileSizeHigh) << 32) + fileb->nFileSizeLow; + if( sizea < sizeb ) result = -1; + else if( sizea == sizeb ) result = 0; + else result = 1; + + /* Order by Date: (Takes into account which date (/T option) */ + } else if (dirOrder == Date) { + + FILETIME *ft; + ULONG64 timea, timeb; + + if (dirTime == Written) { + ft = &filea->ftLastWriteTime; + timea = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + ft = &fileb->ftLastWriteTime; + timeb = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + } else if (dirTime == Access) { + ft = &filea->ftLastAccessTime; + timea = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + ft = &fileb->ftLastAccessTime; + timeb = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + } else { + ft = &filea->ftCreationTime; + timea = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + ft = &fileb->ftCreationTime; + timeb = (((ULONG64)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; + } + if( timea < timeb ) result = -1; + else if( timea == timeb ) result = 0; + else result = 1; + + /* Order by Extension: (Takes into account which date (/T option) */ + } else if (dirOrder == Extension) { + char drive[10]; + char dir[MAX_PATH]; + char fname[MAX_PATH]; + char extA[MAX_PATH]; + char extB[MAX_PATH]; + + /* Split into components */ + WCMD_splitpath(filea->cFileName, drive, dir, fname, extA); + WCMD_splitpath(fileb->cFileName, drive, dir, fname, extB); + result = lstrcmpi(extA, extB); + } + + if (orderReverse) result = -result; + return result; } /*****************************************************************************

1 0

Andrew Talbot : avifil32: Constify some variables.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: 76c99d976a06f3d5a599e6ef747e75334e337896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c99d976a06f3d5a599e6ef7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 13 21:42:48 2007 +0000 avifil32: Constify some variables. --- dlls/avifil32/extrachunk.c | 6 ++---- dlls/avifil32/extrachunk.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index ac3a04d..8fad124 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -29,8 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData, - LPLONG size) +HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size) { LPBYTE lp; DWORD cb; @@ -68,8 +67,7 @@ HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData, } /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData, - LONG size) +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG size) { LPDWORD lp; diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h index b30e9d8..981f68e 100644 --- a/dlls/avifil32/extrachunk.h +++ b/dlls/avifil32/extrachunk.h @@ -35,10 +35,10 @@ typedef struct _EXTRACHUNKS { } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LONG size); +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk fomr the HMMIO into the extrachunk-structure */ HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck);

1 0

Francois Gouget : comctl32/tests: Add missing '\n's in ok() calls.
by Alexandre Julliard 14 Mar '07

14 Mar '07

Module: wine Branch: master Commit: b8f517b063e93e58ae3856f870bbaed436cfa61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f517b063e93e58ae3856f87… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 14 09:17:31 2007 +0100 comctl32/tests: Add missing '\n's in ok() calls. --- dlls/comctl32/tests/listview.c | 8 ++++---- dlls/comctl32/tests/tab.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13ef0f3..3a7186b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -794,7 +794,7 @@ static void test_icon_spacing(void) DWORD r; hwnd = create_custom_listview_control(LVS_ICON); - ok(hwnd != NULL, "failed to create a listview window"); + ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -826,7 +826,7 @@ static void test_color(void) COLORREF colors[4] = {RGB(0,0,0), RGB(100,50,200), CLR_NONE, RGB(255,255,255)}; hwnd = create_listview_control(); - ok(hwnd != NULL, "failed to create a listview window"); + ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -872,7 +872,7 @@ static void test_item_count(void) static CHAR item2text[] = "item2"; hwnd = create_listview_control(); - ok(hwnd != NULL, "failed to create a listview window"); + ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -962,7 +962,7 @@ static void test_item_position(void) static CHAR item2text[] = "item2"; hwnd = create_custom_listview_control(LVS_ICON); - ok(hwnd != NULL, "failed to create a listview window"); + ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 094faae..9b519d2 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -463,10 +463,10 @@ static void test_getters_setters(INT nTabs) toolTip = create_tooltip(hTab, toolTipText); SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) toolTip, 0); - ok (toolTip == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly."); + ok (toolTip == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly.\n"); SendMessage(hTab, TCM_SETTOOLTIPS, (LPARAM) NULL, 0); - ok (NULL == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly."); + ok (NULL == (HWND) SendMessage(hTab,TCM_GETTOOLTIPS,0,0), "ToolTip was set incorrectly.\n"); } DestroyWindow(hTab);

1 0