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

Alexandre Julliard : winnls.h: Added some defines for Unicode surrogates.
by Alexandre Julliard March 15, 2007

March 15, 2007

Module: wine Branch: master Commit: e13c9cd6a1a0a8a814c1cab2d23f6265c495a724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13c9cd6a1a0a8a814c1cab2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:56:10 2007 +0100 winnls.h: Added some defines for Unicode surrogates. --- include/winnls.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index 8888171..6388eed 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -309,9 +309,19 @@ extern "C" { #define CP_INSTALLED 0x1 #define CP_SUPPORTED 0x2 +#define HIGH_SURROGATE_START 0xd800 +#define HIGH_SURROGATE_END 0xdbff +#define LOW_SURROGATE_START 0xdc00 +#define LOW_SURROGATE_END 0xdfff + +#define IS_HIGH_SURROGATE(ch) ((ch) >= HIGH_SURROGATE_START && (ch) <= HIGH_SURROGATE_END) +#define IS_LOW_SURROGATE(ch) ((ch) >= LOW_SURROGATE_START && (ch) <= LOW_SURROGATE_END) +#define IS_SURROGATE_PAIR(high,low) (IS_HIGH_SURROGATE(high) && IS_LOW_SURROGATE(low)) + #define WC_DISCARDNS 0x0010 #define WC_SEPCHARS 0x0020 #define WC_DEFAULTCHAR 0x0040 +#define WC_ERR_INVALID_CHARS 0x0080 #define WC_COMPOSITECHECK 0x0200 #define WC_NO_BEST_FIT_CHARS 0x0400

1 0

Alexandre Julliard : libwine: Pass flags to wine_utf8_wcstombs to allow supporting WC_ERR_INVALID_CHARS.
by Alexandre Julliard March 15, 2007

March 15, 2007

Module: wine Branch: master Commit: a79b26284aa318c691582878fac39295c1412f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79b26284aa318c691582878f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 15:57:50 2007 +0100 libwine: Pass flags to wine_utf8_wcstombs to allow supporting WC_ERR_INVALID_CHARS. --- dlls/kernel32/locale.c | 2 +- dlls/ntdll/rtlstr.c | 2 +- include/wine/unicode.h | 2 +- libs/wine/utf8.c | 4 ++-- tools/wrc/utils.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1c6e537..5b09793 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1892,7 +1892,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, /* fall through */ case CP_UTF8: if (used) *used = FALSE; /* all chars are valid for UTF-8 */ - ret = wine_utf8_wcstombs( src, srclen, dst, dstlen ); + ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); break; default: if (!(table = get_codepage_table( page ))) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 34336fd..2a54223 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -76,7 +76,7 @@ int ntdll_wcstoumbs(DWORD flags, const WCHAR* src, int srclen, char* dst, int ds if (unix_table) return wine_cp_wcstombs( unix_table, flags, src, srclen, dst, dstlen, defchar, used ); if (used) *used = 0; /* all chars are valid for UTF-8 */ - return wine_utf8_wcstombs( src, srclen, dst, dstlen ); + return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); } /************************************************************************** diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 83a7d52..198b00b 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -86,7 +86,7 @@ extern int wine_cp_wcstombs( const union cptable *table, int flags, extern int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen ); extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); +extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); diff --git a/libs/wine/utf8.c b/libs/wine/utf8.c index 334d7fc..be1c672 100644 --- a/libs/wine/utf8.c +++ b/libs/wine/utf8.c @@ -58,8 +58,8 @@ inline static int get_length_wcs_utf8( const WCHAR *src, unsigned int srclen ) } /* wide char to UTF-8 string conversion */ -/* return -1 on dst buffer overflow */ -int wine_utf8_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ) +/* return -1 on dst buffer overflow, -2 on invalid input char */ +int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { int len; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 9e736d4..39d1764 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -270,12 +270,12 @@ string_t *convert_string(const string_t *str, enum str_e type, int codepage) { ret->type = str_char; ret->size = cptable ? wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, NULL, 0, NULL, NULL ) - : wine_utf8_wcstombs( str->str.wstr, str->size, NULL, 0 ); + : wine_utf8_wcstombs( 0, str->str.wstr, str->size, NULL, 0 ); ret->str.cstr = xmalloc( ret->size + 1 ); if (cptable) wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, NULL, NULL ); else - wine_utf8_wcstombs( str->str.wstr, str->size, ret->str.cstr, ret->size ); + wine_utf8_wcstombs( 0, str->str.wstr, str->size, ret->str.cstr, ret->size ); ret->str.cstr[ret->size] = 0; } else if(str->type == str_unicode)

1 0

Alexandre Julliard : ntdll: Fixed typo in previous patch, spotted by Ken Thomases.
by Alexandre Julliard March 15, 2007

March 15, 2007

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 March 14, 2007

March 14, 2007

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

Kanit Therdsteerasukdi : comctl32: datetime: Reject out of range dates in DTM_SETSYSTEMTIME.
by Alexandre Julliard March 14, 2007

March 14, 2007

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

Louis Lenders : winex11.drv: Small spelling fix.
by Alexandre Julliard March 14, 2007

March 14, 2007

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

Erich Hoover : wined3d: Allow SetCursorProperties on existing cursor.
by Alexandre Julliard March 14, 2007

March 14, 2007

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

Alexandre Julliard : ntdll: Add a wrapper to call the thread entry point for broken apps.
by Alexandre Julliard March 14, 2007

March 14, 2007

Module: wine Branch: master Commit: 7744443febb04213cf014b007a83744a66544d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7744443febb04213cf014b007… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:28:38 2007 +0100 ntdll: Add a wrapper to call the thread entry point for broken apps. --- dlls/ntdll/thread.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9656331..d0871a1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -349,6 +349,26 @@ static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) return unhandled_exception_filter; } +#ifdef __i386__ +/* wrapper for apps that don't declare the thread function correctly */ +extern DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_entry_point, + "pushl %ebp\n\t" + "movl %esp,%ebp\n\t" + "subl $4,%esp\n\t" + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leave\n\t" + "ret" ); +#else +static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) +{ + LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; + return func( arg ); +} +#endif + /*********************************************************************** * call_thread_func * @@ -356,16 +376,15 @@ static PUNHANDLED_EXCEPTION_FILTER get_unhandled_exception_filter(void) */ static void DECLSPEC_NORETURN call_thread_func( PRTL_THREAD_START_ROUTINE rtl_func, void *arg ) { - LPTHREAD_START_ROUTINE func = (LPTHREAD_START_ROUTINE)rtl_func; DWORD exit_code; BOOL last; MODULE_DllThreadAttach( NULL ); if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), rtl_func, arg ); - exit_code = func( arg ); + exit_code = call_thread_entry_point( rtl_func, arg ); /* send the exit code to the server */ SERVER_START_REQ( terminate_thread )

1 0

Alexandre Julliard : msvcrt: _initterm doesn't return anything.
by Alexandre Julliard March 14, 2007

March 14, 2007

Module: wine Branch: master Commit: 8f097d8c9d6c0e30e570900183458ad15f4c764c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f097d8c9d6c0e30e57090018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 14 12:26:43 2007 +0100 msvcrt: _initterm doesn't return anything. --- dlls/msvcrt/data.c | 5 +---- dlls/msvcrt/tests/data.c | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 2511970..994e19b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -339,10 +339,9 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * /********************************************************************* * _initterm (MSVCRT.@) */ -unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) +void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN* current = start; - unsigned int count=0; TRACE("(%p,%p)\n",start,end); while (current<end) @@ -352,11 +351,9 @@ unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) TRACE("Call init function %p\n",*current); (**current)(); TRACE("returned\n"); - count++; } current++; } - return count; } /********************************************************************* diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index a137819..262909e 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -32,7 +32,7 @@ #include <errno.h> typedef void (*_INITTERMFUN)(void); -static unsigned int (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); +static void (*p_initterm)(_INITTERMFUN *start, _INITTERMFUN *end); static int callbacked; @@ -43,8 +43,7 @@ static void initcallback(void) #define initterm_test(start, end, expected) \ callbacked = 0; \ - rc = p_initterm(start, end); \ - ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ + p_initterm(start, end); \ ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); static void test_initterm(void)

1 0

Francois Gouget : wined3d: Remove space before '\n' in trace.
by Alexandre Julliard March 14, 2007

March 14, 2007

Module: wine Branch: master Commit: e11ca0a7fd6d07eb7841558d7f92b23872943519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11ca0a7fd6d07eb7841558d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 14 09:17:46 2007 +0100 wined3d: Remove space before '\n' in trace. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ad81c8b..ec45543 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1074,7 +1074,7 @@ void blt_to_drawable(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *surface) { coords[3].x = -1; coords[3].y = -1; coords[3].z = -1; default: - ERR("Unexpected texture target \n"); + ERR("Unexpected texture target\n"); LEAVE_GL(); return; }

1 0