February 2015 - Wine-Commits

Jacek Caban : winegecko.php: Added 2.36 release.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: tools Branch: master Commit: 5f742c669e17cc7b5ed417476798fd4cb5a13af1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f742c669e17cc7b5ed41747… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 24 14:19:18 2015 +0100 winegecko.php: Added 2.36 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index b2135a6..fdc1b96 100644 --- a/winegecko.php +++ b/winegecko.php @@ -86,7 +86,9 @@ $aFileSizes = array( '2.34-x86'=>28269568, '2.34-x86_64'=>29802496, '2.36-beta1-x86'=>29698560, - '2.36-beta1-x86_64'=>31211008 + '2.36-beta1-x86_64'=>31211008, + '2.36-x86'=>29718016, + '2.36-x86_64'=>31222784 ); // Exact size of the file:

1 0

Alexandre Julliard : patches: Insert a blank line before the git signature.
by Alexandre Julliard Feb. 25, 2015

Feb. 25, 2015

Module: tools Branch: master Commit: 06f795c5b0ed1a0b399a1cf03e779081c0cbef30 URL: http://source.winehq.org/git/tools.git/?a=commit;h=06f795c5b0ed1a0b399a1cf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 21:18:16 2015 +0900 patches: Insert a blank line before the git signature. This avoids making it look like a corrupted diff. --- patches/filter | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/patches/filter b/patches/filter index 306787d..53ea86e 100755 --- a/patches/filter +++ b/patches/filter @@ -61,24 +61,23 @@ sub filter_patch(@) my @diff_lines = (); my $p_option = -1; my $use_index = 0; + my $git_patch = 0; foreach $_ (@_) { chomp; s/\r$//; if (/^Index: (\S*)/) { $use_index = 1; } - elsif (/^\+\+\+ b\//) { $p_option = 1; } - elsif (/^diff --git/) { $p_option = 1; } + elsif (/^\+\+\+ b\//) { $git_patch = 1; } + elsif (/^diff --git/) { $git_patch = 1; } elsif (/ (\/dev\/null)/) { push @diff_lines, $1; } elsif (/^--- (\S*)\//) { push @diff_lines, $1; } elsif (/^\+\+\+ (\S*)\//) { push @diff_lines, $1; } } - if ($p_option == -1) - { - if ($use_index) { $p_option = 0; } - else { $p_option = find_p_option( @diff_lines ); } - } + if ($git_patch) { $p_option = 1; } + elsif ($use_index) { $p_option = 0; } + else { $p_option = find_p_option( @diff_lines ); } # now patch the diff lines my $file = ""; @@ -107,6 +106,10 @@ sub filter_patch(@) $f = add_prefix( $file, $p_option, "b/" ); s/^\+\+\+ .*/\+\+\+ $f/; } + elsif ($git_patch && /^-- $/) + { + $_ = "\n" . $_; + } } return @_;

1 0

Piotr Caban : msvcp71: Add locale::facet::_Getcat implementation.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 575628743d07b2c6eb7073afd02736bf0ced7aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=575628743d07b2c6eb7073afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 24 14:12:41 2015 +0100 msvcp71: Add locale::facet::_Getcat implementation. --- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/locale.c | 8 ++++++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 2e98230..bdbce65 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1892,8 +1892,8 @@ @ cdecl -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old @ cdecl -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old -@ stub -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z -@ stub -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z +@ cdecl -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old +@ cdecl -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old @ thiscall -arch=i386 ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ cdecl -arch=win64 ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ thiscall -arch=i386 ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 48bbd40..08c133c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2079,8 +2079,8 @@ @ cdecl -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old @ cdecl -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old -@ stub -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z -@ stub -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z +@ cdecl -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old +@ cdecl -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old @ thiscall -arch=win32 ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ cdecl -arch=win64 ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ thiscall -arch=win32 ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 5d263fa..8f3c43e 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2296,8 +2296,8 @@ @ cdecl -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old @ cdecl -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old -@ stub -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z -@ stub -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z +@ cdecl -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old +@ cdecl -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old @ thiscall -arch=i386 ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ cdecl -arch=win64 ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll @ thiscall -arch=i386 ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 568585c..a0fbc66 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -408,6 +408,14 @@ MSVCP_size_t __cdecl locale_facet__Getcat(const locale_facet **facet, const loca return -1; } +/* ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z */ +/* ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z */ +MSVCP_size_t __cdecl locale_facet__Getcat_old(const locale_facet **facet) +{ + TRACE("(%p)\n", facet); + return -1; +} + /* ??0_Timevec(a)std@@QAE(a)ABV01@@Z */ /* ??0_Timevec(a)std@@QEAA(a)AEBV01@@Z */ /* This copy constructor modifies copied object */

1 0

Bruno Jesus : kernel32/tests: Add more GetTempPath tests.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 300c2dedac24e2bdab1118edf448959fff918d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=300c2dedac24e2bdab1118edf… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 23 22:41:32 2015 -0300 kernel32/tests: Add more GetTempPath tests. --- dlls/kernel32/tests/path.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 44f14d0..8b07b8f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -953,6 +953,14 @@ static void test_GetTempPathA(char* tmp_dir) len = GetTempPathA(len, buf); ok(lstrcmpiA(buf, tmp_dir) == 0, "expected [%s], got [%s]\n",tmp_dir,buf); ok(len == strlen(buf), "returned length should be equal to the length of string\n"); + + memset(buf, 'a', sizeof(buf)); + len = GetTempPathA(sizeof(buf), buf); + ok(lstrcmpiA(buf, tmp_dir) == 0, "expected [%s], got [%s]\n",tmp_dir,buf); + ok(len == strlen(buf), "returned length should be equal to the length of string\n"); + /* The rest of the buffer remains untouched */ + for(len++; len < sizeof(buf); len++) + ok(buf[len] == 'a', "expected 'a' at [%d], got 0x%x\n", len, buf[len]); } static void test_GetTempPathW(char* tmp_dir) @@ -996,6 +1004,16 @@ static void test_GetTempPathW(char* tmp_dir) len = GetTempPathW(len, buf); ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); + + for(len = 0; len < sizeof(buf) / sizeof(buf[0]); len++) + buf[len] = 'a'; + len = GetTempPathW(len, buf); + ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); + ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); + /* The rest of the buffer must be zeroed */ + for(len++; len < sizeof(buf) / sizeof(buf[0]); len++) + todo_wine + ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); } static void test_GetTempPath(void)

1 0

André Hentschel : shell32: Don' t call Drop without valid target.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 81711c755857f312405e17a53d8d34cf20a1e2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81711c755857f312405e17a53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 23 20:01:36 2015 +0100 shell32: Don't call Drop without valid target. --- dlls/shell32/shlview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8520986..48409ff 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2491,6 +2491,8 @@ static HRESULT WINAPI ISVDropTarget_Drop(IDropTarget *iface, IDataObject* pDataO { IShellViewImpl *This = impl_from_IDropTarget(iface); + if (!This->pCurDropTarget) return DRAGDROP_E_INVALIDHWND; + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); IDropTarget_Release(This->pCurDropTarget);

1 0

Mark Harmstone : winecfg: Refresh sys params on theme change.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: fa685fc353adf73d8783d8d29a72a78486fd64d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa685fc353adf73d8783d8d29… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Feb 21 18:55:16 2015 +0000 winecfg: Refresh sys params on theme change. --- programs/winecfg/theme.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 79c8b7c..6db602f 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -83,6 +83,9 @@ HRESULT WINAPI CloseThemeFile (HTHEMEFILE hThemeFile); HRESULT WINAPI EnumThemes (LPCWSTR pszThemePath, EnumThemeProc callback, LPVOID lpData); +static void refresh_sysparams(HWND hDlg); +static void on_sysparam_change(HWND hDlg); + /* A struct to keep both the internal and "fancy" name of a color or size */ typedef struct { @@ -388,7 +391,7 @@ static BOOL update_color_and_size (int themeIndex, HWND comboColor, } /* Apply a theme from a given theme, color and size combo box item index. */ -static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) +static void do_apply_theme (HWND dialog, int themeIndex, int colorIndex, int sizeIndex) { static char b[] = "\0"; @@ -423,6 +426,8 @@ static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) ApplyTheme (NULL, b, NULL); } } + + refresh_sysparams(dialog); } static BOOL updating_ui; @@ -491,7 +496,7 @@ static void apply_theme(HWND dialog) sizeIndex = SendMessageW (GetDlgItem (dialog, IDC_THEME_SIZECOMBO), CB_GETCURSEL, 0, 0); - do_apply_theme (themeIndex, colorIndex, sizeIndex); + do_apply_theme (dialog, themeIndex, colorIndex, sizeIndex); theme_dirty = FALSE; } @@ -956,6 +961,21 @@ static void apply_shell_folder_changes(void) { } } +static void refresh_sysparams(HWND hDlg) +{ + int i; + + for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++) + { + if (metrics[i].sm_idx != -1) + metrics[i].size = GetSystemMetrics(metrics[i].sm_idx); + if (metrics[i].color_idx != -1) + metrics[i].color = GetSysColor(metrics[i].color_idx); + } + + on_sysparam_change(hDlg); +} + static void read_sysparams(HWND hDlg) { WCHAR buffer[256];

1 0

Andrey Gusev : x3daudio1_5: Add stub dll.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 484c818f75426f7d6ab4f7958f098a0ac259c1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=484c818f75426f7d6ab4f7958… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 23 17:38:08 2015 +0200 x3daudio1_5: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_5/Makefile.in | 4 ++++ dlls/x3daudio1_5/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_5/x3daudio1_5.spec | 2 ++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 066444f..b2ab2b0 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_1 enable_x3daudio1_4 +enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 enable_xapofx1_1 @@ -17681,6 +17682,7 @@ 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_4 enable_x3daudio1_4 +wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 diff --git a/configure.ac b/configure.ac index 658280f..6eda10f 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_1) WINE_CONFIG_DLL(x3daudio1_4) +WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in new file mode 100644 index 0000000..42a7f61 --- /dev/null +++ b/dlls/x3daudio1_5/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_5.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_5/main.c b/dlls/x3daudio1_5/main.c new file mode 100644 index 0000000..debb65c --- /dev/null +++ b/dlls/x3daudio1_5/main.c @@ -0,0 +1,37 @@ +/* + * 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/x3daudio1_5/x3daudio1_5.spec b/dlls/x3daudio1_5/x3daudio1_5.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_5/x3daudio1_5.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Andrey Gusev : x3daudio1_4: Add stub dll.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 7a0898371d2e69d488b567a554af8161989d1bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0898371d2e69d488b567a55… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 23 17:33:19 2015 +0200 x3daudio1_4: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_4/Makefile.in | 4 ++++ dlls/x3daudio1_4/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_4/x3daudio1_4.spec | 2 ++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 3c2a1bc..066444f 100755 --- a/configure +++ b/configure @@ -1324,6 +1324,7 @@ enable_wtsapi32 enable_wuapi enable_wuaueng enable_x3daudio1_1 +enable_x3daudio1_4 enable_x3daudio1_6 enable_x3daudio1_7 enable_xapofx1_1 @@ -17679,6 +17680,7 @@ 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_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 diff --git a/configure.ac b/configure.ac index 03f629a..658280f 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_1) +WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_6) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in new file mode 100644 index 0000000..e116f84 --- /dev/null +++ b/dlls/x3daudio1_4/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_4.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_4/main.c b/dlls/x3daudio1_4/main.c new file mode 100644 index 0000000..debb65c --- /dev/null +++ b/dlls/x3daudio1_4/main.c @@ -0,0 +1,37 @@ +/* + * 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/x3daudio1_4/x3daudio1_4.spec b/dlls/x3daudio1_4/x3daudio1_4.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_4/x3daudio1_4.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Nikolay Sivov : gameux/tests: Simplify test game registering, add intermediate test checks.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 2062a483658217d1acfb504d1859108f8994a63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2062a483658217d1acfb504d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 21 20:16:27 2015 +0300 gameux/tests: Simplify test game registering, add intermediate test checks. --- dlls/gameux/tests/gamestatistics.c | 64 ++++++++++++++------------------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index f5dd2ab..663ed53 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -30,7 +30,6 @@ /******************************************************************************* * utilities */ -static IGameExplorer *ge = NULL; static WCHAR sExeName[MAX_PATH] = {0}; static GUID gameInstanceId; static HRESULT WINAPI (*pSHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); @@ -52,65 +51,50 @@ static BOOL _loadDynamicRoutines(void) if (!pSHGetFolderPathW) return FALSE; return TRUE; } + /******************************************************************************* - * _registerGame * Registers test suite executable as game in Games Explorer. Required to test * game statistics. */ -static HRESULT _registerGame(void) { +static void test_register_game(IGameExplorer **explorer) +{ HRESULT hr; - WCHAR sExePath[MAX_PATH]; + WCHAR pathW[MAX_PATH]; BSTR bstrExeName, bstrExePath; - DWORD dwExeNameLen; /* prepare path to binary */ - dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); - hr = (dwExeNameLen!= 0 ? S_OK : E_FAIL); - lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); - - bstrExeName = SysAllocString(sExeName); - if(!bstrExeName) hr = E_OUTOFMEMORY; - - bstrExePath = SysAllocString(sExePath); - if(!bstrExePath) hr = E_OUTOFMEMORY; + GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); - if(SUCCEEDED(hr)) - { - gameInstanceId = GUID_NULL; - hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, - &IID_IGameExplorer, (LPVOID*)&ge); - } + lstrcpyW(pathW, sExeName); + PathRemoveFileSpecW(pathW); - if(SUCCEEDED(hr)) - hr = IGameExplorer_AddGame(ge, bstrExeName, bstrExePath, - GIS_CURRENT_USER, &gameInstanceId); + hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer, (void**)explorer); + ok(hr == S_OK, "got 0x%08x\n", hr); - if(FAILED(hr) && ge) - { - IGameExplorer_Release(ge); - ge = NULL; - } + gameInstanceId = GUID_NULL; + bstrExeName = SysAllocString(sExeName); + bstrExePath = SysAllocString(pathW); + hr = IGameExplorer_AddGame(*explorer, bstrExeName, bstrExePath, GIS_CURRENT_USER, &gameInstanceId); + ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstrExeName); SysFreeString(bstrExePath); - return hr; } + /******************************************************************************* - * _unregisterGame * Unregisters test suite from Games Explorer. */ -static HRESULT _unregisterGame(void) { +static void test_unregister_game(IGameExplorer *ge) +{ HRESULT hr; - if(!ge) return E_FAIL; + if (!ge) return; hr = IGameExplorer_RemoveGame(ge, gameInstanceId); - + ok(hr == S_OK, "got 0x%08x\n", hr); IGameExplorer_Release(ge); - ge = NULL; - - return hr; } + /******************************************************************************* * _buildStatisticsFilePath * Creates path to file containing statistics of game with given id. @@ -438,13 +422,11 @@ START_TEST(gamestatistics) if(gameStatisticsAvailable) { - hr = _registerGame(); - ok( hr == S_OK, "cannot register game in Game Explorer (error: 0x%x)\n", hr); + IGameExplorer *ge; + test_register_game(&ge); test_gamestatisticsmgr(); - - hr = _unregisterGame(); - ok( hr == S_OK, "cannot unregister game from Game Explorer (error: 0x%x)\n", hr); + test_unregister_game(ge); } CoUninitialize();

1 0

Nikolay Sivov : gameux/tests: Simplify initial test skipping.
by Alexandre Julliard Feb. 24, 2015

Feb. 24, 2015

Module: wine Branch: master Commit: 5620159e612c35d5ab7e2a0afe3951facaafc1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5620159e612c35d5ab7e2a0af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 21 20:25:30 2015 +0300 gameux/tests: Simplify initial test skipping. --- dlls/gameux/tests/gamestatistics.c | 59 +++++++++++++++----------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 663ed53..90a16f7 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -161,24 +161,6 @@ static BOOL _isFileExists(LPCWSTR lpFile) /******************************************************************************* * test routines */ -static void test_create(BOOL* gameStatisticsAvailable) -{ - HRESULT hr; - - IGameStatisticsMgr* gsm = NULL; - *gameStatisticsAvailable = FALSE; - - /* interface available up from Win7 */ - hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); - if(gsm) - { - ok( hr == S_OK, "IGameStatisticsMgr creating failed (result: 0x%08x)\n", hr); - *gameStatisticsAvailable = TRUE; - IGameStatisticsMgr_Release(gsm); - } - else - win_skip("IGameStatisticsMgr cannot be created\n"); -} static void test_gamestatisticsmgr( void ) { static const GUID guidApplicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 } }; @@ -411,28 +393,33 @@ static void test_gamestatisticsmgr( void ) START_TEST(gamestatistics) { HRESULT hr; - BOOL gameStatisticsAvailable; + IGameStatisticsMgr* gsm; + IGameExplorer *ge; - if(_loadDynamicRoutines()) + if (!_loadDynamicRoutines()) { - hr = CoInitialize( NULL ); - ok( hr == S_OK, "failed to init COM\n"); - - test_create(&gameStatisticsAvailable); - - if(gameStatisticsAvailable) - { - IGameExplorer *ge; + /* this is not a failure, because a procedure loaded by address + * is always available on systems which has gameux.dll */ + win_skip("too old system, cannot load required dynamic procedures\n"); + return; + } - test_register_game(&ge); - test_gamestatisticsmgr(); - test_unregister_game(ge); - } + hr = CoInitialize( NULL ); + ok(hr == S_OK, "failed to init COM\n"); + /* interface available up from Win7 */ + hr = CoCreateInstance(&CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (void**)&gsm); + if (FAILED(hr)) + { + win_skip("IGameStatisticsMgr is not supported.\n"); CoUninitialize(); + return; } - else - /* this is not a failure, because a procedure loaded by address - * is always available on systems which has gameux.dll */ - win_skip("too old system, cannot load required dynamic procedures\n"); + IGameStatisticsMgr_Release(gsm); + + test_register_game(&ge); + test_gamestatisticsmgr(); + test_unregister_game(ge); + + CoUninitialize(); }

1 0