[PATCH 1/3] dinput: Move the version resource to a separate file.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dinput/Makefile.in | 4 +++- dlls/dinput/dinput.rc | 9 --------- dlls/dinput/version.rc | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 dlls/dinput/version.rc diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index b1107ee7be..3b046d61d4 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -19,4 +19,6 @@ C_SRCS = \ IDL_SRCS = dinput_classes.idl -RC_SRCS = dinput.rc +RC_SRCS = \ + dinput.rc \ + version.rc diff --git a/dlls/dinput/dinput.rc b/dlls/dinput/dinput.rc index 54eae6cf7a..74be033e38 100644 --- a/dlls/dinput/dinput.rc +++ b/dlls/dinput/dinput.rc @@ -18,15 +18,6 @@ #include "resource.h" -#define WINE_FILEDESCRIPTION_STR "Wine DirectInput" -#define WINE_FILENAME_STR "dinput.dll" -#define WINE_FILEVERSION 5,1,2600,881 -#define WINE_FILEVERSION_STR "5.1.2600.881" -#define WINE_PRODUCTVERSION 5,1,2600,881 -#define WINE_PRODUCTVERSION_STR "5.1" - -#include "wine/wine_common_ver.rc" - #pragma makedep po LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/dinput/version.rc b/dlls/dinput/version.rc new file mode 100644 index 0000000000..2cd531902e --- /dev/null +++ b/dlls/dinput/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2001 Ove Kaaven + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DirectInput" +#define WINE_FILENAME_STR "dinput.dll" +#define WINE_FILEVERSION 5,1,2600,881 +#define WINE_FILEVERSION_STR "5.1.2600.881" +#define WINE_PRODUCTVERSION 5,1,2600,881 +#define WINE_PRODUCTVERSION_STR "5.1" + +#include "wine/wine_common_ver.rc" + -- 2.14.1
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dinput8/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 6b62969b18..0ede9f0fb1 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -20,4 +20,6 @@ C_SRCS = \ IDL_SRCS = dinput8.idl -RC_SRCS = version.rc +RC_SRCS = \ + dinput.rc \ + version.rc -- 2.14.1
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=45855 Your paranoid android. === debian9 (32 bit Chinese:China report) === dinput: mouse.c:154: Test failed: GetDeviceData() failed: 00000000 cnt:0 mouse.c:162: Test failed: GetDeviceData() failed: 00000000 cnt:0 mouse.c:173: Test failed: GetDeviceData() failed: 00000000 cnt:0
On Wed, 19 Dec 2018 at 16:42, Zebediah Figura <z.figura12(a)gmail.com> wrote:
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 6b62969b18..0ede9f0fb1 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -20,4 +20,6 @@ C_SRCS = \
IDL_SRCS = dinput8.idl
-RC_SRCS = version.rc +RC_SRCS = \ + dinput.rc \ + version.rc
This looks like it got mangled somehow when it was committed. The dinput.rc line is gone. https://source.winehq.org/git/wine.git/commitdiff/feb23d367f7b3d457053b8f482...
Mathew Hodson <mathew.hodson(a)gmail.com> writes:
On Wed, 19 Dec 2018 at 16:42, Zebediah Figura <z.figura12(a)gmail.com> wrote:
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 6b62969b18..0ede9f0fb1 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -20,4 +20,6 @@ C_SRCS = \
IDL_SRCS = dinput8.idl
-RC_SRCS = version.rc +RC_SRCS = \ + dinput.rc \ + version.rc
This looks like it got mangled somehow when it was committed. The dinput.rc line is gone.
https://source.winehq.org/git/wine.git/commitdiff/feb23d367f7b3d457053b8f482...
Indeed, make_makefiles doesn't handle shared resource files correctly. I'll fix it. Thanks for spotting it! -- Alexandre Julliard julliard(a)winehq.org
This fixes a regression introduced by 56345c8757887431ada9f2347b43fc372d72872a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46323 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dinput/config.c | 8 ++++---- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index bb36db02d5..885f1f4b8e 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -86,7 +86,6 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev */ static void init_listview_columns(HWND dialog) { - HINSTANCE hinstance = (HINSTANCE) GetWindowLongPtrW(dialog, GWLP_HINSTANCE); LVCOLUMNW listColumn; RECT viewRect; int width; @@ -95,7 +94,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); 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.pszText = column; 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); - LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); + LoadStringW(DINPUT_instance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); listColumn.cx = width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -453,7 +452,8 @@ HRESULT _configure_devices(IDirectInput8W *iface, 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; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6ed764e748..7074704d7a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -93,7 +93,7 @@ static const struct dinput_device *dinput_devices[] = &joystick_osx_device }; -static HINSTANCE DINPUT_instance = NULL; +HINSTANCE DINPUT_instance; static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 6c93e16e9e..abdfbeb253 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -27,6 +27,8 @@ #include "dinputd.h" #include "wine/list.h" +extern HINSTANCE DINPUT_instance; + /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; struct IDirectInputImpl -- 2.14.1
participants (4)
-
Alexandre Julliard -
Marvin -
Mathew Hodson -
Zebediah Figura