ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Use the global module instance handle to load resources. 

This fixes a regression introduced by 56345c8757.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46323
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-12-19 15:41:13 -06:00 committed by Alexandre Julliard
parent feb23d367f
commit d507549038
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dinput/config.c
View File

@ -86,7 +86,6 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev
*/ */
static void init_listview_columns(HWND dialog) static void init_listview_columns(HWND dialog)
{ {
HINSTANCE hinstance = (HINSTANCE) GetWindowLongPtrW(dialog, GWLP_HINSTANCE);
LVCOLUMNW listColumn; LVCOLUMNW listColumn;
RECT viewRect; RECT viewRect;
int width; int width;
@ -95,7 +94,7 @@ static void init_listview_columns(HWND dialog)
GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect);
width = (viewRect.right - viewRect.left)/2; width = (viewRect.right - viewRect.left)/2;
LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); LoadStringW(DINPUT_instance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column));
listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
listColumn.pszText = column; listColumn.pszText = column;
listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cchTextMax = lstrlenW(listColumn.pszText);
@ -103,7 +102,7 @@ static void init_listview_columns(HWND dialog)
SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn);
LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); LoadStringW(DINPUT_instance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column));
listColumn.cx = width; listColumn.cx = width;
listColumn.pszText = column; listColumn.pszText = column;
listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cchTextMax = lstrlenW(listColumn.pszText);
@ -453,7 +452,8 @@ HRESULT _configure_devices(IDirectInput8W *iface,
InitCommonControls(); InitCommonControls();
DialogBoxParamW(GetModuleHandleA("dinput.dll"), (LPCWSTR) MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM) &data); DialogBoxParamW(DINPUT_instance, (const WCHAR *)MAKEINTRESOURCE(IDD_CONFIGUREDEVICES),
lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM)&data);
return DI_OK; return DI_OK;
} }

2
dlls/dinput/dinput_main.c
View File

@ -93,7 +93,7 @@ static const struct dinput_device *dinput_devices[] =
&joystick_osx_device &joystick_osx_device
}; };
static HINSTANCE DINPUT_instance = NULL; HINSTANCE DINPUT_instance;
static BOOL check_hook_thread(void); static BOOL check_hook_thread(void);
static CRITICAL_SECTION dinput_hook_crit; static CRITICAL_SECTION dinput_hook_crit;

2
dlls/dinput/dinput_private.h
View File

@ -27,6 +27,8 @@
#include "dinputd.h" #include "dinputd.h"
#include "wine/list.h" #include "wine/list.h"
extern HINSTANCE DINPUT_instance;
/* Implementation specification */ /* Implementation specification */
typedef struct IDirectInputImpl IDirectInputImpl; typedef struct IDirectInputImpl IDirectInputImpl;
struct IDirectInputImpl struct IDirectInputImpl