September 2011 - Wine-commits

Alexandre Julliard : winex11: Get rid of the SetDIBitsToDevice implementation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 3a260497be246f93c8b2891dba9c6fcee4ad5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a260497be246f93c8b2891db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 14:44:11 2011 +0200 winex11: Get rid of the SetDIBitsToDevice implementation. --- dlls/gdi32/tests/bitmap.c | 16 ++++- dlls/winex11.drv/dib.c | 135 --------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 - 4 files changed, 14 insertions(+), 141 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a2dbfd9..a66113c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -929,7 +929,12 @@ static void test_dib_formats(void) "SetDIBits succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); if (expect_ok) - ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + { + if (todo) + todo_wine ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + else + ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + } else ok( !ret || broken((bpp == 4 && compr == BI_RLE4) || (bpp == 8 && compr == BI_RLE8)), /* nt4 */ @@ -978,7 +983,12 @@ static void test_dib_formats(void) ok( !ret, "SetDIBits succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); if (expect_ok) - ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + { + if (todo) + todo_wine ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + else + ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + } else ok( !ret, "SetDIBitsToDevice succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); @@ -1023,7 +1033,7 @@ static void test_dib_formats(void) ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" ); DeleteObject( hdib ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); - ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); + todo_wine ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index ba58f57..df68c2e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3713,141 +3713,6 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) return lines; } -/************************************************************************* - * X11DRV_SetDIBitsToDevice - * - */ -INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, - INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, - BITMAPINFO *info, UINT coloruse ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - X11DRV_DIB_IMAGEBITS_DESCR descr; - INT result; - LONG height; - BOOL top_down; - POINT pt; - int rop = X11DRV_XROPfunction[GetROP2(dev->hdc) - 1]; - - top_down = (info->bmiHeader.biHeight < 0); - height = abs( info->bmiHeader.biHeight ); - descr.infoBpp = info->bmiHeader.biBitCount; - descr.compression = info->bmiHeader.biCompression; - - pt.x = xDest; - pt.y = yDest; - LPtoDP(dev->hdc, &pt, 1); - if (GetLayout( dev->hdc ) & LAYOUT_RTL) pt.x -= cx - 1; - - if (!lines || (startscan >= height)) return 0; - if (!top_down && startscan + lines > height) lines = height - startscan; - - /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, - * and clamp all values to fit inside [startscan,startscan+lines] - */ - if (ySrc + cy <= startscan + lines) - { - UINT y = startscan + lines - (ySrc + cy); - if (ySrc < startscan) cy -= (startscan - ySrc); - if (!top_down) - { - /* avoid getting unnecessary lines */ - ySrc = 0; - if (y >= lines) return 0; - lines -= y; - } - else - { - if (y >= lines) return lines; - ySrc = y; /* need to get all lines in top down mode */ - } - } - else - { - if (ySrc >= startscan + lines) return 0; - pt.y += ySrc + cy - (startscan + lines); - cy = startscan + lines - ySrc; - ySrc = 0; - if (cy > lines) cy = lines; - } - if (xSrc >= info->bmiHeader.biWidth) return lines; - if (xSrc + cx <= 0) return lines; - if (xSrc + cx >= info->bmiHeader.biWidth) cx = info->bmiHeader.biWidth - xSrc; - if (xSrc < 0) - { - pt.x -= xSrc; - cx += xSrc; - xSrc = 0; - } - if (!cx || !cy) return lines; - - /* Update the pixmap from the DIB section */ - X11DRV_LockDIBSection(physDev, DIB_Status_GdiMod); - - X11DRV_SetupGCForText( physDev ); /* To have the correct colors */ - wine_tsx11_lock(); - XSetFunction(gdi_display, physDev->gc, rop); - wine_tsx11_unlock(); - - switch (descr.infoBpp) - { - case 1: - case 4: - case 8: - descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( - physDev, coloruse, - physDev->depth, info, &descr.nColorMap ); - if (!descr.colorMap) return 0; - descr.rMask = descr.gMask = descr.bMask = 0; - break; - case 15: - case 16: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0x7c00; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x03e0; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x001f; - descr.colorMap = 0; - break; - - case 24: - case 32: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0xff0000; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x00ff00; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x0000ff; - descr.colorMap = 0; - break; - } - - descr.physDev = physDev; - descr.bits = bits; - descr.image = NULL; - descr.palentry = NULL; - descr.lines = top_down ? -lines : lines; - descr.infoWidth = info->bmiHeader.biWidth; - descr.depth = physDev->depth; - descr.shifts = physDev->color_shifts; - descr.drawable = physDev->drawable; - descr.gc = physDev->gc; - descr.xSrc = xSrc; - descr.ySrc = ySrc; - descr.xDest = physDev->dc_rect.left + pt.x; - descr.yDest = physDev->dc_rect.top + pt.y; - descr.width = cx; - descr.height = cy; - descr.shm_mode = X11DRV_SHM_NONE; - descr.dibpitch = X11DRV_DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - descr.physBitmap = NULL; - - result = X11DRV_DIB_SetImageBits( &descr ); - - if (descr.infoBpp <= 8) - HeapFree(GetProcessHeap(), 0, descr.colorMap); - - /* Update the DIBSection of the pixmap */ - X11DRV_UnlockDIBSection(physDev, TRUE); - - return result; -} - /*********************************************************************** * X11DRV_DIB_DoCopyDIBSection */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 111676c..95e0a0b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -532,7 +532,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ X11DRV_SetDIBColorTable, /* pSetDIBColorTable */ - X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ + NULL, /* pSetDIBitsToDevice */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 69845d3..545182c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -236,8 +236,6 @@ extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_H extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; -extern INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_base_vertex_index() const.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: cf010c563c1d05358527c496b86d04bfa4dcdf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf010c563c1d05358527c496b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 21:15:54 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_base_vertex_index() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7bb19f..2660ee8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2437,7 +2437,7 @@ HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device return WINED3D_OK; } -INT CDECL wined3d_device_get_base_vertex_index(struct wined3d_device *device) +INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 223812b..c9f9edf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2207,7 +2207,7 @@ void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *devic UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); -INT __cdecl wined3d_device_get_base_vertex_index(struct wined3d_device *device); +INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device,

1 0

Michael Stefaniuc : quartz: Use an IDL file to define the IAMFilterData iface.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 27e1d5adb704371469d1eef32e593c43d5206126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e1d5adb704371469d1eef32… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 6 00:40:28 2011 +0200 quartz: Use an IDL file to define the IAMFilterData iface. --- .gitignore | 1 + dlls/quartz/Makefile.in | 1 + dlls/quartz/fil_data.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/filtermapper.c | 45 +------------------------------------- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8ce12fe..416de9a 100644 --- a/.gitignore +++ b/.gitignore @@ -108,6 +108,7 @@ dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c +dlls/quartz/fil_data.h dlls/quartz/quartz_strmif.h dlls/quartz/quartz_strmif_p.c dlls/rpcrt4/epm.h diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 9a4e511..5827d65 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -29,6 +29,7 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_H_SRCS = fil_data.idl IDL_P_SRCS = quartz_strmif.idl IDL_R_SRCS = quartz_strmif.idl diff --git a/dlls/quartz/fil_data.idl b/dlls/quartz/fil_data.idl new file mode 100644 index 0000000..93cdf1e --- /dev/null +++ b/dlls/quartz/fil_data.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + * + * Notes: + * - This interface is deprecated and IFilterMapper2 should be used instead. + * - There is no full replacement for IAMFilterData::ParseFilterData short of manually + * parsing out the REGFILTER2 struct from the binary blob. + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 78b6699..7d7599f 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -36,6 +36,8 @@ #include "strmif.h" #include "wine/unicode.h" #include "uuids.h" +#include "initguid.h" +#include "fil_data.h" #include "wine/debug.h" @@ -43,49 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) -/* Unexposed IAMFilterData interface */ -typedef struct IAMFilterData IAMFilterData; - -typedef struct IAMFilterDataVtbl -{ - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMFilterData *This, - REFIID riid, - void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMFilterData *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMFilterData *This); - - /*** IAMFilterData methods ***/ - HRESULT (STDMETHODCALLTYPE *ParseFilterData)( - IAMFilterData *This, - BYTE *pData, - ULONG cb, - BYTE **ppRegFilter2); - - HRESULT (STDMETHODCALLTYPE *CreateFilterData)( - IAMFilterData* This, - REGFILTER2 *prf2, - BYTE **pRegFilterData, - ULONG *pcb); - - END_INTERFACE -} IAMFilterDataVtbl; -struct IAMFilterData -{ - const IAMFilterDataVtbl *lpVtbl; -}; -static const GUID IID_IAMFilterData = { - 0x97f7c4d4, 0x547b, 0x4a5f, { 0x83,0x32, 0x53,0x64,0x30,0xad,0x2e,0x4d } -}; - - typedef struct FilterMapper3Impl { IFilterMapper3 IFilterMapper3_iface;

1 0

Lucas Fialho Zawacki : dinput: Added ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 0ae471092617493baafbfcba115fcd51ccfcbd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae471092617493baafbfcba1… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:35 2011 -0300 dinput: Added ConfigureDevices dialog. --- configure | 2 +- configure.ac | 2 +- dlls/dinput/Makefile.in | 9 +++++- dlls/dinput/{version.rc => config.c} | 30 ++++++++++++++++++------ dlls/dinput/{version.rc => dinput.rc} | 10 ++++++++ dlls/dinput/dinput_En.rc | 40 +++++++++++++++++++++++++++++++++ dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 2 + dlls/dinput/resource.h | 35 ++++++++++++++++++++++++++++ po/ar.po | 9 +++++++ po/bg.po | 9 +++++++ po/ca.po | 8 ++++++ po/cs.po | 9 +++++++ po/da.po | 10 ++++++++ po/de.po | 10 ++++++++ po/el.po | 9 +++++++ po/en.po | 8 ++++++ po/en_US.po | 8 ++++++ po/eo.po | 9 +++++++ po/es.po | 10 ++++++++ po/fa.po | 9 +++++++ po/fi.po | 9 +++++++ po/fr.po | 10 ++++++++ po/he.po | 10 ++++++++ po/hi.po | 8 ++++++ po/hu.po | 10 ++++++++ po/it.po | 10 ++++++++ po/ja.po | 10 ++++++++ po/ko.po | 10 ++++++++ po/lt.po | 10 ++++++++ po/ml.po | 8 ++++++ po/nb_NO.po | 10 ++++++++ po/nl.po | 10 ++++++++ po/or.po | 8 ++++++ po/pa.po | 8 ++++++ po/pl.po | 10 ++++++++ po/pt_BR.po | 10 ++++++++ po/pt_PT.po | 10 ++++++++ po/rm.po | 9 +++++++ po/ro.po | 10 ++++++++ po/ru.po | 10 ++++++++ po/sk.po | 9 +++++++ po/sl.po | 10 ++++++++ po/sr_RS(a)cyrillic.po | 10 ++++++++ po/sr_RS(a)latin.po | 10 ++++++++ po/sv.po | 10 ++++++++ po/te.po | 8 ++++++ po/th.po | 9 +++++++ po/tr.po | 10 ++++++++ po/uk.po | 10 ++++++++ po/wa.po | 9 +++++++ po/wine.pot | 8 ++++++ po/zh_CN.po | 10 ++++++++ po/zh_TW.po | 10 ++++++++ 54 files changed, 541 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ae471092617493baafbf…

1 0

Lucas Fialho Zawacki : dinput: Added enumerated devices to ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 9bbe3b45d0954054fd450ce1187151bc7facab17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbe3b45d0954054fd450ce11… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:36 2011 -0300 dinput: Added enumerated devices to ConfigureDevices dialog. --- dlls/dinput/config.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 119 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 63ac507..b002f4c 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -25,6 +25,120 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +typedef struct { + int nobjects; + IDirectInputDevice8W *lpdid; + DIDEVICEINSTANCEW ddi; + DIDEVICEOBJECTINSTANCEW ddo[256]; +} DeviceData; + +typedef struct { + int ndevices; + DeviceData *devices; +} DIDevicesData; + +typedef struct { + IDirectInput8W *lpDI; + LPDIACTIONFORMATW lpdiaf; + DIDevicesData devices_data; +} ConfigureDevicesData; + +/* + * Enumeration callback functions + */ +static BOOL CALLBACK count_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDevice8W *lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) +{ + DIDevicesData *data = (DIDevicesData*) pvRef; + + data->ndevices++; + return DIENUM_CONTINUE; +} + +static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDevice8W *lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) +{ + DIDevicesData *data = (DIDevicesData*) pvRef; + DeviceData *device = &data->devices[data->ndevices]; + device->lpdid = lpdid; + device->ddi = *lpddi; + + IDirectInputDevice_AddRef(lpdid); + + data->ndevices++; + return DIENUM_CONTINUE; +} + +/* + * Utility functions + */ +static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, LPDIACTIONFORMATW lpdiaf) +{ + int i; + + /* Count devices */ + IDirectInput8_EnumDevicesBySemantics(lpDI, NULL, lpdiaf, count_devices, (LPVOID) data, 0); + + /* Allocate devices */ + data->devices = (DeviceData*) HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceData) * data->ndevices); + + /* Collect and insert */ + data->ndevices = 0; + IDirectInput8_EnumDevicesBySemantics(lpDI, NULL, lpdiaf, collect_devices, (LPVOID) data, 0); + + for (i=0; i < data->ndevices; i++) + SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_ADDSTRING, 0, (LPARAM) data->devices[i].ddi.tszProductName ); +} + +static void destroy_devices(HWND dialog) +{ + int i; + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + DIDevicesData *devices_data = &data->devices_data; + + for (i=0; i < devices_data->ndevices; i++) + IDirectInputDevice8_Release(devices_data->devices[i].lpdid); + + HeapFree(GetProcessHeap(), 0, devices_data->devices); +} + +static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + { + ConfigureDevicesData *data = (ConfigureDevicesData*) lParam; + + /* Initialize action format and enumerate devices */ + init_devices(dialog, data->lpDI, &data->devices_data, data->lpdiaf); + + /* Store information in the window */ + SetWindowLongPtrW(dialog, DWLP_USER, (LONG_PTR) data); + + break; + } + case WM_COMMAND: + + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(dialog, 0); + destroy_devices(dialog); + break; + + case IDCANCEL: + EndDialog(dialog, 0); + destroy_devices(dialog); + break; + + case IDC_RESET: + break; + } + break; + } + + return FALSE; +} + HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, @@ -32,9 +146,13 @@ HRESULT _configure_devices(IDirectInput8W *iface, LPVOID pvRefData ) { + ConfigureDevicesData data; + data.lpDI = iface; + data.lpdiaf = lpdiCDParams->lprgFormats; + InitCommonControls(); - DialogBoxParamW(GetModuleHandleA("dinput.dll"), (LPCWSTR) MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), lpdiCDParams->hwnd, 0, 0); + DialogBoxParamW(GetModuleHandleA("dinput.dll"), (LPCWSTR) MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM) &data); return DI_OK; }

1 0

Lucas Fialho Zawacki : dinput: Added object/ action enumeration to ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: a4b209b1198342c47706328cf91fb57e884fba1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b209b1198342c47706328cf… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:37 2011 -0300 dinput: Added object/action enumeration to ConfigureDevices dialog. --- dlls/dinput/config.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index b002f4c..086ee14 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -46,6 +46,16 @@ typedef struct { /* * Enumeration callback functions */ +static BOOL CALLBACK collect_objects(LPCDIDEVICEOBJECTINSTANCEW lpddo, LPVOID pvRef) +{ + DeviceData *data = (DeviceData*) pvRef; + + data->ddo[data->nobjects] = *lpddo; + + data->nobjects++; + return DIENUM_CONTINUE; +} + static BOOL CALLBACK count_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDevice8W *lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) { DIDevicesData *data = (DIDevicesData*) pvRef; @@ -63,13 +73,89 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev IDirectInputDevice_AddRef(lpdid); + device->nobjects = 0; + IDirectInputDevice_EnumObjects(lpdid, collect_objects, (LPVOID) device, DIDFT_ALL); + data->ndevices++; return DIENUM_CONTINUE; } /* + * Listview utility functions + */ +static void init_listview_columns(HWND dialog) +{ + HINSTANCE hinstance = (HINSTANCE) GetWindowLongPtrW(dialog, GWLP_HINSTANCE); + LVCOLUMNW listColumn; + RECT viewRect; + int width; + WCHAR column[MAX_PATH]; + + GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); + width = (viewRect.right - viewRect.left)/2; + + LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, sizeof(column)/sizeof(column[0])); + listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + listColumn.pszText = column; + listColumn.cchTextMax = lstrlenW(listColumn.pszText); + listColumn.cx = width; + + SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); + + LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, sizeof(column)/sizeof(column[0])); + listColumn.cx = width; + listColumn.pszText = column; + listColumn.cchTextMax = lstrlenW(listColumn.pszText); + + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 1, (LPARAM) &listColumn); +} + +static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) +{ + static const WCHAR no_action[] = {'-','\0'}; + const WCHAR *action_text = no_action; + LVITEMW lvItem; + + if (item < 0) return; + + if (action != -1) + action_text = lpdiaf->rgoAction[action].lptszActionName; + + /* Keep the action and text in the listview item */ + lvItem.iItem = item; + + lvItem.mask = LVIF_PARAM; + lvItem.iSubItem = 0; + lvItem.lParam = (LPARAM) action; + + /* Action index */ + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_SETITEMW, 0, (LPARAM) &lvItem); + + lvItem.mask = LVIF_TEXT; + lvItem.iSubItem = 1; + lvItem.pszText = (WCHAR *)action_text; + lvItem.cchTextMax = lstrlenW(lvItem.pszText); + + /* Text */ + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_SETITEMW, 0, (LPARAM) &lvItem); +} + +/* * Utility functions */ +static DeviceData* get_cur_device(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + int sel = SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_GETCURSEL, 0, 0); + return &data->devices_data.devices[sel]; +} + +static LPDIACTIONFORMATW get_cur_lpdiaf(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + return data->lpdiaf; +} + static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, LPDIACTIONFORMATW lpdiaf) { int i; @@ -100,6 +186,45 @@ static void destroy_devices(HWND dialog) HeapFree(GetProcessHeap(), 0, devices_data->devices); } +static void fill_device_object_list(HWND dialog) +{ + DeviceData *device = get_cur_device(dialog); + LPDIACTIONFORMATW lpdiaf = get_cur_lpdiaf(dialog); + LVITEMW item; + int i, j; + + /* Clean the listview */ + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_DELETEALLITEMS, 0, 0); + + /* Add each object */ + for (i=0; i < device->nobjects; i++) + { + int action = -1; + + item.mask = LVIF_TEXT | LVIF_PARAM; + item.iItem = i; + item.iSubItem = 0; + item.pszText = device->ddo[i].tszName; + item.cchTextMax = lstrlenW(item.pszText); + + /* Add the item */ + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTITEMW, 0, (LPARAM) &item); + + /* Search for an assigned action for this device */ + for (j=0; j < lpdiaf->dwNumActions; j++) + { + if (IsEqualGUID(&lpdiaf->rgoAction[j].guidInstance, &device->ddi.guidInstance) && + lpdiaf->rgoAction[j].dwObjID == device->ddo[i].dwType) + { + action = j; + break; + } + } + + lv_set_action(dialog, i, action, lpdiaf); + } +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -114,12 +239,25 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w /* Store information in the window */ SetWindowLongPtrW(dialog, DWLP_USER, (LONG_PTR) data); + init_listview_columns(dialog); + break; } case WM_COMMAND: switch(LOWORD(wParam)) { + + case IDC_CONTROLLERCOMBO: + + switch (HIWORD(wParam)) + { + case CBN_SELCHANGE: + fill_device_object_list(dialog); + break; + } + break; + case IDOK: EndDialog(dialog, 0); destroy_devices(dialog);

1 0

Lucas Fialho Zawacki : dinput: Added display of available actions to ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 914969186566284435c20c80cfb7c54121f1c6eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=914969186566284435c20c80c… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:38 2011 -0300 dinput: Added display of available actions to ConfigureDevices dialog. --- dlls/dinput/config.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 086ee14..d3c604a 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -110,6 +110,11 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 1, (LPARAM) &listColumn); } +static int lv_get_cur_item(HWND dialog) +{ + return SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_GETNEXTITEM, -1, LVNI_SELECTED); +} + static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) { static const WCHAR no_action[] = {'-','\0'}; @@ -225,6 +230,37 @@ static void fill_device_object_list(HWND dialog) } } +static void show_suitable_actions(HWND dialog) +{ + DeviceData *device = get_cur_device(dialog); + LPDIACTIONFORMATW lpdiaf = get_cur_lpdiaf(dialog); + int i, added = 0; + int obj = lv_get_cur_item(dialog); + + if (obj < 0) return; + + SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_RESETCONTENT, 0, 0); + + for (i=0; i < lpdiaf->dwNumActions; i++) + { + /* Skip keyboard actions for non keyboards */ + if (GET_DIDEVICE_TYPE(device->ddi.dwDevType) != DI8DEVTYPE_KEYBOARD && + (lpdiaf->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) continue; + + /* Skip mouse actions for non mouses */ + if (GET_DIDEVICE_TYPE(device->ddi.dwDevType) != DI8DEVTYPE_MOUSE && + (lpdiaf->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) continue; + + /* Add action string and index in the action format to the list entry */ + if (DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwSemantic) & DIDFT_GETTYPE(device->ddo[obj].dwType)) + { + SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_ADDSTRING, 0, (LPARAM)lpdiaf->rgoAction[i].lptszActionName); + SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_SETITEMDATA, added, (LPARAM) i); + added++; + } + } +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -243,6 +279,18 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w break; } + + case WM_NOTIFY: + + switch (((LPNMHDR)lParam)->code) + { + case LVN_ITEMCHANGED: + show_suitable_actions(dialog); + break; + } + break; + + case WM_COMMAND: switch(LOWORD(wParam))

1 0

Lucas Fialho Zawacki : dinput: Added possibility to change the action mapping in the ConfigureDevices dialog .
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 67682c244c9e105b0abed61573f75892f4770a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=67682c244c9e105b0abed6157… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:39 2011 -0300 dinput: Added possibility to change the action mapping in the ConfigureDevices dialog. --- dlls/dinput/config.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index d3c604a..b2aa3ab 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -41,6 +41,7 @@ typedef struct { IDirectInput8W *lpDI; LPDIACTIONFORMATW lpdiaf; DIDevicesData devices_data; + int display_only; } ConfigureDevicesData; /* @@ -115,6 +116,21 @@ static int lv_get_cur_item(HWND dialog) return SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_GETNEXTITEM, -1, LVNI_SELECTED); } +static int lv_get_item_data(HWND dialog, int index) +{ + LVITEMW item; + + if (index < 0) return -1; + + item.mask = LVIF_PARAM; + item.iItem = index; + item.iSubItem = 0; + + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_GETITEMW , 0, (LPARAM)&item); + + return item.lParam; +} + static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) { static const WCHAR no_action[] = {'-','\0'}; @@ -161,6 +177,12 @@ static LPDIACTIONFORMATW get_cur_lpdiaf(HWND dialog) return data->lpdiaf; } +static int dialog_display_only(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + return data->display_only; +} + static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, LPDIACTIONFORMATW lpdiaf) { int i; @@ -261,6 +283,46 @@ static void show_suitable_actions(HWND dialog) } } +static void assign_action(HWND dialog) +{ + DeviceData *device = get_cur_device(dialog); + LPDIACTIONFORMATW lpdiaf = get_cur_lpdiaf(dialog); + LVFINDINFOW lvFind; + int sel = SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_GETCURSEL, 0, 0); + int action = SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_GETITEMDATA, sel, 0); + int obj = lv_get_cur_item(dialog); + int old_action = lv_get_item_data(dialog, obj); + int used_obj; + + DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + + if (old_action == action) return; + + /* Clear old action */ + if (old_action != -1) + { + lpdiaf->rgoAction[old_action].dwObjID = 0; + lpdiaf->rgoAction[old_action].guidInstance = GUID_NULL; + lpdiaf->rgoAction[old_action].dwHow = DIAH_UNMAPPED; + } + + /* Find if action text is already set for other object and unset it */ + lvFind.flags = LVFI_PARAM; + lvFind.lParam = action; + + used_obj = SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_FINDITEMW, -1, (LPARAM) &lvFind); + + lv_set_action(dialog, used_obj, -1, lpdiaf); + + /* Set new action */ + lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; + lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG; + + /* Set new action in the list */ + lv_set_action(dialog, obj, action, lpdiaf); +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -296,6 +358,19 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w switch(LOWORD(wParam)) { + case IDC_ACTIONLIST: + + switch (HIWORD(wParam)) + { + case LBN_DBLCLK: + /* Ignore this if app did not ask for editing */ + if (dialog_display_only(dialog)) break; + + assign_action(dialog); + break; + } + break; + case IDC_CONTROLLERCOMBO: switch (HIWORD(wParam)) @@ -335,6 +410,7 @@ HRESULT _configure_devices(IDirectInput8W *iface, ConfigureDevicesData data; data.lpDI = iface; data.lpdiaf = lpdiCDParams->lprgFormats; + data.display_only = !(dwFlags & DICD_EDIT); InitCommonControls();

1 0

Lucas Fialho Zawacki : dinput: Working CANCEL and RESET buttons in ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: b0dfa932b6b36e6a2beed33f6fd428ccc75c92cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dfa932b6b36e6a2beed33f6… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:40 2011 -0300 dinput: Working CANCEL and RESET buttons in ConfigureDevices dialog. --- dlls/dinput/config.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index b2aa3ab..1c6da6c 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -40,6 +40,7 @@ typedef struct { typedef struct { IDirectInput8W *lpDI; LPDIACTIONFORMATW lpdiaf; + LPDIACTIONFORMATW original_lpdiaf; DIDevicesData devices_data; int display_only; } ConfigureDevicesData; @@ -201,16 +202,21 @@ static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_ADDSTRING, 0, (LPARAM) data->devices[i].ddi.tszProductName ); } -static void destroy_devices(HWND dialog) +static void destroy_data(HWND dialog) { int i; ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); DIDevicesData *devices_data = &data->devices_data; + /* Free the devices */ for (i=0; i < devices_data->ndevices; i++) IDirectInputDevice8_Release(devices_data->devices[i].lpdid); HeapFree(GetProcessHeap(), 0, devices_data->devices); + + /* Free the backup LPDIACTIONFORMATW */ + HeapFree(GetProcessHeap(), 0, data->original_lpdiaf->rgoAction); + HeapFree(GetProcessHeap(), 0, data->original_lpdiaf); } static void fill_device_object_list(HWND dialog) @@ -323,6 +329,26 @@ static void assign_action(HWND dialog) lv_set_action(dialog, obj, action, lpdiaf); } +static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) +{ + int i; + for (i=0; i < from->dwNumActions; i++) + { + to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; + to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; + to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; + to->rgoAction[i].lptszActionName = from->rgoAction[i].lptszActionName; + } +} + +static void reset_actions(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + LPDIACTIONFORMATW to = data->lpdiaf, from = data->original_lpdiaf; + + copy_actions(to, from); +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -339,6 +365,12 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w init_listview_columns(dialog); + /* Create a backup action format for CANCEL and RESET operations */ + data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIACTIONFORMATW)); + data->original_lpdiaf->dwNumActions = data->lpdiaf->dwNumActions; + data->original_lpdiaf->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->lpdiaf->dwNumActions); + copy_actions(data->original_lpdiaf, data->lpdiaf); + break; } @@ -383,15 +415,18 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w case IDOK: EndDialog(dialog, 0); - destroy_devices(dialog); + destroy_data(dialog); break; case IDCANCEL: + reset_actions(dialog); EndDialog(dialog, 0); - destroy_devices(dialog); + destroy_data(dialog); break; case IDC_RESET: + reset_actions(dialog); + fill_device_object_list(dialog); break; } break;

1 0

Alexandre Goujon : kernel32: Add UDF support.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 73f4e23938142225efdc233f9db56334ce8e326f URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f4e23938142225efdc233f9… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Thu Sep 1 16:30:15 2011 +0200 kernel32: Add UDF support. Based on Steven Wallace work. --- dlls/kernel32/volume.c | 160 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 144 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 25affc3..4a2a7b5 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -46,7 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(volume); -#define SUPERBLOCK_SIZE 2048 +#define BLOCK_SIZE 2048 +#define SUPERBLOCK_SIZE BLOCK_SIZE #define SYMBOLIC_LINK_QUERY 0x0001 #define CDFRAMES_PERSEC 75 @@ -63,7 +64,8 @@ enum fs_type FS_UNKNOWN, /* unknown file system */ FS_FAT1216, FS_FAT32, - FS_ISO9660 + FS_ISO9660, + FS_UDF /* For reference [E] = Ecma-167.pdf, [U] = udf260.pdf */ }; /* read a Unix symlink; returned buffer must be freed by caller */ @@ -387,30 +389,106 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /*********************************************************************** + * VOLUME_ReadCDBlock + */ +static BOOL VOLUME_ReadCDBlock( HANDLE handle, BYTE *buff, INT offs ) +{ + DWORD size, whence = offs >= 0 ? FILE_BEGIN : FILE_END; + + if (SetFilePointer( handle, offs, NULL, whence ) != offs || + !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || + size != SUPERBLOCK_SIZE) + return FALSE; + + return TRUE; +} + + +/*********************************************************************** * VOLUME_ReadCDSuperblock */ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) { - DWORD size, offs = VOLUME_FindCdRomDataBestVoldesc( handle ); + int i; + DWORD offs; + + /* Check UDF first as UDF and ISO9660 structures can coexist on the same medium + * Starting from sector 16, we may find : + * - a CD-ROM Volume Descriptor Set (ISO9660) containing one or more Volume Descriptors + * - an Extented Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 + * There is no explicit end so read 16 sectors and then give up */ + for( i=16; i<16+16; i++) + { + if (!VOLUME_ReadCDBlock(handle, buff, i*BLOCK_SIZE)) + continue; + + /* We are supposed to check "BEA01", "NSR0x" and "TEA01" IDs + verify tag checksum + * but we assume the volume is well-formatted */ + if (!memcmp(&buff[1], "BEA01", 5)) return FS_UDF; + } + offs = VOLUME_FindCdRomDataBestVoldesc( handle ); if (!offs) return FS_UNKNOWN; - if (SetFilePointer( handle, offs, NULL, FILE_BEGIN ) != offs || - !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || - size != SUPERBLOCK_SIZE) + if (!VOLUME_ReadCDBlock(handle, buff, offs)) return FS_ERROR; - /* check for iso9660 present */ + /* check for the iso9660 identifier */ if (!memcmp(&buff[1], "CD001", 5)) return FS_ISO9660; return FS_UNKNOWN; } /************************************************************************** + * UDF_Find_PVD + * Find the Primary Volume Descriptor + */ +static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) +{ + int i; + DWORD offset; + INT locations[] = { 256, -1, -257, 512 }; + + for(i=0; i<sizeof(locations)/sizeof(locations[0]); i++) + { + if (!VOLUME_ReadCDBlock(handle, pvd, locations[i]*BLOCK_SIZE)) + return FALSE; + + /* Tag Identifier of Anchor Volume Descriptor Pointer is 2 -- [E] 3/10.2.1 */ + if (pvd[0]==2 && pvd[1]==0) + { + /* Tag location (Uint32) at offset 12, little-endian */ + offset = pvd[20 + 0]; + offset |= pvd[20 + 1] << 8; + offset |= pvd[20 + 2] << 16; + offset |= pvd[20 + 3] << 24; + offset *= BLOCK_SIZE; + + if (!VOLUME_ReadCDBlock(handle, pvd, offset)) + return FALSE; + + /* Check for the Primary Volume Descriptor Tag Id -- [E] 3/10.1.1 */ + if (pvd[0]!=1 || pvd[1]!=0) + return FALSE; + + /* 8 or 16 bits per character -- [U] 2.1.1 */ + if (!(pvd[24]==8 || pvd[24]==16)) + return FALSE; + + return TRUE; + } + } + + return FALSE; +} + + +/************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, enum fs_type type, - const BYTE *superblock, WCHAR *label, DWORD len ) +static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE handle, + enum fs_type type, const BYTE *superblock, + WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; DWORD label_len; @@ -451,6 +529,34 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, enum fs_typ label_len = 32; break; } + case FS_UDF: + { + BYTE pvd[BLOCK_SIZE]; + + if(!UDF_Find_PVD(handle, pvd)) + { + label_len = 0; + break; + } + + /* [E] 3/10.1.4 and [U] 2.1.1 */ + if(pvd[24]==8) + { + label_ptr = pvd + 24 + 1; + label_len = pvd[24+32-1]; + break; + } + else + { + int i; + + label_len = 1 + pvd[24+32-1]; + for(i=0; i<label_len && i<len; i+=2) + label[i/2] = (pvd[24+1 +i] << 8) | pvd[24+1 +i+1]; + label[label_len] = 0; + return; + } + } } if (label_len) RtlMultiByteToUnicodeN( label, (len-1) * sizeof(WCHAR), &label_len, (LPCSTR)label_ptr, label_len ); @@ -463,8 +569,8 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, enum fs_typ /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, enum fs_type type, - const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE handle, + enum fs_type type, const BYTE *superblock ) { switch(type) { @@ -476,6 +582,17 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, enum fs_t return GETLONG( superblock, 0x27 ); case FS_FAT32: return GETLONG( superblock, 0x33 ); + case FS_UDF: + { + BYTE block[BLOCK_SIZE]; + + if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) + break; + + superblock = block; + + /* fallthrough */ + } case FS_ISO9660: { BYTE sum[4]; @@ -495,7 +612,7 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, enum fs_t * Me$$ysoft chose to reverse the serial number in NT4/W2K. * It's true and nobody will ever be able to change it. */ - if (GetVersion() & 0x80000000) + if (GetVersion() & 0x80000000 || type == FS_UDF) return (sum[3] << 24) | (sum[2] << 16) | (sum[1] << 8) | sum[0]; else return (sum[0] << 24) | (sum[1] << 16) | (sum[2] << 8) | sum[3]; @@ -546,6 +663,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR udfW[] = {'U','D','F',0}; static const WCHAR default_rootW[] = {'\\',0}; HANDLE handle; @@ -618,12 +736,16 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, type = VOLUME_ReadFATSuperblock( handle, superblock ); if (type == FS_UNKNOWN) type = VOLUME_ReadCDSuperblock( handle, superblock ); } - CloseHandle( handle ); TRACE( "%s: found fs type %d\n", debugstr_w(nt_name.Buffer), type ); - if (type == FS_ERROR) goto done; + if (type == FS_ERROR) + { + CloseHandle( handle ); + goto done; + } - if (label && label_len) VOLUME_GetSuperblockLabel( &nt_name, type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( &nt_name, type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( &nt_name, handle, type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( &nt_name, handle, type, superblock ); + CloseHandle( handle ); goto fill_fs_info; } else TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); @@ -657,6 +779,12 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (filename_len) *filename_len = 221; if (flags) *flags = FILE_READ_ONLY_VOLUME; break; + case FS_UDF: + if (fsname) lstrcpynW( fsname, udfW, fsname_len ); + if (filename_len) *filename_len = 255; + if (flags) + *flags = FILE_READ_ONLY_VOLUME | FILE_UNICODE_ON_DISK | FILE_CASE_SENSITIVE_SEARCH; + break; case FS_FAT1216: if (fsname) lstrcpynW( fsname, fatW, fsname_len ); case FS_FAT32:

1 0