June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Use sys/inotify. h if it exists instead of hardcoding the system calls.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 61a70360e61df478b0500f5212ada9414eef67b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a70360e61df478b0500f521… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 15:45:03 2009 +0200 server: Use sys/inotify.h if it exists instead of hardcoding the system calls. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ server/change.c | 9 ++++++--- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a6b0a60..0af4b6b 100755 --- a/configure +++ b/configure @@ -5740,6 +5740,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -5824,6 +5825,7 @@ for ac_header in \ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ + sys/inotify.h \ sys/ioctl.h \ sys/ipc.h \ sys/limits.h \ diff --git a/configure.ac b/configure.ac index 60bd78e..c696cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -347,6 +347,7 @@ AC_CHECK_HEADERS(\ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ + sys/inotify.h \ sys/ioctl.h \ sys/ipc.h \ sys/limits.h \ diff --git a/include/config.h.in b/include/config.h.in index b2642c9..e12aa1a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -828,6 +828,9 @@ /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H +/* Define to 1 if you have the <sys/inotify.h> header file. */ +#undef HAVE_SYS_INOTIFY_H + /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H diff --git a/server/change.c b/server/change.c index 63985f4..773fa1c 100644 --- a/server/change.c +++ b/server/change.c @@ -65,7 +65,10 @@ /* inotify support */ -#if defined(__linux__) && defined(__i386__) +#ifdef HAVE_SYS_INOTIFY_H +#include <sys/inotify.h> +#define USE_INOTIFY +#elif defined(__linux__) && defined(__i386__) #define SYS_inotify_init 291 #define SYS_inotify_add_watch 292 @@ -114,7 +117,7 @@ static inline int inotify_add_watch( int fd, const char *name, unsigned int mask return ret; } -static inline int inotify_remove_watch( int fd, int wd ) +static inline int inotify_rm_watch( int fd, int wd ) { int ret; __asm__ __volatile__( "pushl %%ebx;\n\t" @@ -568,7 +571,7 @@ static void free_inode( struct inode *inode ) if (inode->wd != -1) { - inotify_remove_watch( get_unix_fd( inotify_fd ), inode->wd ); + inotify_rm_watch( get_unix_fd( inotify_fd ), inode->wd ); list_remove( &inode->wd_entry ); } list_remove( &inode->ino_entry );

1 0

Hans Leidekker : mlang: Implement IMLangFontLink2_CodePageToScriptID.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: fb0d79aece4b77a215f8c2aced0e72ddd3ee6779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0d79aece4b77a215f8c2ace… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 26 14:20:07 2009 +0200 mlang: Implement IMLangFontLink2_CodePageToScriptID. --- dlls/mlang/mlang.c | 35 ++++++++++++++++++++--------- dlls/mlang/tests/mlang.c | 53 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d762bac..6590ea5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -455,13 +455,13 @@ static const struct mlang_data { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, "Courier","Arial", sidArabic }, /* FIXME */ { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidHan }, /* FIXME */ { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidBopomofo }, /* FIXME */ { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, "Courier","Arial", sidCyrillic }, /* FIXME */ { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, @@ -469,17 +469,17 @@ static const struct mlang_data { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, "Courier","Arial", sidHebrew }, /* FIXME */ { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, - "MS Gothic","MS PGothic" }, + "MS Gothic","MS PGothic", sidKana }, { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidHangul }, /* FIXME */ { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, "Courier","Arial", sidThai }, /* FIXME */ { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, - "Courier","Arial", sidLatin }, /* FIXME */ + "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, "Courier","Arial" } /* FIXME */ }; @@ -3401,8 +3401,21 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This, UINT uiCodePage, SCRIPT_ID *pSid) { - FIXME("(%p)->%i %p\n",This, uiCodePage, pSid); - return E_NOTIMPL; + UINT i; + + TRACE("(%p)->%i %p\n", This, uiCodePage, pSid); + + if (uiCodePage == CP_UNICODE) return E_FAIL; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + if (uiCodePage == mlang_data[i].family_codepage) + { + if (pSid) *pSid = mlang_data[i].sid; + return S_OK; + } + } + return E_FAIL; } static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl = diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 4530a09..eceb3ab 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1841,23 +1841,23 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) SCRIPTFONTINFO sfi[1]; nfonts = 0; - hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, 0, &nfonts, NULL); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, 0, &nfonts, NULL); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 0; - hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, NULL); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, NULL); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 0; - hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, NULL); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, NULL); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 1; memset(sfi, 0, sizeof(sfi)); - hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, sfi); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, sfi); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); ok(sfi[0].scripts != 0, "unexpected result\n"); @@ -1865,13 +1865,55 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) nfonts = 1; memset(sfi, 0, sizeof(sfi)); - hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, sfi); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, sfi); ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); ok(sfi[0].scripts != 0, "unexpected result\n"); ok(sfi[0].wszFont[0], "unexpected result\n"); } +static void test_CodePageToScriptID(IMLangFontLink2 *font_link) +{ + HRESULT hr; + UINT i; + SCRIPT_ID sid; + static const struct + { + UINT cp; + SCRIPT_ID sid; + HRESULT hr; + } + cp_sid[] = + { + {874, sidThai}, + {932, sidKana}, + {936, sidHan}, + {949, sidHangul}, + {950, sidBopomofo}, + {1250, sidAsciiLatin}, + {1251, sidCyrillic}, + {1252, sidAsciiLatin}, + {1253, sidGreek}, + {1254, sidAsciiLatin}, + {1255, sidHebrew}, + {1256, sidArabic}, + {1257, sidAsciiLatin}, + {1258, sidAsciiLatin}, + {CP_UNICODE, 0, E_FAIL} + }; + + for (i = 0; i < sizeof(cp_sid)/sizeof(cp_sid[0]); i++) + { + hr = IMLangFontLink2_CodePageToScriptID(font_link, cp_sid[i].cp, &sid); + ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08x %u\n", i, hr, GetLastError()); + if (SUCCEEDED(hr)) + { + ok(sid == cp_sid[i].sid, + "%u got sid %u for codepage %u, expected %u\n", i, sid, cp_sid[i].cp, cp_sid[i].sid); + } + } +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -1949,6 +1991,7 @@ START_TEST(mlang) if (ret != S_OK || !iMLFL2) return; test_GetScriptFontInfo(iMLFL2); + test_CodePageToScriptID(iMLFL2); IMLangFontLink2_Release(iMLFL2); CoUninitialize();

1 0

Aric Stewart : msctf: Add api definitions for TF_CreateThreadMgr and TF_GetThreadMgr.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 6a392a8aa93b849031219845dc3eb4ecf86e2aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a392a8aa93b849031219845d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:04:22 2009 +0900 msctf: Add api definitions for TF_CreateThreadMgr and TF_GetThreadMgr. --- include/msctf.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 1058057..fc2a8da 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -29,6 +29,9 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") +cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") + cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;")

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: SetDefaultLanguageProfile.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 7cd3e77624b4acbf4abd3460de58c6e902696a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd3e77624b4acbf4abd3460d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:03:47 2009 +0900 msctf: Implement ITfInputProcessorProfiles::SetDefaultLanguageProfile. --- dlls/msctf/inputprocessor.c | 45 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 239c9f9..2cd20cd 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -358,9 +358,50 @@ static HRESULT WINAPI InputProcessorProfiles_SetDefaultLanguageProfile( ITfInputProcessorProfiles *iface, LANGID langid, REFCLSID rclsid, REFGUID guidProfiles) { + WCHAR fullkey[168]; + WCHAR buf[39]; + HKEY hkey; + GUID catid; + HRESULT hr; + ITfCategoryMgr *catmgr; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + static const GUID * tipcats[3] = { &GUID_TFCAT_TIP_KEYBOARD, + &GUID_TFCAT_TIP_SPEECH, + &GUID_TFCAT_TIP_HANDWRITING }; + + TRACE("%p) %x %s %s\n",This, langid, debugstr_guid(rclsid),debugstr_guid(guidProfiles)); + + if (!rclsid || !guidProfiles) + return E_INVALIDARG; + + hr = CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr); + + if (FAILED(hr)) + return hr; + + if (ITfCategoryMgr_FindClosestCategory(catmgr, rclsid, + &catid, tipcats, 3) != S_OK) + hr = ITfCategoryMgr_FindClosestCategory(catmgr, rclsid, + &catid, NULL, 0); + ITfCategoryMgr_Release(catmgr); + + if (FAILED(hr)) + return E_FAIL; + + StringFromGUID2(&catid, buf, 39); + sprintfW(fullkey, szwDefaultFmt, szwSystemCTFKey, szwAssemblies, langid, buf); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, + NULL, &hkey, NULL ) != ERROR_SUCCESS) + return E_FAIL; + + StringFromGUID2(rclsid, buf, 39); + RegSetValueExW(hkey, szwDefault, 0, REG_SZ, (LPBYTE)buf, sizeof(buf)); + StringFromGUID2(guidProfiles, buf, 39); + RegSetValueExW(hkey, szwProfile, 0, REG_SZ, (LPBYTE)buf, sizeof(buf)); + RegCloseKey(hkey); + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_ActivateLanguageProfile(

1 0

Austin English : drmclien: Add stub dll.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: b3ccbc63e66927304c980caeb7348683794f320b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ccbc63e66927304c980caeb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 25 12:30:45 2009 -0500 drmclien: Add stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/drmclien/Makefile.in | 13 +++++++++++++ dlls/drmclien/drmclien.spec | 31 +++++++++++++++++++++++++++++++ dlls/drmclien/main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 96 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ebf519f..a6b0a60 100755 --- a/configure +++ b/configure @@ -25613,6 +25613,14 @@ dlls/dpwsockx/Makefile: dlls/dpwsockx/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dpwsockx/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/drmclien/Makefile" +test "x$enable_drmclien" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + drmclien" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/drmclien/Makefile: dlls/drmclien/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/drmclien/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dsound/Makefile" test "x$enable_dsound" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ dsound" @@ -29472,6 +29480,7 @@ do "dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;; "dlls/dpnlobby/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnlobby/Makefile" ;; "dlls/dpwsockx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpwsockx/Makefile" ;; + "dlls/drmclien/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/drmclien/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; "dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;; "dlls/dssenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dssenh/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8ce3686..60bd78e 100644 --- a/configure.ac +++ b/configure.ac @@ -2131,6 +2131,7 @@ WINE_CONFIG_MAKEFILE([dlls/dpnet/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_ WINE_CONFIG_MAKEFILE([dlls/dpnhpast/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dpnlobby/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dpwsockx/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/drmclien/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dsound/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dsound/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in new file mode 100644 index 0000000..86dcc38 --- /dev/null +++ b/dlls/drmclien/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = drmclien.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/drmclien/drmclien.spec b/dlls/drmclien/drmclien.spec new file mode 100644 index 0000000..b93472b --- /dev/null +++ b/dlls/drmclien/drmclien.spec @@ -0,0 +1,31 @@ +@ stub DllMain +@ stub CanDecrypt +@ stub Decrypt +@ stub RequestLicense +@ stub ProcessResponse +@ stub Bind +@ stub KeyExchange +@ stub GetVersion +@ stub CanDecryptEx +@ stub BindEx +@ stub ??0CDRMLiteCrypto@@QAE(a)XZ +@ stub ??1CDRMLiteCrypto@@QAE(a)XZ +@ stub SetAppSec +@ stub SetLicenseStore +@ stub GetPMLicenseFileName +@ stub GetPMLicenseSize +@ stub CreatePMLicense +@ stub GenerateNewLicense +@ stub Encrypt +@ stub InitAppCerts +@ stub QueryXferToPM +@ stub ?BackupLicenses(a)CDRMLiteCrypto@@QAEJKPAGPAUIUnknown@@PAHPAX(a)Z +@ stub ?EncryptFast(a)CDRMLiteCrypto@@QAEJPBDKPAE1(a)Z +@ stub ?EncryptIndirectFast(a)CDRMLiteCrypto@@QAEJPBDKPAE1(a)Z +@ stub ?GenerateNewLicenseEx(a)CDRMLiteCrypto@@QAEJKPAE00PAPAD10(a)Z +@ stub ?GetLicenses(a)CDRMLiteCrypto@@QAEJPBDPAUPMLICENSE@@PAKKPAX2PAE(a)Z +@ stub ?GetPublicKey(a)CDRMLiteCrypto@@QAEJPAUPKCERT@@@Z +@ stub ?QueryXferToPMEx(a)CDRMLiteCrypto@@QAEJPBDKPAKPAEK2K12(a)Z +@ stub ?RestoreLicenses(a)CDRMLiteCrypto@@QAEJKPAEPAGPAUIUnknown@@PAHPAX(a)Z +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c new file mode 100644 index 0000000..c18ddad --- /dev/null +++ b/dlls/drmclien/main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2009 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" +#include "wine/debug.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: GetDefaultLanguageProfile.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 6e7145d64e773a6cf104884a08869e36d11e36d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7145d64e773a6cf104884a0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:03:30 2009 +0900 msctf: Implement ITfInputProcessorProfiles::GetDefaultLanguageProfile. --- dlls/msctf/inputprocessor.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 765c3d5..239c9f9 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -47,6 +47,11 @@ static const WCHAR szwEnable[] = {'E','n','a','b','l','e',0}; static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; static const WCHAR szwFullLangfmt[] = {'%','s','\\','%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; +static const WCHAR szwAssemblies[] = {'A','s','s','e','m','b','l','i','e','s',0}; +static const WCHAR szwDefault[] = {'D','e','f','a','u','l','t',0}; +static const WCHAR szwProfile[] = {'P','r','o','f','i','l','e',0}; +static const WCHAR szwDefaultFmt[] = {'%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; + typedef struct tagInputProcessorProfilesSink { struct list entry; union { @@ -312,9 +317,41 @@ static HRESULT WINAPI InputProcessorProfiles_GetDefaultLanguageProfile( ITfInputProcessorProfiles *iface, LANGID langid, REFGUID catid, CLSID *pclsid, GUID *pguidProfile) { + WCHAR fullkey[168]; + WCHAR buf[39]; + HKEY hkey; + DWORD count; + ULONG res; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("%p) %x %s %p %p\n",This, langid, debugstr_guid(catid),pclsid,pguidProfile); + + if (!catid || !pclsid || !pguidProfile) + return E_INVALIDARG; + + StringFromGUID2(catid, buf, 39); + sprintfW(fullkey, szwDefaultFmt, szwSystemCTFKey, szwAssemblies, langid, buf); + + if (RegOpenKeyExW(HKEY_CURRENT_USER, fullkey, 0, KEY_READ | KEY_WRITE, + &hkey ) != ERROR_SUCCESS) + return S_FALSE; + + count = sizeof(buf); + res = RegQueryValueExW(hkey, szwDefault, 0, NULL, (LPBYTE)buf, &count); + if (res != ERROR_SUCCESS) + { + RegCloseKey(hkey); + return S_FALSE; + } + CLSIDFromString(buf,pclsid); + + res = RegQueryValueExW(hkey, szwProfile, 0, NULL, (LPBYTE)buf, &count); + if (res == ERROR_SUCCESS) + CLSIDFromString(buf,pguidProfile); + + RegCloseKey(hkey); + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_SetDefaultLanguageProfile( diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 9729ef3..b0a1c54 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -77,6 +77,7 @@ TfClientId processId = 0; ITfCompartmentMgr *globalCompartmentMgr = NULL; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; +const WCHAR szwSystemCTFKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F',0}; typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index eff30c9..928b046 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -63,4 +63,5 @@ extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sin extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink); extern const WCHAR szwSystemTIPKey[]; +extern const WCHAR szwSystemCTFKey[]; #endif /* __WINE_MSCTF_I_H */

1 0

Francois Gouget : clock: Use SUBLANG_NEUTRAL for Romanian.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 264170ffd89c289b794bb980cdaa90f4a2dc25f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264170ffd89c289b794bb980c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 26 11:56:12 2009 +0200 clock: Use SUBLANG_NEUTRAL for Romanian. --- programs/clock/Ro.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/clock/Ro.rc b/programs/clock/Ro.rc index c1d58ff..a702328 100644 --- a/programs/clock/Ro.rc +++ b/programs/clock/Ro.rc @@ -22,7 +22,7 @@ #pragma code_page(65001) -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL MAIN_MENU MENU { @@ -51,7 +51,7 @@ STRINGTABLE DISCARDABLE IDS_CLOCK, "Ceas" } -STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENȚĂ" IDS_LICENSE,

1 0

Paul Vriens : comctl32/tests: Fix test failures with comctl32 < 5.80.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: f2b0e4f6e65389c8a70d6eb2d0ad588ec76a1e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b0e4f6e65389c8a70d6eb2d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 26 14:00:50 2009 +0200 comctl32/tests: Fix test failures with comctl32 < 5.80. --- dlls/comctl32/tests/header.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 7661253..6bf0212 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1025,9 +1025,16 @@ static void test_hdm_filterMessages(HWND hParent) todo_wine { retVal = SendMessage(hChild, HDM_CLEARFILTER, 0, 1); - expect(1, retVal); + if (retVal == 0) + win_skip("HDM_CLEARFILTER needs 5.80\n"); + else + expect(1, retVal); + retVal = SendMessage(hChild, HDM_EDITFILTER, 1, 0); - expect(1, retVal); + if (retVal == 0) + win_skip("HDM_EDITFILTER needs 5.80\n"); + else + expect(1, retVal); } if (winetest_interactive) ok_sequence(sequences, HEADER_SEQ_INDEX, filterMessages_seq_interactive, @@ -1076,7 +1083,10 @@ static void test_hdm_bitmapmarginMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_GETBITMAPMARGIN, 0, 0); - expect(6, retVal); + if (retVal == 0) + win_skip("HDM_GETBITMAPMARGIN needs 5.80\n"); + else + expect(6, retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, bitmapmarginMessages_seq, "bitmapmarginMessages sequence testing", FALSE); @@ -1192,7 +1202,8 @@ static void test_hdm_index_messages(HWND hParent) if (item_spec != -1) \ ok(nm->dwItemSpec == item_spec, "Invalid dwItemSpec %d vs %ld\n", item_spec, nm->dwItemSpec); \ ok(nm->lItemlParam == lparam, "Invalid lItemlParam %d vs %ld\n", lparam, nm->lItemlParam); \ - ok(nm->rc.top == _top && nm->rc.bottom == _bottom && nm->rc.left == _left && nm->rc.right == _right, \ + ok((nm->rc.top == _top && nm->rc.bottom == _bottom && nm->rc.left == _left && nm->rc.right == _right) || \ + broken(draw_stage != CDDS_ITEMPREPAINT), /* comctl32 < 5.80 */ \ "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", _left, _top, _right, _bottom, \ nm->rc.left, nm->rc.top, nm->rc.right, nm->rc.bottom);

1 0

Maksim Kuleshov : wininet: Fix sockets leak in FTP_Connect.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: d233118f7a3b062a3e0c922a84921c6e35ef0810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d233118f7a3b062a3e0c922a8… Author: Maksim Kuleshov <mmcx(a)ucs.ru> Date: Fri Jun 26 16:09:39 2009 +0400 wininet: Fix sockets leak in FTP_Connect. --- dlls/wininet/ftp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index db0bf56..cd3deb3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2462,6 +2462,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, { ERR("Unable to connect (%s)\n", strerror(errno)); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); + closesocket(nsocket); } else {

1 0

Tony Wasserka : d3dx9: Add tests for D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: be8afaff686eced0305fc5bd220bf16f8044aa80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8afaff686eced0305fc5bd2… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 25 20:11:44 2009 +0200 d3dx9: Add tests for D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/tests/texture.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 27610b8..3fc43e6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -50,6 +50,11 @@ static const unsigned char bmp01[66] = { 0x00,0x00 }; +/* 2x2 A8R8G8B8 pixel data */ +static const unsigned char pixdata[] = { +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +}; + /* invalid image file */ static const unsigned char noimage[4] = { 0x11,0x22,0x33,0x44 @@ -205,6 +210,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) HRESULT hr; BOOL testdummy_ok, testbitmap_ok; IDirect3DSurface9 *surf; + RECT rect; hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ testdummy_ok = SUCCEEDED(hr); @@ -289,6 +295,30 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* D3DXLoadSurfaceFromMemory */ + SetRect(&rect, 0, 0, 2, 2); + + todo_wine { + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, 0, NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, NULL, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromMemory(NULL, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_A8R8G8B8, sizeof(pixdata), NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata, D3DFMT_UNKNOWN, sizeof(pixdata), NULL, &rect, D3DX_DEFAULT, 0); + ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL); + + /* cleanup */ check_release((IUnknown*)surf, 0);

1 0