- Wine-Commits - list.winehq.org

Rémi Bernon : comdlg32: Call GlobalReAlloc with GMEM_MOVEABLE flag.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 6ffef221a184f8ffc915bc26f3a2a9c6d899278c URL: https://gitlab.winehq.org/wine/wine/-/commit/6ffef221a184f8ffc915bc26f3a2a9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 17:12:38 2022 +0100 comdlg32: Call GlobalReAlloc with GMEM_MOVEABLE flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/comdlg32/printdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5925ef64a20..bb9a9f78330 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -252,7 +252,7 @@ static HGLOBAL update_devmode_handleW(HGLOBAL hdm, DEVMODEW *dm) /* Increase / alloc the global memory block, when needed */ if ((dm->dmSize + dm->dmDriverExtra) > size) { if (hdm) - hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, GMEM_MOVEABLE); else hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); } @@ -280,7 +280,7 @@ static HGLOBAL update_devmode_handleA(HGLOBAL hdm, DEVMODEA *dm) /* Increase / alloc the global memory block, when needed */ if ((dm->dmSize + dm->dmDriverExtra) > size) { if (hdm) - hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, 0); + hdm = GlobalReAlloc(hdm, dm->dmSize + dm->dmDriverExtra, GMEM_MOVEABLE); else hdm = GlobalAlloc(GMEM_MOVEABLE, dm->dmSize + dm->dmDriverExtra); }

1 0

Rémi Bernon : ole32: Call GlobalReAlloc with GMEM_MOVEABLE flag.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: da929946e6dea2c9c543883ec68b60c432de1112 URL: https://gitlab.winehq.org/wine/wine/-/commit/da929946e6dea2c9c543883ec68b60… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 17:13:08 2022 +0100 ole32: Call GlobalReAlloc with GMEM_MOVEABLE flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/ole32/memlockbytes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index f974e4229eb..163d25a97aa 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -424,7 +424,7 @@ static HRESULT WINAPI HGLOBALLockBytesImpl_SetSize( /* * Re allocate the HGlobal to fit the new size of the stream. */ - supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, 0); + supportHandle = GlobalReAlloc(This->supportHandle, libNewSize.u.LowPart, GMEM_MOVEABLE); if (supportHandle == 0) return STG_E_MEDIUMFULL;

1 0

Rémi Bernon : winemac.drv: Call GlobalReAlloc with GMEM_MOVEABLE flag.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 6299e8a54cf535602d60c835ca3bde76fddaed2f URL: https://gitlab.winehq.org/wine/wine/-/commit/6299e8a54cf535602d60c835ca3bde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 17:13:25 2022 +0100 winemac.drv: Call GlobalReAlloc with GMEM_MOVEABLE flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/winemac.drv/dragdrop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index abb3dac2a3b..45615c68b71 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -105,7 +105,7 @@ static HANDLE get_pasteboard_data(UINT64 pasteboard, UINT desired_format) params.data = GlobalLock(handle); status = MACDRV_CALL(dnd_get_data, &params); GlobalUnlock(handle); - if (!status) return GlobalReAlloc(handle, params.size, 0); + if (!status) return GlobalReAlloc(handle, params.size, GMEM_MOVEABLE); GlobalFree(handle); if (status != STATUS_BUFFER_OVERFLOW) return 0; }

1 0

Rémi Bernon : kernel32/tests: Add more (Global|Local)ReAlloc tests.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 170e04648034f548e118625f969f09de8921024b URL: https://gitlab.winehq.org/wine/wine/-/commit/170e04648034f548e118625f969f09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 23:36:45 2022 +0100 kernel32/tests: Add more (Global|Local)ReAlloc tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 588 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 586 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : server: Set missing error status for get_process_image_name.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 37478a8695a291a5a95213468557b1de48de093b URL: https://gitlab.winehq.org/wine/wine/-/commit/37478a8695a291a5a95213468557b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 13 19:15:10 2021 +0200 server: Set missing error status for get_process_image_name. --- server/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/process.c b/server/process.c index 9bde05dc942..8a1fcd07a7f 100644 --- a/server/process.c +++ b/server/process.c @@ -1536,6 +1536,7 @@ DECL_HANDLER(get_process_image_name) } else set_error( STATUS_BUFFER_TOO_SMALL ); } + else set_error( STATUS_INVALID_HANDLE ); release_object( process ); }

1 0

Rémi Bernon : riched20: Call GlobalReAlloc with GMEM_MOVEABLE flag.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: dfd44bb979ee2052eceff094083147e9879fa807 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd44bb979ee2052eceff094083147… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 17:13:19 2022 +0100 riched20: Call GlobalReAlloc with GMEM_MOVEABLE flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/riched20/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 3a8440ffcd6..c94951b8f6f 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -375,7 +375,7 @@ static DWORD CALLBACK ME_AppendToHGLOBAL(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG if (pData->nLength+cb+1 >= cb) { /* round up to 2^17 */ int nNewSize = (((nMaxSize+cb+1)|0x1FFFF)+1) & 0xFFFE0000; - pData->hData = GlobalReAlloc(pData->hData, nNewSize, 0); + pData->hData = GlobalReAlloc(pData->hData, nNewSize, GMEM_MOVEABLE); } pDest = GlobalLock(pData->hData); memcpy(pDest + pData->nLength, lpBuff, cb); @@ -397,7 +397,7 @@ static HGLOBAL get_rtf_text(ME_TextEditor *editor, const ME_Cursor *start, int n es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = ME_AppendToHGLOBAL; ME_StreamOutRange(editor, SF_RTF, start, nChars, &es); - GlobalReAlloc(gds.hData, gds.nLength+1, 0); + GlobalReAlloc(gds.hData, gds.nLength+1, GMEM_MOVEABLE); return gds.hData; }

1 0

Rémi Bernon : kernelbase: Don't try in-place HeapReAlloc in LocalReAlloc.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 2be9b0ff4a61f3738eb2c05a7f196a60a95d40c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2be9b0ff4a61f3738eb2c05a7f196a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 14:28:43 2022 +0100 kernelbase: Don't try in-place HeapReAlloc in LocalReAlloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/kernel32/tests/heap.c | 20 ++++++++------------ dlls/kernelbase/memory.c | 4 ++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 7760017bd24..069f7c7a8d6 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1675,10 +1675,8 @@ static void test_GlobalAlloc(void) ok( size == 10, "GlobalSize returned %Iu\n", size ); SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( mem, 10, 0 ); - todo_wine ok( !tmp_mem || broken( tmp_mem == mem ) /* w1064v1507 / w1064v1607 */, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY || broken( GetLastError() == 0xdeadbeef ) /* w1064v1507 / w1064v1607 */, "got error %lu\n", GetLastError() ); if (tmp_mem) mem = tmp_mem; @@ -1759,7 +1757,7 @@ static void test_GlobalAlloc(void) { ok( !is_mem_entry( tmp_mem ), "unexpected moveable %p\n", tmp_mem ); if (flags == GMEM_MODIFY) ok( tmp_mem == mem, "GlobalReAlloc returned %p\n", tmp_mem ); - else if (flags != GMEM_MOVEABLE) todo_wine ok( !tmp_mem || broken( tmp_mem == mem ) /* w8 */, "GlobalReAlloc succeeded\n" ); + else if (flags != GMEM_MOVEABLE) todo_wine_if(flags) ok( !tmp_mem || broken( tmp_mem == mem ) /* w8 */, "GlobalReAlloc succeeded\n" ); else todo_wine ok( tmp_mem != mem, "GlobalReAlloc returned %p\n", tmp_mem ); } else @@ -1779,7 +1777,7 @@ static void test_GlobalAlloc(void) todo_wine_if((flags & GMEM_MOVEABLE) && !(flags & GMEM_MODIFY)) ok( size == 12, "GlobalSize returned %Iu\n", size ); } - else todo_wine ok( size == 12 || broken( size == 10 ) /* w8 */, "GlobalSize returned %Iu\n", size ); + else ok( size == 12 || broken( size == 10 ) /* w8 */, "GlobalSize returned %Iu\n", size ); mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); @@ -1794,7 +1792,7 @@ static void test_GlobalAlloc(void) { ok( !is_mem_entry( tmp_mem ), "unexpected moveable %p\n", tmp_mem ); if (flags == GMEM_MODIFY) ok( tmp_mem == mem, "GlobalReAlloc returned %p\n", tmp_mem ); - else if (flags != GMEM_MOVEABLE) todo_wine ok( !tmp_mem || broken( tmp_mem == mem ) /* w8 */, "GlobalReAlloc succeeded\n" ); + else if (flags != GMEM_MOVEABLE) todo_wine_if(flags) ok( !tmp_mem || broken( tmp_mem == mem ) /* w8 */, "GlobalReAlloc succeeded\n" ); else todo_wine ok( tmp_mem != mem, "GlobalReAlloc returned %p\n", tmp_mem ); } else @@ -1814,7 +1812,7 @@ static void test_GlobalAlloc(void) todo_wine_if((flags & GMEM_MOVEABLE) && !(flags & GMEM_MODIFY)) ok( size == 12, "GlobalSize returned %Iu\n", size ); } - else todo_wine ok( size == 12 || broken( size == 0 ) /* w8 */, "GlobalSize returned %Iu\n", size ); + else ok( size == 12 || broken( size == 0 ) /* w8 */, "GlobalSize returned %Iu\n", size ); mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); @@ -2369,10 +2367,8 @@ static void test_LocalAlloc(void) ok( size == 10, "LocalSize returned %Iu\n", size ); SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( mem, 10, 0 ); - todo_wine ok( !tmp_mem || broken( tmp_mem == mem ) /* w1064v1507 / w1064v1607 */, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY || broken( GetLastError() == 0xdeadbeef ) /* w1064v1507 / w1064v1607 */, "got error %lu\n", GetLastError() ); if (tmp_mem) mem = tmp_mem; @@ -2434,14 +2430,14 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( mem, 10, flags ); ok( !is_mem_entry( tmp_mem ), "unexpected moveable %p\n", tmp_mem ); if (flags & LMEM_MODIFY) ok( tmp_mem == mem, "LocalReAlloc returned %p\n", tmp_mem ); - else if (flags != LMEM_MOVEABLE) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); + else if (flags != LMEM_MOVEABLE) todo_wine_if(flags) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else todo_wine ok( tmp_mem != mem, "LocalReAlloc returned %p\n", tmp_mem ); if (tmp_mem) mem = tmp_mem; size = LocalSize( mem ); if (flags == LMEM_MOVEABLE) ok( size == 10, "LocalSize returned %Iu\n", size ); else if (flags) todo_wine_if(!(flags & LMEM_MODIFY)) ok( size == 12, "LocalSize returned %Iu\n", size ); - else todo_wine ok( size == 12, "LocalSize returned %Iu\n", size ); + else ok( size == 12, "LocalSize returned %Iu\n", size ); mem = LocalFree( mem ); ok( !mem, "LocalFree failed, error %lu\n", GetLastError() ); @@ -2454,14 +2450,14 @@ static void test_LocalAlloc(void) tmp_mem = LocalReAlloc( mem, 0, flags ); ok( !is_mem_entry( tmp_mem ), "unexpected moveable %p\n", tmp_mem ); if (flags & LMEM_MODIFY) ok( tmp_mem == mem, "LocalReAlloc returned %p\n", tmp_mem ); - else if (flags != LMEM_MOVEABLE) todo_wine ok( !tmp_mem, "LocalReAlloc succeeded\n" ); + else if (flags != LMEM_MOVEABLE) todo_wine_if(flags) ok( !tmp_mem, "LocalReAlloc succeeded\n" ); else todo_wine ok( tmp_mem != mem, "LocalReAlloc returned %p\n", tmp_mem ); if (tmp_mem) mem = tmp_mem; size = LocalSize( mem ); if (flags == LMEM_MOVEABLE) ok( size == 0 || broken( size == 1 ) /* w7 */, "LocalSize returned %Iu\n", size ); else if (flags) todo_wine_if(!(flags & LMEM_MODIFY)) ok( size == 12, "LocalSize returned %Iu\n", size ); - else todo_wine ok( size == 12, "LocalSize returned %Iu\n", size ); + else ok( size == 12, "LocalSize returned %Iu\n", size ); mem = LocalFree( mem ); ok( !mem, "LocalFree failed, error %lu\n", GetLastError() ); diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4c462c1633b..5710ee3b082 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -990,13 +990,13 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f HeapValidate( heap, HEAP_NO_SERIALIZE, ptr )) { if (flags & LMEM_MODIFY) ret = handle; - else + else if (flags & LMEM_MOVEABLE) { - if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; ret = HeapReAlloc( heap, heap_flags, ptr, size ); if (ret) RtlSetUserValueHeap( heap, heap_flags, ret, ret ); else SetLastError( ERROR_NOT_ENOUGH_MEMORY ); } + else SetLastError( ERROR_NOT_ENOUGH_MEMORY ); } else if ((mem = unsafe_mem_from_HLOCAL( handle ))) {

1 0

Rémi Bernon : user32: Call GlobalReAlloc with GMEM_MOVEABLE flag.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: f051444ff8c285c0048c594501b6f5012847453d URL: https://gitlab.winehq.org/wine/wine/-/commit/f051444ff8c285c0048c594501b6f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 19 17:14:28 2022 +0100 user32: Call GlobalReAlloc with GMEM_MOVEABLE flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53474 --- dlls/user32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 8ae20e53189..db86b447148 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -189,7 +189,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size ) /* rebuild the target handle from the data received in GetClipboardData */ static HANDLE unmarshal_data( UINT format, void *data, data_size_t size ) { - HANDLE handle = GlobalReAlloc( data, size, 0 ); /* release unused space */ + HANDLE handle = GlobalReAlloc( data, size, GMEM_MOVEABLE ); /* release unused space */ switch (format) {

1 0

Nikolay Sivov : ntdll: Use system language as preferred, if user language is custom-unspecified.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 29cbec5e6c262239edbfafd5ccd94d8ade44cddf URL: https://gitlab.winehq.org/wine/wine/-/commit/29cbec5e6c262239edbfafd5ccd94d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 17:14:11 2022 +0300 ntdll: Use system language as preferred, if user language is custom-unspecified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/locale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 7e1a2c96eaa..26302cfb376 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -193,13 +193,16 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG NTSTATUS status; ULONG len; - FIXME("(0x%lx %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); + FIXME("(0x%lx %#x %p %p %p) returning a dummy value (current locale)\n", flags, lang, count, buffer, size); if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str; + if (lang == LOCALE_CUSTOM_UNSPECIFIED) + NtQueryInstallUILanguage( &lang ); + str.Buffer = name; str.MaximumLength = sizeof(name); status = RtlLcidToLocaleName( lang, &str, 0, FALSE );

1 0

Paul Gofman : xinputuap.dll: Add new dll.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 25c52eb7645508d213d8cb2e2019217e9a0ba89b URL: https://gitlab.winehq.org/wine/wine/-/commit/25c52eb7645508d213d8cb2e201921… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 18:20:25 2021 -0700 xinputuap.dll: Add new dll. Based on a patch by Yusuf Khan <yusisamerican(a)gmail.com>. Required for Halo Infinite. --- configure | 2 ++ configure.ac | 1 + dlls/xinputuap/Makefile.in | 8 ++++++++ dlls/xinputuap/version.rc | 27 +++++++++++++++++++++++++++ dlls/xinputuap/xinputuap.spec | 8 ++++++++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 66519182d59..74727004efd 100755 --- a/configure +++ b/configure @@ -1543,6 +1543,7 @@ enable_xinput1_2 enable_xinput1_3 enable_xinput1_4 enable_xinput9_1_0 +enable_xinputuap enable_xmllite enable_xolehlp enable_xpsprint @@ -22020,6 +22021,7 @@ wine_fn_config_makefile dlls/xinput1_3 enable_xinput1_3 wine_fn_config_makefile dlls/xinput1_3/tests enable_tests wine_fn_config_makefile dlls/xinput1_4 enable_xinput1_4 wine_fn_config_makefile dlls/xinput9_1_0 enable_xinput9_1_0 +wine_fn_config_makefile dlls/xinputuap enable_xinputuap wine_fn_config_makefile dlls/xmllite enable_xmllite wine_fn_config_makefile dlls/xmllite/tests enable_tests wine_fn_config_makefile dlls/xolehlp enable_xolehlp diff --git a/configure.ac b/configure.ac index 32eb88129eb..7313fde9a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -3304,6 +3304,7 @@ WINE_CONFIG_MAKEFILE(dlls/xinput1_3) WINE_CONFIG_MAKEFILE(dlls/xinput1_3/tests) WINE_CONFIG_MAKEFILE(dlls/xinput1_4) WINE_CONFIG_MAKEFILE(dlls/xinput9_1_0) +WINE_CONFIG_MAKEFILE(dlls/xinputuap) WINE_CONFIG_MAKEFILE(dlls/xmllite) WINE_CONFIG_MAKEFILE(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE(dlls/xolehlp) diff --git a/dlls/xinputuap/Makefile.in b/dlls/xinputuap/Makefile.in new file mode 100644 index 00000000000..5d311fe7c31 --- /dev/null +++ b/dlls/xinputuap/Makefile.in @@ -0,0 +1,8 @@ +MODULE = xinputuap.dll +IMPORTS = hid setupapi advapi32 user32 +PARENTSRC = ../xinput1_3 + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/xinputuap/version.rc b/dlls/xinputuap/version.rc new file mode 100644 index 00000000000..557189b1596 --- /dev/null +++ b/dlls/xinputuap/version.rc @@ -0,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2021 Yusuf Khan + * + * 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 Common Controller API" +#define WINE_FILENAME_STR "xinputuap.dll" +#define WINE_FILEVERSION 10,0,19041,746 +#define WINE_FILEVERSION_STR "10.0.19041.746" +#define WINE_PRODUCTVERSION 10,0,19041,746 +#define WINE_PRODUCTVERSION_STR "10.0" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xinputuap/xinputuap.spec b/dlls/xinputuap/xinputuap.spec new file mode 100644 index 00000000000..4a5ee5c51d8 --- /dev/null +++ b/dlls/xinputuap/xinputuap.spec @@ -0,0 +1,8 @@ +1 stdcall -private DllMain(long long ptr) +2 stdcall XInputEnable(long) +3 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr) +4 stdcall XInputGetBatteryInformation(long long ptr) +5 stdcall XInputGetCapabilities(long long ptr) +6 stdcall XInputGetKeystroke(long long ptr) +7 stdcall XInputGetState(long ptr) +8 stdcall XInputSetState(long ptr)

1 0