wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Michael Stefaniuc : regedit: Remove a redundant NULL check before HeapFree ().
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: a9987fa11a1b2411b565dd1703d9f795dabfcfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9987fa11a1b2411b565dd170… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:13 2017 +0200 regedit: Remove a redundant NULL check before HeapFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a4158c2..0a356cb 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1564,9 +1564,7 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; - if (parser.value_name) - HeapFree(GetProcessHeap(), 0, parser.value_name); - + HeapFree(GetProcessHeap(), 0, parser.value_name); close_key(&parser); return TRUE;

1 0

Michael Stefaniuc : wineandroid: Use EqualRect() instead of memcmp().
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: ba0afd26e7a70f7b3f67c78a580d4b25f37841d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0afd26e7a70f7b3f67c78a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 7 17:15:11 2017 +0200 wineandroid: Use EqualRect() instead of memcmp(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index ff8b1e0..e5006e3 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1264,7 +1264,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface = NULL; } - if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + if (!surface || !EqualRect( &surface->rect, &rect )) { data->surface = create_surface( data->hwnd, &rect, 255, color_key, TRUE ); if (surface) window_surface_release( surface );

1 0

Hugh McMaster : regedit: Use a function to free the parser data.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: e2ae9e3c5819f305fe3e818bc2bfd625b82cfc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ae9e3c5819f305fe3e818bc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 7 11:47:51 2017 +0000 regedit: Use a function to free the parser data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9680bd2..a4158c2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -495,6 +495,15 @@ static LONG open_key(struct parser *parser, WCHAR *path) return res; } +static void free_parser_data(struct parser *parser) +{ + if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) + HeapFree(GetProcessHeap(), 0, parser->data); + + parser->data = NULL; + parser->data_size = 0; +} + enum reg_versions { REG_VERSION_31, REG_VERSION_40, @@ -802,9 +811,7 @@ static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -826,10 +833,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -870,10 +874,7 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -890,10 +891,7 @@ static WCHAR *eol_backslash_state(struct parser *parser, WCHAR *pos) return pos; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return p; } @@ -918,10 +916,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) return line; invalid: - HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - parser->data_size = 0; - + free_parser_data(parser); set_state(parser, LINE_START); return line; } @@ -941,11 +936,7 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); - if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - HeapFree(GetProcessHeap(), 0, parser->data); - - parser->data = NULL; - parser->data_size = 0; + free_parser_data(parser); if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE);

1 0

Hugh McMaster : regedit/tests: Test the effects of EOF on hex data during concatenation.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 6f24426692777db725f5008e6a9d84b0551fd8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f24426692777db725f5008e6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 7 11:47:35 2017 +0000 regedit/tests: Test the effects of EOF on hex data during concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 7389781..b3f6e76 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -494,11 +494,28 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine17\"=hex(7):4c,69,6e,65,20,\\"); - lr = RegQueryValueExA(hkey, "Wine17", NULL, NULL, NULL, NULL); - ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", lr); - if (lr == ERROR_SUCCESS) - verify_reg(hkey, "Wine17", REG_MULTI_SZ, "Line ", 6, TODO_REG_SIZE | TODO_REG_DATA); + "\"Wine17a\"=hex(0):56,61,6c,75,65,\\"); + verify_reg(hkey, "Wine17a", REG_NONE, "Value", 5, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine17b\"=hex(2):25,50,41,54,48,25,\\"); + verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE | TODO_REG_DATA); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine17c\"=hex:11,22,33,44,55,\\"); + verify_reg(hkey, "Wine17c", REG_BINARY, hex, 5, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine17d\"=hex(7):4c,69,6e,65,\\"); + verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE | TODO_REG_DATA); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine17e\"=hex(100):56,61,6c,75,65,\\"); + verify_reg(hkey, "Wine17e", 0x100, "Value", 5, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Test the effects of EOF on hex data during concatenation.
by Alexandre Julliard 07 Jul '17

07 Jul '17

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

1 0

Alistair Leslie-Hughes : mmdevapi/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: f6bd39f03e2c74650896b631f949964d778050d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bd39f03e2c74650896b631f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 5 02:36:55 2017 +0000 mmdevapi/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9393f7b..e394d59 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -338,8 +338,8 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", - (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); + "Latency < default period, delta %dus (%s vs %s)\n", + (LONG)((t2-t1)/10), wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t1)); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;

1 0

Martin Storsjo : ntdll: Handle IMAGE_REL_BASED_DIR64 for arm64 in the same way as for x86_64.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 114d8aded773bdb8ea76f4dcf418a2d7f2d33d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114d8aded773bdb8ea76f4dcf… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Jul 7 13:39:23 2017 +0300 ntdll: Handle IMAGE_REL_BASED_DIR64 for arm64 in the same way as for x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 518a99f..dd1f74c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2476,7 +2476,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_HIGHLOW: *(int *)((char *)page + offset) += delta; break; -#ifdef __x86_64__ +#ifdef _WIN64 case IMAGE_REL_BASED_DIR64: *(INT_PTR *)((char *)page + offset) += delta; break;

1 0

Alistair Leslie-Hughes : mfreadwrite: Implement MFCreateSourceReaderFromByteStream.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: bf0cad095fabea99dd84d00144aa7c01782b513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0cad095fabea99dd84d0014… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 02:38:10 2017 +0000 mfreadwrite: Implement MFCreateSourceReaderFromByteStream. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 172 ++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- include/mfreadwrite.idl | 2 + 3 files changed, 175 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d3feeaf..e09120d 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -20,8 +20,11 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "mfreadwrite.h" #include "wine/debug.h" @@ -50,3 +53,172 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return E_NOTIMPL; } + +typedef struct _srcreader +{ + IMFSourceReader IMFSourceReader_iface; + LONG ref; +} srcreader; + +static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) +{ + return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); +} + +static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFSourceReader)) + { + *out = &This->IMFSourceReader_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p\n", This, index, selected); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %d\n", This, index, selected); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex, + IMFMediaType **type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %d, %p\n", This, index, typeindex, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p\n", This, index, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWORD index, DWORD *reserved, + IMFMediaType *type) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %p, %p\n", This, index, reserved, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFGUID format, REFPROPVARIANT position) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, %s, %p\n", This, debugstr_guid(format), position); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, + DWORD flags, DWORD *actualindex, DWORD *sampleflags, LONGLONG *timestamp, + IMFSample **sample) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, 0x%08x, %p, %p, %p, %p\n", This, index, flags, actualindex, + sampleflags, timestamp, sample); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x\n", This, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWORD index, REFGUID service, + REFIID riid, void **object) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %s, %s, %p\n", This, index, debugstr_guid(service), debugstr_guid(riid), object); + return E_NOTIMPL; +} + +static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index, + REFGUID guid, PROPVARIANT *attr) +{ + srcreader *This = impl_from_IMFSourceReader(iface); + FIXME("%p, 0x%08x, %s, %p\n", This, index, debugstr_guid(guid), attr); + return E_NOTIMPL; +} + +struct IMFSourceReaderVtbl srcreader_vtbl = +{ + src_reader_QueryInterface, + src_reader_AddRef, + src_reader_Release, + src_reader_GetStreamSelection, + src_reader_SetStreamSelection, + src_reader_GetNativeMediaType, + src_reader_GetCurrentMediaType, + src_reader_SetCurrentMediaType, + src_reader_SetCurrentPosition, + src_reader_ReadSample, + src_reader_Flush, + src_reader_GetServiceForStream, + src_reader_GetPresentationAttribute +}; + +HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes, IMFSourceReader **reader) +{ + srcreader *object; + + TRACE("%p, %p, %p\n", stream, attributes, reader); + + object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + + *reader = &object->IMFSourceReader_iface; + return S_OK; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 70b95a8..4272b71 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -2,6 +2,6 @@ @ stub DllGetClassObject @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL -@ stub MFCreateSourceReaderFromByteStream +@ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stub MFCreateSourceReaderFromURL diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index c8816cd..dd8c124 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -93,5 +93,7 @@ interface IMFSinkWriter : IUnknown HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); }; +cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) +cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" )

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderNetworkConfig1/ 2 interfaces in IWMReader.
by Alexandre Julliard 07 Jul '17

07 Jul '17

Module: wine Branch: master Commit: 34b9b1002ebdfc3e1f06ba0633aa1a8cd7b49a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b9b1002ebdfc3e1f06ba063… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 23:34:37 2017 +0000 wmvcore: Support IWMReaderNetworkConfig1/2 interfaces in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 4 +- dlls/wmvcore/wmvcore_main.c | 425 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 427 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34b9b1002ebdfc3e1f06b…

1 0

Alistair Leslie-Hughes : include: Define IDirectSoundFXI3DL2Reverb interface.
by Alexandre Julliard 07 Jul '17

07 Jul '17

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

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017