November 2007 - Wine-commits

Andrew Talbot : comctl32: Fix a typo.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 04ff9664fd00ce7ce961557e5dbf3f7d1cf7a167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ff9664fd00ce7ce961557e5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 20:07:53 2007 +0000 comctl32: Fix a typo. --- dlls/comctl32/theme_combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index af6eee8..477138e 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -106,7 +106,7 @@ static void paint_text (HWND hwnd, HDC hdc, DWORD dwStyle, const COMBOBOXINFO *c clipRegion=NULL; } - if (!IsWindowEnabled(hwnd) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!IsWindowEnabled(hwnd)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid;

1 0

Andrew Talbot : comdlg32: Use logical OR not bitwise OR.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 3d5cc3b2e2176542afa0b5e0274523e7cd7050ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5cc3b2e2176542afa0b5e02… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:34:55 2007 +0000 comdlg32: Use logical OR not bitwise OR. --- dlls/comdlg32/filedlgbrowser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 11608f0..55ef65b 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -868,8 +868,8 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr ulAttr = SFGAO_HIDDEN | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR | SFGAO_LINK; IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr); - if( (ulAttr & SFGAO_HIDDEN) /* hidden */ - | !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */ + if( (ulAttr & SFGAO_HIDDEN) || /* hidden */ + !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */ return S_FALSE; /* always include directories and links */

1 0

Andrew Talbot : user32: Fix a typo.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 1818d3a2080f798aaec318618228acbaafd5bea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1818d3a2080f798aaec318618… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 20:07:56 2007 +0000 user32: Fix a typo. --- dlls/user32/combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1709f28..b846618 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -774,7 +774,7 @@ static void CBPaintText( clipRegion=NULL; } - if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!IsWindowEnabled(lphc->self)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid;

1 0

Vitaliy Margolen : dinput: Fix dead zone handling.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 1ed3a815edc0edca2c077a1a2795414fca187cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed3a815edc0edca2c077a1a2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 25 11:17:28 2007 -0700 dinput: Fix dead zone handling. --- dlls/dinput/joystick_linuxinput.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 18417fb..13e413b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -88,23 +88,30 @@ DWORD joystick_map_pov(POINTL *p) /* * This maps the read value (from the input event) to a value in the * 'wanted' range. + * Notes: + * Dead zone is in % multiplied by a 100 (range 0..10000) */ LONG joystick_map_axis(ObjProps *props, int val) { LONG ret; - LONG center = (props->lMax - props->lMin) / 2; + LONG dead_zone = MulDiv( props->lDeadZone, props->lDevMax - props->lDevMin, 10000 ); + LONG dev_range = props->lDevMax - props->lDevMin - dead_zone; - /* map the value from the hmin-hmax range into the wmin-wmax range */ - ret = MulDiv( val - props->lDevMin, props->lMax - props->lMin, - props->lDevMax - props->lDevMin ); + /* Center input */ + val -= (props->lDevMin + props->lDevMax) / 2; - if (abs( ret - center ) <= props->lDeadZone / 2 ) - ret = center; + /* Remove dead zone */ + if (abs( val ) <= dead_zone / 2) + val = 0; + else + val = val < 0 ? val + dead_zone / 2 : val - dead_zone / 2; - ret += props->lMin; + /* Scale and map the value from the device range into the required range */ + ret = MulDiv( val, props->lMax - props->lMin, dev_range ) + + (props->lMin + props->lMax) / 2; - TRACE( "(%d %d) -> (%d <%d> %d): val=%d ret=%d\n", - props->lDevMin, props->lDevMax, + TRACE( "(%d <%d> %d) -> (%d <%d> %d): val=%d ret=%d\n", + props->lDevMin, dead_zone, props->lDevMax, props->lMin, props->lDeadZone, props->lMax, val, ret );

1 0

Rob Shearman : ole32: Fix a race in find_proxy_manager.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 6f917d49c1798eb7693c606c29fa1b65bce63171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f917d49c1798eb7693c606c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:08:23 2007 +0000 ole32: Fix a race in find_proxy_manager. --- dlls/ole32/marshal.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index fcfbd64..fde189a 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1097,10 +1097,15 @@ static BOOL find_proxy_manager(APARTMENT * apt, OXID oxid, OID oid, struct proxy struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); if ((oxid == proxy->oxid) && (oid == proxy->oid)) { - *proxy_found = proxy; - ClientIdentity_AddRef((IMultiQI *)&proxy->lpVtbl); - found = TRUE; - break; + /* be careful of a race with ClientIdentity_Release, which would + * cause us to return a proxy which is in the process of being + * destroyed */ + if (ClientIdentity_AddRef((IMultiQI *)&proxy->lpVtbl) != 0) + { + *proxy_found = proxy; + found = TRUE; + break; + } } } LeaveCriticalSection(&apt->cs);

1 0

daoo : Update CODING_STANDARDS
by Chris Morgan 25 Nov '07

25 Nov '07

Module: appdb Branch: master Commit: 3a3863ccd269ad1bd7c5131ec383d0af21a6b743 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3a3863ccd269ad1bd7c5131e… Author: daoo <daoo90(a)gmail.com> Date: Fri Nov 23 22:18:36 2007 +0100 Update CODING_STANDARDS --- CODING_STANDARD | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/CODING_STANDARD b/CODING_STANDARD index bba722d..d4fac23 100644 --- a/CODING_STANDARD +++ b/CODING_STANDARD @@ -97,3 +97,20 @@ function bar() 3) always put a single space after the comment mark 4) never use # for commenting as it will become obsolete in the future + +/** + * string quotes + */ +There are two different ways to quote strings in PHP - single quotes or double quotes. +The difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. +Because of this, always use single quotes unless the string contains a variable that needs to be parsed. + +Also if the string contains a variable put it inside double quotes instead of using 'bla' . $var . 'bla'; +To increase readability of the code. +Wrong: +$str = "This is a long string without any variables"; +$str = 'This string contains a variable ' . $var . ' enough said.'; + +Right: +$str = 'This is a long string without any variables'; +$str = "This string contains a variable $var enough said";

1 0

Alexander Nicolaysen Sørnes : Remove deleteAny.php
by Chris Morgan 24 Nov '07

24 Nov '07

Module: appdb Branch: master Commit: 30dc3d2b2c27b54d287db3b18dbc662863165324 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=30dc3d2b2c27b54d287db3b1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 24 02:30:25 2007 +0100 Remove deleteAny.php --- admin/deleteAny.php | 36 ------------------------------------ appbrowse.php | 1 - 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/admin/deleteAny.php b/admin/deleteAny.php deleted file mode 100644 index 2f146be..0000000 --- a/admin/deleteAny.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/****************************************************/ -/* code to delete versions, families and categories */ -/****************************************************/ - -/* - * application environment - */ -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/category.php"); -require_once(BASE."include/application.php"); -require_once(BASE."include/monitor.php"); -require_once(BASE."include/testData.php"); - -if($aClean['sConfirmed'] != "yes") -{ - // ask for confirmation - // could do some Real Damage if someone accidently hits the delete button on the main category :) - // - // perhaps we can do this with some javascript, popup - - util_show_error_page_and_exit("Not confirmed"); -} - -if(isset($aClean['sWhat']) && $aClean['sWhat'] == "category") -{ - // delete category and the apps in it - $oCategory = new Category($aClean['iCatId']); - if(!$oCategory->delete()) - util_show_error_page_and_exit(); - else - util_redirect_and_exit(BASE."appbrowse.php"); -} - -?> diff --git a/appbrowse.php b/appbrowse.php index b1e4401..e026e49 100644 --- a/appbrowse.php +++ b/appbrowse.php @@ -18,7 +18,6 @@ function admin_menu() $m = new htmlmenu("Admin"); $m->add('Edit this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=edit"); - $url = BASE."admin/deleteAny.php?sWhat=category&iCatId=".$aClean['iCatId']."&sConfirmed=yes"; /* We only allow deletion of the category if it is empty */ $oCat = new category($aClean['iCatId']);

1 0

Alexander Nicolaysen Sørnes : Fix category administration
by Chris Morgan 24 Nov '07

24 Nov '07

Module: appdb Branch: master Commit: 6ebd4cfa34bbacb681bb1c3ae2704d2136ccc554 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6ebd4cfa34bbacb681bb1c3a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 24 02:16:28 2007 +0100 Fix category administration --- admin/addCategory.php | 56 ----------------- appbrowse.php | 8 ++- include/category.php | 150 +++++++++++++++++++++++++++++++-------------- include/sidebar_admin.php | 2 +- include/user.php | 8 --- 5 files changed, 110 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=6ebd4cfa34bbacb681bb…

1 0

Alexandre Julliard : winex11.drv: Make sure to erase the dragging frame before moving the window.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: d4e1debee77eb02270e1cde78a3def94353318b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e1debee77eb02270e1cde78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 13:22:42 2007 +0100 winex11.drv: Make sure to erase the dragging frame before moving the window. --- dlls/winex11.drv/winpos.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e4ce6f5..c01f702 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1454,7 +1454,13 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) } } else if (moved && !DragFullWindows) + { draw_moving_frame( hdc, &sizingRect, thickframe ); + /* make sure the moving frame is erased before we move the window */ + wine_tsx11_lock(); + XFlush( gdi_display ); + wine_tsx11_unlock(); + } ReleaseDC( parent, hdc );

1 0

Alexandre Julliard : wsock32: Forward AcceptEx and GetAcceptExSockaddrs to mswsock.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 029a74e56e6d570e3a7e64b99bac886b41c51a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029a74e56e6d570e3a7e64b99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 13:23:04 2007 +0100 wsock32: Forward AcceptEx and GetAcceptExSockaddrs to mswsock. --- dlls/wsock32/Makefile.in | 2 +- dlls/wsock32/wsock32.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index 0fbb83f..46af82b 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wsock32.dll IMPORTLIB = libwsock32.$(IMPLIBEXT) -IMPORTS = ws2_32 iphlpapi kernel32 +IMPORTS = mswsock ws2_32 iphlpapi kernel32 C_SRCS = \ protocol.c \ diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 620abb1..3a4b32a 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -74,5 +74,5 @@ 1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) #1130 stub NPLoadNameSpaces 1140 stub TransmitFile -1141 stub AcceptEx -1142 stub GetAcceptExSockaddrs +1141 stdcall AcceptEx(long long ptr long long long ptr ptr) mswsock.AcceptEx +1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) mswsock.GetAcceptExSockaddrs

1 0