July 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : include: Define IDirectSoundFXI3DL2Reverb interface.
by Alexandre Julliard July 7, 2017

July 7, 2017

Module: wine Branch: master Commit: 4dc3dad62193854d7f9390ec408f72e7707d045f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc3dad62193854d7f9390ec4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 4 05:16:11 2017 +0000 include: Define IDirectSoundFXI3DL2Reverb interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index fa23e86..d4f3918 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -103,6 +103,12 @@ DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xEDCB4C7A,0xDAAB,0x4216,0xA4,0x2E,0x6C, typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX,**LPLPDIRECTSOUNDFULLDUPLEX; #define IID_IDirectSoundFullDuplex8 IID_IDirectSoundFullDuplex +DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4); +typedef struct IDirectSoundFXI3DL2Reverb *LPDIRECTSOUNDFXI3DL2REVERB; +#define IDirectSoundFXI3DL2Reverb8 IDirectSoundFXI3DL2Reverb +#define IID_IDirectSoundFXI3DL2Reverb8 IID_IDirectSoundFXI3DL2Reverb +typedef struct IDirectSoundFXI3DL2Reverb8 *LPDIRECTSOUNDFXI3DL2REVERB8; + DEFINE_GUID(DSDEVID_DefaultPlayback, 0xDEF00000,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); DEFINE_GUID(DSDEVID_DefaultCapture, 0xDEF00001,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); DEFINE_GUID(DSDEVID_DefaultVoicePlayback,0xDEF00002,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03); @@ -398,6 +404,24 @@ typedef struct _DSCBCAPS } DSCBCAPS, *LPDSCBCAPS; typedef const DSCBCAPS *LPCDSCBCAPS; +typedef struct _DSFXI3DL2Reverb +{ + LONG lRoom; + LONG lRoomHF; + FLOAT flRoomRolloffFactor; + FLOAT flDecayTime; + FLOAT flDecayHFRatio; + LONG lReflections; + FLOAT flReflectionsDelay; + LONG lReverb; + FLOAT flReverbDelay; + FLOAT flDiffusion; + FLOAT flDensity; + FLOAT flHFReference; +} DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; + +typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; + #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER #define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED #define DSCCAPS_MULTIPLECAPTURE 0x00000001 @@ -1214,6 +1238,46 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown) #define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->Initialize(a,b,c,d,e,f,g,h) #endif + +/***************************************************************************** + * IDirectSoundFXI3DL2Reverb interface + */ +#define INTERFACE IDirectSoundFXI3DL2Reverb +DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID, void**) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + + /*** IDirectSoundFXI3DL2Reverb methods ***/ + STDMETHOD(SetAllParameters)(THIS_ LPCDSFXI3DL2Reverb reverb) PURE; + STDMETHOD(GetAllParameters)(THIS_ LPDSFXI3DL2Reverb reverb) PURE; + STDMETHOD(SetPreset)(THIS_ DWORD preset) PURE; + STDMETHOD(GetPreset)(THIS_ DWORD *preset) PURE; + STDMETHOD(SetQuality)(THIS_ LONG quality) PURE; + STDMETHOD(GetQuality)(THIS_ LONG *quality) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirectSoundFXI3DL2Reverb_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirectSoundFXI3DL2Reverb_Release(p) (p)->lpVtbl->Release(p) +#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->lpVtbl->SetAllParameters(p,a) +#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a) +#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->lpVtbl->SetPreset(p,a) +#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->lpVtbl->GetPreset(p,a) +#else +#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirectSoundFXI3DL2Reverb_AddRef(p) (p)->AddRef() +#define IDirectSoundFXI3DL2Reverb_Release(p) (p)->Release() +#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a) (p)->SetAllParameters(a) +#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a) (p)->GetAllParameters(a) +#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a) (p)->SetPreset(a) +#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a) (p)->GetPreset(a) +#endif + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

Hugh McMaster : reg/tests: Test the effects of EOF on hex data during concatenation.
by Alexandre Julliard July 7, 2017

July 7, 2017

Module: wine Branch: master Commit: a0deb171e1ea041a84eb86fb68306db461831bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0deb171e1ea041a84eb86fb6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 7 11:47:21 2017 +0000 reg/tests: Test the effects of EOF on hex data during concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 98 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 58c2aae..af09290 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2133,19 +2133,59 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\", &r); + "\"Wine62a\"=hex(0):56,61,6c,75,65,\\", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", err); if (err == ERROR_SUCCESS) - todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + todo_wine verify_reg(hkey, "Wine62a", REG_NONE, "Value", 5, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62b\"=hex(7):4c,69,6e,65,20\\", &r); + "\"Wine62b\"=hex(2):25,50,41,54,48,25,\\", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegQueryValueExA(hkey, "Wine62b", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62c\"=hex:11,22,33,44,55,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62c", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62c", REG_BINARY, hex, 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62d\"=hex(7):4c,69,6e,65,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62d", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62e\"=hex(100):56,61,6c,75,65,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62e", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62e", 0x100, "Value", 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62f\"=hex(7):4c,69,6e,65,20\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62f"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3558,19 +3598,59 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\", &r); + "\"Wine62a\"=hex(0):56,61,6c,75,65,\\", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", err); if (err == ERROR_SUCCESS) - todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + todo_wine verify_reg(hkey, "Wine62a", REG_NONE, "Value", 5, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine62b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62b", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62c\"=hex:11,22,33,44,55,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62c", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62c", REG_BINARY, hex, 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62d\"=hex(7):4c,00,69,00,6e,00,65,00,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62d", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62e\"=hex(100):56,61,6c,75,65,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62e", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62e", 0x100, "Value", 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62f\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine62b"); + todo_wine verify_reg_nonexist(hkey, "Wine62f"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Alexandre Julliard : user32: Get rid of the Wine-specific OCR_DRAGOBJECT.
by Alexandre Julliard July 7, 2017

July 7, 2017

Module: wine Branch: master Commit: 078dad1ad118f35e3729f4138d58c220ab66acc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078dad1ad118f35e3729f4138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 09:20:12 2017 +0200 user32: Get rid of the Wine-specific OCR_DRAGOBJECT. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_dragobject.cur | Bin 326 -> 0 bytes dlls/user32/user32.rc | 7 +------ include/winuser.rh | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/user32/resources/ocr_dragobject.cur b/dlls/user32/resources/ocr_dragobject.cur deleted file mode 100644 index 45f593f..0000000 Binary files a/dlls/user32/resources/ocr_dragobject.cur and /dev/null differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 01fe13a..9009e0a 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -260,9 +260,6 @@ OCR_APPSTARTING CURSOR resources/ocr_appstarting.cur /* @makedep: resources/ocr_help.cur */ OCR_HELP CURSOR resources/ocr_help.cur -/* @makedep: resources/ocr_dragobject.cur */ -OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur - /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur @@ -270,9 +267,7 @@ OCR_PEN CURSOR resources/ocr_pen.cur OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur /* @makedep: resources/ocr_rdrhorz.cur */ -/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image - * is entirely different */ -/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ +OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur /* @makedep: resources/ocr_rdr2dim.cur */ OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur diff --git a/include/winuser.rh b/include/winuser.rh index e48a935..350d427 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -1014,7 +1014,6 @@ #define OCR_HELP 32651 /* DDK / Win16 */ #define OCR_RDRVERT 32652 /* DDK / Win16 */ #define OCR_RDRHORZ 32653 /* DDK / Win16 */ -#define OCR_DRAGOBJECT OCR_RDRHORZ /* FIXME: Wine-only */ #define OCR_RDR2DIM 32654 /* DDK / Win16 */ #define OCR_RDRNORTH 32655 /* DDK / Win16 */ #define OCR_RDRSOUTH 32656 /* DDK / Win16 */

1 0

Nikolay Sivov : d3drm: Initial support for storing animation keys.
by Alexandre Julliard July 7, 2017

July 7, 2017

Module: wine Branch: master Commit: 6704fc8b20d81a2f228f91b335a222dbbe0e1cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6704fc8b20d81a2f228f91b33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 7 02:18:40 2017 +0200 d3drm: Initial support for storing animation keys. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 23 ++++++ dlls/d3drm/frame.c | 187 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/tests/d3drm.c | 11 +-- 4 files changed, 211 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6704fc8b20d81a2f228f9…

1 0

Nikolay Sivov : d3drm: Implement DeleteKey().
by Alexandre Julliard July 7, 2017

July 7, 2017

Module: wine Branch: master Commit: 2f2e5b998a2fd8ecb6533529e445d7ac6b0389d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2e5b998a2fd8ecb6533529e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 7 02:18:41 2017 +0200 d3drm: Implement DeleteKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 48 +++++++++++++++++++++++--------- dlls/d3drm/tests/d3drm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6d2dc14..0d6ee14 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3348,16 +3348,15 @@ static SIZE_T d3drm_animation_get_insert_position(const struct d3drm_animation_k static const struct d3drm_animation_key *d3drm_animation_get_range(const struct d3drm_animation_keys *keys, D3DVALUE time_min, D3DVALUE time_max, SIZE_T *count) { - SIZE_T min, max; + SIZE_T min; if (!keys->count || time_max < keys->keys[0].time || time_min > keys->keys[keys->count - 1].time) return NULL; min = d3drm_animation_get_index_min(keys->keys, keys->count, time_min); - max = d3drm_animation_get_index_max(&keys->keys[min], keys->count - min, time_max); - - *count = max - min + 1; + if (count) + *count = d3drm_animation_get_index_max(&keys->keys[min], keys->count - min, time_max) - min + 1; return &keys->keys[min]; } @@ -3493,11 +3492,41 @@ static HRESULT WINAPI d3drm_animation1_AddScaleKey(IDirect3DRMAnimation *iface, return d3drm_animation2_AddScaleKey(&animation->IDirect3DRMAnimation2_iface, time, x, y, z); } +static void d3drm_animation_delete_key(struct d3drm_animation_keys *keys, const struct d3drm_animation_key *key) +{ + SIZE_T index = key - keys->keys; + + if (index < keys->count - 1) + memmove(&keys->keys[index], &keys->keys[index + 1], sizeof(*keys->keys) * (keys->count - index - 1)); + --keys->count; +} + +static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time) +{ + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); + const struct d3drm_animation_key *key; + + TRACE("iface %p, time %.8e.\n", iface, time); + + if ((key = d3drm_animation_get_range(&animation->rotate, time, time, NULL))) + d3drm_animation_delete_key(&animation->rotate, key); + + if ((key = d3drm_animation_get_range(&animation->position, time, time, NULL))) + d3drm_animation_delete_key(&animation->position, key); + + if ((key = d3drm_animation_get_range(&animation->scale, time, time, NULL))) + d3drm_animation_delete_key(&animation->scale, key); + + return D3DRM_OK; +} + static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3DVALUE time) { - FIXME("iface %p, time %.8e.\n", iface, time); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); - return E_NOTIMPL; + TRACE("iface %p, time %.8e.\n", iface, time); + + return d3drm_animation2_DeleteKey(&animation->IDirect3DRMAnimation2_iface, time); } static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame) @@ -3544,13 +3573,6 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation1_GetOptions(IDirect3DRMAnima return d3drm_animation2_GetOptions(&animation->IDirect3DRMAnimation2_iface); } -static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D3DVALUE time) -{ - FIXME("iface %p, time %.8e.\n", iface, time); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame) { struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f19558e..c59763d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -7013,9 +7013,81 @@ static void test_animation(void) memset(&key, 0, sizeof(key)); key.dwSize = sizeof(key); key.dwKeyType = D3DRMANIMATION_POSITIONKEY; + key.dvPositionKey.x = 8.0f; hr = IDirect3DRMAnimation2_AddKey(animation2, &key); ok(SUCCEEDED(hr), "Failed to add key, hr %#x.\n", hr); + /* Delete tests. */ + hr = IDirect3DRMAnimation_AddRotateKey(animation, 0.0f, &q); + ok(SUCCEEDED(hr), "Failed to add rotation key, hr %#.x\n", hr); + + hr = IDirect3DRMAnimation_AddScaleKey(animation, 0.0f, 1.0f, 2.0f, 1.0f); + ok(SUCCEEDED(hr), "Failed to add scale key, hr %#x.\n", hr); + + count = 0; + memset(keys, 0, sizeof(keys)); + hr = IDirect3DRMAnimation2_GetKeys(animation2, -1000.0f, 1000.0f, &count, keys); + ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr); + ok(count == 9, "Unexpected key count %u.\n", count); + + ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType); + ok(keys[1].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[1].dwKeyType); + ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType); + ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType); + ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType); + ok(keys[5].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[5].dwKeyType); + ok(keys[6].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[6].dwKeyType); + ok(keys[7].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[7].dwKeyType); + ok(keys[8].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[8].dwKeyType); + + ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime); + ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime); + ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime); + ok(keys[3].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[3].dvTime); + ok(keys[4].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[4].dvTime); + ok(keys[5].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[5].dvTime); + ok(keys[6].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[6].dvTime); + ok(keys[7].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[7].dvTime); + ok(keys[8].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[8].dvTime); + + hr = IDirect3DRMAnimation_DeleteKey(animation, -100.0f); + ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_DeleteKey(animation, 100.0f); + ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr); + + /* Only first Position keys are not removed. */ + hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f); + ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr); + + count = 0; + memset(keys, 0, sizeof(keys)); + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, keys); + ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr); + ok(count == 6, "Unexpected key count %u.\n", count); + + ok(keys[0].dwKeyType == D3DRMANIMATION_ROTATEKEY, "Unexpected key type %u.\n", keys[0].dwKeyType); + ok(keys[1].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[1].dwKeyType); + ok(keys[2].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[2].dwKeyType); + ok(keys[3].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[3].dwKeyType); + ok(keys[4].dwKeyType == D3DRMANIMATION_POSITIONKEY, "Unexpected key type %u.\n", keys[4].dwKeyType); + ok(keys[5].dwKeyType == D3DRMANIMATION_SCALEKEY, "Unexpected key type %u.\n", keys[5].dwKeyType); + + ok(keys[0].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[0].dvTime); + ok(keys[1].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[1].dvTime); + ok(keys[2].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[2].dvTime); + ok(keys[3].dvTime == 80.0f, "Unexpected key time %.8e.\n", keys[3].dvTime); + ok(keys[4].dvTime == 99.0f, "Unexpected key time %.8e.\n", keys[4].dvTime); + ok(keys[5].dvTime == 0.0f, "Unexpected key time %.8e.\n", keys[5].dvTime); + + hr = IDirect3DRMAnimation_DeleteKey(animation, 0.0f); + ok(SUCCEEDED(hr), "Failed to delete keys, hr %#x.\n", hr); + + count = 0; + hr = IDirect3DRMAnimation2_GetKeys(animation2, 0.0f, 100.0f, &count, NULL); + ok(SUCCEEDED(hr), "Failed to get key count, hr %#x.\n", hr); + ok(count == 3, "Unexpected key count %u.\n", count); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Andrey Gusev : ext-ms-win-kernel32-package-l1-1-1: Add dll.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: ebc3fa653ede9bef31897101c048a41e7ffe45d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc3fa653ede9bef31897101c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:18 2017 +0300 ext-ms-win-kernel32-package-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-kernel32-package-l1-1-1/Makefile.in | 1 + .../ext-ms-win-kernel32-package-l1-1-1.spec | 21 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 26 insertions(+) diff --git a/configure b/configure index 4fe266d..43f4331 100755 --- a/configure +++ b/configure @@ -1195,6 +1195,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 +enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 @@ -18262,6 +18263,7 @@ wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l wine_fn_config_dll ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 +wine_fn_config_dll ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index c389209..c22370f 100644 --- a/configure.ac +++ b/configure.ac @@ -3097,6 +3097,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/Makefile.in b/dlls/ext-ms-win-kernel32-package-l1-1-1/Makefile.in new file mode 100644 index 0000000..aa286b3 --- /dev/null +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-kernel32-package-l1-1-1.dll diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec new file mode 100644 index 0000000..ae23952 --- /dev/null +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec @@ -0,0 +1,21 @@ +@ stub AppContainerDeriveSidFromMoniker +@ stub AppContainerFreeMemory +@ stub AppContainerLookupMoniker +@ stub AppXFreeMemory +@ stub AppXGetPackageCapabilities +@ stub AppXGetPackageSid +@ stub AppXLookupMoniker +@ stub ClosePackageInfo +@ stub FormatApplicationUserModelId +@ stub GetPackageFamilyName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName +@ stub GetPackageId +@ stub GetPackageInfo +@ stub GetPackagePath +@ stub GetPackagesByPackageFamily +@ stub GetStagedPackageOrigin +@ stub OpenPackageInfoByFullName +@ stub PackageFamilyNameFromFullName +@ stub PackageFamilyNameFromId +@ stub PackageFullNameFromId +@ stub PackageIdFromFullName diff --git a/tools/make_specfiles b/tools/make_specfiles index 7feb1b8..0cacd45 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -240,6 +240,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-2", "api-ms-win-core-util-l1-1-0", "ext-ms-win-kernel32-package-current-l1-1-0", + "ext-ms-win-kernel32-package-l1-1-1", ], [ "kernel32",

1 0

Andrey Gusev : ext-ms-win-ras-rasapi32-l1-1-0: Add dll.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: c05df86b5fd20d13e6fcb5eb6d41f348c37cd7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05df86b5fd20d13e6fcb5eb6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:20 2017 +0300 ext-ms-win-ras-rasapi32-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ras-rasapi32-l1-1-0.spec | 19 +++++++++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 27 insertions(+) diff --git a/configure b/configure index 8ce432d..2998e0f 100755 --- a/configure +++ b/configure @@ -1202,6 +1202,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +enable_ext_ms_win_ras_rasapi32_l1_1_0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 @@ -18271,6 +18272,7 @@ wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 +wine_fn_config_dll ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index 154f6bf..374a380 100644 --- a/configure.ac +++ b/configure.ac @@ -3104,6 +3104,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-windowclass-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ras-rasapi32-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in new file mode 100644 index 0000000..29ebb93 --- /dev/null +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ras-rasapi32-l1-1-0.dll diff --git a/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec new file mode 100644 index 0000000..bb73c8a --- /dev/null +++ b/dlls/ext-ms-win-ras-rasapi32-l1-1-0/ext-ms-win-ras-rasapi32-l1-1-0.spec @@ -0,0 +1,19 @@ +@ stub RasAutoDialSharedConnection +@ stdcall RasConnectionNotificationW(ptr long long) rasapi32.RasConnectionNotificationW +@ stdcall RasDialW(ptr wstr ptr long ptr ptr) rasapi32.RasDialW +@ stdcall RasEnumConnectionsW(ptr ptr ptr) rasapi32.RasEnumConnectionsW +@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) rasapi32.RasEnumEntriesW +@ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressA +@ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) rasapi32.RasGetAutodialAddressW +@ stub RasGetConnectionStatistics +@ stdcall RasGetConnectStatusW(ptr ptr) rasapi32.RasGetConnectStatusW +@ stub RasGetCredentialsW +@ stdcall RasGetEntryDialParamsW(wstr ptr ptr) rasapi32.RasGetEntryDialParamsW +@ stub RasGetEntryHrasconnW +@ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) rasapi32.RasGetEntryPropertiesW +@ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) rasapi32.RasGetProjectionInfoA +@ stdcall RasHangUpW(long) rasapi32.RasHangUpW +@ stub RasQuerySharedAutoDial +@ stub RasQuerySharedConnection +@ stdcall RasSetAutodialAddressW(wstr long ptr long long) rasapi32.RasSetAutodialAddressW +@ stdcall RasSetEntryDialParamsW(wstr ptr long) rasapi32.RasSetEntryDialParamsW diff --git a/tools/make_specfiles b/tools/make_specfiles index eac1091..d8ee762 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,10 @@ my @dll_groups = "api-ms-win-security-activedirectoryclient-l1-1-0", ], [ + "rasapi32", + "ext-ms-win-ras-rasapi32-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1",

1 0

Andrey Gusev : ext-ms-win-ntuser-windowclass-l1-1-1: Add dll.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 4c0b4706189c32db0e31c126866290da37cd0776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0b4706189c32db0e31c1268… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:19 2017 +0300 ext-ms-win-ntuser-windowclass-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in | 1 + .../ext-ms-win-ntuser-windowclass-l1-1-1.spec | 19 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 24 insertions(+) diff --git a/configure b/configure index 43f4331..8ce432d 100755 --- a/configure +++ b/configure @@ -1201,6 +1201,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 +enable_ext_ms_win_ntuser_windowclass_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 @@ -18269,6 +18270,7 @@ wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_pri wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 +wine_fn_config_dll ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 diff --git a/configure.ac b/configure.ac index c22370f..154f6bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3103,6 +3103,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in new file mode 100644 index 0000000..bc4e4b0 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-windowclass-l1-1-1.dll diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec new file mode 100644 index 0000000..f405cd7 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-1/ext-ms-win-ntuser-windowclass-l1-1-1.spec @@ -0,0 +1,19 @@ +@ stdcall GetClassInfoA(long str ptr) user32.GetClassInfoA +@ stdcall GetClassInfoExA(long str ptr) user32.GetClassInfoExA +@ stdcall GetClassInfoExW(long wstr ptr) user32.GetClassInfoExW +@ stdcall GetClassInfoW(long wstr ptr) user32.GetClassInfoW +@ stdcall GetClassLongA(long long) user32.GetClassLongA +@ stdcall GetClassLongW(long long) user32.GetClassLongW +@ stdcall GetClassNameA(long ptr long) user32.GetClassNameA +@ stdcall GetClassNameW(long ptr long) user32.GetClassNameW +@ stdcall GetWindowLongA(long long) user32.GetWindowLongA +@ stdcall GetWindowLongW(long long) user32.GetWindowLongW +@ stdcall RealGetWindowClassA(long ptr long) user32.RealGetWindowClassA +@ stdcall RealGetWindowClassW(long ptr long) user32.RealGetWindowClassW +@ stdcall RegisterClassA(ptr) user32.RegisterClassA +@ stdcall RegisterClassExW(ptr) user32.RegisterClassExW +@ stdcall RegisterClassW(ptr) user32.RegisterClassW +@ stdcall SetWindowLongA(long long long) user32.SetWindowLongA +@ stdcall SetWindowLongW(long long long) user32.SetWindowLongW +@ stdcall UnregisterClassA(str long) user32.UnregisterClassA +@ stdcall UnregisterClassW(wstr long) user32.UnregisterClassW diff --git a/tools/make_specfiles b/tools/make_specfiles index 0cacd45..eac1091 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -308,6 +308,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0",

1 0

Jacek Caban : d3d11.idl: Added CD3D11_DEPTH_STENCIL_DESC declaration.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: c1e780a96d37c34e39db8a0847698ee018a1d6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e780a96d37c34e39db8a084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 19:21:05 2017 +0200 d3d11.idl: Added CD3D11_DEPTH_STENCIL_DESC declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 5c47d83..be5b3c0 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1232,6 +1232,57 @@ typedef struct D3D11_DEPTH_STENCIL_DESC D3D11_DEPTH_STENCILOP_DESC BackFace; } D3D11_DEPTH_STENCIL_DESC; +cpp_quote("#if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus )") +cpp_quote("struct CD3D11_DEPTH_STENCIL_DESC : public D3D11_DEPTH_STENCIL_DESC {") +cpp_quote(" CD3D11_DEPTH_STENCIL_DESC() {}") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(const D3D11_DEPTH_STENCIL_DESC &other) : D3D11_DEPTH_STENCIL_DESC(other) {}") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT) {") +cpp_quote(" const D3D11_DEPTH_STENCILOP_DESC default_op =") +cpp_quote(" {D3D11_STENCIL_OP_KEEP, D3D11_STENCIL_OP_KEEP, D3D11_STENCIL_OP_KEEP, D3D11_COMPARISON_ALWAYS};") +cpp_quote(" DepthEnable = TRUE;") +cpp_quote(" DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;") +cpp_quote(" DepthFunc = D3D11_COMPARISON_LESS;") +cpp_quote(" StencilEnable = FALSE;") +cpp_quote(" StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;") +cpp_quote(" StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;") +cpp_quote(" FrontFace = default_op;") +cpp_quote(" BackFace = default_op;") +cpp_quote(" }") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(") +cpp_quote(" BOOL depth_enable,") +cpp_quote(" D3D11_DEPTH_WRITE_MASK depth_write_mask,") +cpp_quote(" D3D11_COMPARISON_FUNC depth_func,") +cpp_quote(" BOOL stencil_enable,") +cpp_quote(" UINT8 stencil_read_mask,") +cpp_quote(" UINT8 stencil_write_mask,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_fail_op,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_depth_fail_op,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_pass_op,") +cpp_quote(" D3D11_COMPARISON_FUNC front_stencil_func,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_fail_op,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_depth_fail_op,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_pass_op,") +cpp_quote(" D3D11_COMPARISON_FUNC back_stencil_func) {") +cpp_quote(" DepthEnable = depth_enable;") +cpp_quote(" DepthWriteMask = depth_write_mask;") +cpp_quote(" DepthFunc = depth_func;") +cpp_quote(" StencilEnable = stencil_enable;") +cpp_quote(" StencilReadMask = stencil_read_mask;") +cpp_quote(" StencilWriteMask = stencil_write_mask;") +cpp_quote(" FrontFace.StencilFailOp = front_stencil_fail_op;") +cpp_quote(" FrontFace.StencilDepthFailOp = front_stencil_depth_fail_op;") +cpp_quote(" FrontFace.StencilPassOp = front_stencil_pass_op;") +cpp_quote(" FrontFace.StencilFunc = front_stencil_func;") +cpp_quote(" BackFace.StencilFailOp = back_stencil_fail_op;") +cpp_quote(" BackFace.StencilDepthFailOp = back_stencil_depth_fail_op;") +cpp_quote(" BackFace.StencilPassOp = back_stencil_pass_op;") +cpp_quote(" BackFace.StencilFunc = back_stencil_func;") +cpp_quote(" }") +cpp_quote(" ~CD3D11_DEPTH_STENCIL_DESC() {}") +cpp_quote(" operator const D3D11_DEPTH_STENCIL_DESC&() const { return *this; }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D11_RENDER_TARGET_VIEW_DESC { DXGI_FORMAT Format;

1 0

Andrey Gusev : ext-ms-win-security-credui-l1-1-0: Add dll.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: add3760bba0e4eb2d184cefa2f067ad306c72fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=add3760bba0e4eb2d184cefa2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:21 2017 +0300 ext-ms-win-security-credui-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-security-credui-l1-1-0/Makefile.in | 1 + .../ext-ms-win-security-credui-l1-1-0.spec | 9 +++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 2998e0f..9933c41 100755 --- a/configure +++ b/configure @@ -1208,6 +1208,7 @@ enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 +enable_ext_ms_win_security_credui_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -18278,6 +18279,7 @@ wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 +wine_fn_config_dll ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 374a380..12fd6c2 100644 --- a/configure.ac +++ b/configure.ac @@ -3110,6 +3110,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-security-credui-l1-1-0/Makefile.in b/dlls/ext-ms-win-security-credui-l1-1-0/Makefile.in new file mode 100644 index 0000000..37f39b0 --- /dev/null +++ b/dlls/ext-ms-win-security-credui-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-security-credui-l1-1-0.dll diff --git a/dlls/ext-ms-win-security-credui-l1-1-0/ext-ms-win-security-credui-l1-1-0.spec b/dlls/ext-ms-win-security-credui-l1-1-0/ext-ms-win-security-credui-l1-1-0.spec new file mode 100644 index 0000000..5a5dd39 --- /dev/null +++ b/dlls/ext-ms-win-security-credui-l1-1-0/ext-ms-win-security-credui-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stdcall CredPackAuthenticationBufferW(long wstr ptr ptr ptr) credui.CredPackAuthenticationBufferW +@ stub CredUICmdLinePromptForCredentialsW +@ stub CredUIConfirmCredentialsA +@ stdcall CredUIConfirmCredentialsW(wstr long) credui.CredUIConfirmCredentialsW +@ stdcall CredUIPromptForCredentialsW(ptr wstr ptr long ptr long ptr long ptr long) credui.CredUIPromptForCredentialsW +@ stdcall CredUIPromptForWindowsCredentialsW(ptr long ptr ptr long ptr ptr ptr long) credui.CredUIPromptForWindowsCredentialsW +@ stdcall CredUnPackAuthenticationBufferW(long ptr long ptr ptr ptr ptr ptr ptr) credui.CredUnPackAuthenticationBufferW +@ stub SspiIsPromptingNeeded +@ stdcall SspiPromptForCredentialsW(wstr ptr long wstr ptr ptr ptr long) credui.SspiPromptForCredentialsW diff --git a/tools/make_specfiles b/tools/make_specfiles index d8ee762..de1a33a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -144,6 +144,10 @@ my @dll_groups = "ext-ms-win-authz-context-l1-1-0", ], [ + "credui", + "ext-ms-win-security-credui-l1-1-0", + ], + [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", ],

1 0