October 2006 - Wine-Commits

Alexandre Julliard : shell32: Properly handle negative coordinates for mouse events.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: ff068c088b53a54915e9d59831b98ce80c4a5cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff068c088b53a54915e9d5983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:42:11 2006 +0200 shell32: Properly handle negative coordinates for mouse events. --- dlls/shell32/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index f9f6db8..f38a920 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -163,7 +163,7 @@ #define XSTEP 128 #define YICON 32 #define YSTEP 64 -static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy, +static BOOL Control_Localize(const CPanel* panel, int cx, int cy, CPlApplet** papplet, unsigned* psp) { unsigned i, x = (XSTEP-XICON)/2, y = 0; @@ -228,7 +228,7 @@ static LRESULT Control_WndProc_LButton(C unsigned i; CPlApplet* applet; - if (Control_Localize(panel, LOWORD(lParam), HIWORD(lParam), &applet, &i)) { + if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) { if (up) { if (panel->clkApplet == applet && panel->clkSP == i) { applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData);

1 0

Alexandre Julliard : msi: Properly handle negative coordinates for mouse events.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 33b346613ec1b3c41db29d1bf131b3d04ac34f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b346613ec1b3c41db29d1bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:42:04 2006 +0200 msi: Properly handle negative coordinates for mouse events. --- dlls/msi/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5c4ca26..422f0c5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1800,8 +1800,8 @@ MSISelectionTree_WndProc(HWND hWnd, UINT switch( msg ) { case WM_LBUTTONDOWN: - tvhti.pt.x = LOWORD( lParam ); - tvhti.pt.y = HIWORD( lParam ); + tvhti.pt.x = (short)LOWORD( lParam ); + tvhti.pt.y = (short)HIWORD( lParam ); tvhti.flags = 0; tvhti.hItem = 0; r = CallWindowProcW(info->oldproc, hWnd, TVM_HITTEST, 0, (LPARAM) &tvhti );

1 0

Alexandre Julliard : hhctrl.ocx: Properly handle negative coordinates for mouse events.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 44e8ead5d0283eaacd625b4458951e78f36413df URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e8ead5d0283eaacd625b445… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:41:58 2006 +0200 hhctrl.ocx: Properly handle negative coordinates for mouse events. --- dlls/hhctrl.ocx/help.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 2c288b6..1ed1c8b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -132,7 +132,10 @@ static void SB_OnLButtonDown(HWND hWnd, static void SB_OnLButtonUp(HWND hWnd, WPARAM wParam, LPARAM lParam) { HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); - POINTS pt = MAKEPOINTS(lParam); + POINT pt; + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); /* update the window sizes */ pHHInfo->pHHWinType->iNavWidth += pt.x;

1 0

Alexandre Julliard : comctl32: Properly handle negative coordinates for mouse events.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 7cca856315bc79ea2ad3d175c83765f1b31d94a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cca856315bc79ea2ad3d175c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 17:41:48 2006 +0200 comctl32: Properly handle negative coordinates for mouse events. --- dlls/comctl32/header.c | 12 ++++++------ dlls/comctl32/monthcal.c | 16 ++++++++-------- dlls/comctl32/rebar.c | 4 ++-- dlls/comctl32/status.c | 8 ++++---- dlls/comctl32/syslink.c | 12 ++++++------ dlls/comctl32/tab.c | 16 ++++++++-------- dlls/comctl32/theme_combo.c | 6 ++++-- dlls/comctl32/toolbar.c | 34 +++++++++++++++++----------------- dlls/comctl32/tooltips.c | 4 ++-- dlls/comctl32/treeview.c | 4 ++-- 10 files changed, 59 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cca856315bc79ea2ad3d…

1 0

Kovács András : mlang: Set fnIMLangFontLink_GetStrCodePages stub return values.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: bdb6b74a2f4650bd6510ff9470301210e1d93098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb6b74a2f4650bd6510ff947… Author: Kovács András <andras(a)csevego.net> Date: Wed Oct 25 03:54:22 2006 +0200 mlang: Set fnIMLangFontLink_GetStrCodePages stub return values. --- dlls/mlang/mlang.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 52e932d..8bdcc27 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1281,8 +1281,10 @@ static HRESULT WINAPI fnIMLangFontLink_G DWORD* pdwCodePages, long* pcchCodePages) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("(pszSrc=%s, cchSrc=%ld, dwPriorityCodePages=%d) stub\n", debugstr_w(pszSrc), cchSrc, dwPriorityCodePages); + *pdwCodePages = 0; + *pcchCodePages = 1; + return S_OK; } static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages(

1 0

Andrew Talbot : crypt32: Cast-qual warnings fix.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 58f9b6076fa033ddb12b711f00b527325bbe5aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f9b6076fa033ddb12b711f0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Oct 24 21:54:07 2006 +0100 crypt32: Cast-qual warnings fix. --- dlls/crypt32/crl.c | 2 +- dlls/crypt32/decode.c | 8 ++++---- dlls/crypt32/encode.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 7a031d6..37677a6 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -429,7 +429,7 @@ static BOOL WINAPI CRLContext_SetPropert } case CERT_DATE_STAMP_PROP_ID: ret = ContextPropertyList_SetProperty(properties, dwPropId, - (LPBYTE)pvData, sizeof(FILETIME)); + (const BYTE *)pvData, sizeof(FILETIME)); break; default: FIXME("%d: stub\n", dwPropId); diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6e74fcc..cb83a80 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1333,7 +1333,7 @@ static BOOL WINAPI CRYPT_AsnDecodeNameVa case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; break; default: SetLastError(CRYPT_E_ASN1_BADTAG); @@ -1394,7 +1394,7 @@ static BOOL WINAPI CRYPT_AsnDecodeNameVa LPWSTR str = (LPWSTR)value->Value.pbData; value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; break; } @@ -1508,7 +1508,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicod case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; break; default: SetLastError(CRYPT_E_ASN1_BADTAG); @@ -1561,7 +1561,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicod break; case ASN_UTF8STRING: value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; break; } diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 81ce224..d897617 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -600,7 +600,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLEnt { DWORD cCRLEntry = *(const DWORD *)pvStructInfo; DWORD bytesNeeded, dataLen, lenBytes, i; - const CRL_ENTRY *rgCRLEntry = *(const CRL_ENTRY **) + const CRL_ENTRY *rgCRLEntry = *(const CRL_ENTRY *const *) ((const BYTE *)pvStructInfo + sizeof(DWORD)); BOOL ret = TRUE;

1 0

Mike McCormack : comctl32: Create a point from index function and use it.
by Alexandre Julliard Oct. 25, 2006

Oct. 25, 2006

Module: wine Branch: master Commit: 11f4fb2dd515ac3773afa7b6edc4f75e5561b5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f4fb2dd515ac3773afa7b6e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Oct 25 12:50:10 2006 +0900 comctl32: Create a point from index function and use it. --- dlls/comctl32/imagelist.c | 108 ++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11f4fb2dd515ac3773afa…

1 0

Dmitry Timoshkov : kernel32: Exit from initial thread with ExitThread not by ExitProcess.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 5ace8745ce0439f23bb7843f421273feb9c5356f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ace8745ce0439f23bb7843f4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 24 23:49:44 2006 +0900 kernel32: Exit from initial thread with ExitThread not by ExitProcess. --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index eabe865..c28b6cc 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -819,7 +819,7 @@ static void start_process( void *arg ) SetLastError( 0 ); /* clear error code */ if (peb->BeingDebugged) DbgBreakPoint(); - ExitProcess( entry( peb ) ); + ExitThread( entry( peb ) ); } __EXCEPT(UnhandledExceptionFilter) {

1 0

Alexandre Julliard : Revert "kernel32: Exit from initial thread with ExitThread not by ExitProcess."
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: af9574cead481adf325fbc072d3e49e139e6b9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9574cead481adf325fbc072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 24 20:48:17 2006 +0200 Revert "kernel32: Exit from initial thread with ExitThread not by ExitProcess." This reverts commit 5a1fd50db345c1de97d9d02133728a6080d2848b. I committed the wrong file. --- dlls/winex11.drv/xinerama.c | 45 ++++++------------------------------------ 1 files changed, 7 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 12f6c65..0d01b58 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -106,10 +106,9 @@ static int query_screens(void) nb_monitors = count; for (i = 0; i < nb_monitors; i++) { -#if 1 /* FIXME: for now, force primary to be the screen that starts at (0,0) origin */ if (!screens[i].x_org && !screens[i].y_org) primary_monitor = i; -#endif + monitors[i].cbSize = sizeof( monitors[i] ); monitors[i].rcMonitor.left = screens[i].x_org; monitors[i].rcMonitor.top = screens[i].y_org; @@ -122,6 +121,11 @@ #endif } get_primary()->dwFlags |= MONITORINFOF_PRIMARY; + + for (i = 0; i < nb_monitors; i++) + TRACE( "monitor %p: %s%s\n", + index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), + (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } else count = 0; @@ -141,36 +145,11 @@ #endif /* HAVE_LIBXINERAMA */ void xinerama_init(void) { MONITORINFOEXW *primary; - int i; wine_tsx11_lock(); SetRect( &virtual_screen_rect, 0, 0, screen_width, screen_height ); -#if 0 - if (root_window != DefaultRootWindow( gdi_display )) - { - static const WCHAR monitorW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','u',0}; - nb_monitors = 4; - if ((monitors = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(*monitors) ))) - { - for (i = 0; i < nb_monitors; i++) - { - monitors[i].cbSize = sizeof( monitors[i] ); - monitors[i].rcMonitor.left = (i & 1) ? screen_width / 2 : 0; - monitors[i].rcMonitor.top = (i & 2) ? screen_height / 2 : 0; - monitors[i].rcMonitor.right = monitors[i].rcMonitor.left + screen_width / 2; - monitors[i].rcMonitor.bottom = monitors[i].rcMonitor.top + screen_height / 2; - monitors[i].rcWork = monitors[i].rcMonitor; - monitors[i].dwFlags = 0; - wsprintfW( monitors[i].szDevice, monitorW, i ); - } - primary_monitor = 3; - get_primary()->dwFlags |= MONITORINFOF_PRIMARY; - } - } - else -#endif if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect; @@ -179,21 +158,11 @@ #endif } primary = get_primary(); - /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); - for (i = 0; i < nb_monitors; i++) - { - OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top ); - OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top ); - ERR( "monitor %p: %s%s\n", - index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), - (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); - } - screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; - ERR( "virtual size: %s primary size: %dx%d\n", + TRACE( "virtual size: %s primary size: %dx%d\n", wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); wine_tsx11_unlock();

1 0

Aric Stewart : winex11.drv: Only create a fontSet if we are going to be using it in the XIC.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 0bcc941f964853d17230d74ce06877ea28f96a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcc941f964853d17230d74ce… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 24 12:17:40 2006 -0500 winex11.drv: Only create a fontSet if we are going to be using it in the XIC. --- dlls/winex11.drv/xim.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index ff98f01..2be9dd2 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -456,7 +456,7 @@ err: XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) { - XFontSet fontSet; + XFontSet fontSet = NULL; char **list; int count; XPoint spot = {0}; @@ -485,22 +485,27 @@ XIC X11DRV_CreateIC(XIM xim, Display *di return xic; } - fontSet = XCreateFontSet(display, - "*", /*FIXME*/ - &list, &count, NULL); - TRACE("ximFontSet = %p\n", fontSet); - TRACE("list = %p, count = %d\n", list, count); - - if (list != NULL) + if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) || + ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0)) { - int i; + fontSet = XCreateFontSet(display, + "*", /*FIXME*/ + &list, &count, NULL); + + TRACE("ximFontSet = %p\n", fontSet); + TRACE("list = %p, count = %d\n", list, count); - for (i = 0; i < count; ++i) + if (list != NULL) { - TRACE("list[%d] = %s\n", i, list[i]); + int i; + + for (i = 0; i < count; ++i) + { + TRACE("list[%d] = %s\n", i, list[i]); + } + XFreeStringList(list); } - XFreeStringList(list); } /* create callbacks */

1 0