wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Frédéric Delanoy : cmd: Get rid of obsolete autoexec.bat handling code.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 54c2f6491dbe1493bebc2bb00053998d413a7cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c2f6491dbe1493bebc2bb00… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 01:13:07 2011 +0200 cmd: Get rid of obsolete autoexec.bat handling code. --- programs/cmd/wcmdmain.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ce07111..ed1b46c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2252,11 +2252,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *cmd = NULL; WCHAR string[1024]; WCHAR envvar[4]; - HANDLE h; int opt_q; int opt_t = 0; - static const WCHAR autoexec[] = {'\\','a','u','t','o','e','x','e','c','.', - 'b','a','t','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; char ansiVersion[100]; @@ -2575,19 +2572,6 @@ int wmain (int argc, WCHAR *argvW[]) } /* - * If there is an AUTOEXEC.BAT file, try to execute it. - */ - - GetFullPathNameW (autoexec, sizeof(string)/sizeof(WCHAR), string, NULL); - h = CreateFileW(string, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle (h); -#if 0 - WCMD_batch (autoexec, autoexec, 0, NULL, INVALID_HANDLE_VALUE); -#endif - } - -/* * Loop forever getting commands and executing them. */

1 0

Frédéric Delanoy : cmd: Associate comments with their respective descripted structures in header file .
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: df699a89faaa30ccd6d8ec90b2b0ec4f3e4762eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df699a89faaa30ccd6d8ec90b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 5 17:57:54 2011 +0200 cmd: Associate comments with their respective descripted structures in header file. --- programs/cmd/wcmd.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 27d9d9a..462ecd9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -30,7 +30,7 @@ #include <ctype.h> #include <wine/unicode.h> -/* Data structure to hold commands to be processed */ +/* Data structure to hold commands delimitors/separators */ typedef enum _CMDdelimiters { CMD_NONE, /* End of line or single & */ @@ -39,6 +39,8 @@ typedef enum _CMDdelimiters { CMD_PIPE /* Single | */ } CMD_DELIMITERS; +/* Data structure to hold commands to be processed */ + typedef struct _CMD_LIST { WCHAR *command; /* Command string to execute */ WCHAR *redirects; /* Redirects in place */ @@ -117,7 +119,7 @@ void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, const WCHAR *parameter, const WCHAR *substitution, CMD_LIST **cmdList); -/* Data structure to hold context when executing batch files */ +/* Data structure to hold context when executing batch files */ typedef struct { WCHAR *command; /* The command which invoked the batch file */ @@ -129,7 +131,7 @@ typedef struct { CMD_LIST *toExecute; /* Commands left to be executed */ } BATCH_CONTEXT; -/* Data structure to save setlocal and pushd information */ +/* Data structure to handle building lists during recursive calls */ struct env_stack { @@ -141,7 +143,7 @@ struct env_stack WCHAR *strings; }; -/* Data structure to handle building lists during recursive calls */ +/* Data structure to save setlocal and pushd information */ typedef struct _DIRECTORY_STACK {

1 0

Bruno Jesus : ws2_32: Avoid an unhandled exception in WSAIoctl.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 312f50a26f1c027488d188801f2574eb559d6521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312f50a26f1c027488d188801… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 5 23:04:23 2011 -0300 ws2_32: Avoid an unhandled exception in WSAIoctl. --- dlls/ws2_32/socket.c | 15 +++++++++------ dlls/ws2_32/tests/sock.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 64abd93..ff3c282 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3365,17 +3365,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } case WS_SIO_KEEPALIVE_VALS: { - struct tcp_keepalive *k = in_buff; - int keepalive = k->onoff ? 1 : 0; - int keepidle = k->keepalivetime / 1000; - int keepintvl = k->keepaliveinterval / 1000; + struct tcp_keepalive *k; + int keepalive, keepidle, keepintvl; - if (!in_buff) + if (!in_buff || in_size < sizeof(struct tcp_keepalive)) { - WSASetLastError(WSAEINVAL); + WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } + k = in_buff; + keepalive = k->onoff ? 1 : 0; + keepidle = k->keepalivetime / 1000; + keepintvl = k->keepaliveinterval / 1000; + TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); fd = get_sock_fd(s, 0, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e6912c..fd6b8c2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -26,6 +26,7 @@ #include <windows.h> #include <ws2tcpip.h> #include <mswsock.h> +#include <mstcpip.h> #include <stdio.h> #include "wine/test.h" @@ -2960,6 +2961,18 @@ static void test_ioctlsocket(void) ret = ioctlsocket(sock, SIOCATMARK, &arg); if(ret != SOCKET_ERROR) todo_wine ok(arg, "expected a non-zero value\n"); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ret = WSAGetLastError(); + ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ret = WSAGetLastError(); + ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + + closesocket(sock); } static int drain_pause=0;

1 0

Francois Gouget : comctl32: Property sheets must be able to redraw themselves even if no page is selected .
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 6deccab6c9c585f739fa4b4c4b071ad4fdbeb064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6deccab6c9c585f739fa4b4c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 00:13:38 2011 +0200 comctl32: Property sheets must be able to redraw themselves even if no page is selected. --- dlls/comctl32/propsheet.c | 11 +++++++---- dlls/comctl32/tests/propsheet.c | 28 +++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3dd0713..e6d2d30 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3201,17 +3201,20 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) WCHAR szBuffer[256]; int nLength; - if (psInfo->active_page < 0) return 1; hdc = hdcParam ? hdcParam : BeginPaint(hwnd, &ps); if (!hdc) return 1; hdcSrc = CreateCompatibleDC(0); - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[psInfo->active_page].hpage; if (psInfo->ppshheader.dwFlags & PSH_USEHPLWATERMARK) hOldPal = SelectPalette(hdc, psInfo->ppshheader.hplWatermark, FALSE); - if ( (!(ppshpage->dwFlags & PSP_HIDEHEADER)) && + if (psInfo->active_page < 0) + ppshpage = NULL; + else + ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[psInfo->active_page].hpage; + + if ( (ppshpage && !(ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) ) { @@ -3318,7 +3321,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SelectObject(hdcSrc, hbmp); } - if ( (ppshpage->dwFlags & PSP_HIDEHEADER) && + if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) { diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 89c548f..e6c2bb5 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -33,6 +33,24 @@ static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + + static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) @@ -121,7 +139,8 @@ static void test_nopage(void) HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEA psp; PROPSHEETHEADERA psh; - HWND hdlg; + HWND hdlg, hpage; + MSG msg; memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); @@ -148,7 +167,14 @@ static void test_nopage(void) ShowWindow(hdlg,SW_NORMAL); SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0); + hpage = PropSheet_GetCurrentPageHwnd(hdlg); + ok(hpage == NULL, "expected no current page, got %p, index=%d\n", hpage, PropSheet_HwndToIndex(hdlg, hpage)); + flush_events(); RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW); + + /* Check that the property sheet was fully redrawn */ + ok(!PeekMessage(&msg, 0, WM_PAINT, WM_PAINT, PM_NOREMOVE), + "expected no pending WM_PAINT messages\n"); DestroyWindow(hdlg); }

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

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

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: 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 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 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011