wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Jetro Jormalainen : dinput: Handle username in EnumDevicesBySemantics.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 41b126b5fcf2a8c7b4c36afda3fb15f549d42bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b126b5fcf2a8c7b4c36afda… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Thu Mar 2 20:51:41 2017 +0200 dinput: Handle username in EnumDevicesBySemantics. EnumDevicesBySemantics enums only devices with given username when DIEDBSFL_THISUSER is set and only unowned devices when DIEDBSFL_AVAILABLEDEVICES is set. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 111 ++++++++++++++++++++++++++++++++++++++------ dlls/dinput8/tests/dinput.c | 11 ++++- 2 files changed, 105 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41b126b5fcf2a8c7b4c36…

1 0

Jetro Jormalainen : dinput: Keep username same between device objects.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 967399eba07c33548c7bb941371d03c18547517c URL: http://source.winehq.org/git/wine.git/?a=commit;h=967399eba07c33548c7bb9413… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Thu Mar 2 20:51:40 2017 +0200 dinput: Keep username same between device objects. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/dinput/device_private.h | 1 - dlls/dinput/dinput_main.c | 6 ++++++ dlls/dinput/dinput_private.h | 7 +++++++ dlls/dinput8/tests/device.c | 11 +++++++++++ 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a9ef2d4..7b83a39 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1308,11 +1308,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, case (DWORD_PTR) DIPROP_USERNAME: { LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); - break; + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + if (*device_player->username) + { + lstrcpynW(ps->wsz, device_player->username, sizeof(ps->wsz)/sizeof(WCHAR)); + return DI_OK; + } + else break; + } + } + return S_FALSE; } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); @@ -1390,10 +1403,29 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( case (DWORD_PTR) DIPROP_USERNAME: { LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; + BOOL found = FALSE; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + found = TRUE; + break; + } + } + if (!found && (device_player = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct DevicePlayer)))) + { + list_add_tail(&This->dinput->device_players, &device_player->entry); + device_player->instance_guid = This->guid; + } + if (device_player) + lstrcpynW(device_player->username, ps->wsz, + sizeof(device_player->username)/sizeof(WCHAR)); break; } default: diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index c4fbe85..52bbec4 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,7 +81,6 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ - WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index ab6a2e8..2bf9f38 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -577,6 +577,7 @@ static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwV This->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectInputImpl*->crit"); list_init( &This->devices_list ); + list_init( &This->device_players ); /* Add self to the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); @@ -599,11 +600,16 @@ static void uninitialize_directinput_instance(IDirectInputImpl *This) { if (This->initialized) { + struct DevicePlayer *device_player, *device_player2; /* Remove self from the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); list_remove( &This->entry ); LeaveCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, + &This->device_players, struct DevicePlayer, entry ) + HeapFree(GetProcessHeap(), 0, device_player); + check_hook_thread(); This->crit.DebugInfo->Spare[0] = 0; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 176c0e0..6c93e16 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -46,6 +46,7 @@ struct IDirectInputImpl DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list devices_list; /* list of all created dinput devices */ + struct list device_players; /* device instance guid to player name */ }; /* Function called by all devices that Wine supports */ @@ -56,6 +57,12 @@ struct dinput_device { HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); }; +struct DevicePlayer { + GUID instance_guid; + WCHAR username[MAX_PATH]; + struct list entry; +}; + extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6753b73..2b06f62 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -174,6 +174,7 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec struct enum_data *data = pvRef; DWORD cnt; DIDEVICEOBJECTDATA buffer[5]; + IDirectInputDevice8A *lpdid2; if (!data) return DIENUM_CONTINUE; @@ -205,6 +206,10 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); } + /* Creating second device object to check if it has the same username */ + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &lpdid2, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + /* Building and setting an action map */ /* It should not use any pre-stored mappings so we use DIDBAM_HWDEFAULTS */ hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_HWDEFAULTS); @@ -231,6 +236,11 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); + dps.wsz[0] = '\0'; + hr = IDirectInputDevice_GetProperty(lpdid2, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); + /* Test buffer size */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(dp); @@ -315,6 +325,7 @@ static void test_action_mapping(void) af.dwBufferSize = 32; /* This enumeration builds and sets the action map for all devices */ + data.pDI = pDI; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);

1 0

Nikolay Sivov : xmllite/writer: Fix Release() trace.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 5b78cc992cd183a5ad8b2e50384529a3c1da59ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b78cc992cd183a5ad8b2e503… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 15:53:03 2017 +0300 xmllite/writer: Fix Release() trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 55a53a6..3a0bd29 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -473,7 +473,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) xmlwriter *This = impl_from_IXmlWriter(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->>(%u)\n", This, ref); + TRACE("(%p)->(%u)\n", This, ref); if (ref == 0) { struct element *element, *element2;

1 0

Hugh McMaster : reg/tests: Add some line concatenation tests.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 58f289b58fb0cb5284afc716bcc951e5ba805049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f289b58fb0cb5284afc716b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 3 09:42:34 2017 +0000 reg/tests: Add some line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7c79b31..f6d623f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1162,6 +1162,34 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line6\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1547,6 +1575,34 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line6\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n"

1 0

Jacek Caban : winedbg: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: de002161feb2a415f13c3ce17e2360a3a1d98b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de002161feb2a415f13c3ce17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:12:06 2017 +0100 winedbg: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 739c4eb..ff75874 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,6 +1,6 @@ MODULE = winedbg.exe APPMODE = -mconsole -IMPORTS = psapi dbghelp advapi32 +IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 EXTRALIBS = $(POLL_LIBS)

1 0

Jacek Caban : taskmgr: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 35faa0e7ed3efe31d77f15afa74a575bb922960c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35faa0e7ed3efe31d77f15afa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:12:00 2017 +0100 taskmgr: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 1743024..48313e9 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \

1 0

Jacek Caban : taskkill: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: e1379973998b8edfa4ca25647d6cd40fa1cf93ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1379973998b8edfa4ca25647… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:52 2017 +0100 taskkill: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 20ce1cc..ec53cdb 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskkill.exe APPMODE = -mconsole -municode -IMPORTS = psapi user32 +IMPORTS = user32 C_SRCS = taskkill.c

1 0

Jacek Caban : dxdiagn: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: f4d9c3c9942d830c499c85aebe6b02f10f025207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9c3c9942d830c499c85aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:45 2017 +0100 dxdiagn: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index df3fc77..3a1017e 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 psapi user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 C_SRCS = \ container.c \

1 0

Jacek Caban : dbghelp: Removed no longer needed psapi import.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 4bbb252adc266ce06ef46bdd905682b446064993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbb252adc266ce06ef46bdd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:38 2017 +0100 dbghelp: Removed no longer needed psapi import. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 86846cb..3e120e8 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,7 +1,6 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp EXTRADEFS = -D_IMAGEHLP_SOURCE_ -IMPORTS = psapi DELAYIMPORTS = version EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)

1 0

Jacek Caban : psapi.h: Added support for PSAPI_VERSION version 2.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 853b4148dd9c352d6cb9608df6e281c4fffec590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853b4148dd9c352d6cb9608df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 3 13:11:30 2017 +0100 psapi.h: Added support for PSAPI_VERSION version 2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/psapi.h | 34 ++++++++++++++++++++++++++++++++++ programs/wscript/tests/run.c | 1 + 2 files changed, 35 insertions(+) diff --git a/include/psapi.h b/include/psapi.h index fbdd903..c7663f8 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -21,6 +21,10 @@ #ifndef __WINE_PSAPI_H #define __WINE_PSAPI_H +#ifndef PSAPI_VERSION +#define PSAPI_VERSION 2 +#endif + typedef struct _MODULEINFO { LPVOID lpBaseOfDll; DWORD SizeOfImage; @@ -79,6 +83,36 @@ typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID, PENUM_PAGE_FILE_INFORMATION, extern "C" { #endif +#if PSAPI_VERSION > 1 +#define EnumProcesses K32EnumProcesses +#define EnumProcessModules K32EnumProcessModules +#define EnumProcessModulesEx K32EnumProcessModulesEx +#define GetModuleBaseNameA K32GetModuleBaseNameA +#define GetModuleBaseNameW K32GetModuleBaseNameW +#define GetModuleFileNameExA K32GetModuleFileNameExA +#define GetModuleFileNameExW K32GetModuleFileNameExW +#define GetModuleInformation K32GetModuleInformation +#define EmptyWorkingSet K32EmptyWorkingSet +#define QueryWorkingSet K32QueryWorkingSet +#define QueryWorkingSetEx K32QueryWorkingSetEx +#define InitializeProcessForWsWatch K32InitializeProcessForWsWatch +#define GetWsChanges K32GetWsChanges +#define GetWsChangesEx K32GetWsChangesEx +#define GetMappedFileNameW K32GetMappedFileNameW +#define GetMappedFileNameA K32GetMappedFileNameA +#define EnumDeviceDrivers K32EnumDeviceDrivers +#define GetDeviceDriverBaseNameA K32GetDeviceDriverBaseNameA +#define GetDeviceDriverBaseNameW K32GetDeviceDriverBaseNameW +#define GetDeviceDriverFileNameA K32GetDeviceDriverFileNameA +#define GetDeviceDriverFileNameW K32GetDeviceDriverFileNameW +#define GetProcessMemoryInfo K32GetProcessMemoryInfo +#define GetPerformanceInfo K32GetPerformanceInfo +#define EnumPageFilesW K32EnumPageFilesW +#define EnumPageFilesA K32EnumPageFilesA +#define GetProcessImageFileNameA K32GetProcessImageFileNameA +#define GetProcessImageFileNameW K32GetProcessImageFileNameW +#endif + BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD); diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index eb840cc..770fd8f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -21,6 +21,7 @@ #define COBJMACROS #define CONST_VTABLE +#define PSAPI_VERSION 1 #include <initguid.h> #include <windows.h> #include <psapi.h>

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
72
Older →

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 March 2017