June 2008 - Wine-commits - list.winehq.org

Dylan Smith : wordpad: Fixed the font size validation for the toolbar' s combobox.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 6fab4754d7e09738aafdb9cb218f814ff3c0a71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fab4754d7e09738aafdb9cb2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:19:11 2008 -0400 wordpad: Fixed the font size validation for the toolbar's combobox. --- programs/wordpad/wordpad.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 04fc878..29dc755 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -219,20 +219,22 @@ static void set_caption(LPCWSTR wszNewFileName) static BOOL validate_endptr(LPCSTR endptr, BOOL units) { - if(!endptr || !*endptr) + if(!endptr) + return FALSE; + if(!*endptr) return TRUE; while(*endptr == ' ') endptr++; if(!units) - return *endptr != '\0'; + return *endptr == '\0'; /* FIXME: Allow other units and convert between them */ if(!lstrcmpA(endptr, units_cmA)) endptr += 2; - return *endptr != '\0'; + return *endptr == '\0'; } static BOOL number_from_string(LPCWSTR string, float *num, BOOL units) @@ -246,7 +248,7 @@ static BOOL number_from_string(LPCWSTR string, float *num, BOOL units) errno = 0; ret = strtod(buffer, &endptr); - if((ret == 0 && errno != 0) || endptr == buffer || validate_endptr(endptr, units)) + if((ret == 0 && errno != 0) || endptr == buffer || !validate_endptr(endptr, units)) { return FALSE; } else @@ -1795,7 +1797,8 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) if(lstrcmpW(sizeBuffer, (LPWSTR)endEdit->szText)) { float size = 0; - if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE)) + if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE) + && size > 0) { set_size(size); } else

1 0

Dylan Smith : wordpad: Added style to the richedit control to not hide selection.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 536edd7bfcd4c32087ac4558bbe20ed250df0184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536edd7bfcd4c32087ac4558b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 17 21:18:13 2008 -0400 wordpad: Added style to the richedit control to not hide selection. When run with the native richedit control the selection will be hidden when focus is lost without the ES_NOHIDESEL style applied to the richedit control. This can be annoying in native windows when focus is on a combobox in the toolbar, because it won't show what text will be changed. This patch adds the ES_NOHIDESEL style to be consistent with native wordpad. --- programs/wordpad/wordpad.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 92255fd..04fc878 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1682,7 +1682,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) } hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, - WS_CHILD|WS_VISIBLE|ECO_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL, + WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL + |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); if (!hEditorWnd)

1 0

John Klehm : winex11: Place tablet cursors in slots based on type.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 70cf762d31ac76c2b6b8cdd99eb33fb8a7856fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cf762d31ac76c2b6b8cdd99… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 16:48:19 2008 -0500 winex11: Place tablet cursors in slots based on type. --- dlls/winex11.drv/wintab.c | 159 ++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70cf762d31ac76c2b6b8c…

1 0

John Klehm : winex11: Always assign a tablet cursor type.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 97b2dcb62cd7ca5c15c19d1fcb0cc2c96ab2e5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b2dcb62cd7ca5c15c19d1fc… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 15:51:46 2008 -0500 winex11: Always assign a tablet cursor type. --- dlls/winex11.drv/wintab.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index be72a21..691b1bb 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -227,7 +227,11 @@ typedef struct tagWTI_DEVICES_INFO #define CSR_TYPE_ERASER 0x82a #define CSR_TYPE_MOUSE_2D 0x007 #define CSR_TYPE_MOUSE_4D 0x094 - +/* CSR_TYPE_OTHER is a special value! assumed no real world signifigance + * if a stylus type or eraser type eventually have this value + * it'll be a bug. As of 2008 05 21 we can be sure because + * linux wacom lists all the known values and this isn't one of them */ +#define CSR_TYPE_OTHER 0x000 typedef struct tagWTPACKET { HCTX pkContext; @@ -650,11 +654,14 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) cursor->NPBTNMARKS[0] = 0 ; cursor->NPBTNMARKS[1] = 1 ; cursor->CAPABILITIES = CRC_MULTIMODE; + + /* prefer finding TYPE_PEN(most capable) */ if (is_stylus(target->name, device_type)) cursor->TYPE = CSR_TYPE_PEN; - if (is_eraser(target->name, device_type)) + else if (is_eraser(target->name, device_type)) cursor->TYPE = CSR_TYPE_ERASER; - + else + cursor->TYPE = CSR_TYPE_OTHER; any = target->inputclassinfo;

1 0

John Klehm : winex11: Cursor iteration is now done by checking ACTIVE cursors.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 8d70da9fa95507e970dd5927e90d4eea98ca83d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d70da9fa95507e970dd5927e… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 16:16:23 2008 -0500 winex11: Cursor iteration is now done by checking ACTIVE cursors. --- dlls/winex11.drv/wintab.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 691b1bb..3165e58 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -307,7 +307,7 @@ static INT button_state[10]; static LOGCONTEXTW gSysContext; static WTI_DEVICES_INFO gSysDevice; static WTI_CURSORS_INFO gSysCursor[CURSORMAX]; -static INT gNumCursors; +static INT gNumCursors; /* do NOT use this to iterate through gSysCursor slots */ /* XInput stuff */ @@ -493,6 +493,18 @@ static BOOL is_eraser(const char *name, const char *type) return FALSE; } +static void disable_system_cursors(void) +{ + UINT i; + + for (i = 0; i < CURSORMAX; ++i) + { + gSysCursor[i].ACTIVE = 0; + } + + gNumCursors = 0; +} + /*********************************************************************** * X11DRV_LoadTabletInfo (X11DRV.@) @@ -552,6 +564,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; + /* initialize cursors */ + disable_system_cursors(); + /* Device Defaults */ gSysDevice.HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; gSysDevice.FIRSTCSR= 0; @@ -856,8 +871,8 @@ static void set_button_state(int curnum, XID deviceid) static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) { int i; - for (i = 0; i < gNumCursors; i++) - if (gSysCursor[i].PHYSID == deviceid) + for (i = 0; i < CURSORMAX; i++) + if (gSysCursor[i].ACTIVE && gSysCursor[i].PHYSID == deviceid) { *cursorp = &gSysCursor[i]; return i; @@ -997,11 +1012,13 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) devices = pXListInputDevices(data->display, &num_devices); X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); - for (cur_loop=0; cur_loop < gNumCursors; cur_loop++) + for (cur_loop=0; cur_loop < CURSORMAX; cur_loop++) { char cursorNameA[WT_MAX_NAME_LEN]; int event_number=0; + if (!gSysCursor[cur_loop].ACTIVE) continue; + /* the cursor name fits in the buffer because too long names are skipped */ WideCharToMultiByte(CP_UNIXCP, 0, gSysCursor[cur_loop].NAME, -1, cursorNameA, WT_MAX_NAME_LEN, NULL, NULL); for (loop=0; loop < num_devices; loop ++) @@ -1295,12 +1312,10 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) case WTI_CURSORS+7: case WTI_CURSORS+8: case WTI_CURSORS+9: - if (wCategory - WTI_CURSORS >= gNumCursors) - { + /* Apps will poll different slots to detect what cursors are available + * if there isn't a cursor for this slot return 0 */ + if (!gSysCursor[wCategory - WTI_CURSORS].ACTIVE) rc = 0; - WARN("Requested cursor information for nonexistent cursor %d; only %d cursors\n", - wCategory - WTI_CURSORS, gNumCursors); - } else { tgtcursor = &gSysCursor[wCategory - WTI_CURSORS];

1 0

John Klehm : winex11: Add comments explaining wintab cursor slotting, type, and clarify x11 config.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: a629ece6040699cd33bf6b65a704427f7b5a37d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a629ece6040699cd33bf6b65a… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Sat May 31 15:34:57 2008 -0500 winex11: Add comments explaining wintab cursor slotting, type, and clarify x11 config. --- dlls/winex11.drv/wintab.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 5eecd26..be72a21 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -212,8 +212,17 @@ typedef struct tagWTI_DEVICES_INFO * the type here. (This is unfortunate, the kernel module has * the exact type, but we have no way of getting that module to * pass us that type). + * + * Reference linuxwacom driver project wcmCommon.c function + * idtotype for a much larger list of CSR_TYPE. + * + * http://linuxwacom.cvs.sourceforge.net/linuxwacom/linuxwacom-prod/src/xdrv/w… + * + * The WTI_CURSORS_INFO.TYPE data is supposed to be used like this: + * (cursor.TYPE & 0x0F06) == target_cursor_type + * Reference: Section Unique ID + * http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html */ - #define CSR_TYPE_PEN 0x822 #define CSR_TYPE_ERASER 0x82a #define CSR_TYPE_MOUSE_2D 0x007 @@ -256,6 +265,39 @@ static WTPACKET gMsgPacket; static DWORD gSerial; static INT button_state[10]; +/* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html + * + * Cursors come in sets of 3 normally + * Cursor #0 = puck device 1 + * Cursor #1 = stylus device 1 + * Cursor #2 = eraser device 1 + * Cursor #3 = puck device 2 + * Cursor #4 = stylus device 2 + * Cursor #5 = eraser device 2 + * etc.... + * + * A dual tracking/multimode tablet is one + * that supports 2 independent cursors of the same or + * different types simultaneously on a single tablet. + * This makes our cursor layout potentially like this + * Cursor #0 = puck 1 device 1 + * Cursor #1 = stylus 1 device 1 + * Cursor #2 = eraser 1 device 1 + * Cursor #3 = puck 2 device 1 + * Cursor #4 = stylus 2 device 1 + * Cursor #5 = eraser 2 device 1 + * Cursor #6 = puck 1 device 2 + * etc..... + * + * So with multimode tablets we could potentially need + * 2 slots of the same type per tablet ie. + * you are usuing 2 styluses at once so they would + * get placed in Cursors #1 and Cursor #4 + * + * Now say someone has 2 multimode tablets with 2 erasers each + * now we would need Cursor #2, #5, #8, #11 + * So to support that we need CURSORMAX of 12 (0 to 11) + * FIXME: we dont support more than 4 regular tablets or 2 multimode tablets */ #define CURSORMAX 10 static LOGCONTEXTW gSysContext; @@ -386,6 +428,12 @@ BOOL match_token(const char *haystack, const char *needle) /* Determining if an X device is a Tablet style device is an imperfect science. ** We rely on common conventions around device names as well as the type reported ** by Wacom tablets. This code will likely need to be expanded for alternate tablet types +** +** Wintab refers to any device that interacts with the tablet as a cursor, +** (stylus, eraser, tablet mouse, airbrush, etc) +** this is not to be confused with wacom x11 configuration "cursor" device. +** Wacoms x11 config "cursor" refers to its device slot (which we mirror with +** our gSysCursors) for puck like devices (tablet mice essentially). */ static BOOL is_tablet_cursor(const char *name, const char *type)

1 0

Jon Griffiths : oleidl.h: Fix spelling of OLECONTF_ONLYUSER ( reported by Marcos Gutiérrez Batz).
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: c3995814d71291c435722ea36f46bcfa12c137c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3995814d71291c435722ea36… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Wed Jun 18 18:57:15 2008 -0700 oleidl.h: Fix spelling of OLECONTF_ONLYUSER (reported by Marcos Gutiérrez Batz). --- include/oleidl.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/oleidl.idl b/include/oleidl.idl index 169d83b..5c92cb1 100644 --- a/include/oleidl.idl +++ b/include/oleidl.idl @@ -333,7 +333,7 @@ interface IOleItemContainer : IOleContainer OLECONTF_EMBEDDINGS = 1, OLECONTF_LINKS = 2, OLECONTF_OTHERS = 4, - OLECONTF_OLNYUSER = 8, + OLECONTF_ONLYUSER = 8, OLECONTF_ONLYIFRUNNING = 16 } OLECONTF;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: fb44bc2106169ff4be10a368b6820d5ad1d942ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb44bc2106169ff4be10a368b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 21:52:05 2008 +0100 comctl32: Constify some variables. --- dlls/comctl32/header.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 5757f7a..af1923c 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,6 @@ static LRESULT HEADER_SendNotify(HWND hwnd, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(HWND hwnd, DWORD dwDrawStage, HDC hdc, const RECT *rect); static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; -static WCHAR emptyString[] = {0}; static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,11 +145,13 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - LPWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + static const WCHAR emptyString[] = {0}; + + LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else - Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)pszText); + Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)pszText); lpItem->callbackMask &= ~HDI_TEXT; } else

1 0

Jon Griffiths : oleaut32/tests: Fix invalid free (found by valgrind).
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: eb0566972ae7e00d97cb16fec80de889e6e1b505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0566972ae7e00d97cb16fec… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Wed Jun 18 18:27:04 2008 -0700 oleaut32/tests: Fix invalid free (found by valgrind). --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c2bc231..19e33bc 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5780,7 +5780,7 @@ static void test_ClearCustData(void) * its memory, while Wine uses HeapAlloc(). Doing this ensures we allocate * using the correct function whether with native or builtin. */ - ci.prgCustData = (LPCUSTDATAITEM)SysAllocStringByteLen((LPCSTR)buff, sizeof(buff)); + ci.prgCustData = (LPCUSTDATAITEM)Get(SysAllocStringByteLen((LPCSTR)buff, sizeof(buff))); for (i = 0; i < NUM_CUST_ITEMS; i++) VariantInit(&ci.prgCustData[i].varValue); pClearCustData(&ci);

1 0

Andrew Talbot : msxml3: Constify some variables.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 3aa36b53ca8b600217a83f9277d87df4c999275f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa36b53ca8b600217a83f927… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jun 19 22:51:51 2008 +0100 msxml3: Constify some variables. --- dlls/msxml3/domimpl.c | 8 ++++---- dlls/msxml3/pi.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index ec89fb4..b0b1cde 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -174,10 +174,10 @@ static HRESULT WINAPI dimimpl_Invoke( static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) { - static WCHAR bVersion[] = {'1','.','0',0}; - static WCHAR bXML[] = {'X','M','L',0}; - static WCHAR bDOM[] = {'D','O','M',0}; - static WCHAR bMSDOM[] = {'M','S','-','D','O','M',0}; + static const WCHAR bVersion[] = {'1','.','0',0}; + static const WCHAR bXML[] = {'X','M','L',0}; + static const WCHAR bDOM[] = {'D','O','M',0}; + static const WCHAR bMSDOM[] = {'M','S','-','D','O','M',0}; BOOL bValidFeature = FALSE; BOOL bValidVersion = FALSE; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index f04affb..a38f355 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -201,7 +201,7 @@ static HRESULT WINAPI dom_pi_put_nodeValue( { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); BSTR sTarget; - static WCHAR szXML[] = {'x','m','l',0}; + static const WCHAR szXML[] = {'x','m','l',0}; HRESULT hr; TRACE("%p\n", This ); @@ -526,7 +526,7 @@ static HRESULT WINAPI dom_pi_put_data( HRESULT hr = E_FAIL; VARIANT val; BSTR sTarget; - static WCHAR szXML[] = {'x','m','l',0}; + static const WCHAR szXML[] = {'x','m','l',0}; TRACE("%p %s\n", This, debugstr_w(data) );

1 0