April 2011 - Wine-commits - list.winehq.org

Thomas Mullaly : urlmon/tests: Added tests for CoInternetSetFeatureEnabled.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: b83967ce6b5d98a2df61cd573f16f8cca1055f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83967ce6b5d98a2df61cd573… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed Apr 6 19:37:19 2011 -0400 urlmon/tests: Added tests for CoInternetSetFeatureEnabled. --- dlls/urlmon/tests/misc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 446721a..4811ab0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -76,6 +76,7 @@ static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD); static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); +static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static void test_CreateFormatEnum(void) { @@ -1538,13 +1539,61 @@ static void test_CoInternetIsFeatureEnabled(void) { ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); } +static const struct { + INTERNETFEATURELIST feature; + DWORD set_flags; + BOOL enable; + HRESULT set_expected; + BOOL set_todo; + DWORD get_flags; + HRESULT get_expected; + BOOL get_todo; +} internet_feature_tests[] = { + {FEATURE_OBJECT_CACHING,SET_FEATURE_ON_PROCESS,FALSE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_LOCALMACHINE_LOCKDOWN,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE} +}; + +static void test_CoInternetSetFeatureEnabled(void) { + HRESULT hres; + DWORD i; + + hres = pCoInternetSetFeatureEnabled(FEATURE_ENTRY_COUNT,SET_FEATURE_ON_PROCESS,TRUE); + todo_wine + ok(hres == E_FAIL, "CoInternetSetFeatureEnabled returned %08x, expected E_FAIL\n", hres); + + for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { + hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, + internet_feature_tests[i].enable); + if(internet_feature_tests[i].set_todo) { + todo_wine + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } else { + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } + + hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); + if(internet_feature_tests[i].get_todo) { + todo_wine + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } else { + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } + } +} + static void test_internet_features(void) { - if(!pCoInternetIsFeatureEnabled) { + if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) { win_skip("Skipping internet feature tests, IE is too old\n"); return; } test_CoInternetIsFeatureEnabled(); + test_CoInternetSetFeatureEnabled(); } START_TEST(misc) @@ -1564,6 +1613,7 @@ START_TEST(misc) pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); + pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) {

1 0

Thomas Mullaly : urlmon: Added FeatureControl registry keys.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 6487dfa871a243ee4924941742adda2d5b419697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6487dfa871a243ee492494174… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Fri Apr 8 17:03:38 2011 -0400 urlmon: Added FeatureControl registry keys. --- dlls/urlmon/urlmon.rgs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.rgs b/dlls/urlmon/urlmon.rgs index fadb090..868baad 100644 --- a/dlls/urlmon/urlmon.rgs +++ b/dlls/urlmon/urlmon.rgs @@ -70,6 +70,54 @@ HKCU } } } + NoRemove 'Internet Explorer' + { + NoRemove Main + { + FeatureControl + } + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove 'Internet Explorer' + { + NoRemove Main + { + FeatureControl + { + FEATURE_OBJECT_CACHING + FEATURE_ZONE_ELEVATION + FEATURE_MIME_HANDLING + FEATURE_MIME_SNIFFING + FEATURE_WINDOW_RESTRICTIONS + FEATURE_WEBOC_POPUPMANAGEMENT + FEATURE_BEHAVIORS + FEATURE_DISABLE_MK_PROTOCOL + FEATURE_LOCALMACHINE_LOCKDOWN + FEATURE_SECURITYBAND + FEATURE_RESTRICT_ACTIVEXINSTALL + FEATURE_VALIDATE_NAVIGATE_URL + FEATURE_RESTRICT_FILEDOWNLOAD + FEATURE_ADDON_MANAGEMENT + FEATURE_PROTOCOL_LOCKDOWN + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE + FEATURE_SAFE_BINDTOOBJECT + FEATURE_UNC_SAVEDFILECHECK + FEATURE_SSLUX + FEATURE_DISABLE_LEGACY_COMPRESSION + FEATURE_FORCE_ADDR_AND_STATUS + FEATURE_DISABLE_TELNET_PROTOCOL + FEATURE_FEEDS + } + } + } } } }

1 0

Thomas Mullaly : urlmon/tests: Added FeatureControl registry key tests.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 985aebd59ed02cd8ed35d60a77c690d8fc6294fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=985aebd59ed02cd8ed35d60a7… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Thu Apr 7 12:35:28 2011 -0400 urlmon/tests: Added FeatureControl registry key tests. --- dlls/urlmon/tests/misc.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 4811ab0..bc0f40b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -77,6 +77,7 @@ static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, D static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); +static HRESULT (WINAPI *pIEInstallScope)(DWORD*); static void test_CreateFormatEnum(void) { @@ -1476,6 +1477,114 @@ static void test_IsValidURL(void) IBindCtx_Release(bctx); } +/* With older versions of IE (IE 7 and earlier), urlmon caches + * the FeatureControl values from the registry when it's loaded + * into memory. Newer versions of IE conditionally cache the + * the FeatureControl registry values (i.e. When a call to + * CoInternetIsFeatureEnabled and a corresponding CoInternetSetFeatureEnabled + * call hasn't already been made for the specified Feature). Because of + * this we skip these tests on IE 7 and earlier. + */ +static void test_internet_features_registry(void) { + HRESULT hres; + DWORD res; + char module[MAX_PATH]; + char *name; + HKEY feature_control; + HKEY feature; + DWORD value; + BOOL delete_feature_key = TRUE; + BOOL delete_feature_control_key = FALSE; + + static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; + static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; + static const char* szFeatureZoneElevationKey = "FEATURE_ZONE_ELEVATION"; + + if(!pIEInstallScope) { + win_skip("Skipping internet feature registry tests, IE is too old...\n"); + return; + } + + res = GetModuleFileNameA(NULL, module, sizeof(module)); + ok(res, "GetModuleFileName failed: %d\n", GetLastError()); + + name = strrchr(module, '\\')+1; + + /* Some Windows machines don't have a FeatureControl key in HKCU. */ + res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); + if(res != ERROR_SUCCESS) { + res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + delete_feature_control_key = TRUE; + } + + res = RegOpenKeyA(feature_control, szFeatureBehaviorsKey, &feature); + if(res == ERROR_SUCCESS) + /* FEATURE_BEHAVIORS already existed, so don't delete it when we're done. */ + delete_feature_key = FALSE; + else { + res = RegCreateKeyA(feature_control, szFeatureBehaviorsKey, &feature); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + } + + value = 0; + res = RegSetValueExA(feature, name, 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres); + + if(delete_feature_key) { + RegCloseKey(feature); + RegDeleteKeyA(feature_control, szFeatureBehaviorsKey); + } else { + RegDeleteValue(feature, name); + RegCloseKey(feature); + } + + /* IE's feature control cached the value it got from the registry earlier. */ + hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres); + + /* Restore this feature back to its default value. */ + hres = pCoInternetSetFeatureEnabled(FEATURE_BEHAVIORS, SET_FEATURE_ON_PROCESS, TRUE); + todo_wine + ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); + + RegCloseKey(feature_control); + if(delete_feature_control_key) + RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, szFeatureControlKey, &feature_control); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + + res = RegOpenKeyA(feature_control, szFeatureZoneElevationKey, &feature); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + + value = 1; + res = RegSetValueExA(feature, "*", 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + + RegDeleteValueA(feature, "*"); + RegCloseKey(feature); + RegCloseKey(feature_control); + + /* Value is still cached from last time. */ + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + + hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE); + todo_wine + ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); +} + static const struct { INTERNETFEATURELIST feature; DWORD get_flags; @@ -1592,6 +1701,7 @@ static void test_internet_features(void) { return; } + test_internet_features_registry(); test_CoInternetIsFeatureEnabled(); test_CoInternetSetFeatureEnabled(); } @@ -1614,6 +1724,7 @@ START_TEST(misc) pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); + pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index a2081ed..58b3f33 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -58,6 +58,7 @@ @ stdcall HlinkNavigateString(ptr wstr) @ stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) +@ stub IEInstallScope @ stdcall IsAsyncMoniker(ptr) @ stdcall IsLoggingEnabledA(str) @ stdcall IsLoggingEnabledW(wstr)

1 0

Thomas Mullaly : urlmon: Added basic implementation for CoInternet{Is/ Set}FeatureEnabled.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: b7694d8d7cf2216f1415ce5946e7e0b497432022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7694d8d7cf2216f1415ce594… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat Apr 9 11:59:35 2011 -0400 urlmon: Added basic implementation for CoInternet{Is/Set}FeatureEnabled. --- dlls/urlmon/internet.c | 296 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/tests/misc.c | 70 +++++------ 2 files changed, 321 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7694d8d7cf2216f1415c…

1 0

Michael Curran : d3dxof: Adjusted to allow for parsing of optional template elements.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 3d9ea480a0efbeabb4d2a7681390dbf279f9308f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9ea480a0efbeabb4d2a7681… Author: Michael Curran <curran.michaelp(a)gmail.com> Date: Sun Apr 10 16:30:40 2011 -0400 d3dxof: Adjusted to allow for parsing of optional template elements. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c45fcd0..dcef96b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1161,7 +1161,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))

1 0

Michael Curran : d3dxof: Changed is_string function to accept spaces.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 7d5099e4fc221d2a309605ecc95d66e685d193a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5099e4fc221d2a309605ecc… Author: Michael Curran <curran.michaelp(a)gmail.com> Date: Sun Apr 10 16:31:45 2011 -0400 d3dxof: Changed is_string function to accept spaces. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index dcef96b..0acb7d6 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -475,7 +475,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 99)) + while (!is_operator(c = *(buf->buffer+pos+1)) && (pos < 99)) { if (c == '"') {

1 0

Gerald Pfeifer : configure: Add compiler warning -Wunused-but-set-parameter .
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 3ec82c528370efb37130825b919698054834eebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec82c528370efb37130825b9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 10 20:38:52 2011 +0200 configure: Add compiler warning -Wunused-but-set-parameter. --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a4839a5..7a31847 100755 --- a/configure +++ b/configure @@ -12255,6 +12255,31 @@ $as_echo "$ac_cv_cflags__Wtype_limits" >&6; } if test $ac_cv_cflags__Wtype_limits = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wunused-but-set-parameter" >&5 +$as_echo_n "checking whether the compiler supports -Wunused-but-set-parameter... " >&6; } +if test "${ac_cv_cflags__Wunused_but_set_parameter+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wunused-but-set-parameter" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wunused_but_set_parameter=yes +else + ac_cv_cflags__Wunused_but_set_parameter=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wunused_but_set_parameter" >&5 +$as_echo "$ac_cv_cflags__Wunused_but_set_parameter" >&6; } +if test $ac_cv_cflags__Wunused_but_set_parameter = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wunused-but-set-parameter" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wwrite-strings" >&5 $as_echo_n "checking whether the compiler supports -Wwrite-strings... " >&6; } if test "${ac_cv_cflags__Wwrite_strings+set}" = set; then : diff --git a/configure.ac b/configure.ac index 51d0533..82b1783 100644 --- a/configure.ac +++ b/configure.ac @@ -1707,6 +1707,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) + WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) dnl Check for noisy string.h

1 0

Austin English : vcomp: Add stub dll.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: dd2159c6e3fe9579ad14748e0f3dbe31fe447809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2159c6e3fe9579ad14748e0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 8 18:03:47 2011 +0000 vcomp: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp/Makefile.in | 6 +++ dlls/vcomp/main.c | 48 ++++++++++++++++++++ dlls/vcomp/vcomp.spec | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 168 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7a31847..76ecd55 100755 --- a/configure +++ b/configure @@ -15372,6 +15372,7 @@ wine_fn_config_test dlls/usp10/tests usp10_test wine_fn_config_lib uuid wine_fn_config_dll uxtheme enable_uxtheme implib wine_fn_config_test dlls/uxtheme/tests uxtheme_test +wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 82b1783..21c8d85 100644 --- a/configure.ac +++ b/configure.ac @@ -2815,6 +2815,7 @@ WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) +WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp/Makefile.in b/dlls/vcomp/Makefile.in new file mode 100644 index 0000000..d256526 --- /dev/null +++ b/dlls/vcomp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c new file mode 100644 index 0000000..0a3c4f5 --- /dev/null +++ b/dlls/vcomp/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp implementation + * + * Copyright 2011 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" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, 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; +} diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec new file mode 100644 index 0000000..cd5a964 --- /dev/null +++ b/dlls/vcomp/vcomp.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ stub _vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ stub omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ stub omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: c5ece97167fa5e4adc5cad313d04be6b9aefb857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ece97167fa5e4adc5cad313… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Apr 9 11:45:54 2011 +0900 po: Update Korean translation. --- po/ko.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 13fb85b..159e970 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10896,9 +10896,8 @@ msgid "Large" msgstr "크게" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "도움말 사용법(&H)" +msgstr "도움말 사용법(&H)\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: ef1ad5f374125a3607f6428be5222813ce335546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1ad5f374125a3607f6428be… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Sat Apr 9 15:45:00 2011 +0300 po: Update Ukrainian translation. --- po/uk.po | 127 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 53 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef1ad5f374125a3607f64…

1 0