March 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrrun: Implement GetExtensionName().
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 3814e0229dc8248e0df915eb84dacf092f58da6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3814e0229dc8248e0df915eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 21:06:37 2015 +0300 scrrun: Implement GetExtensionName(). --- dlls/scrrun/filesystem.c | 22 ++++++++++++++++++---- dlls/scrrun/tests/filesystem.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f6f7703..74e5432 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3103,12 +3103,26 @@ static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, return S_OK; } -static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, - BSTR *pbstrResult) +static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR path, + BSTR *ext) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + INT len; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(path), ext); + + *ext = NULL; + len = SysStringLen(path); + while (len) { + if (path[len-1] == '.') { + *ext = SysAllocString(&path[len]); + if (!*ext) + return E_OUTOFMEMORY; + break; + } + len--; + } + + return S_OK; } static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b3f3bee..210b90c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1865,6 +1865,40 @@ static void test_SerialNumber(void) IEnumVARIANT_Release(iter); } +static const struct extension_test { + WCHAR path[20]; + WCHAR ext[10]; +} extension_tests[] = { + { {'n','o','e','x','t',0}, {0} }, + { {'n','.','o','.','e','x','t',0}, {'e','x','t',0} }, + { {'n','.','o','.','e','X','t',0}, {'e','X','t',0} }, + { { 0 } } +}; + +static void test_GetExtensionName(void) +{ + BSTR path, ext; + HRESULT hr; + int i; + + for (i = 0; i < sizeof(extension_tests)/sizeof(extension_tests[0]); i++) { + + path = SysAllocString(extension_tests[i].path); + ext = NULL; + hr = IFileSystem3_GetExtensionName(fs3, path, &ext); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (*extension_tests[i].ext) + ok(!lstrcmpW(ext, extension_tests[i].ext), "%d: path %s, got %s, expected %s\n", i, + wine_dbgstr_w(path), wine_dbgstr_w(ext), wine_dbgstr_w(extension_tests[i].ext)); + else + ok(ext == NULL, "%d: path %s, got %s, expected %s\n", i, + wine_dbgstr_w(path), wine_dbgstr_w(ext), wine_dbgstr_w(extension_tests[i].ext)); + + SysFreeString(path); + SysFreeString(ext); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -1899,6 +1933,7 @@ START_TEST(filesystem) test_Read(); test_GetDriveName(); test_SerialNumber(); + test_GetExtensionName(); IFileSystem3_Release(fs3);

1 0

Vincent Povirk : winemono.php: Added 4.5.6 release.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: tools Branch: master Commit: bd2235d27b9e1c769251ab0363d8946cb87d7374 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bd2235d27b9e1c769251ab03… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 2 13:24:42 2015 -0600 winemono.php: Added 4.5.6 release. --- winemono.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index 10bf13f..3758d0e 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '4.5.4'; +$sVersion = '4.5.6'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -30,7 +30,8 @@ $aFileSizes = array( '0.0.4'=>44408320, '0.0.8'=>46967296, '4.5.2'=>52502528, - '4.5.4'=>53706752 + '4.5.4'=>53706752, + '4.5.6'=>53705216 ); // Exact size of the file:

1 0

Bruno Jesus : kernel32: GetTempPathW must zero the remaining buffer.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: f16cf541068831074a6891688d947f0ce32abdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16cf541068831074a6891688… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Feb 28 20:11:08 2015 -0300 kernel32: GetTempPathW must zero the remaining buffer. --- dlls/kernel32/path.c | 6 +++++- dlls/kernel32/tests/path.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 475b1f6..1048214 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -623,9 +623,13 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) if (count) { - lstrcpynW(path, tmp_path, count); + lstrcpynW(path, tmp_path, ret); if (count >= ret) + { + /* the remaining buffer must be zeroed */ + memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); ret--; /* return length without 0 */ + } else if (count < 4) path[0] = 0; /* avoid returning ambiguous "X:" */ } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8b07b8f..a5c0f41 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1012,7 +1012,6 @@ static void test_GetTempPathW(char* tmp_dir) 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]); }

1 0

Mark Harmstone : comctl32: Call OpenThemeData on themed scrollbars.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 050bda2ece4f249d2973c3d4e1a1f5f3671de053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050bda2ece4f249d2973c3d4e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Feb 28 16:37:08 2015 +0000 comctl32: Call OpenThemeData on themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 9978598..ed2c051 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -38,7 +38,39 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) { + const WCHAR* themeClass = WC_SCROLLBARW; + HTHEME theme; + LRESULT result; + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + switch (msg) { + case WM_CREATE: + result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + OpenThemeData(hwnd, themeClass); + return result; + + case WM_DESTROY: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + OpenThemeData(hwnd, themeClass); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + default: + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + } + + return 0; }

1 0

Alexandre Julliard : ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: ff84bf8bdd118479b7aaabc393db66ff356bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff84bf8bdd118479b7aaabc39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:56:40 2015 +0900 ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure. --- dlls/ntdll/directory.c | 157 ------------------------------------------------- dlls/ntdll/file.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff84bf8bdd118479b7aaa…

1 0

Alex Henrie : x3daudio1_2: Add stub dll.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 13a1b2cfd4e55c97b0b728d2673e3f35abc9cfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a1b2cfd4e55c97b0b728d26… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 26 23:15:29 2015 -0700 x3daudio1_2: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_2/Makefile.in | 4 ++++ dlls/x3daudio1_2/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_2/x3daudio1_2.spec | 2 ++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 273f79e..726a247 100755 --- a/configure +++ b/configure @@ -1324,6 +1324,7 @@ enable_wtsapi32 enable_wuapi enable_wuaueng enable_x3daudio1_1 +enable_x3daudio1_2 enable_x3daudio1_3 enable_x3daudio1_4 enable_x3daudio1_5 @@ -17682,6 +17683,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_2 enable_x3daudio1_2 wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3 wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 diff --git a/configure.ac b/configure.ac index 465ea4d..f242181 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_2) WINE_CONFIG_DLL(x3daudio1_3) WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_5) diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in new file mode 100644 index 0000000..6632115 --- /dev/null +++ b/dlls/x3daudio1_2/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_2.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_2/main.c b/dlls/x3daudio1_2/main.c new file mode 100644 index 0000000..d71c54a --- /dev/null +++ b/dlls/x3daudio1_2/main.c @@ -0,0 +1,37 @@ +/* + * Copyright 2015 Alex Henrie + * + * 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_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Nikolay Sivov : scrrun: Implement Item() property for dictionary.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 1bc4c57e551e3d92ac2776d0e65d9a6d96a4acdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc4c57e551e3d92ac2776d0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:13:04 2015 +0300 scrrun: Implement Item() property for dictionary. --- dlls/scrrun/dictionary.c | 24 ++++++++++++++++++------ dlls/scrrun/tests/dictionary.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 524485b..a7c90db 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -316,22 +316,34 @@ static HRESULT WINAPI dictionary_putref_Item(IDictionary *iface, VARIANT *Key, V return E_NOTIMPL; } -static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *Key, VARIANT *pRetItem) +static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p %p)\n", This, Key, pRetItem); + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(key), debugstr_variant(item)); - return E_NOTIMPL; + if ((pair = get_keyitem_pair(This, key))) + return VariantCopyInd(&pair->item, item); + + return IDictionary_Add(iface, key, item); } -static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *Key, VARIANT *pRetItem) +static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p %p)\n", This, Key, pRetItem ); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(key), item); - return E_NOTIMPL; + if ((pair = get_keyitem_pair(This, key))) + VariantCopy(item, &pair->item); + else { + VariantInit(item); + return IDictionary_Add(iface, key, item); + } + + return S_OK; } static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *key, VARIANT *item) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 066a5ab..c9e71a5 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -574,6 +574,34 @@ todo_wine IDictionary_Release(dict); } +static void test_Item(void) +{ + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 10; + V_VT(&item) = VT_I2; + V_I2(&item) = 123; + hr = IDictionary_get_Item(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); + + V_VT(&key) = VT_I2; + V_I2(&key) = 10; + V_VT(&item) = VT_I2; + hr = IDictionary_get_Item(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -596,6 +624,7 @@ START_TEST(dictionary) test_Exists(); test_Keys(); test_Remove(); + test_Item(); CoUninitialize(); }

1 0

Nikolay Sivov : scrrun: Support VT_BSTR|VT_BYREF keys.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 7727a4859500b524dff011c5326bb1c470e8d60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7727a4859500b524dff011c53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:01:48 2015 +0300 scrrun: Support VT_BSTR|VT_BYREF keys. --- dlls/scrrun/dictionary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 5c1893a..524485b 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -485,8 +485,9 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V V_VT(hash) = VT_I4; switch (V_VT(key)) { + case VT_BSTR|VT_BYREF: case VT_BSTR: - V_I4(hash) = get_str_hash(V_BSTR(key), This->method); + V_I4(hash) = get_str_hash(get_key_strptr(key), This->method); break; case VT_UI1: V_I4(hash) = get_num_hash(V_UI1(key));

1 0

Austin English : include: Add ASN1_* function prototypes.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 04baaa2bf30d0b018ad9f5a44784f1b0b0da8e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04baaa2bf30d0b018ad9f5a44… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 27 12:49:28 2015 -0600 include: Add ASN1_* function prototypes. --- dlls/msasn1/main.c | 1 + include/msasn1.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index fe4877e..81f246a 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "msasn1.h" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { diff --git a/include/msasn1.h b/include/msasn1.h index 32ace3e..6b7bdfb 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -70,6 +70,29 @@ typedef enum { ASN1_BER_RULE = ASN1_BER_RULE_BER | ASN1_BER_RULE_CER | ASN1_BER_RULE_DER } ASN1encodingrule_e; +typedef enum tagASN1error_e +{ + ASN1_SUCCESS = 0, + ASN1_ERR_INTERNAL = -1001, + ASN1_ERR_EOD = -1002, + ASN1_ERR_CORRUPT = -1003, + ASN1_ERR_LARGE = -1004, + ASN1_ERR_CONSTRAINT = -1005, + ASN1_ERR_MEMORY = -1006, + ASN1_ERR_OVERFLOW = -1007, + ASN1_ERR_BADPDU = -1008, + ASN1_ERR_BADARGS = -1009, + ASN1_ERR_BADREAL = -1010, + ASN1_ERR_BADTAG = -1011, + ASN1_ERR_CHOICE = -1012, + ASN1_ERR_RULE = -1013, + ASN1_ERR_UTF8 = -1014, + ASN1_ERR_PDU_TYPE = -1051, + ASN1_ERR_NYI = -1052, + ASN1_WRN_EXTENDED = 1001, + ASN1_WRN_NOEOD = 1002, +} ASN1error_e; + typedef struct tagASN1module_t { ASN1magic_t nModuleName; ASN1encodingrule_e eRule; @@ -83,6 +106,47 @@ typedef struct tagASN1module_t { }; } *ASN1module_t; +typedef enum tagASN1option_e +{ + ASN1OPT_CHANGE_RULE = 0x101, + ASN1OPT_GET_RULE = 0x201, + ASN1OPT_NOT_REUSE_BUFFER = 0x301, + ASN1OPT_REWIND_BUFFER = 0x302, + ASN1OPT_SET_DECODED_BUFFER = 0x501, + ASN1OPT_DEL_DECODED_BUFFER = 0x502, + ASN1OPT_GET_DECODED_BUFFER_SIZE = 0x601, +} ASN1option_e; + +typedef struct tagASN1optionparam_t { + ASN1option_e eOption; + union + { + ASN1encodingrule_e eRule; + ASN1uint32_t cbRequiredDecodedBufSize; + struct + { + ASN1octet_t* pbBuf; + ASN1uint32_t cbBufSize; + } Buffer; + }; +} ASN1optionparam_t, ASN1optionparam_s; + +void WINAPI ASN1_CloseDecoder(ASN1decoding_t); +void WINAPI ASN1_CloseEncoder(ASN1encoding_t); +void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); +void WINAPI ASN1_CloseModule(ASN1module_t); +ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t); +ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t, ASN1encoding_t*, ASN1octet_t*, ASN1uint32_t, ASN1encoding_t); +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t,ASN1encodingrule_e,ASN1uint32_t,ASN1uint32_t,const ASN1GenericFun_t [],const ASN1GenericFun_t [],const ASN1FreeFun_t [],const ASN1uint32_t [],ASN1magic_t); +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t, void** , ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); +ASN1error_e WINAPI ASN1_Encode(ASN1encoding_t, void*, ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); +void WINAPI ASN1_FreeDecoded(ASN1decoding_t, void*, ASN1uint32_t); +void WINAPI ASN1_FreeEncoded(ASN1encoding_t, void*); +ASN1error_e WINAPI ASN1_GetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_GetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_SetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_SetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); + #ifdef __cplusplus } #endif

1 0

Amine Khaldi : include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 21bfc8c440f5d478bbb91f2f631ff02c37d2d2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfc8c440f5d478bbb91f2f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Feb 28 09:22:59 2015 +0100 include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 24 ++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- dlls/ddraw/utils.c | 10 +++++----- dlls/ddrawex/ddraw.c | 4 ++-- dlls/dxdiagn/provider.c | 4 ++-- include/ddraw.h | 10 ++++++++-- 9 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21bfc8c440f5d478bbb91…

1 0