- wine-devel - winehq.org

[PATCH v5] msvcr120: Add nexttoward implementation.
by Zebediah Figura 25 Feb '19

25 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 38 ++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 141 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 05475a32fa..2e80e17dab 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 769ee50790..7dfcabf461 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..3077a18c1e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {2.2250738585072009e-308, 0.0, 0.0f, 2.2250738585072004e-308}, + {2.2250738585072009e-308, 2.2250738585072010e-308, 1.0e-45f, 2.2250738585072009e-308}, + {2.2250738585072009e-308, 1.0, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 0.0, 0.0f, 2.2250738585072009e-308}, + {2.2250738585072014e-308, 2.2250738585072014e-308, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 1.0, 1.0e-45f, 2.2250738585072019e-308}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (!isnormal(d) && !isinf(tests[i].source)) + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + else + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected no error, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e3323dd83a..d78d26f81b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..dc12cb1185 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1529,6 +1529,44 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +/********************************************************************* + * nexttoward (MSVCR120.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#ifdef HAVE_NEXTTOWARD + double ret = nexttoward(num, next); + if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN + | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttowardf (MSVCR120.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#ifdef HAVE_NEXTTOWARDF + float ret = nexttowardf(num, next); + if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN + | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + { + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4f6afbf6c4..55f9658330 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.20.1

2 1

[PATCH] wineandroid.drv: Simplify isFileWanted method.
by Isira Seneviratne 25 Feb '19

25 Feb '19

2 1

[PATCH] usp10: Use single path for all fonts in ScriptGetCMap().
by Nikolay Sivov 25 Feb '19

25 Feb '19

Testing tmPitchAndFamily bitmask does not tell if font has mappings defined. Besides that, GetGlyphIndices() handles bitmap system fonts exactly the same way alternate path did. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/usp10/usp10.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index abc2605919..0a269961b7 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3544,42 +3544,27 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars hr = S_OK; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + for (i = 0; i < cChars; i++) { - for (i = 0; i < cChars; i++) + WCHAR inChar; + if (dwFlags == SGCM_RTL) + inChar = mirror_char(pwcInChars[i]); + else + inChar = pwcInChars[i]; + if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, inChar))) + WORD glyph; + if (!hdc) return E_PENDING; + if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; + if (glyph == 0xffff) { - WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &inChar, 1, &glyph, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) return S_FALSE; - if (glyph == 0xffff) - { - hr = S_FALSE; - glyph = 0x0; - } - pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); + hr = S_FALSE; + glyph = 0x0; } + pwOutGlyphs[i] = set_cache_glyph(psc, inChar, glyph); } } - else - { - TRACE("no glyph translation\n"); - for (i = 0; i < cChars; i++) - { - WCHAR inChar; - if (dwFlags == SGCM_RTL) - inChar = mirror_char(pwcInChars[i]); - else - inChar = pwcInChars[i]; - pwOutGlyphs[i] = inChar; - } - } + return hr; } -- 2.20.1

2 1

[PATCH 1/4] comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems
by Gabriel Ivăncescu 25 Feb '19

25 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Besides cleaning up the code, this is needed for multi-selection LBS_NODATA. dlls/comctl32/listbox.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cbe57f2..b6024c3 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1024,13 +1024,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) return LB_ERR; - for (i = count = 0; i < descr->nb_items; i++, item++) - if (item->selected) count++; + for (i = count = 0; i < descr->nb_items; i++) + count += is_item_selected(descr, i); return count; } @@ -1041,11 +1040,10 @@ static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) - if (item->selected) array[count++] = i; + for (i = count = 0; (i < descr->nb_items) && (count < max); i++) + if (is_item_selected(descr, i)) array[count++] = i; return count; } -- 2.20.1

3 10

[PATCH] dsound: Add missing SetEventHandle error handling (Coverity).
by Sven Baars 25 Feb '19

25 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dsound/primary.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index a30fc5e0a5..9f41a2b47f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -319,7 +319,11 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return hres; } - IAudioClient_SetEventHandle(client, device->sleepev); + hres = IAudioClient_SetEventHandle(client, device->sleepev); + if (FAILED(hres)) { + WARN("SetEventHandle failed: %08x\n", hres); + goto err; + } hres = IAudioClient_GetService(client, &IID_IAudioRenderClient, (void**)&render); if(FAILED(hres)) -- 2.17.1

2 1

[PATCH v2 2/2] user32/listbox: Use is_item_selected in GetSelCount and GetSelItems
by Huw Davies 25 Feb '19

25 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/listbox.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0be48673ca..826ce01cc4 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1066,13 +1066,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) return LB_ERR; - for (i = count = 0; i < descr->nb_items; i++, item++) - if (item->selected) count++; + for (i = count = 0; i < descr->nb_items; i++) + if (is_item_selected(descr, i)) count++; return count; } @@ -1083,11 +1082,10 @@ static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) - if (item->selected) array[count++] = i; + for (i = count = 0; (i < descr->nb_items) && (count < max); i++) + if (is_item_selected(descr, i)) array[count++] = i; return count; } -- 2.18.0

2 1

[PATCH v2 1/2] comctl32/listbox: Use is_item_selected in GetSelCount and GetSelItems
by Huw Davies 25 Feb '19

25 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 180c09b6f1..2b6702a745 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1024,13 +1024,12 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) return LB_ERR; - for (i = count = 0; i < descr->nb_items; i++, item++) - if (item->selected) count++; + for (i = count = 0; i < descr->nb_items; i++) + if (is_item_selected(descr, i)) count++; return count; } @@ -1041,11 +1040,10 @@ static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) - if (item->selected) array[count++] = i; + for (i = count = 0; (i < descr->nb_items) && (count < max); i++) + if (is_item_selected(descr, i)) array[count++] = i; return count; } -- 2.18.0

1 0

[PATCH] comctl32/propsheet: Avoid posting uninitialized data (Valgrind).
by Nikolay Sivov 25 Feb '19

25 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46691 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 09a455121c..88dab3421c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2760,7 +2760,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) static INT do_loop(const PropSheetInfo *psInfo) { - MSG msg; + MSG msg = { 0 }; INT ret = 0; HWND hwnd = psInfo->hwnd; HWND parent = psInfo->ppshheader.hwndParent; @@ -2777,7 +2777,7 @@ static INT do_loop(const PropSheetInfo *psInfo) } } - if(ret == 0) + if(ret == 0 && msg.message) PostQuitMessage(msg.wParam); if(ret != -1) -- 2.20.1

1 0

[v2 PATCH 1/6] mf: Add support for source and output collections.
by Nikolay Sivov 25 Feb '19

25 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixes test crashes on older versions dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 55 +++++++++++++++++++++-- 2 files changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2b3fdcd798..21d8be80c8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -35,8 +35,10 @@ static void test_topology(void) { + IMFCollection *collection, *collection2; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology; + DWORD size; WORD count; HRESULT hr; TOPOID id; @@ -192,6 +194,114 @@ static void test_topology(void) IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); + /* Source/output collections. */ + hr = IMFTopology_Clear(topology); + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection2); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection2, "Unexpected object pointer.\n"); + ok(collection2 != collection, "Expected cloned collection.\n"); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + hr = IMFCollection_AddElement(collection, (IUnknown *)collection); + ok(hr == S_OK, "Failed to add element, hr %#x.\n", hr); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + + hr = IMFCollection_GetElementCount(collection2, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + IMFCollection_Release(collection2); + IMFCollection_Release(collection); + + /* Add some nodes. */ + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetOutputNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + } + IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index d8012226f4..3b4a2e1a58 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -535,18 +535,65 @@ static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTop return topology_get_node_by_id(topology, id, node); } +static HRESULT topology_add_node_of_type(const struct topology *topology, IMFTopologyNode *node, + MF_TOPOLOGY_TYPE filter, IMFCollection *collection) +{ + MF_TOPOLOGY_TYPE node_type; + HRESULT hr; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + if (node_type != filter) + return S_OK; + + return IMFCollection_AddElement(collection, (IUnknown *)node); +} + +static HRESULT topology_get_node_collection(const struct topology *topology, MF_TOPOLOGY_TYPE node_type, + IMFCollection **collection) +{ + IMFTopologyNode *node; + unsigned int i = 0; + HRESULT hr; + + if (!collection) + return E_POINTER; + + if (FAILED(hr = MFCreateCollection(collection))) + return hr; + + while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&node) == S_OK) + { + hr = topology_add_node_of_type(topology, node, node_type, *collection); + IMFTopologyNode_Release(node); + if (FAILED(hr)) + { + IMFCollection_Release(*collection); + *collection = NULL; + break; + } + } + + return hr; +} + static HRESULT WINAPI topology_GetSourceNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_SOURCESTREAM_NODE, collection); } static HRESULT WINAPI topology_GetOutputNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_OUTPUT_NODE, collection); } static const IMFTopologyVtbl topologyvtbl = -- 2.20.1

1 5

[PATCH 3/3] mscms: Set last error on insufficient buffer in EnumColorProfilesA/W.
by Hans Leidekker 25 Feb '19

25 Feb '19

v2: Fix test failures on systems without color profiles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/profile.c | 12 ++++++++++-- dlls/mscms/tests/profile.c | 33 ++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6bc55e7ae6..d45ac4af12 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -918,7 +918,11 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, *p = 0; ret = TRUE; } - else ret = FALSE; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } *size = totalsize; if (number) *number = count; @@ -1044,7 +1048,11 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, *p = 0; ret = TRUE; } - else ret = FALSE; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } *size = totalsize; if (number) *number = count; diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index c4ea7f2c9f..2ef20129e6 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -660,35 +660,36 @@ static void test_EnumColorProfilesA( char *standardprofile ) record.dwDataColorSpace = SPACE_RGB; total = 0; + SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); - ok( !ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesA succeeded\n" ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; ret = pEnumColorProfilesA( machine, &record, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesA succeeded\n" ); ret = pEnumColorProfilesA( NULL, NULL, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesA succeeded\n" ); ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number ); - ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesA succeeded\n" ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); size = 0; - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesA succeeded\n" ); /* Functional checks */ size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + ok( ret, "EnumColorProfilesA failed %u\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -710,34 +711,36 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) record.dwDataColorSpace = SPACE_RGB; total = 0; + SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); - ok( !ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesW succeeded\n" ); + if (have_color_profile) ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; ret = pEnumColorProfilesW( machineW, &record, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesW succeeded\n" ); ret = pEnumColorProfilesW( NULL, NULL, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesW succeeded\n" ); ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number ); - ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesW succeeded\n" ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); + ok( !ret, "EnumColorProfilesW succeeded\n" ); /* Functional checks */ size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); todo_wine_if (!have_color_profile) - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + ok( ret, "EnumColorProfilesW failed %u\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } -- 2.11.0

1 0

[PATCH 2/3] mscms: Map BM_KYMCQUADS to TYPE_KYMC_8.
by Hans Leidekker 25 Feb '19

25 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index cada3329ac..d4eb40b2c8 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,6 +48,7 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_GRAY: ret = TYPE_GRAY_8; break; case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; + case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; default: if (!quietfixme) { -- 2.11.0

1 0

[PATCH 1/3] mscms: Add a partial implementation of WcsOpenColorProfileA/W.
by Hans Leidekker 25 Feb '19

25 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46708 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/mscms.spec | 4 +-- dlls/mscms/profile.c | 71 +++++++++++++++++++++++++++++++++++++-------------- include/icm.h | 2 ++ 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index f521ac6969..fec0af571d 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -96,8 +96,8 @@ @ stub WcsGetDefaultRenderingIntent @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) @ stub WcsGpCanInstallOrUninstallProfiles -@ stub WcsOpenColorProfileA -@ stub WcsOpenColorProfileW +@ stdcall WcsOpenColorProfileA(ptr ptr ptr long long long long) +@ stdcall WcsOpenColorProfileW(ptr ptr ptr long long long long) @ stub WcsSetCalibrationManagementState @ stub WcsSetDefaultColorProfile @ stub WcsSetDefaultRenderingIntent diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index a0b9d4133d..6bc55e7ae6 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1327,6 +1327,18 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete return TRUE; } +static BOOL profile_AtoW( const PROFILE *in, PROFILE *out ) +{ + int len; + if (!in->pProfileData) return FALSE; + len = MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, NULL, 0 ); + if (!(out->pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + out->cbDataSize = len * sizeof(WCHAR); + MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, out->pProfileData, len ); + out->dwType = in->dwType; + return TRUE; +} + /****************************************************************************** * OpenColorProfileA [MSCMS.@] * @@ -1335,6 +1347,7 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) { HPROFILE handle = NULL; + PROFILE profileW; TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); @@ -1344,25 +1357,9 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing if (profile->dwType & PROFILE_MEMBUFFER) return OpenColorProfileW( profile, access, sharing, creation ); - if (profile->dwType & PROFILE_FILENAME) - { - UINT len; - PROFILE profileW; - - profileW.dwType = profile->dwType; - - len = MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, NULL, 0 ); - profileW.pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - - if (profileW.pProfileData) - { - profileW.cbDataSize = len * sizeof(WCHAR); - MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, profileW.pProfileData, len ); - - handle = OpenColorProfileW( &profileW, access, sharing, creation ); - HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); - } - } + if (!profile_AtoW( profile, &profileW )) return FALSE; + handle = OpenColorProfileW( &profileW, access, sharing, creation ); + HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); return handle; } @@ -1546,3 +1543,39 @@ BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTY SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsOpenColorProfileA [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + PROFILE cdmW, campW = {0}, gmmpW = {0}; + HPROFILE ret = NULL; + + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + + if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; + if (camp && !profile_AtoW( camp, &campW )) goto done; + if (gmmp && !profile_AtoW( gmmp, &gmmpW )) goto done; + + ret = WcsOpenColorProfileW( &cdmW, &campW, &gmmpW, access, sharing, creation, flags ); + +done: + HeapFree( GetProcessHeap(), 0, cdmW.pProfileData ); + HeapFree( GetProcessHeap(), 0, campW.pProfileData ); + HeapFree( GetProcessHeap(), 0, gmmpW.pProfileData ); + return ret; +} + +/****************************************************************************** + * WcsOpenColorProfileW [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + FIXME("no support for WCS profiles\n" ); + + return OpenColorProfileW( cdm, access, sharing, creation ); +} diff --git a/include/icm.h b/include/icm.h index fbbdede3ed..de5bf2626e 100644 --- a/include/icm.h +++ b/include/icm.h @@ -411,6 +411,8 @@ BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); +HPROFILE WINAPI WcsOpenColorProfileA(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); +HPROFILE WINAPI WcsOpenColorProfileW(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); #define PROFILE_FILENAME 1 #define PROFILE_MEMBUFFER 2 -- 2.11.0

1 0

[PATCH 1/6] mf: Add support for source and output collections.
by Nikolay Sivov 25 Feb '19

25 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 55 +++++++++++++++++++++-- 2 files changed, 158 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2b3fdcd798..2a9cf40369 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -35,8 +35,10 @@ static void test_topology(void) { + IMFCollection *collection, *collection2; IMFTopologyNode *node, *node2, *node3; IMFTopology *topology; + DWORD size; WORD count; HRESULT hr; TOPOID id; @@ -192,6 +194,111 @@ static void test_topology(void) IMFTopologyNode_Release(node); IMFTopologyNode_Release(node2); + /* Source/output collections. */ + hr = IMFTopology_Clear(topology); + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection2); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection2, "Unexpected object pointer.\n"); + ok(collection2 != collection, "Expected cloned collection.\n"); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + hr = IMFCollection_AddElement(collection, (IUnknown *)collection); + ok(hr == S_OK, "Failed to add element, hr %#x.\n", hr); + + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + + hr = IMFCollection_GetElementCount(collection2, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + + IMFCollection_Release(collection2); + IMFCollection_Release(collection); + + /* Add some nodes. */ + hr = IMFTopology_GetSourceNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetOutputNodeCollection(topology, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetSourceNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(!size, "Unexpected item count.\n"); + IMFCollection_Release(collection); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + + hr = IMFTopology_GetOutputNodeCollection(topology, &collection); + ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(!!collection, "Unexpected object pointer.\n"); + hr = IMFCollection_GetElementCount(collection, &size); + ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr); + ok(size == 1, "Unexpected item count.\n"); + IMFCollection_Release(collection); + IMFTopology_Release(topology); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index d8012226f4..3b4a2e1a58 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -535,18 +535,65 @@ static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTop return topology_get_node_by_id(topology, id, node); } +static HRESULT topology_add_node_of_type(const struct topology *topology, IMFTopologyNode *node, + MF_TOPOLOGY_TYPE filter, IMFCollection *collection) +{ + MF_TOPOLOGY_TYPE node_type; + HRESULT hr; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + if (node_type != filter) + return S_OK; + + return IMFCollection_AddElement(collection, (IUnknown *)node); +} + +static HRESULT topology_get_node_collection(const struct topology *topology, MF_TOPOLOGY_TYPE node_type, + IMFCollection **collection) +{ + IMFTopologyNode *node; + unsigned int i = 0; + HRESULT hr; + + if (!collection) + return E_POINTER; + + if (FAILED(hr = MFCreateCollection(collection))) + return hr; + + while (IMFCollection_GetElement(topology->nodes, i++, (IUnknown **)&node) == S_OK) + { + hr = topology_add_node_of_type(topology, node, node_type, *collection); + IMFTopologyNode_Release(node); + if (FAILED(hr)) + { + IMFCollection_Release(*collection); + *collection = NULL; + break; + } + } + + return hr; +} + static HRESULT WINAPI topology_GetSourceNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_SOURCESTREAM_NODE, collection); } static HRESULT WINAPI topology_GetOutputNodeCollection(IMFTopology *iface, IMFCollection **collection) { - FIXME("(%p)->(%p)\n", iface, collection); + struct topology *topology = impl_from_IMFTopology(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, collection); + + return topology_get_node_collection(topology, MF_TOPOLOGY_OUTPUT_NODE, collection); } static const IMFTopologyVtbl topologyvtbl = -- 2.20.1

2 9

[PATCH] mfplay: Add stub dll.
by Nikolay Sivov 25 Feb '19

25 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/mfplay/Makefile.in | 4 ++++ dlls/mfplay/mfplay.spec | 6 ++++++ dlls/mfplay/player.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 dlls/mfplay/Makefile.in create mode 100644 dlls/mfplay/mfplay.spec create mode 100644 dlls/mfplay/player.c diff --git a/configure b/configure index 166ddbf485..6eec5f160c 100755 --- a/configure +++ b/configure @@ -1371,6 +1371,7 @@ enable_mciwave enable_mf enable_mf3216 enable_mfplat +enable_mfplay enable_mfreadwrite enable_mfuuid enable_mgmtapi @@ -19714,6 +19715,7 @@ wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests +wine_fn_config_makefile dlls/mfplay enable_mfplay wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests wine_fn_config_makefile dlls/mfuuid enable_mfuuid diff --git a/configure.ac b/configure.ac index f11a452e3c..8d3475a5fe 100644 --- a/configure.ac +++ b/configure.ac @@ -3442,6 +3442,7 @@ WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) +WINE_CONFIG_MAKEFILE(dlls/mfplay) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) WINE_CONFIG_MAKEFILE(dlls/mfuuid) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in new file mode 100644 index 0000000000..1ecf743956 --- /dev/null +++ b/dlls/mfplay/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mfplay.dll + +C_SRCS = \ + player.c diff --git a/dlls/mfplay/mfplay.spec b/dlls/mfplay/mfplay.spec new file mode 100644 index 0000000000..964b90af29 --- /dev/null +++ b/dlls/mfplay/mfplay.spec @@ -0,0 +1,6 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub MFPCreateMediaPlayer +@ stub MFPCreateMediaPlayerEx diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c new file mode 100644 index 0000000000..8873f5273d --- /dev/null +++ b/dlls/mfplay/player.c @@ -0,0 +1,36 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} -- 2.20.1

1 0

[PATCH v6 rebase 3/3] mfplat: Implement IMFByteStream::{Read,Write}.
by Jactry Zeng 25 Feb '19

25 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 30 ++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 30 +++++++++++++++--------------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 49eefce641..c1c1e0bd21 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1047,10 +1047,23 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + STATSTG statstg; + QWORD length; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); - return E_NOTIMPL; + memset(&statstg, 0, sizeof(statstg)); + hr = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hr)) + return hr; + if((statstg.grfMode & 0xf) == STGM_WRITE) + return E_ACCESSDENIED; + + IMFByteStream_GetLength(iface, &length); + if(count > length) + count = length; + return IStream_Read(This->stream, data, count, byte_read); } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1075,10 +1088,19 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER stream_size; + HRESULT hr; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("(%p)->(%p, %u, %p)\n", This, data, count, written); - return E_NOTIMPL; + hr = IStream_Write(This->stream, data, count, written); + if(hr == STG_E_ACCESSDENIED) + return E_ACCESSDENIED; + hr = IStream_Size(This->stream, &stream_size); + if(FAILED(hr)) + return hr; + This->length = stream_size.QuadPart; + return hr; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 76ac919f55..1f82a700a8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1139,13 +1139,13 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -1156,12 +1156,12 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -1188,8 +1188,8 @@ static void test_bytestream_from_file(void) CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); @@ -1208,8 +1208,8 @@ static void test_bytestream_from_file(void) todo_wine CHECK_BS_POS(bytestream, 0); read = 0xdeadbeef; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == 0 || broken(read == 1000) /* xp */, "got wrong read length: %d.\n", read); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == 0 || broken(read == 1000) /* xp */, "got wrong read length: %d.\n", read); memset(buffer, 0, sizeof(buffer)); IMFByteStream_Release(bytestream); @@ -1251,8 +1251,8 @@ static void test_bytestream_from_stream(void) CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); @@ -1275,8 +1275,8 @@ static void test_bytestream_from_stream(void) todo_wine CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); -- 2.20.1

1 0

[PATCH v6 rebase 2/3] mfplat: Implement IMFByteStream::{GetLength,SetLength}.
by Jactry Zeng 25 Feb '19

25 Feb '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 30 ++++- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 199 +++++++++++++++++++++++++++++++++- 3 files changed, 224 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2df195218b..49eefce641 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -923,6 +923,7 @@ typedef struct _mfbytestream mfattributes attributes; IMFByteStream IMFByteStream_iface; IStream *stream; + QWORD length; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -995,18 +996,22 @@ static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length { mfbytestream *This = impl_from_IMFByteStream(iface); - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + *length = This->length; + + return S_OK; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); + ULARGE_INTEGER size; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + size.QuadPart = length; + return IStream_SetSize(This->stream, size); } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -1209,6 +1214,8 @@ static const IMFAttributesVtbl mfbytestream_attributes_vtbl = HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) { mfbytestream *object; + ULARGE_INTEGER stream_size; + HRESULT hres; TRACE("(%p, %p): stub\n", stream, bytestream); @@ -1220,6 +1227,13 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; object->stream = stream; + hres = IStream_Size(object->stream, &stream_size); + if(FAILED(hres)) + { + heap_free(object); + return hres; + } + object->length = stream_size.QuadPart; IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1235,6 +1249,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open DWORD attributes = FILE_ATTRIBUTE_NORMAL; BOOL create = FALSE, reset = FALSE; IStream *stream = NULL; + ULARGE_INTEGER stream_size; HRESULT hres; TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); @@ -1298,6 +1313,13 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; object->stream = stream; + hres = IStream_Size(object->stream, &stream_size); + if (FAILED(hres)) + { + heap_free(object); + return hres; + } + object->length = stream_size.QuadPart; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..f7f09aa33e 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat shlwapi C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0f039fe44f..76ac919f55 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "shlwapi.h" #include "wine/test.h" @@ -56,6 +57,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -637,7 +641,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, file_size); @@ -652,7 +656,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); CHECK_FILE_SIZE(filename, 0); @@ -1108,6 +1112,195 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || broken(length == (sizeof(asf_header) + 2)) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 1000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || broken(length == 1000) /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + read = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == 0 || broken(read == 1000) /* xp */, "got wrong read length: %d.\n", read); + memset(buffer, 0, sizeof(buffer)); + IMFByteStream_Release(bytestream); + + MFShutdown(); + DeleteFileW(asffile); +} + +static void test_bytestream_from_stream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + ULONG written, read; + QWORD length; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "MFStartup failed: 0x%08x.\n", hr); + + hr = SHCreateStreamOnFileW(asffile, STGM_READ|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read returned: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d.\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL || broken(hr == S_OK), "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + hr = SHCreateStreamOnFileW(asffile, STGM_WRITE|STGM_FAILIFTHERE|STGM_SHARE_DENY_WRITE, &stream); + ok(hr == S_OK, "SHCreateStreamOnFileEx failed: 0x%08x.\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "MFCreateMFByteStreamOnStream failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_FALSE, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d.\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || broken(length == (sizeof(asf_header) + 2)) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + IStream_Release(stream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d.\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + MFShutdown(); + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1129,6 +1322,8 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_bytestream_from_file(); + test_bytestream_from_stream(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v6 rebase 1/3] mfplat: Implement MFCreateFile().
by Jactry Zeng 25 Feb '19

25 Feb '19

Superseded patch 158283 to 158285. ChangeLog: v6: - Add broken() for test results on Windows XP and Vista. - Cache length in bytestream by itself and improve IMFByteStream::GetLength() to follow behavior on Windows 7. v5: - Fix crash when calling MFCreateMFByteStreamOnStream() on Windows. v4: - Fix test failure on Windows XP and Vista. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 69 +++++++++++++++----------- dlls/mfplat/tests/mfplat.c | 99 +++++++++++++++++++++++++++++++++----- 3 files changed, 127 insertions(+), 43 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 17cda8856c..f4d43a6447 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 shlwapi C_SRCS = \ main.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a38c03b4d1..2df195218b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "shlwapi.h" #include "wine/heap.h" #include "wine/debug.h" @@ -921,6 +922,7 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -973,6 +975,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -1216,6 +1219,8 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; + IStream_AddRef(object->stream); *bytestream = &object->IMFByteStream_iface; @@ -1226,60 +1231,65 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open LPCWSTR url, IMFByteStream **bytestream) { mfbytestream *object; - DWORD fileaccessmode = 0; - DWORD filesharemode = FILE_SHARE_READ; - DWORD filecreation_disposition = 0; - DWORD fileattributes = 0; - HANDLE file; + DWORD mode = STGM_SHARE_DENY_WRITE; + DWORD attributes = FILE_ATTRIBUTE_NORMAL; + BOOL create = FALSE, reset = FALSE; + IStream *stream = NULL; + HRESULT hres; - FIXME("(%d, %d, %d, %s, %p): stub\n", accessmode, openmode, flags, debugstr_w(url), bytestream); + TRACE("(%d, %d, %d, %s, %p)\n", accessmode, openmode, flags, debugstr_w(url), bytestream); switch (accessmode) { case MF_ACCESSMODE_READ: - fileaccessmode = GENERIC_READ; + mode |= STGM_READ; break; case MF_ACCESSMODE_WRITE: - fileaccessmode = GENERIC_WRITE; + mode |= STGM_WRITE; break; case MF_ACCESSMODE_READWRITE: - fileaccessmode = GENERIC_READ | GENERIC_WRITE; + mode |= STGM_READWRITE; break; } switch (openmode) { - case MF_OPENMODE_FAIL_IF_NOT_EXIST: - filecreation_disposition = OPEN_EXISTING; - break; - case MF_OPENMODE_FAIL_IF_EXIST: - filecreation_disposition = CREATE_NEW; - break; case MF_OPENMODE_RESET_IF_EXIST: - filecreation_disposition = TRUNCATE_EXISTING; + if (accessmode == MF_ACCESSMODE_READ) + return E_INVALIDARG; + reset = TRUE; + mode |= STGM_FAILIFTHERE; break; case MF_OPENMODE_APPEND_IF_EXIST: - filecreation_disposition = OPEN_ALWAYS; - fileaccessmode |= FILE_APPEND_DATA; + if (GetFileAttributesW(url) == INVALID_FILE_ATTRIBUTES) + create = TRUE; + case MF_OPENMODE_FAIL_IF_NOT_EXIST: + mode |= STGM_FAILIFTHERE; + break; + case MF_OPENMODE_FAIL_IF_EXIST: + mode |= STGM_FAILIFTHERE; + create = TRUE; break; case MF_OPENMODE_DELETE_IF_EXIST: - filecreation_disposition = CREATE_ALWAYS; + mode |= STGM_CREATE; break; } if (flags & MF_FILEFLAGS_NOBUFFERING) - fileattributes |= FILE_FLAG_NO_BUFFERING; - - /* Open HANDLE to file */ - file = CreateFileW(url, fileaccessmode, filesharemode, NULL, - filecreation_disposition, fileattributes, 0); - - if(file == INVALID_HANDLE_VALUE) - return HRESULT_FROM_WIN32(GetLastError()); + attributes |= FILE_FLAG_NO_BUFFERING; + if ((flags & MF_FILEFLAGS_ALLOW_WRITE_SHARING) && (accessmode == MF_ACCESSMODE_READ)) + mode &= ~STGM_SHARE_DENY_WRITE; - /* Close the file again, since we don't do anything with it yet */ - CloseHandle(file); + hres = SHCreateStreamOnFileEx(url, mode, attributes, create, NULL, &stream); + if (FAILED(hres)) + return hres; + if (reset) + { + ULARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_SetSize(stream, zero); + } object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; @@ -1287,6 +1297,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->stream = stream; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5d00..0f039fe44f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -58,6 +58,48 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + +#define CHECK_BS_POS(obj,pos) _check_bs_pos(obj, pos, __LINE__) +static void _check_bs_pos(IMFByteStream* obj, QWORD pos, int line) +{ + QWORD position = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetCurrentPosition(obj, &position); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetCurrentPosition failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(position == pos, "got wrong position: %s.\n", + wine_dbgstr_longlong(position)); +} + +#define CHECK_BS_LEN(obj,len) _check_bs_len(obj, len, __LINE__) +static void _check_bs_len(IMFByteStream* obj, QWORD len, int line) +{ + QWORD length = 0xdeadbeef; + HRESULT hr; + hr = IMFByteStream_GetLength(obj, &length); + ok_(__FILE__,line)(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(length == len, "got wrong length: %s.\n", + wine_dbgstr_longlong(length)); +} + +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__) +static void _check_file_size(const WCHAR *filename, LONG exp_size, int line) +{ + HANDLE handle; + DWORD file_size = 0xdeadbeef; + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file_size = GetFileSize(handle, NULL); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + CloseHandle(handle); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -449,8 +491,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); @@ -508,7 +552,8 @@ static void test_MFCreateFile(void) IMFAttributes *attributes = NULL; HRESULT hr; WCHAR *filename; - + LONG file_size; + HANDLE handle; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; filename = load_resource(mp4file); @@ -533,13 +578,11 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -557,18 +600,15 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); IMFByteStream_Release(bytestream); @@ -579,10 +619,43 @@ static void test_MFCreateFile(void) /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); + ok(hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION)) /* xp and vista */, + "MFCreateFile failed: 0x%08x.\n", hr); + if(hr == S_OK) + IMFByteStream_Release(bytestream2); + IMFByteStream_Release(bytestream); + + /* test MF_OPENMODE_APPEND_IF_EXIST */ + handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + file_size = GetFileSize(handle, NULL); + CloseHandle(handle); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, file_size); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST with read-only mode */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); + ok(hr == E_INVALIDARG, "MFCreateFile should fail: 0x%08x.\n", hr); + CHECK_FILE_SIZE(filename, file_size); + + /* test MF_OPENMODE_RESET_IF_EXIST */ + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, filename, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_LEN(bytestream, 0); + todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); + CHECK_FILE_SIZE(filename, 0); MFShutdown(); -- 2.20.1

1 0

[PATCH 1/4] setupapi: Return the "Device Parameters" subkey for DIREG_DEV.
by Zebediah Figura 25 Feb '19

25 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21023 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 45 +++++++++++++++-------------------- dlls/setupapi/tests/devinst.c | 39 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e5d008fc83..1fc494617d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1426,6 +1426,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da { struct device *device; HKEY key = INVALID_HANDLE_VALUE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n", devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); @@ -1453,7 +1454,12 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da switch (KeyType) { case DIREG_DEV: - key = SETUPDI_CreateDevKey(device); + if ((l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL))) + { + key = INVALID_HANDLE_VALUE; + } + SetLastError(l); break; case DIREG_DRV: key = create_driver_key(device); @@ -3576,6 +3582,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, { struct device *device; HKEY key = INVALID_HANDLE_VALUE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n", devinfo, device_data, Scope, HwProfile, KeyType, samDesired); @@ -3604,7 +3611,9 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, switch (KeyType) { case DIREG_DEV: - key = SETUPDI_OpenDevKey(device, samDesired); + if ((l = RegOpenKeyExW(device->key, DeviceParameters, 0, samDesired, &key))) + key = INVALID_HANDLE_VALUE; + SetLastError(l); break; case DIREG_DRV: key = open_driver_key(device, samDesired); @@ -3615,24 +3624,6 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, return key; } -static BOOL SETUPDI_DeleteDevKey(struct device *device) -{ - HKEY enumKey; - BOOL ret = FALSE; - LONG l; - - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &enumKey, NULL); - if (!l) - { - ret = RegDeleteTreeW(enumKey, device->instanceId); - RegCloseKey(enumKey); - } - else - SetLastError(l); - return ret; -} - /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */ @@ -3641,6 +3632,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat { struct device *device; BOOL ret = FALSE; + LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", devinfo, device_data, Scope, HwProfile, KeyType); @@ -3668,16 +3660,17 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat FIXME("unimplemented for scope %d\n", Scope); switch (KeyType) { - case DIREG_DEV: - ret = SETUPDI_DeleteDevKey(device); - break; case DIREG_DRV: ret = delete_driver_key(device); break; case DIREG_BOTH: - ret = SETUPDI_DeleteDevKey(device); - if (ret) - ret = delete_driver_key(device); + if (!(ret = delete_driver_key(device))) + break; + /* fall through */ + case DIREG_DEV: + l = RegDeleteKeyW(device->key, DeviceParameters); + SetLastError(l); + ret = !l; break; default: WARN("unknown KeyType %d\n", KeyType); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d46aa9b120..2657252c03 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1030,6 +1030,8 @@ static void test_device_iface_detail(void) static void test_device_key(void) { + static const char params_key_path[] = "System\\CurrentControlSet\\Enum\\Root" + "\\LEGACY_BOGUS\\0000\\Device Parameters"; static const char class_key_path[] = "System\\CurrentControlSet\\Control\\Class" "\\{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', @@ -1159,6 +1161,43 @@ todo_wine { ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); +todo_wine + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + + key = SetupDiCreateDevRegKeyA(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + ok(key != INVALID_HANDLE_VALUE, "Got unexpected error %#x.\n", GetLastError()); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(!res, "Failed to open device key, error %u.\n", res); + res = RegSetValueExA(key, "foo", 0, REG_SZ, (BYTE *)"bar", sizeof("bar")); + ok(!res, "Failed to set value, error %u.\n", res); + RegCloseKey(key); + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key != INVALID_HANDLE_VALUE, "Got unexpected error %#x.\n", GetLastError()); + size = sizeof(data); + res = RegQueryValueExA(key, "foo", NULL, NULL, (BYTE *)data, &size); + ok(!res, "Failed to get value, error %u.\n", res); + ok(!strcmp(data, "bar"), "Got wrong data %s.\n", data); + RegCloseKey(key); + + ret = SetupDiDeleteDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + + key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); + ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); +todo_wine + ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); + ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); + key = SetupDiCreateDevRegKeyW(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); ok(key != INVALID_HANDLE_VALUE, "Failed to create device key, error %#x.\n", GetLastError()); RegCloseKey(key); -- 2.20.1

1 3

[PATCH 3/3] d3dx9: Merge the d3dx9_effect_GetDesc() helper
by Michael Stefaniuc 24 Feb '19

24 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a1e179743b..db91aa4b37 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -991,25 +991,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_desc(struct d3dx9_base_effect *base, D3DXEFFECT_DESC *desc) -{ - if (!desc) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - FIXME("partial stub!\n"); - - /* TODO: add creator and function count. */ - desc->Creator = NULL; - desc->Functions = 0; - desc->Parameters = base->parameter_count; - desc->Techniques = base->technique_count; - - return D3D_OK; -} - static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) { @@ -3419,9 +3400,21 @@ static HRESULT WINAPI d3dx9_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC * { struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("iface %p, desc %p partial stub.\n", iface, desc); - return d3dx9_base_effect_get_desc(&effect->base_effect, desc); + if (!desc) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + /* TODO: add creator and function count. */ + desc->Creator = NULL; + desc->Functions = 0; + desc->Parameters = effect->base_effect.parameter_count; + desc->Techniques = effect->base_effect.technique_count; + + return D3D_OK; } static HRESULT WINAPI d3dx9_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

1 0

[PATCH 2/3] d3dx9: Merge the stub ID3DXBaseEffect methods
by Michael Stefaniuc 24 Feb '19

24 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 54 +++++++----------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5bf66011ea..a1e179743b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1198,14 +1198,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_base_effect_get_function_desc(struct d3dx9_base_effect *base, - D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -1409,20 +1401,6 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_function(struct d3dx9_base_effect *base, UINT index) -{ - FIXME("stub!\n"); - - return NULL; -} - -static D3DXHANDLE d3dx9_base_effect_get_function_by_name(struct d3dx9_base_effect *base, const char *name) -{ - FIXME("stub!\n"); - - return NULL; -} - static UINT get_annotation_from_object(struct d3dx9_base_effect *base, D3DXHANDLE object, struct d3dx_parameter **annotations) { @@ -2772,14 +2750,6 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT start, UINT end) -{ - FIXME("stub!\n"); - - return E_NOTIMPL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3486,11 +3456,9 @@ static HRESULT WINAPI d3dx9_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx9_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, shader %p, desc %p stub.\n", iface, shader, desc); - TRACE("iface %p, shader %p, desc %p.\n", iface, shader, desc); - - return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); + return E_NOTIMPL; } static D3DXHANDLE WINAPI d3dx9_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) @@ -3569,20 +3537,16 @@ static D3DXHANDLE WINAPI d3dx9_effect_GetPassByName(ID3DXEffect *iface, D3DXHAND static D3DXHANDLE WINAPI d3dx9_effect_GetFunction(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, index %u stub.\n", iface, index); - TRACE("iface %p, index %u.\n", iface, index); - - return d3dx9_base_effect_get_function(&effect->base_effect, index); + return NULL; } static D3DXHANDLE WINAPI d3dx9_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); - - TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + FIXME("iface %p, name %s stub.\n", iface, debugstr_a(name)); - return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); + return NULL; } static D3DXHANDLE WINAPI d3dx9_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) @@ -3948,11 +3912,9 @@ static HRESULT WINAPI d3dx9_effect_GetVertexShader(struct ID3DXEffect *iface, D3 static HRESULT WINAPI d3dx9_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + FIXME("iface %p, parameter %p, start %u, end %u stub.\n", iface, parameter, start, end); - TRACE("iface %p, parameter %p, start %u, end %u.\n", iface, parameter, start, end); - - return d3dx9_base_effect_set_array_range(&effect->base_effect, parameter, start, end); + return E_NOTIMPL; } /*** ID3DXEffect methods ***/ -- 2.20.1

1 0

[PATCH v2] Fix handling of zero_bits argument in NtAllocateVirtualMemory and friends
by Las＠protonmail.ch 24 Feb '19

24 Feb '19

This is v2 of my previous patch (https://www.winehq.org/pipermail/wine-devel/2019-February/139590.html), and these are the changes I've made since then: - Readd functionality to specify alignment as an internal ntdll function virtual_alloc - Fix tests - and some minor fix-ups that are not worth mentioning

2 1

[PATCH 1/2] msdmo: Allow for names to be NULL in IEnumDMO_Next.
by Sven Baars 24 Feb '19

24 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/msdmo/dmoreg.c | 15 +++++++++------ dlls/msdmo/tests/msdmo.c | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 864cb859e6..1c06bbfe16 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -530,7 +530,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); - if (!pCLSID || !Names) + if (!pCLSID) return E_POINTER; if (!pcItemsFetched && cItemsToFetch > 1) @@ -656,14 +656,17 @@ static HRESULT WINAPI IEnumDMO_fnNext( } /* Media object wasn't filtered so add it to return list */ - Names[count] = NULL; len = MAX_PATH * sizeof(WCHAR); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); - if (ERROR_SUCCESS == ret) + if (Names) { - Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); - if (Names[count]) - strcpyW(Names[count], szValue); + Names[count] = NULL; + if (ret == ERROR_SUCCESS) + { + Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); + if (Names[count]) + strcpyW(Names[count], szValue); + } } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 7617123aa5..68de11f21a 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -107,6 +107,13 @@ static void test_DMOEnum(void) ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 0, "expected 0, got %d\n", count); + hr = IEnumDMO_Next(enum_dmo, 2, NULL, &name, &count); + ok(hr == E_POINTER, "expected S_FALSE, got %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, NULL, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + IEnumDMO_Release(enum_dmo); } -- 2.17.1

1 1

[PATCH 3/3] mscms: Set last error on insufficient buffer in EnumColorProfilesA/W.
by Hans Leidekker 24 Feb '19

24 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/profile.c | 12 ++++++++++-- dlls/mscms/tests/profile.c | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 6bc55e7ae6..d45ac4af12 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -918,7 +918,11 @@ BOOL WINAPI EnumColorProfilesA( PCSTR machine, PENUMTYPEA record, PBYTE buffer, *p = 0; ret = TRUE; } - else ret = FALSE; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } *size = totalsize; if (number) *number = count; @@ -1044,7 +1048,11 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, *p = 0; ret = TRUE; } - else ret = FALSE; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } *size = totalsize; if (number) *number = count; diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index c4ea7f2c9f..7054082186 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -660,8 +660,9 @@ static void test_EnumColorProfilesA( char *standardprofile ) record.dwDataColorSpace = SPACE_RGB; total = 0; + SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesA( NULL, &record, NULL, &total, &number ); - ok( !ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total ); size = total; @@ -710,8 +711,9 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) record.dwDataColorSpace = SPACE_RGB; total = 0; + SetLastError( 0xdeadbeef ); ret = pEnumColorProfilesW( NULL, &record, NULL, &total, &number ); - ok( !ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError() ); buffer = HeapAlloc( GetProcessHeap(), 0, total * sizeof(WCHAR) ); size = total; -- 2.11.0

2 1

[PATCH 2/3] mscms: Map BM_KYMCQUADS to TYPE_KYMC_8.
by Hans Leidekker 24 Feb '19

24 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index cada3329ac..d4eb40b2c8 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -48,6 +48,7 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_GRAY: ret = TYPE_GRAY_8; break; case BM_xRGBQUADS: ret = TYPE_ARGB_8; break; case BM_xBGRQUADS: ret = TYPE_ABGR_8; break; + case BM_KYMCQUADS: ret = TYPE_KYMC_8; break; default: if (!quietfixme) { -- 2.11.0

1 0

[PATCH 1/3] mscms: Add a partial implementation of WcsOpenColorProfileA/W.
by Hans Leidekker 24 Feb '19

24 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46708 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/mscms.spec | 4 +-- dlls/mscms/profile.c | 71 +++++++++++++++++++++++++++++++++++++-------------- include/icm.h | 2 ++ 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index f521ac6969..fec0af571d 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -96,8 +96,8 @@ @ stub WcsGetDefaultRenderingIntent @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) @ stub WcsGpCanInstallOrUninstallProfiles -@ stub WcsOpenColorProfileA -@ stub WcsOpenColorProfileW +@ stdcall WcsOpenColorProfileA(ptr ptr ptr long long long long) +@ stdcall WcsOpenColorProfileW(ptr ptr ptr long long long long) @ stub WcsSetCalibrationManagementState @ stub WcsSetDefaultColorProfile @ stub WcsSetDefaultRenderingIntent diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index a0b9d4133d..6bc55e7ae6 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1327,6 +1327,18 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete return TRUE; } +static BOOL profile_AtoW( const PROFILE *in, PROFILE *out ) +{ + int len; + if (!in->pProfileData) return FALSE; + len = MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, NULL, 0 ); + if (!(out->pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + out->cbDataSize = len * sizeof(WCHAR); + MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, out->pProfileData, len ); + out->dwType = in->dwType; + return TRUE; +} + /****************************************************************************** * OpenColorProfileA [MSCMS.@] * @@ -1335,6 +1347,7 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) { HPROFILE handle = NULL; + PROFILE profileW; TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); @@ -1344,25 +1357,9 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing if (profile->dwType & PROFILE_MEMBUFFER) return OpenColorProfileW( profile, access, sharing, creation ); - if (profile->dwType & PROFILE_FILENAME) - { - UINT len; - PROFILE profileW; - - profileW.dwType = profile->dwType; - - len = MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, NULL, 0 ); - profileW.pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - - if (profileW.pProfileData) - { - profileW.cbDataSize = len * sizeof(WCHAR); - MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, profileW.pProfileData, len ); - - handle = OpenColorProfileW( &profileW, access, sharing, creation ); - HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); - } - } + if (!profile_AtoW( profile, &profileW )) return FALSE; + handle = OpenColorProfileW( &profileW, access, sharing, creation ); + HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); return handle; } @@ -1546,3 +1543,39 @@ BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTY SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsOpenColorProfileA [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + PROFILE cdmW, campW = {0}, gmmpW = {0}; + HPROFILE ret = NULL; + + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + + if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; + if (camp && !profile_AtoW( camp, &campW )) goto done; + if (gmmp && !profile_AtoW( gmmp, &gmmpW )) goto done; + + ret = WcsOpenColorProfileW( &cdmW, &campW, &gmmpW, access, sharing, creation, flags ); + +done: + HeapFree( GetProcessHeap(), 0, cdmW.pProfileData ); + HeapFree( GetProcessHeap(), 0, campW.pProfileData ); + HeapFree( GetProcessHeap(), 0, gmmpW.pProfileData ); + return ret; +} + +/****************************************************************************** + * WcsOpenColorProfileW [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + FIXME("no support for WCS profiles\n" ); + + return OpenColorProfileW( cdm, access, sharing, creation ); +} diff --git a/include/icm.h b/include/icm.h index fbbdede3ed..de5bf2626e 100644 --- a/include/icm.h +++ b/include/icm.h @@ -411,6 +411,8 @@ BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); +HPROFILE WINAPI WcsOpenColorProfileA(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); +HPROFILE WINAPI WcsOpenColorProfileW(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); #define PROFILE_FILENAME 1 #define PROFILE_MEMBUFFER 2 -- 2.11.0

1 0

[PATCH] mscoree: Add support for config stream in GetRequestedRuntime.
by Vincent Povirk 24 Feb '19

24 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37751 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/config.c | 27 +++++++++++++++++++-------- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/metahost.c | 21 ++++++++++++--------- dlls/mscoree/mscoree_main.c | 14 +++++++------- dlls/mscoree/mscoree_private.h | 5 ++++- 5 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index a5c0666904..777195d85c 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -650,33 +650,44 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) return S_OK; } -HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) +HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) { - IStream *stream; VARIANT var; HRESULT hr; HRESULT initresult; init_config(result); - - hr = CreateConfigStream(filename, &stream); - if (FAILED(hr)) - return hr; - initresult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; hr = parse_config(var, result); - IStream_Release(stream); if (SUCCEEDED(initresult)) CoUninitialize(); return hr; } +HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) +{ + HRESULT hr; + IStream *stream; + + init_config(result); + + hr = CreateConfigStream(filename, &stream); + if (FAILED(hr)) + return hr; + + hr = parse_config_stream(stream, result); + + IStream_Release(stream); + + return hr; +} + void free_parsed_config_file(parsed_config_file *file) { supported_runtime *cursor, *cursor2; diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index f6c77be4aa..ca8ba0dc01 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1296,7 +1296,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); @@ -1469,7 +1469,7 @@ __int32 WINAPI _CorExeMain(void) FixupVTable(GetModuleHandleW(NULL)); - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) { @@ -1831,7 +1831,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) *ppObj = NULL; - hr = get_runtime_info(filename, NULL, NULL, 0, 0, FALSE, &info); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) { hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 422ca3112b..b9f7637f05 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1126,11 +1126,10 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa pwzVersion, pcchVersion, pwzImageVersion, pcchImageVersion, pdwConfigFlags, debugstr_guid(riid), ppRuntime); - if (pCfgStream) - FIXME("ignoring config file stream\n"); - - if (pdwConfigFlags) + if (pdwConfigFlags) { FIXME("ignoring config flags\n"); + *pdwConfigFlags = 0; + } if(dwPolicyFlags & METAHOST_POLICY_USE_PROCESS_IMAGE_PATH) { @@ -1145,7 +1144,7 @@ static HRESULT WINAPI metahostpolicy_GetRequestedRuntime(ICLRMetaHostPolicy *ifa if(dwPolicyFlags & METAHOST_POLICY_APPLY_UPGRADE_POLICY) flags |= RUNTIME_INFO_UPGRADE_VERSION; - hr = get_runtime_info(path, pwzImageVersion, NULL, 0, flags, FALSE, &result); + hr = get_runtime_info(path, pwzImageVersion, NULL, pCfgStream, 0, flags, FALSE, &result); if (SUCCEEDED(hr)) { if (pwzImageVersion) @@ -1276,7 +1275,8 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname } HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, - DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) + IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, + BOOL legacy, ICLRRuntimeInfo **result) { static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; static const DWORD supported_startup_flags = 0; @@ -1297,7 +1297,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (exefile && !exefile[0]) exefile = NULL; - if (exefile && !config_file) + if (exefile && !config_file && !config_stream) { strcpyW(local_config_file, exefile); strcatW(local_config_file, dotconfig); @@ -1305,10 +1305,13 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, config_file = local_config_file; } - if (config_file) + if (config_file || config_stream) { BOOL found = FALSE; - hr = parse_config_file(config_file, &parsed_config); + if (config_file) + hr = parse_config_file(config_file, &parsed_config); + else + hr = parse_config_stream(config_stream, &parsed_config); if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 785ecd0404..db5f42616b 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -205,7 +205,7 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor *ppv = NULL; - ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, startupFlags, 0, TRUE, &info); + ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, NULL, startupFlags, 0, TRUE, &info); if (SUCCEEDED(ret)) { @@ -274,7 +274,7 @@ HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwL if (!dwLength || !pbuffer) return E_POINTER; - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -297,7 +297,7 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) if (!dwLength || !pbuffer) return E_POINTER; - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -336,7 +336,7 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST if (!dwlength) dwlength = &length_dummy; - ret = get_runtime_info(pExe, pwszVersion, pConfigurationFile, startupFlags, runtimeInfoFlags, TRUE, &info); + ret = get_runtime_info(pExe, pwszVersion, pConfigurationFile, NULL, startupFlags, runtimeInfoFlags, TRUE, &info); if (SUCCEEDED(ret)) { @@ -482,7 +482,7 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD *ppv = NULL; - ret = get_runtime_info(NULL, szVersion, NULL, nflags, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, szVersion, NULL, NULL, nflags, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -503,7 +503,7 @@ HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID *ppv = NULL; - ret = get_runtime_info(NULL, NULL, filename, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, filename, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { @@ -526,7 +526,7 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) TRACE("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); /* FIXME: How to determine which runtime version to use? */ - ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + ret = get_runtime_info(NULL, NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) { diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 3f2aa709f5..8ffb1f99e6 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -103,7 +103,8 @@ typedef struct CorDebug } CorDebug; extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, - DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; + IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, + ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; @@ -122,6 +123,8 @@ typedef struct supported_runtime extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; +extern HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) DECLSPEC_HIDDEN; + extern void free_parsed_config_file(parsed_config_file *file) DECLSPEC_HIDDEN; typedef enum { -- 2.17.1

1 0

[PATCH 3/3] oleaut32: Correctly get the Grouping seperator
by Alistair Leslie-Hughes 24 Feb '19

24 Feb '19

LOCALE_SGROUPING allows for 10 characters including the null. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/varformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 91b3c167dd8..757c4f9c3ea 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2284,9 +2284,9 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT if (nGrouping == -2) { - WCHAR grouping[16]; + WCHAR grouping[10]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) @@ -2460,9 +2460,9 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (nGrouping == -2) { - WCHAR grouping[16]; + WCHAR grouping[10]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) -- 2.20.1

1 0

[PATCH 2/3] oleaut32: Correctly get the thousands seperator in VarFormatCurrency
by Alistair Leslie-Hughes 24 Feb '19

24 Feb '19

LOCALE_STHOUSAND allows for 4 chracters including the NULL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index d6ce4a9f74a..91b3c167dd8 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2443,7 +2443,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (SUCCEEDED(hRet)) { - WCHAR buff[256], decimal[8], thousands[8], currency[13]; + WCHAR buff[256], decimal[8], thousands[4], currency[13]; CURRENCYFMTW numfmt; if (nDigits < 0) @@ -2482,7 +2482,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, numfmt.lpDecimalSep = decimal; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, ARRAY_SIZE(thousands)); numfmt.lpCurrencySymbol = currency; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency)); -- 2.20.1

1 0

[PATCH 1/3] oleaut32: Correctly get the Currency seperator in VarFormatCurrency
by Alistair Leslie-Hughes 24 Feb '19

24 Feb '19

LOCALE_SCURRENCY allows for 13 chracters including the NULL. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46442 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/varformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 470ea4e01b7..d6ce4a9f74a 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2443,7 +2443,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (SUCCEEDED(hRet)) { - WCHAR buff[256], decimal[8], thousands[8], currency[8]; + WCHAR buff[256], decimal[8], thousands[8], currency[13]; CURRENCYFMTW numfmt; if (nDigits < 0) @@ -2484,7 +2484,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, numfmt.lpThousandSep = thousands; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands)); numfmt.lpCurrencySymbol = currency; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, ARRAY_SIZE(currency)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency)); /* use NLS as per VarFormatNumber() */ if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff))) -- 2.20.1

1 0

[PATCH] kernel32: Correct GetCurrencyFormatW/A spec enteries
by Alistair Leslie-Hughes 24 Feb '19

24 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2f8ca2f9e1d..86e31f7a464 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -618,9 +618,9 @@ @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() -@ stdcall GetCurrencyFormatA(long long str ptr str long) +@ stdcall GetCurrencyFormatA(long long str ptr ptr long) @ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) -@ stdcall GetCurrencyFormatW(long long str ptr str long) +@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) # @ stub GetCurrentConsoleFontEx -- 2.20.1

1 0

Re: [PATCH] Replace W/A GetModuleHandle cross call
by Fabian Maurer 23 Feb '19

23 Feb '19

Hello Steven, wine-patches is retired, please send patches in future to wine- devel(a)winehq.org. Regarding your patch itself, what's the reason behind this change? Is the other version not shorter? Regards, Fabian Maurer

1 0

[PATCH] crypt32: Correct "Transaction Id" to "Transaction ID".
by Isira Seneviratne 23 Feb '19

23 Feb '19

2 2

[PATCH] po: Update Tamil translation.
by Isira Seneviratne 23 Feb '19

23 Feb '19

1 0

[PATCH 1/5] quartz/filesource: Correctly report short reads from IAsyncReader_SyncRead().
by Zebediah Figura 23 Feb '19

23 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 35 ++++++++++++++++++---------------- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6b8bfa3353..11b9712c2c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1309,34 +1309,37 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMed return hr; } -static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG llPosition, LONG lLength, BYTE * pBuffer) +static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, + LONGLONG offset, LONG length, BYTE *buffer) { OVERLAPPED ovl; - HRESULT hr = S_OK; - FileAsyncReader *This = impl_from_IAsyncReader(iface); + FileAsyncReader *filter = impl_from_IAsyncReader(iface); + DWORD read_len; + HRESULT hr; + BOOL ret; - TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer); + TRACE("filter %p, offset %s, length %d, buffer %p.\n", + filter, wine_dbgstr_longlong(offset), length, buffer); ZeroMemory(&ovl, sizeof(ovl)); ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); /* NOTE: llPosition is the actual byte position to start reading from */ - ovl.u.s.Offset = (DWORD) llPosition; - ovl.u.s.OffsetHigh = (DWORD) (llPosition >> (sizeof(DWORD) * 8)); - - if (!ReadFile(This->hFile, pBuffer, lLength, NULL, &ovl)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if (hr == HRESULT_FROM_WIN32(ERROR_IO_PENDING)) - hr = S_OK; + ovl.u.s.Offset = (DWORD)offset; + ovl.u.s.OffsetHigh = (DWORD)(offset >> (sizeof(DWORD) * 8)); - if (SUCCEEDED(hr)) + ret = ReadFile(filter->hFile, buffer, length, NULL, &ovl); + if (ret || GetLastError() == ERROR_IO_PENDING) { - DWORD dwBytesRead; - - if (!GetOverlappedResult(This->hFile, &ovl, &dwBytesRead, TRUE)) + if (GetOverlappedResult(filter->hFile, &ovl, &read_len, TRUE)) + hr = (read_len == length) ? S_OK : S_FALSE; + else hr = HRESULT_FROM_WIN32(GetLastError()); } + else if (GetLastError() == ERROR_HANDLE_EOF) + hr = S_FALSE; + else + hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(ovl.hEvent); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 7f25596ae3..e13cb05a70 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -722,7 +722,6 @@ static void test_async_reader(void) ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); hr = IAsyncReader_SyncRead(reader, 590, 20, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); for (i = 0; i < 10; i++) ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); @@ -731,7 +730,6 @@ todo_wine memset(buffer, 0xcc, sizeof(buffer)); hr = IAsyncReader_SyncRead(reader, 600, 10, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]); -- 2.20.1

1 4

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 23 Feb '19

23 Feb '19

1 0

crypt32: Correct "Transaction Id" to "Transaction ID".
by Isira Seneviratne 22 Feb '19

22 Feb '19

1 0

[PATCH v2] wined3d: Remove a redundant adapter_count check (Coverity).
by Sven Baars 22 Feb '19

22 Feb '19

It is already tested that adapter_idx < wined3d->adapter_count before calling device_init, so adapter_count can never be zero. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: >= -> < dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..67680ac7f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5336,7 +5336,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); - device->adapter = wined3d->adapter_count ? adapter : NULL; + device->adapter = adapter; device->device_parent = device_parent; list_init(&device->resources); list_init(&device->shaders); -- 2.17.1

2 1

[PATCH] gdiplus: Add support for reading nested metafiles.
by Vincent Povirk 22 Feb '19

22 Feb '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 08dde2fec62..1e48d07703b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1817,6 +1817,39 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si } break; } + case ImageDataTypeMetafile: + { + EmfPlusMetafile *metafiledata = &data->ImageData.metafile; + + if (data_size <= FIELD_OFFSET(EmfPlusMetafile, MetafileData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusMetafile, MetafileData); + + switch (metafiledata->Type) { + case MetafileTypeEmf: + case MetafileTypeEmfPlusOnly: + case MetafileTypeEmfPlusDual: + { + HENHMETAFILE hemf; + + hemf = SetEnhMetaFileBits(data_size, metafiledata->MetafileData); + + if (!hemf) + return GenericError; + + status = GdipCreateMetafileFromEmf(hemf, TRUE, (GpMetafile**)image); + + if (status != Ok) + DeleteEnhMetaFile(hemf); + + break; + } + default: + FIXME("metafile type %d not supported.\n", metafiledata->Type); + return NotImplemented; + } + break; + } default: FIXME("image type %d not supported.\n", data->Type); return NotImplemented; -- 2.17.1

1 0

[PATCH] advapi32: Add a missing return value check (Coverity).
by Sven Baars 22 Feb '19

22 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/advapi32/security.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da40e7..07758eeed6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4123,6 +4123,12 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, } } + if (status != STATUS_SUCCESS) + { + ret = RtlNtStatusToDosError(status); + goto exit; + } + if (OldAcl) { for (i = 0; ; i++) -- 2.17.1

1 0

[PATCH 2/2] ntdll: Track copy-on-write memory state on i386 and x86_64 architectures.
by Piotr Caban 22 Feb '19

22 Feb '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 12 +++----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 8 +++++ dlls/ntdll/signal_arm64.c | 8 +++++ dlls/ntdll/signal_i386.c | 51 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 8 +++++ dlls/ntdll/signal_x86_64.c | 45 +++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++-------- 9 files changed, 170 insertions(+), 21 deletions(-)

2 1

[PATCH] windowscodecs: Move JPEG frame image data initialization from Frame::CopyPixels to Decoder::Initialize.
by Dmitry Timoshkov 22 Feb '19

22 Feb '19

This is how PNG decoder does things, and it avoids image data corruption in some cases (presumably when libjpeg reuses existing scanline data). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 152 ++++++++++++-------------------- 1 file changed, 56 insertions(+), 96 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 54f77a7220..1df898f28c 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -50,6 +50,7 @@ #include "wincodecs_private.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/library.h" @@ -155,6 +156,7 @@ typedef struct { struct jpeg_error_mgr jerr; struct jpeg_source_mgr source_mgr; BYTE source_buffer[1024]; + UINT bpp, stride; BYTE *image_data; CRITICAL_SECTION lock; } JpegDecoder; @@ -303,6 +305,8 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * int ret; LARGE_INTEGER seek; jmp_buf jmpbuf; + UINT data_size, i; + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -381,6 +385,55 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * return E_FAIL; } + if (This->cinfo.out_color_space == JCS_GRAYSCALE) This->bpp = 8; + else if (This->cinfo.out_color_space == JCS_CMYK) This->bpp = 32; + else This->bpp = 24; + + This->stride = (This->bpp * This->cinfo.output_width + 7) / 8; + data_size = This->stride * This->cinfo.output_height; + + This->image_data = heap_alloc(data_size); + if (!This->image_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + + while (This->cinfo.output_scanline < This->cinfo.output_height) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + JDIMENSION ret; + + max_rows = min(This->cinfo.output_height-first_scanline, 4); + for (i=0; i<max_rows; i++) + out_rows[i] = This->image_data + This->stride * (first_scanline+i); + + ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); + if (ret == 0) + { + ERR("read_scanlines failed\n"); + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + } + + if (This->bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + reverse_bgr8(3, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, + This->stride); + } + + if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + /* Adobe JPEG's have inverted CMYK data. */ + for (i=0; i<data_size; i++) + This->image_data[i] ^= 0xff; + } + This->initialized = TRUE; LeaveCriticalSection(&This->lock); @@ -590,104 +643,11 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - UINT bpp; - UINT stride; - UINT data_size; - UINT max_row_needed; - jmp_buf jmpbuf; - WICRect rect; - TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); - - if (!prc) - { - rect.X = 0; - rect.Y = 0; - rect.Width = This->cinfo.output_width; - rect.Height = This->cinfo.output_height; - prc = &rect; - } - else - { - if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->cinfo.output_width || - prc->Y+prc->Height > This->cinfo.output_height) - return E_INVALIDARG; - } - - if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; - else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32; - else bpp = 24; - - stride = (bpp * This->cinfo.output_width + 7) / 8; - data_size = stride * This->cinfo.output_height; - - max_row_needed = prc->Y + prc->Height; - if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; - - EnterCriticalSection(&This->lock); - if (!This->image_data) - { - This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!This->image_data) - { - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - } - - This->cinfo.client_data = jmpbuf; - - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - while (max_row_needed > This->cinfo.output_scanline) - { - UINT first_scanline = This->cinfo.output_scanline; - UINT max_rows; - JSAMPROW out_rows[4]; - UINT i; - JDIMENSION ret; - - max_rows = min(This->cinfo.output_height-first_scanline, 4); - for (i=0; i<max_rows; i++) - out_rows[i] = This->image_data + stride * (first_scanline+i); - - ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); - - if (ret == 0) - { - ERR("read_scanlines failed\n"); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - if (bpp == 24) - { - /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ - reverse_bgr8(3, This->image_data + stride * first_scanline, - This->cinfo.output_width, This->cinfo.output_scanline - first_scanline, - stride); - } - - if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) - { - DWORD *pDwordData = (DWORD*) (This->image_data + stride * first_scanline); - DWORD *pDwordDataEnd = (DWORD*) (This->image_data + This->cinfo.output_scanline * stride); - - /* Adobe JPEG's have inverted CMYK data. */ - while(pDwordData < pDwordDataEnd) - *pDwordData++ ^= 0xffffffff; - } - - } - - LeaveCriticalSection(&This->lock); + TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); - return copy_pixels(bpp, This->image_data, - This->cinfo.output_width, This->cinfo.output_height, stride, + return copy_pixels(This->bpp, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, This->stride, prc, cbStride, cbBufferSize, pbBuffer); } -- 2.20.1

2 3

[PATCH v2] gdiplus/tests: Fix a memory leak (Valgrind).
by Sven Baars 22 Feb '19

22 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Move the free to the bottom of the function. dlls/gdiplus/tests/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5aec1c283a..60591b0aca 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5482,6 +5482,7 @@ todo_wine GdipFree(palette); GdipDisposeImage((GpImage *)bitmap); + HeapFree(GetProcessHeap(), 0, data); } START_TEST(image) -- 2.17.1

2 1

[PATCH] gdiplus: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 22 Feb '19

22 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return InvalidParameter if format is NULL dlls/gdiplus/graphicspath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 76ef1c248e..7ec6061cb4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1088,13 +1088,13 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT heap_free(backup); return status; } - if (format && format->line_align == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) + if (format->line_align == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; inc /= 2; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; - } else if (format && format->line_align == StringAlignmentFar) { + } else if (format->line_align == StringAlignmentFar) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; -- 2.20.1

2 1

[PATCH 1/2] ntdll: Only touch memory that needs clearing when mapping image.
by Piotr Caban 22 Feb '19

22 Feb '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/virtual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH] winebuild: Recognize armv7a target.
by Piotr Caban 22 Feb '19

22 Feb '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- tools/widl/widl.c | 1 + tools/winebuild/utils.c | 1 + tools/winegcc/winegcc.c | 1 + 3 files changed, 3 insertions(+)

1 0

[PATCH vkd3d 10/11] tests: Mark driver bugs as todos in tests.
by Józef Kucia 22 Feb '19

22 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Allows running all tests cleanly on Intel and Nvidia. It might be a controversial change, but it should make development slightly easier. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 37 ++++++++++++++++++++++--------- tests/d3d12_crosstest.h | 48 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 73 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7e74fbfec2ae..2e980a43615c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5569,6 +5569,7 @@ static void test_draw_uav_only(void) D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; D3D12_ROOT_PARAMETER root_parameter; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; @@ -5650,7 +5651,10 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + todo_if(is_radv_device(context.device)) + check_readback_data_uint(&rb, NULL, 500, 0); + release_resource_readback(&rb); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); ID3D12DescriptorHeap_Release(descriptor_heap); @@ -7865,6 +7869,7 @@ static void test_shader_instructions(void) struct ivec4 i; } output; bool skip_on_warp; + bool skip_on_mesa; } tests[] = { @@ -7904,25 +7909,26 @@ static void test_shader_instructions(void) {&ps_if, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_if, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + /* FIXME: Ordered/unordered comparisons are broken on Mesa. */ {&ps_if_return, {{0.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, + {&ps_if_return, {{ NAN, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}, false, true}, {&ps_if_return, {{3.0f, 0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 0.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, + {&ps_if_return, {{4.0f, NAN, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, {&ps_if_return, {{4.0f, 3.0f, 0.0f, 0.0f}}, {{1.0f, 0.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, + {&ps_if_return, {{4.0f, 4.0f, NAN, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}, false, true}, {&ps_if_return, {{4.0f, 4.0f, 3.0f, 0.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 4.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 5.0f, 0.0f}}, {{1.0f, 1.0f, 0.0f, 0.0f}}}, - {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, + {&ps_if_return, {{4.0f, 4.0f, 0.0f, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 2.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 3.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 4.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, {&ps_if_return, {{4.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_if_return, {{5.0f, 4.0f, 0.0f, 5.0f}}, {{1.0f, 1.0f, 1.0f, 0.0f}}}, - {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, + {&ps_if_return, {{ NAN, NAN, NAN, NAN}}, {{1.0f, 1.0f, 1.0f, 1.0f}}, false, true}, {&ps_nested_if, {{0.0f, 0.0f, 0.0f}}, {{0.0f, 0.0f, 0.0f, 1.0f}}}, {&ps_nested_if, {{0.0f, 0.0f, 1.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, @@ -8628,6 +8634,12 @@ static void test_shader_instructions(void) continue; } + if (tests[i].skip_on_mesa && is_mesa_device(context.device)) + { + skip("Skipping shader '%s' test on Mesa.\n", tests[i].ps->name); + continue; + } + if (current_ps != tests[i].ps) { if (context.pipeline_state) @@ -16103,7 +16115,7 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); continue; } - if (is_amd_device(device)) + if (is_amd_windows_device(device)) { skip("Reads from depth/stencil shader resource views return stale values on some AMD drivers.\n"); destroy_depth_stencil(&ds); @@ -18611,7 +18623,8 @@ static void test_atomic_instructions(void) unsigned int expected = test->expected_result[j]; todo_if(test->i.x < 0 - && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin"))) + && (!strcmp(instructions[j], "atomic_imax") || !strcmp(instructions[j], "atomic_imin")) + && !is_nvidia_device(device)) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, instructions[j], @@ -18630,7 +18643,7 @@ static void test_atomic_instructions(void) unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; - todo_if(test->i.x < 0 && todo_instruction) + todo_if(test->i.x < 0 && todo_instruction && !is_nvidia_device(device)) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, imm_instructions[j], @@ -24566,6 +24579,7 @@ static void test_coverage(void) ID3D12Resource *ms_render_target; ID3D12PipelineState *pso_resolve; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12DescriptorHeap *heap; ID3D12CommandQueue *queue; @@ -24702,7 +24716,10 @@ static void test_coverage(void) D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_result, 0); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + todo_if((tests[i].expected_result & 0x3) != tests[i].expected_result && is_intel_mesa_device(context.device)) + check_readback_data_uint(&rb, NULL, tests[i].expected_result, 0); + release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index d0019dc85042..e352cce6b324 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -296,7 +296,7 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } -static inline bool is_amd_device(ID3D12Device *device) +static inline bool is_amd_windows_device(ID3D12Device *device) { DXGI_ADAPTER_DESC desc = {0}; IDXGIFactory4 *factory; @@ -324,8 +324,29 @@ static inline bool is_amd_device(ID3D12Device *device) return desc.VendorId == 0x1002; } + +static inline bool is_intel_mesa_device(ID3D12Device *device) +{ + return false; +} + +static inline bool is_mesa_device(ID3D12Device *device) +{ + return false; +} + +static inline bool is_nvidia_device(ID3D12Device *device) +{ + return false; +} + +static inline bool is_radv_device(ID3D12Device *device) +{ + return false; +} #else static bool have_VK_KHR_driver_properties; +static VkDriverIdKHR vk_driver_id; static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) { @@ -484,16 +505,39 @@ static void init_adapter_info(void) trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + vk_driver_id = driver_properties.driverID; + ID3D12Device_Release(device); done: vkd3d_instance_decref(instance); } -static inline bool is_amd_device(ID3D12Device *device) +static inline bool is_amd_windows_device(ID3D12Device *device) { return false; } + +static inline bool is_intel_mesa_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; +} + +static inline bool is_mesa_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR + || vk_driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; +} + +static inline bool is_nvidia_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; +} + +static inline bool is_radv_device(ID3D12Device *device) +{ + return vk_driver_id == VK_DRIVER_ID_MESA_RADV_KHR; +} #endif static ID3D12Device *create_device(void) -- 2.19.2

2 3

[PATCH] [user32] Add DlgDirList wildcard checks
by Vijay Kiran Kamuju 22 Feb '19

22 Feb '19

Based on patch from Christian Lupien Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8226 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/user32/dialog.c | 9 ++++++++- dlls/user32/tests/listbox.c | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index deaeb84556..094e3ad5bf 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1821,6 +1821,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, HWND hwnd; LPWSTR orig_spec = spec; WCHAR any[] = {'*','.','*',0}; + WCHAR star[] = {'*',0}; #define SENDMSG(msg,wparam,lparam) \ ((attrib & DDL_POSTMSGS) ? PostMessageW( hwnd, msg, wparam, lparam ) \ @@ -1829,10 +1830,16 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, TRACE("%p %s %d %d %04x\n", hDlg, debugstr_w(spec), idLBox, idStatic, attrib ); /* If the path exists and is a directory, chdir to it */ - if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = any; + if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = star; else { WCHAR *p, *p2; + BOOL wildcards = strchrW(spec, '*') || strchrW(spec, '?'); + if (!wildcards) + { + SetLastError(ERROR_NO_WILDCARD_CHARACTERS); + return FALSE; + } p = spec; if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d15b18ac69..8d8115131e 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1836,7 +1836,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); @@ -1849,8 +1849,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd); -- 2.20.1

1 0

[PATCH] ws2_32: Always set overlapped status in AcceptEx.
by Hans Leidekker 22 Feb '19

22 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 9 +++++---- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 542dc9a7a8..3755338ee8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2822,15 +2822,16 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW TRACE("(%04lx, %04lx, %p, %d, %d, %d, %p, %p)\n", listener, acceptor, dest, dest_len, local_addr_len, rem_addr_len, received, overlapped); - if (!dest) + if (!overlapped) { - SetLastError(WSAEINVAL); + SetLastError(WSA_INVALID_PARAMETER); return FALSE; } + overlapped->Internal = STATUS_PENDING; - if (!overlapped) + if (!dest) { - SetLastError(WSA_INVALID_PARAMETER); + SetLastError(WSAEINVAL); return FALSE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b32d1c053d..0c7f7363be 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8276,18 +8276,22 @@ static void test_AcceptEx(void) goto end; } + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); iret = listen(listener, 5); if (iret != 0) { @@ -8295,43 +8299,55 @@ todo_wine goto end; } + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, INVALID_SOCKET, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "AcceptEx on invalid accepting socket " "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEFAULT, "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address size returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel pending accept socket\n"); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small local address " "size returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel pending accept socket\n"); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAEFAULT, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx on too small remote address size returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); bret = CancelIo((HANDLE) listener); ok(bret, "Failed to cancel pending accept socket\n"); @@ -8351,16 +8367,20 @@ todo_wine goto end; } + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); if (bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) { /* We need to cancel this call, otherwise things fail */ bret = CancelIo((HANDLE) listener); @@ -8368,10 +8388,12 @@ todo_wine if (!bret) return; WaitForSingleObject(overlapped.hEvent, 0); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); } iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); @@ -8390,17 +8412,21 @@ todo_wine ok(bret, "Failed to cancel failed test. Bailing...\n"); if (!bret) return; + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); } + overlapped.Internal = 0xdeadbeef; iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, INFINITE); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + ok(overlapped.Internal == STATUS_SUCCESS, "got %08x\n", (ULONG)overlapped.Internal); bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); @@ -8422,10 +8448,12 @@ todo_wine skip("could not create connector socket, error %d\n", WSAGetLastError()); goto end; } + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); connect_time = 0xdeadbeef; optlen = sizeof(connect_time); @@ -8445,6 +8473,7 @@ todo_wine dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_TIMEOUT, "Waiting for accept event timeout failed with %d + errno %d\n", dwret, GetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); @@ -8455,6 +8484,7 @@ todo_wine dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + ok(overlapped.Internal == STATUS_SUCCESS, "got %08x\n", (ULONG)overlapped.Internal); /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, -- 2.20.1

1 0

[PATCH] secur32: Fix the username fallback in get_key_container_path.
by Hans Leidekker 22 Feb '19

22 Feb '19

Spotted by Sven Baars. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ea116e81da..7c6bb96f38 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -599,13 +599,12 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { static const WCHAR rsabaseW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','C','r','y','p','t','o','\\','R','S','A','\\',0}; - DWORD size; CERT_KEY_CONTEXT keyctx; + DWORD size = sizeof(keyctx), prov_size = 0; CRYPT_KEY_PROV_INFO *prov; WCHAR username[UNLEN + 1], *ret = NULL; DWORD len = ARRAY_SIZE(username); - size = sizeof(keyctx); if (CertGetCertificateContextProperty(ctx, CERT_KEY_CONTEXT_PROP_ID, &keyctx, &size)) { char *str; @@ -623,12 +622,10 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) MultiByteToWideChar(CP_ACP, 0, str, -1, ret + strlenW(ret), len); heap_free(str); } - else + else if (CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, NULL, &prov_size)) { - size = 0; - if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size)) return NULL; - if (!(prov = heap_alloc(size))) return NULL; - if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, prov, &size)) + if (!(prov = heap_alloc(prov_size))) return NULL; + if (!CertGetCertificateContextProperty(ctx, CERT_KEY_PROV_INFO_PROP_ID, prov, &prov_size)) { heap_free(prov); return NULL; -- 2.20.1

1 0

[PATCH 5/5] server: Return proper object type for mailslot and device files.
by Jacek Caban 22 Feb '19

22 Feb '19

1 0

[PATCH 4/5] server: Support token object type.
by Jacek Caban 22 Feb '19

22 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 10 ++++++++++ server/token.c | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 3/5] server: Support thread object type.
by Jacek Caban 22 Feb '19

22 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 3 +++ server/thread.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[PATCH 2/5] server: Support process object type.
by Jacek Caban 22 Feb '19

22 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 3 +++ server/process.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] ntdll/tests: Introduce test_object_type helper.
by Jacek Caban 22 Feb '19

22 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 117 +++++++++++++----------------------------- 1 file changed, 35 insertions(+), 82 deletions(-)

1 0

[PATCH] dinput/tests: Remove some redundant NULL pointer checks (Coverity).
by Sven Baars 22 Feb '19

22 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dinput/tests/device.c | 9 ++++----- dlls/dinput/tests/keyboard.c | 10 +++++----- dlls/dinput/tests/mouse.c | 8 ++++---- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index fa9b6f1436..97dc3c19f5 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -177,7 +177,7 @@ struct enum_data static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) { struct enum_data *data = pvRef; - IDirectInputDeviceA *device, *obj = NULL; + IDirectInputDeviceA *device, *obj; HRESULT hr; hr = IDirectInput_GetDeviceStatus(data->pDI, &lpddi->guidInstance); @@ -192,13 +192,12 @@ static BOOL CALLBACK enum_devices(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2A, (LPVOID*)&obj); ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7A) failed: %08x\n", hr); test_object_info(obj, data->hwnd); - if (obj) IUnknown_Release(obj); - obj = NULL; + IUnknown_Release(obj); hr = IUnknown_QueryInterface(device, &IID_IDirectInputDevice2W, (LPVOID*)&obj); ok(SUCCEEDED(hr), "IUnknown_QueryInterface(IID_IDirectInputDevice7W) failed: %08x\n", hr); test_object_info(obj, data->hwnd); - if (obj) IUnknown_Release(obj); + IUnknown_Release(obj); IUnknown_Release(device); } @@ -256,7 +255,7 @@ static void device_tests(void) DestroyWindow(hwnd); } if (obj) IUnknown_Release(obj); - if (pDI) IUnknown_Release(pDI); + IUnknown_Release(pDI); } START_TEST(device) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index e8dfb4f484..9ac9d4ac1d 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -165,7 +165,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) } keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); ActivateKeyboardLayout(hkl_orig, 0); UnloadKeyboardLayout(hkl); @@ -198,7 +198,7 @@ static const HRESULT SetCoop_child_window[16] = { static void test_set_coop(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; - IDirectInputDeviceA *pKeyboard = NULL; + IDirectInputDeviceA *pKeyboard; int i; HWND child; @@ -233,13 +233,13 @@ static void test_set_coop(IDirectInputA *pDI, HWND hwnd) } DestroyWindow(child); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); } static void test_get_prop(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; - IDirectInputDeviceA *pKeyboard = NULL; + IDirectInputDeviceA *pKeyboard; DIPROPRANGE diprg; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); @@ -255,7 +255,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); } static void test_capabilities(IDirectInputA *pDI, HWND hwnd) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c2d0226487..46f3833fee 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -51,7 +51,7 @@ static const HRESULT SetCoop_child_window[16] = { static void test_set_coop(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; - IDirectInputDeviceA *pMouse = NULL; + IDirectInputDeviceA *pMouse; int i; HWND child; @@ -81,13 +81,13 @@ static void test_set_coop(IDirectInputA *pDI, HWND hwnd) } DestroyWindow(child); - if (pMouse) IUnknown_Release(pMouse); + IUnknown_Release(pMouse); } static void test_acquire(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; - IDirectInputDeviceA *pMouse = NULL; + IDirectInputDeviceA *pMouse; DIMOUSESTATE m_state; HWND hwnd2; DIPROPDWORD di_op; @@ -193,7 +193,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) /* Granularity of Y axis should be 1! */ ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); - if (pMouse) IUnknown_Release(pMouse); + IUnknown_Release(pMouse); DestroyWindow( hwnd2 ); } -- 2.17.1

2 1

[PATCH 1/6] mfreadwrite: Add CreateInstanceFromObject() stub for source reader.
by Nikolay Sivov 22 Feb '19

22 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 98 +++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 77dbd7b052..dcacd9a751 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -28,10 +28,14 @@ #include "ole2.h" #include "rpcproxy.h" #include "mfreadwrite.h" +#include "mfidl.h" #include "wine/debug.h" +#include "wine/heap.h" DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); +DEFINE_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4); +DEFINE_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90); WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -52,15 +56,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } - -HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) -{ - FIXME("%p %p %p stub.\n", source, attributes, reader); - - return E_NOTIMPL; -} - HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; @@ -228,21 +223,52 @@ struct IMFSourceReaderVtbl srcreader_vtbl = src_reader_GetPresentationAttribute }; -HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, IMFSourceReader **reader) +static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, + REFIID riid, void **out) { srcreader *object; + HRESULT hr; - TRACE("%p, %p, %p\n", stream, attributes, reader); - - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if(!object) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - object->ref = 1; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->ref = 1; - *reader = &object->IMFSourceReader_iface; - return S_OK; + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + IMFSourceReader_Release(&object->IMFSourceReader_iface); + return hr; +} + +static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + /* FIXME: resolve bytestream to media source */ + + return create_source_reader_from_source(NULL, attributes, riid, out); +} + +/*********************************************************************** + * MFCreateSourceReaderFromByteStream (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", stream, attributes, reader); + + return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); +} + +/*********************************************************************** + * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, + IMFSourceReader **reader) +{ + TRACE("%p, %p, %p.\n", source, attributes, reader); + + return create_source_reader_from_source(source, attributes, &IID_IMFSourceReader, (void **)reader); } static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out) @@ -281,9 +307,43 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassF static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteClassFactory *iface, REFCLSID clsid, IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { - FIXME("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + HRESULT hr; - return E_NOTIMPL; + TRACE("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + + if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) + { + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + + if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + else if (source) + hr = create_source_reader_from_source(source, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; + } + else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) + { + FIXME("MFSinkWriter is not supported.\n"); + *out = NULL; + return E_NOTIMPL; + } + else + { + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + *out = NULL; + return E_FAIL; + } } static const IMFReadWriteClassFactoryVtbl readwrite_factory_vtbl = -- 2.20.1

1 5

[PATCH v2] mfplat: Implement MFHeap[Alloc|Free].
by Gijs Vermeulen 22 Feb '19

22 Feb '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/mfplat/main.c | 12 ++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- dlls/mfplat/tests/mfplat.c | 21 +++++++++++++++++++++ include/mfapi.h | 7 +++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 21240dfbeb..8d9a26d702 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3871,3 +3871,15 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) return S_OK; } + +void *WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type) +{ + TRACE("%lu %x %s %d %x\n", size, flags, debugstr_a(file), line, type); + return HeapAlloc(GetProcessHeap(), flags, size); +} + +void WINAPI MFHeapFree(void *p) +{ + TRACE("%p\n", p); + heap_free(p); +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5ee77406..57a87ef8d2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -103,8 +103,8 @@ @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId -@ stub MFHeapAlloc -@ stub MFHeapFree +@ stdcall MFHeapAlloc(long long str long long) +@ stdcall MFHeapFree(ptr) @ stub MFInitAMMediaTypeFromMFMediaType @ stub MFInitAttributesFromBlob @ stub MFInitMediaTypeFromAMMediaType diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a7b5620d32..7247879fe0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -41,6 +41,8 @@ static HRESULT (WINAPI *pMFCopyImage)(BYTE *dest, LONG deststride, const BYTE *s static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); +static void* (WINAPI *pMFHeapAlloc)(size_t size, ULONG flags, char *file, int line, EAllocationType type); +static void (WINAPI *pMFHeapFree)(void *p); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -314,6 +316,8 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); X(MFCreateMemoryBuffer); + X(MFHeapAlloc); + X(MFHeapFree); #undef X } @@ -913,6 +917,22 @@ static void test_MFCopyImage(void) ok(!memcmp(dest, src, 16), "Unexpected buffer contents.\n"); } +static void test_MFHeapAlloc(void) +{ + void* res; + + if (!pMFHeapAlloc) + { + win_skip("MFHeapAlloc() is not available.\n"); + return; + } + + res = pMFHeapAlloc(16, 0, NULL, 0, eAllocationTypeIgnore); + ok(res != NULL, "MFHeapAlloc failed\n"); + + pMFHeapFree(res); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -932,6 +952,7 @@ START_TEST(mfplat) test_MFCreateAsyncResult(); test_allocate_queue(); test_MFCopyImage(); + test_MFHeapAlloc(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index d70a300a3c..79b05c69e1 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -68,6 +68,13 @@ typedef struct tagMFASYNCRESULT HANDLE hEvent; } MFASYNCRESULT; +typedef enum _EAllocationType { + eAllocationTypeDynamic, + eAllocationTypeRT, + eAllocationTypePageable, + eAllocationTypeIgnore +} EAllocationType; + DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); -- 2.20.1

2 1

[PATCH v2] kernelbase: Remove redundant not-NULL check (coccinellery)
by Zhiyi Zhang 22 Feb '19

22 Feb '19

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Also remove no longer needed braces. Supersede 159016 dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfcc825838..3eefcd7bc1 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -326,7 +326,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); /* If path2 is fully qualified, use path2 only */ - if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + if ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\')) { path1 = path2; path2 = NULL; -- 2.20.1

1 0

[PATCH] kernelbase/tests: Fix a possible test failure.
by Zhiyi Zhang 22 Feb '19

22 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernelbase/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7644c312b7..b5da303629 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1035,6 +1035,7 @@ static void test_PathCchCanonicalize(void) ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); } + path_inW[0] = 0; hr = pPathCchCanonicalize(path_outW, 0, path_inW); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); -- 2.20.1

1 0

[PATCH 1/5] quartz/filesource: Correctly initialize the default media type.
by Zebediah Figura 22 Feb '19

22 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ab8d645d40..44794dff1b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -623,8 +623,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->cbFormat = 0; This->pmt->pbFormat = NULL; This->pmt->pUnk = NULL; - This->pmt->lSampleSize = 0; - This->pmt->formattype = FORMAT_None; + This->pmt->lSampleSize = 1; + This->pmt->formattype = GUID_NULL; hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 845e74d609..2e287f7cf2 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -237,11 +237,9 @@ static void test_file_source_filter(void) ok(file_mt.bFixedSizeSamples == TRUE, "Got fixed size %d.\n", file_mt.bFixedSizeSamples); ok(file_mt.bTemporalCompression == FALSE, "Got temporal compression %d.\n", file_mt.bTemporalCompression); -todo_wine { ok(file_mt.lSampleSize == 1, "Got sample size %u.\n", file_mt.lSampleSize); ok(IsEqualGUID(&file_mt.formattype, &GUID_NULL), "Got format type %s.\n", wine_dbgstr_guid(&file_mt.formattype)); -} ok(!file_mt.pUnk, "Got pUnk %p.\n", file_mt.pUnk); ok(!file_mt.cbFormat, "Got format size %#x.\n", file_mt.cbFormat); ok(!file_mt.pbFormat, "Got format %p.\n", file_mt.pbFormat); -- 2.20.1

1 4

[PATCH] wined3d: Remove a redundant adapter_count check (Coverity).
by Sven Baars 21 Feb '19

21 Feb '19

It is already tested that adapter_idx >= wined3d->adapter_count before calling device_init, so adapter_count can never be zero. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..67680ac7f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5336,7 +5336,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); - device->adapter = wined3d->adapter_count ? adapter : NULL; + device->adapter = adapter; device->device_parent = device_parent; list_init(&device->resources); list_init(&device->shaders); -- 2.17.1

3 3

[PATCH vkd3d 08/11] vkd3d-shader: Avoid generating unique array types for immediate constant buffers.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8cbd8dac121e..82598dfe6d9e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4283,7 +4283,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, &icb->data[4 * i]); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, icb->vec4_count); - type_id = vkd3d_spirv_build_op_type_array(builder, type_id, length_id); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); const_id = vkd3d_spirv_build_op_constant_composite(builder, type_id, elements, icb->vec4_count); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); icb_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, -- 2.19.2

2 1

[PATCH vkd3d 06/11] vkd3d-shader: Use correct base index for relative addressing of aggregates.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9838b7cdb113..8cbd8dac121e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2571,13 +2571,13 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else if (register_info->is_aggregate) { + struct vkd3d_shader_register_index reg_idx = reg->idx[0]; + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - if (reg->idx[0].rel_addr) - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); - else - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); + reg_idx.offset = register_info->member_idx; + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); } else { -- 2.19.2

2 1

[PATCH vkd3d 07/11] tests: Add more tessellation tests.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4e42000905dd..7e74fbfec2ae 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21974,7 +21974,62 @@ static void test_nop_tessellation_shaders(void) 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; - static const D3D12_SHADER_BYTECODE *hull_shaders[] = {&hs_cb, &hs}; + static const DWORD hs_index_range_code[] = + { +#if 0 + float4 tess_factor; + + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(InputPatch<data, 3> input, out patch_constant_data output) + { + output.edges[0] = tess_factor.x; + output.edges[1] = 1.0f; + output.edges[2] = 1.0f; + output.inside = tess_factor.y; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID) + { + return input[i]; + } +#endif + 0x43425844, 0xf9d52cfc, 0xb299036a, 0x66bf56b7, 0x6161e921, 0x00000001, 0x00000244, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, + 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, + 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x00000110, 0x00030050, 0x00000044, 0x01000071, + 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x04000059, 0x00208e46, + 0x00000000, 0x00000001, 0x01000073, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x06000036, + 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000001, 0x00000012, 0x04000067, + 0x00102012, 0x00000002, 0x00000013, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000001, + 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00d02012, 0x00000001, + 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, + 0x00000003, 0x00000014, 0x06000036, 0x00102012, 0x00000003, 0x0020801a, 0x00000000, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs_index_range = {hs_index_range_code, sizeof(hs_index_range_code)}; + static const D3D12_SHADER_BYTECODE *hull_shaders[] = {&hs_cb, &hs, &hs_index_range}; memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; @@ -22362,7 +22417,7 @@ static void test_quad_tessellation(void) pso_desc.StreamOutput.RasterizedStream = 0; pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; - vb = create_upload_buffer(context.device, sizeof(quad), quad); + vb = create_upload_buffer(device, sizeof(quad), quad); vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); vbv.StrideInBytes = sizeof(*quad); @@ -22388,7 +22443,7 @@ static void test_quad_tessellation(void) constant.inside_tess_factors[i] = 1.0f; pso_desc.HS = hs_quad_ccw; - hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); @@ -22427,7 +22482,7 @@ static void test_quad_tessellation(void) ID3D12PipelineState_Release(context.pipeline_state); pso_desc.HS = hs_quad_cw; - hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); @@ -22518,6 +22573,197 @@ static void test_quad_tessellation(void) destroy_test_context(&context); } +static void test_tessellation_dcl_index_range(void) +{ + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct point_data + { + float4 position : SV_POSITION; + }; + + struct patch_constant_data + { + float edges[4] : SV_TessFactor; + float inside[2] : SV_InsideTessFactor; + }; + + patch_constant_data patch_constant(InputPatch<point_data, 4> input) + { + patch_constant_data output; + + output.edges[0] = 1.0f; + output.edges[1] = 1.0f; + output.edges[2] = 1.0f; + output.edges[3] = 1.0f; + output.inside[0] = 1.0f; + output.inside[1] = 1.0f; + + return output; + } + + [domain("quad")] + [outputcontrolpoints(4)] + [outputtopology("triangle_cw")] + [partitioning("integer")] + [patchconstantfunc("patch_constant")] + point_data hs_main(InputPatch<point_data, 4> input, + uint i : SV_OutputControlPointID) + { + return input[i]; + } + + [domain("quad")] + point_data ds_main(patch_constant_data input, + float2 tess_coord : SV_DomainLocation, + const OutputPatch<point_data, 4> patch) + { + point_data output; + + float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x); + float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x); + output.position = lerp(a, b, tess_coord.y); + + return output; + } +#endif + static const DWORD hs_code[] = + { + 0x43425844, 0x0a619042, 0x424471f9, 0x9f0f4ff1, 0x065efacc, 0x00000001, 0x0000029c, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc, + 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002, + 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003, + 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, + 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, + 0x00000138, 0x00030050, 0x0000004e, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896, + 0x01001897, 0x0100086a, 0x01000073, 0x02000099, 0x00000004, 0x0200005f, 0x00017000, 0x04000067, + 0x00102012, 0x00000000, 0x0000000b, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x04000067, + 0x00102012, 0x00000002, 0x0000000d, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000004, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000004, + 0x0000000f, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x02000068, 0x00000001, 0x0400005b, + 0x00102012, 0x00000004, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, + 0x00d02012, 0x00000004, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xeb6b7631, 0x07f5469e, 0xed0cbf4a, 0x7158b3a6, 0x00000001, 0x00000284, 0x00000004, + 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, + 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, + 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098, + 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000001, 0x000000a6, 0x00000000, 0x0000000c, + 0x00000003, 0x00000004, 0x00000001, 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, + 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, + 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x58454853, + 0x00000120, 0x00040050, 0x00000048, 0x01002093, 0x01001895, 0x0100086a, 0x0200005f, 0x0001c032, + 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x02000068, 0x00000002, 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002, + 0x00000000, 0x00219e46, 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006, + 0x00100e46, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001, + 0x80219e46, 0x00000041, 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, + 0x001000f2, 0x00000001, 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000, + 0x08000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001, + 0x08000032, 0x001020f2, 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ID3D12Resource *vb; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, &input_layout); + pso_desc.VS = vs; + pso_desc.HS = hs; + pso_desc.DS = ds; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + vb = create_upload_buffer(device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -24864,6 +25110,7 @@ START_TEST(d3d12) run_test(test_layered_rendering); run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); + run_test(test_tessellation_dcl_index_range); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.19.2

2 1

[PATCH vkd3d 05/11] vkd3d-shader: Remove v{Fork, Join}InstanceID from symbol table when leaving shader phase.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 510fcd3e39da..9838b7cdb113 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4978,36 +4978,49 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } -static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + struct vkd3d_shader_register reg; + struct vkd3d_symbol reg_symbol; vkd3d_spirv_build_op_function_end(builder); compiler->temp_id = 0; compiler->temp_count = 0; + + if (phase->instance_count) + { + reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; + reg.idx[0].offset = ~0u; + vkd3d_symbol_make_register(&reg_symbol, &reg); + rb_remove_key(&compiler->symbol_table, &reg_symbol); + } } static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_phase *previous_phase; struct vkd3d_shader_phase *phase; - unsigned int idx; - if ((idx = compiler->shader_phase_count)) - vkd3d_dxbc_compiler_leave_shader_phase(compiler); + if ((previous_phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_leave_shader_phase(compiler, previous_phase); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) return; - phase = &compiler->shader_phases[compiler->shader_phase_count++]; + phase = &compiler->shader_phases[compiler->shader_phase_count]; phase->type = instruction->handler_idx; - phase->idx = idx; + phase->idx = compiler->shader_phase_count; phase->instance_count = 0; phase->function_id = 0; phase->instance_id = 0; phase->function_location = 0; + + ++compiler->shader_phase_count; } static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, -- 2.19.2

2 1

[PATCH vkd3d 04/11] vkd3d-shader: Simplify vkd3d_dxbc_compiler_get_register_id().
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Special casing is not needed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2c58a4709327..510fcd3e39da 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2605,40 +2605,14 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info register_info; - switch (reg->type) + if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) { - case VKD3DSPR_COLOROUT: - case VKD3DSPR_CONSTBUFFER: - case VKD3DSPR_DEPTHOUT: - case VKD3DSPR_DEPTHOUTGE: - case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_IDXTEMP: - case VKD3DSPR_IMMCONSTBUFFER: - case VKD3DSPR_INCONTROLPOINT: - case VKD3DSPR_INPUT: - case VKD3DSPR_LOCALTHREADID: - case VKD3DSPR_LOCALTHREADINDEX: - case VKD3DSPR_OUTPUT: - case VKD3DSPR_SAMPLER: - case VKD3DSPR_TEMP: - case VKD3DSPR_THREADGROUPID: - case VKD3DSPR_THREADID: - if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) - { - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); - return register_info.id; - } - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - case VKD3DSPR_IMMCONST: - ERR("Unexpected register type %#x.\n", reg->type); - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - default: - FIXME("Unhandled register type %#x.\n", reg->type); - return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); + return register_info.id; } + + return vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + SpvStorageClassPrivate, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); } static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, -- 2.19.2

2 1

[PATCH vkd3d 03/11] vkd3d-shader: Translate vPrim register.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6ef04a4bd747..2c58a4709327 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2358,6 +2358,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_PRIMID: + snprintf(buffer, buffer_size, "vPrim"); + break; case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; @@ -3084,6 +3087,10 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com switch (builtin) { + case SpvBuiltInPrimitiveId: + if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL) + vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); + break; case SpvBuiltInFragDepth: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; @@ -3204,6 +3211,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, + {VKD3D_SIV_PRIMITIVE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInPrimitiveId}}, + {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, {VKD3D_SIV_VIEWPORT_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInViewportIndex}}, @@ -3248,6 +3257,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_GSINSTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, {VKD3DSPR_OUTPOINTID, {VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}}, + {VKD3DSPR_PRIMID, {VKD3D_TYPE_INT, 1, SpvBuiltInPrimitiveId}}, + {VKD3DSPR_TESSCOORD, {VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}}, {VKD3DSPR_COVERAGE, {VKD3D_TYPE_UINT, 1, SpvBuiltInSampleMask, NULL, 1}}, -- 2.19.2

2 1

[PATCH vkd3d 02/11] vkd3d-shader: Fix swizzle for scalars.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> In rare cases, OpCompositeExtract was generated for scalars. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2b52334dc5e4..6ef04a4bd747 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2661,6 +2661,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + if (component_count == 1 && val_component_count == 1) + return val_id; + if (component_count == 1) { component_idx = vkd3d_write_mask_get_component_idx(write_mask); -- 2.19.2

2 1

[PATCH vkd3d 01/11] build: Fix 'make dist'.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3e9ddeaf555c..d854a5b7971b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,8 @@ vkd3d_cross_tests = \ tests/d3d12_invalid_usage vkd3d_test_headers = \ - tests/vkd3d_d3d12_test.h + tests/d3d12_crosstest.h \ + tests/d3d12_test_utils.h vkd3d_demos = \ demos/gears \ @@ -71,7 +72,7 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ - include/private/vkd3d_shader.h \ + include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/spirv.c \ -- 2.19.2

2 1

[PATCH 1/5] wined3d: Rename MAX_STREAMS to WINED3D_MAX_STREAMS.
by Zebediah Figura 21 Feb '19

21 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Since it will be moved to the public header. dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..93eae75463 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1368,7 +1368,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI TRACE("device %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", device, stream_idx, buffer, offset, stride); - if (stream_idx >= MAX_STREAMS) + if (stream_idx >= WINED3D_MAX_STREAMS) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; @@ -1423,7 +1423,7 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi TRACE("device %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", device, stream_idx, buffer, offset, stride); - if (stream_idx >= MAX_STREAMS) + if (stream_idx >= WINED3D_MAX_STREAMS) { WARN("Stream index %u out of range.\n", stream_idx); return WINED3DERR_INVALIDCALL; @@ -5249,7 +5249,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso break; case WINED3D_RTYPE_BUFFER: - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if (&device->state.streams[i].buffer->resource == resource) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 827d4f6df2..0c70f046eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2210,7 +2210,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ - caps->MaxStreams = MAX_STREAMS; + caps->MaxStreams = WINED3D_MAX_STREAMS; caps->MaxStreamStride = 1024; /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd72209391..3dfd368780 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -457,7 +457,7 @@ void state_unbind_resources(struct wined3d_state *state) } } - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) { @@ -535,7 +535,7 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_vertex_declaration_decref(decl); } - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) { @@ -1480,7 +1480,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } @@ -1531,7 +1531,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; - for (i = 0; i < MAX_STREAMS; ++i) + for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 863366b924..cd8bb5e423 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -217,7 +217,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) + if (e->input_slot >= WINED3D_MAX_STREAMS) continue; if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb2..24db1fd469 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -258,7 +258,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup } /* Device caps */ -#define MAX_STREAMS 16 +#define WINED3D_MAX_STREAMS 16 #define MAX_TEXTURES 8 #define MAX_FRAGMENT_SAMPLERS 16 #define MAX_VERTEX_SAMPLERS 4 @@ -2911,7 +2911,7 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]; - struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1 /* tesselated pseudo-stream */]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; unsigned int index_offset; @@ -2980,7 +2980,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { struct wined3d_vertex_declaration *vertex_declaration; - struct wined3d_stream_state streams[MAX_STREAMS + 1]; + struct wined3d_stream_state streams[WINED3D_MAX_STREAMS + 1]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index; @@ -3568,8 +3568,8 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; - WORD streamSource; /* MAX_STREAMS, 16 */ - WORD streamFreq; /* MAX_STREAMS, 16 */ + WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ + WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ -- 2.20.1

2 9

[PATCH] ddraw/tests: Remove redundant not NULL check (coccinellery)
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- skip + return at the beginning prior to the first goto. Same object files generated with CFLAGS="-O2 -g0". But of course the check can be kept to not break the pattern. dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ceb1f83367..d0ed33dbc4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5246,7 +5246,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index db67afa0e4..37238e162f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6271,7 +6271,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dbba9b5104..b60606fca3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7785,7 +7785,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 215e1c7107..3339b32d20 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7615,7 +7615,7 @@ cleanup: if (gl) FreeLibrary(gl); if (hdc) ReleaseDC(window, hdc); if (hdc2) ReleaseDC(window2, hdc2); - if (window) DestroyWindow(window); + DestroyWindow(window); if (window2) DestroyWindow(window2); } -- 2.20.1

3 2

[PATCH 1/5] d3d9: Don't upload unused system memory vertex buffers.
by Matteo Bruni 21 Feb '19

21 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 24 ++++++++++++++++++++++-- dlls/d3d9/tests/visual.c | 22 ++++++++++++++++++++++ dlls/d3d9/vertexdeclaration.c | 2 +- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 3fe0376e5c1..50b18b1ed36 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -256,6 +256,8 @@ struct d3d9_vertex_declaration IDirect3DDevice9Ex *parent_device; }; +HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, + struct wined3d_vertex_element **wined3d_elements, UINT *element_count) DECLSPEC_HIDDEN; HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, const D3DVERTEXELEMENT9 *elements, struct d3d9_vertex_declaration **declaration) DECLSPEC_HIDDEN; struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9( diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6cc3f180b09..8ff83f148d6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2730,23 +2730,43 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { + struct wined3d_vertex_declaration *wined3d_decl; struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + unsigned int i, offset, stride, map, count; + struct wined3d_vertex_element *elements; struct d3d9_vertexbuffer *d3d9_buffer; struct wined3d_resource *dst_resource; - unsigned int i, offset, stride, map; + struct d3d9_vertex_declaration *decl; struct wined3d_buffer *dst_buffer; struct wined3d_resource_desc desc; HRESULT hr; if (!device->sysmem_vb) return; + wined3d_decl = wined3d_device_get_vertex_declaration(device->wined3d_device); + if (!wined3d_decl) + return; if (base_vertex >= 0 || start_vertex >= -base_vertex) start_vertex += base_vertex; else FIXME("System memory vertex data offset is negative.\n"); - map = device->sysmem_vb; + decl = wined3d_vertex_declaration_get_parent(wined3d_decl); + if (!decl->elements) + { + map = 1; + } + else + { + map = 0; + if (FAILED(convert_to_wined3d_declaration(decl->elements, &elements, &count))) + return; + for (i = 0; i < count; ++i) + map |= 1u << elements[i].input_slot; + heap_free(elements); + } + map &= device->sysmem_vb; while (map) { i = wined3d_bit_scan(&map); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13cf6c72833..ce8b589f1a6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24580,6 +24580,28 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00443322, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(vb_s1); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice9_CreateTexture(device, 2, 2, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index b6445255238..5f07207a482 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -320,7 +320,7 @@ static const struct wined3d_parent_ops d3d9_vertexdeclaration_wined3d_parent_ops d3d9_vertexdeclaration_wined3d_object_destroyed, }; -static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, +HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elements, struct wined3d_vertex_element **wined3d_elements, UINT *element_count) { const D3DVERTEXELEMENT9* element; -- 2.19.2

4 14

[PATCH] mfplat: Implement MFHeap[Alloc|Free].
by Gijs Vermeulen 21 Feb '19

21 Feb '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/mfplat/main.c | 12 ++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- include/mfapi.h | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 21240dfbeb..a4c185733e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3871,3 +3871,15 @@ HRESULT WINAPI MFCreateSample(IMFSample **sample) return S_OK; } + +void *WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type) +{ + TRACE("%lu %x %s %d %x\n", size, flags, file, line, type); + return HeapAlloc(GetProcessHeap(), flags, size); +} + +void WINAPI MFHeapFree(void *p) +{ + TRACE("%p\n", p); + heap_free(p); +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5ee77406..57a87ef8d2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -103,8 +103,8 @@ @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId -@ stub MFHeapAlloc -@ stub MFHeapFree +@ stdcall MFHeapAlloc(long long str long long) +@ stdcall MFHeapFree(ptr) @ stub MFInitAMMediaTypeFromMFMediaType @ stub MFInitAttributesFromBlob @ stub MFInitMediaTypeFromAMMediaType diff --git a/include/mfapi.h b/include/mfapi.h index d70a300a3c..79b05c69e1 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -68,6 +68,13 @@ typedef struct tagMFASYNCRESULT HANDLE hEvent; } MFASYNCRESULT; +typedef enum _EAllocationType { + eAllocationTypeDynamic, + eAllocationTypeRT, + eAllocationTypePageable, + eAllocationTypeIgnore +} EAllocationType; + DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); -- 2.20.1

2 2

[PATCH] oledb32: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_POINTER if cookie is NULL dlls/oledb32/rowpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 46904d3da5..c922f93f90 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -416,7 +416,7 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin } This->sinks[i] = sink; - if (cookie) *cookie = i + 1; + *cookie = i + 1; return S_OK; } -- 2.20.1

1 0

[PATCH] ntdll: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return STATUS_ACCESS_VIOLATION if old_prot is NULL dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c86ca88334..76dc6c284d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2712,7 +2712,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T { *addr_ptr = wine_server_get_ptr( result.virtual_protect.addr ); *size_ptr = result.virtual_protect.size; - if (old_prot) *old_prot = result.virtual_protect.prot; + *old_prot = result.virtual_protect.prot; } return result.virtual_protect.status; } -- 2.20.1

1 0

[PATCH] kernelbase: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfcc825838..85b20a9e80 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -326,7 +326,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); /* If path2 is fully qualified, use path2 only */ - if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + if (((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) { path1 = path2; path2 = NULL; -- 2.20.1

1 0

[PATCH] wintrust: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return ERROR_OUTOFMEMORY if provData is NULL. dlls/wintrust/wintrust_main.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 58e3ac39c0..7db0b4787e 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -309,13 +309,11 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, goto done; error: - if (provData) - { - WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->u.pPDSip); - WINTRUST_Free(provData->psPfns); - WINTRUST_Free(provData); - } + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->u.pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + done: TRACE("returning %08x\n", err); return err; @@ -502,13 +500,11 @@ static LONG WINTRUST_CertVerify(HWND hwnd, GUID *actionID, goto done; error: - if (provData) - { - WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->u.pPDSip); - WINTRUST_Free(provData->psPfns); - WINTRUST_Free(provData); - } + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->u.pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + done: TRACE("returning %08x\n", err); return err; -- 2.20.1

1 0

[PATCH] comctl32: Avoid using the comma operator
by Michael Stefaniuc 21 Feb '19

21 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 ++-- dlls/comctl32/listbox.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3e3067300f..9a6ea3bbff 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1002,7 +1002,7 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) imldp.cbSize = sizeof(imldp); imldp.himl = InternalDrag.himl; imldp.i = 0; - imldp.hdcDst = hdc, + imldp.hdcDst = hdc; imldp.x = x; imldp.y = y; imldp.rgbBk = CLR_DEFAULT; @@ -1236,7 +1236,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, imldp.cbSize = sizeof(imldp); imldp.himl = himl; imldp.i = i; - imldp.hdcDst = hdc, + imldp.hdcDst = hdc; imldp.x = x; imldp.y = y; imldp.cx = dx; diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cbe57f2616..180c09b6f1 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1173,7 +1173,7 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) return; - cxEdge = GetSystemMetrics(SM_CXEDGE), + cxEdge = GetSystemMetrics(SM_CXEDGE); cyEdge = GetSystemMetrics(SM_CYEDGE); GetWindowRect(descr->self, &r); -- 2.20.1

1 0

[PATCH] gdiplus/tests: Fix a memory leak (Valgrind).
by Sven Baars 21 Feb '19

21 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdiplus/tests/image.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5aec1c283a..aede76bc2f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5389,6 +5389,8 @@ static void test_GdipInitializePalette(void) status = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat24bppRGB, data, &bitmap); expect(Ok, status); + HeapFree(GetProcessHeap(), 0, data); + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 255); palette->Flags = 0; -- 2.17.1

2 2

[PATCH] windowscodecs: Add support for CMYK to BGR conversion.
by Dmitry Timoshkov 21 Feb '19

21 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 9083aa04f7..3b3030bfc4 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -30,6 +30,7 @@ #include "wincodecs_private.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -1121,6 +1122,48 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec } return S_OK; + case format_32bppCMYK: + if (prc) + { + BYTE *srcdata; + UINT srcstride, srcdatasize; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = heap_alloc(srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *cmyk = src; + BYTE *bgr = dst; + + for (x = 0; x < prc->Width; x++) + { + BYTE c = cmyk[0], m = cmyk[1], y = cmyk[2], k = cmyk[3]; + bgr[0] = (255 - y) * (255 - k) / 255; /* B */ + bgr[1] = (255 - m) * (255 - k) / 255; /* G */ + bgr[2] = (255 - c) * (255 - k) / 255; /* R */ + cmyk += 4; + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + heap_free(srcdata); + return hr; + } + return S_OK; + default: FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; -- 2.20.1

2 1

[PATCH 3/3] ntdll: Pass async parameter to add_fd_completion server call.
by Jacek Caban 21 Feb '19

21 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 4 ++-- dlls/ntdll/file.c | 17 +++++++++-------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/sync.c | 3 ++- dlls/ntdll/tests/file.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-)

1 0

[PATCH] dinput8/tests: Fix some memory leaks (Valgrind).
by Sven Baars 21 Feb '19

21 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/dinput8/tests/device.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index aaeddd9b7b..1bfb34a198 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -281,6 +281,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); ok (hr == DIERR_ACQUIRED, "SetActionMap succeeded with an acquired device hr=%08x\n", hr); + IDirectInputDevice_Release(lpdid2); + return DIENUM_CONTINUE; } @@ -329,6 +331,12 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + if (data.keyboard) + IDirectInputDevice_Release(data.keyboard); + + if (data.mouse) + IDirectInputDevice_Release(data.mouse); + /* Repeat tests with a non NULL user */ data.username = "Ninja Brian"; hr = IDirectInput8_EnumDevicesBySemantics(pDI, NULL, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); @@ -383,6 +391,8 @@ static void test_action_mapping(void) hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_w(dps.wsz)); + + IDirectInputDevice_Release(data.keyboard); } if (data.mouse != NULL) @@ -392,9 +402,12 @@ static void test_action_mapping(void) test_build_action_map(data.mouse, data.lpdiaf, DITEST_YAXIS, DIDFT_RELAXIS, 0x01); test_device_input(data.mouse, INPUT_MOUSE, MOUSEEVENTF_LEFTDOWN, 3); + + IDirectInputDevice_Release(data.mouse); } DestroyWindow(hwnd); + IDirectInput_Release(pDI); } static void test_save_settings(void) @@ -458,7 +471,6 @@ static void test_save_settings(void) /* Easy case. Ask for default mapping, save, ask for previous map and read it back */ hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, DIDBAM_HWDEFAULTS); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); - ok (results[0] == af.rgoAction[0].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); @@ -543,6 +555,9 @@ static void test_save_settings(void) ok (other_results[1] == af.rgoAction[1].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID); ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + + IDirectInputDevice_Release(pKey); + IDirectInput_Release(pDI); } START_TEST(device) -- 2.17.1

1 0

On resources and KTHREAD
by Zebediah Figura 21 Feb '19

21 Feb '19

As the last leg of my journey (for now) implementing Windows' thousand synchronization objects, I arrive at ERESOURCE. Unlike the last three forms of mutex, these can be recursively acquired, and so it's necessary to keep track of who is holding them. I have a complete implementation that passes its own tests, but only with KeGetCurrentThread() stubbed to return the TID. A proper implementation of KeGetCurrentThread() is already required by some drivers (bug 45844). What would be necessary to implement this function in an acceptable way? If simply returning the TID isn't enough (and I believe this approach has been rejected before), how much of the structure need we correctly implement? How can we find out what that structure is, undocumented as it is? (For a slightly more concrete question: is [1] a legally safe source?) ἔρρωσθε, Zeb [1] https://www.nirsoft.net/kernel_struct/vista/index.html

2 1

[PATCH 5/5] user32: Improve EnumDisplayDevices stub.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 44 +++++++++++++++++++++++++++---------- dlls/user32/tests/monitor.c | 10 ++++----- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 483d5552bf..5993170fc8 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -361,25 +361,47 @@ static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISP static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; + static const WCHAR primary_monitor_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; + static const WCHAR nonpnp_monitor_string[] = {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ', + 'M','o','n','i','t','o','r',0}; FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } + else + { + if (strcmpiW(lpDevice, primary_device_name)) + return FALSE; - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + memcpy(lpDisplayDevice->DeviceName, primary_monitor_name, sizeof (primary_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, nonpnp_monitor_string, sizeof(nonpnp_monitor_string)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + lpDisplayDevice->DeviceID[0] = 0; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + } return TRUE; } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 733220a426..33c7e24128 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ -- 2.20.1

2 1

[PATCH 1/2] mfreadwrite: Add MFReadWriteClassFactory stub.
by Nikolay Sivov 21 Feb '19

21 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 129 ++++++++++++++++++++++++++++++-- dlls/mfreadwrite/tests/mfplat.c | 18 +++++ 2 files changed, 141 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 666e5ae62b..77dbd7b052 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -24,12 +24,15 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "ole2.h" #include "rpcproxy.h" #include "mfreadwrite.h" #include "wine/debug.h" +DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static HINSTANCE mfinstance; @@ -58,12 +61,6 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return E_NOTIMPL; } -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; -} - HRESULT WINAPI DllCanUnloadNow(void) { return S_FALSE; @@ -247,3 +244,123 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr *reader = &object->IMFSourceReader_iface; return S_OK; } + +static HRESULT WINAPI readwrite_factory_QueryInterface(IMFReadWriteClassFactory *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFReadWriteClassFactory) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFReadWriteClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI readwrite_factory_AddRef(IMFReadWriteClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI readwrite_factory_Release(IMFReadWriteClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassFactory *iface, REFCLSID clsid, + const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) +{ + FIXME("%s, %s, %p, %s, %p.\n", debugstr_guid(clsid), debugstr_w(url), attributes, debugstr_guid(riid), out); + + return E_NOTIMPL; +} + +static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteClassFactory *iface, REFCLSID clsid, + IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) +{ + FIXME("%s, %p, %p, %s, %p.\n", debugstr_guid(clsid), unk, attributes, debugstr_guid(riid), out); + + return E_NOTIMPL; +} + +static const IMFReadWriteClassFactoryVtbl readwrite_factory_vtbl = +{ + readwrite_factory_QueryInterface, + readwrite_factory_AddRef, + readwrite_factory_Release, + readwrite_factory_CreateInstanceFromURL, + readwrite_factory_CreateInstanceFromObject, +}; + +static IMFReadWriteClassFactory readwrite_factory = { &readwrite_factory_vtbl }; + +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI classfactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), out); + + *out = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + return IMFReadWriteClassFactory_QueryInterface(&readwrite_factory, riid, out); +} + +static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("%d.\n", dolock); + return S_OK; +} + +static const struct IClassFactoryVtbl classfactoryvtbl = +{ + classfactory_QueryInterface, + classfactory_AddRef, + classfactory_Release, + classfactory_CreateInstance, + classfactory_LockServer, +}; + +static IClassFactory classfactory = { &classfactoryvtbl }; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), out); + + if (IsEqualGUID(clsid, &CLSID_MFReadWriteClassFactory)) + return IClassFactory_QueryInterface(&classfactory, riid, out); + + WARN("Unsupported class %s.\n", debugstr_guid(clsid)); + *out = NULL; + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 9f5cad6ac2..de5f35949e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -36,6 +36,7 @@ #include "initguid.h" DEFINE_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO,0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61); DEFINE_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1); +DEFINE_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); @@ -90,6 +91,22 @@ static void test_MFCreateSourceReaderFromByteStream(void) IMFSourceReader_Release(source); } +static void test_factory(void) +{ + IMFReadWriteClassFactory *factory, *factory2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, + (void **)&factory); + ok(hr == S_OK, "Failed to create class factory, hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_MFReadWriteClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFReadWriteClassFactory, + (void **)&factory2); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + + IMFReadWriteClassFactory_Release(factory); +} + START_TEST(mfplat) { HRESULT hr; @@ -102,6 +119,7 @@ START_TEST(mfplat) init_functions(); test_MFCreateSourceReaderFromByteStream(); + test_factory(); MFShutdown(); -- 2.20.1

1 1

[PATCH 4/5] user32: Check device name in EnumDisplayDevicesW().
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 28 ++++++++++++++++++++++++++++ dlls/user32/tests/monitor.c | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a45e1c882..256a26c71b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -276,12 +276,40 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD return TRUE; } +static BOOL is_display_device(LPCWSTR name) +{ + static const WCHAR display_deviceW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + const WCHAR *p = name; + + if (strncmpiW(name, display_deviceW, ARRAY_SIZE(display_deviceW))) + return FALSE; + + p += ARRAY_SIZE(display_deviceW); + + if (!isdigitW(*p++)) + return FALSE; + + for (; *p; p++) + { + if (!isdigitW(*p)) + return FALSE; + } + + return TRUE; +} + /*********************************************************************** * EnumDisplayDevicesW (USER32.@) */ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { + if (lpDevice && !is_display_device(lpDevice)) + { + WARN("Wrong adapter name: %s\n", wine_dbgstr_w(lpDevice)); + return FALSE; + } + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8bf284a5e1..733220a426 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

2 1

[PATCH 1/6] user32/listbox: Use a helper to retrieve item height by index
by Gabriel Ivăncescu 21 Feb '19

21 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/listbox.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 118f564..9cecd00 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -158,6 +158,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static UINT get_item_height( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -212,7 +217,7 @@ static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; for (i = descr->top_item, height = 0; i < descr->nb_items; i++) { - if ((height += descr->items[i].height) > descr->height) break; + if ((height += get_item_height(descr, i)) > descr->height) break; } if (i == descr->top_item) return 1; else return i - descr->top_item; @@ -232,7 +237,7 @@ static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { page = descr->height; for (max = descr->nb_items - 1; max >= 0; max--) - if ((page -= descr->items[max].height) < 0) break; + if ((page -= get_item_height(descr, max)) < 0) break; if (max < descr->nb_items - 1) max++; } else if (descr->style & LBS_MULTICOLUMN) @@ -360,12 +365,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - dy -= descr->items[i].height; + dy -= get_item_height(descr, i); } else { for (i = index; i < descr->top_item; i++) - dy += descr->items[i].height; + dy += get_item_height(descr, i); } } else @@ -481,14 +486,14 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect if (index < descr->top_item) { for (i = descr->top_item-1; i >= index; i--) - rect->top -= descr->items[i].height; + rect->top -= get_item_height(descr, i); } else { for (i = descr->top_item; i < index; i++) - rect->top += descr->items[i].height; + rect->top += get_item_height(descr, i); } - rect->bottom = rect->top + descr->items[index].height; + rect->bottom = rect->top + get_item_height(descr, index); } } @@ -523,7 +528,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { while (index < descr->nb_items) { - if ((pos += descr->items[index].height) > y) break; + if ((pos += get_item_height(descr, index)) > y) break; index++; } } @@ -532,7 +537,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) while (index > 0) { index--; - if ((pos -= descr->items[index].height) <= y) break; + if ((pos -= get_item_height(descr, index)) <= y) break; } } } @@ -1099,7 +1104,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) rect.bottom = rect.top + descr->item_height; else - rect.bottom = rect.top + descr->items[i].height; + rect.bottom = rect.top + get_item_height(descr, i); /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) @@ -1214,7 +1219,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[index].height; + return get_item_height(descr, index); } else return descr->item_height; } @@ -1384,9 +1389,9 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) } else if (descr->style & LBS_OWNERDRAWVARIABLE) { - INT height = fully ? descr->items[index].height : 1; + INT height = fully ? get_item_height(descr, index) : 1; for (top = index; top > descr->top_item; top--) - if ((height += descr->items[top-1].height) > descr->height) break; + if ((height += get_item_height(descr, top - 1)) > descr->height) break; } else { @@ -1597,7 +1602,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } /* Repaint the items */ -- 2.20.1

3 15

[PATCH vkd3d 11/11] tests: Skip DXGI_FORMAT_R24G8_TYPELESS tests on radv.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Allows running all tests cleanly on radv. We have to implement formats emulation in vkd3d to fix the test. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e980a43615c..caa0764711c0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16051,6 +16051,13 @@ static void test_depth_stencil_sampling(void) { vkd3d_test_set_context("Test %u", i); + /* FIXME: Implement format substitution. */ + if (tests[i].typeless_format == DXGI_FORMAT_R24G8_TYPELESS && is_radv_device(device)) + { + skip("radv doesn't support VK_FORMAT_D24_UNORM_S8_UINT.\n"); + continue; + } + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, -- 2.19.2

1 0

[PATCH vkd3d 09/11] tests: Print driver info from VK_KHR_driver_properties.
by Józef Kucia 21 Feb '19

21 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> In preparation for the next commit. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 3 +- tests/d3d12_crosstest.h | 161 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d854a5b7971b..0bd788974ac5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,8 @@ AM_DEFAULT_SOURCE_EXT = .c if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) -tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ +tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ +tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la endif diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6357d48fe7ea..d0019dc85042 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -55,6 +55,7 @@ typedef int HRESULT; # include "vkd3d_dxgi1_4.h" #else # include <pthread.h> +# include "vkd3d.h" # include "vkd3d_utils.h" #endif @@ -324,12 +325,170 @@ static inline bool is_amd_device(ID3D12Device *device) return desc.VendorId == 0x1002; } #else +static bool have_VK_KHR_driver_properties; + +static HRESULT create_vkd3d_instance(struct vkd3d_instance **instance) +{ + struct vkd3d_optional_instance_extensions_info optional_extensions_info; + struct vkd3d_instance_create_info instance_create_info; + + static const char * const optional_instance_extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + }; + + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + + memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = &optional_extensions_info; + instance_create_info.pfn_signal_event = vkd3d_signal_event; + instance_create_info.wchar_size = sizeof(WCHAR); + + return vkd3d_create_instance(&instance_create_info, instance); +} + +static HRESULT create_vkd3d_device(struct vkd3d_instance *instance, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_device_create_info device_create_info; + + static const char * const device_extensions[] = + { + VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME, + }; + + memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.minimum_feature_level = minimum_feature_level; + device_create_info.instance = instance; + if (have_VK_KHR_driver_properties) + { + device_create_info.device_extensions = device_extensions; + device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + } + + return vkd3d_create_device(&device_create_info, iid, device); +} + +static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) +{ + VkExtensionProperties *properties; + bool ret = false; + unsigned int i; + uint32_t count; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return false; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(vk_physical_device, NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = true; + break; + } + } + + free(properties); + return ret; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, + D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) +{ + struct vkd3d_instance *instance; + HRESULT hr; + + if (SUCCEEDED(hr = create_vkd3d_instance(&instance))) + { + hr = create_vkd3d_device(instance, minimum_feature_level, iid, device); + vkd3d_instance_decref(instance); + } + + return hr; +} + static IUnknown *create_adapter(void) { return NULL; } -static void init_adapter_info(void) {} +static void init_adapter_info(void) +{ + PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties2 device_properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + struct vkd3d_instance *instance; + VkInstance vk_instance; + ID3D12Device *device; + uint32_t count, i; + VkResult vr; + HRESULT hr; + + if (FAILED(hr = create_vkd3d_instance(&instance))) + return; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + have_VK_KHR_driver_properties = true; + for (i = 0; i < count; ++i) + { + if (!check_device_extension(vk_physical_devices[i],VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME)) + { + have_VK_KHR_driver_properties = false; + break; + } + } + + free(vk_physical_devices); + + if (!have_VK_KHR_driver_properties) + goto done; + + if (FAILED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + goto done; + + vk_physical_device = vkd3d_get_vk_physical_device(device); + + pfn_vkGetPhysicalDeviceProperties2KHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + ok(pfn_vkGetPhysicalDeviceProperties2KHR, "vkGetPhysicalDeviceProperties2KHR is NULL.\n"); + + memset(&device_properties2, 0, sizeof(device_properties2)); + device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + device_properties2.pNext = &driver_properties; + memset(&driver_properties, 0, sizeof(driver_properties)); + driver_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + + trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + + ID3D12Device_Release(device); + +done: + vkd3d_instance_decref(instance); +} static inline bool is_amd_device(ID3D12Device *device) { -- 2.19.2

1 0

[PATCH 3/5] user32: Move EnumDisplayDevicesW stub to nulldrv.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/driver.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 26 +------------------------- dlls/user32/user_private.h | 1 + 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5b2929245c..483d5552bf 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -125,6 +125,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ClipCursor); GET_USER_FUNC(UpdateClipboard); GET_USER_FUNC(ChangeDisplaySettingsEx); + GET_USER_FUNC(EnumDisplayDevicesW); GET_USER_FUNC(EnumDisplayMonitors); GET_USER_FUNC(EnumDisplaySettingsEx); GET_USER_FUNC(GetMonitorInfo); @@ -354,6 +355,35 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode return DISP_CHANGE_FAILED; } +static BOOL CDECL nulldrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', + 'S','y','s','t','e','m',0}; + static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; + + FIXME("(%s,%d,%p,0x%08x), stub!\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + if (i) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); + memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); + + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | + DISPLAY_DEVICE_PRIMARY_DEVICE | + DISPLAY_DEVICE_VGA_COMPATIBLE; + + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lpDisplayDevice->DeviceKey[0] = 0; + + return TRUE; +} + static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { RECT r = {0, 0, 640, 480}; @@ -549,6 +579,7 @@ static USER_DRIVER null_driver = nulldrv_UpdateClipboard, /* display modes */ nulldrv_ChangeDisplaySettingsEx, + nulldrv_EnumDisplayDevicesW, nulldrv_EnumDisplayMonitors, nulldrv_EnumDisplaySettingsEx, nulldrv_GetMonitorInfo, @@ -691,6 +722,11 @@ static LONG CDECL loaderdrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mo return load_driver()->pChangeDisplaySettingsEx( name, mode, hwnd, flags, lparam ); } +static BOOL CDECL loaderdrv_EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) +{ + return load_driver()->pEnumDisplayDevicesW( lpDevice, i, lpDisplayDevice, dwFlags ); +} + static BOOL CDECL loaderdrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return load_driver()->pEnumDisplayMonitors( hdc, rect, proc, lp ); @@ -770,6 +806,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, + loaderdrv_EnumDisplayDevicesW, loaderdrv_EnumDisplayMonitors, loaderdrv_EnumDisplaySettingsEx, loaderdrv_GetMonitorInfo, diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd05..1a45e1c882 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -243,12 +243,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -288,25 +282,7 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); - - if (i) - return FALSE; - - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; - - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; + return USER_Driver->pEnumDisplayDevicesW(lpDevice, i, lpDisplayDevice, dwFlags); } /*********************************************************************** diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 514cf6753f..51b60a4b5c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -86,6 +86,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUpdateClipboard)(void); /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); + BOOL (CDECL *pEnumDisplayDevicesW)(LPCWSTR,DWORD,LPDISPLAY_DEVICEW,DWORD); BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (CDECL *pGetMonitorInfo)(HMONITOR,MONITORINFO*); -- 2.20.1

2 1

[PATCH] mf/tests: Add some tests for node management.
by Nikolay Sivov 21 Feb '19

21 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 134 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6e77f6b77c..d6091cb629 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -28,29 +28,159 @@ #include "initguid.h" #include "mfapi.h" +#include "mferror.h" #include "mfidl.h" #include "wine/test.h" static void test_topology(void) { + IMFTopologyNode *node, *node2; IMFTopology *topology; - IMFTopologyNode *node; + WORD count; HRESULT hr; + TOPOID id; hr = MFCreateTopology(NULL); ok(hr == E_POINTER, "got %#x\n", hr); hr = MFCreateTopology(&topology); ok(hr == S_OK, "got %#x\n", hr); - IMFTopology_Release(topology); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetTopoNodeID(node, &id); +todo_wine + ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetTopoNodeID(node2, id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + + count = 1; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 0, "Unexpected node count %u.\n", count); +} + /* Same id, different nodes. */ + hr = IMFTopology_AddNode(topology, node); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 1, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_AddNode(topology, node2); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNodeByID(topology, id, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + /* Change node id, add it again. */ + hr = IMFTopologyNode_SetTopoNodeID(node, ++id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(topology, id, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNodeByID(topology, id + 1, &node2); +todo_wine + ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node); +todo_wine + ok(hr == E_INVALIDARG, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopology_GetNode(topology, 0, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNode(topology, 1, &node2); +todo_wine + ok(hr == MF_E_INVALIDINDEX, "Failed to get a node, hr %#x.\n", hr); + + hr = IMFTopology_GetNode(topology, -2, &node2); +todo_wine + ok(hr == MF_E_INVALIDINDEX, "Failed to get a node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node2); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 2, "Unexpected node count %u.\n", count); +} + /* Remove with detached node, existing id. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + hr = IMFTopologyNode_SetTopoNodeID(node2, id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + hr = IMFTopology_RemoveNode(topology, node2); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + hr = IMFTopology_RemoveNode(topology, node); +todo_wine + ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 1, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_Clear(topology); +todo_wine + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + + count = 1; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 0, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_Clear(topology); +todo_wine + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + IMFTopology_Release(topology); } static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) -- 2.20.1

1 0

[PATCH] mfplat: Implement MFInvokeCallback().
by Nikolay Sivov 21 Feb '19

21 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 ++--- dlls/mfplat/queue.c | 54 +++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 ++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5ee77406..e55cfb9a5a 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -116,12 +116,12 @@ @ stub MFInitMediaTypeFromWaveFormatEx @ stub MFInitVideoFormat @ stub MFInitVideoFormat_RGB -@ stub MFInvokeCallback +@ stdcall MFInvokeCallback(ptr) @ stub MFJoinIoPort @ stdcall MFLockPlatform() @ stdcall MFLockWorkQueue(long) -@ stub MFPutWorkItem -@ stub MFPutWorkItemEx +@ stdcall MFPutWorkItem(long ptr ptr) +@ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback @ stub MFScheduleWorkItem diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 65f111ba41..ebc2ad487b 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -331,3 +331,57 @@ HRESULT WINAPI MFUnlockWorkQueue(DWORD queue) return unlock_user_queue(queue); } + +/*********************************************************************** + * MFPutWorkItem (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%#x, %p, %p.\n", queue, callback, state); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = MFPutWorkItemEx(queue, result); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFPutWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) +{ + FIXME("%#x, %p\n", queue, result); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFInvokeCallback (mfplat.@) + */ +HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) +{ + MFASYNCRESULT *result_data = (MFASYNCRESULT *)result; + DWORD queue = MFASYNC_CALLBACK_QUEUE_STANDARD, flags; + HRESULT hr; + + TRACE("%p.\n", result); + + if (FAILED(IMFAsyncCallback_GetParameters(result_data->pCallback, &flags, &queue))) + queue = MFASYNC_CALLBACK_QUEUE_STANDARD; + + if (FAILED(MFLockWorkQueue(queue))) + queue = MFASYNC_CALLBACK_QUEUE_STANDARD; + + hr = MFPutWorkItemEx(queue, result); + + MFUnlockWorkQueue(queue); + + return hr; +} diff --git a/include/mfapi.h b/include/mfapi.h index d70a300a3c..d85f7408b0 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -102,6 +102,8 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN UINT32 *pcount); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

1 0

[PATCH] wineandroid.drv: Remove unnecessary 'extends Object' statement.
by Isira Seneviratne 21 Feb '19

21 Feb '19

1 0

[PATCH 2/5] user32/tests: Add more EnumDisplayDevices tests.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 194 ++++++++++++++++++++++++++++++++---- 1 file changed, 174 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8f1b2c6fdd..8bf284a5e1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" +#include <stdio.h> static HMODULE hdll; static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); @@ -74,12 +76,154 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, return TRUE; } +static int adapter_count = 0; +static int monitor_count = 0; + +static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) +{ + char video_name[16]; + char video_value[128]; + char buffer[128]; + int number; + int vendor_id; + int device_id; + int subsys_id; + int revision_id; + size_t length; + HKEY hkey; + HDC hdc; + DWORD size; + LSTATUS ls; + + adapter_count++; + + /* DeviceName */ + ok(sscanf(device->DeviceName, "\\\\.\\DISPLAY%d", &number) == 1, "#%d: wrong DeviceName %s\n", index, + device->DeviceName); + + /* DeviceKey */ + /* win7 is the only OS version where \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not in order with adapter index. */ + if (GetVersion() != 0x1db10106 || !strcmp(winetest_platform, "wine")) + { + sprintf(video_name, "\\Device\\Video%d", index); + ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); + todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + if (!ls) + { + memset(video_value, 0, sizeof(video_value)); + size = sizeof(video_value); + ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); + ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); + RegCloseKey(hkey); + ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + } + } + else + ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); + + /* DeviceString */ + length = strlen(device->DeviceString); + ok(broken(length == 0) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ + length > 0, "#%d: expect DeviceString not empty\n", index); + + /* StateFlags */ + if (index == 0) + ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); + else + ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); + + if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + /* Test creating DC */ + hdc = CreateDCA(device->DeviceName, NULL, NULL, NULL); + ok(hdc != NULL, "#%d: failed to CreateDC(\"%s\") err=%d\n", index, device->DeviceName, GetLastError()); + DeleteDC(hdc); + } + + /* DeviceID */ + /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this + * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on + * userland. So here we check the expected format instead. */ + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", + &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: got %s\n", index, device->DeviceID); + else + { + todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, + &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); + } +} + +static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, + const DISPLAY_DEVICEA *device, DWORD flags) +{ + static const char device_id_prefix[] = "MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; + static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" + "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; + char monitor_name[32]; + char buffer[128]; + int number; + + monitor_count++; + + /* DeviceName */ + lstrcpyA(monitor_name, adapter_name); + sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); + todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + + /* DeviceString */ + ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); + + /* StateFlags */ + if (adapter_index == 0 && monitor_index == 0) + todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + else + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, + device->StateFlags); + + /* DeviceID */ + lstrcpynA(buffer, device->DeviceID, sizeof(device_id_prefix)); + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR + * ^ ^ ^ + * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ + todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ + (!lstrcmpiA(buffer, device_id_prefix) && + sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: wrong DeviceID : %s \n", monitor_index, device->DeviceID); + } + else + { + /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ + /* But we don't know which monitor instance this belongs to, so check format instead */ + todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + } + + /* DeviceKey */ + lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); + todo_wine ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + todo_wine ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); +} + static void test_enumdisplaydevices(void) { + static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; char primary_device_name[32]; char primary_monitor_device_name[32]; - DWORD primary_num = -1, num = 0; + char adapter_name[32]; + int number; + int flag_index; + int adapter_index; + int monitor_index; BOOL ret; if (!pEnumDisplayDevicesA) @@ -88,34 +232,44 @@ static void test_enumdisplaydevices(void) return; } + /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); - while(1) - { - BOOL ret; - HDC dc; - ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); - if(!ret) break; - if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - strcpy(primary_device_name, dd.DeviceName); - primary_num = num; - } - if(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); + todo_wine ok(!ret, "Expect failure\n"); + + /* Enumeration */ + for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) + for (adapter_index = 0; pEnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) { - /* test creating DC */ - dc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); - ok(dc != NULL, "Failed to CreateDC(\"%s\") err=%d\n", dd.DeviceName, GetLastError()); - DeleteDC(dc); + lstrcpyA(adapter_name, dd.DeviceName); + + if (sscanf(adapter_name, "\\\\.\\DISPLAYV%d", &number) == 1) + { + skip("Skipping software devices %s:%s\n", adapter_name, dd.DeviceString); + continue; + } + + test_enumdisplaydevices_adapter(adapter_index, &dd, flags[flag_index]); + + for (monitor_index = 0; pEnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); + monitor_index++) + test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); } - num++; - } - if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA) + ok(adapter_count > 0, "Expect at least one adapter found\n"); + /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ + ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); + + if (!pEnumDisplayMonitors || !pGetMonitorInfoA) { win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); return; } + ret = pEnumDisplayDevicesA(NULL, 0, &dd, 0); + ok(ret, "Expect success\n"); + lstrcpyA(primary_device_name, dd.DeviceName); + primary_monitor_device_name[0] = 0; ret = pEnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); ok(ret, "EnumDisplayMonitors failed\n"); -- 2.20.1

1 0

[PATCH 1/5] include: Add EnumDisplayDevices flags.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/wingdi.h | 6 +++++- include/winuser.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 1851654194..11d55c602e 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,13 +3318,17 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +/* DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 + typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { POINTL PathSourceSize; diff --git a/include/winuser.h b/include/winuser.h index 693965a03e..6300cc9a39 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1082,6 +1082,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used by EnumDisplayDevices */ +#define EDD_GET_DEVICE_INTERFACE_NAME 0x00000001 + #define EDS_RAWMODE 0x00000002 #define EDS_ROTATEDMODE 0x00000004 -- 2.20.1

1 0

[PATCH] [PATCH v2] wmvcore: Add stub for WMCheckURlExtension
by Vijay Kiran Kamuju 21 Feb '19

21 Feb '19

V2: Added tests Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ include/wmsdkidl.idl | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b11a5bf7dea9..af6d32a78efb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -18,7 +18,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -232,6 +232,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -245,6 +265,7 @@ START_TEST(wmvcore) test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index f3e3b6412274..61c3c0885249 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,4 +1,4 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 690885e8612d..14014ee59ace 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) +{ + FIXME("(%s): stub\n", wine_dbgstr_w(url)); + + if (!url) + return E_INVALIDARG; + + return NS_E_INVALID_NAME; +} + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5bc85465e1b2..bb7bfee4f8bc 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") +cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") -- 2.17.0

1 0

[PATCH] [PATCH v2] wmvcore: Add stub for WMCheckURlExtension
by Vijay Kiran Kamuju 21 Feb '19

21 Feb '19

V2: Added tests Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ include/wmsdkidl.idl | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b11a5bf7dea9..af6d32a78efb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -18,7 +18,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -232,6 +232,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -245,6 +265,7 @@ START_TEST(wmvcore) test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index f3e3b6412274..61c3c0885249 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,4 +1,4 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 690885e8612d..14014ee59ace 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) +{ + FIXME("(%s): stub\n", wine_dbgstr_w(url)); + + if (!url) + return E_INVALIDARG; + + return NS_E_INVALID_NAME; +} + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5bc85465e1b2..bb7bfee4f8bc 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") +cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") -- 2.17.0

1 0

[PATCH v2 1/5] quartz/tests/filesource: Add some tests for IBaseFilter_EnumPins().
by Zebediah Figura 21 Feb '19

21 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filesource.c | 160 +++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index b9040e26d6..9781a83792 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -23,6 +23,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + static IBaseFilter *create_file_source(void) { IBaseFilter *filter = NULL; @@ -32,6 +34,50 @@ static IBaseFilter *create_file_source(void) return filter; } +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + +static void load_file(IBaseFilter *filter, const WCHAR *filename) +{ + IFileSourceFilter *filesource; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFileSourceFilter_Load(filesource, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFileSourceFilter_Release(filesource); +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -192,11 +238,125 @@ static void test_file_source_filter(void) } } +static void test_enum_pins(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_file_source(); + IEnumPins *enum1, *enum2; + IPin *pins[2]; + ULONG count; + HRESULT hr; + ULONG ref; + BOOL ret; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + load_file(filter, filename); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); test_interfaces(); + test_enum_pins(); test_file_source_filter(); CoUninitialize(); -- 2.20.1

1 4

[PATCH 1/5] quartz/tests/filesource: Add some tests for IBaseFilter_EnumPins().
by Zebediah Figura 21 Feb '19

21 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filesource.c | 160 +++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index b9040e26d6..9781a83792 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -23,6 +23,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + static IBaseFilter *create_file_source(void) { IBaseFilter *filter = NULL; @@ -32,6 +34,50 @@ static IBaseFilter *create_file_source(void) return filter; } +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + +static void load_file(IBaseFilter *filter, const WCHAR *filename) +{ + IFileSourceFilter *filesource; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFileSourceFilter_Load(filesource, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFileSourceFilter_Release(filesource); +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -192,11 +238,125 @@ static void test_file_source_filter(void) } } +static void test_enum_pins(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_file_source(); + IEnumPins *enum1, *enum2; + IPin *pins[2]; + ULONG count; + HRESULT hr; + ULONG ref; + BOOL ret; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + load_file(filter, filename); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); test_interfaces(); + test_enum_pins(); test_file_source_filter(); CoUninitialize(); -- 2.20.1

2 5

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 21 Feb '19

21 Feb '19

1 0

[PATCH] comctl32: fix a memory leak (valgrind)
by Austin English 21 Feb '19

21 Feb '19

-- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

1 0

[PATCH] ntoskrnl.exe: Implement ExUuidCreate().
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b62660750..1d36620fc4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3983,3 +3983,36 @@ void WINAPI KeLeaveGuardedRegion(void) { FIXME("\n"); } + +/************************************************************************* + * ExUuidCreate (NTOSKRNL.@) + * + * Creates a 128bit UUID. + * + * RETURNS + * + * STATUS_SUCCESS if successful. + * RPC_NT_UUID_LOCAL_ONLY if UUID is only locally unique. + * + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) + */ +NTSTATUS WINAPI ExUuidCreate(UUID *uuid) +{ + /* RtlGenRandom */ + SystemFunction036(uuid, sizeof(*uuid)); + /* Clear the version bits and set the version (4) */ + uuid->Data3 &= 0x0fff; + uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + uuid->Data4[0] &= 0x3f; + uuid->Data4[0] |= 0x80; + + TRACE("%s\n", debugstr_guid(uuid)); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d087422605..73ebbd91ef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -185,7 +185,7 @@ @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback -@ stub ExUuidCreate +@ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType @ stub Exi386InterlockedDecrementLong diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 452e510fdc..fb8cacc188 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,9 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; +typedef GUID UUID; +NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); -- 2.15.2 (Apple Git-101.1)

2 2

[PATCH] wineandroid.drv: Remove redundant not-NULL checks (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Return if win is NULL. *Not compile tested*. dlls/wineandroid.drv/device.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 0800ad7947..0b8bf67ef1 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -520,8 +520,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (!data || data->parent == win) { - if (win) pANativeWindow_release( win ); - if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); + pANativeWindow_release( win ); + if (data) PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); return; } @@ -529,15 +529,12 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR release_native_window( data ); data->parent = win; data->generation++; - if (win) - { - wrap_java_call(); - if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); - win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); - win->setSwapInterval( win, data->swap_interval ); - unwrap_java_call(); - PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); - } + wrap_java_call(); + if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); + win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); + win->setSwapInterval( win, data->swap_interval ); + unwrap_java_call(); + PostMessageW( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p\n", hwnd, data, win ); } -- 2.20.1

1 0

[PATCH] kernel32: Remove redundant not 0 check (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Return with ERROR_INVALID_PARAMETER if size is 0. dlls/kernel32/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3419898407..eb0471cc8e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1612,7 +1612,7 @@ DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, if ( process == GetCurrentProcess() ) { len = GetModuleFileNameA( module, file_name, size ); - if (size) file_name[size - 1] = '\0'; + file_name[size - 1] = '\0'; return len; } -- 2.20.1

1 0

[PATCH] shell32: Remove superfluous continue (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/xdg.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 781902a238..0351699912 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -939,14 +939,10 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d /* Parse the value */ hr = parse_config2(p, home_dir, &out[idx]); - if (FAILED(hr)) + if (hr == E_OUTOFMEMORY) { - if (hr == E_OUTOFMEMORY) - { - fclose(file); - goto xdg_user_dir_lookup_error; - } - continue; + fclose(file); + goto xdg_user_dir_lookup_error; } } fclose (file); -- 2.20.1

1 0

[PATCH] secur32: Remove dead code (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- NULL is returned when !ret, so this part is never reached. dlls/secur32/schannel_gnutls.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ea116e81da..857b7e7090 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -602,8 +602,8 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) DWORD size; CERT_KEY_CONTEXT keyctx; CRYPT_KEY_PROV_INFO *prov; - WCHAR username[UNLEN + 1], *ret = NULL; - DWORD len = ARRAY_SIZE(username); + WCHAR *ret = NULL; + DWORD len; size = sizeof(keyctx); if (CertGetCertificateContextProperty(ctx, CERT_KEY_CONTEXT_PROP_ID, &keyctx, &size)) @@ -643,12 +643,6 @@ static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) heap_free(prov); } - if (!ret && GetUserNameW(username, &len) && (ret = heap_alloc(sizeof(rsabaseW) + len * sizeof(WCHAR)))) - { - strcpyW(ret, rsabaseW); - strcatW(ret, username); - } - return ret; } -- 2.17.1

2 1

[PATCH v2 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 20 Feb '19

20 Feb '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - no changes. dlls/kernel32/tests/file.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..a4fba43242 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,31 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + + br = pSetFileCompletionNotificationModes(hfile, 0); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

2 8

[PATCH] mshtml: Remove useless casts to self
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/editor.c | 8 ++++---- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/tests/htmldoc.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6838433985..c901592352 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -295,7 +295,7 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) TRACE("found font tag %p\n", elem); - get_elem_attr_value((nsIDOMElement*)elem, sizeW, &val_str, &val); + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); @@ -366,7 +366,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0); }else { /* Remove all size attributes from the range */ - remove_child_attr((nsIDOMElement*)elem, fontW, &size_str); + remove_child_attr(elem, fontW, &size_str); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } @@ -1174,10 +1174,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (insert_link_at_caret) { /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, (nsIDOMElement*)anchor_elem, FALSE); + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, (nsIDOMElement*)anchor_elem); + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4da01560e2..d490030ef3 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5597,14 +5597,14 @@ HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_g tag = get_tag_desc(tag_name); if(tag) { - hres = tag->constructor(doc, (nsIDOMElement*)nselem, &elem); + hres = tag->constructor(doc, nselem, &elem); }else if(use_generic) { - hres = HTMLGenericElement_Create(doc, (nsIDOMElement*)nselem, &elem); + hres = HTMLGenericElement_Create(doc, nselem, &elem); }else { elem = heap_alloc_zero(sizeof(HTMLElement)); if(elem) { elem->node.vtbl = &HTMLElementImplVtbl; - HTMLElement_Init(elem, doc, (nsIDOMElement*)nselem, &HTMLElement_dispex); + HTMLElement_Init(elem, doc, nselem, &HTMLElement_dispex); hres = S_OK; }else { hres = E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 25cdf802b1..52e6fe71b3 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -7543,7 +7543,7 @@ static void test_QueryInterface(IHTMLDocument2 *htmldoc) hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); - ok(qi != (IUnknown*)doc, "disp == doc\n"); + ok(qi != doc, "disp == doc\n"); IUnknown_Release(qi); } -- 2.20.1

2 1

[PATCH] d3d11: Change assert and return in unsafe_impl_from_ID3D11ShaderResourceView().
by Andrey Gusev 20 Feb '19

20 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46686 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d11/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 93d0b78655..43ec357340 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2291,8 +2291,8 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D11ShaderResourceView(ID3D1 { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d11_shader_resource_view_vtbl); - return impl_from_ID3D11ShaderResourceView(iface); + assert(iface->lpVtbl == (ID3D11ShaderResourceViewVtbl *)&d3d11_shader_resource_view_vtbl); + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); } struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) -- 2.20.1

3 2

[PATCH] wined3d: Pass d3d_info instead of the device to wined3d_stateblock_state_init.
by Sven Baars 20 Feb '19

20 Feb '19

This fixes a NULL pointer dereference in device_init found by Coverity. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..d1ab739c77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,7 +5093,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); + wined3d_stateblock_state_init(&device->stateblock_state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device_init_swapchain_state(device, swapchain); @@ -5368,7 +5368,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); + wined3d_stateblock_state_init(&device->stateblock_state, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd72209391..e66f6ab036 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1536,7 +1536,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1546,7 +1546,7 @@ void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, } if (flags & WINED3D_STATE_INIT_DEFAULT) - stateblock_state_init_default(state, &device->adapter->d3d_info); + stateblock_state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1556,7 +1556,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); + wined3d_stateblock_state_init(&stateblock->stateblock_state, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb2..c722d6dab2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3632,7 +3632,7 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; void wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, -- 2.17.1

2 5

[PATCH vkd3d 8/8] vkd3d-shader: Handle VKD3DSPR_INCONTROLPOINT in vkd3d_dxbc_compiler_get_register_id().
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 52c22fee33cc..2b52334dc5e4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2604,21 +2604,22 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * switch (reg->type) { - case VKD3DSPR_TEMP: - case VKD3DSPR_IDXTEMP: - case VKD3DSPR_INPUT: - case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: + case VKD3DSPR_CONSTBUFFER: case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_CONSTBUFFER: + case VKD3DSPR_IDXTEMP: case VKD3DSPR_IMMCONSTBUFFER: - case VKD3DSPR_SAMPLER: - case VKD3DSPR_THREADID: + case VKD3DSPR_INCONTROLPOINT: + case VKD3DSPR_INPUT: case VKD3DSPR_LOCALTHREADID: case VKD3DSPR_LOCALTHREADINDEX: + case VKD3DSPR_OUTPUT: + case VKD3DSPR_SAMPLER: + case VKD3DSPR_TEMP: case VKD3DSPR_THREADGROUPID: + case VKD3DSPR_THREADID: if (vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info)) { vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &register_info); -- 2.19.2

2 1

[PATCH vkd3d 7/8] tests: Add another hull shader to NOP tessellation shaders test.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 78 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a4e90b76b35..4e42000905dd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21838,6 +21838,7 @@ static void test_nop_tessellation_shaders(void) struct test_context context; ID3D12CommandQueue *queue; struct vec4 tess_factors; + unsigned int i; HRESULT hr; static const DWORD hs_cb_code[] = @@ -21912,6 +21913,16 @@ static void test_nop_tessellation_shaders(void) output.inside = 1.0f; } + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID) + { + return input[i]; + } + [domain("tri")] void ds_main(patch_constant_data input, float3 tess_coord : SV_DomainLocation, @@ -21923,6 +21934,27 @@ static void test_nop_tessellation_shaders(void) + tess_coord.z * patch[2].position; } #endif + static const DWORD hs_code[] = + { + 0x43425844, 0x0e9a8861, 0x39351e76, 0x0e10883f, 0x6054b5a1, 0x00000001, 0x0000020c, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, + 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, + 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x000000d8, 0x00030050, 0x00000036, 0x01000071, + 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x01000073, 0x02000099, + 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; static const DWORD ds_code[] = { 0x43425844, 0x8ed11021, 0x414dff74, 0x426849eb, 0x312f4860, 0x00000001, 0x000001e0, 0x00000004, @@ -21942,6 +21974,7 @@ static void test_nop_tessellation_shaders(void) 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SHADER_BYTECODE *hull_shaders[] = {&hs_cb, &hs}; memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; @@ -21964,23 +21997,42 @@ static void test_nop_tessellation_shaders(void) hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + ID3D12PipelineState_Release(context.pipeline_state); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + for (i = 0; i < ARRAY_SIZE(hull_shaders); ++i) + { + vkd3d_test_set_context("Test %u", i); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f; - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + pso_desc.HS = *hull_shaders[i]; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + vkd3d_test_set_context(NULL); destroy_test_context(&context); } -- 2.19.2

2 1

[PATCH vkd3d 6/8] vkd3d-shader: Add basic support for dcl_index_range.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> We can address SPIR-V arrays dynamically. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 4 +- libs/vkd3d-shader/spirv.c | 74 ++++++++++++++++++++++-- libs/vkd3d-shader/trace.c | 4 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 49116681dbab..7cc11e7586ac 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -619,8 +619,8 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins struct vkd3d_sm4_data *priv) { shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_OPAQUE, - &ins->declaration.index_range.first_register); - ins->declaration.index_range.last_register = *tokens; + &ins->declaration.index_range.dst); + ins->declaration.index_range.register_count = *tokens; } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index afed8a27050a..52c22fee33cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2568,14 +2568,17 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else if (register_info->is_aggregate) { - if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); + if (reg->idx[0].rel_addr) + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); + else + indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); } else { - if (reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr || (reg->idx[1].offset == ~0u && reg->idx[0].rel_addr)) FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ @@ -4754,6 +4757,64 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_siv(struct vkd3d_dxbc_compiler * vkd3d_dxbc_compiler_emit_output(compiler, dst, sysval); } +static bool vkd3d_dxbc_compiler_check_index_range(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_index_range *range) +{ + const struct vkd3d_shader_register *reg = &range->dst.reg; + struct vkd3d_shader_register_info reg_info; + struct vkd3d_shader_register current_reg; + struct vkd3d_symbol reg_symbol; + unsigned int i; + uint32_t id; + + current_reg = *reg; + vkd3d_symbol_make_register(&reg_symbol, &current_reg); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, &current_reg, &reg_info)) + { + ERR("Failed to get register info.\n"); + return false; + } + + /* FIXME: We should check if it's an array. */ + if (!reg_info.is_aggregate) + { + FIXME("Unhandled register %#x.\n", reg->type); + return false; + } + id = reg_info.id; + + for (i = reg->idx[0].offset; i < reg->idx[0].offset + range->register_count; ++i) + { + current_reg.idx[0].offset = i; + vkd3d_symbol_make_register(&reg_symbol, &current_reg); + + if (range->dst.write_mask != reg_info.write_mask + || vkd3d_write_mask_component_count(reg_info.write_mask) != 1) + { + FIXME("Unhandled index range write mask %#x (%#x).\n", + range->dst.write_mask, reg_info.write_mask); + return false; + } + + if (reg_info.id != id) + { + FIXME("Unhandled index range %#x, %u.\n", reg->type, i); + return false; + } + } + + return true; +} + +static void vkd3d_dxbc_compiler_emit_dcl_index_range(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_index_range *range = &instruction->declaration.index_range; + + if (!vkd3d_dxbc_compiler_check_index_range(compiler, range)) + FIXME("Ignoring dcl_index_range %#x %u.\n", range->dst.reg.type, range->register_count); +} + static void vkd3d_dxbc_compiler_emit_dcl_stream(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -7388,6 +7449,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_OUTPUT_SIV: vkd3d_dxbc_compiler_emit_dcl_output_siv(compiler, instruction); break; + case VKD3DSIH_DCL_INDEX_RANGE: + vkd3d_dxbc_compiler_emit_dcl_index_range(compiler, instruction); + break; case VKD3DSIH_DCL_STREAM: vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; @@ -7730,7 +7794,6 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -7789,7 +7852,10 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, } if (compiler->epilogue_function_id) + { + vkd3d_spirv_build_op_name(builder, compiler->epilogue_function_id, "epilogue"); vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); + } if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6375e714c1fc..bb0e6ad5a3d0 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1389,8 +1389,8 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_INDEX_RANGE: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.index_range.first_register, shader_version); - shader_addline(buffer, " %u", ins->declaration.index_range.last_register); + shader_dump_dst_param(buffer, &ins->declaration.index_range.dst, shader_version); + shader_addline(buffer, " %u", ins->declaration.index_range.register_count); break; case VKD3DSIH_DCL_INDEXABLE_TEMP: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6b095a9cbba6..7ffcdd9c5e77 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -584,8 +584,8 @@ struct vkd3d_shader_src_param struct vkd3d_shader_index_range { - struct vkd3d_shader_dst_param first_register; - unsigned int last_register; + struct vkd3d_shader_dst_param dst; + unsigned int register_count; }; enum vkd3d_decl_usage -- 2.19.2

2 1

[PATCH vkd3d 5/8] tests: Add test for quad tessellation.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 488 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 485 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index e83ea48fdb6a..5a4e90b76b35 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -658,10 +658,10 @@ static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, } #define create_32bit_constants_root_signature(a, b, c, e) \ - create_32bit_constants_root_signature_(__LINE__, a, b, c, e) + create_32bit_constants_root_signature_(__LINE__, a, b, c, e, 0) static ID3D12RootSignature *create_32bit_constants_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, unsigned int element_count, - D3D12_SHADER_VISIBILITY shader_visibility) + D3D12_SHADER_VISIBILITY shader_visibility, D3D12_ROOT_SIGNATURE_FLAGS flags) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature = NULL; @@ -677,7 +677,7 @@ static ID3D12RootSignature *create_32bit_constants_root_signature_(unsigned int memset(&root_signature_desc, 0, sizeof(root_signature_desc)); root_signature_desc.NumParameters = 1; root_signature_desc.pParameters = &root_parameter; - root_signature_desc.Flags = 0; + root_signature_desc.Flags = flags; hr = create_root_signature(device, &root_signature_desc, &root_signature); ok_(line)(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); @@ -21985,6 +21985,487 @@ static void test_nop_tessellation_shaders(void) destroy_test_context(&context); } +struct triangle +{ + struct vec4 v[3]; +}; + +#define check_triangles(a, b, c, d, e) check_triangles_(__LINE__, a, b, c, d, e) +static void check_triangles_(unsigned int line, ID3D12Resource *buffer, + ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + const struct triangle *triangles, unsigned int triangle_count) +{ + const struct triangle *current, *expected; + struct resource_readback rb; + unsigned int i, j, offset; + bool all_match = true; + + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + + for (i = 0; i < triangle_count; ++i) + { + current = get_readback_data(&rb, i, 0, 0, sizeof(*current)); + expected = &triangles[i]; + + offset = ~0u; + for (j = 0; j < ARRAY_SIZE(expected->v); ++j) + { + if (compare_vec4(&current->v[0], &expected->v[j], 0)) + { + offset = j; + break; + } + } + + if (offset == ~0u) + { + all_match = false; + break; + } + + for (j = 0; j < ARRAY_SIZE(expected->v); ++j) + { + if (!compare_vec4(&current->v[j], &expected->v[(j + offset) % 3], 0)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + + ok_(line)(all_match, "Triangle %u vertices {%.8e, %.8e, %.8e, %.8e}, " + "{%.8e, %.8e, %.8e, %.8e}, {%.8e, %.8e, %.8e, %.8e} " + "do not match {%.8e, %.8e, %.8e, %.8e}, {%.8e, %.8e, %.8e, %.8e}, " + "{%.8e, %.8e, %.8e, %.8e}.\n", i, + current->v[0].x, current->v[0].y, current->v[0].z, current->v[0].w, + current->v[1].x, current->v[1].y, current->v[1].z, current->v[1].w, + current->v[2].x, current->v[2].y, current->v[2].z, current->v[2].w, + expected->v[0].x, expected->v[0].y, expected->v[0].z, expected->v[0].w, + expected->v[1].x, expected->v[1].y, expected->v[1].z, expected->v[1].w, + expected->v[2].x, expected->v[2].y, expected->v[2].z, expected->v[2].w); + + release_resource_readback(&rb); +} + +static void test_quad_tessellation(void) +{ + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; +#if 0 + struct point_data + { + float4 position : SV_POSITION; + }; + + struct patch_constant_data + { + float edges[4] : SV_TessFactor; + float inside[2] : SV_InsideTessFactor; + }; + + float4 tess_factors; + float2 inside_tess_factors; + + patch_constant_data patch_constant(InputPatch<point_data, 4> input) + { + patch_constant_data output; + + output.edges[0] = tess_factors.x; + output.edges[1] = tess_factors.y; + output.edges[2] = tess_factors.z; + output.edges[3] = tess_factors.w; + output.inside[0] = inside_tess_factors.x; + output.inside[1] = inside_tess_factors.y; + + return output; + } + + [domain("quad")] + [outputcontrolpoints(4)] + [outputtopology("triangle_ccw")] + [partitioning("integer")] + [patchconstantfunc("patch_constant")] + point_data hs_main(InputPatch<point_data, 4> input, + uint i : SV_OutputControlPointID) + { + return input[i]; + } + + [domain("quad")] + point_data ds_main(patch_constant_data input, + float2 tess_coord : SV_DomainLocation, + const OutputPatch<point_data, 4> patch) + { + point_data output; + + float4 a = lerp(patch[0].position, patch[1].position, tess_coord.x); + float4 b = lerp(patch[2].position, patch[3].position, tess_coord.x); + output.position = lerp(a, b, tess_coord.y); + + return output; + } +#endif + static const DWORD hs_quad_ccw_code[] = + { + 0x43425844, 0xdf8df700, 0x58b08fb1, 0xbd23d2c3, 0xcf884094, 0x00000001, 0x000002b8, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc, + 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002, + 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003, + 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, + 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, + 0x00000154, 0x00030050, 0x00000055, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896, + 0x01002097, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x01000073, 0x04000067, + 0x00102012, 0x00000000, 0x0000000b, 0x06000036, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x06000036, + 0x00102012, 0x00000001, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000002, 0x0000000d, 0x06000036, 0x00102012, 0x00000002, 0x0020802a, 0x00000000, + 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x06000036, + 0x00102012, 0x00000003, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000004, 0x0000000f, 0x06000036, 0x00102012, 0x00000004, 0x0020800a, 0x00000000, + 0x00000001, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x06000036, + 0x00102012, 0x00000005, 0x0020801a, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs_quad_ccw = {hs_quad_ccw_code, sizeof(hs_quad_ccw_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xeb6b7631, 0x07f5469e, 0xed0cbf4a, 0x7158b3a6, 0x00000001, 0x00000284, 0x00000004, + 0x00000030, 0x00000064, 0x00000128, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x47534350, 0x000000bc, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, + 0x00000003, 0x00000000, 0x00000001, 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, + 0x00000001, 0x00000098, 0x00000002, 0x0000000b, 0x00000003, 0x00000002, 0x00000001, 0x00000098, + 0x00000003, 0x0000000b, 0x00000003, 0x00000003, 0x00000001, 0x000000a6, 0x00000000, 0x0000000c, + 0x00000003, 0x00000004, 0x00000001, 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, + 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, + 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x58454853, + 0x00000120, 0x00040050, 0x00000048, 0x01002093, 0x01001895, 0x0100086a, 0x0200005f, 0x0001c032, + 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x02000068, 0x00000002, 0x0a000000, 0x001000f2, 0x00000000, 0x80219e46, 0x00000041, 0x00000002, + 0x00000000, 0x00219e46, 0x00000003, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x0001c006, + 0x00100e46, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, 0x0a000000, 0x001000f2, 0x00000001, + 0x80219e46, 0x00000041, 0x00000000, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, + 0x001000f2, 0x00000001, 0x0001c006, 0x00100e46, 0x00000001, 0x00219e46, 0x00000000, 0x00000000, + 0x08000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x80100e46, 0x00000041, 0x00000001, + 0x08000032, 0x001020f2, 0x00000000, 0x0001c556, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; +#if 0 + ... + [outputtopology("triangle_cw")] + ... +#endif + static const DWORD hs_quad_cw_code[] = + { + 0x43425844, 0x1ab30cc8, 0x94174771, 0x61f4cdd0, 0xa287f62c, 0x00000001, 0x000002b8, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000015c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, + 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x47534350, 0x000000bc, + 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x0000000b, 0x00000003, 0x00000000, 0x00000e01, + 0x00000098, 0x00000001, 0x0000000b, 0x00000003, 0x00000001, 0x00000e01, 0x00000098, 0x00000002, + 0x0000000b, 0x00000003, 0x00000002, 0x00000e01, 0x00000098, 0x00000003, 0x0000000b, 0x00000003, + 0x00000003, 0x00000e01, 0x000000a6, 0x00000000, 0x0000000c, 0x00000003, 0x00000004, 0x00000e01, + 0x000000a6, 0x00000001, 0x0000000c, 0x00000003, 0x00000005, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, + 0x00000154, 0x00030050, 0x00000055, 0x01000071, 0x01002093, 0x01002094, 0x01001895, 0x01000896, + 0x01001897, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x01000073, 0x04000067, + 0x00102012, 0x00000000, 0x0000000b, 0x06000036, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000001, 0x0000000c, 0x06000036, + 0x00102012, 0x00000001, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000002, 0x0000000d, 0x06000036, 0x00102012, 0x00000002, 0x0020802a, 0x00000000, + 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x0000000e, 0x06000036, + 0x00102012, 0x00000003, 0x0020803a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000004, 0x0000000f, 0x06000036, 0x00102012, 0x00000004, 0x0020800a, 0x00000000, + 0x00000001, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000005, 0x00000010, 0x06000036, + 0x00102012, 0x00000005, 0x0020801a, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs_quad_cw = {hs_quad_cw_code, sizeof(hs_quad_cw_code)}; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + }; + unsigned int strides[] = {16}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const BYTE zero_data[2048]; + static const struct triangle expected_quad_ccw[] = + { + {{{-1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}}}, + {{{-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}}}, + {{{ 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 0.0f}}}, + }; + static const struct triangle expected_quad_cw[] = + { + {{{-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}}}, + {{{-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}}}, + {{{ 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 0.0f, 0.0f}}}, + }; + struct + { + float tess_factors[4]; + float inside_tess_factors[2]; + uint32_t padding[2]; + } constant; + + ID3D12Resource *vb, *so_buffer, *upload_buffer, *readback_buffer; + D3D12_QUERY_DATA_SO_STATISTICS *so_statistics; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_QUERY_HEAP_DESC query_heap_desc; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct resource_readback rb; + ID3D12QueryHeap *query_heap; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_SO_STATISTICS; + query_heap_desc.Count = 2; + query_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateQueryHeap(device, &query_heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr); + + context.root_signature = create_32bit_constants_root_signature_(__LINE__, + device, 0, 6, D3D12_SHADER_VISIBILITY_HULL, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, &input_layout); + pso_desc.VS = vs; + pso_desc.HS = hs_quad_cw; + pso_desc.DS = ds; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = 0; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + + vb = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + upload_buffer = create_upload_buffer(device, sizeof(zero_data), &zero_data); + + so_buffer = create_default_buffer(device, sizeof(zero_data), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0, + upload_buffer, 0, sizeof(zero_data)); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + for (i = 0; i < ARRAY_SIZE(constant.tess_factors); ++i) + constant.tess_factors[i] = 1.0f; + for (i = 0; i < ARRAY_SIZE(constant.inside_tess_factors); ++i) + constant.inside_tess_factors[i] = 1.0f; + + pso_desc.HS = hs_quad_ccw; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_triangles(so_buffer, queue, command_list, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0, + upload_buffer, 0, sizeof(zero_data)); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.HS = hs_quad_cw; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_triangles(so_buffer, queue, command_list, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, so_buffer, 0, + upload_buffer, 0, sizeof(zero_data)); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + + ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); + + for (i = 0; i < ARRAY_SIZE(constant.tess_factors); ++i) + constant.tess_factors[i] = 2.0f; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + constant.tess_factors[0] = 0.0f; /* A patch is discarded. */ + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); + + ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 1); + + constant.tess_factors[0] = 5.0f; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 6, &constant, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 1); + + readback_buffer = create_readback_buffer(device, 2 * sizeof(*so_statistics)); + ID3D12GraphicsCommandList_ResolveQueryData(command_list, + query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0, 2, readback_buffer, 0); + + get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + so_statistics = get_readback_data(&rb, 0, 0, 0, sizeof(*so_statistics)); + ok(so_statistics[0].NumPrimitivesWritten == 8, "Got unexpected primitives written %u.\n", + (unsigned int)so_statistics[0].NumPrimitivesWritten); + ok(so_statistics[0].PrimitivesStorageNeeded == 8, "Got unexpected primitives storage needed %u.\n", + (unsigned int)so_statistics[0].PrimitivesStorageNeeded); + ok(so_statistics[1].NumPrimitivesWritten == 11, "Got unexpected primitives written %u.\n", + (unsigned int)so_statistics[1].NumPrimitivesWritten); + ok(so_statistics[1].PrimitivesStorageNeeded == 11, "Got unexpected primitives storage needed %u.\n", + (unsigned int)so_statistics[1].PrimitivesStorageNeeded); + release_resource_readback(&rb); + + ID3D12Resource_Release(readback_buffer); + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(vb); + ID3D12QueryHeap_Release(query_heap); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -24330,6 +24811,7 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_nop_tessellation_shaders); + run_test(test_quad_tessellation); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.19.2

2 1

[PATCH vkd3d 3/8] vkd3d: Implement SO statistics queries.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/command.c | 35 +++++++++++++++++++++++++++++++---- libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 13 ++++++++++--- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 11 ++++++++--- 6 files changed, 57 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 8b2e70fdadcb..231123bd672f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1749,6 +1749,12 @@ typedef struct D3D12_QUERY_DATA_PIPELINE_STATISTICS UINT64 CSInvocations; } D3D12_QUERY_DATA_PIPELINE_STATISTICS; +typedef struct D3D12_QUERY_DATA_SO_STATISTICS +{ + UINT64 NumPrimitivesWritten; + UINT64 PrimitivesStorageNeeded; +} D3D12_QUERY_DATA_SO_STATISTICS; + typedef enum D3D12_PREDICATION_OP { D3D12_PREDICATION_OP_EQUAL_ZERO = 0, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7457ae3610fa..5b11c3c43d44 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4080,10 +4080,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman d3d12_command_list_end_current_render_pass(list); + VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1)); + if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; - VK_CALL(vkCmdResetQueryPool(list->vk_command_buffer, query_heap->vk_query_pool, index, 1)); + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + { + unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0; + VK_CALL(vkCmdBeginQueryIndexedEXT(list->vk_command_buffer, + query_heap->vk_query_pool, index, flags, stream_index)); + return; + } + VK_CALL(vkCmdBeginQuery(list->vk_command_buffer, query_heap->vk_query_pool, index, flags)); } @@ -4110,9 +4119,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL return; } + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + { + unsigned int stream_index = type - D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0; + VK_CALL(vkCmdEndQueryIndexedEXT(list->vk_command_buffer, + query_heap->vk_query_pool, index, stream_index)); + return; + } + VK_CALL(vkCmdEndQuery(list->vk_command_buffer, query_heap->vk_query_pool, index)); } +static size_t get_query_stride(D3D12_QUERY_TYPE type) +{ + if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) + return sizeof(D3D12_QUERY_DATA_PIPELINE_STATISTICS); + + if (D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3) + return sizeof(D3D12_QUERY_DATA_SO_STATISTICS); + + return sizeof(uint64_t); +} + static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12GraphicsCommandList *iface, ID3D12QueryHeap *heap, D3D12_QUERY_TYPE type, UINT start_index, UINT query_count, ID3D12Resource *dst_buffer, UINT64 aligned_dst_buffer_offset) @@ -4120,9 +4148,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics const struct d3d12_query_heap *query_heap = unsafe_impl_from_ID3D12QueryHeap(heap); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *buffer = unsafe_impl_from_ID3D12Resource(dst_buffer); - VkDeviceSize offset, stride = sizeof(uint64_t); const struct vkd3d_vk_device_procs *vk_procs; unsigned int i, first, count; + VkDeviceSize offset, stride; TRACE("iface %p, heap %p, type %#x, start_index %u, query_count %u, " "dst_buffer %p, aligned_dst_buffer_offset %#"PRIx64".\n", @@ -4149,8 +4177,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics d3d12_command_list_end_current_render_pass(list); - if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) - stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); + stride = get_query_stride(type); count = 0; first = start_index; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index df59a49dcc17..3d9b8c9aae8d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -945,6 +945,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; + vulkan_info->transform_feedback_queries = xfb_properties.transformFeedbackQueries; vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 34f558d6fda3..1176538f5c54 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2835,9 +2835,16 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H break; case D3D12_QUERY_HEAP_TYPE_SO_STATISTICS: - FIXME("Unsupported query heap type SO_STATISTICS.\n"); - vkd3d_free(object); - return E_NOTIMPL; + if (!device->vk_info.transform_feedback_queries) + { + FIXME("Transform feedback queries are not supported by Vulkan implementation.\n"); + vkd3d_free(object); + return E_NOTIMPL; + } + + pool_info.queryType = VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT; + pool_info.pipelineStatistics = 0; + break; default: WARN("Invalid query heap type %u.\n", desc->Type); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index dee129e80e9e..9b2fbaf4abe0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -93,6 +93,7 @@ struct vkd3d_vulkan_info bool EXT_vertex_attribute_divisor; bool rasterization_stream; + bool transform_feedback_queries; bool vertex_attrib_zero_divisor; unsigned int max_vertex_attrib_divisor; diff --git a/tests/d3d12.c b/tests/d3d12.c index 259f0cafa443..e83ea48fdb6a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19007,10 +19007,15 @@ static void test_create_query_heap(void) heap_desc.NodeMask = 0; hr = ID3D12Device_CreateQueryHeap(device, &heap_desc, &IID_ID3D12QueryHeap, (void **)&query_heap); - todo ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); - - if (hr == S_OK) + if (hr != E_NOTIMPL) + { + ok(hr == S_OK, "Failed to create query heap, type %u, hr %#x.\n", heap_desc.Type, hr); ID3D12QueryHeap_Release(query_heap); + } + else + { + skip("Stream output is not supported.\n"); + } refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); -- 2.19.2

2 1

[PATCH vkd3d 4/8] vkd3d-shader: Avoid using SPIR-V built-ins for shader interface between tessellation stages.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> We can do this because both tessellation shaders are required in Direct3D. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 67 ++++++++++++++------------------------- 1 file changed, 24 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6ba169f6c6af..afed8a27050a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -129,20 +129,6 @@ static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, return NULL; } -static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_sysval_semantic sysval) -{ - switch (sysval) - { - case VKD3D_SV_NONE: - return VKD3D_SIV_NONE; - case VKD3D_SV_POSITION: - return VKD3D_SIV_POSITION; - default: - FIXME("Unhandled sysval %#x.\n", sysval); - return VKD3D_SIV_NONE; - } -} - #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 #define VKD3D_SPIRV_GENERATOR_VERSION 1 @@ -3558,9 +3544,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi return 0; } - if (!sysval && signature_element->sysval_semantic) - sysval = vkd3d_siv_from_sysval(signature_element->sysval_semantic); - builtin = get_spirv_builtin_for_sysval(compiler, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -5014,11 +4997,12 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_signature *signature = compiler->input_signature; + const struct vkd3d_shader_signature *output_signature = compiler->output_signature; + const struct vkd3d_shader_signature *input_signature = compiler->input_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_spirv_builtin *builtin, *input_builtin; uint32_t type_id, input_ptr_type_id, output_ptr_type_id; uint32_t input_id, output_id, dst_id, src_id; - const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; unsigned int component_count; uint32_t invocation_id; @@ -5030,48 +5014,45 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx type_id = vkd3d_spirv_get_type_id(builder, builtin->component_type, builtin->component_count); invocation_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); - for (i = 0; i < signature->element_count; ++i) + assert(input_signature->element_count == output_signature->element_count); + for (i = 0; i < output_signature->element_count; ++i) { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + const struct vkd3d_shader_signature_element *output = &output_signature->elements[i]; + const struct vkd3d_shader_signature_element *input = &input_signature->elements[i]; + + assert((input->mask & 0xff) == (output->mask & 0xff)); + assert(input->component_type == output->component_type); - if ((builtin = get_spirv_builtin_for_sysval(compiler, e->sysval_semantic))) + if ((input_builtin = get_spirv_builtin_for_sysval(compiler, input->sysval_semantic))) { - component_type = builtin->component_type; - component_count = builtin->component_count; + component_type = input_builtin->component_type; + component_count = input_builtin->component_count; } else { - component_type = e->component_type; - component_count = vkd3d_write_mask_component_count(e->mask & 0xff); + component_type = input->component_type; + component_count = vkd3d_write_mask_component_count(input->mask & 0xff); } - if (builtin) + if (input_builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, - builtin, SpvStorageClassInput, compiler->input_control_point_count); + input_builtin, SpvStorageClassInput, compiler->input_control_point_count); } else { input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, component_type, component_count, compiler->input_control_point_count); vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, e->register_index); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, input->register_index); } - vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", e->register_index); + vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", input->register_index); - if (builtin) - { - output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, - builtin, SpvStorageClassOutput, compiler->output_control_point_count); - } - else - { - output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); - vkd3d_spirv_add_iface_variable(builder, output_id); - vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, e->register_index); - } - vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", e->register_index); + output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, output->register_index); + vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", output->register_index); type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); output_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); -- 2.19.2

2 1

[PATCH vkd3d 2/8] vkd3d-shader: Set xxxx swizzle for scalar registers.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly for vOutputControlPointID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 43 +++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5e4babb1e4de..49116681dbab 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1511,6 +1511,25 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr return true; } +static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) +{ + switch (reg->type) + { + case VKD3DSPR_COVERAGE: + case VKD3DSPR_DEPTHOUT: + case VKD3DSPR_DEPTHOUTGE: + case VKD3DSPR_DEPTHOUTLE: + case VKD3DSPR_GSINSTID: + case VKD3DSPR_LOCALTHREADINDEX: + case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: + case VKD3DSPR_SAMPLEMASK: + return true; + default: + return false; + } +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { @@ -1541,7 +1560,10 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * switch (swizzle_type) { case VKD3D_SM4_SWIZZLE_NONE: - src_param->swizzle = VKD3D_NO_SWIZZLE; + if (shader_sm4_is_scalar_register(&src_param->reg)) + src_param->swizzle = VKD3D_SWIZZLE(VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_X); + else + src_param->swizzle = VKD3D_NO_SWIZZLE; break; case VKD3D_SM4_SWIZZLE_SCALAR: @@ -1562,25 +1584,6 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * return true; } -static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) -{ - switch (reg->type) - { - case VKD3DSPR_COVERAGE: - case VKD3DSPR_DEPTHOUT: - case VKD3DSPR_DEPTHOUTGE: - case VKD3DSPR_DEPTHOUTLE: - case VKD3DSPR_GSINSTID: - case VKD3DSPR_LOCALTHREADINDEX: - case VKD3DSPR_OUTPOINTID: - case VKD3DSPR_PRIMID: - case VKD3DSPR_SAMPLEMASK: - return true; - default: - return false; - } -} - static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) { -- 2.19.2

2 1

[PATCH vkd3d 1/8] vkd3d-shader: Replace VKD3DSIH_TABLE_SIZE with VKD3DSIH_INVALID.
by Józef Kucia 20 Feb '19

20 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 10 +++++----- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0b5f7bc892f6..5e4babb1e4de 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -545,7 +545,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, if (icb_size % 4 || icb_size > MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE) { FIXME("Unexpected immediate constant buffer size %u.\n", icb_size); - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } @@ -1689,7 +1689,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(opcode_info = get_opcode_info(opcode))) { FIXME("Unrecognized opcode %#x, opcode_token 0x%08x.\n", opcode, opcode_token); - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; *ptr += len; return; } @@ -1733,7 +1733,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) { - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } priv->dst_param[i].modifiers |= instruction_dst_modifier; @@ -1744,7 +1744,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]), &priv->src_param[i]))) { - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } } @@ -1754,7 +1754,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha fail: *ptr = priv->end; - ins->handler_idx = VKD3DSIH_TABLE_SIZE; + ins->handler_idx = VKD3DSIH_INVALID; return; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index cb7452bdc2ab..6375e714c1fc 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1602,7 +1602,7 @@ void vkd3d_shader_trace(void *data) struct vkd3d_shader_instruction ins; shader_sm4_read_instruction(data, &ptr, &ins); - if (ins.handler_idx == VKD3DSIH_TABLE_SIZE) + if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); shader_addline(&buffer, "<unrecognized instruction>\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6e6880c689b4..55cb56c2e191 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -175,7 +175,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); - if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE) + if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); vkd3d_dxbc_compiler_destroy(spirv_compiler); @@ -305,7 +305,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, { shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); - if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE) + if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 40d46b3b86c1..6b095a9cbba6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -300,7 +300,8 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER VKD3DSIH_USHR, VKD3DSIH_UTOF, VKD3DSIH_XOR, - VKD3DSIH_TABLE_SIZE + + VKD3DSIH_INVALID, }; enum vkd3d_shader_register_type -- 2.19.2

2 1

[PATCH 4/4] windowscodecs: Avoid redundant checks when reading a TIFF tile.
by Dmitry Timoshkov 20 Feb '19

20 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 40 ++++++++++++--------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3bc8d696ca..295330aea2 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -974,34 +974,25 @@ static HRESULT WINAPI TiffFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT tile_y) { - HRESULT hr=S_OK; tsize_t ret; int swap_bytes; swap_bytes = pTIFFIsByteSwapped(This->parent->tiff); ret = pTIFFSetDirectory(This->parent->tiff, This->index); - if (ret == -1) - hr = E_FAIL; + return E_FAIL; - if (hr == S_OK) - { - if (This->decode_info.tiled) - { - ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); - } - else - { - ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); - } + if (This->decode_info.tiled) + ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); + else + ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); - if (ret == -1) - hr = E_FAIL; - } + if (ret == -1) + return E_FAIL; /* 8bpp grayscale with extra alpha */ - if (hr == S_OK && This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) + if (This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32) { BYTE *src; DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height; @@ -1016,7 +1007,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && This->decode_info.reverse_bgr) + if (This->decode_info.reverse_bgr) { if (This->decode_info.bps == 8) { @@ -1027,7 +1018,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && swap_bytes && This->decode_info.bps > 8) + if (swap_bytes && This->decode_info.bps > 8) { UINT row, i, samples_per_row; BYTE *sample, temp; @@ -1055,7 +1046,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } - if (hr == S_OK && This->decode_info.invert_grayscale) + if (This->decode_info.invert_grayscale) { BYTE *byte, *end; @@ -1071,13 +1062,10 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT *byte = ~(*byte); } - if (hr == S_OK) - { - This->cached_tile_x = tile_x; - This->cached_tile_y = tile_y; - } + This->cached_tile_x = tile_x; + This->cached_tile_y = tile_y; - return hr; + return S_OK; } static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, -- 2.20.1

2 1

[PATCH 3/4] windowscodecs: Fail earlier in TIFF decoder's Initialize method for unsupported pixel formats.
by Dmitry Timoshkov 20 Feb '19

20 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 58cd04ef17..3bc8d696ca 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -638,6 +638,7 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); TIFF *tiff; + tiff_decode_info decode_info; HRESULT hr=S_OK; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); @@ -651,13 +652,20 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * } tiff = tiff_open_stream(pIStream, "r"); - if (!tiff) { hr = E_FAIL; goto exit; } + /* make sure that TIFF format is supported */ + hr = tiff_get_decode_info(tiff, &decode_info); + if (hr != S_OK) + { + pTIFFClose(tiff); + goto exit; + } + This->tiff = tiff; This->stream = pIStream; IStream_AddRef(pIStream); -- 2.20.1

2 1

[PATCH 2/4] windowscodecs: Fix the SupportsTransparency flag value for various pixel formats.
by Dmitry Timoshkov 20 Feb '19

20 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c8338f1bea..d215e30808 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1775,7 +1775,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_1bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat2bppIndexed, "The Wine Project", @@ -1786,7 +1786,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_2bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat4bppIndexed, "The Wine Project", @@ -1797,7 +1797,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_4bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat8bppIndexed, "The Wine Project", @@ -1808,7 +1808,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_8bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormatBlackWhite, "The Wine Project", @@ -1995,7 +1995,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_32bit, WICPixelFormatNumericRepresentationFloat, - 1 + 0 }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", -- 2.20.1

2 1

[PATCH 1/4] windowscodecs/tests: Add a test for 8bpp indexed TIFF format.
by Dmitry Timoshkov 20 Feb '19

20 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 187 ++++++++++++++++++++++---- 1 file changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 7651ea154a..2f9a0ca65f 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -145,6 +145,49 @@ static const struct tiff_8bpp_alpha { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 } }; +static const struct tiff_8bpp_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + short palette_data[3][256]; + BYTE pixel_data[4]; +} tiff_8bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_8bpp_data, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 4 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE: XP doesn't accept IFD_LONG here */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 3 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_8bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 1 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x140, IFD_SHORT, 256*3, FIELD_OFFSET(struct tiff_8bpp_data, palette_data) } /* COLORMAP */ + }, + 0, + { 96, 1 }, + { { 0 } }, + { 0,1,2,3 } +}; + static const struct tiff_resolution_test_data { struct IFD_rational resx; @@ -284,29 +327,41 @@ static IStream *create_stream(const void *data, int data_size) return stream; } -static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) +static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitmapDecoder **decoder) { + HGLOBAL hmem; + BYTE *data; HRESULT hr; IStream *stream; - IWICBitmapDecoder *decoder = NULL; - GUID guid; + GUID format; + LONG refcount; - stream = create_stream(image_data, image_size); + *decoder = NULL; - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); - ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); - if (FAILED(hr)) return NULL; + hmem = GlobalAlloc(0, image_size); + data = GlobalLock(hmem); + memcpy(data, image_data, image_size); + GlobalUnlock(hmem); - hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guid); - ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); - ok(IsEqualGUID(&guid, &GUID_ContainerFormatTiff), "container format is not TIFF\n"); + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); - IStream_Release(stream); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, decoder); + if (hr == S_OK) + { + hr = IWICBitmapDecoder_GetContainerFormat(*decoder, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatTiff), + "wrong container format %s\n", wine_dbgstr_guid(&format)); - return decoder; + refcount = IStream_Release(stream); + ok(refcount > 0, "expected stream refcount > 0\n"); + } + + return hr; } -static void test_tiff_palette(void) +static void test_tiff_1bpp_palette(void) { HRESULT hr; IWICBitmapDecoder *decoder; @@ -314,9 +369,9 @@ static void test_tiff_palette(void) IWICPalette *palette; GUID format; - decoder = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_1bpp_data, sizeof(tiff_1bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); @@ -448,9 +503,9 @@ static void test_tiff_8bpp_alpha(void) static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44, 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 }; - decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha)); - ok(decoder != 0, "Failed to load TIFF image data\n"); - if (!decoder) return; + hr = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -497,6 +552,84 @@ static void test_tiff_8bpp_alpha(void) IWICBitmapFrameDecode_Release(frame); } +static void generate_tiff_palette(void *buf, unsigned count) +{ + unsigned short *r, *g, *b; + unsigned i; + + r = buf; + g = r + count; + b = g + count; + + r[0] = 0x11 * 257; + g[0] = 0x22 * 257; + b[0] = 0x33 * 257; + r[1] = 0x44 * 257; + g[1] = 0x55 * 257; + b[1] = 0x66 * 257; + r[2] = 0x77 * 257; + g[2] = 0x88 * 257; + b[2] = 0x99 * 257; + r[3] = 0xa1 * 257; + g[3] = 0xb5 * 257; + b[3] = 0xff * 257; + + for (i = 4; i < count; i++) + { + r[i] = i * 257; + g[i] = (i | 0x40) * 257; + b[i] = (i | 0x80) * 257; + } +} + +static void test_tiff_8bpp_palette(void) +{ + char buf[sizeof(tiff_8bpp_data)]; + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + IWICPalette *palette; + GUID format; + UINT count, ret; + WICColor color[256]; + + memcpy(buf, &tiff_8bpp_data, sizeof(tiff_8bpp_data)); + generate_tiff_palette(buf + FIELD_OFFSET(struct tiff_8bpp_data, palette_data), 256); + + hr = create_decoder(buf, sizeof(buf), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat8bppIndexed), + "expected GUID_WICPixelFormat8bppIndexed, got %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 256, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff112233, "got %#x\n", color[0]); + ok(color[1] == 0xff445566, "got %#x\n", color[1]); + ok(color[2] == 0xff778899, "got %#x\n", color[2]); + ok(color[3] == 0xffa1b5ff, "got %#x\n", color[3]); + + IWICPalette_Release(palette); + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + static void test_tiff_resolution(void) { HRESULT hr; @@ -512,9 +645,9 @@ static void test_tiff_resolution(void) tiff_resolution_image_data.resy = test_data->resy; tiff_resolution_image_data.entry[12].value = test_data->resolution_unit; - decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data)); - ok(decoder != 0, "%d: Failed to load TIFF image data\n", i); - if (!decoder) continue; + hr = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr); @@ -561,8 +694,9 @@ static void test_tiff_24bpp(void) BYTE data[3]; static const BYTE expected_data[] = { 0x33,0x22,0x11 }; - decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); - ok(decoder != NULL, "Failed to load TIFF image data\n"); + hr = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); @@ -620,7 +754,8 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; - test_tiff_palette(); + test_tiff_1bpp_palette(); + test_tiff_8bpp_palette(); test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution(); -- 2.20.1

2 1

[PATCH] d3dx9: Simplify get_parameter_by_name().
by Matteo Bruni 20 Feb '19

20 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fde87706739..81f16f6cbb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -918,7 +918,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - /* Pass / technique annotations are not in the parameters tree. */ if (parameter->full_name) { name_len = strlen(name); @@ -948,9 +947,11 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } + /* Pass / technique annotations are not stored in the parameters tree, + * do a linear search. */ count = parameter->member_count; - length = strcspn( name, "[.@" ); + length = strcspn( name, "[." ); part = name + length; for (i = 0; i < count; i++) @@ -969,9 +970,6 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, case '.': return get_parameter_by_name(base, temp_parameter, part); - case '@': - return NULL; - case '[': return get_parameter_element_by_name(base, temp_parameter, part); -- 2.19.2

2 1

[PATCH] d3dx9/tests: Avoid using the comma operator (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 114 ++++++++++++++++++------------------- dlls/d3dx9_36/tests/mesh.c | 2 +- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 04f5849850..0c3e001702 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -218,7 +218,7 @@ static void D3DXColorTest(void) scale = 0.3f; /*_______________D3DXColorAdd________________*/ - expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; + expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f; expected.a = 0.93f; D3DXColorAdd(&got,&color1,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -230,12 +230,12 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorAdjustContrast______*/ - expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f; + expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f; expected.a = 0.93f; D3DXColorAdjustContrast(&got,&color,scale); expect_color(&expected, &got, 0); /*_______________D3DXColorAdjustSaturation______*/ - expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; + expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f; expected.a = 0.93f; D3DXColorAdjustSaturation(&got,&color,scale); expect_color(&expected, &got, 16); @@ -294,7 +294,7 @@ static void D3DXColorTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXColorSubtract_______________*/ - expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; + expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f; expected.a = 0.82f; D3DXColorSubtract(&got,&color,&color2); expect_color(&expected, &got, 1); /* Test the NULL case */ @@ -1143,8 +1143,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, &eye, &r, &last); expect_matrix(&expectedmat, &gotmat, 32); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 2.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 2.0f; set_matrix(&expectedmat, 41.0f, -12.0f, -24.0f, 0.0f, @@ -1154,8 +1154,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 57.0f, -12.0f, -36.0f, 0.0f, @@ -1165,8 +1165,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 1.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 1.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 25.0f, 0.0f, -20.0f, 0.0f, @@ -1176,8 +1176,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 5.0f, -4.0f, 0.0f, 0.0f, @@ -1187,8 +1187,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 5.0f, axis.y = 2.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 5.0f; axis.y = 2.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1198,8 +1198,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1209,8 +1209,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1220,8 +1220,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1231,8 +1231,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 0.0f, axis.y = 4.0f, axis.z = 0.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 0.0f; axis.y = 4.0f; axis.z = 0.0f; set_matrix(&expectedmat, 0.0f, 0.0f, 0.0f, 0.0f, @@ -1242,8 +1242,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 0.0f, q.y = 1.0f, q.z = 0.0f, q.w = 1.0f, - axis.x = 1.0f, axis.y = 4.0f, axis.z = 1.0f, + q.x = 0.0f; q.y = 1.0f; q.z = 0.0f; q.w = 1.0f; + axis.x = 1.0f; axis.y = 4.0f; axis.z = 1.0f; set_matrix(&expectedmat, 5.0f, 0.0f, 0.0f, 0.0f, @@ -1253,8 +1253,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 1.0f, q.y = 0.0f, q.z = 0.0f, q.w = 0.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 1.0f; q.y = 0.0f; q.z = 0.0f; q.w = 0.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1.0f, 0.0f, 0.0f, 0.0f, @@ -1264,8 +1264,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 3.0f, axis.y = 3.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 3.0f; axis.y = 3.0f; axis.z = 3.0f; set_matrix(&expectedmat, 3796587.0f, -1377948.0f, -1589940.0f, 0.0f, @@ -1275,8 +1275,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 1.0f; set_matrix(&expectedmat, 1265529.0f, -459316.0f, -529980.0f, 0.0f, @@ -1286,8 +1286,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 1.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 1.0f; axis.z = 3.0f; set_matrix(&expectedmat, 2457497.0f, -434612.0f, -1423956.0f, 0.0f, @@ -1297,8 +1297,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 3.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 3.0f; set_matrix(&expectedmat, 1787952.0f, 37056.0f, -1340964.0f, 0.0f, @@ -1308,8 +1308,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 0.0f, axis.z = 1.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 0.0f; axis.z = 1.0f; set_matrix(&expectedmat, 595984.0f, 12352.0f, -446988.0f, 0.0f, @@ -1319,8 +1319,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 3.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 3.0f; axis.z = 0.0f; set_matrix(&expectedmat, 150528.0f, 464352.0f, -513408.0f, 0.0f, @@ -1330,8 +1330,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 0.0f, axis.y = 1.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 0.0f; axis.y = 1.0f; axis.z = 0.0f; set_matrix(&expectedmat, 50176.0f, 154784.0f, -171136.0f, 0.0f, @@ -1341,8 +1341,8 @@ static void D3DXMatrixTest(void) D3DXMatrixTransformation(&gotmat, NULL, &q, &axis, NULL, NULL, NULL); expect_matrix(&expectedmat, &gotmat, 0); - q.x = 11.0f, q.y = 13.0f, q.z = 15.0f, q.w = 17.0f, - axis.x = 1.0f, axis.y = 0.0f, axis.z = 0.0f, + q.x = 11.0f; q.y = 13.0f; q.z = 15.0f; q.w = 17.0f; + axis.x = 1.0f; axis.y = 0.0f; axis.z = 0.0f; set_matrix(&expectedmat, 619369.0f, -626452.0f, 88144.0f, 0.0f, @@ -1393,35 +1393,35 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneDot________________*/ expected = 42.0f; - got = D3DXPlaneDot(&plane,&vec), + got = D3DXPlaneDot(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,&vec), + got = D3DXPlaneDot(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDot(NULL,NULL), + got = D3DXPlaneDot(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotCoord________________*/ expected = -28.0f; - got = D3DXPlaneDotCoord(&plane,&vec), + got = D3DXPlaneDotCoord(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,&vec), + got = D3DXPlaneDotCoord(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotCoord(NULL,NULL), + got = D3DXPlaneDotCoord(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneDotNormal______________*/ expected = -35.0f; - got = D3DXPlaneDotNormal(&plane,&vec), + got = D3DXPlaneDotNormal(&plane, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,&vec), + got = D3DXPlaneDotNormal(NULL, &vec); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); expected = 0.0f; - got = D3DXPlaneDotNormal(NULL,NULL), + got = D3DXPlaneDotNormal(NULL, NULL); ok( expected == got, "Expected : %f, Got : %f\n",expected, got); /*_______________D3DXPlaneFromPointNormal_______*/ @@ -1463,7 +1463,7 @@ static void D3DXPlaneTest(void) expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); expect_plane(&expectedplane, &gotplane, 2); - nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; + nulplane.a = 0.0; nulplane.b = 0.0f; nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(&expectedplane, &gotplane, 0); @@ -1484,9 +1484,9 @@ static void D3DXQuaternionTest(void) D3DXVECTOR3 axis, expectedvec; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; - q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; + q.x = 1.0f; q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; smallq.x = 0.1f; smallq.y = 0.2f; smallq.z= 0.3f; smallq.w = 0.4f; smallr.x = 0.5f; smallr.y = 0.6f; smallr.z= 0.7f; smallr.w = 0.8f; @@ -1790,9 +1790,9 @@ static void D3DXQuaternionTest(void) expect_quaternion(&expectedquat, &gotquat, 2); /*_______________D3DXQuaternionSquadSetup___________________*/ - r.x = 1.0f, r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; + r.x = 1.0f; r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; - t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + t.x = -1111.0f; t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; D3DXQuaternionSquadSetup(&gotquat, &Nq, &Nq1, &r, &s, &t, &u); expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; @@ -2145,7 +2145,7 @@ static void D3DXVector3Test(void) ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3Lerp__________________________*/ - expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ; + expectedvec.x = 54.5f; expectedvec.y = 64.5f; expectedvec.z = 41.0f ; D3DXVec3Lerp(&gotvec,&u,&v,scale); expect_vec3(&expectedvec, &gotvec, 0); /* Tests the case NULL */ diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3fcd65ffbb..e36ee0adcd 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -86,7 +86,7 @@ static void check_floats_(int line, const char *prefix, const float *got, const equal = equal && compare(*exp, *got); exp_buffer_ptr += sprintf(exp_buffer_ptr, "%g", *exp); got_buffer_ptr += sprintf(got_buffer_ptr, "%g", *got); - exp++, got++; + exp++; got++; } ok_(__FILE__,line)(equal, "%sExpected (%s), got (%s)", prefix, exp_buffer, got_buffer); } -- 2.20.1

2 1

[PATCH] d3dx9: Remove redundant "not NULL" checks (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- parameter is checked for not NULL at the beginning of the function. Those conditional expressions are blamed on 847f772fe1d but that just split an existing if (parameter) else construct. dlls/d3dx9_36/effect.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e8ae7b54c2..1abc8dc7c8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -948,15 +948,14 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return NULL; } - count = parameter ? parameter->member_count : base->parameter_count; + count = parameter->member_count; length = strcspn( name, "[.@" ); part = name + length; for (i = 0; i < count; i++) { - temp_parameter = !parameter ? &base->parameters[i].param - : &parameter->members[i]; + temp_parameter = &parameter->members[i]; if (!strcmp(temp_parameter->name, name)) { @@ -971,13 +970,8 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, return get_parameter_by_name(base, temp_parameter, part); case '@': - { - struct d3dx_top_level_parameter *top_param - = top_level_parameter_from_parameter(temp_parameter); + return NULL; - return parameter ? NULL : get_annotation_by_name(base, top_param->annotation_count, - top_param->annotations, part); - } case '[': return get_parameter_element_by_name(base, temp_parameter, part); -- 2.20.1

3 2

[PATCH 1/5] kernel32/tests: Test ReadFileScatter() completion status with FILE_SKIP_COMPLETION_PORT_ON_SUCCESS.
by Paul Gofman 20 Feb '19

20 Feb '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/tests/file.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 18cd18d154..a4fba43242 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -61,6 +61,7 @@ static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CL static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static char filename[MAX_PATH]; static const char sillytext[] = @@ -109,6 +110,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); } static void test__hread( void ) @@ -4565,6 +4567,31 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, "invalid data was read into buffer\n" ); + if (pSetFileCompletionNotificationModes) + { + br = pSetFileCompletionNotificationModes(hfile, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + + br = ReadFileScatter(hfile, fse, si.dwPageSize, NULL, &ovl); + ok(br == FALSE, "ReadFileScatter should be asynchronous.\n"); + ok(GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed, error %u.\n", GetLastError()); + + br = GetQueuedCompletionStatus(hiocp2, &size, &key, &povl, 1000); + todo_wine ok(br, "GetQueuedCompletionStatus failed, err %u.\n", GetLastError()); + todo_wine ok(povl == &ovl, "Wrong ovl %p.\n", povl); + + br = GetOverlappedResult(hfile, &ovl, &tx, TRUE); + ok(br, "GetOverlappedResult failed, err %u.\n", GetLastError()); + ok(tx == si.dwPageSize, "Got unexpected size %u.\n", tx); + + ResetEvent(evt); + + br = pSetFileCompletionNotificationModes(hfile, 0); + ok(br, "SetFileCompletionNotificationModes failed, error %u.\n", GetLastError()); + } + else + win_skip("SetFileCompletionNotificationModes not available.\n"); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); -- 2.20.1

1 4

[PATCH 1/3] ext-ms-win-ntuser-dialogbox-l1-1-0: Add dll.
by Andrey Gusev 20 Feb '19

20 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- .../Makefile.in | 1 + .../ext-ms-win-ntuser-dialogbox-l1-1-0.spec | 21 +++++++++++++++++++ tools/make_specfiles | 1 + 3 files changed, 23 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in new file mode 100644 index 0000000000..e19c95d832 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-dialogbox-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec new file mode 100644 index 0000000000..6816e5f5d2 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-dialogbox-l1-1-0/ext-ms-win-ntuser-dialogbox-l1-1-0.spec @@ -0,0 +1,21 @@ +@ stdcall CheckDlgButton(long long long) user32.CheckDlgButton +@ stdcall CreateDialogIndirectParamA(long ptr long ptr long) user32.CreateDialogIndirectParamA +@ stdcall CreateDialogIndirectParamW(long ptr long ptr long) user32.CreateDialogIndirectParamW +@ stdcall CreateDialogParamA(long str long ptr long) user32.CreateDialogParamA +@ stdcall CreateDialogParamW(long wstr long ptr long) user32.CreateDialogParamW +@ stdcall DialogBoxIndirectParamA(long ptr long ptr long) user32.DialogBoxIndirectParamA +@ stdcall DialogBoxIndirectParamW(long ptr long ptr long) user32.DialogBoxIndirectParamW +@ stdcall DialogBoxParamW(long wstr long ptr long) user32.DialogBoxParamW +@ stdcall EndDialog(long long) user32.EndDialog +@ stdcall GetDlgCtrlID(long) user32.GetDlgCtrlID +@ stdcall GetDlgItem(long long) user32.GetDlgItem +@ stdcall GetDlgItemTextW(long long ptr long) user32.GetDlgItemTextW +@ stdcall IsDlgButtonChecked(long long) user32.IsDlgButtonChecked +@ stdcall MessageBoxA(long str str long) user32.MessageBoxA +@ stdcall MessageBoxIndirectA(ptr) user32.MessageBoxIndirectA +@ stdcall MessageBoxIndirectW(ptr) user32.MessageBoxIndirectW +@ stdcall MessageBoxW(long wstr wstr long) user32.MessageBoxW +@ stdcall SendDlgItemMessageA(long long long long long) user32.SendDlgItemMessageA +@ stdcall SendDlgItemMessageW(long long long long long) user32.SendDlgItemMessageW +@ stdcall SetDlgItemTextA(long long str) user32.SetDlgItemTextA +@ stdcall SetDlgItemTextW(long long wstr) user32.SetDlgItemTextW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8933ae46e8..f6cfea1f8d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -376,6 +376,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", + "ext-ms-win-ntuser-dialogbox-l1-1-0", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", -- 2.20.1

1 2

[PATCH v6 6/6] comctl32/tests: Test negative counts in LB_SETCOUNT
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 0cdcdea7ec..de73ad2a56 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1996,6 +1996,11 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + ret = SendMessageA( listbox, LB_SETCOUNT, -5, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == -5, "got %d\n", ret ); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.18.0

1 0

[PATCH v6 5/6] comctl32/listbox: Implement LBS_NODATA for single-selection listboxes
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> The LBS_NODATA style's purpose is to drastically improve performance and memory usage on very large lists, since they should function as virtual lists. Thus, don't store any data for single-selection listboxes (descr->items always NULL). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e89d25761e..cbe57f2616 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -135,17 +135,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) { items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); - if (!items) + if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - SEND_NOTIFICATION(descr, LBN_ERRSPACE); - return FALSE; + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items = items; } descr->items_size = items_size; - descr->items = items; } - if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); @@ -190,6 +193,8 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -204,6 +209,8 @@ static void remove_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -1762,7 +1769,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!(descr->style & LBS_NODATA)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0; -- 2.18.0

1 0

[PATCH v6 4/6] comctl32/listbox: Move the item data removal into a separate function
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 44e3b1c7d1..e89d25761e 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -200,6 +200,15 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item->selected = FALSE; } +static void remove_item_data(LB_DESCR *descr, UINT index) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1699,8 +1708,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { - LB_ITEMDATA *item; - if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; /* We need to invalidate the original rect instead of the updated one. */ @@ -1713,15 +1720,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + remove_item_data(descr, index); - /* Remove the item */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - resize_storage(descr, descr->nb_items); /* Repaint the items */ -- 2.18.0

1 0

[PATCH v6 3/6] comctl32/listbox: Move the item data insertion into a separate function
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ba8b7eeade..44e3b1c7d1 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -186,6 +186,20 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1563,23 +1577,13 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; + insert_item_data(descr, index, str, data); descr->nb_items++; /* Get item height */ -- 2.18.0

1 0

[PATCH v6 2/6] comctl32/listbox: Use a helper to set item height by index
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a457d63ead..ba8b7eeade 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -168,6 +168,11 @@ static UINT get_item_height( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; } +static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -1233,7 +1238,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BO return LB_ERR; } TRACE("[%p]: item %d height = %d\n", descr->self, index, height ); - descr->items[index].height = height; + set_item_height(descr, index, height); LISTBOX_UpdateScroll( descr ); if (repaint) LISTBOX_InvalidateItems( descr, index ); @@ -1590,7 +1595,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; + set_item_height(descr, index, mis.itemHeight ? mis.itemHeight : 1); TRACE("[%p]: measure item %d (%s) = %d\n", descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } -- 2.18.0

1 0

[PATCH v6 1/6] comctl32/listbox: Use a helper to retrieve item height by index
by Huw Davies 20 Feb '19

20 Feb '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listbox.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c53f8..a457d63ead 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -163,6 +163,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static UINT get_item_height( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -187,7 +192,7 @@ static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; for (i = descr->top_item, height = 0; i < descr->nb_items; i++) { - if ((height += descr->items[i].height) > descr->height) break; + if ((height += get_item_height(descr, i)) > descr->height) break; } if (i == descr->top_item) return 1; else return i - descr->top_item; @@ -207,7 +212,7 @@ static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { page = descr->height; for (max = descr->nb_items - 1; max >= 0; max--) - if ((page -= descr->items[max].height) < 0) break; + if ((page -= get_item_height(descr, max)) < 0) break; if (max < descr->nb_items - 1) max++; } else if (descr->style & LBS_MULTICOLUMN) @@ -335,12 +340,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - dy -= descr->items[i].height; + dy -= get_item_height(descr, i); } else { for (i = index; i < descr->top_item; i++) - dy += descr->items[i].height; + dy += get_item_height(descr, i); } } else @@ -456,14 +461,14 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect if (index < descr->top_item) { for (i = descr->top_item-1; i >= index; i--) - rect->top -= descr->items[i].height; + rect->top -= get_item_height(descr, i); } else { for (i = descr->top_item; i < index; i++) - rect->top += descr->items[i].height; + rect->top += get_item_height(descr, i); } - rect->bottom = rect->top + descr->items[index].height; + rect->bottom = rect->top + get_item_height(descr, index); } } @@ -498,7 +503,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { while (index < descr->nb_items) { - if ((pos += descr->items[index].height) > y) break; + if ((pos += get_item_height(descr, index)) > y) break; index++; } } @@ -507,7 +512,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) while (index > 0) { index--; - if ((pos -= descr->items[index].height) <= y) break; + if ((pos -= get_item_height(descr, index)) <= y) break; } } } @@ -1057,7 +1062,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) rect.bottom = rect.top + descr->item_height; else - rect.bottom = rect.top + descr->items[i].height; + rect.bottom = rect.top + get_item_height(descr, i); /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) @@ -1204,7 +1209,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[index].height; + return get_item_height(descr, index); } else return descr->item_height; } @@ -1374,9 +1379,9 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) } else if (descr->style & LBS_OWNERDRAWVARIABLE) { - INT height = fully ? descr->items[index].height : 1; + INT height = fully ? get_item_height(descr, index) : 1; for (top = index; top > descr->top_item; top--) - if ((height += descr->items[top-1].height) > descr->height) break; + if ((height += get_item_height(descr, top - 1)) > descr->height) break; } else { @@ -1587,7 +1592,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } /* Repaint the items */ -- 2.18.0

1 0

[PATCH] shell32: Use the return value of ResetEnumerator (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 36b0c5d7bc..6850ded0ab 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -1096,7 +1096,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( if ((changed & ACO_FILTERPREFIXES) && This->txtbackup) { if (get_text_prefix_filtering(This->txtbackup) != prefix_filtering_none) - IAutoCompleteDropDown_ResetEnumerator(&This->IAutoCompleteDropDown_iface); + hr = IAutoCompleteDropDown_ResetEnumerator(&This->IAutoCompleteDropDown_iface); } return hr; -- 2.17.1

1 0

[PATCH] setupapi: Add a missing return statement (Coverity).
by Sven Baars 20 Feb '19

20 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7769284d54..888bed051a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2585,6 +2585,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, devinfo, iface_data, reserved, access, hinf, debugstr_w(section)); if (!(iface = get_device_iface(devinfo, iface_data))) + return INVALID_HANDLE_VALUE; if (hinf && !section) { -- 2.17.1

1 0

[PATCH 2/2] wined3d: Get rid of unused wined3d_blit_op enum elements.
by Henri Verbeet 20 Feb '19

20 Feb '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5751bb2a2ee..a8ba1d074d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2106,8 +2106,6 @@ enum wined3d_blit_op WINED3D_BLIT_OP_COLOR_BLIT, WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, WINED3D_BLIT_OP_COLOR_BLIT_CKEY, - WINED3D_BLIT_OP_COLOR_FILL, - WINED3D_BLIT_OP_DEPTH_FILL, WINED3D_BLIT_OP_DEPTH_BLIT, WINED3D_BLIT_OP_RAW_BLIT, }; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value.
by Henri Verbeet 20 Feb '19

20 Feb '19

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 173 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 12 +++ 4 files changed, 168 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13cf6c72833..52d67c81991 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8886,11 +8886,11 @@ done: static void srgbtexture_test(void) { - /* Fill a texture with 0x7f (~ .5), and then turn on the D3DSAMP_SRGBTEXTURE - * texture stage state to render a quad using that texture. The resulting - * color components should be 0x36 (~ 0.21), per this formula: + /* The result of sRGB to linear conversion for value 0x7f (~ .5) used on + * texture mip level 0 should be 0x36 (~ 0.21), per this formula: * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 - * This is true where srgb_color > 0.04045. */ + * This is true where srgb_color > 0.04045. + * For the value of 0x3f used on mip level 1 the result should be 0x0d (~0.05). */ struct IDirect3DTexture9 *texture; struct IDirect3DSurface9 *surface; IDirect3DDevice9 *device; @@ -8898,6 +8898,7 @@ static void srgbtexture_test(void) D3DCOLOR color; ULONG refcount; HWND window; + DWORD value; HRESULT hr; static const float quad[] = @@ -8925,38 +8926,170 @@ static void srgbtexture_test(void) goto done; } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); fill_surface(surface, 0xff7f7f7f, 0); IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, 0xff3f3f3f, 0); + IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* AMD uses the LSB of the D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values other than 0 and 1, leaving the previous + * D3DSAMP_SRGBTEXTURE state. + * Intel, WARP treat the value as boolean. */ hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); - ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 100, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 2, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00363636, 1), "sRGB quad has color 0x%08x, expected 0x00363636.\n", color); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 3, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00363636, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + /* Set the other state to verify that the sampler just inherits old + * D3DSAMP_SRGBTEXTURE but * the old sampler is not preserved entirely on + * NVIDIA. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == 0x7e41882a, "Got unexpected value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), + "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 96ba06ddf1c..63ff8336919 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3719,7 +3719,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f7b030b0cc..43746a4363e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3574,7 +3574,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->max_anisotropy = 1; desc->compare = texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; - desc->srgb_decode = sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; + desc->srgb_decode = is_srgb_enabled(sampler_states); if (!(texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FILTERING)) { @@ -3615,9 +3615,9 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]); - BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; struct wined3d_device *device = context->device; + BOOL srgb = is_srgb_enabled(sampler_states); struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb24..5751bb2a2ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4591,6 +4591,18 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } +static inline BOOL is_srgb_enabled(const DWORD *sampler_states) +{ + /* Only use the LSB of the WINED3D_SAMP_SRGB_TEXTURE value. This matches + * the behaviour of the AMD Windows driver. + * + * Might & Magic: Heroes VI - Shades of Darkness sets + * WINED3D_SAMP_SRGB_TEXTURE to a large value that looks like a + * pointer—presumably by accident—and expects sRGB decoding to be + * disabled. */ + return sampler_states[WINED3D_SAMP_SRGB_TEXTURE] & 0x1; +} + static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { -- 2.11.0

1 0

[PATCH] ddraw/tests: Avoid using the comma operator (coccinellery)
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1dc88561b4..ceb1f83367 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8383,7 +8383,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 91300ed38a..db67afa0e4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9535,7 +9535,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d192cdf151..dbba9b5104 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10975,7 +10975,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface4_Release(surface), + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b43b53881d..215e1c7107 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10878,7 +10878,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface7_Release(surface), + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); -- 2.20.1

3 2

[PATCH] d3d8/tests: Remove useless casts to self
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 749062220d..c405f8245e 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10564,7 +10564,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_SYSTEMMEM, &vb); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad, sizeof(quad)); hr = IDirect3DVertexBuffer8_Unlock(vb); @@ -10622,7 +10622,7 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), (BYTE **)&data, 0); + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer8_Unlock(ib); @@ -10651,14 +10651,14 @@ static void test_sysmem_draw(void) hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s0), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s0, sizeof(quad_s0)); hr = IDirect3DVertexBuffer8_Unlock(vb_s0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s1), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), (BYTE **)&data, 0); + hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), &data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memcpy(data, quad_s1, sizeof(quad_s1)); hr = IDirect3DVertexBuffer8_Unlock(vb_s1); -- 2.20.1

2 1

[PATCH 2/2] winhttp: Introduce a structure to describe URL components.
by Hans Leidekker 20 Feb '19

20 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/url.c | 112 ++++++++++++++++++++++++++++----------------- 1 file changed, 70 insertions(+), 42 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 786378d3b6..e1255bd6b1 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -34,27 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR scheme_http[] = {'h','t','t','p',0}; static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; -static DWORD set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags, BOOL *overflow ) +struct url_component { - if (*str && !*str_len) return ERROR_INVALID_PARAMETER; - if (!*str_len) return ERROR_SUCCESS; - if (!*str) + WCHAR **str; + DWORD *len; +}; + +static DWORD set_component( struct url_component *comp, WCHAR *value, DWORD len, DWORD flags, BOOL *overflow ) +{ + if (*comp->str && !*comp->len) return ERROR_INVALID_PARAMETER; + if (!*comp->len) return ERROR_SUCCESS; + if (!*comp->str) { - if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE))) return ERROR_INVALID_PARAMETER; - *str = value; - *str_len = len; + if (len && *comp->len && (flags & (ICU_DECODE|ICU_ESCAPE))) return ERROR_INVALID_PARAMETER; + *comp->str = value; + *comp->len = len; } else { - if (len >= *str_len) + if (len >= *comp->len) { - *str_len = len+1; + *comp->len = len + 1; *overflow = TRUE; return ERROR_SUCCESS; } - memcpy( *str, value, len * sizeof(WCHAR) ); - (*str)[len] = 0; - *str_len = len; + memcpy( *comp->str, value, len * sizeof(WCHAR) ); + (*comp->str)[len] = 0; + *comp->len = len; } return ERROR_SUCCESS; } @@ -173,7 +179,8 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; - INTERNET_SCHEME scheme = 0; + INTERNET_SCHEME scheme_number = 0; + struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; DWORD err; @@ -209,15 +216,18 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } - if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme = INTERNET_SCHEME_HTTP; - else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme = INTERNET_SCHEME_HTTPS; + if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme_number = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme_number = INTERNET_SCHEME_HTTPS; else { err = ERROR_WINHTTP_UNRECOGNIZED_SCHEME; goto exit; } - if ((err = set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url, flags, &overflow ))) goto exit; + scheme.str = &uc->lpszScheme; + scheme.len = &uc->dwSchemeLength; + + if ((err = set_component( &scheme, (WCHAR *)url, p - url, flags, &overflow ))) goto exit; p++; /* skip ':' */ if (!p[0] || p[0] != '/' || p[1] != '/') @@ -231,83 +241,101 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN err = ERROR_WINHTTP_INVALID_URL; goto exit; } + + username.str = &uc->lpszUserName; + username.len = &uc->dwUserNameLength; + + password.str = &uc->lpszPassword; + password.len = &uc->dwPasswordLength; + if ((q = memchrW( p, '@', len - (p - url) )) && !(memchrW( p, '/', q - p ))) { + if ((r = memchrW( p, ':', q - p ))) { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &username, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, r, q - r, flags, &overflow ))) goto exit; + if ((err = set_component( &password, r, q - r, flags, &overflow ))) goto exit; } else { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, q - p, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &username, p, q - p, flags, &overflow ))) goto exit; + if ((err = set_component( &password, NULL, 0, flags, &overflow ))) goto exit; } p = q + 1; } else { - if ((err = set_component( &uc->lpszUserName, &uc->dwUserNameLength, NULL, 0, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &username, NULL, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &password, NULL, 0, flags, &overflow ))) goto exit; } + + hostname.str = &uc->lpszHostName; + hostname.len = &uc->dwHostNameLength; + + path.str = &uc->lpszUrlPath; + path.len = &uc->dwUrlPathLength; + + extra.str = &uc->lpszExtraInfo; + extra.len = &uc->dwExtraInfoLength; + if ((q = memchrW( p, '/', len - (p - url) ))) { if ((r = memchrW( p, ':', q - p ))) { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags, &overflow ))) goto exit; - if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if ((err = set_component( &hostname, p, q - p, flags, &overflow ))) goto exit; + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = memchrW( q, '?', len - (q - url) ))) { - if (uc->dwExtraInfoLength) + if (*extra.len) { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + if ((err = set_component( &path, q, r - q, flags, &overflow ))) goto exit; + if ((err = set_component( &extra, r, len - (r - url), flags, &overflow ))) goto exit; } - else if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; + else if ((err = set_component( &path, q, len - (q - url), flags, &overflow ))) goto exit; } else { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &path, q, len - (q - url), flags, &overflow ))) goto exit; + if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; } } else { if ((r = memchrW( p, ':', len - (p - url) ))) { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, r - p, flags, &overflow ))) goto exit; + if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else { - if ((err = set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags, &overflow ))) goto exit; - if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if ((err = set_component( &hostname, p, len - (p - url), flags, &overflow ))) goto exit; + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &path, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; + if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; } - TRACE("scheme(%s) host(%s) port(%d) path(%s) extra(%s)\n", debugstr_wn( uc->lpszScheme, uc->dwSchemeLength ), - debugstr_wn( uc->lpszHostName, uc->dwHostNameLength ), uc->nPort, debugstr_wn( uc->lpszUrlPath, uc->dwUrlPathLength ), - debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); + TRACE("scheme(%s) host(%s) port(%d) path(%s) extra(%s)\n", debugstr_wn(*scheme.str, *scheme.len), + debugstr_wn(*hostname.str, *hostname.len ), uc->nPort, debugstr_wn(*path.str, *path.len), + debugstr_wn(*extra.str, *extra.len)); exit: if (!err) { if (overflow) err = ERROR_INSUFFICIENT_BUFFER; - uc->nScheme = scheme; + uc->nScheme = scheme_number; } heap_free( url_decoded ); heap_free( url_escaped ); -- 2.20.1

1 0

[PATCH 1/2] winhttp: Include URL extra info in the path unless the caller asks for it seperately.
by Hans Leidekker 20 Feb '19

20 Feb '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/url.c | 19 ++++++++++++++++++- dlls/winhttp/url.c | 10 +++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 0a31e181c2..37a6e4a10b 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -81,6 +81,10 @@ static const WCHAR url19[] = {'h','t','t','p',':','/','/','?','t','e','x','t','=',0xfb00,0}; static const WCHAR url20[] = {'h','t','t','p',':','/','/','/','t','e','x','t','=',0xfb00,0}; +static const WCHAR url21[] = + {'h','t','t','p','s',':','/','/','n','b','a','2','k','1','9','-','w','s','.','2','k','s','p','o','r','t','s','.','c','o','m',':','1','9','1','3','3', + '/','n','b','a','/','v','4','/','A','c','c','o','u','n','t','s','/','g','e','t','_','a','c','c','o','u','n','t','?','x','=','3','7','8','9','5','2', + '6','7','7','5','2','6','5','6','6','3','8','7','6',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -428,7 +432,7 @@ static void WinHttpCrackUrl_test( void ) static const WCHAR pathW[] = {'/','p','a','t','h','%','2','0','w','i','t','h','%','2','0','s','p','a','c','e','s',0}; URL_COMPONENTSW uc; - WCHAR scheme[20], user[20], pass[20], host[20], path[80], extra[40]; + WCHAR scheme[20], user[20], pass[20], host[40], path[80], extra[40]; DWORD error; BOOL ret; @@ -843,6 +847,19 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url17, 0, 0, &uc ); ok( ret, "got %u\n", GetLastError() ); todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszScheme = scheme; + uc.dwSchemeLength = ARRAY_SIZE(scheme); + uc.lpszHostName = host; + uc.dwHostNameLength = ARRAY_SIZE(host); + uc.lpszUrlPath = path; + uc.dwUrlPathLength = ARRAY_SIZE(path); + ret = WinHttpCrackUrl( url21, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + ok( !lstrcmpW( uc.lpszUrlPath, url21 + 37 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 50, "unexpected length %u\n", uc.dwUrlPathLength ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index e6aeac3df2..786378d3b6 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -179,7 +179,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); - if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) + if (!url || !uc || uc->dwStructSize != sizeof(*uc)) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -268,8 +268,12 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if ((r = memchrW( q, '?', len - (q - url) ))) { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + if (uc->dwExtraInfoLength) + { + if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; + if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + } + else if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; } else { -- 2.20.1

1 0

[PATCH] winecfg: Update Windows 10 build number.
by Isira Seneviratne 20 Feb '19

20 Feb '19

1 0

[PATCH] msxml3: Remove useless casts to self
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 07eeb74370..c6f9fdb33e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -759,7 +759,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + if ((hr = SafeArrayAccessData(sa, &ptr)) != S_OK) { heap_free(bsc); return hr; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fc18935b69..27abf94530 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1217,7 +1217,7 @@ static HRESULT node_transform_write(xsltStylesheetPtr style, xmlDocPtr result, B htmlSetMetaEncoding(result, (const xmlChar *)encoding); if (indent == -1) indent = 1; - htmldoc_dumpcontent(output, result, (const char*)encoding, indent); + htmldoc_dumpcontent(output, result, encoding, indent); } else if (method && xmlStrEqual(method, (const xmlChar *)"xhtml")) { -- 2.20.1

2 1

[PATCH] msxml32/tests: Floating point numeric constants are by default doubles
by Michael Stefaniuc 20 Feb '19

20 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9e5116f38f..f1f3e4206b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1371,10 +1371,10 @@ static void test_XDR_datatypes(void) break; case VT_R8: if (!strcmp(ptr->typename, "float")) - ok(V_R8(&v) == (double)3.14159, "got %f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159, "got %f\n", V_R8(&v)); else todo_wine - ok(V_R8(&v) == (double)3.14159265358979323846, "got %.20f\n", V_R8(&v)); + ok(V_R8(&v) == 3.14159265358979323846, "got %.20f\n", V_R8(&v)); break; case VT_UI1: ok(V_UI1(&v) == 0xFF, "got %02x\n", V_UI1(&v)); -- 2.20.1

2 1

[PATCH 1/3] mf: Add attributes store to topology object.
by Nikolay Sivov 20 Feb '19

20 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 1 + dlls/mf/topology.c | 459 ++++++++++++++++++++++---------------------- 2 files changed, 226 insertions(+), 234 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 9c61d94c8a..f05364bca6 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,5 +1,6 @@ MODULE = mf.dll IMPORTLIB = mf +IMPORTS = mfplat C_SRCS = \ main.c \ diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e8389cf4df..fbd8bf3bd9 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -24,34 +24,37 @@ #include "windef.h" #include "winbase.h" #include "initguid.h" +#include "mfapi.h" #include "mfidl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -typedef struct mftopology +struct topology { IMFTopology IMFTopology_iface; - LONG ref; -} mftopology; + LONG refcount; + IMFAttributes *attributes; +}; -static inline mftopology *impl_from_IMFTopology(IMFTopology *iface) +static inline struct topology *impl_from_IMFTopology(IMFTopology *iface) { - return CONTAINING_RECORD(iface, mftopology, IMFTopology_iface); + return CONTAINING_RECORD(iface, struct topology, IMFTopology_iface); } -static HRESULT WINAPI mftopology_QueryInterface(IMFTopology *iface, REFIID riid, void **out) +static HRESULT WINAPI topology_QueryInterface(IMFTopology *iface, REFIID riid, void **out) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFTopology) || IsEqualIID(riid, &IID_IMFAttributes) || IsEqualIID(riid, &IID_IUnknown)) { - *out = &This->IMFTopology_iface; + *out = &topology->IMFTopology_iface; } else { @@ -64,440 +67,421 @@ static HRESULT WINAPI mftopology_QueryInterface(IMFTopology *iface, REFIID riid, return S_OK; } -static ULONG WINAPI mftopology_AddRef(IMFTopology *iface) +static ULONG WINAPI topology_AddRef(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct topology *topology = impl_from_IMFTopology(iface); + ULONG refcount = InterlockedIncrement(&topology->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) refcount=%u\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI mftopology_Release(IMFTopology *iface) +static ULONG WINAPI topology_Release(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct topology *topology = impl_from_IMFTopology(iface); + ULONG refcount = InterlockedDecrement(&topology->refcount); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) refcount=%u\n", iface, refcount); - if (!ref) + if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + IMFAttributes_Release(topology->attributes); + heap_free(topology); } - return ref; + return refcount; } -static HRESULT WINAPI mftopology_GetItem(IMFTopology *iface, REFGUID key, PROPVARIANT *value) +static HRESULT WINAPI topology_GetItem(IMFTopology *iface, REFGUID key, PROPVARIANT *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_GetItem(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_GetItemType(IMFTopology *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +static HRESULT WINAPI topology_GetItemType(IMFTopology *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), type); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), type); - return E_NOTIMPL; + return IMFAttributes_GetItemType(topology->attributes, key, type); } -static HRESULT WINAPI mftopology_CompareItem(IMFTopology *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +static HRESULT WINAPI topology_CompareItem(IMFTopology *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %p)\n", This, debugstr_guid(key), value, result); + TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, result); - return E_NOTIMPL; + return IMFAttributes_CompareItem(topology->attributes, key, value, result); } -static HRESULT WINAPI mftopology_Compare(IMFTopology *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, - BOOL *result) +static HRESULT WINAPI topology_Compare(IMFTopology *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%p, %d, %p)\n", This, theirs, type, result); + TRACE("(%p)->(%p, %d, %p)\n", iface, theirs, type, result); - return E_NOTIMPL; + return IMFAttributes_Compare(topology->attributes, theirs, type, result); } -static HRESULT WINAPI mftopology_GetUINT32(IMFTopology *iface, REFGUID key, UINT32 *value) +static HRESULT WINAPI topology_GetUINT32(IMFTopology *iface, REFGUID key, UINT32 *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_GetUINT32(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_GetUINT64(IMFTopology *iface, REFGUID key, UINT64 *value) +static HRESULT WINAPI topology_GetUINT64(IMFTopology *iface, REFGUID key, UINT64 *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_GetUINT64(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_GetDouble(IMFTopology *iface, REFGUID key, double *value) +static HRESULT WINAPI topology_GetDouble(IMFTopology *iface, REFGUID key, double *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_GetDouble(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_GetGUID(IMFTopology *iface, REFGUID key, GUID *value) +static HRESULT WINAPI topology_GetGUID(IMFTopology *iface, REFGUID key, GUID *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_GetGUID(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_GetStringLength(IMFTopology *iface, REFGUID key, UINT32 *length) +static HRESULT WINAPI topology_GetStringLength(IMFTopology *iface, REFGUID key, UINT32 *length) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), length); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), length); - return E_NOTIMPL; + return IMFAttributes_GetStringLength(topology->attributes, key, length); } -static HRESULT WINAPI mftopology_GetString(IMFTopology *iface, REFGUID key, WCHAR *value, - UINT32 size, UINT32 *length) +static HRESULT WINAPI topology_GetString(IMFTopology *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %d, %p)\n", This, debugstr_guid(key), value, size, length); + TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), value, size, length); - return E_NOTIMPL; + return IMFAttributes_GetString(topology->attributes, key, value, size, length); } -static HRESULT WINAPI mftopology_GetAllocatedString(IMFTopology *iface, REFGUID key, - WCHAR **value, UINT32 *length) +static HRESULT WINAPI topology_GetAllocatedString(IMFTopology *iface, REFGUID key, + WCHAR **value, UINT32 *length) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %p)\n", This, debugstr_guid(key), value, length); + TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), value, length); - return E_NOTIMPL; + return IMFAttributes_GetAllocatedString(topology->attributes, key, value, length); } -static HRESULT WINAPI mftopology_GetBlobSize(IMFTopology *iface, REFGUID key, UINT32 *size) +static HRESULT WINAPI topology_GetBlobSize(IMFTopology *iface, REFGUID key, UINT32 *size) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), size); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), size); - return E_NOTIMPL; + return IMFAttributes_GetBlobSize(topology->attributes, key, size); } -static HRESULT WINAPI mftopology_GetBlob(IMFTopology *iface, REFGUID key, UINT8 *buf, - UINT32 bufsize, UINT32 *blobsize) +static HRESULT WINAPI topology_GetBlob(IMFTopology *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %d, %p)\n", This, debugstr_guid(key), buf, bufsize, blobsize); + TRACE("(%p)->(%s, %p, %d, %p)\n", iface, debugstr_guid(key), buf, bufsize, blobsize); - return E_NOTIMPL; + return IMFAttributes_GetBlob(topology->attributes, key, buf, bufsize, blobsize); } -static HRESULT WINAPI mftopology_GetAllocatedBlob(IMFTopology *iface, REFGUID key, UINT8 **buf, UINT32 *size) +static HRESULT WINAPI topology_GetAllocatedBlob(IMFTopology *iface, REFGUID key, UINT8 **buf, UINT32 *size) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %p)\n", This, debugstr_guid(key), buf, size); + TRACE("(%p)->(%s, %p, %p)\n", iface, debugstr_guid(key), buf, size); - return E_NOTIMPL; + return IMFAttributes_GetAllocatedBlob(topology->attributes, key, buf, size); } -static HRESULT WINAPI mftopology_GetUnknown(IMFTopology *iface, REFGUID key, REFIID riid, void **ppv) +static HRESULT WINAPI topology_GetUnknown(IMFTopology *iface, REFGUID key, REFIID riid, void **ppv) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %s, %p)\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %s, %p)\n", iface, debugstr_guid(key), debugstr_guid(riid), ppv); - return E_NOTIMPL; + return IMFAttributes_GetUnknown(topology->attributes, key, riid, ppv); } -static HRESULT WINAPI mftopology_SetItem(IMFTopology *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT WINAPI topology_SetItem(IMFTopology *iface, REFGUID key, REFPROPVARIANT value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), Value); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_SetItem(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_DeleteItem(IMFTopology *iface, REFGUID key) +static HRESULT WINAPI topology_DeleteItem(IMFTopology *iface, REFGUID key) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s)\n", This, debugstr_guid(key)); + TRACE("(%p)->(%s)\n", topology, debugstr_guid(key)); - return E_NOTIMPL; + return IMFAttributes_DeleteItem(topology->attributes, key); } -static HRESULT WINAPI mftopology_DeleteAllItems(IMFTopology *iface) +static HRESULT WINAPI topology_DeleteAllItems(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)\n", This); + TRACE("(%p)\n", iface); - return E_NOTIMPL; + return IMFAttributes_DeleteAllItems(topology->attributes); } -static HRESULT WINAPI mftopology_SetUINT32(IMFTopology *iface, REFGUID key, UINT32 value) +static HRESULT WINAPI topology_SetUINT32(IMFTopology *iface, REFGUID key, UINT32 value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %d)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %d)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_SetUINT32(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_SetUINT64(IMFTopology *iface, REFGUID key, UINT64 value) +static HRESULT WINAPI topology_SetUINT64(IMFTopology *iface, REFGUID key, UINT64 value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + return IMFAttributes_SetUINT64(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_SetDouble(IMFTopology *iface, REFGUID key, double value) +static HRESULT WINAPI topology_SetDouble(IMFTopology *iface, REFGUID key, double value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %f)\n", This, debugstr_guid(key), value); + TRACE("(%p)->(%s, %f)\n", iface, debugstr_guid(key), value); - return E_NOTIMPL; + return IMFAttributes_SetDouble(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_SetGUID(IMFTopology *iface, REFGUID key, REFGUID value) +static HRESULT WINAPI topology_SetGUID(IMFTopology *iface, REFGUID key, REFGUID value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %s)\n", This, debugstr_guid(key), debugstr_guid(value)); + TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_guid(value)); - return E_NOTIMPL; + return IMFAttributes_SetGUID(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_SetString(IMFTopology *iface, REFGUID key, const WCHAR *value) +static HRESULT WINAPI topology_SetString(IMFTopology *iface, REFGUID key, const WCHAR *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %s)\n", This, debugstr_guid(key), debugstr_w(value)); + TRACE("(%p)->(%s, %s)\n", iface, debugstr_guid(key), debugstr_w(value)); - return E_NOTIMPL; + return IMFAttributes_SetString(topology->attributes, key, value); } -static HRESULT WINAPI mftopology_SetBlob(IMFTopology *iface, REFGUID key, const UINT8 *buf, UINT32 size) +static HRESULT WINAPI topology_SetBlob(IMFTopology *iface, REFGUID key, const UINT8 *buf, UINT32 size) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p, %d)\n", This, debugstr_guid(key), buf, size); + TRACE("(%p)->(%s, %p, %d)\n", iface, debugstr_guid(key), buf, size); - return E_NOTIMPL; + return IMFAttributes_SetBlob(topology->attributes, key, buf, size); } -static HRESULT WINAPI mftopology_SetUnknown(IMFTopology *iface, REFGUID key, IUnknown *unknown) +static HRESULT WINAPI topology_SetUnknown(IMFTopology *iface, REFGUID key, IUnknown *unknown) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(key), unknown); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(key), unknown); - return E_NOTIMPL; + return IMFAttributes_SetUnknown(topology->attributes, key, unknown); } -static HRESULT WINAPI mftopology_LockStore(IMFTopology *iface) +static HRESULT WINAPI topology_LockStore(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)\n", This); + TRACE("(%p)\n", iface); - return E_NOTIMPL; + return IMFAttributes_LockStore(topology->attributes); } -static HRESULT WINAPI mftopology_UnlockStore(IMFTopology *iface) +static HRESULT WINAPI topology_UnlockStore(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)\n", This); + TRACE("(%p)\n", iface); - return E_NOTIMPL; + return IMFAttributes_UnlockStore(topology->attributes); } -static HRESULT WINAPI mftopology_GetCount(IMFTopology *iface, UINT32 *count) +static HRESULT WINAPI topology_GetCount(IMFTopology *iface, UINT32 *count) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%p)\n", This, count); + TRACE("(%p)->(%p)\n", iface, count); - return E_NOTIMPL; + return IMFAttributes_GetCount(topology->attributes, count); } -static HRESULT WINAPI mftopology_GetItemByIndex(IMFTopology *iface, UINT32 index, GUID *key, PROPVARIANT *value) +static HRESULT WINAPI topology_GetItemByIndex(IMFTopology *iface, UINT32 index, GUID *key, PROPVARIANT *value) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%u, %p, %p)\n", This, index, key, value); + TRACE("(%p)->(%u, %p, %p)\n", iface, index, key, value); - return E_NOTIMPL; + return IMFAttributes_GetItemByIndex(topology->attributes, index, key, value); } -static HRESULT WINAPI mftopology_CopyAllItems(IMFTopology *iface, IMFAttributes *dest) +static HRESULT WINAPI topology_CopyAllItems(IMFTopology *iface, IMFAttributes *dest) { - mftopology *This = impl_from_IMFTopology(iface); + struct topology *topology = impl_from_IMFTopology(iface); - FIXME("(%p)->(%p)\n", This, dest); + TRACE("(%p)->(%p)\n", iface, dest); - return E_NOTIMPL; + return IMFAttributes_CopyAllItems(topology->attributes, dest); } -static HRESULT WINAPI mftopology_GetTopologyID(IMFTopology *iface, TOPOID *id) +static HRESULT WINAPI topology_GetTopologyID(IMFTopology *iface, TOPOID *id) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, id); + FIXME("(%p)->(%p)\n", iface, id); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_AddNode(IMFTopology *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_AddNode(IMFTopology *iface, IMFTopologyNode *node) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, node); + FIXME("(%p)->(%p)\n", iface, node); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_RemoveNode(IMFTopology *iface, IMFTopologyNode *node) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, node); + FIXME("(%p)->(%p)\n", iface, node); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_GetNodeCount(IMFTopology *iface, WORD *count) +static HRESULT WINAPI topology_GetNodeCount(IMFTopology *iface, WORD *count) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, count); + FIXME("(%p)->(%p)\n", iface, count); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_GetNode(IMFTopology *iface, WORD index, IMFTopologyNode **node) +static HRESULT WINAPI topology_GetNode(IMFTopology *iface, WORD index, IMFTopologyNode **node) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%u, %p)\n", This, index, node); + FIXME("(%p)->(%u, %p)\n", iface, index, node); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_Clear(IMFTopology *iface) +static HRESULT WINAPI topology_Clear(IMFTopology *iface) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)\n", This); + FIXME("(%p)\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_CloneFrom(IMFTopology *iface, IMFTopology *topology) +static HRESULT WINAPI topology_CloneFrom(IMFTopology *iface, IMFTopology *src_topology) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, topology); + FIXME("(%p)->(%p)\n", iface, src_topology); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **node) +static HRESULT WINAPI topology_GetNodeByID(IMFTopology *iface, TOPOID id, IMFTopologyNode **node) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, node); + FIXME("(%p)->(%p)\n", iface, node); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_GetSourceNodeCollection(IMFTopology *iface, IMFCollection **collection) +static HRESULT WINAPI topology_GetSourceNodeCollection(IMFTopology *iface, IMFCollection **collection) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, collection); + FIXME("(%p)->(%p)\n", iface, collection); return E_NOTIMPL; } -static HRESULT WINAPI mftopology_GetOutputNodeCollection(IMFTopology *iface, IMFCollection **collection) +static HRESULT WINAPI topology_GetOutputNodeCollection(IMFTopology *iface, IMFCollection **collection) { - mftopology *This = impl_from_IMFTopology(iface); - - FIXME("(%p)->(%p)\n", This, collection); + FIXME("(%p)->(%p)\n", iface, collection); return E_NOTIMPL; } -static const IMFTopologyVtbl mftopologyvtbl = -{ - mftopology_QueryInterface, - mftopology_AddRef, - mftopology_Release, - mftopology_GetItem, - mftopology_GetItemType, - mftopology_CompareItem, - mftopology_Compare, - mftopology_GetUINT32, - mftopology_GetUINT64, - mftopology_GetDouble, - mftopology_GetGUID, - mftopology_GetStringLength, - mftopology_GetString, - mftopology_GetAllocatedString, - mftopology_GetBlobSize, - mftopology_GetBlob, - mftopology_GetAllocatedBlob, - mftopology_GetUnknown, - mftopology_SetItem, - mftopology_DeleteItem, - mftopology_DeleteAllItems, - mftopology_SetUINT32, - mftopology_SetUINT64, - mftopology_SetDouble, - mftopology_SetGUID, - mftopology_SetString, - mftopology_SetBlob, - mftopology_SetUnknown, - mftopology_LockStore, - mftopology_UnlockStore, - mftopology_GetCount, - mftopology_GetItemByIndex, - mftopology_CopyAllItems, - mftopology_GetTopologyID, - mftopology_AddNode, - mftopology_RemoveNode, - mftopology_GetNodeCount, - mftopology_GetNode, - mftopology_Clear, - mftopology_CloneFrom, - mftopology_GetNodeByID, - mftopology_GetSourceNodeCollection, - mftopology_GetOutputNodeCollection, +static const IMFTopologyVtbl topologyvtbl = +{ + topology_QueryInterface, + topology_AddRef, + topology_Release, + topology_GetItem, + topology_GetItemType, + topology_CompareItem, + topology_Compare, + topology_GetUINT32, + topology_GetUINT64, + topology_GetDouble, + topology_GetGUID, + topology_GetStringLength, + topology_GetString, + topology_GetAllocatedString, + topology_GetBlobSize, + topology_GetBlob, + topology_GetAllocatedBlob, + topology_GetUnknown, + topology_SetItem, + topology_DeleteItem, + topology_DeleteAllItems, + topology_SetUINT32, + topology_SetUINT64, + topology_SetDouble, + topology_SetGUID, + topology_SetString, + topology_SetBlob, + topology_SetUnknown, + topology_LockStore, + topology_UnlockStore, + topology_GetCount, + topology_GetItemByIndex, + topology_CopyAllItems, + topology_GetTopologyID, + topology_AddNode, + topology_RemoveNode, + topology_GetNodeCount, + topology_GetNode, + topology_Clear, + topology_CloneFrom, + topology_GetNodeByID, + topology_GetSourceNodeCollection, + topology_GetOutputNodeCollection, }; /*********************************************************************** @@ -505,19 +489,26 @@ static const IMFTopologyVtbl mftopologyvtbl = */ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) { - mftopology *object; + struct topology *object; + HRESULT hr; TRACE("(%p)\n", topology); if (!topology) return E_POINTER; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; - object->IMFTopology_iface.lpVtbl = &mftopologyvtbl; - object->ref = 1; + object->IMFTopology_iface.lpVtbl = &topologyvtbl; + object->refcount = 1; + hr = MFCreateAttributes(&object->attributes, 0); + if (FAILED(hr)) + { + heap_free(object); + return hr; + } *topology = &object->IMFTopology_iface; -- 2.20.1

1 2

[PATCH 1/2] user32: Move iconic windows as their border instead of their icon.
by Zebediah Figura 20 Feb '19

20 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/winpos.c | 50 +++++++++++--------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a938fa9314..5837c179e4 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2709,12 +2709,10 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) HWND parent; LONG hittest = (LONG)(wParam & 0x0f); WPARAM syscommand = wParam & 0xfff0; - HCURSOR hDragCursor = 0, hOldCursor = 0; MINMAXINFO minmax; POINT capturePoint, pt; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL thickframe = HAS_THICKFRAME( style ); - BOOL iconic = style & WS_MINIMIZE; BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); BOOL DragFullWindows = TRUE; @@ -2794,13 +2792,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* Retrieve a default cache DC (without using the window style) */ hdc = GetDCEx( parent, 0, DCX_CACHE ); - if( iconic ) /* create a cursor for dragging */ - { - hDragCursor = (HCURSOR)GetClassLongPtrW( hwnd, GCLP_HICON); - if( !hDragCursor ) hDragCursor = (HCURSOR)SendMessageW( hwnd, WM_QUERYDRAGICON, 0, 0L); - if( !hDragCursor ) iconic = FALSE; - } - /* we only allow disabling the full window drag for child windows */ if (parent) SystemParametersInfoW( SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0 ); @@ -2870,20 +2861,14 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if( !moved ) { moved = TRUE; - - if( iconic ) /* ok, no system popup tracking */ - { - hOldCursor = SetCursor(hDragCursor); - ShowCursor( TRUE ); - } - else if(!DragFullWindows) + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + if (!DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; else if (ON_RIGHT_BORDER(hittest)) sizingRect.right += dx; @@ -2903,32 +2888,21 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); - if (!iconic) + if (!DragFullWindows) + draw_moving_frame( parent, hdc, &sizingRect, thickframe ); + else { - if(!DragFullWindows) - draw_moving_frame( parent, hdc, &sizingRect, thickframe ); - else - { - RECT rect = sizingRect; - MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); - SetWindowPos( hwnd, 0, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 ); - } + RECT rect = sizingRect; + MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + SetWindowPos( hwnd, 0, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + (hittest == HTCAPTION) ? SWP_NOSIZE : 0 ); } } } } - if( iconic ) - { - if( moved ) /* restore cursors, show icon title later on */ - { - ShowCursor( FALSE ); - SetCursor( hOldCursor ); - } - } - else if (moved && !DragFullWindows) + if (moved && !DragFullWindows) { draw_moving_frame( parent, hdc, &sizingRect, thickframe ); } @@ -2952,7 +2926,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ - if(!DragFullWindows || iconic) + if (!DragFullWindows) SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top, -- 2.20.1

1 1

(Resend) [PATCH] Fix handling of zero_bits argument in NtAllocateVirtualMemory
by Las＠protonmail.ch 19 Feb '19

19 Feb '19

Patch attached. This is my first contribution to wine, and I have checked through the wiki for what I should do, and have attempted to fulfill all criteria. Commit message from patch: Before, Wine would (very incorrectly) use the argument to specify how many *low-order* address bits should be 0, when in fact, in Windows it's used to specify how many *high-order* address bits should be zero! The functionality is taken from the documentation for NtAllocateVirtualMemory: The number of high-order address bits that must be zero in the base address of the section view. Used only when the operating system determines where to allocate the region, as when BaseAddress is NULL. Note that when ZeroBits is larger than 32, it becomes a bitmask. and NtMapViewOfSection: Specifies the number of high-order address bits that must be zero in the base address of the section view. The value of this parameter must be less than 21 and is used only if BaseAddress is NULL—in other words, when the caller allows the system to determine where to allocate the view. and from documentation for LuaJIT's allocator: /* Number of top bits of the lower 32 bits of an address that must be zero. ** Apparently 0 gives us full 64 bit addresses and 1 gives us the lower 2GB. */ \#define NTAVM_ZEROBITS 1 Thus the interpretation done here is: If zero_bits is 0, use the full address space. If zero_bits is over 20, err (12-bit pointers are the smallest allowed). Otherwise only the lower (32-zero_bits) bits should be used. A lot of internal Wine functionality unfortunately depends on the old Wine behavior, but thankfully, all of the uses seem to be redundant, as no function requested an alignment higher than the minimum! It may however be that I have not fully understood the code, as it is not always clear what alignment is requested. In addition, to implement this odd Windows API, Wine somehow has to mmap an address below the maximum, which is not possible efficiently on POSIX systems compared to the Windows API. Linux has the MAP_32BIT flag, but it restricts the address space to just 1 GiB, which is not enough. For that reason, the implementation of this API in Wine uses pseudorandom heuristics ripped from the LuaJIT project (which also seems to be the only project to use this Windows API) to achieve this. It is not optimal, but it works. A proper implementation would require extensions to the mmap API.

3 2

[PATCH 1/2] xaudio2: Rewrite to use FAudio
by elee＠codeweavers.com 19 Feb '19

19 Feb '19

From: Ethan Lee <elee(a)codeweavers.com> FAudio Website: https://github.com/FNA-XNA/FAudio Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 24 +- dlls/x3daudio1_0/Makefile.in | 2 + dlls/x3daudio1_1/Makefile.in | 2 + dlls/x3daudio1_2/Makefile.in | 2 + dlls/x3daudio1_3/Makefile.in | 2 + dlls/x3daudio1_4/Makefile.in | 2 + dlls/x3daudio1_5/Makefile.in | 2 + dlls/x3daudio1_6/Makefile.in | 2 + dlls/x3daudio1_7/Makefile.in | 2 + dlls/xapofx1_1/Makefile.in | 6 +- dlls/xapofx1_2/Makefile.in | 6 +- dlls/xapofx1_3/Makefile.in | 6 +- dlls/xapofx1_4/Makefile.in | 6 +- dlls/xapofx1_5/Makefile.in | 6 +- dlls/xaudio2_0/Makefile.in | 8 +- dlls/xaudio2_1/Makefile.in | 8 +- dlls/xaudio2_2/Makefile.in | 8 +- dlls/xaudio2_3/Makefile.in | 8 +- dlls/xaudio2_4/Makefile.in | 8 +- dlls/xaudio2_5/Makefile.in | 8 +- dlls/xaudio2_6/Makefile.in | 8 +- dlls/xaudio2_7/Makefile.in | 9 +- dlls/xaudio2_7/compat.c | 774 ++++----- dlls/xaudio2_7/tests/xaudio2.c | 1075 +----------- dlls/xaudio2_7/x3daudio.c | 36 +- dlls/xaudio2_7/xapo.c | 405 +++++ dlls/xaudio2_7/xapofx.c | 792 +-------- dlls/xaudio2_7/xaudio_allocator.c | 41 + dlls/xaudio2_7/xaudio_classes.idl | 7 - dlls/xaudio2_7/xaudio_dll.c | 2598 ++++++++++++----------------- dlls/xaudio2_7/xaudio_private.h | 174 +- dlls/xaudio2_8/Makefile.in | 9 +- dlls/xaudio2_9/Makefile.in | 9 +- 33 files changed, 2086 insertions(+), 3969 deletions(-) create mode 100644 dlls/xaudio2_7/xapo.c create mode 100644 dlls/xaudio2_7/xaudio_allocator.c diff --git a/configure.ac b/configure.ac index 1b425d22a2..18e07909a2 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) +AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAudio2 support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) @@ -1634,6 +1635,16 @@ fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) +dnl **** Check for FAudio **** +if test "x$with_faudio" != "xno" +then + WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + [AC_CHECK_HEADERS([FAudio.h], + [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) +fi +WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], + [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.]) + dnl **** Check for capi4linux **** if test "x$with_capi" != "xno" then @@ -1798,19 +1809,8 @@ WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.], [enable_openal32]) -dnl **** Check for openal-soft **** -if test "x$ac_cv_lib_openal" = xyes -then - AC_CACHE_CHECK([for openal-soft], ac_cv_have_openalsoft, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <AL/al.h> -#include <AL/alc.h> -#include <AL/alext.h> -LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft=no])) -fi -if test "x$ac_cv_have_openalsoft" != xyes +if test "x$ac_cv_lib_soname_FAudio" = "x" then - WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported.]) enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in index 9b4ce2189c..d2305be6f1 100644 --- a/dlls/x3daudio1_0/Makefile.in +++ b/dlls/x3daudio1_0/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=0 -DXAUDIO2_VER=0 MODULE = x3daudio1_0.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in index d866dc3ddb..efe8d74539 100644 --- a/dlls/x3daudio1_1/Makefile.in +++ b/dlls/x3daudio1_1/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=1 -DXAUDIO2_VER=1 MODULE = x3daudio1_1.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in index d5de11b258..3b52e063fc 100644 --- a/dlls/x3daudio1_2/Makefile.in +++ b/dlls/x3daudio1_2/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=2 -DXAUDIO2_VER=2 MODULE = x3daudio1_2.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in index cfd2c6c6c6..9afd1e6431 100644 --- a/dlls/x3daudio1_3/Makefile.in +++ b/dlls/x3daudio1_3/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=3 -DXAUDIO2_VER=3 MODULE = x3daudio1_3.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in index bd0eac7fc6..e481567cce 100644 --- a/dlls/x3daudio1_4/Makefile.in +++ b/dlls/x3daudio1_4/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=4 -DXAUDIO2_VER=4 MODULE = x3daudio1_4.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in index dac67aef76..0a97959e7e 100644 --- a/dlls/x3daudio1_5/Makefile.in +++ b/dlls/x3daudio1_5/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=5 -DXAUDIO2_VER=5 MODULE = x3daudio1_5.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index 177fb8d34d..c88374a381 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=6 -DXAUDIO2_VER=6 MODULE = x3daudio1_6.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 019588dce0..267a93fd6d 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,6 +1,8 @@ EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7 MODULE = x3daudio1_7.dll PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ x3daudio.c diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in index f69ff86bd9..072ec3f5fb 100644 --- a/dlls/xapofx1_1/Makefile.in +++ b/dlls/xapofx1_1/Makefile.in @@ -2,8 +2,12 @@ EXTRADEFS = -DXAPOFX1_VER=1 -DXAUDIO2_VER=2 MODULE = xapofx1_1.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_2/Makefile.in b/dlls/xapofx1_2/Makefile.in index d56a2be4bb..f018a7e931 100644 --- a/dlls/xapofx1_2/Makefile.in +++ b/dlls/xapofx1_2/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=2 -DXAUDIO2_VER=3 MODULE = xapofx1_2.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in index 1139520b73..e2ae458257 100644 --- a/dlls/xapofx1_3/Makefile.in +++ b/dlls/xapofx1_3/Makefile.in @@ -2,8 +2,12 @@ EXTRADEFS = -DXAPOFX1_VER=3 -DXAUDIO2_VER=4 MODULE = xapofx1_3.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c RC_SRCS = version.rc diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in index b49e4643af..0c6695f191 100644 --- a/dlls/xapofx1_4/Makefile.in +++ b/dlls/xapofx1_4/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=4 -DXAUDIO2_VER=6 MODULE = xapofx1_4.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in index 5055a16fd5..9bb7d704e5 100644 --- a/dlls/xapofx1_5/Makefile.in +++ b/dlls/xapofx1_5/Makefile.in @@ -2,6 +2,10 @@ EXTRADEFS = -DXAPOFX1_VER=5 -DXAUDIO2_VER=7 MODULE = xapofx1_5.dll IMPORTS = ole32 PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ - xapofx.c + xaudio_allocator.c \ + xapofx.c \ + xapo.c diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index cf15c7bf02..3aa083b88f 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index 32a5a62a2a..87c6bfce85 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index f20de2d5f4..44eaf14991 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index ca749f247b..8b71f10fec 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index 0b74f68fdc..2c43df199d 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index 09356c94ac..0e5b825a46 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index e0ef588158..69d4574ca4 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,12 +1,14 @@ EXTRADEFS = -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 2f2e232007..d7a1a35839 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,12 +1,13 @@ EXTRADEFS = -DXAUDIO2_VER=7 MODULE = xaudio2_7.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ - xapofx.c \ - xaudio_dll.c + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index 4980e25f2f..318f668589 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -124,15 +124,15 @@ static XAUDIO2_SEND_DESCRIPTOR *convert_send_descriptors23(const XAUDIO23_VOICE_ /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 -static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio20SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20SourceVoice_iface); } static void WINAPI XA20SRC_GetVoiceDetails(IXAudio20SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -145,7 +145,7 @@ static void WINAPI XA20SRC_GetVoiceDetails(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -168,14 +168,14 @@ static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetEffectChain(IXAudio20SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA20SRC_EnableEffect(IXAudio20SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -183,7 +183,7 @@ static HRESULT WINAPI XA20SRC_EnableEffect(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_DisableEffect(IXAudio20SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -191,7 +191,7 @@ static HRESULT WINAPI XA20SRC_DisableEffect(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetEffectState(IXAudio20SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -200,7 +200,7 @@ static HRESULT WINAPI XA20SRC_SetEffectParameters(IXAudio20SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -208,7 +208,7 @@ static HRESULT WINAPI XA20SRC_SetEffectParameters(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_GetEffectParameters(IXAudio20SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -216,7 +216,7 @@ static HRESULT WINAPI XA20SRC_GetEffectParameters(IXAudio20SourceVoice *iface, static HRESULT WINAPI XA20SRC_SetFilterParameters(IXAudio20SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -224,14 +224,14 @@ static HRESULT WINAPI XA20SRC_SetFilterParameters(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetFilterParameters(IXAudio20SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } static HRESULT WINAPI XA20SRC_SetVolume(IXAudio20SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } @@ -239,14 +239,14 @@ static HRESULT WINAPI XA20SRC_SetVolume(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetVolume(IXAudio20SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA20SRC_SetChannelVolumes(IXAudio20SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -254,7 +254,7 @@ static HRESULT WINAPI XA20SRC_SetChannelVolumes(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetChannelVolumes(IXAudio20SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -264,7 +264,7 @@ static HRESULT WINAPI XA20SRC_SetOutputMatrix(IXAudio20SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -274,7 +274,7 @@ static HRESULT WINAPI XA20SRC_GetOutputMatrix(IXAudio20SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); @@ -283,62 +283,62 @@ static HRESULT WINAPI XA20SRC_GetOutputMatrix(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_DestroyVoice(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_Start(IXAudio20SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA20SRC_Stop(IXAudio20SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA20SRC_SubmitSourceBuffer(IXAudio20SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA20SRC_FlushSourceBuffers(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_Discontinuity(IXAudio20SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA20SRC_ExitLoop(IXAudio20SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA20SRC_GetState(IXAudio20SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA20SRC_SetFrequencyRatio(IXAudio20SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } @@ -346,7 +346,7 @@ static HRESULT WINAPI XA20SRC_SetFrequencyRatio(IXAudio20SourceVoice *iface, static void WINAPI XA20SRC_GetFrequencyRatio(IXAudio20SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -381,15 +381,15 @@ const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static XA2SourceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio23SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23SourceVoice_iface); } static void WINAPI XA23SRC_GetVoiceDetails(IXAudio23SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -402,7 +402,7 @@ static void WINAPI XA23SRC_GetVoiceDetails(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -425,14 +425,14 @@ static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetEffectChain(IXAudio23SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA23SRC_EnableEffect(IXAudio23SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -440,7 +440,7 @@ static HRESULT WINAPI XA23SRC_EnableEffect(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_DisableEffect(IXAudio23SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } @@ -448,7 +448,7 @@ static HRESULT WINAPI XA23SRC_DisableEffect(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetEffectState(IXAudio23SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -457,7 +457,7 @@ static HRESULT WINAPI XA23SRC_SetEffectParameters(IXAudio23SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -465,7 +465,7 @@ static HRESULT WINAPI XA23SRC_SetEffectParameters(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_GetEffectParameters(IXAudio23SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -473,7 +473,7 @@ static HRESULT WINAPI XA23SRC_GetEffectParameters(IXAudio23SourceVoice *iface, static HRESULT WINAPI XA23SRC_SetFilterParameters(IXAudio23SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -481,14 +481,14 @@ static HRESULT WINAPI XA23SRC_SetFilterParameters(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetFilterParameters(IXAudio23SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } static HRESULT WINAPI XA23SRC_SetVolume(IXAudio23SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } @@ -496,14 +496,14 @@ static HRESULT WINAPI XA23SRC_SetVolume(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetVolume(IXAudio23SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA23SRC_SetChannelVolumes(IXAudio23SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -511,7 +511,7 @@ static HRESULT WINAPI XA23SRC_SetChannelVolumes(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetChannelVolumes(IXAudio23SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -521,7 +521,7 @@ static HRESULT WINAPI XA23SRC_SetOutputMatrix(IXAudio23SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -531,7 +531,7 @@ static void WINAPI XA23SRC_GetOutputMatrix(IXAudio23SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); @@ -539,62 +539,62 @@ static void WINAPI XA23SRC_GetOutputMatrix(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_DestroyVoice(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_Start(IXAudio23SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA23SRC_Stop(IXAudio23SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA23SRC_SubmitSourceBuffer(IXAudio23SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA23SRC_FlushSourceBuffers(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_Discontinuity(IXAudio23SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA23SRC_ExitLoop(IXAudio23SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA23SRC_GetState(IXAudio23SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA23SRC_SetFrequencyRatio(IXAudio23SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } @@ -602,7 +602,7 @@ static HRESULT WINAPI XA23SRC_SetFrequencyRatio(IXAudio23SourceVoice *iface, static void WINAPI XA23SRC_GetFrequencyRatio(IXAudio23SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -637,15 +637,15 @@ const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static XA2SourceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio27SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27SourceVoice_iface); } static void WINAPI XA27SRC_GetVoiceDetails(IXAudio27SourceVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SourceVoice_GetVoiceDetails(&This->IXAudio2SourceVoice_iface, &details); @@ -658,35 +658,35 @@ static void WINAPI XA27SRC_GetVoiceDetails(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_SetOutputVoices(IXAudio27SourceVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, pSendList); } static HRESULT WINAPI XA27SRC_SetEffectChain(IXAudio27SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetEffectChain(&This->IXAudio2SourceVoice_iface, pEffectChain); } static HRESULT WINAPI XA27SRC_EnableEffect(IXAudio27SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_EnableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } static HRESULT WINAPI XA27SRC_DisableEffect(IXAudio27SourceVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_DisableEffect(&This->IXAudio2SourceVoice_iface, EffectIndex, OperationSet); } static void WINAPI XA27SRC_GetEffectState(IXAudio27SourceVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetEffectState(&This->IXAudio2SourceVoice_iface, EffectIndex, pEnabled); } @@ -694,7 +694,7 @@ static HRESULT WINAPI XA27SRC_SetEffectParameters(IXAudio27SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -702,7 +702,7 @@ static HRESULT WINAPI XA27SRC_SetEffectParameters(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_GetEffectParameters(IXAudio27SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetEffectParameters(&This->IXAudio2SourceVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -710,7 +710,7 @@ static HRESULT WINAPI XA27SRC_GetEffectParameters(IXAudio27SourceVoice *iface, static HRESULT WINAPI XA27SRC_SetFilterParameters(IXAudio27SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters, OperationSet); } @@ -718,7 +718,7 @@ static HRESULT WINAPI XA27SRC_SetFilterParameters(IXAudio27SourceVoice *iface, static void WINAPI XA27SRC_GetFilterParameters(IXAudio27SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetFilterParameters(&This->IXAudio2SourceVoice_iface, pParameters); } @@ -726,7 +726,7 @@ static HRESULT WINAPI XA27SRC_SetOutputFilterParameters(IXAudio27SourceVoice *if IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputFilterParameters(&This->IXAudio2SourceVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -735,7 +735,7 @@ static void WINAPI XA27SRC_GetOutputFilterParameters(IXAudio27SourceVoice *iface IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetOutputFilterParameters(&This->IXAudio2SourceVoice_iface, pDestinationVoice, pParameters); } @@ -743,21 +743,21 @@ static void WINAPI XA27SRC_GetOutputFilterParameters(IXAudio27SourceVoice *iface static HRESULT WINAPI XA27SRC_SetVolume(IXAudio27SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetVolume(&This->IXAudio2SourceVoice_iface, Volume, OperationSet); } static void WINAPI XA27SRC_GetVolume(IXAudio27SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetVolume(&This->IXAudio2SourceVoice_iface, pVolume); } static HRESULT WINAPI XA27SRC_SetChannelVolumes(IXAudio27SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes, OperationSet); } @@ -765,7 +765,7 @@ static HRESULT WINAPI XA27SRC_SetChannelVolumes(IXAudio27SourceVoice *iface, static void WINAPI XA27SRC_GetChannelVolumes(IXAudio27SourceVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetChannelVolumes(&This->IXAudio2SourceVoice_iface, Channels, pVolumes); } @@ -775,7 +775,7 @@ static HRESULT WINAPI XA27SRC_SetOutputMatrix(IXAudio27SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -785,74 +785,74 @@ static void WINAPI XA27SRC_GetOutputMatrix(IXAudio27SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_GetOutputMatrix(&This->IXAudio2SourceVoice_iface, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); } static void WINAPI XA27SRC_DestroyVoice(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); IXAudio2SourceVoice_DestroyVoice(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_Start(IXAudio27SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Start(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA27SRC_Stop(IXAudio27SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Stop(&This->IXAudio2SourceVoice_iface, Flags, OperationSet); } static HRESULT WINAPI XA27SRC_SubmitSourceBuffer(IXAudio27SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SubmitSourceBuffer(&This->IXAudio2SourceVoice_iface, pBuffer, pBufferWMA); } static HRESULT WINAPI XA27SRC_FlushSourceBuffers(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_FlushSourceBuffers(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_Discontinuity(IXAudio27SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_Discontinuity(&This->IXAudio2SourceVoice_iface); } static HRESULT WINAPI XA27SRC_ExitLoop(IXAudio27SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_ExitLoop(&This->IXAudio2SourceVoice_iface, OperationSet); } static void WINAPI XA27SRC_GetState(IXAudio27SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetState(&This->IXAudio2SourceVoice_iface, pVoiceState, 0); } static HRESULT WINAPI XA27SRC_SetFrequencyRatio(IXAudio27SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetFrequencyRatio(&This->IXAudio2SourceVoice_iface, Ratio, OperationSet); } static void WINAPI XA27SRC_GetFrequencyRatio(IXAudio27SourceVoice *iface, float *pRatio) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_GetFrequencyRatio(&This->IXAudio2SourceVoice_iface, pRatio); } @@ -860,7 +860,7 @@ static HRESULT WINAPI XA27SRC_SetSourceSampleRate( IXAudio27SourceVoice *iface, UINT32 NewSourceSampleRate) { - XA2SourceImpl *This = impl_from_IXAudio27SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SourceVoice(iface); return IXAudio2SourceVoice_SetSourceSampleRate(&This->IXAudio2SourceVoice_iface, NewSourceSampleRate); } @@ -901,15 +901,15 @@ const IXAudio27SourceVoiceVtbl XAudio27SourceVoice_Vtbl = { /* BEGIN IXAudio2SubmixVoice */ #if XAUDIO2_VER == 0 -static XA2SubmixImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio20SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20SubmixVoice_iface); } static void WINAPI XA20SUB_GetVoiceDetails(IXAudio20SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -922,7 +922,7 @@ static void WINAPI XA20SUB_GetVoiceDetails(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; @@ -945,14 +945,14 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetEffectChain(IXAudio20SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA20SUB_EnableEffect(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -960,7 +960,7 @@ static HRESULT WINAPI XA20SUB_EnableEffect(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_DisableEffect(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -968,7 +968,7 @@ static HRESULT WINAPI XA20SUB_DisableEffect(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetEffectState(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -977,7 +977,7 @@ static HRESULT WINAPI XA20SUB_SetEffectParameters(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -985,7 +985,7 @@ static HRESULT WINAPI XA20SUB_SetEffectParameters(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_GetEffectParameters(IXAudio20SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -993,7 +993,7 @@ static HRESULT WINAPI XA20SUB_GetEffectParameters(IXAudio20SubmixVoice *iface, static HRESULT WINAPI XA20SUB_SetFilterParameters(IXAudio20SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1001,14 +1001,14 @@ static HRESULT WINAPI XA20SUB_SetFilterParameters(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetFilterParameters(IXAudio20SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } static HRESULT WINAPI XA20SUB_SetVolume(IXAudio20SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1016,14 +1016,14 @@ static HRESULT WINAPI XA20SUB_SetVolume(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetVolume(IXAudio20SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA20SUB_SetChannelVolumes(IXAudio20SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1031,7 +1031,7 @@ static HRESULT WINAPI XA20SUB_SetChannelVolumes(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_GetChannelVolumes(IXAudio20SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1041,7 +1041,7 @@ static HRESULT WINAPI XA20SUB_SetOutputMatrix(IXAudio20SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1051,7 +1051,7 @@ static HRESULT WINAPI XA20SUB_GetOutputMatrix(IXAudio20SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1060,7 +1060,7 @@ static HRESULT WINAPI XA20SUB_GetOutputMatrix(IXAudio20SubmixVoice *iface, static void WINAPI XA20SUB_DestroyVoice(IXAudio20SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1086,15 +1086,15 @@ const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static XA2SubmixImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio23SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23SubmixVoice_iface); } static void WINAPI XA23SUB_GetVoiceDetails(IXAudio23SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -1107,7 +1107,7 @@ static void WINAPI XA23SUB_GetVoiceDetails(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -1130,14 +1130,14 @@ static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetEffectChain(IXAudio23SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA23SUB_EnableEffect(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI XA23SUB_EnableEffect(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_DisableEffect(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI XA23SUB_DisableEffect(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetEffectState(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI XA23SUB_SetEffectParameters(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1170,7 +1170,7 @@ static HRESULT WINAPI XA23SUB_SetEffectParameters(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_GetEffectParameters(IXAudio23SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1178,7 +1178,7 @@ static HRESULT WINAPI XA23SUB_GetEffectParameters(IXAudio23SubmixVoice *iface, static HRESULT WINAPI XA23SUB_SetFilterParameters(IXAudio23SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1186,14 +1186,14 @@ static HRESULT WINAPI XA23SUB_SetFilterParameters(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetFilterParameters(IXAudio23SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } static HRESULT WINAPI XA23SUB_SetVolume(IXAudio23SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1201,14 +1201,14 @@ static HRESULT WINAPI XA23SUB_SetVolume(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetVolume(IXAudio23SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA23SUB_SetChannelVolumes(IXAudio23SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI XA23SUB_SetChannelVolumes(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_GetChannelVolumes(IXAudio23SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1226,7 +1226,7 @@ static HRESULT WINAPI XA23SUB_SetOutputMatrix(IXAudio23SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1236,7 +1236,7 @@ static void WINAPI XA23SUB_GetOutputMatrix(IXAudio23SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1244,7 +1244,7 @@ static void WINAPI XA23SUB_GetOutputMatrix(IXAudio23SubmixVoice *iface, static void WINAPI XA23SUB_DestroyVoice(IXAudio23SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1270,15 +1270,15 @@ const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static XA2SubmixImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio27SubmixVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27SubmixVoice_iface); } static void WINAPI XA27SUB_GetVoiceDetails(IXAudio27SubmixVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2SubmixVoice_GetVoiceDetails(&This->IXAudio2SubmixVoice_iface, &details); @@ -1291,21 +1291,21 @@ static void WINAPI XA27SUB_GetVoiceDetails(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_SetOutputVoices(IXAudio27SubmixVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, pSendList); } static HRESULT WINAPI XA27SUB_SetEffectChain(IXAudio27SubmixVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectChain(&This->IXAudio2SubmixVoice_iface, pEffectChain); } static HRESULT WINAPI XA27SUB_EnableEffect(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_EnableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1313,7 +1313,7 @@ static HRESULT WINAPI XA27SUB_EnableEffect(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_DisableEffect(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_DisableEffect(&This->IXAudio2SubmixVoice_iface, EffectIndex, OperationSet); } @@ -1321,7 +1321,7 @@ static HRESULT WINAPI XA27SUB_DisableEffect(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetEffectState(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectState(&This->IXAudio2SubmixVoice_iface, EffectIndex, pEnabled); } @@ -1330,7 +1330,7 @@ static HRESULT WINAPI XA27SUB_SetEffectParameters(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1338,7 +1338,7 @@ static HRESULT WINAPI XA27SUB_SetEffectParameters(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_GetEffectParameters(IXAudio27SubmixVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetEffectParameters(&This->IXAudio2SubmixVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1346,7 +1346,7 @@ static HRESULT WINAPI XA27SUB_GetEffectParameters(IXAudio27SubmixVoice *iface, static HRESULT WINAPI XA27SUB_SetFilterParameters(IXAudio27SubmixVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters, OperationSet); } @@ -1354,7 +1354,7 @@ static HRESULT WINAPI XA27SUB_SetFilterParameters(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetFilterParameters(IXAudio27SubmixVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetFilterParameters(&This->IXAudio2SubmixVoice_iface, pParameters); } @@ -1362,7 +1362,7 @@ static HRESULT WINAPI XA27SUB_SetOutputFilterParameters(IXAudio27SubmixVoice *if IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputFilterParameters(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -1371,7 +1371,7 @@ static void WINAPI XA27SUB_GetOutputFilterParameters(IXAudio27SubmixVoice *iface IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); IXAudio2SubmixVoice_GetOutputFilterParameters(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, pParameters); } @@ -1379,7 +1379,7 @@ static void WINAPI XA27SUB_GetOutputFilterParameters(IXAudio27SubmixVoice *iface static HRESULT WINAPI XA27SUB_SetVolume(IXAudio27SubmixVoice *iface, float Volume, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetVolume(&This->IXAudio2SubmixVoice_iface, Volume, OperationSet); } @@ -1387,14 +1387,14 @@ static HRESULT WINAPI XA27SUB_SetVolume(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetVolume(IXAudio27SubmixVoice *iface, float *pVolume) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetVolume(&This->IXAudio2SubmixVoice_iface, pVolume); } static HRESULT WINAPI XA27SUB_SetChannelVolumes(IXAudio27SubmixVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes, OperationSet); } @@ -1402,7 +1402,7 @@ static HRESULT WINAPI XA27SUB_SetChannelVolumes(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_GetChannelVolumes(IXAudio27SubmixVoice *iface, UINT32 Channels, float *pVolumes) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetChannelVolumes(&This->IXAudio2SubmixVoice_iface, Channels, pVolumes); } @@ -1412,7 +1412,7 @@ static HRESULT WINAPI XA27SUB_SetOutputMatrix(IXAudio27SubmixVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_SetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1422,7 +1422,7 @@ static void WINAPI XA27SUB_GetOutputMatrix(IXAudio27SubmixVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SubmixChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_GetOutputMatrix(&This->IXAudio2SubmixVoice_iface, pDestinationVoice, SubmixChannels, DestinationChannels, pLevelMatrix); @@ -1430,7 +1430,7 @@ static void WINAPI XA27SUB_GetOutputMatrix(IXAudio27SubmixVoice *iface, static void WINAPI XA27SUB_DestroyVoice(IXAudio27SubmixVoice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio27SubmixVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27SubmixVoice(iface); return IXAudio2SubmixVoice_DestroyVoice(&This->IXAudio2SubmixVoice_iface); } @@ -1461,15 +1461,15 @@ const IXAudio27SubmixVoiceVtbl XAudio27SubmixVoice_Vtbl = { /* BEGIN IXAudio2MasteringVoice */ #if XAUDIO2_VER == 0 -static IXAudio2Impl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio20MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio20MasteringVoice_iface); } static void WINAPI XA20M_GetVoiceDetails(IXAudio20MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1482,7 +1482,7 @@ static void WINAPI XA20M_GetVoiceDetails(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; @@ -1505,14 +1505,14 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetEffectChain(IXAudio20MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA20M_EnableEffect(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1520,7 +1520,7 @@ static HRESULT WINAPI XA20M_EnableEffect(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_DisableEffect(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1528,7 +1528,7 @@ static HRESULT WINAPI XA20M_DisableEffect(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetEffectState(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1537,7 +1537,7 @@ static HRESULT WINAPI XA20M_SetEffectParameters(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1545,7 +1545,7 @@ static HRESULT WINAPI XA20M_SetEffectParameters(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_GetEffectParameters(IXAudio20MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1553,7 +1553,7 @@ static HRESULT WINAPI XA20M_GetEffectParameters(IXAudio20MasteringVoice *iface, static HRESULT WINAPI XA20M_SetFilterParameters(IXAudio20MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1561,14 +1561,14 @@ static HRESULT WINAPI XA20M_SetFilterParameters(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetFilterParameters(IXAudio20MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } static HRESULT WINAPI XA20M_SetVolume(IXAudio20MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1576,14 +1576,14 @@ static HRESULT WINAPI XA20M_SetVolume(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetVolume(IXAudio20MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA20M_SetChannelVolumes(IXAudio20MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1591,7 +1591,7 @@ static HRESULT WINAPI XA20M_SetChannelVolumes(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_GetChannelVolumes(IXAudio20MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1601,7 +1601,7 @@ static HRESULT WINAPI XA20M_SetOutputMatrix(IXAudio20MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1611,7 +1611,7 @@ static HRESULT WINAPI XA20M_GetOutputMatrix(IXAudio20MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1620,7 +1620,7 @@ static HRESULT WINAPI XA20M_GetOutputMatrix(IXAudio20MasteringVoice *iface, static void WINAPI XA20M_DestroyVoice(IXAudio20MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio20MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -1646,15 +1646,15 @@ const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl = { #elif XAUDIO2_VER <= 3 -static IXAudio2Impl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio23MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio23MasteringVoice_iface); } static void WINAPI XA23M_GetVoiceDetails(IXAudio23MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1667,7 +1667,7 @@ static void WINAPI XA23M_GetVoiceDetails(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; @@ -1690,14 +1690,14 @@ static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetEffectChain(IXAudio23MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA23M_EnableEffect(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1705,7 +1705,7 @@ static HRESULT WINAPI XA23M_EnableEffect(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_DisableEffect(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1713,7 +1713,7 @@ static HRESULT WINAPI XA23M_DisableEffect(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetEffectState(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1722,7 +1722,7 @@ static HRESULT WINAPI XA23M_SetEffectParameters(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1730,7 +1730,7 @@ static HRESULT WINAPI XA23M_SetEffectParameters(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_GetEffectParameters(IXAudio23MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1738,7 +1738,7 @@ static HRESULT WINAPI XA23M_GetEffectParameters(IXAudio23MasteringVoice *iface, static HRESULT WINAPI XA23M_SetFilterParameters(IXAudio23MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1746,14 +1746,14 @@ static HRESULT WINAPI XA23M_SetFilterParameters(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetFilterParameters(IXAudio23MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } static HRESULT WINAPI XA23M_SetVolume(IXAudio23MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1761,14 +1761,14 @@ static HRESULT WINAPI XA23M_SetVolume(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetVolume(IXAudio23MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA23M_SetChannelVolumes(IXAudio23MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1776,7 +1776,7 @@ static HRESULT WINAPI XA23M_SetChannelVolumes(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_GetChannelVolumes(IXAudio23MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1786,7 +1786,7 @@ static HRESULT WINAPI XA23M_SetOutputMatrix(IXAudio23MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1796,7 +1796,7 @@ static void WINAPI XA23M_GetOutputMatrix(IXAudio23MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1804,7 +1804,7 @@ static void WINAPI XA23M_GetOutputMatrix(IXAudio23MasteringVoice *iface, static void WINAPI XA23M_DestroyVoice(IXAudio23MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio23MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -1830,15 +1830,15 @@ const IXAudio23MasteringVoiceVtbl XAudio23MasteringVoice_Vtbl = { #elif XAUDIO2_VER <= 7 -static IXAudio2Impl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) +XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio27MasteringVoice_iface); + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio27MasteringVoice_iface); } static void WINAPI XA27M_GetVoiceDetails(IXAudio27MasteringVoice *iface, XAUDIO27_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); XAUDIO2_VOICE_DETAILS details; IXAudio2MasteringVoice_GetVoiceDetails(&This->IXAudio2MasteringVoice_iface, &details); @@ -1851,21 +1851,21 @@ static void WINAPI XA27M_GetVoiceDetails(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_SetOutputVoices(IXAudio27MasteringVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, pSendList); } static HRESULT WINAPI XA27M_SetEffectChain(IXAudio27MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectChain(&This->IXAudio2MasteringVoice_iface, pEffectChain); } static HRESULT WINAPI XA27M_EnableEffect(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_EnableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1873,7 +1873,7 @@ static HRESULT WINAPI XA27M_EnableEffect(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_DisableEffect(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_DisableEffect(&This->IXAudio2MasteringVoice_iface, EffectIndex, OperationSet); } @@ -1881,7 +1881,7 @@ static HRESULT WINAPI XA27M_DisableEffect(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetEffectState(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectState(&This->IXAudio2MasteringVoice_iface, EffectIndex, pEnabled); } @@ -1890,7 +1890,7 @@ static HRESULT WINAPI XA27M_SetEffectParameters(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize, OperationSet); } @@ -1898,7 +1898,7 @@ static HRESULT WINAPI XA27M_SetEffectParameters(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_GetEffectParameters(IXAudio27MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetEffectParameters(&This->IXAudio2MasteringVoice_iface, EffectIndex, pParameters, ParametersByteSize); } @@ -1906,7 +1906,7 @@ static HRESULT WINAPI XA27M_GetEffectParameters(IXAudio27MasteringVoice *iface, static HRESULT WINAPI XA27M_SetFilterParameters(IXAudio27MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters, OperationSet); } @@ -1914,7 +1914,7 @@ static HRESULT WINAPI XA27M_SetFilterParameters(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetFilterParameters(IXAudio27MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetFilterParameters(&This->IXAudio2MasteringVoice_iface, pParameters); } @@ -1922,7 +1922,7 @@ static HRESULT WINAPI XA27M_SetOutputFilterParameters(IXAudio27MasteringVoice *i IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputFilterParameters(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, pParameters, OperationSet); } @@ -1931,7 +1931,7 @@ static void WINAPI XA27M_GetOutputFilterParameters(IXAudio27MasteringVoice *ifac IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); IXAudio2MasteringVoice_GetOutputFilterParameters(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, pParameters); } @@ -1939,7 +1939,7 @@ static void WINAPI XA27M_GetOutputFilterParameters(IXAudio27MasteringVoice *ifac static HRESULT WINAPI XA27M_SetVolume(IXAudio27MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetVolume(&This->IXAudio2MasteringVoice_iface, Volume, OperationSet); } @@ -1947,14 +1947,14 @@ static HRESULT WINAPI XA27M_SetVolume(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetVolume(IXAudio27MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetVolume(&This->IXAudio2MasteringVoice_iface, pVolume); } static HRESULT WINAPI XA27M_SetChannelVolumes(IXAudio27MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes, OperationSet); } @@ -1962,7 +1962,7 @@ static HRESULT WINAPI XA27M_SetChannelVolumes(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_GetChannelVolumes(IXAudio27MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetChannelVolumes(&This->IXAudio2MasteringVoice_iface, Channels, pVolumes); } @@ -1972,7 +1972,7 @@ static HRESULT WINAPI XA27M_SetOutputMatrix(IXAudio27MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_SetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix, OperationSet); @@ -1982,7 +1982,7 @@ static void WINAPI XA27M_GetOutputMatrix(IXAudio27MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 MasteringChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_GetOutputMatrix(&This->IXAudio2MasteringVoice_iface, pDestinationVoice, MasteringChannels, DestinationChannels, pLevelMatrix); @@ -1990,7 +1990,7 @@ static void WINAPI XA27M_GetOutputMatrix(IXAudio27MasteringVoice *iface, static void WINAPI XA27M_DestroyVoice(IXAudio27MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio27MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio27MasteringVoice(iface); return IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); } @@ -2048,93 +2048,16 @@ static ULONG WINAPI XA20_Release(IXAudio20 *iface) static HRESULT WINAPI XA20_GetDeviceCount(IXAudio20 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA20_GetDeviceDetails(IXAudio20 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA20_Initialize(IXAudio20 *iface, UINT32 flags, @@ -2222,12 +2145,41 @@ static HRESULT WINAPI XA20_CreateMasteringVoice(IXAudio20 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); + + /* XAUDIO2_VER == 0 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio20MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA20_StartEngine(IXAudio20 *iface) @@ -2331,93 +2283,16 @@ static ULONG WINAPI XA22_Release(IXAudio22 *iface) static HRESULT WINAPI XA22_GetDeviceCount(IXAudio22 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA22_GetDeviceDetails(IXAudio22 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA22_Initialize(IXAudio22 *iface, UINT32 flags, @@ -2505,12 +2380,41 @@ static HRESULT WINAPI XA22_CreateMasteringVoice(IXAudio22 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); + + /* 1 <= XAUDIO2_VER <= 2 */ + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA22_StartEngine(IXAudio22 *iface) @@ -2613,93 +2517,16 @@ static ULONG WINAPI XA27_Release(IXAudio27 *iface) static HRESULT WINAPI XA27_GetDeviceCount(IXAudio27 *iface, UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio27(iface); - TRACE("%p, %p\n", This, pCount); - - *pCount = This->ndevs; - - return S_OK; + return FAudio_GetDeviceCount(This->faudio, pCount); } static HRESULT WINAPI XA27_GetDeviceDetails(IXAudio27 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio27(iface); - HRESULT hr; - IMMDevice *dev; - IAudioClient *client; - IPropertyStore *ps; - WAVEFORMATEX *wfx; - PROPVARIANT var; - TRACE("%p, %u, %p\n", This, index, pDeviceDetails); - - if(index >= This->ndevs) - return E_INVALIDARG; - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, This->devids[index], &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - return hr; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&client); - if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); - IMMDevice_Release(dev); - return hr; - } - - hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &ps); - if(FAILED(hr)){ - WARN("OpenPropertyStore failed: %08x\n", hr); - IAudioClient_Release(client); - IMMDevice_Release(dev); - return hr; - } - - PropVariantInit(&var); - - hr = IPropertyStore_GetValue(ps, (PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &var); - if(FAILED(hr)){ - WARN("GetValue failed: %08x\n", hr); - goto done; - } - - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); - - PropVariantClear(&var); - - hr = IAudioClient_GetMixFormat(client, &wfx); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - goto done; - } - - lstrcpyW(pDeviceDetails->DeviceID, This->devids[index]); - - if(index == 0) - pDeviceDetails->Role = GlobalDefaultDevice; - else - pDeviceDetails->Role = NotDefaultDevice; - - if(sizeof(WAVEFORMATEX) + wfx->cbSize > sizeof(pDeviceDetails->OutputFormat)){ - FIXME("AudioClient format is too large to fit into WAVEFORMATEXTENSIBLE!\n"); - CoTaskMemFree(wfx); - hr = E_FAIL; - goto done; - } - memcpy(&pDeviceDetails->OutputFormat, wfx, sizeof(WAVEFORMATEX) + wfx->cbSize); - - CoTaskMemFree(wfx); - -done: - IPropertyStore_Release(ps); - IAudioClient_Release(client); - IMMDevice_Release(dev); - - return hr; + return FAudio_GetDeviceDetails(This->faudio, index, (FAudioDeviceDetails *)pDeviceDetails); } static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, @@ -2759,12 +2586,45 @@ static HRESULT WINAPI XA27_CreateMasteringVoice(IXAudio27 *iface, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); - if(deviceIndex >= This->ndevs) - return E_INVALIDARG; + EnterCriticalSection(&This->lock); - return IXAudio2_CreateMasteringVoice(&This->IXAudio2_iface, ppMasteringVoice, - inputChannels, inputSampleRate, flags, This->devids[deviceIndex], - pEffectChain, AudioCategory_GameEffects); + /* 3 <= XAUDIO2_VER <= 7 */ +#if XAUDIO2_VER == 3 + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio23MasteringVoice_iface; +#else + *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->mst.IXAudio27MasteringVoice_iface; +#endif + + EnterCriticalSection(&This->mst.lock); + + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); + LeaveCriticalSection(&This->lock); + return COMPAT_E_INVALID_CALL; + } + + LeaveCriticalSection(&This->lock); + + This->mst.effect_chain = wrap_effect_chain(pEffectChain); + + pthread_mutex_lock(&This->mst.engine_lock); + + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); + + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); + + pthread_mutex_unlock(&This->mst.engine_lock); + + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); + + FAudio_CreateMasteringVoice(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, deviceIndex, This->mst.effect_chain); + + This->mst.in_use = TRUE; + + LeaveCriticalSection(&This->mst.lock); + + return S_OK; } static HRESULT WINAPI XA27_StartEngine(IXAudio27 *iface) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 0c1d9a7805..6f9b7d12cd 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -33,915 +33,6 @@ static BOOL xaudio27; static HRESULT (WINAPI *pXAudio2Create)(IXAudio2 **, UINT32, XAUDIO2_PROCESSOR) = NULL; static HRESULT (WINAPI *pCreateAudioVolumeMeter)(IUnknown**) = NULL; -#define XA2CALL_0(method) if(xaudio27) hr = IXAudio27_##method((IXAudio27*)xa); else hr = IXAudio2_##method(xa); -#define XA2CALL_0V(method) if(xaudio27) IXAudio27_##method((IXAudio27*)xa); else IXAudio2_##method(xa); -#define XA2CALL_V(method, ...) if(xaudio27) IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else IXAudio2_##method(xa, __VA_ARGS__); -#define XA2CALL(method, ...) if(xaudio27) hr = IXAudio27_##method((IXAudio27*)xa, __VA_ARGS__); else hr = IXAudio2_##method(xa, __VA_ARGS__); - -static void fill_buf(float *buf, WAVEFORMATEX *fmt, DWORD hz, DWORD len_frames) -{ - if(winetest_interactive){ - DWORD offs, c; - for(offs = 0; offs < len_frames; ++offs) - for(c = 0; c < fmt->nChannels; ++c) - buf[offs * fmt->nChannels + c] = sinf(offs * hz * 2 * M_PI / fmt->nSamplesPerSec); - }else - memset(buf, 0, sizeof(float) * len_frames * fmt->nChannels); -} - -static struct _cb_state { - BOOL start_called, end_called; -} ecb_state, src1_state, src2_state; - -static int pass_state = 0; -static BOOL buffers_called = FALSE; - -static void WINAPI ECB_OnProcessingPassStart(IXAudio2EngineCallback *This) -{ - ok(!xaudio27 || pass_state == 0, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; -} - -static void WINAPI ECB_OnProcessingPassEnd(IXAudio2EngineCallback *This) -{ - ok(!xaudio27 || pass_state == (buffers_called ? 7 : 5), "Callbacks called out of order: %u\n", pass_state); - pass_state = 0; - buffers_called = FALSE; -} - -static void WINAPI ECB_OnCriticalError(IXAudio2EngineCallback *This, HRESULT Error) -{ - ok(0, "Unexpected OnCriticalError\n"); -} - -static const IXAudio2EngineCallbackVtbl ecb_vtbl = { - ECB_OnProcessingPassStart, - ECB_OnProcessingPassEnd, - ECB_OnCriticalError -}; - -static IXAudio2EngineCallback ecb = { &ecb_vtbl }; - -static IXAudio2VoiceCallback vcb1; -static IXAudio2VoiceCallback vcb2; - -static void WINAPI VCB_OnVoiceProcessingPassStart(IXAudio2VoiceCallback *This, - UINT32 BytesRequired) -{ - if(This == &vcb1){ - ok(!xaudio27 || pass_state == (buffers_called ? 4 : 3), "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - }else{ - ok(!xaudio27 || pass_state == 1, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - } -} - -static void WINAPI VCB_OnVoiceProcessingPassEnd(IXAudio2VoiceCallback *This) -{ - if(This == &vcb1){ - ok(!xaudio27 || pass_state == (buffers_called ? 6 : 4), "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - }else{ - ok(!xaudio27 || pass_state == (buffers_called ? 3 : 2), "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - } -} - -static void WINAPI VCB_OnStreamEnd(IXAudio2VoiceCallback *This) -{ - ok(0, "Unexpected OnStreamEnd\n"); -} - -static void WINAPI VCB_OnBufferStart(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - if(This == &vcb1){ - ok(!xaudio27 || pass_state == 5, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - }else{ - ok(!xaudio27 || pass_state == 2, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - buffers_called = TRUE; - } -} - -static void WINAPI VCB_OnBufferEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - if(This == &vcb1){ - ok(!xaudio27 || pass_state == 5, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - }else{ - ok(!xaudio27 || pass_state == 2, "Callbacks called out of order: %u\n", pass_state); - ++pass_state; - buffers_called = TRUE; - } -} - -static void WINAPI VCB_OnLoopEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - ok(0, "Unexpected OnLoopEnd\n"); -} - -static void WINAPI VCB_OnVoiceError(IXAudio2VoiceCallback *This, - void *pBuffercontext, HRESULT Error) -{ - ok(0, "Unexpected OnVoiceError\n"); -} - -static const IXAudio2VoiceCallbackVtbl vcb_vtbl = { - VCB_OnVoiceProcessingPassStart, - VCB_OnVoiceProcessingPassEnd, - VCB_OnStreamEnd, - VCB_OnBufferStart, - VCB_OnBufferEnd, - VCB_OnLoopEnd, - VCB_OnVoiceError -}; - -static IXAudio2VoiceCallback vcb1 = { &vcb_vtbl }; -static IXAudio2VoiceCallback vcb2 = { &vcb_vtbl }; - -static void test_simple_streaming(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SourceVoice *src, *src2; - IUnknown *vumeter; - WAVEFORMATEX fmt; - XAUDIO2_BUFFER buf, buf2; - XAUDIO2_VOICE_STATE state; - XAUDIO2_EFFECT_DESCRIPTOR effect; - XAUDIO2_EFFECT_CHAIN chain; - DWORD chmask; - - memset(&ecb_state, 0, sizeof(ecb_state)); - memset(&src1_state, 0, sizeof(src1_state)); - memset(&src2_state, 0, sizeof(src2_state)); - - XA2CALL_0V(StopEngine); - - /* Tests show in native XA2.8, ECB is called from a mixer thread, but VCBs - * may be called from other threads in any order. So we can't rely on any - * sequencing between VCB calls. - * - * XA2.7 does all mixing from a single thread, so call sequence can be - * tested. */ - XA2CALL(RegisterForCallbacks, &ecb); - ok(hr == S_OK, "RegisterForCallbacks failed: %08x\n", hr); - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - if(!xaudio27){ - chmask = 0xdeadbeef; - IXAudio2MasteringVoice_GetChannelMask(master, &chmask); - ok(chmask == (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT), "Got unexpected channel mask: 0x%x\n", chmask); - } - - /* create first source voice */ - fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt.nChannels = 2; - fmt.nSamplesPerSec = 44100; - fmt.wBitsPerSample = 32; - fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &vcb1, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - if(xaudio27){ - XAUDIO27_VOICE_DETAILS details; - IXAudio27SourceVoice_GetVoiceDetails((IXAudio27SourceVoice*)src, &details); - ok(details.CreationFlags == 0, "Got wrong flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - }else{ - XAUDIO2_VOICE_DETAILS details; - IXAudio2SourceVoice_GetVoiceDetails(src, &details); - ok(details.CreationFlags == 0, "Got wrong creation flags: 0x%x\n", details.CreationFlags); - ok(details.ActiveFlags == 0, "Got wrong active flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - } - - memset(&buf, 0, sizeof(buf)); - buf.AudioBytes = 22050 * fmt.nBlockAlign; - buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); - fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - /* create second source voice */ - XA2CALL(CreateSourceVoice, &src2, &fmt, 0, 1.f, &vcb2, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - if(xaudio27){ - XAUDIO27_VOICE_DETAILS details; - IXAudio27SourceVoice_GetVoiceDetails((IXAudio27SourceVoice*)src2, &details); - ok(details.CreationFlags == 0, "Got wrong flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - }else{ - XAUDIO2_VOICE_DETAILS details; - IXAudio2SourceVoice_GetVoiceDetails(src2, &details); - ok(details.CreationFlags == 0, "Got wrong creation flags: 0x%x\n", details.CreationFlags); - ok(details.ActiveFlags == 0, "Got wrong active flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - } - - memset(&buf2, 0, sizeof(buf2)); - buf2.AudioBytes = 22050 * fmt.nBlockAlign; - buf2.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf2.AudioBytes); - fill_buf((float*)buf2.pAudioData, &fmt, 220, 22050); - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src2, &buf2, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_Start(src2, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); - - /* hook up volume meter */ - if(xaudio27){ - IXAPO *xapo; - - hr = CoCreateInstance(&CLSID_AudioVolumeMeter27, NULL, - CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&vumeter); - ok(hr == S_OK, "CoCreateInstance(AudioVolumeMeter) failed: %08x\n", hr); - - hr = IUnknown_QueryInterface(vumeter, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - }else{ - IXAPO *xapo; - - hr = pCreateAudioVolumeMeter(&vumeter); - ok(hr == S_OK, "CreateAudioVolumeMeter failed: %08x\n", hr); - - hr = IUnknown_QueryInterface(vumeter, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - } - - effect.InitialState = TRUE; - effect.OutputChannels = 2; - effect.pEffect = vumeter; - - chain.EffectCount = 1; - chain.pEffectDescriptors = &effect; - - hr = IXAudio2MasteringVoice_SetEffectChain(master, &chain); - ok(hr == S_OK, "SetEffectchain failed: %08x\n", hr); - - IUnknown_Release(vumeter); - - while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); - if(state.SamplesPlayed >= 22050) - break; - Sleep(100); - } - - ok(state.SamplesPlayed == 22050, "Got wrong samples played\n"); - - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); - HeapFree(GetProcessHeap(), 0, (void*)buf2.pAudioData); - - if(xaudio27){ - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src2); - }else{ - IXAudio2SourceVoice_DestroyVoice(src); - IXAudio2SourceVoice_DestroyVoice(src2); - } - IXAudio2MasteringVoice_DestroyVoice(master); - - XA2CALL_V(UnregisterForCallbacks, &ecb); -} - -static void WINAPI vcb_buf_OnVoiceProcessingPassStart(IXAudio2VoiceCallback *This, - UINT32 BytesRequired) -{ -} - -static void WINAPI vcb_buf_OnVoiceProcessingPassEnd(IXAudio2VoiceCallback *This) -{ -} - -static void WINAPI vcb_buf_OnStreamEnd(IXAudio2VoiceCallback *This) -{ - ok(0, "Unexpected OnStreamEnd\n"); -} - -struct vcb_buf_testdata { - int idx; - IXAudio2SourceVoice *src; -}; - -static int obs_calls = 0; -static int obe_calls = 0; - -static void WINAPI vcb_buf_OnBufferStart(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - struct vcb_buf_testdata *data = pBufferContext; - XAUDIO2_VOICE_STATE state; - - ok(data->idx == obs_calls, "Buffer callback out of order: %u\n", data->idx); - - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)data->src, &state); - else - IXAudio2SourceVoice_GetState(data->src, &state, 0); - - ok(state.BuffersQueued == 5 - obs_calls, "Got wrong number of buffers remaining: %u\n", state.BuffersQueued); - ok(state.pCurrentBufferContext == pBufferContext, "Got wrong buffer from GetState\n"); - - ++obs_calls; -} - -static void WINAPI vcb_buf_OnBufferEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - struct vcb_buf_testdata *data = pBufferContext; - XAUDIO2_VOICE_STATE state; - - ok(data->idx == obe_calls, "Buffer callback out of order: %u\n", data->idx); - - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)data->src, &state); - else - IXAudio2SourceVoice_GetState(data->src, &state, 0); - - ok(state.BuffersQueued == 5 - obe_calls - 1, "Got wrong number of buffers remaining: %u\n", state.BuffersQueued); - if(state.BuffersQueued == 0) - ok(state.pCurrentBufferContext == NULL, "Got wrong buffer from GetState: %p\n", state.pCurrentBufferContext); - else - ok(state.pCurrentBufferContext == data + 1, "Got wrong buffer from GetState: %p\n", state.pCurrentBufferContext); - - ++obe_calls; -} - -static void WINAPI vcb_buf_OnLoopEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - ok(0, "Unexpected OnLoopEnd\n"); -} - -static void WINAPI vcb_buf_OnVoiceError(IXAudio2VoiceCallback *This, - void *pBuffercontext, HRESULT Error) -{ - ok(0, "Unexpected OnVoiceError\n"); -} - -static const IXAudio2VoiceCallbackVtbl vcb_buf_vtbl = { - vcb_buf_OnVoiceProcessingPassStart, - vcb_buf_OnVoiceProcessingPassEnd, - vcb_buf_OnStreamEnd, - vcb_buf_OnBufferStart, - vcb_buf_OnBufferEnd, - vcb_buf_OnLoopEnd, - vcb_buf_OnVoiceError -}; - -static IXAudio2VoiceCallback vcb_buf = { &vcb_buf_vtbl }; - -static int nloopends = 0; -static int nstreamends = 0; - -static void WINAPI loop_buf_OnStreamEnd(IXAudio2VoiceCallback *This) -{ - ++nstreamends; -} - -static void WINAPI loop_buf_OnBufferStart(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ -} - -static void WINAPI loop_buf_OnBufferEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ -} - -static void WINAPI loop_buf_OnLoopEnd(IXAudio2VoiceCallback *This, - void *pBufferContext) -{ - ++nloopends; -} - -static void WINAPI loop_buf_OnVoiceError(IXAudio2VoiceCallback *This, - void *pBuffercontext, HRESULT Error) -{ -} - -static const IXAudio2VoiceCallbackVtbl loop_buf_vtbl = { - vcb_buf_OnVoiceProcessingPassStart, - vcb_buf_OnVoiceProcessingPassEnd, - loop_buf_OnStreamEnd, - loop_buf_OnBufferStart, - loop_buf_OnBufferEnd, - loop_buf_OnLoopEnd, - loop_buf_OnVoiceError -}; - -static IXAudio2VoiceCallback loop_buf = { &loop_buf_vtbl }; - -static void test_buffer_callbacks(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SourceVoice *src; - WAVEFORMATEX fmt; - XAUDIO2_BUFFER buf; - XAUDIO2_VOICE_STATE state; - struct vcb_buf_testdata testdata[5]; - int i, timeout; - - obs_calls = 0; - obe_calls = 0; - - XA2CALL_0V(StopEngine); - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - /* test OnBufferStart/End callbacks */ - fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt.nChannels = 2; - fmt.nSamplesPerSec = 44100; - fmt.wBitsPerSample = 32; - fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &vcb_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - memset(&buf, 0, sizeof(buf)); - buf.AudioBytes = 4410 * fmt.nBlockAlign; - buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); - fill_buf((float*)buf.pAudioData, &fmt, 440, 4410); - - /* submit same buffer fragment 5 times */ - for(i = 0; i < 5; ++i){ - testdata[i].idx = i; - testdata[i].src = src; - buf.pContext = &testdata[i]; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - } - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - - XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); - - if(xaudio27){ - hr = IXAudio27SourceVoice_SetSourceSampleRate((IXAudio27SourceVoice*)src, 48000); - todo_wine ok(hr == S_OK, "SetSourceSampleRate failed: %08x\n", hr); - }else{ - hr = IXAudio2SourceVoice_SetSourceSampleRate(src, 48000); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetSourceSampleRate should have failed: %08x\n", hr); - } - - while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); - if(state.SamplesPlayed >= 4410 * 5) - break; - Sleep(100); - } - - ok(state.SamplesPlayed == 4410 * 5, "Got wrong samples played\n"); - - if(xaudio27) - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); - else - IXAudio2SourceVoice_DestroyVoice(src); - - - /* test OnStreamEnd callback */ - XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - buf.Flags = XAUDIO2_END_OF_STREAM; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - timeout = 0; - while(nstreamends == 0 && timeout < 1000){ - Sleep(100); - timeout += 100; - } - - ok(nstreamends == 1, "Got wrong number of OnStreamEnd calls: %u\n", nstreamends); - - /* xaudio resets SamplesPlayed after processing an end-of-stream buffer */ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); - ok(state.SamplesPlayed == 0, "Got wrong samples played\n"); - - if(xaudio27) - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); - else - IXAudio2SourceVoice_DestroyVoice(src); - - - IXAudio2MasteringVoice_DestroyVoice(master); - - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); -} - -static UINT32 play_to_completion(IXAudio2SourceVoice *src, UINT32 max_samples) -{ - XAUDIO2_VOICE_STATE state; - HRESULT hr; - - nloopends = 0; - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); - if(state.BuffersQueued == 0) - break; - if(state.SamplesPlayed >= max_samples){ - if(xaudio27) - IXAudio27SourceVoice_ExitLoop((IXAudio27SourceVoice*)src, XAUDIO2_COMMIT_NOW); - else - IXAudio2SourceVoice_ExitLoop(src, XAUDIO2_COMMIT_NOW); - } - Sleep(100); - } - - hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - return state.SamplesPlayed; -} - -static void test_looping(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SourceVoice *src; - WAVEFORMATEX fmt; - XAUDIO2_BUFFER buf; - UINT32 played, running_total = 0; - - XA2CALL_0V(StopEngine); - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - - fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt.nChannels = 2; - fmt.nSamplesPerSec = 44100; - fmt.wBitsPerSample = 32; - fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, &loop_buf, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - memset(&buf, 0, sizeof(buf)); - - buf.AudioBytes = 44100 * fmt.nBlockAlign; - buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); - fill_buf((float*)buf.pAudioData, &fmt, 440, 44100); - - XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); - - /* play from middle to end */ - buf.PlayBegin = 22050; - buf.PlayLength = 0; - buf.LoopBegin = 0; - buf.LoopLength = 0; - buf.LoopCount = 0; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 22050, "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 0, "Got wrong OnLoopEnd calls: %u\n", nloopends); - - /* play 4410 samples from middle */ - buf.PlayBegin = 22050; - buf.PlayLength = 4410; - buf.LoopBegin = 0; - buf.LoopLength = 0; - buf.LoopCount = 0; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 4410, "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 0, "Got wrong OnLoopEnd calls: %u\n", nloopends); - - /* loop 4410 samples in middle */ - buf.PlayBegin = 0; - buf.PlayLength = 0; - buf.LoopBegin = 22050; - buf.LoopLength = 4410; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 44100 + 4410, "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); - - /* play last half, then loop the whole buffer */ - buf.PlayBegin = 22050; - buf.PlayLength = 0; - buf.LoopBegin = 0; - buf.LoopLength = 0; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 22050 + 44100, "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); - - /* play short segment from middle, loop to the beginning, and end at PlayEnd */ - buf.PlayBegin = 22050; - buf.PlayLength = 4410; - buf.LoopBegin = 0; - buf.LoopLength = 0; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 4410 + (22050 + 4410), "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); - - /* invalid: LoopEnd must be <= PlayEnd - * xaudio27: play until LoopEnd, loop to beginning, play until PlayEnd */ - buf.PlayBegin = 22050; - buf.PlayLength = 4410; - buf.LoopBegin = 0; - buf.LoopLength = 22050 + 4410 * 2; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - if(xaudio27){ - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 4410 + (22050 + 4410 * 2), "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); - }else - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); - - /* invalid: LoopEnd must be within play range - * xaudio27: plays only play range */ - buf.PlayBegin = 22050; - buf.PlayLength = 0; /* == until end of buffer */ - buf.LoopBegin = 0; - buf.LoopLength = 22050; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - if(xaudio27){ - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, -1); - ok(played - running_total == 22050, "Got wrong samples played: %u\n", played - running_total); - running_total = played; - ok(nloopends == 0, "Got wrong OnLoopEnd calls: %u\n", nloopends); - }else - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); - - /* invalid: LoopBegin must be before PlayEnd - * xaudio27: crashes */ - if(!xaudio27){ - buf.PlayBegin = 0; - buf.PlayLength = 4410; - buf.LoopBegin = 22050; - buf.LoopLength = 4410; - buf.LoopCount = 1; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == XAUDIO2_E_INVALID_CALL, "SubmitSourceBuffer should have failed: %08x\n", hr); - } - - /* infinite looping buffer */ - buf.PlayBegin = 22050; - buf.PlayLength = 0; - buf.LoopBegin = 0; - buf.LoopLength = 0; - buf.LoopCount = 255; - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - played = play_to_completion(src, running_total + 88200); - ok(played - running_total == 22050 + 44100 * 2, "Got wrong samples played: %u\n", played - running_total); - ok(nloopends == (played - running_total) / 88200 + 1, "Got wrong OnLoopEnd calls: %u\n", nloopends); - running_total = played; - - if(xaudio27) - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); - else - IXAudio2SourceVoice_DestroyVoice(src); - IXAudio2MasteringVoice_DestroyVoice(master); - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); -} - -static void test_submix(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SubmixVoice *sub; - - XA2CALL_0V(StopEngine); - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - XA2CALL(CreateSubmixVoice, &sub, 2, 44100, 0, 0, NULL, NULL); - ok(hr == S_OK, "CreateSubmixVoice failed: %08x\n", hr); - - if(xaudio27){ - XAUDIO27_VOICE_DETAILS details; - IXAudio27SubmixVoice_GetVoiceDetails((IXAudio27SubmixVoice*)sub, &details); - ok(details.CreationFlags == 0, "Got wrong flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - }else{ - XAUDIO2_VOICE_DETAILS details; - IXAudio2SubmixVoice_GetVoiceDetails(sub, &details); - ok(details.CreationFlags == 0, "Got wrong creation flags: 0x%x\n", details.CreationFlags); - ok(details.ActiveFlags == 0, "Got wrong active flags: 0x%x\n", details.CreationFlags); - ok(details.InputChannels == 2, "Got wrong channel count: 0x%x\n", details.InputChannels); - ok(details.InputSampleRate == 44100, "Got wrong sample rate: 0x%x\n", details.InputSampleRate); - } - - IXAudio2SubmixVoice_DestroyVoice(sub); - IXAudio2MasteringVoice_DestroyVoice(master); -} - -static void test_flush(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SourceVoice *src; - WAVEFORMATEX fmt; - XAUDIO2_BUFFER buf; - XAUDIO2_VOICE_STATE state; - - XA2CALL_0V(StopEngine); - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 2, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - fmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt.nChannels = 2; - fmt.nSamplesPerSec = 44100; - fmt.wBitsPerSample = 32; - fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; - fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; - fmt.cbSize = 0; - - XA2CALL(CreateSourceVoice, &src, &fmt, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - memset(&buf, 0, sizeof(buf)); - buf.AudioBytes = 22050 * fmt.nBlockAlign; - buf.pAudioData = HeapAlloc(GetProcessHeap(), 0, buf.AudioBytes); - fill_buf((float*)buf.pAudioData, &fmt, 440, 22050); - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - XA2CALL_0(StartEngine); - ok(hr == S_OK, "StartEngine failed: %08x\n", hr); - - while(1){ - if(xaudio27) - IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); - else - IXAudio2SourceVoice_GetState(src, &state, 0); - if(state.SamplesPlayed >= 2205) - break; - Sleep(10); - } - - hr = IXAudio2SourceVoice_Stop(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Stop failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_FlushSourceBuffers(src); - ok(hr == S_OK, "FlushSourceBuffers failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_Start(src, 0, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "Start failed: %08x\n", hr); - - Sleep(100); - - hr = IXAudio2SourceVoice_SubmitSourceBuffer(src, &buf, NULL); - ok(hr == S_OK, "SubmitSourceBuffer failed: %08x\n", hr); - - if(xaudio27){ - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src); - }else{ - IXAudio2SourceVoice_DestroyVoice(src); - } - IXAudio2MasteringVoice_DestroyVoice(master); - - HeapFree(GetProcessHeap(), 0, (void*)buf.pAudioData); -} - -static UINT32 test_DeviceDetails(IXAudio27 *xa) -{ - HRESULT hr; - XAUDIO2_DEVICE_DETAILS dd; - UINT32 count, i; - - hr = IXAudio27_GetDeviceCount(xa, &count); - ok(hr == S_OK, "GetDeviceCount failed: %08x\n", hr); - - if(count == 0) - return 0; - - for(i = 0; i < count; ++i){ - hr = IXAudio27_GetDeviceDetails(xa, i, &dd); - ok(hr == S_OK, "GetDeviceDetails failed: %08x\n", hr); - - if(i == 0) - ok(dd.Role == GlobalDefaultDevice, "Got wrong role for index 0: 0x%x\n", dd.Role); - else - ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); - } - - return count; -} - static void test_xapo_creation_legacy(const char *module, unsigned int version) { HANDLE xapofxdll; @@ -952,19 +43,16 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**) = NULL; /* CLSIDs are the same across all versions */ - static struct { - const GUID *clsid; - BOOL todo; - } const_clsids[] = { - { &CLSID_FXEQ27, FALSE }, - { &CLSID_FXMasteringLimiter27, TRUE }, - { &CLSID_FXReverb27, FALSE }, - { &CLSID_FXEcho27, TRUE}, + static const GUID *const_clsids[] = { + &CLSID_FXEQ27, + &CLSID_FXMasteringLimiter27, + &CLSID_FXReverb27, + &CLSID_FXEcho27, /* older versions of xapofx actually have support for new clsids */ - { &CLSID_FXEQ, FALSE }, - { &CLSID_FXMasteringLimiter, TRUE }, - { &CLSID_FXReverb, FALSE }, - { &CLSID_FXEcho, TRUE} + &CLSID_FXEQ, + &CLSID_FXMasteringLimiter, + &CLSID_FXReverb, + &CLSID_FXEcho }; /* different CLSID for each version */ @@ -1005,9 +93,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) if(pCreateFX){ for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i].clsid, &fx_unk); - todo_wine_if(const_clsids[i].todo) - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + hr = pCreateFX(const_clsids[i], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); @@ -1017,7 +104,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); } - hr = CoCreateInstance(const_clsids[i].clsid, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); if(SUCCEEDED(hr)) @@ -1062,18 +149,15 @@ static void test_xapo_creation_modern(const char *module) HRESULT (WINAPI *pCAR)(IUnknown**) = NULL; /* CLSIDs are the same across all versions */ - static struct { - const GUID *clsid; - BOOL todo; - } const_clsids[] = { - { &CLSID_FXEQ27, FALSE }, - { &CLSID_FXMasteringLimiter27, TRUE }, - { &CLSID_FXReverb27, FALSE }, - { &CLSID_FXEcho27, TRUE}, - { &CLSID_FXEQ, FALSE }, - { &CLSID_FXMasteringLimiter, TRUE }, - { &CLSID_FXReverb, FALSE }, - { &CLSID_FXEcho, TRUE} + static const GUID *const_clsids[] = { + &CLSID_FXEQ27, + &CLSID_FXMasteringLimiter27, + &CLSID_FXReverb27, + &CLSID_FXEcho27, + &CLSID_FXEQ, + &CLSID_FXMasteringLimiter, + &CLSID_FXReverb, + &CLSID_FXEcho }; xaudio2dll = LoadLibraryA(module); @@ -1091,9 +175,8 @@ static void test_xapo_creation_modern(const char *module) if(pCreateFX){ for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i].clsid, &fx_unk, NULL, 0); - todo_wine_if(const_clsids[i].todo) - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i].clsid), hr); + hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); @@ -1103,7 +186,7 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - hr = CoCreateInstance(const_clsids[i].clsid, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&fx_unk); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); if(SUCCEEDED(hr)) @@ -1165,97 +248,12 @@ static void test_xapo_creation(void) test_xapo_creation_modern("xaudio2_8.dll"); } -static void test_setchannelvolumes(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - IXAudio2SourceVoice *src_2ch, *src_8ch; - WAVEFORMATEX fmt_2ch, fmt_8ch; - float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; - - if(xaudio27) - hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); - else - hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); - - fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt_2ch.nChannels = 2; - fmt_2ch.nSamplesPerSec = 44100; - fmt_2ch.wBitsPerSample = 32; - fmt_2ch.nBlockAlign = fmt_2ch.nChannels * fmt_2ch.wBitsPerSample / 8; - fmt_2ch.nAvgBytesPerSec = fmt_2ch.nSamplesPerSec * fmt_2ch.nBlockAlign; - fmt_2ch.cbSize = 0; - - fmt_8ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - fmt_8ch.nChannels = 8; - fmt_8ch.nSamplesPerSec = 44100; - fmt_8ch.wBitsPerSample = 32; - fmt_8ch.nBlockAlign = fmt_8ch.nChannels * fmt_8ch.wBitsPerSample / 8; - fmt_8ch.nAvgBytesPerSec = fmt_8ch.nSamplesPerSec * fmt_8ch.nBlockAlign; - fmt_8ch.cbSize = 0; - - XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); - ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); - - if(xaudio27){ - /* XAudio 2.7 doesn't check the number of channels */ - hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); - }else{ - /* the number of channels must be the same as the number of channels on the source voice */ - hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); - - hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 8, volumes, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); - - /* volumes must not be NULL, XAudio 2.7 doesn't check this */ - hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); - ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); - } - - if(xaudio27){ - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_2ch); - IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_8ch); - }else{ - IXAudio2SourceVoice_DestroyVoice(src_2ch); - IXAudio2SourceVoice_DestroyVoice(src_8ch); - } - - IXAudio2MasteringVoice_DestroyVoice(master); -} - -static UINT32 check_has_devices(IXAudio2 *xa) -{ - HRESULT hr; - IXAudio2MasteringVoice *master; - - hr = IXAudio2_CreateMasteringVoice(xa, &master, 2, 44100, 0, NULL, NULL, AudioCategory_GameEffects); - if(hr != S_OK) - return 0; - - IXAudio2MasteringVoice_DestroyVoice(master); - - return 1; -} - START_TEST(xaudio2) { HRESULT hr; IXAudio27 *xa27 = NULL; IXAudio2 *xa = NULL; HANDLE xa28dll; - UINT32 has_devices; CoInitialize(NULL); @@ -1276,20 +274,6 @@ START_TEST(xaudio2) hr = IXAudio27_QueryInterface(xa27, &IID_IXAudio28, (void**) &xa); ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n"); - hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); - - has_devices = test_DeviceDetails(xa27); - if(has_devices){ - test_simple_streaming((IXAudio2*)xa27); - test_buffer_callbacks((IXAudio2*)xa27); - test_looping((IXAudio2*)xa27); - test_submix((IXAudio2*)xa27); - test_flush((IXAudio2*)xa27); - test_setchannelvolumes((IXAudio2*)xa27); - }else - skip("No audio devices available\n"); - IXAudio27_Release(xa27); }else win_skip("XAudio 2.7 not available\n"); @@ -1304,17 +288,6 @@ START_TEST(xaudio2) hr = IXAudio2_QueryInterface(xa, &IID_IXAudio27, (void**)&xa27); ok(hr == E_NOINTERFACE, "XA28 object should support IXAudio27, gave: %08x\n", hr); - has_devices = check_has_devices(xa); - if(has_devices){ - test_simple_streaming(xa); - test_buffer_callbacks(xa); - test_looping(xa); - test_submix(xa); - test_flush(xa); - test_setchannelvolumes(xa); - }else - skip("No audio devices available\n"); - IXAudio2_Release(xa); }else win_skip("XAudio 2.8 not available\n"); diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 58f7062ad6..ee3367e092 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2016 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,11 +19,14 @@ #include <stdarg.h> -#include "xaudio_private.h" +#include "windef.h" +#include "winbase.h" #include "x3daudio.h" #include "wine/debug.h" +#include <F3DAudio.h> + #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif @@ -34,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; @@ -48,7 +50,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { - FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); + F3DAudioInitialize(chanmask, speedofsound, handle); return S_OK; } #endif /* XAUDIO2_VER >= 8 */ @@ -57,7 +60,8 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) { - FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); + F3DAudioInitialize(chanmask, speedofsound, handle); } #endif /* X3DAUDIO1_VER */ @@ -66,19 +70,13 @@ void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) { - static int once = 0; - if(!once){ - FIXME("%p %p %p 0x%x %p: Stub!\n", handle, listener, emitter, flags, out); - ++once; - } - - out->LPFDirectCoefficient = 0; - out->LPFReverbCoefficient = 0; - out->ReverbLevel = 0; - out->DopplerFactor = 1; - out->EmitterToListenerAngle = 0; - out->EmitterToListenerDistance = 0; - out->EmitterVelocityComponent = 0; - out->ListenerVelocityComponent = 0; + TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out); + F3DAudioCalculate( + handle, + (const F3DAUDIO_LISTENER*) listener, + (const F3DAUDIO_EMITTER*) emitter, + flags, + (F3DAUDIO_DSP_SETTINGS*) out + ); } #endif /* XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER */ diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c new file mode 100644 index 0000000000..ccad417ea5 --- /dev/null +++ b/dlls/xaudio2_7/xapo.c @@ -0,0 +1,405 @@ +/* + * Copyright (c) 2015 Mark Harmstone + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "xaudio_private.h" +#include "xaudio2fx.h" +#include "xapofx.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +#include <FAPO.h> +#include <FAPOFX.h> +#include <FAudioFX.h> + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); + +static XA2XAPOFXImpl *impl_from_IXAPO(IXAPO *iface) +{ + return CONTAINING_RECORD(iface, XA2XAPOFXImpl, IXAPO_iface); +} + +static XA2XAPOFXImpl *impl_from_IXAPOParameters(IXAPOParameters *iface) +{ + return CONTAINING_RECORD(iface, XA2XAPOFXImpl, IXAPOParameters_iface); +} + +static HRESULT WINAPI XAPOFX_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + + TRACE("%p, %s, %p\n", This, wine_dbgstr_guid(riid), ppvObject); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXAPO) || + IsEqualGUID(riid, &IID_IXAPO27)) + *ppvObject = &This->IXAPO_iface; + else if(IsEqualGUID(riid, &IID_IXAPOParameters) || + IsEqualGUID(riid, &IID_IXAPO27Parameters)) + *ppvObject = &This->IXAPOParameters_iface; + else + *ppvObject = NULL; + + if(*ppvObject){ + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI XAPOFX_AddRef(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + ULONG ref = This->fapo->AddRef(This->fapo); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + return ref; +} + +static ULONG WINAPI XAPOFX_Release(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + ULONG ref = This->fapo->Release(This->fapo); + + TRACE("(%p)->(): Refcount now %u\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI XAPOFX_GetRegistrationProperties(IXAPO *iface, + XAPO_REGISTRATION_PROPERTIES **props) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + HRESULT hr; + FAPORegistrationProperties *fprops; + + TRACE("%p, %p\n", This, props); + + hr = This->fapo->GetRegistrationProperties(This->fapo, &fprops); + if(FAILED(hr)) + return hr; + + /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ + *props = (XAPO_REGISTRATION_PROPERTIES*) fprops; + return hr; +} + +static HRESULT WINAPI XAPOFX_IsInputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, + WAVEFORMATEX **supported_fmt) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); + return This->fapo->IsInputFormatSupported(This->fapo, + (const FAudioWaveFormatEx *)output_fmt, + (const FAudioWaveFormatEx *)input_fmt, + (FAudioWaveFormatEx **)supported_fmt); +} + +static HRESULT WINAPI XAPOFX_IsOutputFormatSupported(IXAPO *iface, + const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, + WAVEFORMATEX **supported_fmt) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); + return This->fapo->IsOutputFormatSupported(This->fapo, + (const FAudioWaveFormatEx *)input_fmt, + (const FAudioWaveFormatEx *)output_fmt, + (FAudioWaveFormatEx **)supported_fmt); +} + +static HRESULT WINAPI XAPOFX_Initialize(IXAPO *iface, const void *data, + UINT32 data_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %p, %u\n", This, data, data_len); + return This->fapo->Initialize(This->fapo, data, data_len); +} + +static void WINAPI XAPOFX_Reset(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p\n", This); + This->fapo->Reset(This->fapo); +} + +static HRESULT WINAPI XAPOFX_LockForProcess(IXAPO *iface, UINT32 in_params_count, + const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, + const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, + out_params_count, out_params); + return This->fapo->LockForProcess(This->fapo, + in_params_count, + (const FAPOLockForProcessBufferParameters *)in_params, + out_params_count, + (const FAPOLockForProcessBufferParameters *)out_params); +} + +static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p\n", This); + This->fapo->UnlockForProcess(This->fapo); +} + +static void WINAPI XAPOFX_Process(IXAPO *iface, UINT32 in_params_count, + const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, + UINT32 out_params_count, + const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, + out_params_count, out_params, enabled); + This->fapo->Process(This->fapo, in_params_count, + (const FAPOProcessBufferParameters *)in_params, out_params_count, + (FAPOProcessBufferParameters *)out_params, enabled); +} + +static UINT32 WINAPI XAPOFX_CalcInputFrames(IXAPO *iface, UINT32 output_frames) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u\n", This, output_frames); + return 0; +} + +static UINT32 WINAPI XAPOFX_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) +{ + XA2XAPOFXImpl *This = impl_from_IXAPO(iface); + TRACE("%p, %u\n", This, input_frames); + return 0; +} + +static const IXAPOVtbl XAPOFX_Vtbl = { + XAPOFX_QueryInterface, + XAPOFX_AddRef, + XAPOFX_Release, + XAPOFX_GetRegistrationProperties, + XAPOFX_IsInputFormatSupported, + XAPOFX_IsOutputFormatSupported, + XAPOFX_Initialize, + XAPOFX_Reset, + XAPOFX_LockForProcess, + XAPOFX_UnlockForProcess, + XAPOFX_Process, + XAPOFX_CalcInputFrames, + XAPOFX_CalcOutputFrames +}; + +static HRESULT WINAPI XAPOFXParams_QueryInterface(IXAPOParameters *iface, + REFIID riid, void **ppvObject) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_QueryInterface(&This->IXAPO_iface, riid, ppvObject); +} + +static ULONG WINAPI XAPOFXParams_AddRef(IXAPOParameters *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_AddRef(&This->IXAPO_iface); +} + +static ULONG WINAPI XAPOFXParams_Release(IXAPOParameters *iface) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + return XAPOFX_Release(&This->IXAPO_iface); +} + +static void WINAPI XAPOFXParams_SetParameters(IXAPOParameters *iface, + const void *params, UINT32 params_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); + This->fapo->SetParameters(This->fapo, params, params_len); +} + +static void WINAPI XAPOFXParams_GetParameters(IXAPOParameters *iface, void *params, + UINT32 params_len) +{ + XA2XAPOFXImpl *This = impl_from_IXAPOParameters(iface); + TRACE("%p, %p, %u\n", This, params, params_len); + This->fapo->GetParameters(This->fapo, params, params_len); +} + +static const IXAPOParametersVtbl XAPOFXParameters_Vtbl = { + XAPOFXParams_QueryInterface, + XAPOFXParams_AddRef, + XAPOFXParams_Release, + XAPOFXParams_SetParameters, + XAPOFXParams_GetParameters +}; + +struct xapo_cf { + IClassFactory IClassFactory_iface; + LONG ref; + const CLSID *class; +}; + +static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); +} + +static HRESULT WINAPI xapocf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + if(IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = iface; + return S_OK; + } + + *ppobj = NULL; + WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI xapocf_AddRef(IClassFactory *iface) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + return ref; +} + +static ULONG WINAPI xapocf_Release(IClassFactory *iface) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(): Refcount now %u\n", This, ref); + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) +{ +#ifndef XAPOFX1_VER + if(IsEqualGUID(clsid, &CLSID_AudioVolumeMeter27)) + return FAudioCreateVolumeMeterWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverbWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif +#if XAUDIO2_VER >= 8 || defined XAPOFX1_VER + if(IsEqualGUID(clsid, &CLSID_FXReverb) || + IsEqualGUID(clsid, &CLSID_FXEQ) || + IsEqualGUID(clsid, &CLSID_FXEcho) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + return FAPOFX_CreateFXWithCustomAllocatorEXT( + (const FAudioGUID*) clsid, + fapo, + NULL, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif + ERR("Invalid XAPO CLSID!"); + return E_INVALIDARG; +} + +static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + HRESULT hr; + XA2XAPOFXImpl *object; + + TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + if(pOuter) + return CLASS_E_NOAGGREGATION; + + object = heap_alloc(sizeof(*object)); + object->IXAPO_iface.lpVtbl = &XAPOFX_Vtbl; + object->IXAPOParameters_iface.lpVtbl = &XAPOFXParameters_Vtbl; + + hr = get_fapo_from_clsid(This->class, &object->fapo); + + if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); + if(FAILED(hr)){ + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) +{ + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl xapo_Vtbl = +{ + xapocf_QueryInterface, + xapocf_AddRef, + xapocf_Release, + xapocf_CreateInstance, + xapocf_LockServer +}; + +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) +{ + HRESULT hr; + struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); + ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; + ret->class = clsid; + ret->ref = 0; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; +} diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index e450851b25..100ba02d3b 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,13 +24,17 @@ #define NONAMELESSUNION #define COBJMACROS +#ifdef XAPOFX1_VER #include "initguid.h" +#endif /* XAPOFX1_VER */ #include "xaudio_private.h" #include "xapofx.h" #include "wine/debug.h" +#if XAUDIO2_VER >= 8 || defined XAPOFX1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); +#endif #ifdef XAPOFX1_VER BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) @@ -38,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); break; @@ -48,779 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) } #endif /* XAPOFX1_VER */ -typedef struct _VUMeterImpl { - IXAPO IXAPO_iface; - IXAPOParameters IXAPOParameters_iface; - - LONG ref; -} VUMeterImpl; - -static VUMeterImpl *VUMeterImpl_from_IXAPO(IXAPO *iface) -{ - return CONTAINING_RECORD(iface, VUMeterImpl, IXAPO_iface); -} - -static VUMeterImpl *VUMeterImpl_from_IXAPOParameters(IXAPOParameters *iface) -{ - return CONTAINING_RECORD(iface, VUMeterImpl, IXAPOParameters_iface); -} - -static HRESULT WINAPI VUMXAPO_QueryInterface(IXAPO *iface, REFIID riid, - void **ppvObject) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - - TRACE("%p, %s, %p\n", This, wine_dbgstr_guid(riid), ppvObject); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IXAPO) || - IsEqualGUID(riid, &IID_IXAPO27)) - *ppvObject = &This->IXAPO_iface; - else if(IsEqualGUID(riid, &IID_IXAPOParameters)) - *ppvObject = &This->IXAPOParameters_iface; - else - *ppvObject = NULL; - - if(*ppvObject){ - IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI VUMXAPO_AddRef(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI VUMXAPO_Release(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(): Refcount now %u\n", This, ref); - - if(!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; -} - -static HRESULT WINAPI VUMXAPO_GetRegistrationProperties(IXAPO *iface, - XAPO_REGISTRATION_PROPERTIES **props) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p\n", This, props); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_IsInputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, - WAVEFORMATEX **supported_fmt) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_IsOutputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, - WAVEFORMATEX **supported_fmt) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI VUMXAPO_Initialize(IXAPO *iface, const void *data, - UINT32 data_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %p, %u\n", This, data, data_len); - return E_NOTIMPL; -} - -static void WINAPI VUMXAPO_Reset(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static HRESULT WINAPI VUMXAPO_LockForProcess(IXAPO *iface, - UINT32 in_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, - out_params_count, out_params); - return E_NOTIMPL; -} - -static void WINAPI VUMXAPO_UnlockForProcess(IXAPO *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static void WINAPI VUMXAPO_Process(IXAPO *iface, UINT32 in_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, - out_params_count, out_params, enabled); -} - -static UINT32 WINAPI VUMXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, output_frames); - return 0; -} - -static UINT32 WINAPI VUMXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, input_frames); - return 0; -} - -static const IXAPOVtbl VUMXAPO_Vtbl = { - VUMXAPO_QueryInterface, - VUMXAPO_AddRef, - VUMXAPO_Release, - VUMXAPO_GetRegistrationProperties, - VUMXAPO_IsInputFormatSupported, - VUMXAPO_IsOutputFormatSupported, - VUMXAPO_Initialize, - VUMXAPO_Reset, - VUMXAPO_LockForProcess, - VUMXAPO_UnlockForProcess, - VUMXAPO_Process, - VUMXAPO_CalcInputFrames, - VUMXAPO_CalcOutputFrames -}; - -static HRESULT WINAPI VUMXAPOParams_QueryInterface(IXAPOParameters *iface, - REFIID riid, void **ppvObject) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); -} - -static ULONG WINAPI VUMXAPOParams_AddRef(IXAPOParameters *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_AddRef(&This->IXAPO_iface); -} - -static ULONG WINAPI VUMXAPOParams_Release(IXAPOParameters *iface) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - return VUMXAPO_Release(&This->IXAPO_iface); -} - -static void WINAPI VUMXAPOParams_SetParameters(IXAPOParameters *iface, - const void *params, UINT32 params_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static void WINAPI VUMXAPOParams_GetParameters(IXAPOParameters *iface, - void *params, UINT32 params_len) -{ - VUMeterImpl *This = VUMeterImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static const IXAPOParametersVtbl VUMXAPOParameters_Vtbl = { - VUMXAPOParams_QueryInterface, - VUMXAPOParams_AddRef, - VUMXAPOParams_Release, - VUMXAPOParams_SetParameters, - VUMXAPOParams_GetParameters -}; - -typedef struct _ReverbImpl { - IXAPO IXAPO_iface; - IXAPOParameters IXAPOParameters_iface; - - LONG ref; -} ReverbImpl; - -static ReverbImpl *ReverbImpl_from_IXAPO(IXAPO *iface) -{ - return CONTAINING_RECORD(iface, ReverbImpl, IXAPO_iface); -} - -static ReverbImpl *ReverbImpl_from_IXAPOParameters(IXAPOParameters *iface) -{ - return CONTAINING_RECORD(iface, ReverbImpl, IXAPOParameters_iface); -} - -static HRESULT WINAPI RVBXAPO_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - - TRACE("%p, %s, %p\n", This, wine_dbgstr_guid(riid), ppvObject); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IXAPO) || - IsEqualGUID(riid, &IID_IXAPO27)) - *ppvObject = &This->IXAPO_iface; - else if(IsEqualGUID(riid, &IID_IXAPOParameters)) - *ppvObject = &This->IXAPOParameters_iface; - else - *ppvObject = NULL; - - if(*ppvObject){ - IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI RVBXAPO_AddRef(IXAPO *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI RVBXAPO_Release(IXAPO *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(): Refcount now %u\n", This, ref); - - if(!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; -} - -static HRESULT WINAPI RVBXAPO_GetRegistrationProperties(IXAPO *iface, - XAPO_REGISTRATION_PROPERTIES **props) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %p\n", This, props); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - return E_NOTIMPL; -} - -static HRESULT WINAPI RVBXAPO_IsInputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, - WAVEFORMATEX **supported_fmt) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI RVBXAPO_IsOutputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, - WAVEFORMATEX **supported_fmt) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI RVBXAPO_Initialize(IXAPO *iface, const void *data, - UINT32 data_len) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %p, %u\n", This, data, data_len); - return E_NOTIMPL; -} - -static void WINAPI RVBXAPO_Reset(IXAPO *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static HRESULT WINAPI RVBXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, - out_params_count, out_params); - return E_NOTIMPL; -} - -static void WINAPI RVBXAPO_UnlockForProcess(IXAPO *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static void WINAPI RVBXAPO_Process(IXAPO *iface, UINT32 in_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, - out_params_count, out_params, enabled); -} - -static UINT32 WINAPI RVBXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, output_frames); - return 0; -} - -static UINT32 WINAPI RVBXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) -{ - ReverbImpl *This = ReverbImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, input_frames); - return 0; -} - -static const IXAPOVtbl RVBXAPO_Vtbl = { - RVBXAPO_QueryInterface, - RVBXAPO_AddRef, - RVBXAPO_Release, - RVBXAPO_GetRegistrationProperties, - RVBXAPO_IsInputFormatSupported, - RVBXAPO_IsOutputFormatSupported, - RVBXAPO_Initialize, - RVBXAPO_Reset, - RVBXAPO_LockForProcess, - RVBXAPO_UnlockForProcess, - RVBXAPO_Process, - RVBXAPO_CalcInputFrames, - RVBXAPO_CalcOutputFrames -}; - -static HRESULT WINAPI RVBXAPOParams_QueryInterface(IXAPOParameters *iface, - REFIID riid, void **ppvObject) -{ - ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); - return RVBXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); -} - -static ULONG WINAPI RVBXAPOParams_AddRef(IXAPOParameters *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); - return RVBXAPO_AddRef(&This->IXAPO_iface); -} - -static ULONG WINAPI RVBXAPOParams_Release(IXAPOParameters *iface) -{ - ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); - return RVBXAPO_Release(&This->IXAPO_iface); -} - -static void WINAPI RVBXAPOParams_SetParameters(IXAPOParameters *iface, - const void *params, UINT32 params_len) -{ - ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static void WINAPI RVBXAPOParams_GetParameters(IXAPOParameters *iface, void *params, - UINT32 params_len) -{ - ReverbImpl *This = ReverbImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static const IXAPOParametersVtbl RVBXAPOParameters_Vtbl = { - RVBXAPOParams_QueryInterface, - RVBXAPOParams_AddRef, - RVBXAPOParams_Release, - RVBXAPOParams_SetParameters, - RVBXAPOParams_GetParameters -}; - -typedef struct _EQImpl { - IXAPO IXAPO_iface; - IXAPOParameters IXAPOParameters_iface; - - LONG ref; -} EQImpl; - -static EQImpl *EQImpl_from_IXAPO(IXAPO *iface) -{ - return CONTAINING_RECORD(iface, EQImpl, IXAPO_iface); -} - -static EQImpl *EQImpl_from_IXAPOParameters(IXAPOParameters *iface) -{ - return CONTAINING_RECORD(iface, EQImpl, IXAPOParameters_iface); -} - -static HRESULT WINAPI EQXAPO_QueryInterface(IXAPO *iface, REFIID riid, void **ppvObject) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - - TRACE("%p, %s, %p\n", This, wine_dbgstr_guid(riid), ppvObject); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IXAPO) || - IsEqualGUID(riid, &IID_IXAPO27)) - *ppvObject = &This->IXAPO_iface; - else if(IsEqualGUID(riid, &IID_IXAPOParameters)) - *ppvObject = &This->IXAPOParameters_iface; - else - *ppvObject = NULL; - - if(*ppvObject){ - IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI EQXAPO_AddRef(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI EQXAPO_Release(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(): Refcount now %u\n", This, ref); - - if(!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; -} - -static HRESULT WINAPI EQXAPO_GetRegistrationProperties(IXAPO *iface, - XAPO_REGISTRATION_PROPERTIES **props) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p\n", This, props); - /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_IsInputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *output_fmt, const WAVEFORMATEX *input_fmt, - WAVEFORMATEX **supported_fmt) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, output_fmt, input_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_IsOutputFormatSupported(IXAPO *iface, - const WAVEFORMATEX *input_fmt, const WAVEFORMATEX *output_fmt, - WAVEFORMATEX **supported_fmt) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %p, %p\n", This, input_fmt, output_fmt, supported_fmt); - return E_NOTIMPL; -} - -static HRESULT WINAPI EQXAPO_Initialize(IXAPO *iface, const void *data, - UINT32 data_len) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %p, %u\n", This, data, data_len); - return E_NOTIMPL; -} - -static void WINAPI EQXAPO_Reset(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static HRESULT WINAPI EQXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p\n", This, in_params_count, in_params, - out_params_count, out_params); - return E_NOTIMPL; -} - -static void WINAPI EQXAPO_UnlockForProcess(IXAPO *iface) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p\n", This); -} - -static void WINAPI EQXAPO_Process(IXAPO *iface, UINT32 in_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, - out_params_count, out_params, enabled); -} - -static UINT32 WINAPI EQXAPO_CalcInputFrames(IXAPO *iface, UINT32 output_frames) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, output_frames); - return 0; -} - -static UINT32 WINAPI EQXAPO_CalcOutputFrames(IXAPO *iface, UINT32 input_frames) -{ - EQImpl *This = EQImpl_from_IXAPO(iface); - TRACE("%p, %u\n", This, input_frames); - return 0; -} - -static const IXAPOVtbl EQXAPO_Vtbl = { - EQXAPO_QueryInterface, - EQXAPO_AddRef, - EQXAPO_Release, - EQXAPO_GetRegistrationProperties, - EQXAPO_IsInputFormatSupported, - EQXAPO_IsOutputFormatSupported, - EQXAPO_Initialize, - EQXAPO_Reset, - EQXAPO_LockForProcess, - EQXAPO_UnlockForProcess, - EQXAPO_Process, - EQXAPO_CalcInputFrames, - EQXAPO_CalcOutputFrames -}; - -static HRESULT WINAPI EQXAPOParams_QueryInterface(IXAPOParameters *iface, - REFIID riid, void **ppvObject) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_QueryInterface(&This->IXAPO_iface, riid, ppvObject); -} - -static ULONG WINAPI EQXAPOParams_AddRef(IXAPOParameters *iface) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_AddRef(&This->IXAPO_iface); -} - -static ULONG WINAPI EQXAPOParams_Release(IXAPOParameters *iface) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - return EQXAPO_Release(&This->IXAPO_iface); -} - -static void WINAPI EQXAPOParams_SetParameters(IXAPOParameters *iface, - const void *params, UINT32 params_len) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static void WINAPI EQXAPOParams_GetParameters(IXAPOParameters *iface, void *params, - UINT32 params_len) -{ - EQImpl *This = EQImpl_from_IXAPOParameters(iface); - TRACE("%p, %p, %u\n", This, params, params_len); -} - -static const IXAPOParametersVtbl EQXAPOParameters_Vtbl = { - EQXAPOParams_QueryInterface, - EQXAPOParams_AddRef, - EQXAPOParams_Release, - EQXAPOParams_SetParameters, - EQXAPOParams_GetParameters -}; - -struct xapo_cf { - IClassFactory IClassFactory_iface; - LONG ref; - const CLSID *class; -}; - -static struct xapo_cf *xapo_impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, struct xapo_cf, IClassFactory_iface); -} - -static HRESULT WINAPI xapocf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) -{ - if(IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) - { - IClassFactory_AddRef(iface); - *ppobj = iface; - return S_OK; - } - - *ppobj = NULL; - WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI xapocf_AddRef(IClassFactory *iface) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - return ref; -} - -static ULONG WINAPI xapocf_Release(IClassFactory *iface) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): Refcount now %u\n", This, ref); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - return ref; -} - -static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOuter, - REFIID riid, void **ppobj) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - HRESULT hr; - - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - - if(pOuter) - return CLASS_E_NOAGGREGATION; - - if(IsEqualGUID(This->class, &CLSID_AudioVolumeMeter27)){ - VUMeterImpl *object; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAPO_iface.lpVtbl = &VUMXAPO_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &VUMXAPOParameters_Vtbl; - - hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - }else if(IsEqualGUID(This->class, &CLSID_FXReverb)){ - ReverbImpl *object; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAPO_iface.lpVtbl = &RVBXAPO_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &RVBXAPOParameters_Vtbl; - - hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - }else if(IsEqualGUID(This->class, &CLSID_FXEQ)){ - EQImpl *object; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAPO_iface.lpVtbl = &EQXAPO_Vtbl; - object->IXAPOParameters_iface.lpVtbl = &EQXAPOParameters_Vtbl; - - hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - }else - /* TODO FXECHO, FXMasteringLimiter, */ - return E_INVALIDARG; - - return S_OK; -} - -static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) -{ - struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); - FIXME("(%p)->(%d): stub!\n", This, dolock); - return S_OK; -} - -static const IClassFactoryVtbl xapo_Vtbl = -{ - xapocf_QueryInterface, - xapocf_AddRef, - xapocf_Release, - xapocf_CreateInstance, - xapocf_LockServer -}; - -HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) -{ - HRESULT hr; - struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); - ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; - ret->class = clsid; - ret->ref = 0; - hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); - if(FAILED(hr)) - HeapFree(GetProcessHeap(), 0, ret); - return hr; -} - #if XAUDIO2_VER >= 8 -HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} - -HRESULT WINAPI CreateAudioReverb(IUnknown **out) -{ - IClassFactory *cf; - HRESULT hr; - - hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); - if(FAILED(hr)) - return hr; - - hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - - IClassFactory_Release(cf); - - return hr; -} - HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 initdata_bytes) { HRESULT hr; @@ -836,6 +67,12 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; + else if(IsEqualGUID(clsid, &CLSID_FXEcho27) || + IsEqualGUID(clsid, &CLSID_FXEcho)) + class = &CLSID_FXEcho; + else if(IsEqualGUID(clsid, &CLSID_FXMasteringLimiter27) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + class = &CLSID_FXMasteringLimiter; if(class){ hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); @@ -895,7 +132,12 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) else if(IsEqualGUID(clsid, &CLSID_FXEQ27) || IsEqualGUID(clsid, &CLSID_FXEQ)) class = &CLSID_FXEQ; - /* TODO FXECHO, FXMasteringLimiter, */ + else if(IsEqualGUID(clsid, &CLSID_FXEcho27) || + IsEqualGUID(clsid, &CLSID_FXEcho)) + class = &CLSID_FXEcho; + else if(IsEqualGUID(clsid, &CLSID_FXMasteringLimiter27) || + IsEqualGUID(clsid, &CLSID_FXMasteringLimiter)) + class = &CLSID_FXMasteringLimiter; if(class){ hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); diff --git a/dlls/xaudio2_7/xaudio_allocator.c b/dlls/xaudio2_7/xaudio_allocator.c new file mode 100644 index 0000000000..41be48a80f --- /dev/null +++ b/dlls/xaudio2_7/xaudio_allocator.c @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define COBJMACROS + +#include "ole2.h" + +void* XAudio_Internal_Malloc(size_t size) +{ + return CoTaskMemAlloc(size); +} + +void XAudio_Internal_Free(void* ptr) +{ + return CoTaskMemFree(ptr); +} + +void* XAudio_Internal_Realloc(void* ptr, size_t size) +{ + return CoTaskMemRealloc(ptr, size); +} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 64e350f8d4..17a59c35cc 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -41,13 +41,6 @@ coclass AudioVolumeMeter { interface IUnknown; } uuid(6a93130e-1d53-41d1-a9cf-e758800bb179) ] coclass AudioReverb { interface IUnknown; } - -[ - helpstring("XACT 31 Class"), - threading(both), - uuid(962f5027-99be-4692-a468-85802cf8de61) -] -coclass XACT31 { interface IUnknown; } #endif /* XAUDIO2_VER == 7 */ #if XAUDIO2_VER == 6 diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 0bbe943f15..f338b56dc9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2015 Mark Harmstone * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,38 +19,26 @@ */ #include "config.h" + #include <stdarg.h> #define NONAMELESSUNION #define COBJMACROS +#include "initguid.h" #include "xaudio_private.h" +#include "xaudio2fx.h" +#if XAUDIO2_VER >= 8 +#include "xapofx.h" +#endif #include "ole2.h" #include "rpcproxy.h" -#include "xapofx.h" - #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); -WINE_DECLARE_DEBUG_CHANNEL(winediag); - -static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); -static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); -static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); - -static HINSTANCE instance; - -#define IN_AL_PERIODS 4 - -#if XAUDIO2_VER == 0 -#define COMPAT_E_INVALID_CALL E_INVALIDARG -#define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED -#else -#define COMPAT_E_INVALID_CALL XAUDIO2_E_INVALID_CALL -#define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED -#endif #if XAUDIO2_VER != 0 && defined(__i386__) /* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ @@ -82,38 +71,9 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, "ret" ) #endif -static void dump_fmt(const WAVEFORMATEX *fmt) -{ - TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); - switch(fmt->wFormatTag){ -#define DOCASE(x) case x: TRACE(#x); break; - DOCASE(WAVE_FORMAT_PCM) - DOCASE(WAVE_FORMAT_IEEE_FLOAT) - DOCASE(WAVE_FORMAT_EXTENSIBLE) -#undef DOCASE - default: - TRACE("Unknown"); - break; - } - TRACE(")\n"); - - TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); - TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); - TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); - TRACE("cbSize: %u\n", fmt->cbSize); - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); - TRACE("Samples: %04x\n", fmtex->Samples.wReserved); - TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); - }else if(fmt->wFormatTag == WAVE_FORMAT_ADPCM){ - ADPCMWAVEFORMAT *fmtadpcm = (void*)fmt; - TRACE("wSamplesPerBlock: %u\n", fmtadpcm->wSamplesPerBlock); - } -} +static HINSTANCE instance; + +static XA2VoiceImpl *impl_from_IXAudio2Voice(IXAudio2Voice *iface); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) { @@ -124,20 +84,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - - if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback") || - !(palcLoopbackOpenDeviceSOFT = alcGetProcAddress(NULL, "alcLoopbackOpenDeviceSOFT")) || - !(palcRenderSamplesSOFT = alcGetProcAddress(NULL, "alcRenderSamplesSOFT"))){ - ERR("XAudio2 requires the ALC_SOFT_loopback extension (OpenAL-Soft >= 1.14)\n"); - return FALSE; - } - - if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || - !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ - ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); - return FALSE; - } - break; } return TRUE; @@ -160,250 +106,579 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources(instance); } -static XA2SourceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) +/* Effect Wrapping */ + +static inline XA2XAPOImpl *impl_from_FAPO(FAPO *iface) { - return CONTAINING_RECORD(iface, XA2SourceImpl, IXAudio2SourceVoice_iface); + return CONTAINING_RECORD(iface, XA2XAPOImpl, FAPO_vtbl); } -static XA2SubmixImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) +static int32_t FAPOCALL XAPO_AddRef(void *iface) { - return CONTAINING_RECORD(iface, XA2SubmixImpl, IXAudio2SubmixVoice_iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); } -static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) +static int32_t FAPOCALL XAPO_Release(void *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); + int32_t r; + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + r = InterlockedDecrement(&This->ref); + if(r == 0){ + IXAPO_Release(This->xapo); + if(This->xapo_params) + IXAPOParameters_Release(This->xapo_params); + heap_free(This); + } + return r; } -static IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) -{ - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); -} - -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); +static uint32_t FAPOCALL XAPO_GetRegistrationProperties(void *iface, + FAPORegistrationProperties **ppRegistrationProperties) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + XAPO_REGISTRATION_PROPERTIES *xprops; + HRESULT hr; + + TRACE("%p\n", This); + + hr = IXAPO_GetRegistrationProperties(This->xapo, &xprops); + if(FAILED(hr)) + return hr; + + /* TODO: check for version == 20 and use XAPO20_REGISTRATION_PROPERTIES */ + *ppRegistrationProperties = (FAPORegistrationProperties*) xprops; return 0; } -static void WINAPI XA2SRC_GetVoiceDetails(IXAudio2SourceVoice *iface, - XAUDIO2_VOICE_DETAILS *pVoiceDetails) +static uint32_t FAPOCALL XAPO_IsInputFormatSupported(void *iface, + const FAudioWaveFormatEx *pOutputFormat, const FAudioWaveFormatEx *pRequestedInputFormat, + FAudioWaveFormatEx **ppSupportedInputFormat) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_IsInputFormatSupported(This->xapo, (const WAVEFORMATEX*)pOutputFormat, + (const WAVEFORMATEX*)pRequestedInputFormat, (WAVEFORMATEX**)ppSupportedInputFormat); +} - TRACE("%p, %p\n", This, pVoiceDetails); +static uint32_t FAPOCALL XAPO_IsOutputFormatSupported(void *iface, + const FAudioWaveFormatEx *pInputFormat, const FAudioWaveFormatEx *pRequestedOutputFormat, + FAudioWaveFormatEx **ppSupportedOutputFormat) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_IsOutputFormatSupported(This->xapo, (const WAVEFORMATEX *)pInputFormat, + (const WAVEFORMATEX *)pRequestedOutputFormat, (WAVEFORMATEX**)ppSupportedOutputFormat); +} - pVoiceDetails->CreationFlags = 0; - pVoiceDetails->ActiveFlags = 0; - pVoiceDetails->InputChannels = This->fmt->nChannels; - pVoiceDetails->InputSampleRate = This->fmt->nSamplesPerSec; +static uint32_t FAPOCALL XAPO_Initialize(void *iface, const void *pData, + uint32_t DataByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_Initialize(This->xapo, pData, DataByteSize); } -static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, - const XAUDIO2_VOICE_SENDS *pSendList) +static void FAPOCALL XAPO_Reset(void *iface) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_Reset(This->xapo); +} + +static uint32_t FAPOCALL XAPO_LockForProcess(void *iface, + uint32_t InputLockedParameterCount, + const FAPOLockForProcessBufferParameters *pInputLockedParameters, + uint32_t OutputLockedParameterCount, + const FAPOLockForProcessBufferParameters *pOutputLockedParameters) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_LockForProcess(This->xapo, + InputLockedParameterCount, + (const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *)pInputLockedParameters, + OutputLockedParameterCount, + (const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *)pOutputLockedParameters); +} + +static void FAPOCALL XAPO_UnlockForProcess(void *iface) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_UnlockForProcess(This->xapo); +} + +static void FAPOCALL XAPO_Process(void *iface, + uint32_t InputProcessParameterCount, + const FAPOProcessBufferParameters* pInputProcessParameters, + uint32_t OutputProcessParameterCount, + FAPOProcessBufferParameters* pOutputProcessParameters, + int32_t IsEnabled) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + IXAPO_Process(This->xapo, InputProcessParameterCount, + (const XAPO_PROCESS_BUFFER_PARAMETERS *)pInputProcessParameters, + OutputProcessParameterCount, + (XAPO_PROCESS_BUFFER_PARAMETERS *)pOutputProcessParameters, + IsEnabled); +} + +static uint32_t FAPOCALL XAPO_CalcInputFrames(void *iface, + uint32_t OutputFrameCount) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_CalcInputFrames(This->xapo, OutputFrameCount); +} + +static uint32_t FAPOCALL XAPO_CalcOutputFrames(void *iface, + uint32_t InputFrameCount) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + return IXAPO_CalcOutputFrames(This->xapo, InputFrameCount); +} + +static void FAPOCALL XAPO_SetParameters(void *iface, + const void *pParameters, uint32_t ParametersByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + if(This->xapo_params) + IXAPOParameters_SetParameters(This->xapo_params, pParameters, ParametersByteSize); +} + +static void FAPOCALL XAPO_GetParameters(void *iface, + void *pParameters, uint32_t ParametersByteSize) +{ + XA2XAPOImpl *This = impl_from_FAPO(iface); + TRACE("%p\n", This); + if(This->xapo_params) + IXAPOParameters_GetParameters(This->xapo_params, pParameters, ParametersByteSize); + else + memset(pParameters, 0, ParametersByteSize); +} + +static const FAPO FAPO_Vtbl = { + XAPO_AddRef, + XAPO_Release, + XAPO_GetRegistrationProperties, + XAPO_IsInputFormatSupported, + XAPO_IsOutputFormatSupported, + XAPO_Initialize, + XAPO_Reset, + XAPO_LockForProcess, + XAPO_UnlockForProcess, + XAPO_Process, + XAPO_CalcInputFrames, + XAPO_CalcOutputFrames, + XAPO_SetParameters, + XAPO_GetParameters, +}; + +static XA2XAPOImpl *wrap_xapo(IUnknown *unk) +{ + XA2XAPOImpl *ret; + IXAPO *xapo; + IXAPOParameters *xapo_params; + HRESULT hr; + +#if XAUDIO2_VER <= 7 + hr = IUnknown_QueryInterface(unk, &IID_IXAPO27, (void**)&xapo); +#else + hr = IUnknown_QueryInterface(unk, &IID_IXAPO, (void**)&xapo); +#endif + if(FAILED(hr)){ + WARN("XAPO doesn't support IXAPO? %p\n", unk); + return NULL; + } + +#if XAUDIO2_VER <= 7 + hr = IUnknown_QueryInterface(unk, &IID_IXAPO27Parameters, (void**)&xapo_params); +#else + hr = IUnknown_QueryInterface(unk, &IID_IXAPOParameters, (void**)&xapo_params); +#endif + if(FAILED(hr)){ + TRACE("XAPO doesn't support IXAPOParameters %p\n", unk); + xapo_params = NULL; + } + + ret = heap_alloc(sizeof(*ret)); + + ret->xapo = xapo; + ret->xapo_params = xapo_params; + ret->FAPO_vtbl = FAPO_Vtbl; + ret->ref = 1; + + TRACE("wrapped IXAPO %p with %p\n", xapo, ret); + + return ret; +} + +FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + FAudioEffectChain *ret; int i; - XAUDIO2_VOICE_SENDS def_send; - XAUDIO2_SEND_DESCRIPTOR def_desc; - TRACE("%p, %p\n", This, pSendList); + if(!pEffectChain) + return NULL; - if(!pSendList){ - def_desc.Flags = 0; - def_desc.pOutputVoice = (IXAudio2Voice*)&This->xa2->IXAudio2MasteringVoice_iface; + ret = heap_alloc(sizeof(*ret) + sizeof(FAudioEffectDescriptor) * pEffectChain->EffectCount); - def_send.SendCount = 1; - def_send.pSends = &def_desc; + ret->EffectCount = pEffectChain->EffectCount; + ret->pEffectDescriptors = (void*)(ret + 1); - pSendList = &def_send; + for(i = 0; i < ret->EffectCount; ++i){ + ret->pEffectDescriptors[i].pEffect = &wrap_xapo(pEffectChain->pEffectDescriptors[i].pEffect)->FAPO_vtbl; + ret->pEffectDescriptors[i].InitialState = pEffectChain->pEffectDescriptors[i].InitialState; + ret->pEffectDescriptors[i].OutputChannels = pEffectChain->pEffectDescriptors[i].OutputChannels; } - if(TRACE_ON(xaudio2)){ - for(i = 0; i < pSendList->SendCount; ++i){ - XAUDIO2_SEND_DESCRIPTOR *desc = &pSendList->pSends[i]; - TRACE("Outputting to: 0x%x, %p\n", desc->Flags, desc->pOutputVoice); - } + return ret; +} + +static void free_effect_chain(FAudioEffectChain *chain) +{ + int i; + if(!chain) + return; + for(i = 0; i < chain->EffectCount; ++i) + XAPO_Release(chain->pEffectDescriptors[i].pEffect); + heap_free(chain); +} + +/* Send Wrapping */ + +static FAudioVoiceSends *wrap_voice_sends(const XAUDIO2_VOICE_SENDS *sends) +{ + FAudioVoiceSends *ret; + int i; + + if(!sends) + return NULL; + + ret = heap_alloc(sizeof(*ret) + sends->SendCount * sizeof(FAudioSendDescriptor)); + ret->SendCount = sends->SendCount; + ret->pSends = (FAudioSendDescriptor*)(ret + 1); + for(i = 0; i < sends->SendCount; ++i){ + XA2VoiceImpl *voice = impl_from_IXAudio2Voice(sends->pSends[i].pOutputVoice); + ret->pSends[i].pOutputVoice = voice->faudio_voice; + ret->pSends[i].Flags = sends->pSends[i].Flags; } + return ret; +} - if(This->nsends < pSendList->SendCount){ - HeapFree(GetProcessHeap(), 0, This->sends); - This->sends = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sends) * pSendList->SendCount); - This->nsends = pSendList->SendCount; - }else - memset(This->sends, 0, sizeof(*This->sends) * This->nsends); +static void free_voice_sends(FAudioVoiceSends *sends) +{ + if(!sends) + return; + heap_free(sends); +} - memcpy(This->sends, pSendList->pSends, sizeof(*This->sends) * pSendList->SendCount); +/* Voice Callbacks */ - return S_OK; +static inline XA2VoiceImpl *impl_from_FAudioVoiceCallback(FAudioVoiceCallback *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, FAudioVoiceCallback_vtbl); +} + +static void FAUDIOCALL XA2VCB_OnVoiceProcessingPassStart(FAudioVoiceCallback *iface, + UINT32 BytesRequired) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) +#if XAUDIO2_VER == 0 + IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)This->cb); +#else + IXAudio2VoiceCallback_OnVoiceProcessingPassStart(This->cb, BytesRequired); +#endif +} + +static void FAUDIOCALL XA2VCB_OnVoiceProcessingPassEnd(FAudioVoiceCallback *iface) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(This->cb); +} + +static void FAUDIOCALL XA2VCB_OnStreamEnd(FAudioVoiceCallback *iface) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnStreamEnd(This->cb); +} + +static void FAUDIOCALL XA2VCB_OnBufferStart(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnBufferStart(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnBufferEnd(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnBufferEnd(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnLoopEnd(FAudioVoiceCallback *iface, + void *pBufferContext) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnLoopEnd(This->cb, pBufferContext); +} + +static void FAUDIOCALL XA2VCB_OnVoiceError(FAudioVoiceCallback *iface, + void *pBufferContext, unsigned int Error) +{ + XA2VoiceImpl *This = impl_from_FAudioVoiceCallback(iface); + TRACE("%p\n", This); + if(This->cb) + IXAudio2VoiceCallback_OnVoiceError(This->cb, pBufferContext, (HRESULT)Error); +} + +static const FAudioVoiceCallback FAudioVoiceCallback_Vtbl = { + XA2VCB_OnBufferEnd, + XA2VCB_OnBufferStart, + XA2VCB_OnLoopEnd, + XA2VCB_OnStreamEnd, + XA2VCB_OnVoiceError, + XA2VCB_OnVoiceProcessingPassEnd, + XA2VCB_OnVoiceProcessingPassStart +}; + +/* Engine Callbacks */ + +static inline IXAudio2Impl *impl_from_FAudioEngineCallback(FAudioEngineCallback *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, FAudioEngineCallback_vtbl); +} + +static void FAUDIOCALL XA2ECB_OnProcessingPassStart(FAudioEngineCallback *iface) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnProcessingPassStart(This->cbs[i]); +} + +static void FAUDIOCALL XA2ECB_OnProcessingPassEnd(FAudioEngineCallback *iface) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnProcessingPassEnd(This->cbs[i]); +} + +static void FAUDIOCALL XA2ECB_OnCriticalError(FAudioEngineCallback *iface, + uint32_t error) +{ + IXAudio2Impl *This = impl_from_FAudioEngineCallback(iface); + int i; + TRACE("%p\n", This); + for(i = 0; i < This->ncbs && This->cbs[i]; ++i) + IXAudio2EngineCallback_OnCriticalError(This->cbs[i], error); +} + +static const FAudioEngineCallback FAudioEngineCallback_Vtbl = { + XA2ECB_OnCriticalError, + XA2ECB_OnProcessingPassEnd, + XA2ECB_OnProcessingPassStart +}; + +/* Common Voice Functions */ + +static inline void destroy_voice(XA2VoiceImpl *This) +{ + FAudioVoice_DestroyVoice(This->faudio_voice); + free_effect_chain(This->effect_chain); + This->effect_chain = NULL; + This->in_use = FALSE; +} + +/* Source Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2SourceVoice(IXAudio2SourceVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2SourceVoice_iface); +} + +static void WINAPI XA2SRC_GetVoiceDetails(IXAudio2SourceVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); +} + +static HRESULT WINAPI XA2SRC_SetOutputVoices(IXAudio2SourceVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + + TRACE("%p, %p\n", This, pSendList); + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; } static HRESULT WINAPI XA2SRC_SetEffectChain(IXAudio2SourceVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + HRESULT hr; + TRACE("%p, %p\n", This, pEffectChain); - return S_OK; + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; } -static HRESULT WINAPI XA2SRC_EnableEffect(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_EnableEffect(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); } -static HRESULT WINAPI XA2SRC_DisableEffect(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_DisableEffect(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); } -static void WINAPI XA2SRC_GetEffectState(IXAudio2SourceVoice *iface, - UINT32 EffectIndex, BOOL *pEnabled) +static void WINAPI XA2SRC_GetEffectState(IXAudio2SourceVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); } static HRESULT WINAPI XA2SRC_SetEffectParameters(IXAudio2SourceVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize, OperationSet); - return S_OK; + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); } static HRESULT WINAPI XA2SRC_GetEffectParameters(IXAudio2SourceVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize); - return S_OK; + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); } static HRESULT WINAPI XA2SRC_SetFilterParameters(IXAudio2SourceVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; + return FAudioVoice_SetFilterParameters(This->faudio_voice, + (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2SRC_GetFilterParameters(IXAudio2SourceVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2SRC_SetOutputFilterParameters(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2SRC_GetOutputFilterParameters(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat al_gain; - + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - - al_gain = Volume; - - palcSetThreadContext(This->xa2->al_ctx); - - alSourcef(This->al_src, AL_GAIN, al_gain); - - return S_OK; + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); } static void WINAPI XA2SRC_GetVolume(IXAudio2SourceVoice *iface, float *pVolume) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); } -static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, - UINT32 Channels, const float *pVolumes, UINT32 OperationSet) +static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat al_gain; - UINT32 i; - BOOL same_volumes_given = TRUE; - + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - -#if XAUDIO2_VER > 7 - if(Channels != This->fmt->nChannels || !pVolumes) - return COMPAT_E_INVALID_CALL; -#endif - - al_gain = *pVolumes; - - /* check whether all volumes are the same */ - for(i = 1; i < Channels; ++i){ - if(al_gain != *(pVolumes + i)){ - same_volumes_given = FALSE; - break; - } - } - if(!same_volumes_given){ - WARN("Different volumes for channels unsupported, setting the highest volume.\n"); - for(; i < Channels; ++i) - al_gain = max(al_gain, *(pVolumes + i)); - } - - palcSetThreadContext(This->xa2->al_ctx); - alSourcef(This->al_src, AL_GAIN, al_gain); - - return S_OK; + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); } -static void WINAPI XA2SRC_GetChannelVolumes(IXAudio2SourceVoice *iface, - UINT32 Channels, float *pVolumes) +static void WINAPI XA2SRC_GetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, + float *pVolumes) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); } static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface, @@ -411,68 +686,39 @@ static HRESULT WINAPI XA2SRC_SetOutputMatrix(IXAudio2SourceVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); } static void WINAPI XA2SRC_GetOutputMatrix(IXAudio2SourceVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); -} + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); +} static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALint processed; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - palcSetThreadContext(This->xa2->al_ctx); - EnterCriticalSection(&This->lock); - if(!This->in_use){ - LeaveCriticalSection(&This->lock); - return; - } - - This->in_use = FALSE; - - This->running = FALSE; - - IXAudio2SourceVoice_Stop(iface, 0, 0); - - alSourceStop(This->al_src); - - /* unqueue all buffers */ - alSourcei(This->al_src, AL_BUFFER, AL_NONE); - - alGetSourcei(This->al_src, AL_BUFFERS_PROCESSED, &processed); - - if(processed > 0){ - ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - - alSourceUnqueueBuffers(This->al_src, processed, al_buffers); - } - - HeapFree(GetProcessHeap(), 0, This->fmt); - - alDeleteBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, This->al_bufs); - alDeleteSources(1, &This->al_src); - - This->in_al_bytes = 0; - This->al_bufs_used = 0; - This->played_frames = 0; - This->nbufs = 0; - This->first_buf = 0; - This->cur_buf = 0; - This->abandoned_albufs = 0; + destroy_voice(This); LeaveCriticalSection(&This->lock); } @@ -480,380 +726,98 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) static HRESULT WINAPI XA2SRC_Start(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); - EnterCriticalSection(&This->lock); - - This->running = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_Start(This->faudio_voice, Flags, OperationSet); } static HRESULT WINAPI XA2SRC_Stop(IXAudio2SourceVoice *iface, UINT32 Flags, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALint bufs; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x, 0x%x\n", This, Flags, OperationSet); - palcSetThreadContext(This->xa2->al_ctx); - - EnterCriticalSection(&This->lock); - - alGetSourcei(This->al_src, AL_BUFFERS_QUEUED, &bufs); - - This->abandoned_albufs = bufs; - - This->running = FALSE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static ALenum get_al_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)fmt; - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->wBitsPerSample){ - case 8: - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO8; - case 2: - return AL_FORMAT_STEREO8; - case 4: - return AL_FORMAT_QUAD8; - case 6: - return AL_FORMAT_51CHN8; - case 7: - return AL_FORMAT_61CHN8; - case 8: - return AL_FORMAT_71CHN8; - } - break; - case 16: - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO16; - case 2: - return AL_FORMAT_STEREO16; - case 4: - return AL_FORMAT_QUAD16; - case 6: - return AL_FORMAT_51CHN16; - case 7: - return AL_FORMAT_61CHN16; - case 8: - return AL_FORMAT_71CHN16; - } - break; - } - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample == 32){ - switch(fmt->nChannels){ - case 1: - return AL_FORMAT_MONO_FLOAT32; - case 2: - return AL_FORMAT_STEREO_FLOAT32; - case 4: - return AL_FORMAT_QUAD32; - case 6: - return AL_FORMAT_51CHN32; - case 7: - return AL_FORMAT_61CHN32; - case 8: - return AL_FORMAT_71CHN32; - } - } - } - return 0; + return FAudioSourceVoice_Stop(This->faudio_voice, Flags, OperationSet); } static HRESULT WINAPI XA2SRC_SubmitSourceBuffer(IXAudio2SourceVoice *iface, const XAUDIO2_BUFFER *pBuffer, const XAUDIO2_BUFFER_WMA *pBufferWMA) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - XA2Buffer *buf; - UINT32 buf_idx; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, %p\n", This, pBuffer, pBufferWMA); - if(TRACE_ON(xaudio2)){ - TRACE("Flags: 0x%x\n", pBuffer->Flags); - TRACE("AudioBytes: %u\n", pBuffer->AudioBytes); - TRACE("pAudioData: %p\n", pBuffer->pAudioData); - TRACE("PlayBegin: %u\n", pBuffer->PlayBegin); - TRACE("PlayLength: %u\n", pBuffer->PlayLength); - TRACE("LoopBegin: %u\n", pBuffer->LoopBegin); - TRACE("LoopLength: %u\n", pBuffer->LoopLength); - TRACE("LoopCount: %u\n", pBuffer->LoopCount); - TRACE("pContext: %p\n", pBuffer->pContext); - } - - EnterCriticalSection(&This->lock); - - if(This->nbufs >= XAUDIO2_MAX_QUEUED_BUFFERS){ - TRACE("Too many buffers queued!\n"); - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - buf_idx = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - buf = &This->buffers[buf_idx]; - memset(buf, 0, sizeof(*buf)); - - /* API contract: pAudioData must remain valid until this buffer is played, - * but pBuffer itself may be reused immediately */ - memcpy(&buf->xa2buffer, pBuffer, sizeof(*pBuffer)); - -#if XAUDIO2_VER == 0 - if(buf->xa2buffer.LoopCount == XAUDIO20_LOOP_INFINITE) - buf->xa2buffer.LoopCount = XAUDIO2_LOOP_INFINITE; -#endif - - /* convert samples offsets to bytes */ - if(This->fmt->wFormatTag == WAVE_FORMAT_ADPCM){ - /* ADPCM gives us a number of samples per block, so round down to - * nearest block and convert to bytes */ - buf->xa2buffer.PlayBegin = buf->xa2buffer.PlayBegin / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.PlayLength = buf->xa2buffer.PlayLength / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.LoopBegin = buf->xa2buffer.LoopBegin / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - buf->xa2buffer.LoopLength = buf->xa2buffer.LoopLength / ((ADPCMWAVEFORMAT*)This->fmt)->wSamplesPerBlock * This->fmt->nBlockAlign; - }else{ - buf->xa2buffer.PlayBegin *= This->fmt->nBlockAlign; - buf->xa2buffer.PlayLength *= This->fmt->nBlockAlign; - buf->xa2buffer.LoopBegin *= This->fmt->nBlockAlign; - buf->xa2buffer.LoopLength *= This->fmt->nBlockAlign; - } - - if(buf->xa2buffer.PlayLength == 0) - /* set to end of buffer */ - buf->xa2buffer.PlayLength = buf->xa2buffer.AudioBytes - buf->xa2buffer.PlayBegin; - - buf->play_end_bytes = buf->xa2buffer.PlayBegin + buf->xa2buffer.PlayLength; - - if(buf->xa2buffer.LoopCount){ - if(buf->xa2buffer.LoopLength == 0) - /* set to end of play range */ - buf->xa2buffer.LoopLength = buf->play_end_bytes - buf->xa2buffer.LoopBegin; - - if(buf->xa2buffer.LoopBegin >= buf->play_end_bytes){ - /* this actually crashes on native xaudio 2.7 */ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - buf->loop_end_bytes = buf->xa2buffer.LoopBegin + buf->xa2buffer.LoopLength; - - /* xaudio 2.7 allows some invalid looping setups, but later versions - * return an error */ -#if XAUDIO2_VER > 7 - if(buf->loop_end_bytes > buf->play_end_bytes){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - if(buf->loop_end_bytes <= buf->xa2buffer.PlayBegin){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } -#else - if(buf->loop_end_bytes <= buf->xa2buffer.PlayBegin){ - buf->xa2buffer.LoopCount = 0; - buf->loop_end_bytes = buf->play_end_bytes; - } -#endif - }else{ - buf->xa2buffer.LoopLength = buf->xa2buffer.PlayLength; - buf->xa2buffer.LoopBegin = buf->xa2buffer.PlayBegin; - buf->loop_end_bytes = buf->play_end_bytes; - } - - buf->offs_bytes = buf->xa2buffer.PlayBegin; - buf->cur_end_bytes = buf->loop_end_bytes; - - buf->latest_al_buf = -1; - - ++This->nbufs; - - TRACE("%p: queued buffer %u (%u bytes), now %u buffers held\n", - This, buf_idx, buf->xa2buffer.AudioBytes, This->nbufs); - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_SubmitSourceBuffer(This->faudio_voice, (FAudioBuffer*)pBuffer, (FAudioBufferWMA*)pBufferWMA); } static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) { - UINT i, first, last, to_flush; - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - EnterCriticalSection(&This->lock); - - if(This->running && This->nbufs > 0){ - /* when running, flush only completely unused buffers; the rest remain - * in queue */ - last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - first = (This->cur_buf + 1) % XAUDIO2_MAX_QUEUED_BUFFERS; - if(This->cur_buf == last) - /* nothing to do */ - to_flush = 0; - else if(last >= first) - to_flush = last - first; - else - to_flush = last + XAUDIO2_MAX_QUEUED_BUFFERS - first; - }else{ - /* when stopped, flush all buffers */ - first = This->first_buf; - last = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - to_flush = This->nbufs; - } - - - for(i = first; - i < (first + to_flush) % XAUDIO2_MAX_QUEUED_BUFFERS; - i = (i + 1) % XAUDIO2_MAX_QUEUED_BUFFERS){ - if(This->cb) - IXAudio2VoiceCallback_OnBufferEnd(This->cb, - This->buffers[i].xa2buffer.pContext); - } - - This->nbufs -= to_flush; - This->cur_buf = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_FlushSourceBuffers(This->faudio_voice); } static HRESULT WINAPI XA2SRC_Discontinuity(IXAudio2SourceVoice *iface) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p\n", This); - EnterCriticalSection(&This->lock); - - if(This->nbufs > 0){ - DWORD last = (This->first_buf + This->nbufs - 1) % XAUDIO2_MAX_QUEUED_BUFFERS; - This->buffers[last].xa2buffer.Flags |= XAUDIO2_END_OF_STREAM; - } - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_Discontinuity(This->faudio_voice); } static HRESULT WINAPI XA2SRC_ExitLoop(IXAudio2SourceVoice *iface, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, 0x%x\n", This, OperationSet); - EnterCriticalSection(&This->lock); - - This->buffers[This->cur_buf].looped = XAUDIO2_LOOP_INFINITE; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_ExitLoop(This->faudio_voice, OperationSet); } static void WINAPI XA2SRC_GetState(IXAudio2SourceVoice *iface, XAUDIO2_VOICE_STATE *pVoiceState, UINT32 Flags) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p, 0x%x\n", This, pVoiceState, Flags); - EnterCriticalSection(&This->lock); - - if(!(Flags & XAUDIO2_VOICE_NOSAMPLESPLAYED)) - pVoiceState->SamplesPlayed = This->played_frames; - else - pVoiceState->SamplesPlayed = 0; - - if(This->nbufs) - pVoiceState->pCurrentBufferContext = This->buffers[This->first_buf].xa2buffer.pContext; - else - pVoiceState->pCurrentBufferContext = NULL; - - pVoiceState->BuffersQueued = This->nbufs; - - LeaveCriticalSection(&This->lock); - - TRACE("returning %s, queued: %u\n", wine_dbgstr_longlong(pVoiceState->SamplesPlayed), This->nbufs); + return FAudioSourceVoice_GetState(This->faudio_voice, (FAudioVoiceState*)pVoiceState, Flags); } static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, float Ratio, UINT32 OperationSet) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); - ALfloat r; + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %f, 0x%x\n", This, Ratio, OperationSet); - if(Ratio < XAUDIO2_MIN_FREQ_RATIO) - r = XAUDIO2_MIN_FREQ_RATIO; - else if (Ratio > XAUDIO2_MAX_FREQ_RATIO) - r = XAUDIO2_MAX_FREQ_RATIO; - else - r = Ratio; - - palcSetThreadContext(This->xa2->al_ctx); - - alSourcef(This->al_src, AL_PITCH, r); - - return S_OK; + return FAudioSourceVoice_SetFrequencyRatio(This->faudio_voice, Ratio, OperationSet); } static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *pRatio) { - ALfloat ratio; - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %p\n", This, pRatio); - palcSetThreadContext(This->xa2->al_ctx); - - alGetSourcef(This->al_src, AL_PITCH, &ratio); - - *pRatio = ratio; + return FAudioSourceVoice_GetFrequencyRatio(This->faudio_voice, pRatio); } static HRESULT WINAPI XA2SRC_SetSourceSampleRate( IXAudio2SourceVoice *iface, UINT32 NewSourceSampleRate) { - XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2SourceVoice(iface); TRACE("%p, %u\n", This, NewSourceSampleRate); - EnterCriticalSection(&This->lock); - - if(This->nbufs){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - This->fmt->nSamplesPerSec = NewSourceSampleRate; - - LeaveCriticalSection(&This->lock); - - return S_OK; + return FAudioSourceVoice_SetSourceSampleRate(This->faudio_voice, NewSourceSampleRate); } static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = { @@ -888,134 +852,408 @@ static const IXAudio2SourceVoiceVtbl XAudio2SourceVoice_Vtbl = { XA2SRC_SetSourceSampleRate }; +/* Submix Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2SubmixVoice(IXAudio2SubmixVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2SubmixVoice_iface); +} + +static void WINAPI XA2SUB_GetVoiceDetails(IXAudio2SubmixVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); +} + +static HRESULT WINAPI XA2SUB_SetOutputVoices(IXAudio2SubmixVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + + TRACE("%p, %p\n", This, pSendList); + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; +} + +static HRESULT WINAPI XA2SUB_SetEffectChain(IXAudio2SubmixVoice *iface, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + HRESULT hr; + + TRACE("%p, %p\n", This, pEffectChain); + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; +} + +static HRESULT WINAPI XA2SUB_EnableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); +} + +static HRESULT WINAPI XA2SUB_DisableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); +} + +static void WINAPI XA2SUB_GetEffectState(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); +} + +static HRESULT WINAPI XA2SUB_SetEffectParameters(IXAudio2SubmixVoice *iface, + UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize, OperationSet); + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); +} + +static HRESULT WINAPI XA2SUB_GetEffectParameters(IXAudio2SubmixVoice *iface, + UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize); + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); +} + +static HRESULT WINAPI XA2SUB_SetFilterParameters(IXAudio2SubmixVoice *iface, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); + return FAudioVoice_SetFilterParameters(This->faudio_voice, (const FAudioFilterParameters *)pParameters, + OperationSet); +} + +static void WINAPI XA2SUB_GetFilterParameters(IXAudio2SubmixVoice *iface, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); +} + +static HRESULT WINAPI XA2SUB_SetOutputFilterParameters(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); +} + +static void WINAPI XA2SUB_GetOutputFilterParameters(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); +} + +static HRESULT WINAPI XA2SUB_SetVolume(IXAudio2SubmixVoice *iface, float Volume, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); +} + +static void WINAPI XA2SUB_GetVolume(IXAudio2SubmixVoice *iface, float *pVolume) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); +} + +static HRESULT WINAPI XA2SUB_SetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); +} + +static void WINAPI XA2SUB_GetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, + float *pVolumes) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); +} + +static HRESULT WINAPI XA2SUB_SetOutputMatrix(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, const float *pLevelMatrix, + UINT32 OperationSet) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); +} + +static void WINAPI XA2SUB_GetOutputMatrix(IXAudio2SubmixVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, float *pLevelMatrix) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix); + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); +} + +static void WINAPI XA2SUB_DestroyVoice(IXAudio2SubmixVoice *iface) +{ + XA2VoiceImpl *This = impl_from_IXAudio2SubmixVoice(iface); + + TRACE("%p\n", This); + + EnterCriticalSection(&This->lock); + + destroy_voice(This); + + LeaveCriticalSection(&This->lock); +} + +static const struct IXAudio2SubmixVoiceVtbl XAudio2SubmixVoice_Vtbl = { + XA2SUB_GetVoiceDetails, + XA2SUB_SetOutputVoices, + XA2SUB_SetEffectChain, + XA2SUB_EnableEffect, + XA2SUB_DisableEffect, + XA2SUB_GetEffectState, + XA2SUB_SetEffectParameters, + XA2SUB_GetEffectParameters, + XA2SUB_SetFilterParameters, + XA2SUB_GetFilterParameters, + XA2SUB_SetOutputFilterParameters, + XA2SUB_GetOutputFilterParameters, + XA2SUB_SetVolume, + XA2SUB_GetVolume, + XA2SUB_SetChannelVolumes, + XA2SUB_GetChannelVolumes, + XA2SUB_SetOutputMatrix, + XA2SUB_GetOutputMatrix, + XA2SUB_DestroyVoice +}; + +/* Mastering Voices */ + +static inline XA2VoiceImpl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) +{ + return CONTAINING_RECORD(iface, XA2VoiceImpl, IXAudio2MasteringVoice_iface); +} + static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, XAUDIO2_VOICE_DETAILS *pVoiceDetails) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVoiceDetails); - pVoiceDetails->CreationFlags = 0; - pVoiceDetails->ActiveFlags = 0; - pVoiceDetails->InputChannels = This->fmt.Format.nChannels; - pVoiceDetails->InputSampleRate = This->fmt.Format.nSamplesPerSec; + FAudioVoice_GetVoiceDetails(This->faudio_voice, (FAudioVoiceDetails *)pVoiceDetails); } static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface, const XAUDIO2_VOICE_SENDS *pSendList) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + FAudioVoiceSends *faudio_sends; + HRESULT hr; + TRACE("%p, %p\n", This, pSendList); - return S_OK; + + faudio_sends = wrap_voice_sends(pSendList); + + hr = FAudioVoice_SetOutputVoices(This->faudio_voice, faudio_sends); + + free_voice_sends(faudio_sends); + + return hr; } static HRESULT WINAPI XA2M_SetEffectChain(IXAudio2MasteringVoice *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + HRESULT hr; + TRACE("%p, %p\n", This, pEffectChain); - return S_OK; + + free_effect_chain(This->effect_chain); + This->effect_chain = wrap_effect_chain(pEffectChain); + + hr = FAudioVoice_SetEffectChain(This->faudio_voice, This->effect_chain); + + return hr; } static HRESULT WINAPI XA2M_EnableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_EnableEffect(This->faudio_voice, EffectIndex, OperationSet); } static HRESULT WINAPI XA2M_DisableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; + return FAudioVoice_DisableEffect(This->faudio_voice, EffectIndex, OperationSet); } static void WINAPI XA2M_GetEffectState(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, BOOL *pEnabled) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); + FAudioVoice_GetEffectState(This->faudio_voice, EffectIndex, (int32_t*)pEnabled); } static HRESULT WINAPI XA2M_SetEffectParameters(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize, OperationSet); - return S_OK; + return FAudioVoice_SetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize, OperationSet); } static HRESULT WINAPI XA2M_GetEffectParameters(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, ParametersByteSize); - return S_OK; + return FAudioVoice_GetEffectParameters(This->faudio_voice, EffectIndex, + pParameters, ParametersByteSize); } static HRESULT WINAPI XA2M_SetFilterParameters(IXAudio2MasteringVoice *iface, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; + return FAudioVoice_SetFilterParameters(This->faudio_voice, (const FAudioFilterParameters *)pParameters, + OperationSet); } static void WINAPI XA2M_GetFilterParameters(IXAudio2MasteringVoice *iface, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pParameters); + FAudioVoice_GetFilterParameters(This->faudio_voice, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2M_SetOutputFilterParameters(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (const FAudioFilterParameters *)pParameters, OperationSet); } static void WINAPI XA2M_GetOutputFilterParameters(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, XAUDIO2_FILTER_PARAMETERS *pParameters) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); + + FAudioVoice_GetOutputFilterParameters(This->faudio_voice, + dst ? dst->faudio_voice : NULL, (FAudioFilterParameters *)pParameters); } static HRESULT WINAPI XA2M_SetVolume(IXAudio2MasteringVoice *iface, float Volume, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - return S_OK; + return FAudioVoice_SetVolume(This->faudio_voice, Volume, OperationSet); } static void WINAPI XA2M_GetVolume(IXAudio2MasteringVoice *iface, float *pVolume) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pVolume); + return FAudioVoice_GetVolume(This->faudio_voice, pVolume); } static HRESULT WINAPI XA2M_SetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - return S_OK; + return FAudioVoice_SetChannelVolumes(This->faudio_voice, Channels, + pVolumes, OperationSet); } static void WINAPI XA2M_GetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, float *pVolumes) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %u, %p\n", This, Channels, pVolumes); + return FAudioVoice_GetChannelVolumes(This->faudio_voice, Channels, + pVolumes); } static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, @@ -1023,60 +1261,58 @@ static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, UINT32 DestinationChannels, const float *pLevelMatrix, UINT32 OperationSet) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + + return FAudioVoice_SetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); } static void WINAPI XA2M_GetOutputMatrix(IXAudio2MasteringVoice *iface, IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, UINT32 DestinationChannels, float *pLevelMatrix) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *dst = pDestinationVoice ? impl_from_IXAudio2Voice(pDestinationVoice) : NULL; + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, SourceChannels, DestinationChannels, pLevelMatrix); + + FAudioVoice_GetOutputMatrix(This->faudio_voice, dst ? dst->faudio_voice : NULL, + SourceChannels, DestinationChannels, pLevelMatrix); } static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p\n", This); EnterCriticalSection(&This->lock); - if(!This->aclient){ - LeaveCriticalSection(&This->lock); - return; - } - - This->running = FALSE; - - IAudioRenderClient_Release(This->render); - This->render = NULL; - - IAudioClient_Release(This->aclient); - This->aclient = NULL; + destroy_voice(This); + pthread_mutex_lock(&This->engine_lock); + This->engine_params.proc = NULL; + pthread_cond_broadcast(&This->engine_ready); + pthread_mutex_unlock(&This->engine_lock); - alcDestroyContext(This->al_ctx); - This->al_ctx = NULL; - - alcCloseDevice(This->al_device); - This->al_device = NULL; + WaitForSingleObject(This->engine_thread, INFINITE); + This->engine_thread = NULL; LeaveCriticalSection(&This->lock); } -/* not present in XAudio2 2.7 */ static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, DWORD *pChannelMask) { - IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); - TRACE("%p %p\n", This, pChannelMask); + TRACE("%p, %p\n", This, pChannelMask); - *pChannelMask = This->fmt.dwChannelMask; + FAudioMasteringVoice_GetChannelMask(This->faudio_voice, pChannelMask); } static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { @@ -1102,190 +1338,49 @@ static const struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { XA2M_GetChannelMask }; -static void WINAPI XA2SUB_GetVoiceDetails(IXAudio2SubmixVoice *iface, - XAUDIO2_VOICE_DETAILS *pVoiceDetails) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - - TRACE("%p, %p\n", This, pVoiceDetails); - - *pVoiceDetails = This->details; -} - -static HRESULT WINAPI XA2SUB_SetOutputVoices(IXAudio2SubmixVoice *iface, - const XAUDIO2_VOICE_SENDS *pSendList) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pSendList); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_SetEffectChain(IXAudio2SubmixVoice *iface, - const XAUDIO2_EFFECT_CHAIN *pEffectChain) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pEffectChain); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_EnableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_DisableEffect(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetEffectState(IXAudio2SubmixVoice *iface, UINT32 EffectIndex, - BOOL *pEnabled) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); -} - -static HRESULT WINAPI XA2SUB_SetEffectParameters(IXAudio2SubmixVoice *iface, - UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, - ParametersByteSize, OperationSet); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_GetEffectParameters(IXAudio2SubmixVoice *iface, - UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, - ParametersByteSize); - return S_OK; -} - -static HRESULT WINAPI XA2SUB_SetFilterParameters(IXAudio2SubmixVoice *iface, - const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetFilterParameters(IXAudio2SubmixVoice *iface, - XAUDIO2_FILTER_PARAMETERS *pParameters) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pParameters); -} - -static HRESULT WINAPI XA2SUB_SetOutputFilterParameters(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, - const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetOutputFilterParameters(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, - XAUDIO2_FILTER_PARAMETERS *pParameters) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); -} - -static HRESULT WINAPI XA2SUB_SetVolume(IXAudio2SubmixVoice *iface, float Volume, - UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetVolume(IXAudio2SubmixVoice *iface, float *pVolume) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p\n", This, pVolume); -} - -static HRESULT WINAPI XA2SUB_SetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, - const float *pVolumes, UINT32 OperationSet) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); - return S_OK; -} - -static void WINAPI XA2SUB_GetChannelVolumes(IXAudio2SubmixVoice *iface, UINT32 Channels, - float *pVolumes) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %u, %p\n", This, Channels, pVolumes); -} +/* More Common Voice Functions */ -static HRESULT WINAPI XA2SUB_SetOutputMatrix(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, - UINT32 DestinationChannels, const float *pLevelMatrix, - UINT32 OperationSet) +static XA2VoiceImpl *impl_from_IXAudio2Voice(IXAudio2Voice *iface) { - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, - SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); - return S_OK; + if(iface->lpVtbl == (void*)&XAudio2SourceVoice_Vtbl) + return impl_from_IXAudio2SourceVoice((IXAudio2SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio2MasteringVoice_Vtbl) + return impl_from_IXAudio2MasteringVoice((IXAudio2MasteringVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio2SubmixVoice_Vtbl) + return impl_from_IXAudio2SubmixVoice((IXAudio2SubmixVoice*)iface); +#if XAUDIO2_VER == 0 + if(iface->lpVtbl == (void*)&XAudio20SourceVoice_Vtbl) + return impl_from_IXAudio20SourceVoice((IXAudio20SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio20SubmixVoice_Vtbl) + return impl_from_IXAudio20SubmixVoice((IXAudio20SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio20MasteringVoice_Vtbl) + return impl_from_IXAudio20MasteringVoice((IXAudio20MasteringVoice*)iface); +#elif XAUDIO2_VER <= 3 + if(iface->lpVtbl == (void*)&XAudio23SourceVoice_Vtbl) + return impl_from_IXAudio23SourceVoice((IXAudio23SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio23SubmixVoice_Vtbl) + return impl_from_IXAudio23SubmixVoice((IXAudio23SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio23MasteringVoice_Vtbl) + return impl_from_IXAudio23MasteringVoice((IXAudio23MasteringVoice*)iface); +#elif XAUDIO2_VER <= 7 + if(iface->lpVtbl == (void*)&XAudio27SourceVoice_Vtbl) + return impl_from_IXAudio27SourceVoice((IXAudio27SourceVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio27SubmixVoice_Vtbl) + return impl_from_IXAudio27SubmixVoice((IXAudio27SubmixVoice*)iface); + if(iface->lpVtbl == (void*)&XAudio27MasteringVoice_Vtbl) + return impl_from_IXAudio27MasteringVoice((IXAudio27MasteringVoice*)iface); +#endif + ERR("invalid IXAudio2Voice pointer: %p\n", iface); + return NULL; } -static void WINAPI XA2SUB_GetOutputMatrix(IXAudio2SubmixVoice *iface, - IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, - UINT32 DestinationChannels, float *pLevelMatrix) -{ - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, - SourceChannels, DestinationChannels, pLevelMatrix); -} +/* XAudio2 Engine Implementation */ -static void WINAPI XA2SUB_DestroyVoice(IXAudio2SubmixVoice *iface) +static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { - XA2SubmixImpl *This = impl_from_IXAudio2SubmixVoice(iface); - - TRACE("%p\n", This); - - EnterCriticalSection(&This->lock); - - This->in_use = FALSE; - - LeaveCriticalSection(&This->lock); + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); } -static const struct IXAudio2SubmixVoiceVtbl XAudio2SubmixVoice_Vtbl = { - XA2SUB_GetVoiceDetails, - XA2SUB_SetOutputVoices, - XA2SUB_SetEffectChain, - XA2SUB_EnableEffect, - XA2SUB_DisableEffect, - XA2SUB_GetEffectState, - XA2SUB_SetEffectParameters, - XA2SUB_GetEffectParameters, - XA2SUB_SetFilterParameters, - XA2SUB_GetFilterParameters, - XA2SUB_SetOutputFilterParameters, - XA2SUB_GetOutputFilterParameters, - XA2SUB_SetVolume, - XA2SUB_GetVolume, - XA2SUB_SetChannelVolumes, - XA2SUB_GetChannelVolumes, - XA2SUB_SetOutputMatrix, - XA2SUB_GetOutputMatrix, - XA2SUB_DestroyVoice -}; - static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) { @@ -1326,7 +1421,7 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = FAudio_AddRef(This->faudio); TRACE("(%p)->(): Refcount now %u\n", This, ref); return ref; } @@ -1334,48 +1429,21 @@ static ULONG WINAPI IXAudio2Impl_AddRef(IXAudio2 *iface) static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = FAudio_Release(This->faudio); TRACE("(%p)->(): Refcount now %u\n", This, ref); if (!ref) { - int i; - XA2SourceImpl *src, *src2; - XA2SubmixImpl *sub, *sub2; - - if(This->engine){ - This->stop_engine = TRUE; - SetEvent(This->mmevt); - WaitForSingleObject(This->engine, INFINITE); - CloseHandle(This->engine); - } - - LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ - HeapFree(GetProcessHeap(), 0, src->sends); - IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); - src->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&src->lock); - HeapFree(GetProcessHeap(), 0, src); - } + XA2VoiceImpl *v, *v2; - LIST_FOR_EACH_ENTRY_SAFE(sub, sub2, &This->submix_voices, XA2SubmixImpl, entry){ - IXAudio2SubmixVoice_DestroyVoice(&sub->IXAudio2SubmixVoice_iface); - sub->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&sub->lock); - HeapFree(GetProcessHeap(), 0, sub); + LIST_FOR_EACH_ENTRY_SAFE(v, v2, &This->voices, XA2VoiceImpl, entry){ + v->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&v->lock); + HeapFree(GetProcessHeap(), 0, v); } - IXAudio2MasteringVoice_DestroyVoice(&This->IXAudio2MasteringVoice_iface); - - if(This->devenum) - IMMDeviceEnumerator_Release(This->devenum); - for(i = 0; i < This->ndevs; ++i) - CoTaskMemFree(This->devids[i]); - HeapFree(GetProcessHeap(), 0, This->devids); HeapFree(GetProcessHeap(), 0, This->cbs); - CloseHandle(This->mmevt); - This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); @@ -1402,8 +1470,8 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, } } - This->ncbs *= 2; - This->cbs = HeapReAlloc(GetProcessHeap(), 0, This->cbs, This->ncbs * sizeof(*This->cbs)); + This->ncbs++; + This->cbs = heap_realloc(This->cbs, This->ncbs * sizeof(*This->cbs)); This->cbs[i] = pCallback; @@ -1422,6 +1490,11 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, EnterCriticalSection(&This->lock); + if(This->ncbs == 0){ + LeaveCriticalSection(&This->lock); + return; + } + for(i = 0; i < This->ncbs; ++i){ if(This->cbs[i] == pCallback) break; @@ -1436,20 +1509,40 @@ static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, LeaveCriticalSection(&This->lock); } -static WAVEFORMATEX *copy_waveformat(const WAVEFORMATEX *wfex) +static inline XA2VoiceImpl *create_voice(IXAudio2Impl *This) { - WAVEFORMATEX *pwfx; + XA2VoiceImpl *voice; - if(wfex->wFormatTag == WAVE_FORMAT_PCM){ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); - CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); - pwfx->cbSize = 0; - }else{ - pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + wfex->cbSize); - CopyMemory(pwfx, wfex, sizeof(WAVEFORMATEX) + wfex->cbSize); - } + voice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*voice)); + if(!voice) + return NULL; + + list_add_head(&This->voices, &voice->entry); + + voice->IXAudio2SourceVoice_iface.lpVtbl = &XAudio2SourceVoice_Vtbl; +#if XAUDIO2_VER == 0 + voice->IXAudio20SourceVoice_iface.lpVtbl = &XAudio20SourceVoice_Vtbl; +#elif XAUDIO2_VER <= 3 + voice->IXAudio23SourceVoice_iface.lpVtbl = &XAudio23SourceVoice_Vtbl; +#elif XAUDIO2_VER <= 7 + voice->IXAudio27SourceVoice_iface.lpVtbl = &XAudio27SourceVoice_Vtbl; +#endif + + voice->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; +#if XAUDIO2_VER == 0 + voice->IXAudio20SubmixVoice_iface.lpVtbl = &XAudio20SubmixVoice_Vtbl; +#elif XAUDIO2_VER <= 3 + voice->IXAudio23SubmixVoice_iface.lpVtbl = &XAudio23SubmixVoice_Vtbl; +#elif XAUDIO2_VER <= 7 + voice->IXAudio27SubmixVoice_iface.lpVtbl = &XAudio27SubmixVoice_Vtbl; +#endif + + voice->FAudioVoiceCallback_vtbl = FAudioVoiceCallback_Vtbl; + + InitializeCriticalSection(&voice->lock); + voice->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2VoiceImpl.lock"); - return pwfx; + return voice; } static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, @@ -1459,94 +1552,44 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - XA2SourceImpl *src; + XA2VoiceImpl *src; HRESULT hr; + FAudioVoiceSends *faudio_sends; TRACE("(%p)->(%p, %p, 0x%x, %f, %p, %p, %p)\n", This, ppSourceVoice, pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, pEffectChain); - dump_fmt(pSourceFormat); - - palcSetThreadContext(This->al_ctx); - EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ + LIST_FOR_EACH_ENTRY(src, &This->voices, XA2VoiceImpl, entry){ EnterCriticalSection(&src->lock); if(!src->in_use) break; LeaveCriticalSection(&src->lock); } - if(&src->entry == &This->source_voices){ - src = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*src)); - if(!src){ - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - - list_add_head(&This->source_voices, &src->entry); - - src->IXAudio2SourceVoice_iface.lpVtbl = &XAudio2SourceVoice_Vtbl; - -#if XAUDIO2_VER == 0 - src->IXAudio20SourceVoice_iface.lpVtbl = &XAudio20SourceVoice_Vtbl; -#elif XAUDIO2_VER <= 3 - src->IXAudio23SourceVoice_iface.lpVtbl = &XAudio23SourceVoice_Vtbl; -#elif XAUDIO2_VER <= 7 - src->IXAudio27SourceVoice_iface.lpVtbl = &XAudio27SourceVoice_Vtbl; -#endif - - InitializeCriticalSection(&src->lock); - src->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SourceImpl.lock"); - - src->xa2 = This; - + if(&src->entry == &This->voices){ + src = create_voice(This); EnterCriticalSection(&src->lock); } - src->in_use = TRUE; - src->running = FALSE; - LeaveCriticalSection(&This->lock); - src->cb = pCallback; - - src->al_fmt = get_al_format(pSourceFormat); - if(!src->al_fmt){ - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); - WARN("OpenAL can't convert this format!\n"); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } + src->effect_chain = wrap_effect_chain(pEffectChain); + faudio_sends = wrap_voice_sends(pSendList); - src->submit_blocksize = pSourceFormat->nBlockAlign; - - src->fmt = copy_waveformat(pSourceFormat); - - hr = XA2SRC_SetOutputVoices(&src->IXAudio2SourceVoice_iface, pSendList); + hr = FAudio_CreateSourceVoice(This->faudio, &src->faudio_voice, + (FAudioWaveFormatEx*)pSourceFormat, flags, maxFrequencyRatio, + &src->FAudioVoiceCallback_vtbl, faudio_sends, + src->effect_chain); + free_voice_sends(faudio_sends); if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, src->fmt); - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); + LeaveCriticalSection(&This->lock); return hr; } - - alGenSources(1, &src->al_src); - if(!src->al_src){ - static int once = 0; - if(!once++) - ERR_(winediag)("OpenAL ran out of sources, consider increasing its source limit.\n"); - HeapFree(GetProcessHeap(), 0, src->fmt); - src->in_use = FALSE; - LeaveCriticalSection(&src->lock); - return E_OUTOFMEMORY; - } - - alGenBuffers(XAUDIO2_MAX_QUEUED_BUFFERS, src->al_bufs); - - alSourcePlay(src->al_src); + src->in_use = TRUE; + src->cb = pCallback; LeaveCriticalSection(&src->lock); @@ -1571,8 +1614,10 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, const XAUDIO2_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { + HRESULT hr; IXAudio2Impl *This = impl_from_IXAudio2(iface); - XA2SubmixImpl *sub; + XA2VoiceImpl *sub; + FAudioVoiceSends *faudio_sends; TRACE("(%p)->(%p, %u, %u, 0x%x, %u, %p, %p)\n", This, ppSubmixVoice, inputChannels, inputSampleRate, flags, processingStage, pSendList, @@ -1580,46 +1625,33 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, EnterCriticalSection(&This->lock); - LIST_FOR_EACH_ENTRY(sub, &This->submix_voices, XA2SubmixImpl, entry){ + LIST_FOR_EACH_ENTRY(sub, &This->voices, XA2VoiceImpl, entry){ EnterCriticalSection(&sub->lock); if(!sub->in_use) break; LeaveCriticalSection(&sub->lock); } - if(&sub->entry == &This->submix_voices){ - sub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sub)); - if(!sub){ - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - - list_add_head(&This->submix_voices, &sub->entry); - - sub->IXAudio2SubmixVoice_iface.lpVtbl = &XAudio2SubmixVoice_Vtbl; + if(&sub->entry == &This->voices){ + sub = create_voice(This); + EnterCriticalSection(&sub->lock); + } -#if XAUDIO2_VER == 0 - sub->IXAudio20SubmixVoice_iface.lpVtbl = &XAudio20SubmixVoice_Vtbl; -#elif XAUDIO2_VER <= 3 - sub->IXAudio23SubmixVoice_iface.lpVtbl = &XAudio23SubmixVoice_Vtbl; -#elif XAUDIO2_VER <= 7 - sub->IXAudio27SubmixVoice_iface.lpVtbl = &XAudio27SubmixVoice_Vtbl; -#endif + LeaveCriticalSection(&This->lock); - InitializeCriticalSection(&sub->lock); - sub->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2SubmixImpl.lock"); + sub->effect_chain = wrap_effect_chain(pEffectChain); + faudio_sends = wrap_voice_sends(pSendList); - EnterCriticalSection(&sub->lock); + hr = FAudio_CreateSubmixVoice(This->faudio, &sub->faudio_voice, inputChannels, + inputSampleRate, flags, processingStage, faudio_sends, + sub->effect_chain); + free_voice_sends(faudio_sends); + if(FAILED(hr)){ + LeaveCriticalSection(&sub->lock); + return hr; } - sub->in_use = TRUE; - sub->details.CreationFlags = flags; - sub->details.ActiveFlags = flags; - sub->details.InputChannels = inputChannels; - sub->details.InputSampleRate = inputSampleRate; - - LeaveCriticalSection(&This->lock); LeaveCriticalSection(&sub->lock); #if XAUDIO2_VER == 0 @@ -1637,25 +1669,46 @@ static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, return S_OK; } -static ALenum al_get_loopback_format(const WAVEFORMATEXTENSIBLE *fmt) +/* called thread created by SDL, must not access Wine TEB */ +void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) +{ + XA2VoiceImpl *This = user; + + pthread_mutex_lock(&This->engine_lock); + + This->engine_params.proc = proc; + This->engine_params.stream = stream; + This->engine_params.faudio = faudio; + + pthread_cond_broadcast(&This->engine_ready); + + while(This->engine_params.proc) + pthread_cond_wait(&This->engine_done, &This->engine_lock); + + pthread_mutex_unlock(&This->engine_lock); +} + +/* wine thread, OK to access TEB, invoke client code, etc */ +DWORD WINAPI engine_thread(void *user) { - if(fmt->Format.wFormatTag == WAVE_FORMAT_PCM || - (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->Format.wBitsPerSample){ - case 8: - return ALC_UNSIGNED_BYTE_SOFT; - case 16: - return ALC_SHORT_SOFT; - case 32: - return ALC_INT_SOFT; + XA2VoiceImpl *This = user; + + pthread_mutex_lock(&This->engine_lock); + + pthread_cond_broadcast(&This->engine_done); + + do{ + pthread_cond_wait(&This->engine_ready, &This->engine_lock); + + if(This->engine_params.proc){ + This->engine_params.proc(This->engine_params.faudio, This->engine_params.stream); + This->engine_params.proc = NULL; + pthread_cond_broadcast(&This->engine_done); } - }else if(fmt->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmt->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->Format.wBitsPerSample == 32) - return ALC_FLOAT_SOFT; - } + }while(This->in_use); + + pthread_mutex_unlock(&This->engine_lock); + return 0; } @@ -1666,251 +1719,60 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, AUDIO_STREAM_CATEGORY streamCategory) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - IMMDevice *dev; - HRESULT hr; - WAVEFORMATEX *fmt; - ALCint attrs[11]; - REFERENCE_TIME period, bufdur; TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, ppMasteringVoice, inputChannels, inputSampleRate, flags, wine_dbgstr_w(deviceId), pEffectChain, streamCategory); - if(flags != 0) - WARN("Unknown flags set: 0x%x\n", flags); - - if(pEffectChain) - WARN("Effect chain is unimplemented\n"); - EnterCriticalSection(&This->lock); - /* there can only be one Mastering Voice, so just build it into XA2 */ - if(This->aclient){ - LeaveCriticalSection(&This->lock); - return COMPAT_E_INVALID_CALL; - } - - if(!deviceId){ - if(This->ndevs == 0){ - LeaveCriticalSection(&This->lock); - return E_NOTFOUND; - } - deviceId = This->devids[0]; - } - - hr = IMMDeviceEnumerator_GetDevice(This->devenum, deviceId, &dev); - if(FAILED(hr)){ - WARN("GetDevice failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - hr = IMMDevice_Activate(dev, &IID_IAudioClient, - CLSCTX_INPROC_SERVER, NULL, (void**)&This->aclient); - if(FAILED(hr)){ - WARN("Activate(IAudioClient) failed: %08x\n", hr); - IMMDevice_Release(dev); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - IMMDevice_Release(dev); - - hr = IAudioClient_GetMixFormat(This->aclient, &fmt); - if(FAILED(hr)){ - WARN("GetMixFormat failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ - FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - if(inputChannels == XAUDIO2_DEFAULT_CHANNELS) - inputChannels = fmt->nChannels; - if(inputSampleRate == XAUDIO2_DEFAULT_SAMPLERATE) - inputSampleRate = fmt->nSamplesPerSec; - - memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); - This->fmt.Format.nChannels = inputChannels; - This->fmt.Format.nSamplesPerSec = inputSampleRate; - This->fmt.Format.nBlockAlign = This->fmt.Format.nChannels * This->fmt.Format.wBitsPerSample / 8; - This->fmt.Format.nAvgBytesPerSec = This->fmt.Format.nSamplesPerSec * This->fmt.Format.nBlockAlign; - This->fmt.dwChannelMask = get_channel_mask(This->fmt.Format.nChannels); - - CoTaskMemFree(fmt); - fmt = NULL; - - hr = IAudioClient_IsFormatSupported(This->aclient, - AUDCLNT_SHAREMODE_SHARED, &This->fmt.Format, &fmt); - if(hr == S_FALSE){ - if(sizeof(WAVEFORMATEX) + fmt->cbSize > sizeof(WAVEFORMATEXTENSIBLE)){ - FIXME("Mix format doesn't fit into WAVEFORMATEXTENSIBLE!\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - memcpy(&This->fmt, fmt, sizeof(WAVEFORMATEX) + fmt->cbSize); - } - - CoTaskMemFree(fmt); - - hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL); - if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - /* 3 periods or 0.1 seconds */ - bufdur = max(3 * period, 1000000); + /* Note that we don't have paths for each XAUDIO2_VER here. + * All versions < 8 have a very different CreateMasteringVoice, so we + * implement those separately in compat.c. + * -flibit + */ + *ppMasteringVoice = &This->mst.IXAudio2MasteringVoice_iface; - hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_EVENTCALLBACK, bufdur, - 0, &This->fmt.Format, NULL); - if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - This->period_frames = MulDiv(period, inputSampleRate, 10000000); - - hr = IAudioClient_SetEventHandle(This->aclient, This->mmevt); - if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - - hr = IAudioClient_GetService(This->aclient, &IID_IAudioRenderClient, - (void**)&This->render); - if(FAILED(hr)){ - WARN("GetService(IAudioRenderClient) failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + EnterCriticalSection(&This->mst.lock); - /* setup openal context */ - attrs[0] = ALC_FORMAT_CHANNELS_SOFT; - switch(inputChannels){ - case 1: - attrs[1] = ALC_MONO_SOFT; - break; - case 2: - attrs[1] = ALC_STEREO_SOFT; - break; - case 4: - attrs[1] = ALC_QUAD_SOFT; - break; - case 6: - attrs[1] = ALC_5POINT1_SOFT; - break; - case 7: - attrs[1] = ALC_6POINT1_SOFT; - break; - case 8: - attrs[1] = ALC_7POINT1_SOFT; - break; - default: - WARN("OpenAL doesn't support %u channels\n", inputChannels); + if(This->mst.in_use){ + LeaveCriticalSection(&This->mst.lock); LeaveCriticalSection(&This->lock); - return AUDCLNT_E_UNSUPPORTED_FORMAT; + return COMPAT_E_INVALID_CALL; } - attrs[2] = ALC_FREQUENCY; - attrs[3] = inputSampleRate; - - attrs[4] = ALC_FORMAT_TYPE_SOFT; - attrs[5] = al_get_loopback_format(&This->fmt); + LeaveCriticalSection(&This->lock); - /* some games create very many sources */ - attrs[6] = ALC_STEREO_SOURCES; - attrs[7] = 1024; - attrs[8] = ALC_MONO_SOURCES; - attrs[9] = 1024; + This->mst.effect_chain = wrap_effect_chain(pEffectChain); - attrs[10] = 0; + pthread_mutex_lock(&This->mst.engine_lock); - if(!attrs[5]){ - WARN("OpenAL can't output samples in this format\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + This->mst.engine_thread = CreateThread(NULL, 0, &engine_thread, &This->mst, 0, NULL); - This->al_device = palcLoopbackOpenDeviceSOFT(NULL); - if(!This->al_device){ - WARN("alcLoopbackOpenDeviceSOFT failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + pthread_cond_wait(&This->mst.engine_done, &This->mst.engine_lock); - This->al_ctx = alcCreateContext(This->al_device, attrs); - if(!This->al_ctx){ - WARN("alcCreateContext failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + pthread_mutex_unlock(&This->mst.engine_lock); - hr = IAudioClient_Start(This->aclient); - if (FAILED(hr)) - { - WARN("Start(IAudioClient) failed: %08x\n", hr); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } + FAudio_SetEngineProcedureEXT(This->faudio, &engine_cb, &This->mst); -#if XAUDIO2_VER == 0 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio20MasteringVoice_iface; -#elif XAUDIO2_VER <= 3 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio23MasteringVoice_iface; -#elif XAUDIO2_VER <= 7 - *ppMasteringVoice = (IXAudio2MasteringVoice*)&This->IXAudio27MasteringVoice_iface; -#else - *ppMasteringVoice = &This->IXAudio2MasteringVoice_iface; -#endif + FAudio_CreateMasteringVoice8(This->faudio, &This->mst.faudio_voice, inputChannels, + inputSampleRate, flags, NULL /* TODO: (uint16_t*)deviceId */, + This->mst.effect_chain, (FAudioStreamCategory)streamCategory); -exit: - if(FAILED(hr)){ - if(This->render){ - IAudioRenderClient_Release(This->render); - This->render = NULL; - } - if(This->aclient){ - IAudioClient_Release(This->aclient); - This->aclient = NULL; - } - if(This->al_ctx){ - alcDestroyContext(This->al_ctx); - This->al_ctx = NULL; - } - if(This->al_device){ - alcCloseDevice(This->al_device); - This->al_device = NULL; - } - } + This->mst.in_use = TRUE; - LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&This->mst.lock); - return hr; + return S_OK; } -static DWORD WINAPI engine_threadproc(void *arg); - static HRESULT WINAPI IXAudio2Impl_StartEngine(IXAudio2 *iface) { IXAudio2Impl *This = impl_from_IXAudio2(iface); TRACE("(%p)->()\n", This); - This->running = TRUE; - - if(!This->engine) - This->engine = CreateThread(NULL, 0, engine_threadproc, This, 0, NULL); - - return S_OK; + return FAudio_StartEngine(This->faudio); } static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface) @@ -1919,7 +1781,7 @@ static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface) TRACE("(%p)->()\n", This); - This->running = FALSE; + FAudio_StopEngine(This->faudio); } static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, @@ -1929,7 +1791,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, TRACE("(%p)->(0x%x): stub!\n", This, operationSet); - return E_NOTIMPL; + return FAudio_CommitChanges(This->faudio); } static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, @@ -1939,7 +1801,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, TRACE("(%p)->(%p): stub!\n", This, pPerfData); - memset(pPerfData, 0, sizeof(*pPerfData)); + FAudio_GetPerformanceData(This->faudio, (FAudioPerformanceData *)pPerfData); } static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, @@ -1948,7 +1810,9 @@ static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + TRACE("(%p)->(%p, %p): stub!\n", This, pDebugConfiguration, pReserved); + + FAudio_SetDebugConfiguration(This->faudio, (FAudioDebugConfiguration *)pDebugConfiguration, pReserved); } /* XAudio2 2.8 */ @@ -1969,6 +1833,8 @@ static const IXAudio2Vtbl XAudio2_Vtbl = IXAudio2Impl_SetDebugConfiguration }; +/* XAudio2 ClassFactory */ + struct xaudio2_cf { IClassFactory IClassFactory_iface; LONG ref; @@ -2012,79 +1878,6 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) return ref; } -static HRESULT initialize_mmdevices(IXAudio2Impl *This) -{ - IMMDeviceCollection *devcoll; - UINT devcount; - HRESULT hr; - - if(!This->devenum){ - hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, - CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&This->devenum); - if(FAILED(hr)) - return hr; - } - - hr = IMMDeviceEnumerator_EnumAudioEndpoints(This->devenum, eRender, - DEVICE_STATE_ACTIVE, &devcoll); - if(FAILED(hr)){ - return hr; - } - - hr = IMMDeviceCollection_GetCount(devcoll, &devcount); - if(FAILED(hr)){ - IMMDeviceCollection_Release(devcoll); - return hr; - } - - if(devcount > 0){ - UINT i, count = 1; - IMMDevice *dev, *def_dev; - - /* make sure that device 0 is the default device */ - IMMDeviceEnumerator_GetDefaultAudioEndpoint(This->devenum, eRender, eConsole, &def_dev); - - This->devids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * devcount); - - for(i = 0; i < devcount; ++i){ - hr = IMMDeviceCollection_Item(devcoll, i, &dev); - if(SUCCEEDED(hr)){ - UINT idx; - - if(dev == def_dev) - idx = 0; - else{ - idx = count; - ++count; - } - - hr = IMMDevice_GetId(dev, &This->devids[idx]); - if(FAILED(hr)){ - WARN("GetId failed: %08x\n", hr); - HeapFree(GetProcessHeap(), 0, This->devids); - This->devids = NULL; - IMMDevice_Release(dev); - return hr; - } - - IMMDevice_Release(dev); - }else{ - WARN("Item failed: %08x\n", hr); - HeapFree(GetProcessHeap(), 0, This->devids); - This->devids = NULL; - IMMDeviceCollection_Release(devcoll); - return hr; - } - } - } - - IMMDeviceCollection_Release(devcoll); - - This->ndevs = devcount; - - return S_OK; -} - static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { @@ -2104,7 +1897,6 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p return E_OUTOFMEMORY; object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl; - object->IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; #if XAUDIO2_VER == 0 object->IXAudio20_iface.lpVtbl = &XAudio20_Vtbl; @@ -2114,38 +1906,48 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; #endif + object->mst.IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; + #if XAUDIO2_VER == 0 - object->IXAudio20MasteringVoice_iface.lpVtbl = &XAudio20MasteringVoice_Vtbl; + object->mst.IXAudio20MasteringVoice_iface.lpVtbl = &XAudio20MasteringVoice_Vtbl; #elif XAUDIO2_VER <= 3 - object->IXAudio23MasteringVoice_iface.lpVtbl = &XAudio23MasteringVoice_Vtbl; + object->mst.IXAudio23MasteringVoice_iface.lpVtbl = &XAudio23MasteringVoice_Vtbl; #elif XAUDIO2_VER <= 7 - object->IXAudio27MasteringVoice_iface.lpVtbl = &XAudio27MasteringVoice_Vtbl; + object->mst.IXAudio27MasteringVoice_iface.lpVtbl = &XAudio27MasteringVoice_Vtbl; #endif - list_init(&object->source_voices); - list_init(&object->submix_voices); + object->FAudioEngineCallback_vtbl = FAudioEngineCallback_Vtbl; + + list_init(&object->voices); - object->mmevt = CreateEventW(NULL, FALSE, FALSE, NULL); InitializeCriticalSection(&object->lock); object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IXAudio2Impl.lock"); + InitializeCriticalSection(&object->mst.lock); + object->mst.lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": XA2MasteringVoice.lock"); + + pthread_mutex_init(&object->mst.engine_lock, NULL); + pthread_cond_init(&object->mst.engine_done, NULL); + pthread_cond_init(&object->mst.engine_ready, NULL); + + FAudioCOMConstructWithCustomAllocatorEXT( + &object->faudio, + XAUDIO2_VER, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); + + FAudio_RegisterForCallbacks(object->faudio, &object->FAudioEngineCallback_vtbl); + hr = IXAudio2_QueryInterface(&object->IXAudio2_iface, riid, ppobj); if(FAILED(hr)){ + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); HeapFree(GetProcessHeap(), 0, object); return hr; } - hr = initialize_mmdevices(object); - if(FAILED(hr)){ - IUnknown_Release((IUnknown*)*ppobj); - return hr; - } - - object->ncbs = 4; - object->cbs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->ncbs * sizeof(*object->cbs)); - - IXAudio2_StartEngine(&object->IXAudio2_iface); - TRACE("Created XAudio version %u: %p\n", 20 + XAUDIO2_VER, object); return hr; @@ -2167,7 +1969,9 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) +/* Engine Generators */ + +static inline HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); @@ -2179,6 +1983,13 @@ static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) return hr; } +HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) +{ + if(proc != XAUDIO2_ANY_PROCESSOR) + WARN("Processor affinity not implemented in FAudio\n"); + return FAudio_Initialize(This->faudio, flags, FAUDIO_DEFAULT_PROCESSOR); +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -2211,18 +2022,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || IsEqualGUID(rclsid, &CLSID_AudioReverb27)) - return make_xapo_factory(&CLSID_FXReverb, riid, ppv); + return make_xapo_factory(&CLSID_AudioReverb27, riid, ppv); return CLASS_E_CLASSNOTAVAILABLE; } -HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) -{ - if(flags) - FIXME("Unimplemented flags: 0x%x\n", flags); - return S_OK; -} - #if XAUDIO2_VER >= 8 HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc) { @@ -2251,284 +2055,36 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p return S_OK; } -#endif /* XAUDIO2_VER >= 8 */ - -/* returns TRUE if there is more data available in the buffer, FALSE if the - * buffer's data has all been queued */ -static BOOL xa2buffer_queue_period(XA2SourceImpl *src, XA2Buffer *buf, ALuint al_buf) -{ - UINT32 submit_bytes; - const BYTE *submit_buf = NULL; - - if(buf->offs_bytes >= buf->cur_end_bytes){ - WARN("Shouldn't happen: Trying to push frames from a spent buffer?\n"); - return FALSE; - } - - submit_bytes = min(src->xa2->period_frames * src->submit_blocksize, buf->cur_end_bytes - buf->offs_bytes); - submit_buf = buf->xa2buffer.pAudioData + buf->offs_bytes; - buf->offs_bytes += submit_bytes; - - alBufferData(al_buf, src->al_fmt, submit_buf, submit_bytes, - src->fmt->nSamplesPerSec); - - alSourceQueueBuffers(src->al_src, 1, &al_buf); - - src->in_al_bytes += submit_bytes; - src->al_bufs_used++; - - buf->latest_al_buf = al_buf; - - TRACE("queueing %u bytes, now %u in AL\n", submit_bytes, src->in_al_bytes); - - return buf->offs_bytes < buf->cur_end_bytes; -} - -#if XAUDIO2_VER > 0 -static UINT32 get_underrun_warning(XA2SourceImpl *src) -{ - UINT32 period_bytes = src->xa2->period_frames * src->submit_blocksize; - UINT32 total = 0, i; - - for(i = 0; i < src->nbufs && total < IN_AL_PERIODS * period_bytes; ++i){ - XA2Buffer *buf = &src->buffers[(src->first_buf + i) % XAUDIO2_MAX_QUEUED_BUFFERS]; - total += buf->cur_end_bytes - buf->offs_bytes; - if(buf->xa2buffer.LoopCount == XAUDIO2_LOOP_INFINITE) - return 0; - if(buf->xa2buffer.LoopCount > 0){ - total += (buf->loop_end_bytes - buf->xa2buffer.LoopBegin) * (buf->xa2buffer.LoopCount - buf->looped); - total += buf->play_end_bytes - buf->loop_end_bytes; - } - } - - if(total >= IN_AL_PERIODS * period_bytes) - return 0; - - return ((IN_AL_PERIODS * period_bytes - total) / period_bytes + 1) * period_bytes; -} -#endif - -/* Looping: - * - * The looped section of a buffer is a subset of the play area which is looped - * LoopCount times. - * - * v PlayBegin - * vvvvvvvvvvvvvvvvvv PlayLength - * v (PlayEnd) - * [-----PPPLLLLLLLLPPPPPPP------] - * ^ LoopBegin - * ^^^^^^^^ LoopLength - * ^ (LoopEnd) - * - * In the simple case, playback will start at PlayBegin. At LoopEnd, playback - * will move to LoopBegin and repeat that loop LoopCount times. Then, playback - * will cease at PlayEnd. - * - * If PlayLength is zero, then PlayEnd is the end of the buffer. - * - * If LoopLength is zero, then LoopEnd is PlayEnd. - * - * For corner cases and version differences, see tests. - */ -static void update_source_state(XA2SourceImpl *src) -{ - int i; - ALint processed; - ALint bufpos; - - alGetSourcei(src->al_src, AL_BUFFERS_PROCESSED, &processed); - - if(processed > 0){ - ALuint al_buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - - alSourceUnqueueBuffers(src->al_src, processed, al_buffers); - - src->first_al_buf += processed; - src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->al_bufs_used -= processed; - - for(i = 0; i < processed; ++i){ - ALint bufsize; - - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - - src->in_al_bytes -= bufsize; - - if(src->abandoned_albufs == 0){ - src->played_frames += bufsize / src->submit_blocksize; - - if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ - DWORD old_buf = src->first_buf; - - src->first_buf++; - src->first_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - src->nbufs--; - - TRACE("%p: done with buffer %u\n", src, old_buf); - - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - src->played_frames = 0; - - if(src->cb){ - IXAudio2VoiceCallback_OnBufferEnd(src->cb, - src->buffers[old_buf].xa2buffer.pContext); - if(src->buffers[old_buf].xa2buffer.Flags & XAUDIO2_END_OF_STREAM) - IXAudio2VoiceCallback_OnStreamEnd(src->cb); - - if(src->nbufs > 0) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); - } - } - }else{ - src->abandoned_albufs--; - } - } - } - - if(!src->running) - return; - - alGetSourcei(src->al_src, AL_BYTE_OFFSET, &bufpos); - - /* maintain IN_AL_PERIODS periods in AL */ - while(src->cur_buf != (src->first_buf + src->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS && - src->in_al_bytes - bufpos < IN_AL_PERIODS * src->xa2->period_frames * src->submit_blocksize){ - TRACE("%p: going to queue a period from buffer %u\n", src, src->cur_buf); - - /* starting from an empty buffer */ - if(src->cb && src->cur_buf == src->first_buf && src->buffers[src->cur_buf].offs_bytes == 0 && !src->buffers[src->cur_buf].looped) - IXAudio2VoiceCallback_OnBufferStart(src->cb, - src->buffers[src->first_buf].xa2buffer.pContext); - - if(!xa2buffer_queue_period(src, &src->buffers[src->cur_buf], - src->al_bufs[(src->first_al_buf + src->al_bufs_used) % XAUDIO2_MAX_QUEUED_BUFFERS])){ - XA2Buffer *cur = &src->buffers[src->cur_buf]; - - if(cur->looped < cur->xa2buffer.LoopCount){ - if(cur->xa2buffer.LoopCount != XAUDIO2_LOOP_INFINITE) - ++cur->looped; - else - cur->looped = 1; /* indicate that we are executing a loop */ - - cur->offs_bytes = cur->xa2buffer.LoopBegin; - if(cur->looped == cur->xa2buffer.LoopCount) - cur->cur_end_bytes = cur->play_end_bytes; - else - cur->cur_end_bytes = cur->loop_end_bytes; - - if(src->cb) - IXAudio2VoiceCallback_OnLoopEnd(src->cb, - src->buffers[src->cur_buf].xa2buffer.pContext); - - }else{ - /* buffer is spent, move on */ - src->cur_buf++; - src->cur_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; - } - } - } -} -static void do_engine_tick(IXAudio2Impl *This) +HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) { - BYTE *buf; - XA2SourceImpl *src; + IClassFactory *cf; HRESULT hr; - UINT32 nframes, i, pad; - - /* maintain up to 3 periods in mmdevapi */ - hr = IAudioClient_GetCurrentPadding(This->aclient, &pad); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: 0x%x\n", hr); - return; - } - - nframes = This->period_frames * 3 - pad; - - TRACE("frames available: %u\n", nframes); - - if(nframes < This->period_frames) - return; - - if(!nframes) - return; - - for(i = 0; i < This->ncbs && This->cbs[i]; ++i) - IXAudio2EngineCallback_OnProcessingPassStart(This->cbs[i]); - - LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ - ALint st = 0; - - EnterCriticalSection(&src->lock); - - if(!src->in_use){ - LeaveCriticalSection(&src->lock); - continue; - } - - if(src->cb && This->running){ -#if XAUDIO2_VER == 0 - IXAudio20VoiceCallback_OnVoiceProcessingPassStart((IXAudio20VoiceCallback*)src->cb); -#else - UINT32 underrun; - underrun = get_underrun_warning(src); - if(underrun > 0) - TRACE("Calling OnVoiceProcessingPassStart with BytesRequired: %u\n", underrun); - IXAudio2VoiceCallback_OnVoiceProcessingPassStart(src->cb, underrun); -#endif - } - - update_source_state(src); - - if(This->running){ - alGetSourcei(src->al_src, AL_SOURCE_STATE, &st); - if(st != AL_PLAYING) - alSourcePlay(src->al_src); - - if(src->cb) - IXAudio2VoiceCallback_OnVoiceProcessingPassEnd(src->cb); - } - LeaveCriticalSection(&src->lock); - } - - hr = IAudioRenderClient_GetBuffer(This->render, nframes, &buf); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) - WARN("GetBuffer failed: %08x\n", hr); + return hr; - palcRenderSamplesSOFT(This->al_device, buf, nframes); + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - hr = IAudioRenderClient_ReleaseBuffer(This->render, nframes, 0); - if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + IClassFactory_Release(cf); - for(i = 0; i < This->ncbs && This->cbs[i]; ++i) - IXAudio2EngineCallback_OnProcessingPassEnd(This->cbs[i]); + return hr; } -static DWORD WINAPI engine_threadproc(void *arg) +HRESULT WINAPI CreateAudioReverb(IUnknown **out) { - IXAudio2Impl *This = arg; - while(1){ - WaitForSingleObject(This->mmevt, INFINITE); - - if(This->stop_engine) - break; - - EnterCriticalSection(&This->lock); + IClassFactory *cf; + HRESULT hr; - if(!This->running || !This->aclient){ - LeaveCriticalSection(&This->lock); - continue; - } + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; - palcSetThreadContext(This->al_ctx); + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); - do_engine_tick(This); + IClassFactory_Release(cf); - LeaveCriticalSection(&This->lock); - } - return 0; + return hr; } +#endif /* XAUDIO2_VER >= 8 */ diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 5d3814fb9e..84bab8257d 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * Copyright (c) 2018 Ethan Lee for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,33 +18,42 @@ */ #include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "wine/list.h" -#include "mmsystem.h" #include "xaudio2.h" -#include "xaudio2fx.h" #include "xapo.h" -#include "devpkey.h" -#include "mmdeviceapi.h" -#include "audioclient.h" -#include <AL/al.h> -#include <AL/alc.h> -#include <AL/alext.h> +#include <FAudio.h> +#include <FAPO.h> -typedef struct _XA2Buffer { - XAUDIO2_BUFFER xa2buffer; - DWORD offs_bytes; - UINT32 latest_al_buf, looped, loop_end_bytes, play_end_bytes, cur_end_bytes; -} XA2Buffer; +#include <pthread.h> -typedef struct _IXAudio2Impl IXAudio2Impl; +#if XAUDIO2_VER == 0 +#define COMPAT_E_INVALID_CALL E_INVALIDARG +#define COMPAT_E_DEVICE_INVALIDATED XAUDIO20_E_DEVICE_INVALIDATED +#else +#define COMPAT_E_INVALID_CALL XAUDIO2_E_INVALID_CALL +#define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED +#endif -typedef struct _XA2SourceImpl { - IXAudio2SourceVoice IXAudio2SourceVoice_iface; +typedef struct _XA2XAPOImpl { + IXAPO *xapo; + IXAPOParameters *xapo_params; + + LONG ref; + + FAPO FAPO_vtbl; +} XA2XAPOImpl; + +typedef struct _XA2XAPOFXImpl { + IXAPO IXAPO_iface; + IXAPOParameters IXAPOParameters_iface; + + FAPO *fapo; +} XA2XAPOFXImpl; +typedef struct _XA2VoiceImpl { + IXAudio2SourceVoice IXAudio2SourceVoice_iface; #if XAUDIO2_VER == 0 IXAudio20SourceVoice IXAudio20SourceVoice_iface; #elif XAUDIO2_VER <= 3 @@ -52,43 +62,7 @@ typedef struct _XA2SourceImpl { IXAudio27SourceVoice IXAudio27SourceVoice_iface; #endif - IXAudio2Impl *xa2; - - BOOL in_use; - - CRITICAL_SECTION lock; - - WAVEFORMATEX *fmt; - ALenum al_fmt; - UINT32 submit_blocksize; - - IXAudio2VoiceCallback *cb; - - DWORD nsends; - XAUDIO2_SEND_DESCRIPTOR *sends; - - BOOL running; - - UINT64 played_frames; - - XA2Buffer buffers[XAUDIO2_MAX_QUEUED_BUFFERS]; - UINT32 first_buf, cur_buf, nbufs, in_al_bytes; - - UINT32 scratch_bytes, convert_bytes; - BYTE *scratch_buf, *convert_buf; - - ALuint al_src; - /* most cases will only need about 4 AL buffers, but some corner cases - * could require up to MAX_QUEUED_BUFFERS */ - ALuint al_bufs[XAUDIO2_MAX_QUEUED_BUFFERS]; - DWORD first_al_buf, al_bufs_used, abandoned_albufs; - - struct list entry; -} XA2SourceImpl; - -typedef struct _XA2SubmixImpl { IXAudio2SubmixVoice IXAudio2SubmixVoice_iface; - #if XAUDIO2_VER == 0 IXAudio20SubmixVoice IXAudio20SubmixVoice_iface; #elif XAUDIO2_VER <= 3 @@ -97,18 +71,41 @@ typedef struct _XA2SubmixImpl { IXAudio27SubmixVoice IXAudio27SubmixVoice_iface; #endif - BOOL in_use; + IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; +#if XAUDIO2_VER == 0 + IXAudio20MasteringVoice IXAudio20MasteringVoice_iface; +#elif XAUDIO2_VER <= 3 + IXAudio23MasteringVoice IXAudio23MasteringVoice_iface; +#elif XAUDIO2_VER <= 7 + IXAudio27MasteringVoice IXAudio27MasteringVoice_iface; +#endif - XAUDIO2_VOICE_DETAILS details; + FAudioVoiceCallback FAudioVoiceCallback_vtbl; + FAudioEffectChain *effect_chain; + + BOOL in_use; CRITICAL_SECTION lock; + IXAudio2VoiceCallback *cb; + + FAudioVoice *faudio_voice; + + struct { + FAudioEngineCallEXT proc; + FAudio *faudio; + float *stream; + } engine_params; + + HANDLE engine_thread; + pthread_cond_t engine_done, engine_ready; + pthread_mutex_t engine_lock; + struct list entry; -} XA2SubmixImpl; +} XA2VoiceImpl; -struct _IXAudio2Impl { +typedef struct _IXAudio2Impl { IXAudio2 IXAudio2_iface; - IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; #if XAUDIO2_VER == 0 IXAudio20 IXAudio20_iface; @@ -118,59 +115,43 @@ struct _IXAudio2Impl { IXAudio27 IXAudio27_iface; #endif -#if XAUDIO2_VER == 0 - IXAudio20MasteringVoice IXAudio20MasteringVoice_iface; -#elif XAUDIO2_VER <= 3 - IXAudio23MasteringVoice IXAudio23MasteringVoice_iface; -#elif XAUDIO2_VER <= 7 - IXAudio27MasteringVoice IXAudio27MasteringVoice_iface; -#endif - - LONG ref; - CRITICAL_SECTION lock; - HANDLE engine, mmevt; - BOOL stop_engine; - - struct list source_voices; - struct list submix_voices; - - IMMDeviceEnumerator *devenum; + struct list voices; - WCHAR **devids; - UINT32 ndevs; + FAudio *faudio; - UINT32 last_query_glitches; + FAudioEngineCallback FAudioEngineCallback_vtbl; - IAudioClient *aclient; - IAudioRenderClient *render; + XA2VoiceImpl mst; - UINT32 period_frames; - - WAVEFORMATEXTENSIBLE fmt; - - ALCdevice *al_device; - ALCcontext *al_ctx; + DWORD last_query_glitches; UINT32 ncbs; IXAudio2EngineCallback **cbs; - - BOOL running; -}; +} IXAudio2Impl; #if XAUDIO2_VER == 0 extern const IXAudio20SourceVoiceVtbl XAudio20SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20SubmixVoice(IXAudio20SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio20MasteringVoice(IXAudio20MasteringVoice *iface) DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 3 extern const IXAudio23SourceVoiceVtbl XAudio23SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio23SubmixVoiceVtbl XAudio23SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio23MasteringVoiceVtbl XAudio23MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23SourceVoice(IXAudio23SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23SubmixVoice(IXAudio23SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio23MasteringVoice(IXAudio23MasteringVoice *iface) DECLSPEC_HIDDEN; #elif XAUDIO2_VER <= 7 extern const IXAudio27SourceVoiceVtbl XAudio27SourceVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27SubmixVoiceVtbl XAudio27SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27MasteringVoiceVtbl XAudio27MasteringVoice_Vtbl DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27SourceVoice(IXAudio27SourceVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27SubmixVoice(IXAudio27SubmixVoice *iface) DECLSPEC_HIDDEN; +extern XA2VoiceImpl *impl_from_IXAudio27MasteringVoice(IXAudio27MasteringVoice *iface) DECLSPEC_HIDDEN; #endif #if XAUDIO2_VER == 0 @@ -181,5 +162,16 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif -extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +/* xaudio_dll.c */ extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN; +extern FAudioEffectChain *wrap_effect_chain(const XAUDIO2_EFFECT_CHAIN *pEffectChain) DECLSPEC_HIDDEN; +extern void engine_cb(FAudioEngineCallEXT proc, FAudio *faudio, float *stream, void *user) DECLSPEC_HIDDEN; +extern DWORD WINAPI engine_thread(void *user) DECLSPEC_HIDDEN; + +/* xapo.c */ +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; + +/* xaudio_allocator.c */ +extern void* XAudio_Internal_Malloc(size_t size) DECLSPEC_HIDDEN; +extern void XAudio_Internal_Free(void* ptr) DECLSPEC_HIDDEN; +extern void* XAudio_Internal_Realloc(void* ptr, size_t size) DECLSPEC_HIDDEN; diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index d4efc41d5c..b591b1141b 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,13 +1,16 @@ EXTRADEFS = -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ xapofx.c \ - xaudio_dll.c + x3daudio.c \ + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_9/Makefile.in b/dlls/xaudio2_9/Makefile.in index ceb2216f5a..99f1bd0deb 100644 --- a/dlls/xaudio2_9/Makefile.in +++ b/dlls/xaudio2_9/Makefile.in @@ -1,13 +1,16 @@ EXTRADEFS = -DXAUDIO2_VER=9 MODULE = xaudio2_9.dll IMPORTS = advapi32 ole32 user32 uuid -EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + xaudio_allocator.c \ compat.c \ - x3daudio.c \ xapofx.c \ - xaudio_dll.c + x3daudio.c \ + xaudio_dll.c \ + xapo.c IDL_SRCS = xaudio_classes.idl -- 2.17.2

4 17

[PATCH v3 1/9] user32: SetWindowPos() shouldn't change the client rect of a minimized window.
by Zebediah Figura 19 Feb '19

19 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 12 ++++++++++++ dlls/user32/winpos.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 50dbf49e19..ceb4b82313 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6548,6 +6548,18 @@ static void test_ShowWindow(void) wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); todo_wine + ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); + /* SetWindowPos shouldn't affect the client rect */ + ret = SetWindowPos(hwnd, 0, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); + GetClientRect(hwnd, &rc); + todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4b39d0aa39..38444b243f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1699,7 +1699,7 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC WIN_GetRectangles( pWinpos->hwnd, COORDS_PARENT, old_window_rect, old_client_rect ); *new_window_rect = *old_window_rect; - *new_client_rect = (wndPtr->dwStyle & WS_MINIMIZE) ? *old_window_rect : *old_client_rect; + *new_client_rect = *old_client_rect; if (!(pWinpos->flags & SWP_NOSIZE)) { -- 2.20.1

2 14

[PATCH v2] secur32: Use offsetof() instead of pointer substraction
by Michael Stefaniuc 19 Feb '19

19 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Drop the const as that is unnecessary dlls/secur32/secur32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b3ab80a850..8288286c61 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -247,8 +247,8 @@ static void _makeFnTableA(PSecurityFunctionTableA fnTableA, * implemented (yikes) */ size_t tableSize = inFnTableA->dwVersion == 1 ? - (const BYTE *)&inFnTableA->SetContextAttributesA - - (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA); + offsetof(SecurityFunctionTableA, SetContextAttributesA) : + sizeof(SecurityFunctionTableA); memcpy(fnTableA, inFnTableA, tableSize); /* override this, since we can do it internally anyway */ @@ -318,8 +318,8 @@ static void _makeFnTableW(PSecurityFunctionTableW fnTableW, * implemented (yikes) */ size_t tableSize = inFnTableW->dwVersion == 1 ? - (const BYTE *)&inFnTableW->SetContextAttributesW - - (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW); + offsetof(SecurityFunctionTableW, SetContextAttributesW) : + sizeof(SecurityFunctionTableW); memcpy(fnTableW, inFnTableW, tableSize); /* override this, since we can do it internally anyway */ -- 2.20.1

1 0

[PATCH] secur32: Use offsetof() instead of pointer substraction
by Michael Stefaniuc 19 Feb '19

19 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/secur32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index b3ab80a850..909207f0c6 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -247,8 +247,8 @@ static void _makeFnTableA(PSecurityFunctionTableA fnTableA, * implemented (yikes) */ size_t tableSize = inFnTableA->dwVersion == 1 ? - (const BYTE *)&inFnTableA->SetContextAttributesA - - (const BYTE *)inFnTableA : sizeof(SecurityFunctionTableA); + offsetof(const SecurityFunctionTableA, SetContextAttributesA) : + sizeof(SecurityFunctionTableA); memcpy(fnTableA, inFnTableA, tableSize); /* override this, since we can do it internally anyway */ @@ -318,8 +318,8 @@ static void _makeFnTableW(PSecurityFunctionTableW fnTableW, * implemented (yikes) */ size_t tableSize = inFnTableW->dwVersion == 1 ? - (const BYTE *)&inFnTableW->SetContextAttributesW - - (const BYTE *)inFnTableW : sizeof(SecurityFunctionTableW); + offsetof(const SecurityFunctionTableW, SetContextAttributesW) : + sizeof(SecurityFunctionTableW); memcpy(fnTableW, inFnTableW, tableSize); /* override this, since we can do it internally anyway */ -- 2.20.1

1 0

[PATCH v2 1/9] user32: Correctly calculate the client size of a minimized window.
by Zebediah Figura 19 Feb '19

19 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/nonclient.c | 5 +++++ dlls/user32/tests/win.c | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 4444a2c91e..26bb0a01b5 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -414,6 +414,11 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (winRect->left > winRect->right) winRect->right = winRect->left; } + else + { + winRect->right = winRect->left; + winRect->bottom = winRect->top; + } return result; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ceb4b82313..308e243c3d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6469,7 +6469,7 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized; + RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient; LPARAM ret; MONITORINFO mon_info; @@ -6533,7 +6533,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ @@ -6547,7 +6546,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); /* SetWindowPos shouldn't affect the client rect */ @@ -6559,9 +6557,14 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); + /* test NC area */ + GetWindowRect(hwnd, &rc); + SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", + wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6651,7 +6654,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); @@ -6667,7 +6669,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); @@ -6710,7 +6711,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); @@ -6729,7 +6729,6 @@ static void test_ShowWindow(void) ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); GetClientRect(hwnd, &rc); - todo_wine ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); @@ -6740,7 +6739,7 @@ static void test_ShowWindow(void) static void test_ShowWindow_owned(HWND hwndMain) { MONITORINFO mon_info = {sizeof(mon_info)}; - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND hwnd, hwnd2; LONG style; @@ -6798,6 +6797,12 @@ static void test_ShowWindow_owned(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized owned windows stack next to each other (and eventually * on top of each other) */ @@ -6863,7 +6868,7 @@ static void test_ShowWindow_owned(HWND hwndMain) static void test_ShowWindow_child(HWND hwndMain) { - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND hwnd, hwnd2; LONG style; @@ -6926,6 +6931,12 @@ static void test_ShowWindow_child(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized children also stack; here the parent is too small to * fit more than one per row */ @@ -6993,7 +7004,7 @@ static void test_ShowWindow_child(HWND hwndMain) static void test_ShowWindow_mdichild(HWND hwndMain) { - RECT rect, orig, expect; + RECT rect, orig, expect, nc; BOOL ret; HWND mdiclient, hwnd, hwnd2; LONG style; @@ -7051,6 +7062,12 @@ static void test_ShowWindow_mdichild(HWND hwndMain) todo_wine ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); + /* test NC area */ + GetWindowRect(hwnd, &rect); + SetRect(&nc, rect.left, rect.top, rect.left, rect.top); + DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(EqualRect(&rect, &nc), "expected %s, got %s\n", + wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); /* multiple minimized children also stack; here the parent is too small to * fit more than one per row */ -- 2.20.1

2 17

[PATCH] wined3d: Use LSB only in _SAMP_SRGB_TEXTURE state value.
by Paul Gofman 19 Feb '19

19 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> The final version of wined3d changes were suggested by Henri Verbeet. --- dlls/d3d9/tests/visual.c | 149 +++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 5 ++ 4 files changed, 148 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13cf6c7283..d0e2932db5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8886,11 +8886,11 @@ done: static void srgbtexture_test(void) { - /* Fill a texture with 0x7f (~ .5), and then turn on the D3DSAMP_SRGBTEXTURE - * texture stage state to render a quad using that texture. The resulting - * color components should be 0x36 (~ 0.21), per this formula: + /* The result of SRGB to linear conversion for value 0x7f (~ .5) used on + * texture mip level 0 should be 0x36 (~ 0.21), per this formula: * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 - * This is true where srgb_color > 0.04045. */ + * This is true where srgb_color > 0.04045. + * For the value of 0x3f used on mip level 1 the result should be 0x0d (~0.05). */ struct IDirect3DTexture9 *texture; struct IDirect3DSurface9 *surface; IDirect3DDevice9 *device; @@ -8898,6 +8898,7 @@ static void srgbtexture_test(void) D3DCOLOR color; ULONG refcount; HWND window; + DWORD value; HRESULT hr; static const float quad[] = @@ -8925,38 +8926,168 @@ static void srgbtexture_test(void) goto done; } - hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 2, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed, hr %#x.\n", hr); fill_surface(surface, 0xff7f7f7f, 0); IDirect3DSurface9_Release(surface); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface); + ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel failed, hr %#x.\n", hr); + fill_surface(surface, 0xff3f3f3f, 0); + IDirect3DSurface9_Release(surface); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); + /* AMD uses LSB from D3DSAMP_SRGBTEXTURE value. + * NVIDIA ignores any values except for 0 or 1 leaving previous D3DSAMP_SRGBTEXTURE state. + * Intel, WARP treat the value as boolean. */ hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 100); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 100, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 2); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 2, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || broken(color_match(color, 0x00363636, 1)), + "sRGB quad has color 0x%08x, expected 0x007f7f7f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 3); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 3, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x007f7f7f, 1) || color_match(color, 0x00363636, 1), + "sRGB quad has color 0x%08x, expected 0x007f7f7f or 0x00363636.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == TRUE, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); ok(color_match(color, 0x00363636, 1), "sRGB quad has color 0x%08x, expected 0x00363636.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + /* Set the other state to verify that the sampler just inherits old D3DSAMP_SRGBTEXTURE but + * the old sampler is not preserved entirely on NVIDIA. */ + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x000d0d0d, 1) || color_match(color, 0x003f3f3f, 1), + "sRGB quad has color 0x%08x, expected 0x000d0d0d or 0x003f3f3f.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1), "sRGB quad has color 0x%08x, expected 0x003f3f3f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, 0x7e41882a); + ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, &value); + ok(SUCCEEDED(hr), "Failed to get sampler state, hr %#x.\n", hr); + ok(value == 0x7e41882a, "Unexpected D3DSAMP_SRGBTEXTURE value %#x.\n", value); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x003f3f3f, 1) || broken(color_match(color, 0x000d0d0d, 1)), + "sRGB quad has color 0x%08x, expected 0x003f3f3f.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); IDirect3DTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 96ba06ddf1..63ff833691 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3719,7 +3719,7 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; - wined3d_texture_load(texture, context, state->sampler_states[idx][WINED3D_SAMP_SRGB_TEXTURE]); + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0f7b030b0c..43746a4363 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3574,7 +3574,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->max_anisotropy = 1; desc->compare = texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_SHADOW; desc->comparison_func = WINED3D_CMP_LESSEQUAL; - desc->srgb_decode = sampler_states[WINED3D_SAMP_SRGB_TEXTURE]; + desc->srgb_decode = is_srgb_enabled(sampler_states); if (!(texture_gl->t.resource.format_flags & WINED3DFMT_FLAG_FILTERING)) { @@ -3615,9 +3615,9 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (state->textures[sampler_idx]) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]); - BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; const DWORD *sampler_states = state->sampler_states[sampler_idx]; struct wined3d_device *device = context->device; + BOOL srgb = is_srgb_enabled(sampler_states); struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57df9f1eb2..5c5e515e50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4591,6 +4591,11 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } +static inline BOOL is_srgb_enabled(const DWORD *sampler_states) +{ + return sampler_states[WINED3D_SAMP_SRGB_TEXTURE] & 0x1; +} + static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { -- 2.20.1

2 1

[PATCH] winmm/tests: Floating point numeric constants are by default doubles
by Michael Stefaniuc 19 Feb '19

19 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c106594b3f..9c114c87a0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -102,11 +102,11 @@ static char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { - unsigned char sample=(unsigned char)((double)127.5*(y+1.0)); + unsigned char sample=(unsigned char)(127.5*(y+1.0)); for (j = 0; j < wfx->nChannels; j++) *b++=sample; } else if (wfx->wBitsPerSample==16) { - signed short sample=(signed short)((double)32767.5*y-0.5); + signed short sample=(signed short)(32767.5*y-0.5); for (j = 0; j < wfx->nChannels; j++) { b[0]=sample & 0xff; b[1]=sample >> 8; -- 2.20.1

2 1

[PATCH 01/10] explorer: Enable the taskbar by default.
by Zebediah Figura 19 Feb '19

19 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Apologies for the rather large series, but I didn't want to leave minimized windows in a half-migrated state. programs/explorer/desktop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24901..24ce8702a9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -754,7 +754,6 @@ static BOOL get_default_enable_shell( const WCHAR *name ) 'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; static const WCHAR enable_shellW[] = {'E','n','a','b','l','e','S','h','e','l','l',0}; - static const WCHAR shellW[] = {'s','h','e','l','l',0}; HKEY hkey; BOOL found = FALSE; BOOL result; @@ -767,9 +766,9 @@ static BOOL get_default_enable_shell( const WCHAR *name ) found = TRUE; RegCloseKey( hkey ); } - /* Default off, except for the magic desktop name "shell" */ + /* Default on */ if (!found) - result = (lstrcmpiW( name, shellW ) == 0); + result = TRUE; return result; } -- 2.20.1

3 20

[PATCH v5 1/6] comctl32/listbox: Use a helper to retrieve item height by index
by Gabriel Ivăncescu 19 Feb '19

19 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c5..a457d63 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -163,6 +163,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static UINT get_item_height( const LB_DESCR *descr, UINT index ) +{ + return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -187,7 +192,7 @@ static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; for (i = descr->top_item, height = 0; i < descr->nb_items; i++) { - if ((height += descr->items[i].height) > descr->height) break; + if ((height += get_item_height(descr, i)) > descr->height) break; } if (i == descr->top_item) return 1; else return i - descr->top_item; @@ -207,7 +212,7 @@ static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { page = descr->height; for (max = descr->nb_items - 1; max >= 0; max--) - if ((page -= descr->items[max].height) < 0) break; + if ((page -= get_item_height(descr, max)) < 0) break; if (max < descr->nb_items - 1) max++; } else if (descr->style & LBS_MULTICOLUMN) @@ -335,12 +340,12 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) if (index > descr->top_item) { for (i = index - 1; i >= descr->top_item; i--) - dy -= descr->items[i].height; + dy -= get_item_height(descr, i); } else { for (i = index; i < descr->top_item; i++) - dy += descr->items[i].height; + dy += get_item_height(descr, i); } } else @@ -456,14 +461,14 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect if (index < descr->top_item) { for (i = descr->top_item-1; i >= index; i--) - rect->top -= descr->items[i].height; + rect->top -= get_item_height(descr, i); } else { for (i = descr->top_item; i < index; i++) - rect->top += descr->items[i].height; + rect->top += get_item_height(descr, i); } - rect->bottom = rect->top + descr->items[index].height; + rect->bottom = rect->top + get_item_height(descr, index); } } @@ -498,7 +503,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { while (index < descr->nb_items) { - if ((pos += descr->items[index].height) > y) break; + if ((pos += get_item_height(descr, index)) > y) break; index++; } } @@ -507,7 +512,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) while (index > 0) { index--; - if ((pos -= descr->items[index].height) <= y) break; + if ((pos -= get_item_height(descr, index)) <= y) break; } } } @@ -1057,7 +1062,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (!(descr->style & LBS_OWNERDRAWVARIABLE)) rect.bottom = rect.top + descr->item_height; else - rect.bottom = rect.top + descr->items[i].height; + rect.bottom = rect.top + get_item_height(descr, i); /* keep the focus rect, to paint the focus item after */ if (i == descr->focus_item) @@ -1204,7 +1209,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[index].height; + return get_item_height(descr, index); } else return descr->item_height; } @@ -1374,9 +1379,9 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) } else if (descr->style & LBS_OWNERDRAWVARIABLE) { - INT height = fully ? descr->items[index].height : 1; + INT height = fully ? get_item_height(descr, index) : 1; for (top = index; top > descr->top_item; top--) - if ((height += descr->items[top-1].height) > descr->height) break; + if ((height += get_item_height(descr, top - 1)) > descr->height) break; } else { @@ -1587,7 +1592,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); item->height = mis.itemHeight ? mis.itemHeight : 1; TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); + descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); } /* Repaint the items */ -- 2.20.1

1 5

[v2 PATCH 1/4] mfplat/tests: Remove initialization from tests that don't need it.
by Nikolay Sivov 19 Feb '19

19 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde421d..7d202bc2e5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); -- 2.20.1

1 3

[PATCH 1/4] mfplat/tests: Remove initialization from tests that don't need it.
by Nikolay Sivov 19 Feb '19

19 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde421d..7d202bc2e5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent(); -- 2.20.1

2 4

[PATCH 1/4] ext-ms-win-gdi-draw-l1-1-0: Add dll.
by Andrey Gusev 19 Feb '19

19 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 3 files changed, 20 insertions(+) create mode 100644 dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000000..1a0efdfd28 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec new file mode 100644 index 0000000000..6f1f587045 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index d93723daf7..c00f3bfe8a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -435,6 +435,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", + "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", -- 2.20.1

1 3

[PATCH v4 1/4] comctl32/listbox: Move the item data insertion into a separate function
by Gabriel Ivăncescu 19 Feb '19

19 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch. nb_items is incremented before the call and this is taken care of in the helper function. This is for two reasons: 1) This simplifies the nodata patch (only adds a single line to insert_item_data). 2) This matches what RemoveItem does, so it's more consistent. dlls/comctl32/listbox.c | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c5..330d3ae 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -176,6 +176,38 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, INT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = &descr->items[index]; + + if (index < descr->nb_items - 1) + RtlMoveMemory(item + 1, item, + (descr->nb_items - 1 - index) * sizeof(LB_ITEMDATA)); + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; + + /* Get item height */ + if (descr->style & LBS_OWNERDRAWVARIABLE) + { + MEASUREITEMSTRUCT mis; + UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); + + mis.CtlType = ODT_LISTBOX; + mis.CtlID = id; + mis.itemID = index; + mis.itemData = data; + mis.itemHeight = descr->item_height; + SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); + item->height = mis.itemHeight ? mis.itemHeight : 1; + TRACE("[%p]: measure item %d (%s) = %d\n", + descr->self, index, str ? debugstr_w(str) : "", item->height ); + } +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1553,42 +1585,14 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; descr->nb_items++; - - /* Get item height */ - - if (descr->style & LBS_OWNERDRAWVARIABLE) - { - MEASUREITEMSTRUCT mis; - UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); - - mis.CtlType = ODT_LISTBOX; - mis.CtlID = id; - mis.itemID = index; - mis.itemData = data; - mis.itemHeight = descr->item_height; - SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; - TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); - } + insert_item_data(descr, index, str, data); /* Repaint the items */ -- 2.20.1

2 7

[PATCH] msi: Don't use delay imports.
by Hans Leidekker 19 Feb '19

19 Feb '19

This avoids problems with disabling Wow64 filesystem redirection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46654 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 4434a3ff6d..7140e5a330 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,6 @@ MODULE = msi.dll IMPORTLIB = msi -IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs -DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp mspatcha +IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32 EXTRAIDLFLAGS = --prefix-server=s_ -- 2.20.1

1 0

[PATCH] gdi32: Add a workaround for Freetype < 2.8.1 using v40 FT_LOAD_TARGET_MONO.
by Huw Davies 19 Feb '19

19 Feb '19

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Freetype < 2.8.1 v40 has incorrect advance widths and rendering issues. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0fc41f3902..098faff342 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -170,6 +170,7 @@ static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef FT_LCD_FILTER_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif +static FT_Error (*pFT_Property_Set)(FT_Library, const FT_String *, const FT_String *, const void *); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> @@ -4162,6 +4163,7 @@ static BOOL init_freetype(void) #ifdef FT_LCD_FILTER_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); #endif + pFT_Property_Set = wine_dlsym(ft_handle, "FT_Property_Set", NULL, 0); if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -4176,6 +4178,13 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + /* In Freetype < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ + if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) + { + FT_UInt interpreter_version = 35; + pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); + } + font_driver = &freetype_funcs; return TRUE; -- 2.18.0

1 0

[PATCH] po: Update Russian translation.
by Nikolay Sivov 19 Feb '19

19 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index dd22cee0fd..58713e048c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-11 15:59+0300\n" +"PO-Revision-Date: 2019-02-19 09:59+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.2.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -9100,16 +9100,12 @@ msgid "Cape Verde Daylight Time" msgstr "" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:140 msgid "Morocco Standard Time" @@ -9120,16 +9116,12 @@ msgid "Morocco Daylight Time" msgstr "" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Центральноевропейский" +msgstr "" #: tzres.rc:118 msgid "Iran Standard Time" @@ -9164,10 +9156,8 @@ msgid "Mountain Daylight Time (Mexico)" msgstr "" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:107 msgid "GMT Daylight Time" @@ -9338,10 +9328,8 @@ msgid "India Daylight Time" msgstr "" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:113 msgid "GTB Daylight Time" @@ -9660,10 +9648,8 @@ msgid "Paraguay Daylight Time" msgstr "" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:85 msgid "Dateline Daylight Time" @@ -9750,16 +9736,12 @@ msgid "Greenland Daylight Time" msgstr "" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Дата и время" +msgstr "" #: tzres.rc:96 msgid "Egypt Standard Time" @@ -9810,10 +9792,8 @@ msgid "E. Africa Daylight Time" msgstr "" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Стандартная панель" +msgstr "" #: tzres.rc:103 msgid "FLE Daylight Time" @@ -14790,7 +14770,7 @@ msgstr "Просмотрщик обычных метафайлов" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Метафайлы (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -16335,10 +16315,8 @@ msgid "Text documents (*.txt)" msgstr "Текстовые документы (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Документы Unicode (*.txt)" +msgstr "Текстовые документы Unicode (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)" -- 2.20.1

1 0

po: Update Lithuanian translation
by Aurimas Fišeras 19 Feb '19

19 Feb '19

1 0

[PATCH] hnetcfg: Remove redundant "not NULL" check (coccinellery)
by Michael Stefaniuc 18 Feb '19

18 Feb '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/policy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index c2f32520bd..53f39ae46f 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -641,11 +641,8 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru if(!rules) return E_POINTER; - if(rules) - { - *rules = This->fw_policy2_rules; - INetFwRules_AddRef(This->fw_policy2_rules); - } + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); return S_OK; } -- 2.20.1

1 0

[PATCH v6] po: Update Sinhala translation.
by Isira Seneviratne 18 Feb '19

18 Feb '19

1 0

[PATCH v3] po: Add Tamil translation.
by Isira Seneviratne 18 Feb '19

18 Feb '19

1 0

[PATCH v2] po: Add Tamil translation.
by Isira Seneviratne 18 Feb '19

18 Feb '19

1 0

[PATCH 4/4] atlthunk/tests: Add tests.
by Jacek Caban 18 Feb '19

18 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atlthunk/tests/Makefile.in | 6 ++++ dlls/atlthunk/tests/atlthunk.c | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 dlls/atlthunk/tests/Makefile.in create mode 100644 dlls/atlthunk/tests/atlthunk.c

1 0

[PATCH 3/4] atlthunk: Implement AtlThunk functions.
by Jacek Caban 18 Feb '19

18 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atlthunk/atlthunk.c | 132 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 5 deletions(-)

1 0

[PATCH 2/4] atlthunk: Add stub DLL.
by Jacek Caban 18 Feb '19

18 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/atlthunk/Makefile.in | 5 +++++ dlls/atlthunk/atlthunk.c | 45 +++++++++++++++++++++++++++++++++++++ dlls/atlthunk/atlthunk.spec | 4 ++++ 3 files changed, 54 insertions(+) create mode 100644 dlls/atlthunk/Makefile.in create mode 100644 dlls/atlthunk/atlthunk.c create mode 100644 dlls/atlthunk/atlthunk.spec

1 0

[PATCH 1/4] include: Add atlthunk.h.
by Jacek Caban 18 Feb '19

18 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/atlthunk.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 include/atlthunk.h

1 0

[PATCH] Update Wine Mono to 4.8.0.
by Vincent Povirk 18 Feb '19

18 Feb '19

New in this release: * Nearly 2 years of updates from the Mono project. * A separate Framework64 directory is now created in 64-bit prefixes, fixing bug 46639. * The csc command-line interface to the C# compiler is now present in Framework directories. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5b71a66c063..225f9158ed8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.5" -#define MONO_SHA "154d68d476cdedef56f159d837fbb5eef9358a9f85de89f86c189ec4da004b3f" +#define MONO_VERSION "4.8.0" +#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 19d120e0d2e..785ecd04040 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.5"; + static const char* mono_version = "4.8.0"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; -- 2.17.1

1 0

[PATCH 1/4] ext-ms-win-ntuser-windowclass-l1-1-0: Add dll. (v2)
by Andrey Gusev 18 Feb '19

18 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- .../Makefile.in | 1 + .../ext-ms-win-ntuser-windowclass-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 3 files changed, 17 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in new file mode 100644 index 0000000000..9f5a87a79f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-windowclass-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec new file mode 100644 index 0000000000..8b2ab2b260 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec @@ -0,0 +1,15 @@ +@ 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 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 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 7666c3ceeb..8f771b8d8c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "api-ms-win-ntuser-rectangle-l1-1-0", "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", -- 2.20.1

1 3

[PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 18 Feb '19

18 Feb '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 110 ++++++++++++++++++++++++++++------- 1 file changed, 89 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b62660750..97e9549bd1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3223,6 +3224,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3232,6 +3311,8 @@ static HMODULE load_driver_module( const WCHAR *name ) int i; INT_PTR delta; ULONG size; + DWORD old; + NTSTATUS status; HMODULE module = LoadLibraryW( name ); if (!module) return NULL; @@ -3246,28 +3327,15 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; + status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + if (status != STATUS_SUCCESS) + goto error; - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + /* make sure we don't try again */ + size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; + VirtualProtect( nt, size, PAGE_READWRITE, &old ); + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = 0; + VirtualProtect( nt, size, old, &old ); } /* make sure imports are relocated too */ -- 2.17.1

3 2

[PATCH] ext-ms-win-ntuser-window-l1-1-0: Add dll.
by Andrey Gusev 18 Feb '19

18 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../ext-ms-win-ntuser-window-l1-1-0.spec | 40 +++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 45 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec diff --git a/configure b/configure index 0977348ccc..545992d616 100755 --- a/configure +++ b/configure @@ -1279,6 +1279,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_private_l1_3_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_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_window_l1_1_4 enable_ext_ms_win_ntuser_windowclass_l1_1_1 @@ -19577,6 +19578,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-3-1 enable_ext_ms_win_ntuser_private_l1_3_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-0 enable_ext_ms_win_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-0 enable_ext_ms_win_ntuser_windowclass_l1_1_0 diff --git a/configure.ac b/configure.ac index e3b7016d88..16f72f635b 100644 --- a/configure.ac +++ b/configure.ac @@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-3-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in new file mode 100644 index 0000000000..d89b45b83f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-window-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec new file mode 100644 index 0000000000..52b974806d --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall AdjustWindowRectEx(ptr long long long) user32.AdjustWindowRectEx +@ stdcall AllowSetForegroundWindow (long) user32.AllowSetForegroundWindow +@ stdcall AnimateWindow(long long long) user32.AnimateWindow +@ stdcall BringWindowToTop(long) user32.BringWindowToTop +@ stdcall CallNextHookEx(long long long long) user32.CallNextHookEx +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) user32.CreateWindowExA +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DefWindowProcA(long long long long) user32.DefWindowProcA +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumThreadWindows(long ptr long) user32.EnumThreadWindows +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowA(str str) user32.FindWindowA +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetShellWindow() user32.GetShellWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo +@ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsIconic(long) user32.IsIconic +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stub SoundSentry +@ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 8f771b8d8c..42e0f9f51b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -391,6 +391,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", + "ext-ms-win-ntuser-window-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", "ext-ms-win-rtcore-ntuser-cursor-l1-1-0", -- 2.20.1

2 1

[PATCH] ext-ms-win-gdi-dc-create-l1-1-0: Add dll.
by Andrey Gusev 18 Feb '19

18 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-dc-create-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) create mode 100644 dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec diff --git a/configure b/configure index 545992d616..a17f6139bf 100755 --- a/configure +++ b/configure @@ -1261,6 +1261,7 @@ enable_explorerframe enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +enable_ext_ms_win_gdi_dc_create_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -19560,6 +19561,7 @@ wine_fn_config_makefile dlls/explorerframe/tests enable_tests wine_fn_config_makefile dlls/ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-dwmapi-ext-l1-1-0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-0 enable_ext_ms_win_gdi_dc_create_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index 16f72f635b..e468966f5e 100644 --- a/configure.ac +++ b/configure.ac @@ -3298,6 +3298,7 @@ WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in new file mode 100644 index 0000000000..aa82fc2cb7 --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-create-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec new file mode 100644 index 0000000000..114f8bcfdf --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CreateCompatibleDC(long) gdi32.CreateCompatibleDC +@ stdcall CreateDCW(wstr wstr wstr ptr) gdi32.CreateDCW +@ stdcall DeleteDC(long) gdi32.DeleteDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 42e0f9f51b..d93723daf7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -431,6 +431,7 @@ my @dll_groups = "gdi32", "api-ms-win-dx-d3dkmt-l1-1-0", "api-ms-win-gdi-dpiinfo-l1-1-0", + "ext-ms-win-gdi-dc-create-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", -- 2.20.1

1 0

[PATCH] ext-ms-win-ntuser-window-l1-1-4: Update spec file.
by Andrey Gusev 18 Feb '19

18 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- .../ext-ms-win-ntuser-window-l1-1-4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec index 77e7b1fe0b..a950535add 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec @@ -1,3 +1,4 @@ +@ stdcall CallWindowProcW(ptr long long long long) user32.CallWindowProcW @ stdcall KillTimer(long long) user32.KillTimer @ stdcall ScreenToClient(long ptr) user32.ScreenToClient @ stdcall SetTimer(long long long ptr) user32.SetTimer -- 2.20.1

1 0

[PATCH] ext-ms-win-ntuser-windowclass-l1-1-0: Add dll.
by Andrey Gusev 18 Feb '19

18 Feb '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- configure | 1 + configure.ac | 1 + .../Makefile.in | 1 + .../ext-ms-win-ntuser-windowclass-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 19 insertions(+) create mode 100644 dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec diff --git a/configure b/configure index 4ab39a48aa..0977348ccc 100755 --- a/configure +++ b/configure @@ -19579,6 +19579,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_m wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-0 enable_ext_ms_win_ntuser_windowclass_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 60f8accf16..e3b7016d88 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-4) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in new file mode 100644 index 0000000000..9f5a87a79f --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-windowclass-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec new file mode 100644 index 0000000000..8b2ab2b260 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec @@ -0,0 +1,15 @@ +@ 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 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 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 7666c3ceeb..8f771b8d8c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "api-ms-win-ntuser-rectangle-l1-1-0", "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", -- 2.20.1

1 0

[PATCH] windowscodecs: Add missing source_bpp initialization (Valgrind).
by Sven Baars 18 Feb '19

18 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/windowscodecs/tiffformat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3d53b2439a..58cd04ef17 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -289,6 +289,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->reverse_bgr = 0; decode_info->invert_grayscale = 0; decode_info->tiled = 0; + decode_info->source_bpp = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret) -- 2.17.1

2 1

[PATCH] windowscodecs/tests: Fix a memory leak (Valgrind).
by Sven Baars 18 Feb '19

18 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/windowscodecs/tests/converter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1cfa29b4df..7f5ba9bda1 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -843,6 +843,8 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else tag[i].value[0] = -1; + + PropVariantClear(&value); } IWICMetadataReader_Release(reader); -- 2.17.1

2 1

[PATCH] windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter.
by Dmitry Timoshkov 18 Feb '19

18 Feb '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 112 +++++++++++++++++++++++++++ dlls/windowscodecs/info.c | 2 + dlls/windowscodecs/regsvr.c | 36 +++++++++ dlls/windowscodecs/tests/converter.c | 45 ++++++++++- 4 files changed, 194 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 83f1339d0c..9083aa04f7 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -53,8 +53,11 @@ enum pixelformat { format_24bppRGB, format_32bppGrayFloat, format_32bppBGR, + format_32bppRGB, format_32bppBGRA, + format_32bppRGBA, format_32bppPBGRA, + format_32bppPRGBA, format_48bppRGB, format_64bppRGBA, format_32bppCMYK, @@ -858,6 +861,63 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe } } +static HRESULT copypixels_to_32bppRGBA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppRGB: + if (prc) + { + INT x, y; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(hr)) return hr; + + /* set all alpha values to 255 */ + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + pbBuffer[cbStride*y+4*x+3] = 0xff; + } + return S_OK; + + case format_32bppRGBA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + + case format_32bppPRGBA: + if (prc) + { + INT x, y; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(hr)) return hr; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 0 && alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * 255 / alpha; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * 255 / alpha; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * 255 / alpha; + } + } + } + return S_OK; + + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + reverse_bgr8(4, pbBuffer, prc->Width, prc->Height, cbStride); + return hr; + } +} + static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -874,6 +934,22 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec } } +static HRESULT copypixels_to_32bppRGB(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + switch (source_format) + { + case format_32bppRGB: + case format_32bppRGBA: + case format_32bppPRGBA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + return copypixels_to_32bppRGBA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + } +} + static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -907,6 +983,39 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR } } +static HRESULT copypixels_to_32bppPRGBA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppPRGBA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + hr = copypixels_to_32bppRGBA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + } + } + } + return hr; + } +} + static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -1326,8 +1435,11 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppRGB, &GUID_WICPixelFormat24bppRGB, copypixels_to_24bppRGB}, {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, + {format_32bppRGB, &GUID_WICPixelFormat32bppRGB, copypixels_to_32bppRGB}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_32bppRGBA, &GUID_WICPixelFormat32bppRGBA, copypixels_to_32bppRGBA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, + {format_32bppPRGBA, &GUID_WICPixelFormat32bppPRGBA, copypixels_to_32bppPRGBA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL}, diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 9bec30fcea..0a86266396 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2483,6 +2483,8 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma BOOL canconvert; ULONG num_fetched; + TRACE("%s,%p,%p\n", debugstr_guid(dstFormat), pISrc, ppIDst); + res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9a580c67c5..c8338f1bea 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1463,8 +1463,11 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat24bppRGB, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormat32bppRGB, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat32bppRGBA, &GUID_WICPixelFormat32bppPBGRA, + &GUID_WICPixelFormat32bppPRGBA, &GUID_WICPixelFormat32bppGrayFloat, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, @@ -1928,6 +1931,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, + { &GUID_WICPixelFormat32bppRGB, + "The Wine Project", + "32bpp RGB", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 3, /* channel count */ + channel_masks_8bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 0 + }, { &GUID_WICPixelFormat32bppBGRA, "The Wine Project", "32bpp BGRA", @@ -1939,6 +1953,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppRGBA, + "The Wine Project", + "32bpp RGBA", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_8bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 1 + }, { &GUID_WICPixelFormat32bppPBGRA, "The Wine Project", "32bpp PBGRA", @@ -1950,6 +1975,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppPRGBA, + "The Wine Project", + "32bpp PRGBA", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 4, /* channel count */ + channel_masks_8bit, + WICPixelFormatNumericRepresentationUnsignedInteger, + 1 + }, { &GUID_WICPixelFormat32bppGrayFloat, "The Wine Project", "32bpp GrayFloat", diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1cfa29b4df..455c6ae2e6 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -294,6 +294,21 @@ static BOOL compare_bits(const struct bitmap_data *expect, UINT buffersize, cons if (!equal && expect->alt_data) equal = compare_bits(expect->alt_data, buffersize, converted_bits); + if (!equal && winetest_debug > 1) + { + UINT i, bps; + bps = expect->bpp / 8; + if (!bps) bps = buffersize; + printf("converted_bits (%u bytes):\n ", buffersize); + for (i = 0; i < buffersize; i++) + { + printf("%u,", converted_bits[i]); + if (!((i + 1) % 32)) printf("\n "); + else if (!((i+1) % bps)) printf(" "); + } + printf("\n"); + } + return equal; } @@ -441,6 +456,10 @@ static const BYTE bits_32bppBGR[] = { 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; static const struct bitmap_data testdata_32bppBGR = { &GUID_WICPixelFormat32bppBGR, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; +static const struct bitmap_data testdata_32bppBGRA80 = { + &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; +static const struct bitmap_data testdata_32bppRGBA80 = { + &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGR, 32, 2, 96.0, 96.0}; static const BYTE bits_32bppBGRA[] = { 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, 255,0,0,255, 0,255,0,255, 0,0,255,255, 0,0,0,255, @@ -453,6 +472,24 @@ static const BYTE bits_32bppBGRA[] = { 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255, 0,255,255,255, 255,0,255,255, 255,255,0,255, 255,255,255,255}; static const struct bitmap_data testdata_32bppBGRA = { &GUID_WICPixelFormat32bppBGRA, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0}; +static const struct bitmap_data testdata_32bppRGBA = { + &GUID_WICPixelFormat32bppRGBA, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0}; +static const struct bitmap_data testdata_32bppRGB = { + &GUID_WICPixelFormat32bppRGB, 32, bits_32bppBGRA, 32, 2, 96.0, 96.0}; + +static const BYTE bits_32bppPBGRA[] = { + 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, + 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, + 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, + 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, 80,0,0,80, 0,80,0,80, 0,0,80,80, 0,0,0,80, + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, + 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80, 0,80,80,80, 80,0,80,80, 80,80,0,80, 80,80,80,80}; +static const struct bitmap_data testdata_32bppPBGRA = { + &GUID_WICPixelFormat32bppPBGRA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; +static const struct bitmap_data testdata_32bppPRGBA = { + &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; /* XP and 2003 use linear color conversion, later versions use sRGB gamma */ static const float bits_32bppGrayFloat_xp[] = { @@ -518,7 +555,7 @@ static void test_conversion(const struct bitmap_data *src, const struct bitmap_d hr = WICConvertBitmapSource(dst->format, &src_obj->IWICBitmapSource_iface, &dst_bitmap); todo_wine_if (todo) ok(hr == S_OK || - broken(hr == E_INVALIDARG) /* XP */, "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); + broken(hr == E_INVALIDARG || hr == WINCODEC_ERR_COMPONENTNOTFOUND) /* XP */, "WICConvertBitmapSource(%s) failed, hr=%x\n", name, hr); if (hr == S_OK) { @@ -1751,6 +1788,12 @@ START_TEST(converter) test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", FALSE); test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", FALSE); + test_conversion(&testdata_32bppBGRA80, &testdata_32bppPBGRA, "BGRA -> PBGRA", FALSE); + + test_conversion(&testdata_32bppRGBA, &testdata_32bppRGB, "RGBA -> RGB", FALSE); + test_conversion(&testdata_32bppRGB, &testdata_32bppRGBA, "RGB -> RGBA", FALSE); + test_conversion(&testdata_32bppRGBA, &testdata_32bppRGBA, "RGBA -> RGBA", FALSE); + test_conversion(&testdata_32bppRGBA80, &testdata_32bppPRGBA, "RGBA -> PRGBA", FALSE); test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", FALSE); test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", FALSE); -- 2.20.1

3 2

[PATCH] server: Improve handling of cursor position clipping for empty rectangle.
by Andrew Eikum 18 Feb '19

18 Feb '19

From: Sebastian Lackner <sebastian(a)fds-team.de> Based on a patch by Kevin Buhr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38791 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- >From Sebastian: "We cannot match the Windows behavior because there is no sane way to emulate the unusual Windows cursor clipping in winex11/winemac. For now it is better to keep wineserver and backends synchronized to avoid cursor drift." Before this patch, a mouse at 0,0 clipped to 0,0,0,0 would end up at -1,-1 in the server. With the patch, it ends up at 0,0. The new behavior still doesn't totally match Windows. See the todo_wines in the tests, which mostly invert if you remove this patch. However, it fixes a nasty issue in a common game engine. This patch has been in wine-staging since June 2017. dlls/user32/tests/input.c | 69 +++++++++++++++++++++++++++++++++++++++ server/queue.c | 8 ++--- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ffdd4b7137..835dfb108d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1269,6 +1269,19 @@ static LRESULT CALLBACK hook_proc2( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } +static LRESULT CALLBACK hook_proc3( int code, WPARAM wparam, LPARAM lparam ) +{ + POINT pt; + + if (code == HC_ACTION) + { + /* MSLLHOOKSTRUCT does not seem to be reliable and contains different data on each run. */ + GetCursorPos(&pt); + ok(pt.x == pt_old.x && pt.y == pt_old.y, "GetCursorPos: (%d,%d)\n", pt.x, pt.y); + } + return CallNextHookEx( 0, code, wparam, lparam ); +} + static void test_mouse_ll_hook(void) { HWND hwnd; @@ -1342,6 +1355,62 @@ static void test_mouse_ll_hook(void) ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); UnhookWindowsHookEx(hook2); + hook1 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc3, GetModuleHandleA(0), 0); + + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + clipped = TRUE; + + SetCursorPos(140, 140); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + SetCursorPos(160, 160); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, -STEP, -STEP, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, +STEP, +STEP, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + + clipped = FALSE; + ClipCursor(NULL); + + SetCursorPos(140, 140); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(160, 160); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(150, 150); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + UnhookWindowsHookEx(hook1); + done: DestroyWindow(hwnd); SetCursorPos(pt_org.x, pt_org.y); diff --git a/server/queue.c b/server/queue.c index 545991b99c..2eec422c57 100644 --- a/server/queue.c +++ b/server/queue.c @@ -411,8 +411,8 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); /* warp the mouse to be inside the clip rect */ - x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - y = min( max( desktop->cursor.y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + y = max( min( desktop->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); } @@ -1500,8 +1500,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { if (msg->msg == WM_MOUSEMOVE) { - int x = min( max( msg->x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - int y = min( max( msg->y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + int x = max( min( msg->x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + int y = max( min( msg->y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (desktop->cursor.x != x || desktop->cursor.y != y) always_queue = 1; desktop->cursor.x = x; desktop->cursor.y = y; -- 2.20.1

2 1

[PATCH] ntdll: Validate len in NtQueryVirtualMemory.
by Gijs Vermeulen 18 Feb '19

18 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45632 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/tests/info.c | 3 +++ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7690696304..5f27d8bb69 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2005,6 +2005,9 @@ static void test_queryvirtualmemory(void) /* check error code when addr is higher than working set limit */ status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c008db7806..7f4b8f4d31 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2820,6 +2820,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } } + if(len < sizeof(MEMORY_BASIC_INFORMATION)) + return STATUS_INFO_LENGTH_MISMATCH; + if (process != NtCurrentProcess()) { NTSTATUS status; -- 2.20.1

1 0

[PATCH] mfplat: Implement MFCreateAsyncResult().
by Nikolay Sivov 18 Feb '19

18 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 3 +- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 190 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 140 +++++++++++++++++++++++++++ include/mfapi.h | 14 +++ 5 files changed, 347 insertions(+), 2 deletions(-) create mode 100644 dlls/mfplat/queue.c diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..17cda8856c 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = mfplat IMPORTS = advapi32 ole32 C_SRCS = \ - main.c + main.c \ + queue.c diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 349b9265d5..b4e6c77aae 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -38,7 +38,7 @@ @ stdcall MFCopyImage(ptr long ptr long long long) @ stub MFCreateAMMediaTypeFromMFMediaType @ stub MFCreateAlignedMemoryBuffer -@ stub MFCreateAsyncResult +@ stdcall MFCreateAsyncResult(ptr ptr ptr ptr) @ stdcall MFCreateAttributes(ptr long) @ stub MFCreateAudioMediaType @ stub MFCreateCollection diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c new file mode 100644 index 0000000000..762af248f0 --- /dev/null +++ b/dlls/mfplat/queue.c @@ -0,0 +1,190 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "mfapi.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct async_result +{ + MFASYNCRESULT result; + LONG refcount; + IUnknown *object; + IUnknown *state; +}; + +static struct async_result *impl_from_IMFAsyncResult(IMFAsyncResult *iface) +{ + return CONTAINING_RECORD(iface, struct async_result, result.AsyncResult); +} + +static HRESULT WINAPI async_result_QueryInterface(IMFAsyncResult *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncResult) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncResult_AddRef(iface); + return S_OK; + } + + *obj = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI async_result_AddRef(IMFAsyncResult *iface) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedIncrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI async_result_Release(IMFAsyncResult *iface) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedDecrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + { + if (result->result.pCallback) + IMFAsyncCallback_Release(result->result.pCallback); + if (result->object) + IUnknown_Release(result->object); + if (result->state) + IUnknown_Release(result->state); + heap_free(result); + } + + return refcount; +} + +static HRESULT WINAPI async_result_GetState(IMFAsyncResult *iface, IUnknown **state) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, state); + + if (!result->state) + return E_POINTER; + + *state = result->state; + IUnknown_AddRef(*state); + + return S_OK; +} + +static HRESULT WINAPI async_result_GetStatus(IMFAsyncResult *iface) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->result.hrStatusResult; +} + +static HRESULT WINAPI async_result_SetStatus(IMFAsyncResult *iface, HRESULT status) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %#x.\n", iface, status); + + result->result.hrStatusResult = status; + + return S_OK; +} + +static HRESULT WINAPI async_result_GetObject(IMFAsyncResult *iface, IUnknown **object) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, object); + + if (!result->object) + return E_POINTER; + + *object = result->object; + IUnknown_AddRef(*object); + + return S_OK; +} + +static IUnknown * WINAPI async_result_GetStateNoAddRef(IMFAsyncResult *iface) +{ + struct async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->state; +} + +static const IMFAsyncResultVtbl async_result_vtbl = +{ + async_result_QueryInterface, + async_result_AddRef, + async_result_Release, + async_result_GetState, + async_result_GetStatus, + async_result_SetStatus, + async_result_GetObject, + async_result_GetStateNoAddRef, +}; + +HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) +{ + struct async_result *result; + + TRACE("%p, %p, %p, %p.\n", object, callback, state, out); + + if (!out) + return E_INVALIDARG; + + result = heap_alloc_zero(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->result.AsyncResult.lpVtbl = &async_result_vtbl; + result->refcount = 1; + result->object = object; + if (result->object) + IUnknown_AddRef(result->object); + result->result.pCallback = callback; + if (result->result.pCallback) + IMFAsyncCallback_AddRef(result->result.pCallback); + result->state = state; + if (result->state) + IUnknown_AddRef(result->state); + + *out = &result->result.AsyncResult; + + return S_OK; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..395fde421d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -693,6 +693,145 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static HRESULT WINAPI testcallback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testcallback_AddRef(IMFAsyncCallback *iface) +{ + return 2; +} + +static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) +{ + return 1; +} + +static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMFAsyncCallbackVtbl testcallbackvtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + testcallback_Invoke, +}; + +static void test_MFCreateAsyncResult(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result, *result2; + IUnknown *state, *object; + MFASYNCRESULT *data; + ULONG refcount; + HRESULT hr; + + hr = MFCreateAsyncResult(NULL, NULL, NULL, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result; + ok(data->pCallback == NULL, "Unexpected callback value.\n"); + ok(data->hrStatusResult == S_OK, "Unexpected status %#x.\n", data->hrStatusResult); + ok(data->dwBytesTransferred == 0, "Unexpected byte length %u.\n", data->dwBytesTransferred); + ok(data->hEvent == NULL, "Unexpected event.\n"); + + hr = IMFAsyncResult_GetState(result, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + state = (void *)0xdeadbeef; + hr = IMFAsyncResult_GetState(result, &state); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(state == (void *)0xdeadbeef, "Unexpected state.\n"); + + hr = IMFAsyncResult_GetStatus(result); + ok(hr == S_OK, "Unexpected status %#x.\n", hr); + + data->hrStatusResult = 123; + hr = IMFAsyncResult_GetStatus(result); + ok(hr == 123, "Unexpected status %#x.\n", hr); + + hr = IMFAsyncResult_SetStatus(result, E_FAIL); + ok(hr == S_OK, "Failed to set status, hr %#x.\n", hr); + ok(data->hrStatusResult == E_FAIL, "Unexpected status %#x.\n", hr); + + hr = IMFAsyncResult_GetObject(result, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + object = (void *)0xdeadbeef; + hr = IMFAsyncResult_GetObject(result, &object); + ok(hr == E_POINTER, "Failed to get object, hr %#x.\n", hr); + ok(object == (void *)0xdeadbeef, "Unexpected object.\n"); + + state = IMFAsyncResult_GetStateNoAddRef(result); + ok(state == NULL, "Unexpected state.\n"); + + /* Object. */ + hr = MFCreateAsyncResult((IUnknown *)result, &callback, NULL, &result2); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result2; + ok(data->pCallback == &callback, "Unexpected callback value.\n"); + ok(data->hrStatusResult == S_OK, "Unexpected status %#x.\n", data->hrStatusResult); + ok(data->dwBytesTransferred == 0, "Unexpected byte length %u.\n", data->dwBytesTransferred); + ok(data->hEvent == NULL, "Unexpected event.\n"); + + object = NULL; + hr = IMFAsyncResult_GetObject(result2, &object); + ok(hr == S_OK, "Failed to get object, hr %#x.\n", hr); + ok(object == (IUnknown *)result, "Unexpected object.\n"); + IUnknown_Release(object); + + IMFAsyncResult_Release(result2); + + /* State object. */ + hr = MFCreateAsyncResult(NULL, &callback, (IUnknown *)result, &result2); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + data = (MFASYNCRESULT *)result2; + ok(data->pCallback == &callback, "Unexpected callback value.\n"); + ok(data->hrStatusResult == S_OK, "Unexpected status %#x.\n", data->hrStatusResult); + ok(data->dwBytesTransferred == 0, "Unexpected byte length %u.\n", data->dwBytesTransferred); + ok(data->hEvent == NULL, "Unexpected event.\n"); + + state = NULL; + hr = IMFAsyncResult_GetState(result2, &state); + ok(hr == S_OK, "Failed to get state object, hr %#x.\n", hr); + ok(state == (IUnknown *)result, "Unexpected state.\n"); + IUnknown_Release(state); + + state = IMFAsyncResult_GetStateNoAddRef(result2); + ok(state == (IUnknown *)result, "Unexpected state.\n"); + + refcount = IMFAsyncResult_Release(result2); + ok(!refcount, "Unexpected refcount %u\n.", refcount); + refcount = IMFAsyncResult_Release(result); + ok(!refcount, "Unexpected refcount %u\n.", refcount); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -708,6 +847,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_MFCreateAsyncResult(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index b0d8e43125..1575cc3d97 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -54,6 +54,19 @@ extern "C" { DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); +#if defined(__cplusplus) && !defined(CINTERFACE) +typedef struct tagMFASYNCRESULT : public IMFAsyncResult { +#else +typedef struct tagMFASYNCRESULT +{ + IMFAsyncResult AsyncResult; +#endif + OVERLAPPED overlapped; + IMFAsyncCallback *pCallback; + HRESULT hrStatusResult; + DWORD dwBytesTransferred; + HANDLE hEvent; +} MFASYNCRESULT; DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); @@ -70,6 +83,7 @@ typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); +HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); -- 2.20.1

1 0

[PATCH v3 1/4] comctl32/listbox: Move the item data insertion into a separate function
by Gabriel Ivăncescu 18 Feb '19

18 Feb '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch. nb_items is incremented before the call and this is taken care of in the helper function. This is for two reasons: 1) This simplifies the nodata patch (only adds a single line to insert_item_data). 2) This matches what RemoveItem does, so it's more consistent. dlls/comctl32/listbox.c | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 50ff5c5..330d3ae 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -176,6 +176,38 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } +static void insert_item_data(LB_DESCR *descr, INT index, WCHAR *str, ULONG_PTR data) +{ + LB_ITEMDATA *item; + + item = &descr->items[index]; + + if (index < descr->nb_items - 1) + RtlMoveMemory(item + 1, item, + (descr->nb_items - 1 - index) * sizeof(LB_ITEMDATA)); + item->str = str; + item->data = HAS_STRINGS(descr) ? 0 : data; + item->height = 0; + item->selected = FALSE; + + /* Get item height */ + if (descr->style & LBS_OWNERDRAWVARIABLE) + { + MEASUREITEMSTRUCT mis; + UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); + + mis.CtlType = ODT_LISTBOX; + mis.CtlID = id; + mis.itemID = index; + mis.itemData = data; + mis.itemHeight = descr->item_height; + SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); + item->height = mis.itemHeight ? mis.itemHeight : 1; + TRACE("[%p]: measure item %d (%s) = %d\n", + descr->self, index, str ? debugstr_w(str) : "", item->height ); + } +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1553,42 +1585,14 @@ static void LISTBOX_MoveCaret( LB_DESCR *descr, INT index, BOOL fully_visible ) static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { - LB_ITEMDATA *item; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - /* Insert the item structure */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item + 1, item, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; descr->nb_items++; - - /* Get item height */ - - if (descr->style & LBS_OWNERDRAWVARIABLE) - { - MEASUREITEMSTRUCT mis; - UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); - - mis.CtlType = ODT_LISTBOX; - mis.CtlID = id; - mis.itemID = index; - mis.itemData = data; - mis.itemHeight = descr->item_height; - SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; - TRACE("[%p]: measure item %d (%s) = %d\n", - descr->self, index, str ? debugstr_w(str) : "", item->height ); - } + insert_item_data(descr, index, str, data); /* Repaint the items */ -- 2.20.1

2 6

Fwd: [PATCH v4] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 18 Feb '19

18 Feb '19

---------- Forwarded message --------- From: Isira Seneviratne <isirasen96(a)gmail.com> Date: Mon, Feb 18, 2019 at 5:53 PM Subject: Re: [PATCH v4] winetest: Add GUI to display results of individual tests. To: Zebediah Figura <z.figura12(a)gmail.com> On Mon, Feb 18, 2019 at 11:14 AM Isira Seneviratne <isirasen96(a)gmail.com> wrote: > > > On Mon, Feb 18, 2019 at 11:02 AM Zebediah Figura <z.figura12(a)gmail.com> > wrote: > >> On 2/17/19 11:30 PM, Isira Seneviratne wrote: >> > >> > >> > On Mon, Feb 18, 2019 at 10:50 AM Zebediah Figura <z.figura12(a)gmail.com >> > <mailto:z.figura12@gmail.com>> wrote: >> > >> > On 2/17/19 11:17 PM, Isira Seneviratne wrote: >> > > >> > > On Mon, Feb 18, 2019 at 9:08 AM Zebediah Figura >> > <z.figura12(a)gmail.com <mailto:z.figura12@gmail.com> >> > > <mailto:z.figura12@gmail.com <mailto:z.figura12@gmail.com>>> >> wrote: >> > > >> > > >> > > >> > > On 2/13/19 2:57 AM, Isira Seneviratne wrote: >> > > > >> > > > >> > > > >> > > >> > > Again, I'm seeing multiple lines show up per test run, >> > > >> > > Do the tests normally print multiple sets of results? If so, then >> > should >> > > any of them be ignored? >> > > >> > > >> > >> > No, only one set of results is printed per test. You can check this >> by >> > running winetest normally with the -o option, and examining what >> > data is >> > printed. >> > >> > >> > In that case, I think that something is probably wrong with the >> winetest >> > output, since I'm reading data from the same file that winetest is >> > writing data to, with these lines: >> > >> > SetFilePointer (out_file, -sizeof(buffer), NULL, FILE_CURRENT); >> > ReadFile (out_file, buffer, sizeof(buffer), &read_count, NULL); >> > >> > >> >> Something is probably wrong with the way you're reading from it. >> > > Okay, I'll check my code. Thank you for the feedback. > > I'll get back to you in a few hours. > I advanced the file pointer by 1 after reading 1000 characters from it, and that eliminated most of the duplicates, except for "advapi32:security". I isolated the following two lines of interest from the output: 00d4:security: 23 tests executed (0 marked as todo, 0 failures), 0 skipped. 00cd:security: 2696 tests executed (175 marked as todo, 0 failures), 28 skipped.

2 1

[PATCH v2] msi: Prevent uninitialized variable usage
by Hans Leidekker 18 Feb '19

18 Feb '19

From: Mark Jansen <mark.jansen(a)reactos.org> v2: Added tests. Observed with Lync 2010 setup in ReactOS. The embedded Silverlight setup hits this case (no LASTUSEDSOURCE in the registry). Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/source.c | 9 ++++++--- dlls/msi/tests/source.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index e2cf7fc8ad..3640b0dfbd 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -592,8 +592,11 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, 0, 0, NULL, &size); if (rc != ERROR_SUCCESS) { - RegCloseKey(sourcekey); - return ERROR_SUCCESS; + static WCHAR szEmpty[1] = { '\0' }; + rc = ERROR_SUCCESS; + source = NULL; + ptr = szEmpty; + goto output_out; } source = msi_alloc(size); @@ -627,7 +630,7 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, else ptr++; } - +output_out: if (szValue) { if (strlenW(ptr) < *pcchValue) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 654df35f54..3d4a955005 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -48,6 +48,8 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); static UINT (WINAPI *pMsiSourceListGetInfoA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiSourceListGetInfoW) + (LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR, LPWSTR, LPDWORD); static UINT (WINAPI *pMsiSourceListSetInfoA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD,LPCSTR, LPCSTR); static UINT (WINAPI *pMsiSourceListAddSourceA) @@ -69,6 +71,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumMediaDisksA) GET_PROC(hmsi, MsiSourceListEnumSourcesA) GET_PROC(hmsi, MsiSourceListGetInfoA) + GET_PROC(hmsi, MsiSourceListGetInfoW) GET_PROC(hmsi, MsiSourceListSetInfoA) GET_PROC(hmsi, MsiSourceListAddSourceA) @@ -179,14 +182,21 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); +static inline WCHAR *strdupAW( const char *str ) +{ + int len; + WCHAR *ret; + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + return ret; +} + static void test_MsiSourceListGetInfo(void) { - CHAR prodcode[MAX_PATH]; - CHAR prod_squashed[MAX_PATH]; - CHAR keypath[MAX_PATH*2]; - CHAR value[MAX_PATH]; - LPSTR usersid; - LPCSTR data; + char prodcode[MAX_PATH], prod_squashed[MAX_PATH], keypath[MAX_PATH * 2], value[MAX_PATH], *usersid; + WCHAR valueW[MAX_PATH], *usersidW, *prodcodeW; + const char *data; LONG res; UINT r; HKEY userkey, hkey, media; @@ -416,6 +426,30 @@ static void test_MsiSourceListGetInfo(void) ok(!lstrcmpA(value, "prompt"), "Expected \"prompt\", got \"%s\"\n", value); ok(size == 6, "Expected 6, got %d\n", size); + /* LastUsedSource value doesn't exist */ + RegDeleteValueA(hkey, "LastUsedSource"); + size = MAX_PATH; + memset(value, 0x55, sizeof(value)); + r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, + value, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + usersidW = strdupAW(usersid); + prodcodeW = strdupAW(prodcode); + memset(valueW, 0x55, sizeof(valueW)); + r = pMsiSourceListGetInfoW(prodcodeW, usersidW, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, + valueW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!valueW[0], "Expected \"\""); + ok(size == 0, "Expected 0, got %d\n", size); + HeapFree(GetProcessHeap(), 0, usersidW); + HeapFree(GetProcessHeap(), 0, prodcodeW); + data = ""; res = RegSetValueExA(hkey, "LastUsedSource", 0, REG_SZ, (const BYTE *)data, lstrlenA(data) + 1); -- 2.11.0

1 0

[PATCH] msi: Do not leak rootkey
by Mark Jansen 18 Feb '19

18 Feb '19

2 1

[PATCH] wbemprox: Initialize a variable (Coverity).
by Sven Baars 18 Feb '19

18 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d2b7dc116f..b206a2a658 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1372,7 +1372,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages NTSTATUS status; ULONG len, offset = 0; BOOL smt_enabled = FALSE; - DWORD all; + DWORD all = RelationAll; if (num_packages) *num_packages = 1; status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), NULL, 0, &len ); -- 2.17.1

2 1

[PATCH] wbemprox/tests: Add a simple test for semi-synchronous mode behaviour.
by Nikolay Sivov 18 Feb '19

18 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index ae0106a341..e8ddbccbe6 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1084,6 +1084,34 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } +static void test_query_semisync( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','D','u','m','m','y',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + ULONG count; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, + NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 1; + obj = (void *)0xdeadbeef; + hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); +todo_wine + ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); + ok( count == 0, "Unexpected count %u.\n", count ); + ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); + + IEnumWbemClassObject_Release( result ); + + SysFreeString( wql ); + SysFreeString( query ); +} + static void test_GetNames( IWbemServices *services ) { static const WCHAR queryW[] = @@ -1950,6 +1978,7 @@ START_TEST(query) test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_query_semisync( services ); test_GetNames( services ); test_SystemSecurity( services ); test_Win32_OperatingSystem( services ); -- 2.20.1

2 1

[PATCH] comctl32/updown: Make sure buttons rectangles are consistent with each other.
by Nikolay Sivov 18 Feb '19

18 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/updown.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 8dec7a4807..a48f1e437c 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -170,13 +171,16 @@ static BOOL UPDOWN_HasBuddyBorder(const UPDOWN_INFO *infoPtr) * rect - will hold the rectangle * arrow - FLAG_INCR to get the "increment" rect (up or right) * FLAG_DECR to get the "decrement" rect (down or left) - * If both flags are present, the envelope is returned. */ -static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arrow) +static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, unsigned int arrow) { HTHEME theme = GetWindowTheme (infoPtr->Self); const int border = theme ? DEFAULT_BUDDYBORDER_THEMED : DEFAULT_BUDDYBORDER; const int spacer = theme ? DEFAULT_BUDDYSPACER_THEMED : DEFAULT_BUDDYSPACER; + int size; + + assert(arrow && (arrow & (FLAG_INCR | FLAG_DECR)) != (FLAG_INCR | FLAG_DECR)); + GetClientRect (infoPtr->Self, rect); /* @@ -200,21 +204,20 @@ static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arr /* * We're calculating the midpoint to figure-out where the - * separation between the buttons will lay. We make sure that we - * round the uneven numbers by adding 1. + * separation between the buttons will lay. */ if (infoPtr->dwStyle & UDS_HORZ) { - int len = rect->right - rect->left + 1; /* compute the width */ + size = (rect->right - rect->left) / 2; if (arrow & FLAG_INCR) - rect->left = rect->left + len/2; - if (arrow & FLAG_DECR) - rect->right = rect->left + len/2 - (theme ? 0 : 1); + rect->left = rect->right - size; + else if (arrow & FLAG_DECR) + rect->right = rect->left + size; } else { - int len = rect->bottom - rect->top + 1; /* compute the height */ + size = (rect->bottom - rect->top) / 2; if (arrow & FLAG_INCR) - rect->bottom = rect->top + len/2 - (theme ? 0 : 1); - if (arrow & FLAG_DECR) - rect->top = rect->top + len/2; + rect->bottom = rect->top + size; + else if (arrow & FLAG_DECR) + rect->top = rect->bottom - size; } } -- 2.20.1

1 0

[PATCH v4] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 18 Feb '19

18 Feb '19

2 5

[PATCH v5] po: Update Sinhala translation.
by Isira Seneviratne 18 Feb '19

18 Feb '19

1 0

Hangover 0.4.0 release
by André Hentschel 18 Feb '19

18 Feb '19

Hi all, Stefan and I want to announce the first Hangover alpha release 0.4.0 (shifted from the corresponding Wine version) The release can be found at github: https://github.com/AndreRH/hangover/releases It is still highly experimental and won't run most applications. Features: * Running x86 and x86_64 applications on arm64 * That happens automagically when qemu is at C:\x86\qemu-x86_64.exe.so * Android support (currently first starts native cmd, then x86_64 notepad++) * D3D support (not on Android, because Wine cannot fully deal with GLES yet) For more infos, see: https://github.com/AndreRH/hangover/blob/master/README https://wiki.winehq.org/Emulation#Hangover

2 1

[PATCH resend] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 17 Feb '19

17 Feb '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 102 +++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec78f4bc46..e15a75a810 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3224,6 +3225,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3247,28 +3326,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + perform_relocations(module, nt->OptionalHeader.SizeOfImage); } /* make sure imports are relocated too */ -- 2.17.1

2 2

[PATCH] msi: Prevent uninitialized variable usage
by Mark Jansen 17 Feb '19

17 Feb '19

Observed with Lync 2010 setup in ReactOS. The embedded Silverlight setup hits this case. (No LASTUSEDSOURCE in the registry)

1 0

winehq 32bit configuration doesn't work on WLinux
by Dr. Makoto Sakurai 17 Feb '19

17 Feb '19

Dear all, it says config.status: executing include/stamp-h commands config.status: executing tools/makedep commands config.status: executing Makefile commands ./config.status: line 551: tools/makedep: cannot execute binary file: Exec format error config.status: error: could not create Makefile This seems to be an unknown error case. Sincerely yours, Makoto Sakurai

2 1

winehq 32bit configuration doesn't work on WLinux
by Dr. Makoto Sakurai 17 Feb '19

17 Feb '19

Dear all, it says config.status: executing include/stamp-h commands config.status: executing tools/makedep commands config.status: executing Makefile commands ./config.status: line 551: tools/makedep: cannot execute binary file: Exec format error config.status: error: could not create Makefile This seems to be an unknown error case. Sincerely yours, Makoto Sakurai

1 0

Wine staging 4.2 release
by Alistair Leslie-Hughes 17 Feb '19

17 Feb '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.2 (798 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette. * windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided. * windowscodecs/tests: Add a bunch of new tests for indexed format conversions. * windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format. * windowscodecs/tests: Add a missing check for IWICBitmapFrameDecode::GetPixelFormat return value. * ntoskrnl.exe: Implement ExInitializeNPagedLookasideList. * ntoskrnl.exe: Implement NtBuildNumber. * wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry(). * d3d8: Improve ValidateVertexShader stub. * ntdll: Improve speed of LdrGetDllHandle when searching for the basename of modules that are not loaded. * include: Add more VSS_* typedefs * include: Add VSS writer enum * include: Convert header vswriter to an idl. * include: Add vsbackup.idl * vssapi: Add CreateVssBackupComponentsInternal stub * vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub * wined3d: Return stream frequency of 1 if it was not set. * tools/make_unicode: Implement full Unicode character decomposition. * tools/make_unicode: Implement canonical composition for use in normalization. * kernel32: Implement NormalizeString API function. * libs: Generated make_unicode files * ntdll: Check architecture before loading module. * ntdll: Add a futex-based condition variable implementation. * bcrypt: Implement BCryptDeriveKeyPBKDF2 and add test vectors. * bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. * mfplat: Implement MFGetSystemTime. * wineps.drv: Add stubs for escapes required by Adobe PageMaker. * wineps.drv: PostScript header should be written by StartDoc instead of StartPage. Added: * [19153] ddraw: Return correct devices based off requested DirectX version. * [34579] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing problem. * [35331] gdi32: fix for rotated ellipse. Updated: * uxtheme-GTK_Theming. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

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-devel