January 2006 - Wine-commits

Steven Edwards : gdi: Move EMRSETTEXTJUSTIFICATION structure to the private gdi header.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 50690e5fa28a1f377f1535e9ecc035c35dc19c77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50690e5fa28a1f377f1535e… Author: Steven Edwards <winehacker(a)gmail.com> Date: Tue Jan 3 13:16:59 2006 +0100 gdi: Move EMRSETTEXTJUSTIFICATION structure to the private gdi header. --- dlls/gdi/gdi_private.h | 6 ++++++ include/wingdi.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index 26df293..7e06239 100644 --- a/dlls/gdi/gdi_private.h +++ b/dlls/gdi/gdi_private.h @@ -28,6 +28,12 @@ #define METAFILE_MEMORY 1 #define METAFILE_DISK 2 +typedef struct { + EMR emr; + INT nBreakExtra; + INT nBreakCount; +} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; + /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) diff --git a/include/wingdi.h b/include/wingdi.h index 032efbb..b4ea1b5 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2648,12 +2648,6 @@ typedef struct { BYTE Data[1]; } EMRGLSBOUNDEDRECORD, *PEMRGLSBOUNDEDRECORD; -typedef struct { - EMR emr; - INT nBreakExtra; - INT nBreakCount; -} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; - typedef INT (CALLBACK *ENHMFENUMPROC)(HDC, HANDLETABLE *, const ENHMETARECORD *, INT, LPARAM);

1 0

Alex Villacís Lasso : msacm32: Implement ACM_METRIC_DRIVER_PRIORITY in acmMetrics.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 63413b74800566eeccafa0257f6749d2879e26cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63413b74800566eeccafa02… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 3 13:16:12 2006 +0100 msacm32: Implement ACM_METRIC_DRIVER_PRIORITY in acmMetrics. --- dlls/msacm/msacm32_main.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c index 90a01e0..379539e 100644 --- a/dlls/msacm/msacm32_main.c +++ b/dlls/msacm/msacm32_main.c @@ -221,11 +221,24 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, FIXME("ACM_METRIC_COUNT_HARDWARE not implemented\n"); break; + case ACM_METRIC_DRIVER_PRIORITY: + /* Return current list position of driver */ + if (!hao) return MMSYSERR_INVALHANDLE; + if (!pMetric) return MMSYSERR_INVALPARAM; + mmr = MMSYSERR_INVALHANDLE; + for (i = 1, padid = MSACM_pFirstACMDriverID; padid; i++, padid = padid->pNextACMDriverID) { + if (padid == (PWINE_ACMDRIVERID)hao) { + *(LPDWORD)pMetric = i; + mmr = MMSYSERR_NOERROR; + break; + } + } + break; + case ACM_METRIC_HARDWARE_WAVE_INPUT: case ACM_METRIC_HARDWARE_WAVE_OUTPUT: case ACM_METRIC_MAX_SIZE_FILTER: case ACM_METRIC_DRIVER_SUPPORT: - case ACM_METRIC_DRIVER_PRIORITY: default: FIXME("(%p, %d, %p): stub\n", hao, uMetric, pMetric); mmr = MMSYSERR_NOTSUPPORTED;

1 0

Robert Reif : kernel: DelayLoadFailureHook crash fix.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 6501d7b155138f03d6e6247d6ab8e9b24713e5b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6501d7b155138f03d6e6247… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 3 13:15:55 2006 +0100 kernel: DelayLoadFailureHook crash fix. --- dlls/kernel/module.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index c26345d..4610adf 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -992,7 +992,10 @@ FARPROC WINAPI DelayLoadFailureHook( LPC { ULONG_PTR args[2]; - ERR( "failed to delay load %s.%s\n", name, function ); + if ((ULONG_PTR)function >> 16) + ERR( "failed to delay load %s.%s\n", name, function ); + else + ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); args[0] = (ULONG_PTR)name; args[1] = (ULONG_PTR)function; RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );

1 0

Alexandre Julliard : Added some flex options to avoid compiler warnings.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 0ae2c69c7a8368553156945d3475a3d97043a98f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ae2c69c7a8368553156945… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 12:16:05 2006 +0100 Added some flex options to avoid compiler warnings. Moved options from the Makefile into the source. --- libs/wpp/Makefile.in | 3 +-- libs/wpp/ppl.l | 6 ++++-- programs/winedbg/debug.l | 2 ++ programs/winhelp/macro.lex.l | 1 + tools/widl/Makefile.in | 3 +-- tools/widl/parser.l | 5 +++-- tools/wrc/Makefile.in | 3 +-- tools/wrc/parser.l | 3 ++- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 6250fb1..58a374c 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b MODULE = libwpp.a C_SRCS = \ @@ -29,7 +28,7 @@ ppy.tab.h: ppy.tab.c ppy.tab.o: ppy.tab.h @LEX_OUTPUT_ROOT(a).c: ppl.l - $(LEX) $(LEXOPT) -d -Ppp -o$@ -8 $(SRCDIR)/ppl.l + $(LEX) -o$@ $(SRCDIR)/ppl.l @LEX_OUTPUT_ROOT(a).o: ppy.tab.h diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index e08e84c..020f91f 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1,4 +1,4 @@ -/* +/* -*-C-*- * Wrc preprocessor lexical analysis * * Copyright 1999-2000 Bertho A. Stultiens (BS) @@ -125,7 +125,9 @@ * Special flex options and exclusive scanner start-conditions */ %option stack -%option never-interactive +%option 8bit never-interactive +%option nounput +%option prefix="pp" %x pp_pp %x pp_eol diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index cc3e6f8..c5aa044 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +%option nounput + %{ #include <stdlib.h> #include <string.h> diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index c35c5a6..b614821 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ %} +%option nounput %x quote %{ #include <assert.h> diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 6d52a59..6d10d19 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -2,7 +2,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b EXEEXT = @EXEEXT@ PROGRAMS = widl$(EXEEXT) @@ -39,7 +38,7 @@ parser.tab.h: parser.tab.c parser.tab.o: parser.tab.h @LEX_OUTPUT_ROOT(a).c: parser.l - $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l + $(LEX) $(SRCDIR)/parser.l @LEX_OUTPUT_ROOT(a).o: parser.tab.h diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 43ed190..4955bad 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -1,4 +1,4 @@ -/* +/* -*-C-*- * IDL Compiler * * Copyright 2002 Ove Kaaven @@ -19,7 +19,8 @@ */ %option stack -%option never-interactive +%option nounput noyy_top_state +%option 8bit never-interactive nl \r?\n ws [ \f\t\r] diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 49c913e..f482be4 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -3,7 +3,6 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -LEXOPT = -Cf #-w -b EXEEXT = @EXEEXT@ PROGRAMS = wrc$(EXEEXT) @@ -38,7 +37,7 @@ parser.tab.h: parser.tab.c parser.tab.o: parser.tab.h @LEX_OUTPUT_ROOT(a).c: parser.l - $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l + $(LEX) $(SRCDIR)/parser.l @LEX_OUTPUT_ROOT(a).o: parser.tab.h diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index d8abcad..cbdf9b6 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -87,7 +87,8 @@ %x pp_code_page %option stack -%option never-interactive +%option nounput noyy_top_state +%option 8bit never-interactive /* Some shortcut definitions */ ws [ \f\t\r]

1 0

Mike McCormack : msi: Subclass the Richedit control.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 00a7faa3777ccb18b81b47c14df427f4f616b4a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00a7faa3777ccb18b81b47c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 3 12:15:04 2006 +0100 msi: Subclass the Richedit control. Send a "DoAction" control event when the user scrolls the text. --- dlls/msi/dialog.c | 93 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 21 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ac10dc9..d7b3fdd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -59,7 +59,6 @@ struct msi_control_tag HBITMAP hBitmap; HICON hIcon; LPWSTR tabnext; - HMODULE hDll; WCHAR name[1]; }; @@ -329,7 +328,6 @@ static msi_control *msi_dialog_create_wi control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; - control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); x = MSI_RecordGetInteger( rec, 4 ); @@ -695,6 +693,42 @@ static UINT msi_dialog_line_control( msi return ERROR_SUCCESS; } +/******************** Scroll Text ********************************************/ + +struct msi_scrolltext_info +{ + msi_dialog *dialog; + msi_control *control; + WNDPROC oldproc; + HMODULE hRichedit; +}; + +static LRESULT WINAPI +MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + struct msi_scrolltext_info *info; + HRESULT r; + + TRACE("%p %04x %08x %08lx\n", hWnd, msg, wParam, lParam); + + info = GetPropW( hWnd, szButtonData ); + + r = CallWindowProcW( info->oldproc, hWnd, msg, wParam, lParam ); + + switch( msg ) + { + case WM_NCDESTROY: + FreeLibrary( info->hRichedit ); + msi_free( info ); + RemovePropW( hWnd, szButtonData ); + break; + case WM_VSCROLL: + msi_dialog_button_handler( info->dialog, info->control, BN_CLICKED ); + break; + } + return r; +} + struct msi_streamin_info { LPSTR string; @@ -718,40 +752,59 @@ msi_richedit_stream_in( DWORD_PTR arg, L return 0; } +static void msi_scrolltext_add_text( msi_control *control, LPCWSTR text ) +{ + struct msi_streamin_info info; + EDITSTREAM es; + + info.string = strdupWtoA( text ); + info.offset = 0; + info.length = lstrlenA( info.string ) + 1; + + es.dwCookie = (DWORD_PTR) &info; + es.dwError = 0; + es.pfnCallback = msi_richedit_stream_in; + + SendMessageW( control->hwnd, EM_STREAMIN, SF_RTF, (LPARAM) &es ); + + msi_free( info.string ); +} + static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) { static const WCHAR szRichEdit20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; - struct msi_streamin_info info; + struct msi_scrolltext_info *info; msi_control *control; - LPCWSTR text; - EDITSTREAM es; DWORD style; - HMODULE hRichedit; - hRichedit = LoadLibraryA("riched20"); + info = msi_alloc( sizeof *info ); + if (!info) + return ERROR_FUNCTION_FAILED; + + info->hRichedit = LoadLibraryA("riched20"); style = WS_BORDER | ES_MULTILINE | WS_VSCROLL | ES_READONLY | ES_AUTOVSCROLL | WS_TABSTOP; control = msi_dialog_add_control( dialog, rec, szRichEdit20W, style ); if (!control) + { + FreeLibrary( info->hRichedit ); + msi_free( info ); return ERROR_FUNCTION_FAILED; + } - control->hDll = hRichedit; - - text = MSI_RecordGetString( rec, 10 ); - info.string = strdupWtoA( text ); - info.offset = 0; - info.length = lstrlenA( info.string ) + 1; - - es.dwCookie = (DWORD_PTR) &info; - es.dwError = 0; - es.pfnCallback = msi_richedit_stream_in; + info->dialog = dialog; + info->control = control; - SendMessageW( control->hwnd, EM_STREAMIN, SF_RTF, (LPARAM) &es ); + /* subclass the static control */ + info->oldproc = (WNDPROC) SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, + (LONG_PTR)MSIScrollText_WndProc ); + SetPropW( control->hwnd, szButtonData, info ); - msi_free( info.string ); + /* add the text into the richedit */ + msi_scrolltext_add_text( control, MSI_RecordGetString( rec, 10 ) ); return ERROR_SUCCESS; } @@ -2144,8 +2197,6 @@ void msi_dialog_destroy( msi_dialog *dia DestroyIcon( t->hIcon ); msi_free( t->tabnext ); msi_free( t ); - if (t->hDll) - FreeLibrary( t->hDll ); } /* destroy the list of fonts */

1 0

Mike McCormack : MSI: Improve the MsiGetMode stub a little.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: a0f88f7a3ec981e394b6e989d58e2e077d0ea731 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0f88f7a3ec981e394b6e98… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 3 12:12:15 2006 +0100 MSI: Improve the MsiGetMode stub a little. --- dlls/msi/install.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b74d244..08b5f70 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -449,8 +449,31 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) { - FIXME("STUB (iRunMode=%i)\n",iRunMode); - return TRUE; + BOOL r = FALSE; + + switch (iRunMode) + { + case MSIRUNMODE_WINDOWS9X: + if (GetVersion() & 0x80000000) + r = TRUE; + break; + + case MSIRUNMODE_RESERVED11: + case MSIRUNMODE_RESERVED14: + case MSIRUNMODE_RESERVED15: + break; + + case MSIRUNMODE_SCHEDULED: + case MSIRUNMODE_ROLLBACK: + case MSIRUNMODE_COMMIT: + break; + + default: + FIXME("%ld %d\n", hInstall, iRunMode); + r = TRUE; + } + + return r; } /***********************************************************************

1 0

Mike McCormack : msi: Implement the Reset control event.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 188365e2f02fb7c1572aa21689d94eba46d60136 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=188365e2f02fb7c1572aa21… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 3 12:12:09 2006 +0100 msi: Implement the Reset control event. --- dlls/msi/dialog.c | 6 ++++++ dlls/msi/events.c | 8 ++++++++ dlls/msi/msipriv.h | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index c4f9d2c..ac10dc9 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1512,6 +1512,12 @@ static UINT msi_dialog_evaluate_control_ return r; } +UINT msi_dialog_reset( msi_dialog *dialog ) +{ + /* FIXME: should restore the original values of any properties we changed */ + return msi_dialog_evaluate_control_conditions( dialog ); +} + /* figure out the height of 10 point MS Sans Serif */ static INT msi_dialog_get_sans_serif_height( HWND hwnd ) { diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 08a85c6..393154a 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -243,6 +243,13 @@ static UINT ControlEvent_SetTargetPath(M return r; } +static UINT ControlEvent_Reset(MSIPACKAGE* package, LPCWSTR argument, + msi_dialog* dialog) +{ + msi_dialog_reset(dialog); + return ERROR_SUCCESS; +} + /* * Subscribed events */ @@ -371,6 +378,7 @@ struct _events Events[] = { { "Remove",ControlEvent_Remove }, { "AddSource",ControlEvent_AddSource }, { "SetTargetPath",ControlEvent_SetTargetPath }, + { "Reset",ControlEvent_Reset }, { NULL,NULL }, }; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7649d39..cb64897 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -414,6 +414,7 @@ extern void msi_dialog_destroy( msi_dial extern BOOL msi_dialog_register_class( void ); extern void msi_dialog_unregister_class( void ); extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * ); +extern UINT msi_dialog_reset( msi_dialog *dialog ); /* preview */ extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * );

1 0

Mike McCormack : oleaut32: Allow _invoke to handle up to 17 parameters.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 8193d97bfd3f98f2748659a2dd61af404cecbc79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8193d97bfd3f98f2748659a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 3 12:11:44 2006 +0100 oleaut32: Allow _invoke to handle up to 17 parameters. --- dlls/oleaut32/typelib.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a3e9e86..af26fc8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4890,6 +4890,15 @@ _invoke(FARPROC func,CALLCONV callconv, case 14: res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13]); break; + case 15: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14]); + break; + case 16: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15]); + break; + case 17: + res = func(args[0],args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8],args[9],args[10],args[11],args[12],args[13],args[14],args[15],args[16]); + break; default: FIXME("unsupported number of arguments %d in stdcall\n",nrargs); res = -1;

1 0

Robert Reif : dsound Add uninitialized check.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 88ff4321643cb74877d18424b37d833d347cde79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88ff4321643cb74877d1842… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 3 12:11:27 2006 +0100 dsound Add uninitialized check. --- dlls/dsound/dsound.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 0163f8a..02bf016 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -584,10 +584,16 @@ static HRESULT WINAPI IDirectSoundImpl_S IDirectSoundImpl *This = (IDirectSoundImpl *)iface; TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level)); + if (This->device == NULL) { + WARN("not initialized\n"); + return DSERR_UNINITIALIZED; + } + if (level==DSSCL_PRIORITY || level==DSSCL_EXCLUSIVE) { WARN("level=%s not fully supported\n", level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); } + This->device->priolevel = level; return DS_OK; }

1 0

Vitaliy Margolen : comctl32: Listview - allow selection toggle with ctrl+space.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: a8e59b1c52866af35244b226b9fe98648cb3e6af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8e59b1c52866af35244b22… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 3 12:11:18 2006 +0100 comctl32: Listview - allow selection toggle with ctrl+space. --- dlls/comctl32/listview.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3cb5137..4b95caf 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3173,6 +3173,7 @@ static BOOL LISTVIEW_KeySelection(LISTVI WORD wCtrl = HIWORD(GetKeyState(VK_CONTROL)); BOOL bResult = FALSE; + TRACE("nItem=%d, wShift=%d, wCtrl=%d\n", nItem, wShift, wCtrl); if ((nItem >= 0) && (nItem < infoPtr->nItemCount)) { if (infoPtr->dwStyle & LVS_SINGLESEL) @@ -3189,6 +3190,14 @@ static BOOL LISTVIEW_KeySelection(LISTVI } else if (wCtrl) { + LVITEMW lvItem; + lvItem.state = ~LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); + lvItem.stateMask = LVIS_SELECTED; + LISTVIEW_SetItemState(infoPtr, nItem, &lvItem); + + if (lvItem.state & LVIS_SELECTED) + infoPtr->nSelectionMark = nItem; + bResult = LISTVIEW_SetItemFocus(infoPtr, nItem); } else @@ -8016,6 +8025,10 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW switch (nVirtualKey) { + case VK_SPACE: + nItem = infoPtr->nFocusedItem; + break; + case VK_RETURN: if ((infoPtr->nItemCount > 0) && (infoPtr->nFocusedItem != -1)) { @@ -8082,7 +8095,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW break; } - if ((nItem != -1) && (nItem != infoPtr->nFocusedItem)) + if ((nItem != -1) && (nItem != infoPtr->nFocusedItem || nVirtualKey == VK_SPACE)) LISTVIEW_KeySelection(infoPtr, nItem); return 0;

1 0