January 2011 - Wine-commits

Joel Holdsworth : comctl32/rebar: Moved drag notify code into REBAR_MouseMove.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 53284d2a18e49d9fea9e6db47378918498155e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53284d2a18e49d9fea9e6db47… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:15 2011 +0000 comctl32/rebar: Moved drag notify code into REBAR_MouseMove. --- dlls/comctl32/rebar.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 5ab55d4..6549638 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2044,20 +2044,6 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) INT movement, xBand, cxLeft = 0; BOOL shrunkBands = FALSE; - /* on first significant mouse movement, issue notify */ - if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { - if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) { - /* Notify returned TRUE - abort drag */ - infoPtr->dragStart.x = 0; - infoPtr->dragStart.y = 0; - infoPtr->dragNow = infoPtr->dragStart; - infoPtr->iGrabbedBand = -1; - ReleaseCapture (); - return ; - } - infoPtr->fStatus |= BEGIN_DRAG_ISSUED; - } - iHitBand = infoPtr->iGrabbedBand; iRowBegin = get_row_begin_for_band(infoPtr, iHitBand); iRowEnd = get_row_end_for_band(infoPtr, iHitBand); @@ -3095,6 +3081,20 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) if ((abs(ptMove.x - infoPtr->dragNow.x) <= mindragx) && (abs(ptMove.y - infoPtr->dragNow.y) <= mindragy)) return 0; + /* on first significant mouse movement, issue notify */ + if (!(infoPtr->fStatus & BEGIN_DRAG_ISSUED)) { + if (REBAR_Notify_NMREBAR (infoPtr, -1, RBN_BEGINDRAG)) { + /* Notify returned TRUE - abort drag */ + infoPtr->dragStart.x = 0; + infoPtr->dragStart.y = 0; + infoPtr->dragNow = infoPtr->dragStart; + infoPtr->iGrabbedBand = -1; + ReleaseCapture (); + return 0; + } + infoPtr->fStatus |= BEGIN_DRAG_ISSUED; + } + /* Test for valid drag case - must not be first band in row */ if ((yPtMove < band->rcBand.top) || (yPtMove > band->rcBand.bottom)) {

1 0

Joel Holdsworth : comctl32/rebar: Implemented dragging between rows.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 90a8e3f37f1ca1778cdb415d5809c0ccc3f76993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a8e3f37f1ca1778cdb415d5… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Jan 9 09:40:23 2011 +0000 comctl32/rebar: Implemented dragging between rows. --- dlls/comctl32/rebar.c | 96 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 87 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6549638..8e9c38b 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1264,18 +1264,33 @@ static int REBAR_ShrinkBandsLTR(const REBAR_INFO *infoPtr, INT iBeginBand, INT i /* Tries to move a band to a given offset within a row. */ static int REBAR_MoveBandToRowOffset(REBAR_INFO *infoPtr, INT iBand, INT iFirstBand, - INT iLastBand, INT xOff) + INT iLastBand, INT xOff, BOOL reorder) { REBAR_BAND *insertBand = REBAR_GetBand(infoPtr, iBand); int xPos = 0, i; const BOOL setBreak = REBAR_GetBand(infoPtr, iFirstBand)->fStyle & RBBS_BREAK; /* Find the band's new position */ - for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + if(reorder) { - if(xPos > xOff) - break; - xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + /* Used during an LR band reorder drag */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + if(xPos > xOff) + break; + xPos += REBAR_GetBand(infoPtr, i)->cxEffective + SEP_WIDTH; + } + } + else + { + /* Used during a UD band insertion drag */ + for (i = iFirstBand; i < iLastBand; i = next_visible(infoPtr, i)) + { + const REBAR_BAND *band = REBAR_GetBand(infoPtr, i); + if(xPos + band->cxMinBand / 2 > xOff) + break; + xPos += band->cxEffective + SEP_WIDTH; + } } /* Move the band to its new position */ @@ -2036,8 +2051,6 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) /* Gripper drag within a row. It will not implement "out- */ /* of-row" drags. (They are detected and handled in */ /* REBAR_MouseMove.) */ - /* **** FIXME Switching order of bands in a row not **** */ - /* **** yet implemented. **** */ { REBAR_BAND *hitBand; INT iHitBand, iRowBegin, iRowEnd; @@ -2088,7 +2101,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) /* It was not possible to move the band by shrinking bands. * Try relocating the band instead. */ REBAR_MoveBandToRowOffset(infoPtr, iHitBand, iRowBegin, - iRowEnd, xBand + movement); + iRowEnd, xBand + movement, TRUE); } REBAR_SetRowRectsX(infoPtr, iRowBegin, iRowEnd); @@ -2099,6 +2112,71 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) REBAR_MoveChildWindows(infoPtr, iRowBegin, iRowEnd); } +static void +REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) +{ + INT yOff = (infoPtr->dwStyle & CCS_VERT) ? ptsmove->x : ptsmove->y; + INT iHitBand, iRowBegin, iNextRowBegin; + REBAR_BAND *hitBand, *rowBeginBand; + + if(infoPtr->uNumBands <= 0) + ERR("There are no bands in this rebar"); + + /* Up/down dragging can only occur when there is more than one + * band in the rebar */ + if(infoPtr->uNumBands <= 1) + return; + + iHitBand = infoPtr->iGrabbedBand; + hitBand = REBAR_GetBand(infoPtr, iHitBand); + + /* If we're taking a band that has the RBBS_BREAK style set, this + * style needs to be reapplied to the band that is going to become + * the new start of the row. */ + if((hitBand->fStyle & RBBS_BREAK) && + (iHitBand < infoPtr->uNumBands - 1)) + REBAR_GetBand(infoPtr, iHitBand + 1)->fStyle |= RBBS_BREAK; + + if(yOff < 0) + { + /* Place the band above the current top row */ + DPA_DeletePtr(infoPtr->bands, iHitBand); + hitBand->fStyle &= RBBS_BREAK; + REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK; + infoPtr->iGrabbedBand = DPA_InsertPtr( + infoPtr->bands, 0, hitBand); + } + else if(yOff > REBAR_GetBand(infoPtr, infoPtr->uNumBands - 1)->rcBand.bottom) + { + /* Place the band below the current bottom row */ + DPA_DeletePtr(infoPtr->bands, iHitBand); + hitBand->fStyle |= RBBS_BREAK; + infoPtr->iGrabbedBand = DPA_InsertPtr( + infoPtr->bands, infoPtr->uNumBands - 1, hitBand); + } + else + { + /* Place the band in the prexisting row the mouse is hovering over */ + iRowBegin = first_visible(infoPtr); + while(iRowBegin < infoPtr->uNumBands) + { + iNextRowBegin = get_row_end_for_band(infoPtr, iRowBegin); + rowBeginBand = REBAR_GetBand(infoPtr, iRowBegin); + if(rowBeginBand->rcBand.bottom > yOff) + { + REBAR_MoveBandToRowOffset( + infoPtr, iHitBand, iRowBegin, iNextRowBegin, + ((infoPtr->dwStyle & CCS_VERT) ? ptsmove->y : ptsmove->x) + - REBAR_PRE_GRIPPER - infoPtr->ihitoffset, FALSE); + break; + } + + iRowBegin = iNextRowBegin; + } + } + + REBAR_Layout(infoPtr); +} /* << REBAR_BeginDrag >> */ @@ -3098,7 +3176,7 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) /* Test for valid drag case - must not be first band in row */ if ((yPtMove < band->rcBand.top) || (yPtMove > band->rcBand.bottom)) { - FIXME("Cannot drag to other rows yet!!\n"); + REBAR_HandleUDDrag (infoPtr, &ptMove); } else { REBAR_HandleLRDrag (infoPtr, &ptMove);

1 0

Alexandre Julliard : comctl32/imagelist: Don' t change destination size in ImageList_Duplicate without corresponding allocation .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: cca319d5943ca01a564335473a9ac3ee949d342d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca319d5943ca01a564335473… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 11:16:23 2011 +0100 comctl32/imagelist: Don't change destination size in ImageList_Duplicate without corresponding allocation. --- dlls/comctl32/imagelist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 2e1581e..ed92a52 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1521,7 +1521,6 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - himlDst->cMaxImage = himlSrc->cMaxImage; if (himlSrc->has_alpha && himlDst->has_alpha) memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); }

1 0

Eric Pouech : winedump: Added support for dumping FPO streams.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 982775ddae84dcb6fa92683703dca23664eb4722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982775ddae84dcb6fa9268370… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 8 14:03:52 2011 +0100 winedump: Added support for dumping FPO streams. --- include/wine/mscvpdb.h | 16 +++++++++++ tools/winedump/pdb.c | 66 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 2d5b9c9..59ce8a5 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1917,6 +1917,22 @@ typedef struct _PDB_SYMBOLS DWORD resvd[5]; } PDB_SYMBOLS, *PPDB_SYMBOLS; +typedef struct _PDB_FPO_DATA +{ + DWORD start; + DWORD func_size; + DWORD locals_size; + DWORD params_size; + DWORD maxstack_size; + DWORD str_offset; + WORD prolog_size; + WORD savedregs_size; +#define PDB_FPO_DFL_SEH 0x00000001 +#define PDB_FPO_DFL_EH 0x00000002 +#define PDB_FPO_DFL_IN_BLOCK 0x00000004 + DWORD flags; +} PDB_FPO_DATA; + #include "poppack.h" /* ---------------------------------------------- diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 5098d85..89146d5 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -508,6 +508,59 @@ static void pdb_dump_types(struct pdb_reader* reader) free(types); } +static void pdb_dump_fpo(struct pdb_reader* reader) +{ + FPO_DATA* fpo; + PDB_FPO_DATA* fpoext; + unsigned i, size, strsize; + char* strbase; + const char* frame_type[4] = {"Fpo", "Trap", "Tss", "NonFpo"}; + + fpo = reader->read_file(reader, 5); + size = pdb_get_file_size(reader, 5); + if (fpo && (size % sizeof(*fpo)) == 0) + { + size /= sizeof(*fpo); + printf("FPO data:\n\t Start Length #loc #pmt #prolog #reg frame SEH /BP\n"); + for (i = 0; i < size; i++) + { + printf("\t%08x %08x %4d %4d %7d %4d %6s %c %c\n", + fpo[i].ulOffStart, fpo[i].cbProcSize, fpo[i].cdwLocals, fpo[i].cdwParams, + fpo[i].cbProlog, fpo[i].cbRegs, frame_type[fpo[i].cbFrame], + fpo[i].fHasSEH ? 'Y' : 'N', fpo[i].fUseBP ? 'Y' : 'N'); + } + } + free(fpo); + + strbase = reader->read_file(reader, 12); /* FIXME: really fixed ??? */ + if (!strbase) return; + + if (*(const DWORD*)strbase != 0xeffeeffe) + { + printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)strbase); + free(strbase); + return; + } + strsize = *(const DWORD*)(strbase + 8); + fpoext = reader->read_file(reader, 10); + size = pdb_get_file_size(reader, 10); + if (fpoext && (size % sizeof(*fpoext)) == 0) + { + size /= sizeof(*fpoext); + printf("FPO data (extended):\n" + "\t Start Length Locals Params MaxStack Prolog #SavedRegs Flags Command\n"); + for (i = 0; i < size; i++) + { + printf("\t%08x %08x %8x %8x %8x %6x %8x %08x %s\n", + fpoext[i].start, fpoext[i].func_size, fpoext[i].locals_size, fpoext[i].params_size, + fpoext[i].maxstack_size, fpoext[i].prolog_size, fpoext[i].savedregs_size, fpoext[i].flags, + fpoext[i].str_offset < strsize ? strbase + 12 + fpoext[i].str_offset : "<out of bounds>"); + } + } + free(fpoext); + free(strbase); +} + static const char pdb2[] = "Microsoft C/C++ program database 2.00"; static void pdb_jg_dump(void) @@ -662,10 +715,14 @@ static void pdb_ds_dump(void) reader.u.ds.header->toc_page); /* files: - * 0: JG says old toc pages, I'd say free pages (tbc, low prio) - * 1: root structure - * 2: types - * 3: modules + * 0: JG says old toc pages, I'd say free pages (tbc, low prio) + * 1: root structure + * 2: types + * 3: modules + * 5: FPO data + * 8: segments + * 10: extended FPO data + * 12: string table (FPO unwinder, files for linetab2...) */ root = reader.read_file(&reader, 1); if (root) @@ -692,6 +749,7 @@ static void pdb_ds_dump(void) pdb_dump_types(&reader); pdb_dump_symbols(&reader); + pdb_dump_fpo(&reader); pdb_exit(&reader); }

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in Linux joystick .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: a1b08e5d049aeeeb440cff0915827227bb6f4c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b08e5d049aeeeb440cff091… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:41 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in Linux joystick. --- dlls/dinput/joystick_linux.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1eb71ff..fb13722 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -99,6 +99,15 @@ struct JoystickImpl POINTL povs[4]; }; +static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (JoystickImpl *) iface; +} +static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (JoystickImpl *) iface; +} + static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed9, 0x7734, @@ -495,7 +504,7 @@ const struct dinput_device joystick_linux_device = { */ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; TRACE("(%p)\n",This); @@ -524,7 +533,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) */ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; TRACE("(%p)\n",This); @@ -548,7 +557,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; struct js_event jse; - JoystickImpl *This = (JoystickImpl*) iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p)\n", This);

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in linuxinput joystick .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: f09ace0d8357d9a6d4541dd0c5a04b2b24525182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09ace0d8357d9a6d4541dd0c… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:45 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in linuxinput joystick. --- dlls/dinput/joystick_linuxinput.c | 43 ++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e571a65..e036cf2 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -133,6 +133,15 @@ struct JoystickImpl int ff_gain; }; +static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (JoystickImpl *) iface; +} +static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (JoystickImpl *) iface; +} + static void fake_current_js_state(JoystickImpl *ji); static void find_joydevs(void); static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); @@ -615,7 +624,7 @@ const struct dinput_device joystick_linuxinput_device = { */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; TRACE("(this=%p)\n",This); @@ -668,7 +677,7 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) */ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; TRACE("(this=%p)\n",This); @@ -735,7 +744,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; struct input_event ie; - JoystickImpl *This = (JoystickImpl*) iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); if (This->joyfd==-1) return; @@ -836,7 +845,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); if (!ph) { WARN("invalid argument\n"); @@ -893,7 +902,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -939,7 +948,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface, HRESULT retval = DI_OK; #endif - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p,%p,%p,%p)\n", This, rguid, lpeff, ppdef, pUnkOuter); #ifndef HAVE_STRUCT_FF_EFFECT_DIRECTION @@ -991,7 +1000,7 @@ static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface, #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION DIEFFECTINFOA dei; /* feif */ DWORD type = DIEFT_GETTYPE(dwEffType); - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p,%d) type=%d\n", This, pvRef, dwEffType, type); @@ -1067,7 +1076,7 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface, * are actually different (A/W) */ DIEFFECTINFOW dei; /* feif */ DWORD type = DIEFT_GETTYPE(dwEffType); - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8W(iface); int xfd = This->joyfd; TRACE("(this=%p,%p,%d) type=%d fd=%d\n", This, pvRef, dwEffType, type, xfd); @@ -1144,7 +1153,7 @@ static HRESULT WINAPI JoystickAImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8A iface, LPDIEFFECTINFOA pdei, REFGUID guid) { - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p,%s)\n", This, pdei, _dump_dinput_GUID(guid)); @@ -1159,10 +1168,10 @@ static HRESULT WINAPI JoystickWImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIEFFECTINFOW pdei, REFGUID guid) { - JoystickImpl* This = (JoystickImpl*)iface; - + JoystickImpl* This = impl_from_IDirectInputDevice8W(iface); + TRACE("(this=%p,%p,%s)\n", This, pdei, _dump_dinput_GUID(guid)); - + #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION return linuxinput_get_info_W(This->joyfd, guid, pdei); #else @@ -1177,7 +1186,7 @@ static HRESULT WINAPI JoystickAImpl_GetForceFeedbackState( LPDIRECTINPUTDEVICE8A iface, LPDWORD pdwOut) { - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdwOut); @@ -1199,7 +1208,7 @@ static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand( LPDIRECTINPUTDEVICE8A iface, DWORD dwFlags) { - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%d)\n", This, dwFlags); #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION @@ -1256,7 +1265,7 @@ static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects( DWORD dwFlags) { /* this function is safe to call on non-ff-enabled builds */ - JoystickImpl* This = (JoystickImpl*)iface; + JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); effect_list_item *itr, *ptr; TRACE("(this=%p,%p,%p,%d)\n", This, lpCallback, pvRef, dwFlags); @@ -1279,7 +1288,7 @@ static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects( static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p) %p\n", This, pdidi); @@ -1296,7 +1305,7 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) { - JoystickImpl *This = (JoystickImpl *)iface; + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %p\n", This, pdidi);

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in OS/ X joystick.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 399be3455aefb714864f3f519642df4049f287ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=399be3455aefb714864f3f519… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:48 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in OS/X joystick. --- dlls/dinput/joystick_osx.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 7daccd4..dc15db8 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -135,6 +135,15 @@ struct JoystickImpl ObjProps **propmap; }; +static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (JoystickImpl *) iface; +} +static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (JoystickImpl *) iface; +} + static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */ 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} }; @@ -519,7 +528,7 @@ static void get_osx_device_elements_props(JoystickImpl *device) static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *device = (JoystickImpl*)iface; + JoystickImpl *device = impl_from_IDirectInputDevice8A(iface); IOHIDElementRef tIOHIDTopElementRef; IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef;

1 0

Vitaliy Margolen : dinput: Change internal check_dinput_hooks method to take W iface.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 9594be7f79046fdb10035348f973f90002f08979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9594be7f79046fdb10035348f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:52 2011 -0700 dinput: Change internal check_dinput_hooks method to take W iface. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 12846bf..770a2c9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -590,7 +590,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) if (res == DI_OK) { This->queue_head = This->queue_tail = This->overflow = 0; - check_dinput_hooks(iface); + check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); } LeaveCriticalSection(&This->crit); @@ -610,7 +610,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; if (res == DI_OK) - check_dinput_hooks(iface); + check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); LeaveCriticalSection(&This->crit); return res; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 646a4f8..14f7ca8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1093,7 +1093,7 @@ static BOOL check_hook_thread(void) return hook_thread_id != 0; } -void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface) +void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) { static HHOOK callwndproc_hook; static ULONG foreground_cnt; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index b2b4c00..73f3049 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; extern const struct dinput_device joystick_osx_device; -extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); +extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W); typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA);

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in DirectInputDevice base class . Make ASCII methods call Unicode. Use new methods in child classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0f24b9e86fd51d9c6c8b39f4144947c0e8bd2d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f24b9e86fd51d9c6c8b39f41… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:55 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in DirectInputDevice base class. Make ASCII methods call Unicode. Use new methods in child classes. --- dlls/dinput/device.c | 262 +++++++++++++++++++++++++------------ dlls/dinput/device_private.h | 96 +++++++------- dlls/dinput/joystick_linux.c | 50 ++++---- dlls/dinput/joystick_linuxinput.c | 42 +++--- dlls/dinput/joystick_osx.c | 32 +++--- dlls/dinput/keyboard.c | 58 ++++---- dlls/dinput/mouse.c | 30 ++-- 7 files changed, 333 insertions(+), 237 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f24b9e86fd51d9c6c8b3…

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in keyboard.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 9f9e376239731c859bd7f20e5bcee35ab81b6ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9e376239731c859bd7f20e5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:58 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in keyboard. --- dlls/dinput/keyboard.c | 131 +++++++++++++++++++++++++++--------------------- 1 files changed, 74 insertions(+), 57 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 68d8b47..bdb7a83 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -58,6 +58,14 @@ static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice { return (SysKeyboardImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysKeyboardImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) { @@ -302,11 +310,9 @@ const struct dinput_device keyboard_device = { keyboarddev_create_deviceW }; -static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( - LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr -) +static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p)->(%d,%p)\n", This, len, ptr); if (!This->base.acquired) return DIERR_NOTACQUIRED; @@ -330,14 +336,18 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); +} + /****************************************************************************** * GetCapabilities : get the device capabilities */ -static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVCAPS lpDIDevCaps) +static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -346,7 +356,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( WARN("invalid parameter\n"); return DIERR_INVALIDPARAM; } - + devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED; if (This->base.dinput->dwVersion >= 0x0800) @@ -363,10 +373,16 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( devcaps.dwFFDriverVersion = 0; memcpy(lpDIDevCaps, &devcaps, lpDIDevCaps->dwSize); - + return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -450,9 +466,11 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface /****************************************************************************** * GetProperty : Retrieves information about the input device. */ -static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, LPDIPROPHEADER pdiph) +static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, + REFGUID rguid, LPDIPROPHEADER pdiph) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -471,72 +489,72 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, didoi.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW); - hr = SysKeyboardWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface , &didoi, - ps->diph.dwObj, ps->diph.dwHow); + hr = SysKeyboardWImpl_GetObjectInfo(iface, &didoi, ps->diph.dwObj, ps->diph.dwHow); if (hr == DI_OK) memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } default: - return IDirectInputDevice2AImpl_GetProperty( iface, rguid, pdiph ); + return IDirectInputDevice2AImpl_GetProperty( IDirectInputDevice8A_from_impl(This), rguid, pdiph ); } return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, + REFGUID rguid, LPDIPROPHEADER pdiph) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + static const IDirectInputDevice8AVtbl SysKeyboardAvt = { - IDirectInputDevice2AImpl_QueryInterface, - IDirectInputDevice2AImpl_AddRef, - IDirectInputDevice2AImpl_Release, - SysKeyboardAImpl_GetCapabilities, - IDirectInputDevice2AImpl_EnumObjects, - SysKeyboardAImpl_GetProperty, - IDirectInputDevice2AImpl_SetProperty, - IDirectInputDevice2AImpl_Acquire, - IDirectInputDevice2AImpl_Unacquire, - SysKeyboardAImpl_GetDeviceState, - IDirectInputDevice2AImpl_GetDeviceData, - IDirectInputDevice2AImpl_SetDataFormat, - IDirectInputDevice2AImpl_SetEventNotification, - IDirectInputDevice2AImpl_SetCooperativeLevel, - SysKeyboardAImpl_GetObjectInfo, - SysKeyboardAImpl_GetDeviceInfo, - IDirectInputDevice2AImpl_RunControlPanel, - IDirectInputDevice2AImpl_Initialize, - IDirectInputDevice2AImpl_CreateEffect, - IDirectInputDevice2AImpl_EnumEffects, - IDirectInputDevice2AImpl_GetEffectInfo, - IDirectInputDevice2AImpl_GetForceFeedbackState, - IDirectInputDevice2AImpl_SendForceFeedbackCommand, - IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - IDirectInputDevice2AImpl_Escape, - IDirectInputDevice2AImpl_Poll, - IDirectInputDevice2AImpl_SendDeviceData, - IDirectInputDevice7AImpl_EnumEffectsInFile, - IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, - IDirectInputDevice8AImpl_GetImageInfo + IDirectInputDevice2AImpl_QueryInterface, + IDirectInputDevice2AImpl_AddRef, + IDirectInputDevice2AImpl_Release, + SysKeyboardAImpl_GetCapabilities, + IDirectInputDevice2AImpl_EnumObjects, + SysKeyboardAImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, + SysKeyboardAImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceData, + IDirectInputDevice2AImpl_SetDataFormat, + IDirectInputDevice2AImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetCooperativeLevel, + SysKeyboardAImpl_GetObjectInfo, + SysKeyboardAImpl_GetDeviceInfo, + IDirectInputDevice2AImpl_RunControlPanel, + IDirectInputDevice2AImpl_Initialize, + IDirectInputDevice2AImpl_CreateEffect, + IDirectInputDevice2AImpl_EnumEffects, + IDirectInputDevice2AImpl_GetEffectInfo, + IDirectInputDevice2AImpl_GetForceFeedbackState, + IDirectInputDevice2AImpl_SendForceFeedbackCommand, + IDirectInputDevice2AImpl_EnumCreatedEffectObjects, + IDirectInputDevice2AImpl_Escape, + IDirectInputDevice2AImpl_Poll, + IDirectInputDevice2AImpl_SendDeviceData, + IDirectInputDevice7AImpl_EnumEffectsInFile, + IDirectInputDevice7AImpl_WriteEffectToFile, + IDirectInputDevice8AImpl_BuildActionMap, + IDirectInputDevice8AImpl_SetActionMap, + IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysKeyboardWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl SysKeyboardWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, IDirectInputDevice2WImpl_Release, - XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, + SysKeyboardWImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - XCAST(GetProperty)SysKeyboardAImpl_GetProperty, + SysKeyboardWImpl_GetProperty, IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, - XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState, + SysKeyboardWImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, @@ -560,4 +578,3 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST

1 0