wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Jacek Caban : crypt32: Moved CertAddCertificateContextToStore to cert.c.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 988e8a78c2deda0463c8bad9734fa6fd8d4ec543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988e8a78c2deda0463c8bad97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:52:57 2013 +0200 crypt32: Moved CertAddCertificateContextToStore to cert.c. --- dlls/crypt32/cert.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 128 -------------------------------------------------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9016d8c..2c96419 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -121,6 +121,134 @@ static const context_vtbl_t cert_vtbl = { Cert_free }; +BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) +{ + WINECRYPT_CERTSTORE *store = hCertStore; + BOOL ret = TRUE; + PCCERT_CONTEXT toAdd = NULL, existing = NULL; + + TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, + dwAddDisposition, ppStoreContext); + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + break; + case CERT_STORE_ADD_NEW: + case CERT_STORE_ADD_REPLACE_EXISTING: + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + case CERT_STORE_ADD_USE_EXISTING: + case CERT_STORE_ADD_NEWER: + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + { + BYTE hashToAdd[20]; + DWORD size = sizeof(hashToAdd); + + ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, + hashToAdd, &size); + if (ret) + { + CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; + + existing = CertFindCertificateInStore(hCertStore, + pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, + NULL); + } + break; + } + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEW: + if (existing) + { + TRACE("found matching certificate, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING: + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + toAdd = CertDuplicateCertificateContext(pCertContext); + if (existing) + Context_CopyProperties(toAdd, existing); + break; + case CERT_STORE_ADD_USE_EXISTING: + if (existing) + { + Context_CopyProperties(existing, pCertContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(existing); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: + if (existing) + { + if (CompareFileTime(&existing->pCertInfo->NotBefore, + &pCertContext->pCertInfo->NotBefore) >= 0) + { + TRACE("existing certificate is newer, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + ret = FALSE; + } + else + { + toAdd = CertDuplicateCertificateContext(pCertContext); + Context_CopyProperties(toAdd, existing); + } + } + else + toAdd = CertDuplicateCertificateContext(pCertContext); + break; + } + + if (toAdd) + { + if (store) + ret = store->vtbl->certs.addContext(store, (void *)toAdd, + (void *)existing, (const void **)ppStoreContext); + else if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(toAdd); + CertFreeCertificateContext(toAdd); + } + CertFreeCertificateContext(existing); + + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index f11279c..5bd19eb 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -892,134 +892,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); } -BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, - PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, - PCCERT_CONTEXT *ppStoreContext) -{ - WINECRYPT_CERTSTORE *store = hCertStore; - BOOL ret = TRUE; - PCCERT_CONTEXT toAdd = NULL, existing = NULL; - - TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, - dwAddDisposition, ppStoreContext); - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - break; - case CERT_STORE_ADD_NEW: - case CERT_STORE_ADD_REPLACE_EXISTING: - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - case CERT_STORE_ADD_USE_EXISTING: - case CERT_STORE_ADD_NEWER: - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - { - BYTE hashToAdd[20]; - DWORD size = sizeof(hashToAdd); - - ret = CertGetCertificateContextProperty(pCertContext, CERT_HASH_PROP_ID, - hashToAdd, &size); - if (ret) - { - CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; - - existing = CertFindCertificateInStore(hCertStore, - pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, - NULL); - } - break; - } - default: - FIXME("Unimplemented add disposition %d\n", dwAddDisposition); - SetLastError(E_INVALIDARG); - ret = FALSE; - } - - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEW: - if (existing) - { - TRACE("found matching certificate, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING: - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: - toAdd = CertDuplicateCertificateContext(pCertContext); - if (existing) - Context_CopyProperties(toAdd, existing); - break; - case CERT_STORE_ADD_USE_EXISTING: - if (existing) - { - Context_CopyProperties(existing, pCertContext); - if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(existing); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: - if (existing) - { - if (CompareFileTime(&existing->pCertInfo->NotBefore, - &pCertContext->pCertInfo->NotBefore) >= 0) - { - TRACE("existing certificate is newer, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - ret = FALSE; - } - else - { - toAdd = CertDuplicateCertificateContext(pCertContext); - Context_CopyProperties(toAdd, existing); - } - } - else - toAdd = CertDuplicateCertificateContext(pCertContext); - break; - } - - if (toAdd) - { - if (store) - ret = store->vtbl->certs.addContext(store, (void *)toAdd, - (void *)existing, (const void **)ppStoreContext); - else if (ppStoreContext) - *ppStoreContext = CertDuplicateCertificateContext(toAdd); - CertFreeCertificateContext(toAdd); - } - CertFreeCertificateContext(existing); - - TRACE("returning %d\n", ret); - return ret; -} - PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pPrev) {

1 0

Austin English : explorerframe/tests: Build with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 97861a524b1f8347b8d1cdf06fa181282e5eed08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97861a524b1f8347b8d1cdf06… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 14 10:59:12 2013 -0700 explorerframe/tests: Build with -D__WINESRC__. --- dlls/explorerframe/tests/Makefile.in | 1 - dlls/explorerframe/tests/nstc.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index 727670e..921eaa9 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ nstc.c diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index ab6a0ce..94ca06c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -418,10 +418,10 @@ static void process_msgs(void) do { got_msg = FALSE; Sleep(100); - while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE)) + while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); got_msg = TRUE; } } while(got_msg); @@ -432,10 +432,10 @@ static void process_msgs(void) sending WM_TIMER manually does not seem to help us.) */ Sleep(500); - while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE)) + while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } @@ -1928,17 +1928,17 @@ static void test_events(void) /* Test On*Expand */ hroot = (HTREEITEM)SendMessageW(hwnd_tv, TVM_GETNEXTITEM, TVGN_ROOT, 0); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); process_msgs(); ok_event_count(pnstceimpl, OnBeforeExpand, 1); ok_event_count(pnstceimpl, OnAfterExpand, 1); ok_event_broken(pnstceimpl, OnItemAdded); /* No event on Vista */ todo_wine ok_event_count(pnstceimpl, OnSelectionChanged, 1); ok_no_events(pnstceimpl); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot); process_msgs(); ok_no_events(pnstceimpl); - SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); + SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot); process_msgs(); ok_no_events(pnstceimpl);

1 0

Piotr Caban : msvcrt: Don't validate parameters in _itoa function.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: f906be9ef46635e55d96944de0e45b5618c7e979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f906be9ef46635e55d96944de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 16:29:00 2013 +0200 msvcrt: Don't validate parameters in _itoa function. --- dlls/msvcrt/string.c | 31 ++++++++++++++++++------------- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a6b328b..10fb35f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -980,10 +980,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } -/********************************************************************* - * _ltoa_s (MSVCRT.@) - */ -int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; @@ -991,14 +988,6 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) char buffer[33], *pos; size_t len; - if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) - { - str[0] = '\0'; - return MSVCRT_EINVAL; - } - if (value < 0 && radix == 10) { is_negative = TRUE; @@ -1056,6 +1045,22 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _ltoa_s (MSVCRT.@) + */ +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +{ + if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) + { + str[0] = '\0'; + return MSVCRT_EINVAL; + } + + return ltoa_helper(value, str, size, radix); +} + +/********************************************************************* * _ltow_s (MSVCRT.@) */ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) @@ -1143,7 +1148,7 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) */ char* CDECL _itoa(int value, char *str, int radix) { - return _itoa_s(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; + return ltoa_helper(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3877d18..d778586 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1882,6 +1882,11 @@ static void test__itoa_s(void) ok(!strcmp(buffer, "-12345678"), "Expected output buffer string to be \"-12345678\", got \"%s\"\n", buffer); + + itoa(100, buffer, 100); + ok(!strcmp(buffer, "10"), + "Expected output buffer string to be \"10\", got \"%s\"\n", buffer); + if (p_set_invalid_parameter_handler) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n");

1 0

Piotr Caban : comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set .
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 26c751ea2968cb1ec63025a4f19567e7cafe86de URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c751ea2968cb1ec63025a4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 15:52:30 2013 +0200 comctl32: Ignore tooltip position passed in TTM_TRACKPOSITION if TTF_TRACK flag is not set. --- dlls/comctl32/tests/tooltips.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 2 +- 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 71c66a5..87e1d9b 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -758,6 +758,62 @@ static void test_longtextW(void) DestroyWindow(hwnd); } +static BOOL almost_eq(int a, int b) +{ + return a-5<b && a+5>b; +} + +static void test_track(void) +{ + WCHAR textW[] = {'t','e','x','t',0}; + TTTOOLINFOW info = { 0 }; + HWND parent, tt; + LRESULT res; + RECT pos; + + parent = CreateWindowExW(0, WC_STATICW, NULL, WS_CAPTION | WS_VISIBLE, + 50, 50, 300, 300, NULL, NULL, NULL, 0); + ok(parent != NULL, "creation of parent window failed\n"); + + ShowWindow(parent, SW_SHOWNORMAL); + flush_events(100); + + tt = CreateWindowExW(WS_EX_TOPMOST, TOOLTIPS_CLASSW, NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleW(NULL), 0); + ok(tt != NULL, "creation of tooltip window failed\n"); + + info.cbSize = TTTOOLINFO_V1_SIZE; + info.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; + info.hwnd = parent; + info.hinst = GetModuleHandleW(NULL); + info.lpszText = textW; + info.uId = (UINT_PTR)parent; + GetClientRect(parent, &info.rect); + + res = SendMessageW(tt, TTM_ADDTOOLW, 0, (LPARAM)&info); + ok(res, "adding the tool to the tooltip failed\n"); + + SendMessageW(tt, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); + SendMessageW(tt, TTM_TRACKACTIVATE, (WPARAM)TRUE, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + info.uFlags = TTF_IDISHWND | TTF_ABSOLUTE; + SendMessageW(tt, TTM_SETTOOLINFO, 0, (LPARAM)&info); + SendMessageW(tt, TTM_TRACKPOSITION, 0, MAKELPARAM(10, 10)); + + GetWindowRect(tt, &pos); + ok(!almost_eq(pos.left, 10), "pos.left = %d\n", pos.left); + ok(!almost_eq(pos.top, 10), "pos.top = %d\n", pos.top); + + DestroyWindow(tt); + DestroyWindow(parent); +} + START_TEST(tooltips) { InitCommonControls(); @@ -768,4 +824,5 @@ START_TEST(tooltips) test_ttm_gettoolinfo(); test_longtextA(); test_longtextW(); + test_track(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2cc7e47..a325bcc 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -626,7 +626,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TOOLTIPS_CalcTipSize (infoPtr, &size); TRACE("size %d x %d\n", size.cx, size.cy); - if (track_activate) + if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { rect.left = infoPtr->xTrackPos; rect.top = infoPtr->yTrackPos;

1 0

Zhenbo Li : atl90: Added new dll.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 7003bbdfd41b8dd690b41aa1d367927e75ad781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7003bbdfd41b8dd690b41aa1d… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Oct 12 12:11:58 2013 +0800 atl90: Added new dll. --- configure | 2 + configure.ac | 1 + dlls/atl90/Makefile.in | 7 ++++ dlls/atl90/atl90.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl90/atl90.spec | 52 ++++++++++++++++++++++++++ include/atlbase.h | 1 + tools/make_specfiles | 1 + 7 files changed, 158 insertions(+), 0 deletions(-) diff --git a/configure b/configure index bfde1af..b523d82 100755 --- a/configure +++ b/configure @@ -881,6 +881,7 @@ enable_atl enable_atl100 enable_atl110 enable_atl80 +enable_atl90 enable_authz enable_avicap32 enable_avifil32 @@ -16679,6 +16680,7 @@ wine_fn_config_test dlls/atl100/tests atl100_test wine_fn_config_dll atl110 enable_atl110 wine_fn_config_dll atl80 enable_atl80 implib wine_fn_config_test dlls/atl80/tests atl80_test +wine_fn_config_dll atl90 enable_atl90 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index a2e1874..4f6e263 100644 --- a/configure.ac +++ b/configure.ac @@ -2716,6 +2716,7 @@ WINE_CONFIG_TEST(dlls/atl100/tests) WINE_CONFIG_DLL(atl110) WINE_CONFIG_DLL(atl80,,[implib]) WINE_CONFIG_TEST(dlls/atl80/tests) +WINE_CONFIG_DLL(atl90) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in new file mode 100644 index 0000000..92b5d44 --- /dev/null +++ b/dlls/atl90/Makefile.in @@ -0,0 +1,7 @@ +MODULE = atl90.dll +IMPORTS = atl100 oleaut32 user32 ole32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_90 + +C_SRCS = atl90.c + +@MAKE_DLL_RULES@ diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c new file mode 100644 index 0000000..1b46dcb --- /dev/null +++ b/dlls/atl90/atl90.c @@ -0,0 +1,94 @@ +/* + * Copyright 2013 Zhenbo Li + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "atlbase.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl90.@] + */ +DWORD WINAPI AtlGetVersion(void *reserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if ( msg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hwnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hwnd, ptr, len ); + AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; + const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic90; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec new file mode 100644 index 0000000..aed22bd --- /dev/null +++ b/dlls/atl90/atl90.spec @@ -0,0 +1,52 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 660fbf5..bcd634e 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -28,6 +28,7 @@ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 +#define _ATL_VER_90 0x0900 #define _ATL_VER_100 0x0a00 #define _ATL_VER_110 0x0b00 diff --git a/tools/make_specfiles b/tools/make_specfiles index 5314c41..dbfa5e3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "atl110", "atl", "atl80", + "atl90", ], [ "advapi32",

1 0

Andrew Eikum : advapi32: Don' t cache HKCR if WOW64 redirection flags are set.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 0d1526bf4a6178063486c517e38141705ba85b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1526bf4a6178063486c517e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:28 2013 -0500 advapi32: Don't cache HKCR if WOW64 redirection flags are set. --- dlls/advapi32/registry.c | 69 +++++++++++++++++++++++----------------- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++- 2 files changed, 75 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1526bf4a6178063486c…

1 0

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 8cb7f877d7406065074183ae8541355f0090e6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb7f877d7406065074183ae8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 11e7500..c4113fb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0

Alexandre Julliard : tools: Update the character data tables to Unicode 6.3 .0.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 13479aa7b8116982f2db839d056f9d66afd8c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13479aa7b8116982f2db839d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 16:09:16 2013 +0200 tools: Update the character data tables to Unicode 6.3.0. --- dlls/usp10/indicsyllable.c | 4 +- dlls/usp10/linebreak.c | 168 ++++++++++++++++++++++---------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 70 ++++++++++-------- libs/wine/wctype.c | 12 ++-- tools/make_unicode | 2 +- 6 files changed, 133 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13479aa7b8116982f2db8…

1 0

Aric Stewart : tools: Add new Explicit Formatting types for Unicode 6.3.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: b5d9fc323d4a8414819443a966511de3f22c8a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d9fc323d4a8414819443a96… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 7 10:18:31 2013 -0500 tools: Add new Explicit Formatting types for Unicode 6.3. --- tools/make_unicode | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1acc424..cae3547 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -279,13 +279,8 @@ my %special_categories = my %directions = ( "L" => 1, # Left-to-Right - "LRE" => 15, # Left-to-Right Embedding - "LRO" => 15, # Left-to-Right Override "R" => 2, # Right-to-Left "AL" => 12, # Right-to-Left Arabic - "RLE" => 15, # Right-to-Left Embedding - "RLO" => 15, # Right-to-Left Override - "PDF" => 15, # Pop Directional Format "EN" => 3, # European Number "ES" => 4, # European Number Separator "ET" => 5, # European Number Terminator @@ -296,7 +291,16 @@ my %directions = "B" => 8, # Paragraph Separator "S" => 9, # Segment Separator "WS" => 10, # Whitespace - "ON" => 11 # Other Neutrals + "ON" => 11, # Other Neutrals + "LRE" => 15, # Left-to-Right Embedding + "LRO" => 15, # Left-to-Right Override + "RLE" => 15, # Right-to-Left Embedding + "RLO" => 15, # Right-to-Left Override + "PDF" => 15, # Pop Directional Format + "LRI" => 15, # Left-to-Right Isolate + "RLI" => 15, # Right-to-Left Isolate + "FSI" => 15, # First Strong Isolate + "PDI" => 15 # Pop Directional Isolate ); my %joining_types =

1 0

Qian Hong : user32/tests: Skip winstation tests on NT4.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 00c9c6fde360d7f938a987ed066794eed36af73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c9c6fde360d7f938a987ed0… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 15 17:01:50 2013 +0800 user32/tests: Skip winstation tests on NT4. --- dlls/user32/tests/winstation.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index fd6bcc0..0bc9966 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -822,6 +822,21 @@ static void test_foregroundwindow(void) return; } + ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0); + if(!ret) + { + win_skip("Skip tests on NT4\n"); + CloseDesktop(hdesks[1]); + return; + } + trace("old timeout %d\n", timeout_old); + timeout = 0; + ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(ret, "set foreground lock timeout failed!\n"); + ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); + ok(ret, "get foreground lock timeout failed!\n"); + ok(timeout == 0, "unexpected timeout %d\n", timeout); + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) { param.hdesk = hdesks[thread_desk_id]; @@ -844,16 +859,6 @@ static void test_foregroundwindow(void) trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]); - ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout_old, 0); - ok(ret, "get foreground lock timeout failed!\n"); - trace("old timeout %d\n", timeout_old); - timeout = 0; - ret = SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - ok(ret, "set foreground lock timeout failed!\n"); - ret = SystemParametersInfo(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); - ok(ret, "get foreground lock timeout failed!\n"); - ok(timeout == 0, "unexpected timeout %d\n", timeout); - for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++) for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++)

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
76
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 October 2013