wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Dmitry Timoshkov : activeds: Implement ADsGetObject.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 18d7356f0ca1c07f09cfcf0de6a9b61349fc257a URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d7356f0ca1c07f09cfcf0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:34 2020 +0800 activeds: Implement ADsGetObject. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 10 +++++++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..6a825f0913 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT hr; + + hr = ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); + if (hr != S_OK) + hr = ADsOpenObject(path, NULL, NULL, 0, riid, obj); + return hr; } /***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e0e562e8bf..28e41e4d95 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads); + hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password);

1 0

Dmitry Timoshkov : activeds: ADsOpenObject should return E_FAIL by default.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 2a1841f5cfe936c69a8bfd9aca202f4e3e6a894a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a1841f5cfe936c69a8bfd9a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:14 2020 +0800 activeds: ADsOpenObject should return E_FAIL by default. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 6f8c00aa89..e0e562e8bf 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password);

1 0

Dmitry Timoshkov : adsldp: Bind to an LDAP server after connection.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 3eb581db430a6839690bb3828225bd66bc2e5a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb581db430a6839690bb382… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:07 2020 +0800 adsldp: Bind to an LDAP server after connection. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 29 ++++++++++++-- dlls/adsldp/adsldp_private.h | 24 ++++++++++++ dlls/adsldp/ldap.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/ldap.c | 31 +++++++++++---- 5 files changed, 166 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb581db430a6839690b…

1 0

Dmitry Timoshkov : adsldp: If secure open object fails fallback to simple bind.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: e396c01a2b2fbd8434d76c824f0bfb99090714fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e396c01a2b2fbd8434d76c82… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:52:55 2020 +0800 adsldp: If secure open object fails fallback to simple bind. This matches ADsGetObject() behaviour described in MSDN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index acebf717aa..30bd1672f6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -111,6 +111,8 @@ static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx * if (hr != S_OK) return hr; hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + if (hr != S_OK) + hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, 0, &disp); if (hr == S_OK) { hr = CreatePointerMoniker((IUnknown *)disp, mk);

1 0

Rémi Bernon : tools: Only update protocol version if something changed.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: f181d5ce82470639459555cd59a076963861a61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f181d5ce82470639459555cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 19 12:28:37 2020 +0100 tools: Only update protocol version if something changed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 ++++ tools/make_requests | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af4507b5d1..ba70d13a39 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6706,6 +6706,10 @@ union generic_reply struct resume_process_reply resume_process_reply; }; +/* ### protocol_version begin ### */ + #define SERVER_PROTOCOL_VERSION 596 +/* ### protocol_version end ### */ + #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/tools/make_requests b/tools/make_requests index 4e39bb65a9..a30c9be905 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -406,10 +406,23 @@ print SERVER_PROT " struct reply_header reply_header;\n"; foreach my $req (@requests) { print SERVER_PROT " struct ${req}_reply ${req}_reply;\n"; } print SERVER_PROT "};\n\n"; -printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol + 1; +print SERVER_PROT "/* ### protocol_version begin ### */\n\n"; +printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol; +print SERVER_PROT "/* ### protocol_version end ### */\n\n"; print SERVER_PROT "#endif /* __WINE_WINE_SERVER_PROTOCOL_H */\n"; close SERVER_PROT; -update_file( "include/wine/server_protocol.h" ); + +if (update_file( "include/wine/server_protocol.h" )) +{ + my @version_lines = (); + + push @version_lines, sprintf( "#define SERVER_PROTOCOL_VERSION %d\n", $protocol + 1 ); + + replace_in_file( "include/wine/server_protocol.h", + "### protocol_version begin ###", + "### protocol_version end ###", + @version_lines ); +} ### Output the dumping function tables

1 0

Vijay Kiran Kamuju : include: Add missing GUIDs in dsound.h.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 90233748209bb9a5c0adfc41a100c83535a1b9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90233748209bb9a5c0adfc41… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:28:43 2020 +0100 include: Add missing GUIDs in dsound.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48750 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index d397e2315c..85235ef1bb 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -116,6 +116,11 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); +#define DSD3DALG_DEFAULT GUID_NULL +DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); + DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xDAFD8210,0x5711,0x4B91,0x9F,0xE3,0xF7,0x5B,0x7A,0xE2,0x79,0xBF); DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xEFE6629C,0x81F7,0x4281,0xBD,0x91,0xC9,0xD6,0x04,0xA9,0x5A,0xF6); DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xEFCA3D92,0xDFD8,0x4672,0xA6,0x03,0x74,0x20,0x89,0x4B,0xAD,0x98);

1 0

Vijay Kiran Kamuju : include: Add missing effect related defines and enums in dsound.h.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 8f1ec07e48c8bed452a533a10f49d8c3e8f5440c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1ec07e48c8bed452a533a1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:27:00 2020 +0100 include: Add missing effect related defines and enums in dsound.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index b4a2509e89..d397e2315c 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1769,6 +1769,92 @@ DECLARE_INTERFACE_(IDirectSoundFXWavesReverb,IUnknown) #define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a) #endif +enum +{ + DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_THINDOOR, + DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR, + DSFX_I3DL2_MATERIAL_PRESET_WOODWALL, + DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL, + DSFX_I3DL2_MATERIAL_PRESET_STONEWALL, + DSFX_I3DL2_MATERIAL_PRESET_CURTAIN +}; + +#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW -2800,0.71f +#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW -5000,0.40f +#define I3DL2_MATERIAL_PRESET_THINDOOR -1800,0.66f +#define I3DL2_MATERIAL_PRESET_THICKDOOR -4400,0.64f +#define I3DL2_MATERIAL_PRESET_WOODWALL -4000,0.50f +#define I3DL2_MATERIAL_PRESET_BRICKWALL -5000,0.60f +#define I3DL2_MATERIAL_PRESET_STONEWALL -6000,0.68f +#define I3DL2_MATERIAL_PRESET_CURTAIN -1200,0.15f + +enum +{ + DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT, + DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC, + DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL, + DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM, + DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE, + DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA, + DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR, + DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR, + DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY, + DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST, + DSFX_I3DL2_ENVIRONMENT_PRESET_CITY, + DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS, + DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN, + DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT, + DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE, + DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER, + DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE +}; + +#define I3DL2_ENVIRONMENT_PRESET_DEFAULT -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_GENERIC -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL -1000,-6000,0.0f,0.17f,0.10f,-1204,0.001f,207,0.002f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ROOM -1000,-454,0.0f,0.40f,0.83f,-1646,0.002f,53,0.003f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_BATHROOM -1000,-1200,0.0f,1.49f,0.54f,-370,0.007f,1030,0.011f,100.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM -1000,-6000,0.0f,0.50f,0.10f,-1376,0.003f,-1104,0.004f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONEROOM -1000,-300,0.0f,2.31f,0.64f,-711,0.012f,83,0.017f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM -1000,-476,0.0f,4.32f,0.59f,-789,0.020f,-289,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL -1000,-500,0.0f,3.92f,0.70f,-1230,0.020f,-2,0.029f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CAVE -1000,0,0.0f,2.91f,1.30f,-602,0.015f,-302,0.022f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ARENA -1000,-698,0.0f,7.24f,0.33f,-1166,0.020f,16,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HANGAR -1000,-1000,0.0f,10.05f,0.23f,-602,0.020f,198,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000,0.0f,0.30f,0.10f,-1831,0.002f,-1630,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HALLWAY -1000,-300,0.0f,1.49f,0.59f,-1219,0.007f,441,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR -1000,-237,0.0f,2.70f,0.79f,-1214,0.013f,395,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ALLEY -1000,-270,0.0f,1.49f,0.86f,-1204,0.007f,-4,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_FOREST -1000,-3300,0.0f,1.49f,0.54f,-2560,0.162f,-613,0.088f,79.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CITY -1000,-800,0.0f,1.49f,0.67f,-2273,0.007f,2217,0.011f,50.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS -1000,-2500,0.0f,1.49f,0.21f,-2780,0.300f,-2014,0.100f,27.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_QUARRY -1000,-1000,0.0f,1.49f,0.83f,-10000,0.061f,500,0.025f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLAIN -1000,-2000,0.0f,1.49f,0.50f,-2466,0.179f,-2514,0.100f,21.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT -1000,0,0.0f,1.65f,1.50f,-1363,0.008f,-1153,0.012f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE -1000,-1000,0.0f,2.81f,0.14f,429,0.014f,648,0.011f,80.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER -1000,-4000,0.0f,1.49f,0.10f,-449,0.007f,1700,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM -1000,-600,0.0f,1.10f,0.83f,-400,0.005f,500,0.010f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM -1000,-600,0.0f,1.30f,0.83f,-1000,0.010f,-200,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM -1000,-600,0.0f,1.50f,0.83f,-1600,0.020f,-1000,0.040f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL -1000,-600,0.0f,1.80f,0.70f,-1300,0.015f,-800,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL -1000,-600,0.0f,1.80f,0.70f,-2000,0.030f,-1400,0.060f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLATE -1000,-200,0.0f,1.30f,0.90f,0,0.002f,0,0.010f,100.0f,75.0f,5000.0f + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

Zebediah Figura : kernel32/tests: Remove a test for Unix-style paths.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 7c6222838c40f11e44c6076b1a8c8b019920040f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6222838c40f11e44c6076b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:53 2020 -0500 kernel32/tests: Remove a test for Unix-style paths. Wine intentionally treats these specially, so there is no point in testing them. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb834aa3c3..ded167f3e0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -847,26 +847,22 @@ static void test_GetVolumePathNameA(void) NO_ERROR, NO_ERROR }, { /* test 37 */ - "/unix-style/absolute/path", "%CurrentDrive%\\", sizeof(volume_path), - NO_ERROR, NO_ERROR - }, - { /* test 38 */ "\\??\\C:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 39 */ + { /* test 38 */ "\\??\\M:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 40 */ + { /* test 39 */ "somefile:def", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 41 */ + { /* test 40 */ "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, - { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + { /* test 41: a reasonable forward slash path that is guaranteed to exist */ "C:/windows/system32", "C:\\", sizeof(volume_path), NO_ERROR, NO_ERROR },

1 0

Zebediah Figura : kernel32/tests: Add some tests for mounted folders.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 5885c70b18f7293e33537a04581363faa887016b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5885c70b18f7293e33537a04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:52 2020 -0500 kernel32/tests: Add some tests for mounted folders. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 231 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5885c70b18f7293e3353…

1 0

Jacek Caban : dbghelp: Use Windows API to map macho files.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: ebf57f01f4890b726a0af702ab7751258f5ab03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf57f01f4890b726a0af702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 18:35:54 2020 +0100 dbghelp: Use Windows API to map macho files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 136 +++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebf57f01f4890b726a0a…

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