February 2007 - Wine-commits

Rob Shearman : rpcrt4: Fix a memory leak in I_RpcSendReceive caused by I_RpcReceive overwriting pMsg- >Buffer.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: ca6fe3fbf249feb4c06fec3b613e21b644fa065e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6fe3fbf249feb4c06fec3b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 17:12:41 2007 +0000 rpcrt4: Fix a memory leak in I_RpcSendReceive caused by I_RpcReceive overwriting pMsg->Buffer. (Reported by Huw Davies.) --- dlls/rpcrt4/rpc_message.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 574316d..8a02463 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1030,10 +1030,16 @@ fail: RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; + RPC_MESSAGE original_message; TRACE("(%p)\n", pMsg); + + original_message = *pMsg; status = I_RpcSend(pMsg); if (status == RPC_S_OK) status = I_RpcReceive(pMsg); + /* free the buffer replaced by a new buffer in I_RpcReceive */ + if (status == RPC_S_OK) + I_RpcFreeBuffer(&original_message); return status; }

1 0

Rob Shearman : rpcrt4: Add documentation for the I_Rpc* RPC message functions.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: b491d926d56776c9c37784520adcbbd0e5ad21c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b491d926d56776c9c37784520… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 21 13:58:10 2007 +0000 rpcrt4: Add documentation for the I_Rpc* RPC message functions. --- dlls/rpcrt4/rpc_message.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 829b6ca..574316d 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -784,6 +784,27 @@ fail: /*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] + * + * Allocates a buffer for use by I_RpcSend or I_RpcSendReceive and binds to the + * server interface. + * + * PARAMS + * pMsg [I/O] RPC message information. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: RPC_S_INVALID_BINDING if pMsg->Handle is invalid. + * RPC_S_SERVER_UNAVAILABLE if unable to connect to server. + * ERROR_OUTOFMEMORY if buffer allocation failed. + * + * NOTES + * The pMsg->BufferLength field determines the size of the buffer to allocate, + * in bytes. + * + * Use I_RpcFreeBuffer() to unbind from the server and free the message buffer. + * + * SEE ALSO + * I_RpcFreeBuffer(), I_RpcSend(), I_RpcReceive(), I_RpcSendReceive(). */ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { @@ -810,6 +831,18 @@ static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) /*********************************************************************** * I_RpcFreeBuffer [RPCRT4.@] + * + * Frees a buffer allocated by I_RpcGetBuffer or I_RpcReceive and unbinds from + * the server interface. + * + * PARAMS + * pMsg [I/O] RPC message information. + * + * RETURNS + * RPC_S_OK. + * + * SEE ALSO + * I_RpcGetBuffer(), I_RpcReceive(). */ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { @@ -822,6 +855,20 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) /*********************************************************************** * I_RpcSend [RPCRT4.@] + * + * Sends a message to the server. + * + * PARAMS + * pMsg [I/O] RPC message information. + * + * RETURNS + * Unknown. + * + * NOTES + * The buffer must have been allocated with I_RpcGetBuffer(). + * + * SEE ALSO + * I_RpcGetBuffer(), I_RpcReceive(), I_RpcSendReceive(). */ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) { @@ -964,6 +1011,21 @@ fail: /*********************************************************************** * I_RpcSendReceive [RPCRT4.@] + * + * Sends a message to the server and receives the response. + * + * PARAMS + * pMsg [I/O] RPC message information. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + * + * NOTES + * The buffer must have been allocated with I_RpcGetBuffer(). + * + * SEE ALSO + * I_RpcGetBuffer(), I_RpcSend(), I_RpcReceive(). */ RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) {

1 0

Ken Thomases : winex11.drv: Pass correct coords into X11DRV_InternalFloodFill.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 44c2db175b9b75254785084ef477cf736352c398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c2db175b9b75254785084ef… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 21 10:50:36 2007 -0600 winex11.drv: Pass correct coords into X11DRV_InternalFloodFill. The (x,y) should be relative to the XImage, not the drawable. The (xOrg,yOrg) is what should be relative to the drawable. This fixes a crash when XGetPixel tried to access memory outside the XImage's buffer. --- dlls/winex11.drv/graphics.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index d8e5f91..638356b 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1312,9 +1312,10 @@ X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color, wine_tsx11_lock(); XSetFunction( gdi_display, physDev->gc, GXcopy ); X11DRV_InternalFloodFill(image, physDev, - physDev->dc_rect.left + pt.x - rect.left, - physDev->dc_rect.top + pt.y - rect.top, - rect.left, rect.top, + pt.x - rect.left, + pt.y - rect.top, + physDev->dc_rect.left + rect.left, + physDev->dc_rect.top + rect.top, X11DRV_PALETTE_ToPhysical( physDev, color ), fillType ); wine_tsx11_unlock();

1 0

Huw Davies : oleaut32: Fix a TypeAttr leak.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: d5664881e59da5b6ddb566bdecdc755df77e0ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5664881e59da5b6ddb566bde… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 21 15:33:17 2007 +0000 oleaut32: Fix a TypeAttr leak. --- dlls/oleaut32/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index d192d01..cf0df90 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -356,6 +356,7 @@ static int _nroffuncs(ITypeInfo *tinfo) { n += _nroffuncs(tinfo2); ITypeInfo_Release(tinfo2); } + ITypeInfo_ReleaseTypeAttr(tinfo, attr); i = 0; while (1) { hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,i,&fdesc);

1 0

Francois Gouget : wininet/tests: Fix some tests so they succeed on Windows 98.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 56da1eeadc8fe7194fd338c62121a39e3c3bc9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=56da1eeadc8fe7194fd338c62… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 21 17:29:56 2007 +0100 wininet/tests: Fix some tests so they succeed on Windows 98. --- dlls/wininet/tests/ftp.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index e87aa45..c7b881c 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -50,9 +50,9 @@ static void test_getfile_no_open(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(NULL, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - ok ( GetLastError() == ERROR_INTERNET_NOT_INITIALIZED, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_NOT_INITIALIZED || + GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INTERNET_NOT_INITIALIZED or ERROR_INVALID_HANDLE (win98), got %d\n", GetLastError()); } static void test_connect(void) @@ -245,12 +245,13 @@ static void test_getfile(void) * Condition flags */ - /* Test to show validity of 'local file' parameter is tested first (together with 'remote file') */ + /* Test to show the parameter checking order depends on the Windows version */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(NULL, NULL, "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_HANDLE (win98) or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Test to show session handle is checked before 'condition flags' */ SetLastError(0xdeadbeef); @@ -377,12 +378,13 @@ static void test_getfile(void) hConnect = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - /* Test to show existence of local file is tested before 'session handle type' */ + /* Test to show the parameter checking order depends on the Windows version */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hConnect, NULL, "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE || + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE (win98) or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Test to show that 'session handle type' is checked before 'condition flags' */ SetLastError(0xdeadbeef); @@ -525,12 +527,13 @@ static void test_putfile(void) * Condition flags */ - /* Test to show validity of 'local file' parameter is tested first (together with 'remote file') */ + /* Test to show the parameter checking order depends on the Windows version */ SetLastError(0xdeadbeef); bRet = FtpPutFileA(NULL, NULL, "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_HANDLE (win98) or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Test to show session handle is checked before 'condition flags' */ SetLastError(0xdeadbeef); @@ -600,12 +603,13 @@ static void test_putfile(void) hConnect = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - /* Test to show validity of 'local file' parameter is tested a before 'session handle type' */ + /* Test to show the parameter checking order depends on the Windows version */ SetLastError(0xdeadbeef); bRet = FtpPutFileA(hConnect, NULL, "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE || + GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE (win98) or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* Test to show that 'session handle type' is checked before 'condition flags' */ SetLastError(0xdeadbeef);

1 0

Francois Gouget : wine.inf: Update the timezone information.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 17382dd5f7ce84db965ef38f5606a664ed9737b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17382dd5f7ce84db965ef38f5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 21 17:41:39 2007 +0100 wine.inf: Update the timezone information. --- tools/wine.inf | 163 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 112 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17382dd5f7ce84db965ef…

1 0

Lei Zhang : comctl32: Move up-down msg seq test functions into msg.c.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: b29c99c59a59d9aff82518a108de61f088cb1b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29c99c59a59d9aff82518a10… Author: Lei Zhang <thestig(a)google.com> Date: Sat Feb 17 15:27:05 2007 -0800 comctl32: Move up-down msg seq test functions into msg.c. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/msg.c | 230 +++++++++++++++++++++++++++++++++ dlls/comctl32/tests/msg.h | 71 +++++++++++ dlls/comctl32/tests/updown.c | 266 ++------------------------------------ 4 files changed, 316 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b29c99c59a59d9aff8251…

1 0

Andrew Talbot : odbc32: Constify some variables.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 138a88321b2ee786facbe5e51aca691897e953fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a88321b2ee786facbe5e51… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 21 14:45:21 2007 +0000 odbc32: Constify some variables. --- dlls/odbc32/proxyodbc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 3351cfd..eeae263 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -347,7 +347,7 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) KEY_ALL_ACCESS, NULL, &hDSN, NULL)) == ERROR_SUCCESS) { - static const char *DRIVERKEY = "Driver"; + static const char DRIVERKEY[] = "Driver"; if ((reg_ret = RegQueryValueExA (hDSN, DRIVERKEY, NULL, NULL, NULL, NULL)) == ERROR_FILE_NOT_FOUND) @@ -2108,7 +2108,7 @@ SQLRETURN WINAPI SQLSetScrollOptions( static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) { - static SQLUSMALLINT attrList[] = + static const SQLUSMALLINT attrList[] = { SQL_COLUMN_OWNER_NAME, SQL_COLUMN_QUALIFIER_NAME,

1 0

Alexandre Julliard : server: Added support for the PM_QS_* flags in PeekMessage.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 89faee01948f22b337f0c36669744d16882c4ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89faee01948f22b337f0c3666… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 21 15:21:05 2007 +0100 server: Added support for the PM_QS_* flags in PeekMessage. --- dlls/user32/message.c | 16 ++++++------ dlls/user32/tests/msg.c | 50 ---------------------------------------- include/wine/server_protocol.h | 7 ++--- server/protocol.def | 5 +-- server/queue.c | 31 ++++++++++++++++-------- server/trace.c | 4 ++- 6 files changed, 36 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89faee01948f22b337f0c…

1 0

Dmitry Timoshkov : winex11.drv: Clients should pass only KeyPress events to XmbLookupString.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: ac3646cc08dcb56cff8988b52987acea6c474d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3646cc08dcb56cff8988b52… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 19 16:19:44 2007 +0800 winex11.drv: Clients should pass only KeyPress events to XmbLookupString. --- dlls/winex11.drv/keyboard.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 33564cf..c025a38 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1124,7 +1124,8 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) Status status; char buf[24]; - if (xic) + /* Clients should pass only KeyPress events to XmbLookupString */ + if (xic && e->type == KeyPress) XmbLookupString(xic, e, buf, sizeof(buf), &keysym, &status); else XLookupString(e, buf, sizeof(buf), &keysym, NULL); @@ -1365,7 +1366,8 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) event->type, event->window, event->state, event->keycode); wine_tsx11_lock(); - if (xic) + /* Clients should pass only KeyPress events to XmbLookupString */ + if (xic && event->type == KeyPress) ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); else ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL); @@ -2486,6 +2488,9 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, TRACE_(key)("type %d, window %lx, state 0x%04x, keycode 0x%04x\n", e.type, e.window, e.state, e.keycode); + /* Clients should pass only KeyPress events to XmbLookupString, + * e.type was set to KeyPress above. + */ if (xic) ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, &status); else

1 0