February 2008 - Wine-commits

Paul Vriens : rpcrt4/tests: Change test for Windows 2003.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: a9e29c7576d93b58aa0a8bafeba547364bd60a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e29c7576d93b58aa0a8bafe… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Feb 8 10:32:18 2008 +0100 rpcrt4/tests: Change test for Windows 2003. --- dlls/rpcrt4/tests/rpc.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index ec70902..cca1fa1 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -392,6 +392,12 @@ static void test_I_RpcMapWin32Status(void) { LONG win32status; RPC_STATUS rpc_status; + BOOL w2k3 = FALSE; + + /* Windows 2003 returns STATUS_UNSUCCESSFUL if given an unknown status */ + win32status = I_RpcMapWin32Status(9999); + if (win32status == STATUS_UNSUCCESSFUL) + w2k3 = TRUE; for (rpc_status = 0; rpc_status < 10000; rpc_status++) { @@ -399,6 +405,7 @@ static void test_I_RpcMapWin32Status(void) win32status = I_RpcMapWin32Status(rpc_status); switch (rpc_status) { + case ERROR_SUCCESS: expected_win32status = ERROR_SUCCESS; break; case ERROR_ACCESS_DENIED: expected_win32status = STATUS_ACCESS_DENIED; break; case ERROR_INVALID_HANDLE: expected_win32status = RPC_NT_SS_CONTEXT_MISMATCH; break; case ERROR_OUTOFMEMORY: expected_win32status = STATUS_NO_MEMORY; break; @@ -505,7 +512,11 @@ static void test_I_RpcMapWin32Status(void) case RPC_X_PIPE_EMPTY: expected_win32status = RPC_NT_PIPE_EMPTY; break; case ERROR_PASSWORD_MUST_CHANGE: expected_win32status = STATUS_PASSWORD_MUST_CHANGE; break; case ERROR_ACCOUNT_LOCKED_OUT: expected_win32status = STATUS_ACCOUNT_LOCKED_OUT; break; - default: expected_win32status = rpc_status; + default: + if (w2k3) + expected_win32status = STATUS_UNSUCCESSFUL; + else + expected_win32status = rpc_status; } ok(win32status == expected_win32status, "I_RpcMapWin32Status(%ld) should have returned 0x%x instead of 0x%x\n", rpc_status, expected_win32status, win32status);

1 0

Roderick Colenbrander : wined3d: Upload p8 palette using GL_ALPHA instead of GL_RED.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: 059778446f566878670e9a1ecd2db5ccb9c4726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=059778446f566878670e9a1ec… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 8 01:24:24 2008 +0100 wined3d: Upload p8 palette using GL_ALPHA instead of GL_RED. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d6ce92f..bd73089 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1399,7 +1399,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } } else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { - *format = GL_RED; + *format = GL_ALPHA; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; *target_bpp = 1; @@ -1980,9 +1980,9 @@ const char *fragment_palette_conversion = "!!ARBfp1.0\n" "TEMP index;\n" "PARAM constants = { 0.996, 0.00195, 0, 0 };\n" /* { 255/256, 0.5/255*255/256, 0, 0 } */ - "TEX index.x, fragment.texcoord[0], texture[0], 2D;\n" /* store the red-component of the current pixel */ - "MAD index.x, index.x, constants.x, constants.y;\n" /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ - "TEX result.color, index, texture[1], 1D;\n" /* use the red-component as a index in the palette to get the final color */ + "TEX index, fragment.texcoord[0], texture[0], 2D;\n" /* The alpha-component contains the palette index */ + "MAD index.a, index.a, constants.x, constants.y;\n" /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ + "TEX result.color, index.a, texture[1], 1D;\n" /* use the alpha-component as a index in the palette to get the final color */ "END"; /* This function is used in case of 8bit paletted textures to upload the palette.

1 0

Lei Zhang : quartz: Add VideoRendererDefault.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: 9742724afeed8a03c19b9dac3eaa995ad557ac8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9742724afeed8a03c19b9dac3… Author: Lei Zhang <thestig(a)google.com> Date: Sat Feb 2 01:47:34 2008 -0800 quartz: Add VideoRendererDefault. --- dlls/quartz/main.c | 1 + dlls/quartz/quartz_private.h | 1 + dlls/quartz/regsvr.c | 18 ++++++++++++++++++ dlls/quartz/videorenderer.c | 6 ++++++ include/uuids.h | 1 + 5 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 66b6f6a..73c5062 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -69,6 +69,7 @@ static const struct object_creation_info object_creation[] = { &CLSID_AviSplitter, AVISplitter_create }, { &CLSID_MPEG1Splitter, MPEGSplitter_create }, { &CLSID_VideoRenderer, VideoRenderer_create }, + { &CLSID_VideoRendererDefault, VideoRendererDefault_create }, { &CLSID_DSoundRender, DSoundRender_create }, { &CLSID_AVIDec, AVIDec_create }, { &CLSID_SystemClock, &QUARTZ_CreateSystemClock }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index a483f2a..ebb6a02 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -52,6 +52,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv); diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 8b93601..98fd0bc 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -861,6 +861,12 @@ static struct regsvr_coclass const coclass_list[] = { "quartz.dll", "Both" }, + { &CLSID_VideoRendererDefault, + "Default Video Renderer", + NULL, + "quartz.dll", + "Both" + }, { &CLSID_ACMWrapper, "ACM wrapper", NULL, @@ -1075,6 +1081,18 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, + { &CLSID_VideoRendererDefault, + &CLSID_LegacyAmFilterCategory, + {'V','i','d','e','o',' ','R','e','n','d','e','r','e','r',0}, + 0x800000, + { { REG_PINFLAG_B_RENDERER, + { { &MEDIATYPE_Video, &GUID_NULL }, + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, { &CLSID_AVIDec, &CLSID_LegacyAmFilterCategory, {'A','V','I',' ','D','e','c','o','m','p','r','e','s','s','o','r',0}, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 28f527c..ec16a4c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -488,6 +488,12 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } +HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) +{ + /* TODO: Attenmpt to use the VMR-7 renderer instead when possible */ + return VideoRenderer_create(pUnkOuter, ppv); +} + static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); diff --git a/include/uuids.h b/include/uuids.h index e3fb41b..b767fcc 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -135,6 +135,7 @@ OUR_GUID_ENTRY(CLSID_QTDec, 0xfdfe9681, 0x74a3, 0x11d0, OUR_GUID_ENTRY(CLSID_AVIDoc, 0xd3588ab0, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70e102b0, 0x5556, 0x11ce, 0x97, 0xc0, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) +OUR_GUID_ENTRY(CLSID_VideoRendererDefault, 0x6bc1cffa, 0x8fc1, 0x4261, 0xac, 0x22, 0xcf, 0xb4, 0xcc, 0x38, 0xdb, 0x50) OUR_GUID_ENTRY(CLSID_Colour, 0x1643e180, 0x90f5, 0x11ce, 0x97, 0xd5, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) OUR_GUID_ENTRY(CLSID_Dither, 0x1da08500, 0x9edc, 0x11cf, 0xbc, 0x10, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6) OUR_GUID_ENTRY(CLSID_ModexRenderer, 0x07167665, 0x5011, 0x11cf, 0xbf, 0x33, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a)

1 0

Andrew Talbot : ws2_32: Remove unneeded casts.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: e27ede40706f5214661838b89a413ed1ff6c8b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27ede40706f5214661838b89… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 7 21:41:40 2008 +0000 ws2_32: Remove unneeded casts. --- dlls/ws2_32/async.c | 8 ++++---- dlls/ws2_32/socket.c | 11 ++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index b9c7457..963ed66 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -215,9 +215,9 @@ static int WS_copy_he(char *p_to,char *p_base,int t_size,struct hostent* p_he, i p_name = p; strcpy(p, p_he->h_name); p += strlen(p) + 1; p_aliases = p; - p += list_dup(p_he->h_aliases, p, p_base + (p - (char*)p_to), 0); + p += list_dup(p_he->h_aliases, p, p_base + (p - p_to), 0); p_addr = p; - list_dup(p_he->h_addr_list, p, p_base + (p - (char*)p_to), p_he->h_length); + list_dup(p_he->h_addr_list, p, p_base + (p - p_to), p_he->h_length); if (flag & AQ_WIN16) { @@ -273,7 +273,7 @@ static int WS_copy_pe(char *p_to,char *p_base,int t_size,struct protoent* p_pe, p_name = p; strcpy(p, p_pe->p_name); p += strlen(p) + 1; p_aliases = p; - list_dup(p_pe->p_aliases, p, p_base + (p - (char*)p_to), 0); + list_dup(p_pe->p_aliases, p, p_base + (p - p_to), 0); if (flag & AQ_WIN16) { @@ -630,7 +630,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { TRACE("hwnd %p, msg %08x, host %s, buffer %i\n", - hWnd, uMsg, (name)?name:"<null>", (int)buflen ); + hWnd, uMsg, (name)?name:"<null>", buflen ); return WSA_H32( __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen, AQ_NAME|AQ_DUPLOWPTR1|AQ_WIN32|AQ_GETHOST)); } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5d6eee3..fb6a20d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1670,8 +1670,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd,(int) level, optname, optval, - (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -1792,7 +1791,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd,(int) level, optname, &tv, &len) != 0 ) + if (getsockopt(fd, level, optname, &tv, &len) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -1886,8 +1885,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd,(int) level, optname, optval, - (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; @@ -1915,8 +1913,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); - if (getsockopt(fd,(int) level, optname, optval, - (unsigned int *)optlen) != 0 ) + if (getsockopt(fd, level, optname, optval, (unsigned int *)optlen) != 0 ) { SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR;

1 0

Andrew Talbot : wnaspi32: Remove unneeded cast.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: 49665fa3548ef9e096a778aa264d46bc3d4a6b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49665fa3548ef9e096a778aa2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 7 21:41:37 2008 +0000 wnaspi32: Remove unneeded cast. --- dlls/wnaspi32/winaspi16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index ec451e4..b8dcf27 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -425,7 +425,7 @@ adapter name */ FIXME("Not implemented SC_GET_DEV_TYPE\n"); break; case SC_EXEC_SCSI_CMD: - return ASPI_ExecScsiCmd((DWORD)ptrSRB, mode); + return ASPI_ExecScsiCmd(ptrSRB, mode); case SC_RESET_DEV: FIXME("Not implemented SC_RESET_DEV\n"); break;

1 0

Colin Finck : widl: Support Windows paths in dup_basename and make_token.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: 0fae921727a2c7b973172e10977bfb01863ea457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fae921727a2c7b973172e109… Author: Colin Finck <mail(a)colinfinck.de> Date: Thu Feb 7 17:41:00 2008 +0100 widl: Support Windows paths in dup_basename and make_token. --- tools/widl/utils.c | 3 +++ tools/widl/widl.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index e77361c..ed950f6 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -136,6 +136,9 @@ char *dup_basename(const char *name, const char *ext) name = "widl.tab"; slash = strrchr(name, '/'); + if (!slash) + slash = strrchr(name, '\\'); + if (slash) name = slash + 1; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7945694..07f024c 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -166,6 +166,9 @@ static char *make_token(const char *name) int i; slash = strrchr(name, '/'); + if(!slash) + slash = strrchr(name, '\\'); + if (slash) name = slash + 1; token = xstrdup(name);

1 0

Colin Finck : widl: Write the TLB file in binary mode, so the line endings won't be changed.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: 318e61535cab9c143891182fa8f2967fa30ed7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318e61535cab9c143891182fa… Author: Colin Finck <mail(a)colinfinck.de> Date: Thu Feb 7 17:41:30 2008 +0100 widl: Write the TLB file in binary mode, so the line endings won't be changed. --- tools/widl/write_msft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 51227bf..4e7edf3 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2418,7 +2418,7 @@ static int save_all_changes(msft_typelib_t *typelib) retval = TYPE_E_IOERROR; - fd = creat(typelib->typelib->filename, 0666); + fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir);

1 0

Johan Gardell : user32: Added support for SPI_SETMOUSESPEED in SystemParametersInfoW.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: ebe9b3c9950c159dae528bcc61cafbfbebb0e689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe9b3c9950c159dae528bcc6… Author: Johan Gardell <gardin(a)gmail.com> Date: Thu Feb 7 21:30:47 2008 +0100 user32: Added support for SPI_SETMOUSESPEED in SystemParametersInfoW. --- dlls/user32/sysparams.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b323a9b..e355480 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2107,7 +2107,13 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, break; } - WINE_SPI_FIXME(SPI_SETMOUSESPEED); /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_SETMOUSESPEED: /* 113 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + { + ret = save_int_param( SPI_SETMOUSE_REGKEY, SPI_SETMOUSE_VALNAME3, + &mouse_speed, (INT) pvParam, fWinIni); + + break; + } case SPI_GETSCREENSAVERRUNNING: ret = get_bool_param( SPI_SETSCREENSAVERRUNNING_IDX,

1 0

Juan Lang : rsaenh: Merge the encrypting and decrypting states, as encrypting and decrypting are allowed with the same key.
by Alexandre Julliard 08 Feb '08

08 Feb '08

Module: wine Branch: master Commit: ad6a7a788de7ce09e98ea149fc7e7c51c5106fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6a7a788de7ce09e98ea149f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 7 13:27:40 2008 -0800 rsaenh: Merge the encrypting and decrypting states, as encrypting and decrypting are allowed with the same key. --- dlls/rsaenh/rsaenh.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 1f0e0b2..ded6df7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -75,8 +75,7 @@ typedef struct tagCRYPTHASH #define RSAENH_MAX_BLOCK_SIZE 24 #define RSAENH_KEYSTATE_IDLE 0 #define RSAENH_KEYSTATE_ENCRYPTING 1 -#define RSAENH_KEYSTATE_DECRYPTING 2 -#define RSAENH_KEYSTATE_MASTERKEY 3 +#define RSAENH_KEYSTATE_MASTERKEY 2 typedef struct _RSAENH_SCHANNEL_INFO { SCHANNEL_ALG saEncAlg; @@ -2115,9 +2114,9 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, } if (pCryptKey->dwState == RSAENH_KEYSTATE_IDLE) - pCryptKey->dwState = RSAENH_KEYSTATE_DECRYPTING; + pCryptKey->dwState = RSAENH_KEYSTATE_ENCRYPTING; - if (pCryptKey->dwState != RSAENH_KEYSTATE_DECRYPTING) + if (pCryptKey->dwState != RSAENH_KEYSTATE_ENCRYPTING) { SetLastError(NTE_BAD_DATA); return FALSE;

1 0

Alexandre Julliard : localspl: Avoid sizeof in a trace.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: d03f5f22e9ce1f886f6432c57b46f013d88ec402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03f5f22e9ce1f886f6432c57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 7 14:55:02 2008 +0100 localspl: Avoid sizeof in a trace. --- dlls/localspl/localspl_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 6780c06..f855635 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -289,7 +289,7 @@ static const PRINTPROVIDOR * get_backend(void) NULL, /* fpSendRecvBidiData */ NULL /* fpAddDriverCatalog */ }; - TRACE("=> %p (%u byte for %u entries)\n", &backend, sizeof(backend), sizeof(backend) / sizeof(VOID *)); + TRACE("=> %p\n", &backend); return &backend; }

1 0