wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Austin English : x3daudio1_1: Add stub dll.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 32c8b79b92f9a9cd2e2a961e8d25b24ba5ccb810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c8b79b92f9a9cd2e2a961e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 17:28:41 2015 -0600 x3daudio1_1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_1/Makefile.in | 4 ++++ dlls/x3daudio1_1/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_1/x3daudio1_1.spec | 2 ++ 5 files changed, 45 insertions(+) diff --git a/configure b/configure index 1df598a..1265c86 100755 --- a/configure +++ b/configure @@ -1323,6 +1323,7 @@ enable_wsock32 enable_wtsapi32 enable_wuapi enable_wuaueng +enable_x3daudio1_1 enable_x3daudio1_7 enable_xapofx1_1 enable_xapofx1_3 @@ -17676,6 +17677,7 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index ef58f2d..f611fa5 100644 --- a/configure.ac +++ b/configure.ac @@ -3384,6 +3384,7 @@ WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(x3daudio1_1) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_3) diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in new file mode 100644 index 0000000..3d90eaa --- /dev/null +++ b/dlls/x3daudio1_1/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_1.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_1/main.c b/dlls/x3daudio1_1/main.c new file mode 100644 index 0000000..9fc9bd2 --- /dev/null +++ b/dlls/x3daudio1_1/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Austin English + * + * 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> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Andrey Gusev : xapofx1_3: Add stub dll.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 1e3f45c2094439db4cac66222d6a83b9d3aa1ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f45c2094439db4cac66222… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 19 21:04:23 2015 +0200 xapofx1_3: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_3/Makefile.in | 6 ++++++ dlls/xapofx1_3/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/xapofx1_3/version.rc | 26 ++++++++++++++++++++++++++ dlls/xapofx1_3/xapofx1_3.spec | 1 + 6 files changed, 74 insertions(+) diff --git a/configure b/configure index fd639fc..1df598a 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 @@ -17677,6 +17678,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 diff --git a/configure.ac b/configure.ac index 97ae4e2..ef58f2d 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) diff --git a/dlls/xapofx1_3/Makefile.in b/dlls/xapofx1_3/Makefile.in new file mode 100644 index 0000000..3730872 --- /dev/null +++ b/dlls/xapofx1_3/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xapofx1_3.dll + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/xapofx1_3/main.c b/dlls/xapofx1_3/main.c new file mode 100644 index 0000000..6a7f185 --- /dev/null +++ b/dlls/xapofx1_3/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_3/version.rc b/dlls/xapofx1_3/version.rc new file mode 100644 index 0000000..900726b --- /dev/null +++ b/dlls/xapofx1_3/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine XAPOFX dll" +#define WINE_FILENAME_STR "xapofx1_3.dll" +#define WINE_FILEVERSION 9,26,1590,0 +#define WINE_FILEVERSION_STR "9.26.1590.0" +#define WINE_PRODUCTVERSION 9,26,1590,0 +#define WINE_PRODUCTVERSION_STR "9.26.1590.0" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xapofx1_3/xapofx1_3.spec b/dlls/xapofx1_3/xapofx1_3.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_3/xapofx1_3.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Alex Henrie : cryptui: Fix grammar in warning message.
by Alexandre Julliard 20 Feb '15

20 Feb '15

1 0

Mark Harmstone : winecfg: Draw colour button using theme.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: b467908ea4a7d1f731265a08dead57a894f7b989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b467908ea4a7d1f731265a08d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 20 00:03:58 2015 +0000 winecfg: Draw colour button using theme. --- programs/winecfg/theme.c | 58 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 0618974..79c8b7c 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1070,14 +1070,52 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) if (draw_info->CtlID == IDC_SYSPARAM_COLOR) { - UINT state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + UINT state; + HTHEME theme; + RECT buttonrect; - if (draw_info->itemState & ODS_DISABLED) - state |= DFCS_INACTIVE; - else - state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + theme = OpenThemeData(draw_info->hwndItem, WC_BUTTONW); - DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + if (theme) { + MARGINS margins; + + if (draw_info->itemState & ODS_DISABLED) + state = PBS_DISABLED; + else if (draw_info->itemState & ODS_SELECTED) + state = PBS_PRESSED; + else + state = PBS_NORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(draw_info->hwndItem, draw_info->hDC, NULL); + + DrawThemeBackground(theme, draw_info->hDC, BP_PUSHBUTTON, state, &draw_info->rcItem, NULL); + + buttonrect = draw_info->rcItem; + + GetThemeMargins(theme, draw_info->hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, &draw_info->rcItem, &margins); + + buttonrect.left += margins.cxLeftWidth; + buttonrect.top += margins.cyTopHeight; + buttonrect.right -= margins.cxRightWidth; + buttonrect.bottom -= margins.cyBottomHeight; + + if (draw_info->itemState & ODS_FOCUS) + DrawFocusRect(draw_info->hDC, &buttonrect); + + CloseThemeData(theme); + } else { + state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + + if (draw_info->itemState & ODS_DISABLED) + state |= DFCS_INACTIVE; + else + state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + + DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + + buttonrect = draw_info->rcItem; + } if (!(draw_info->itemState & ODS_DISABLED)) { @@ -1087,10 +1125,10 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); brush = CreateSolidBrush(metrics[index].color); - InflateRect(&draw_info->rcItem, -1, -1); - FrameRect(draw_info->hDC, &draw_info->rcItem, black_brush); - InflateRect(&draw_info->rcItem, -1, -1); - FillRect(draw_info->hDC, &draw_info->rcItem, brush); + InflateRect(&buttonrect, -1, -1); + FrameRect(draw_info->hDC, &buttonrect, black_brush); + InflateRect(&buttonrect, -1, -1); + FillRect(draw_info->hDC, &buttonrect, brush); DeleteObject(brush); } }

1 0

Austin English : po: Use English names for Programs Files in Lithuanian translation.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 6cf6c4c596d6bbf5ceb7b7035625aedafa869e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf6c4c596d6bbf5ceb7b7035… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 15:25:10 2015 -0600 po: Use English names for Programs Files in Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index d1c03fe..854c896 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8161,7 +8161,7 @@ msgstr "Istorija" #: shell32.rc:215 msgid "Program Files" -msgstr "Programų failai" +msgstr "Program Files" #: shell32.rc:217 msgid "My Pictures" @@ -8193,7 +8193,7 @@ msgstr "Vaizdai" #: shell32.rc:216 msgid "Program Files (x86)" -msgstr "Programų failai (x86)" +msgstr "Program Files (x86)" #: shell32.rc:224 msgid "Contacts"

1 0

Alex Henrie : dpvoice: Turn GetCompressionTypes into a semi-stub.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5cd04574084c3e39d41d50fd61a70b53eb04a0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd04574084c3e39d41d50fd6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:35 2015 -0700 dpvoice: Turn GetCompressionTypes into a semi-stub. --- dlls/dpvoice/client.c | 5 +++-- dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/server.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/dpvoice/tests/voice.c | 10 ---------- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 29b5336..bdae160 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "dvoice.h" +#include "dvoice_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpvoice); @@ -149,8 +150,8 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index 5b0e57d..ededeab 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -23,5 +23,6 @@ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index e9291e2..80ef199 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -41,6 +41,45 @@ typedef struct IDirectPlayVoiceServerImpl LONG ref; } IDirectPlayVoiceServerImpl; +HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) +{ + static const DVCOMPRESSIONINFO pcm_type = + {80, {0x8de12fd4,0x7cb3,0x48ce,{0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, NULL, NULL, 0, 64000}; + static const WCHAR pcm_name[] = + {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; + + HRESULT ret; + LPWSTR string_loc; + + if (!pdwDataSize || !pdwNumElements) + return DVERR_INVALIDPOINTER; + + if (dwFlags) + return DVERR_INVALIDFLAGS; + + *pdwNumElements = 1; + + if (*pdwDataSize < sizeof(pcm_type) + sizeof(pcm_name)) + { + ret = DVERR_BUFFERTOOSMALL; + } + else if (!pData) + { + ret = DVERR_INVALIDPOINTER; + } + else + { + string_loc = (LPWSTR)((char*)pData + sizeof(pcm_type)); + memcpy(pData, &pcm_type, sizeof(pcm_type)); + memcpy(string_loc, pcm_name, sizeof(pcm_name)); + pData->lpszName = string_loc; + ret = DV_OK; + } + + *pdwDataSize = sizeof(pcm_type) + sizeof(pcm_name); + return ret; +} + static inline IDirectPlayVoiceServerImpl *impl_from_IDirectPlayVoiceServer(IDirectPlayVoiceServer *iface) { return CONTAINING_RECORD(iface, IDirectPlayVoiceServerImpl, IDirectPlayVoiceServer_iface); @@ -130,8 +169,8 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface, DVID dvSource, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index fe2db94..7f0faa3 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -420,16 +420,6 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire /* either client_iface or server_iface must be given, but not both */ assert(!client_iface ^ !server_iface); - if(client_iface) - ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); - else - ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); - if(ret == E_NOTIMPL) - { - skip("%s: GetCompressionTypes not implemented\n", name); - return; - } - if (client_iface) ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); else

1 0

Alex Henrie : dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d3c87e50008b696b0089ce652cd8b5ba60ae3fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c87e50008b696b0089ce652… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:34 2015 -0700 dpvoice/tests: Add GetCompressionTypes tests. --- dlls/dpvoice/tests/voice.c | 207 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 8048280..fe2db94 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> +#include <assert.h> #include <initguid.h> #include <dplay8.h> @@ -343,6 +344,195 @@ static void create_voicetest(void) } } +static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDirectPlayVoiceServer *server_iface) +{ + const char *name = client_iface ? "client" : "server"; + HRESULT ret; + DVCOMPRESSIONINFO data[32]; + DWORD data_size = 0, num_elements, i, j; + WCHAR *string_loc; + BOOL found_pcm; + + /* some variables are initialized to 99 just to check that they are not overwritten with 0 */ + static struct + { + /* inputs */ + DWORD data_size; + DWORD num_elements; + DWORD flags; + /* expected output */ + HRESULT ret; + /* test flags */ + enum + { + NULL_DATA = 1, + NULL_DATA_SIZE = 2, + NULL_NUM_ELEMENTS = 4, + SHARED_VARIABLE = 8 + } + test_flags; + } + tests[] = + { + /* tests NULL data with an insufficient data_size */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, NULL_DATA }, + + /* tests NULL data with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_INVALIDPOINTER, NULL_DATA }, + + /* tests NULL data_size */ + { 0, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA_SIZE }, + + /* tests NULL num_elements */ + { 99, 0, 0, DVERR_INVALIDPOINTER, NULL_NUM_ELEMENTS }, + + /* tests NULL everything */ + { 99, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA | NULL_DATA_SIZE | NULL_NUM_ELEMENTS }, + + /* tests passing the same pointer for data_size and num_elements */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests passing the same pointer but with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests flags!=0 */ + { 99, 99, 1, DVERR_INVALIDFLAGS }, + + /* tests data_size=0 */ + { 0, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size=1 */ + { 1, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = sizeof(DVCOMPRESSIONINFO) */ + { sizeof(DVCOMPRESSIONINFO), 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size - 1 */ + { 0 /* initialized later */, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size */ + { 0 /* initialized later */, 0, 0, DV_OK }, + + /* tests data_size = returned data_size + 1 */ + { 0 /* initialized later */, 0, 0, DV_OK } + }; + + /* either client_iface or server_iface must be given, but not both */ + assert(!client_iface ^ !server_iface); + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); + if(ret == E_NOTIMPL) + { + skip("%s: GetCompressionTypes not implemented\n", name); + return; + } + + if (client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, &data_size, &num_elements, 0); + ok(ret == DVERR_BUFFERTOOSMALL, + "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: got data_size=%u\n", name, data_size); + tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; + tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; + tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + + for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(data, 0x23, sizeof(data)); + + data_size = tests[i].data_size; + num_elements = tests[i].num_elements; + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes( + client_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes( + server_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + + ok(ret == tests[i].ret, + "%s: tests[%u]: expected ret=%x got ret=%x\n", name, i, tests[i].ret, ret); + + if(ret == DV_OK || ret == DVERR_BUFFERTOOSMALL || tests[i].test_flags == NULL_DATA) + { + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: tests[%u]: got data_size=%u\n", name, i, data_size); + if(!(tests[i].test_flags & SHARED_VARIABLE)) + ok(num_elements > 0 && num_elements < data_size / sizeof(DVCOMPRESSIONINFO) + 1, + "%s: tests[%u]: got num_elements=%u\n", name, i, num_elements); + } + else + { + ok(data_size == tests[i].data_size, + "%s: tests[%u]: expected data_size=%u got data_size=%u\n", + name, i, tests[i].data_size, data_size); + ok(num_elements == tests[i].num_elements, + "%s: tests[%u]: expected num_elements=%u got num_elements=%u\n", + name, i, tests[i].num_elements, num_elements); + } + + if(ret == DV_OK) + { + string_loc = (WCHAR*)(data + num_elements); + found_pcm = FALSE; + for(j = 0; j < num_elements; j++) + { + if(memcmp(&data[j].guidType, &DPVCTGUID_NONE, sizeof(GUID)) == 0) + { + ok(data[j].dwMaxBitsPerSecond == 64000, + "%s: tests[%u]: data[%u]: expected dwMaxBitsPerSecond=64000 got dwMaxBitsPerSecond=%u\n", + name, i, j, data[j].dwMaxBitsPerSecond); + found_pcm = TRUE; + } + ok(data[j].dwSize == 80, + "%s: tests[%u]: data[%u]: expected dwSize=80 got dwSize=%u\n", + name, i, j, data[j].dwSize); + ok(data[j].lpszName == string_loc, + "%s: tests[%u]: data[%u]: expected lpszName=%p got lpszName=%p\n", + name, i, j, string_loc, data[j].lpszName); + ok(!data[j].lpszDescription, + "%s: tests[%u]: data[%u]: expected lpszDescription=NULL got lpszDescription=%s\n", + name, i, j, wine_dbgstr_w(data[j].lpszDescription)); + ok(!data[j].dwFlags, + "%s: tests[%u]: data[%u]: expected dwFlags=0 got dwFlags=%u\n", + name, i, j, data[j].dwFlags); + string_loc += lstrlenW(data[j].lpszName) + 1; + } + ok((char*)string_loc == (char*)data + data_size, + "%s: tests[%u]: expected string_loc=%p got string_loc=%p\n", + name, i, (char*)data + data_size, string_loc); + ok(*(char*)string_loc == 0x23, + "%s: tests[%u]: expected *(char*)string_loc=0x23 got *(char*)string_loc=0x%x\n", + name, i, *(char*)string_loc); + ok(found_pcm, "%s: tests[%u]: MS-PCM codec not found\n", name, i); + } + else + { + ok(*(char*)data == 0x23, + "%s: tests[%u]: expected *(char*)data=0x23 got *(char*)data=0x%x\n", + name, i, *(char*)data); + } + } +} + START_TEST(voice) { HRESULT hr; @@ -354,9 +544,22 @@ START_TEST(voice) create_voicetest(); - if(test_init_dpvoice_server() && test_init_dpvoice_client()) + if(test_init_dpvoice_server()) + { + test_GetCompressionTypes(NULL, vserver); + + if(test_init_dpvoice_client()) + { + test_GetCompressionTypes(vclient, NULL); + } + else + { + skip("client failed to initialize\n"); + } + } + else { - /* TODO */ + skip("server failed to initialize\n"); } test_cleanup_dpvoice();

1 0

Matteo Bruni : wined3d: Make sure the correct texture is bound in device_update_volume.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 7c4d512fee752876b4ce95f1f97308f6a291b010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4d512fee752876b4ce95f1f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:49 2015 +0100 wined3d: Make sure the correct texture is bound in device_update_volume. --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 649f324..8cab927 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, /* Only a prepare, since we're uploading the entire volume. */ wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); + wined3d_texture_bind(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Matteo Bruni : wined3d: Reject unsupported pitches in wined3d_surface_update_desc().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: b47695bf3abd188a9e4185c43df3c80ea92bd74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47695bf3abd188a9e4185c43… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 19:21:00 2015 +0100 wined3d: Reject unsupported pitches in wined3d_surface_update_desc(). --- dlls/wined3d/texture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 675ca9e..6b2e266 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,19 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } + /* We have no way of supporting a pitch that is not a multiple of the pixel + * byte width short of uploading the texture row-by-row. + * Fortunately that's not an issue since D3D9Ex doesn't allow a custom pitch + * for user-memory textures (it always expects packed data) while DirectDraw + * requires a 4-byte aligned pitch and doesn't support texture formats + * larger than 4 bytes per pixel nor any format using 3 bytes per pixel. + * This check is here to verify that the assumption holds. */ + if (pitch % texture->resource.format->byte_count) + { + WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); + return WINED3DERR_INVALIDCALL; + } + surface = surface_from_resource(texture->sub_resources[0]); if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) {

1 0

Matteo Bruni : wined3d: Set the surface pitch for user-memory surfaces.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d56c168da12d890b0ed3c2f22c4554d3d1140252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c168da12d890b0ed3c2f22… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:47 2015 +0100 wined3d: Set the surface pitch for user-memory surfaces. --- dlls/wined3d/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 096579f..429147e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2187,10 +2187,16 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; if (surface->pitch) + { surface->resource.size = height * surface->pitch; + } else + { + /* User memory surfaces don't have the regular surface alignment. */ surface->resource.size = wined3d_format_calculate_size(texture_resource->format, - texture_resource->device->surface_alignment, width, height, 1); + 1, width, height, 1); + surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width); + } /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
42
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 February 2015