wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Andrew Talbot : msi: Remove tentative declaration of static array with no size specifier.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9e85ec3bad2df40e05dd3b738cd9e7b084003692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e85ec3bad2df40e05dd3b738… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 3 14:50:28 2008 +0100 msi: Remove tentative declaration of static array with no size specifier. --- dlls/msi/action.c | 103 ++++++++++++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ef0e136..e7edabe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran); static UINT ACTION_ProcessUISequence(MSIPACKAGE *package); static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI); +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, UINT* rc, BOOL force); /* * consts and values used @@ -233,8 +234,6 @@ struct _actions { STANDARDACTIONHANDLER handler; }; -static const struct _actions StandardActions[]; - /******************************************************** * helper functions @@ -965,56 +964,6 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, - UINT* rc, BOOL force ) -{ - BOOL ret = FALSE; - BOOL run = force; - int i; - - if (!run && !package->script->CurrentlyScripting) - run = TRUE; - - if (!run) - { - if (strcmpW(action,szInstallFinalize) == 0 || - strcmpW(action,szInstallExecute) == 0 || - strcmpW(action,szInstallExecuteAgain) == 0) - run = TRUE; - } - - i = 0; - while (StandardActions[i].action != NULL) - { - if (strcmpW(StandardActions[i].action, action)==0) - { - if (!run) - { - ui_actioninfo(package, action, TRUE, 0); - *rc = schedule_action(package,INSTALL_SCRIPT,action); - ui_actioninfo(package, action, FALSE, *rc); - } - else - { - ui_actionstart(package, action); - if (StandardActions[i].handler) - { - *rc = StandardActions[i].handler(package); - } - else - { - FIXME("unhandled standard action %s\n",debugstr_w(action)); - *rc = ERROR_SUCCESS; - } - } - ret = TRUE; - break; - } - i++; - } - return ret; -} - static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, UINT* rc, UINT script, BOOL force ) { @@ -5852,3 +5801,53 @@ static const struct _actions StandardActions[] = { { szWriteRegistryValues, ACTION_WriteRegistryValues }, { NULL, NULL }, }; + +static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, + UINT* rc, BOOL force ) +{ + BOOL ret = FALSE; + BOOL run = force; + int i; + + if (!run && !package->script->CurrentlyScripting) + run = TRUE; + + if (!run) + { + if (strcmpW(action,szInstallFinalize) == 0 || + strcmpW(action,szInstallExecute) == 0 || + strcmpW(action,szInstallExecuteAgain) == 0) + run = TRUE; + } + + i = 0; + while (StandardActions[i].action != NULL) + { + if (strcmpW(StandardActions[i].action, action)==0) + { + if (!run) + { + ui_actioninfo(package, action, TRUE, 0); + *rc = schedule_action(package,INSTALL_SCRIPT,action); + ui_actioninfo(package, action, FALSE, *rc); + } + else + { + ui_actionstart(package, action); + if (StandardActions[i].handler) + { + *rc = StandardActions[i].handler(package); + } + else + { + FIXME("unhandled standard action %s\n",debugstr_w(action)); + *rc = ERROR_SUCCESS; + } + } + ret = TRUE; + break; + } + i++; + } + return ret; +}

1 0

Dmitry Timoshkov : gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 90265ac5863f30bee34db60bffc408d470af16ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=90265ac5863f30bee34db60bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 3 21:55:49 2008 +0900 gdi32: Add a font scaling test when lfHeight == 0 and lfWidth != 0, make it pass under Wine. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6356c1f..0284a00 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3378,14 +3378,13 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->aveWidth = abs(lf.lfWidth); + ret->aveWidth = height ? abs(lf.lfWidth) : 0; if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */ INT scale, scaled_height; if (height != 0) height = diff; - else height = 0; height += face->size.height; scale = (height + face->size.height - 1) / face->size.height; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d85ab12..a91adcb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -158,7 +158,8 @@ static INT CALLBACK font_enum_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } -static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *test_str, +static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, + LONG lfWidth, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) @@ -188,9 +189,14 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *t ok(tm.tmAveCharWidth == tm_orig->tmAveCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmAveCharWidth * scale_x); ok(tm.tmMaxCharWidth == tm_orig->tmMaxCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmMaxCharWidth * scale_x); - ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); - if (lf.lfWidth) - ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); + if (lf.lfHeight) + { + if (lf.lfWidth) + ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); + } + else + ok(lf.lfWidth == lfWidth, "lf %d != %d\n", lf.lfWidth, lfWidth); GetTextExtentPoint32A(hdc, test_str, test_str_len, &size); @@ -213,7 +219,7 @@ static void test_bitmap_font(void) HFONT hfont, old_hfont; TEXTMETRICA tm_orig; SIZE size_orig; - INT ret, i, width_orig, height_orig, scale; + INT ret, i, width_orig, height_orig, scale, lfWidth; hdc = GetDC(0); @@ -229,8 +235,9 @@ static void test_bitmap_font(void) trace("found bitmap font %s, height %d\n", bitmap_lf.lfFaceName, bitmap_lf.lfHeight); height_orig = bitmap_lf.lfHeight; - hfont = create_font("bitmap", &bitmap_lf); + lfWidth = bitmap_lf.lfWidth; + hfont = create_font("bitmap", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); ok(GetTextMetricsA(hdc, &tm_orig), "GetTextMetricsA failed\n"); ok(GetTextExtentPoint32A(hdc, test_str, sizeof(test_str), &size_orig), "GetTextExtentPoint32A failed\n"); @@ -238,6 +245,15 @@ static void test_bitmap_font(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); + bitmap_lf.lfHeight = 0; + bitmap_lf.lfWidth = 4; + hfont = create_font("bitmap", &bitmap_lf); + test_font_metrics(hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + DeleteObject(hfont); + + bitmap_lf.lfHeight = height_orig; + bitmap_lf.lfWidth = lfWidth; + /* test fractional scaling */ for (i = 1; i <= height_orig * 3; i++) { @@ -249,7 +265,7 @@ static void test_bitmap_font(void) nearest_height = scale * height_orig; /* XP allows not more than 10% deviation */ if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); DeleteObject(hfont); } @@ -257,14 +273,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); DeleteObject(hfont); ReleaseDC(0, hdc);

1 0

Paul Vriens : rsabase: Remove rsabase tests as they are covered in rsaenh.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 4f3dbb7f7d6b7da9bcdb92189fae5fbe4abfb261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3dbb7f7d6b7da9bcdb92189… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 08:12:13 2008 +0200 rsabase: Remove rsabase tests as they are covered in rsaenh. --- .gitignore | 4 -- Makefile.in | 2 - configure | 3 - configure.ac | 1 - dlls/Makefile.in | 1 - dlls/rsabase/tests/Makefile.in | 13 ------ dlls/rsabase/tests/rsabase.c | 84 ---------------------------------------- programs/winetest/Makefile.in | 3 - programs/winetest/winetest.rc | 1 - 9 files changed, 0 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index 7837b5b..dc40bde 100644 --- a/.gitignore +++ b/.gitignore @@ -350,9 +350,6 @@ dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/rpcrt4/tests/testlist.c -dlls/rsabase/tests/*.ok -dlls/rsabase/tests/rsabase_crosstest.exe -dlls/rsabase/tests/testlist.c dlls/rsaenh/librsaenh.def dlls/rsaenh/tests/*.ok dlls/rsaenh/tests/rsaenh_crosstest.exe @@ -673,7 +670,6 @@ programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe programs/winetest/rpcrt4_test.exe -programs/winetest/rsabase_test.exe programs/winetest/rsaenh_test.exe programs/winetest/schannel_test.exe programs/winetest/secur32_test.exe diff --git a/Makefile.in b/Makefile.in index b8962a9..cc9211d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -412,7 +412,6 @@ ALL_MAKEFILES = \ dlls/rpcrt4/Makefile \ dlls/rpcrt4/tests/Makefile \ dlls/rsabase/Makefile \ - dlls/rsabase/tests/Makefile \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ @@ -837,7 +836,6 @@ dlls/riched32/tests/Makefile: dlls/riched32/tests/Makefile.in dlls/Maketest.rule dlls/rpcrt4/Makefile: dlls/rpcrt4/Makefile.in dlls/Makedll.rules dlls/rpcrt4/tests/Makefile: dlls/rpcrt4/tests/Makefile.in dlls/Maketest.rules dlls/rsabase/Makefile: dlls/rsabase/Makefile.in dlls/Makedll.rules -dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 86b9bf0..a0f73f8 100755 --- a/configure +++ b/configure @@ -21772,8 +21772,6 @@ ac_config_files="$ac_config_files dlls/rpcrt4/tests/Makefile" ac_config_files="$ac_config_files dlls/rsabase/Makefile" -ac_config_files="$ac_config_files dlls/rsabase/tests/Makefile" - ac_config_files="$ac_config_files dlls/rsaenh/Makefile" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" @@ -22912,7 +22910,6 @@ do "dlls/rpcrt4/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/Makefile" ;; "dlls/rpcrt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rpcrt4/tests/Makefile" ;; "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; - "dlls/rsabase/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/tests/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0cab238..3e14bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1915,7 +1915,6 @@ AC_CONFIG_FILES([dlls/riched32/tests/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/Makefile]) AC_CONFIG_FILES([dlls/rpcrt4/tests/Makefile]) AC_CONFIG_FILES([dlls/rsabase/Makefile]) -AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index bb473e2..6f171d7 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -342,7 +342,6 @@ TESTSUBDIRS = \ riched20/tests \ riched32/tests \ rpcrt4/tests \ - rsabase/tests \ rsaenh/tests \ schannel/tests \ secur32/tests \ diff --git a/dlls/rsabase/tests/Makefile.in b/dlls/rsabase/tests/Makefile.in deleted file mode 100644 index bd5c77d..0000000 --- a/dlls/rsabase/tests/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -TESTDLL = rsabase.dll -IMPORTS = advapi32 kernel32 - -CTESTS = \ - rsabase.c - -@MAKE_TEST_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rsabase/tests/rsabase.c b/dlls/rsabase/tests/rsabase.c deleted file mode 100644 index b7746b1..0000000 --- a/dlls/rsabase/tests/rsabase.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Unit tests for rsabase functions - * - * Copyright (c) 2004 Michael Jung - * - * 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 <string.h> -#include "wine/test.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wincrypt.h" - -HCRYPTPROV hProv; -static const char szContainer[] = "Wine Test Container"; -static const char szProvider[] = MS_DEF_PROV_A; - -static int init_environment(void) -{ - hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; - - if (!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, 0)) - { - if (GetLastError()==NTE_BAD_KEYSET) - { - if(!CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET)) - { - trace("%08x\n", GetLastError()); - return 0; - } - } - else - { - trace("%08x\n", GetLastError()); - return 0; - } - } - - return 1; -} - -static void clean_up_environment(void) -{ - CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); -} - -static void test_gen_random(void) -{ - BOOL result; - BYTE rnd1[16], rnd2[16]; - - memset(rnd1, 0, sizeof(rnd1)); - memset(rnd2, 0, sizeof(rnd2)); - - result = CryptGenRandom(hProv, sizeof(rnd1), rnd1); - ok(result, "%08x\n", GetLastError()); - - result = CryptGenRandom(hProv, sizeof(rnd2), rnd2); - ok(result, "%08x\n", GetLastError()); - - ok(memcmp(rnd1, rnd2, sizeof(rnd1)), "CryptGenRandom generates non random data\n"); -} - -START_TEST(rsabase) -{ - if (!init_environment()) - return; - test_gen_random(); - clean_up_environment(); -} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 7ccce18..5a188b6 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -83,7 +83,6 @@ TESTBINS = \ riched20_test.exe \ riched32_test.exe \ rpcrt4_test.exe \ - rsabase_test.exe \ rsaenh_test.exe \ schannel_test.exe \ secur32_test.exe \ @@ -223,8 +222,6 @@ riched32_test.exe: $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) cp $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) $@ && $(STRIP) $@ rpcrt4_test.exe: $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsabase_test.exe: $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) - cp $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) $@ && $(STRIP) $@ rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ schannel_test.exe: $(DLLDIR)/schannel/tests/schannel_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8c36d63..299e0e3 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -144,7 +144,6 @@ quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe" rpcrt4_test.exe TESTRES "rpcrt4_test.exe" -rsabase_test.exe TESTRES "rsabase_test.exe" rsaenh_test.exe TESTRES "rsaenh_test.exe" schannel_test.exe TESTRES "schannel_test.exe" secur32_test.exe TESTRES "secur32_test.exe"

1 0

Paul Vriens : rsaenh/tests: Add a few skips for non implemented parameters.
by Alexandre Julliard 04 Apr '08

04 Apr '08

Module: wine Branch: master Commit: 9666218ca8fc5a56857b40f26bb05bb458f32869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9666218ca8fc5a56857b40f26… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 13:09:11 2008 +0200 rsaenh/tests: Add a few skips for non implemented parameters. --- dlls/rsaenh/tests/rsaenh.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1a8bb92..4fef6e9 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -175,12 +175,20 @@ static void test_prov(void) DWORD dwLen, dwInc; dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_SIG_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_SIG_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); dwLen = (DWORD)sizeof(DWORD); + SetLastError(0xdeadbeef); result = CryptGetProvParam(hProv, PP_KEYX_KEYSIZE_INC, (BYTE*)&dwInc, &dwLen, 0); - ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYX_KEYSIZE_INC is not supported (win9x or NT)\n"); + else + ok(result && dwInc==8, "%08x, %d\n", GetLastError(), dwInc); } static void test_gen_random(void) @@ -1823,9 +1831,13 @@ static void test_null_provider(void) ok(result && dataLen == sizeof(dwParam) && (dwParam & CRYPT_SEC_DESCR), "Expected CRYPT_SEC_DESCR to be set, got 0x%08X\n",dwParam); dataLen = sizeof(keySpec); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_KEYSPEC, (LPBYTE)&keySpec, &dataLen, 0); - ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), - "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_KEYSPEC is not supported (win9x or NT)\n"); + else + ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), + "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); /* PP_CONTAINER parameter */ dataLen = sizeof(szName); result = CryptGetProvParam(prov, PP_CONTAINER, (LPBYTE)szName, &dataLen, 0); @@ -1834,10 +1846,14 @@ static void test_null_provider(void) (result)? "TRUE":"FALSE",GetLastError(),dataLen); /* PP_UNIQUE_CONTAINER parameter */ dataLen = sizeof(szName); + SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + if (!result && GetLastError() == NTE_BAD_TYPE) + skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + else + ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, + "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

Lei Zhang : website: add links to cvs web interface and documentation writing
by Jeremy Newman 03 Apr '08

03 Apr '08

Module: website Branch: master Commit: 109a7800eb6b62214ff4220a5c8c6dae27c76577 URL: http://source.winehq.org/git/website.git/?a=commit;h=109a7800eb6b62214ff422… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 3 11:54:54 2008 -0700 website: add links to cvs web interface and documentation writing Hi, This adds a couple more useful links to the cvs page. >From be495374b484f2081d337ba4e8baee8f46a0a169 Mon Sep 17 00:00:00 2001 From: Lei Zhang <thestig(a)google.com> Date: Thu, 3 Apr 2008 11:53:38 -0700 Subject: [PATCH] website: add links to cvs web interface and documentation writing. --- templates/en/cvs.template | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template index f7e14b1..8044a1a 100644 --- a/templates/en/cvs.template +++ b/templates/en/cvs.template @@ -40,6 +40,12 @@ cvs login <p>When prompted for a password press the enter key. A subdirectory named docs will be created.</p> +<p>You can also Browse +<a href="http://wine.cvs.sourceforge.net/wine/">the Wine Documentation +module</a>. Here is more information on +<a href="http://www.winehq.org/site/contributing#doc">documentation +writing</a>.</p> + <hr /> <h1 id="sourcetree">Source Tree Browsing via the Web</h1>

1 0

Stefan Dösinger : wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: ddf52dda15e83eae639ef2ce0ec4071b321ce34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf52dda15e83eae639ef2ce0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 30 14:52:18 2008 +0200 wined3d: Deactivate GL_FRAGMENT_SHADER_ATI before deactivating a context. Mesa has a bug that causes a crash due to a NULL pointer dereference with the R200 driver when making a context current that has GL_FRAGMENT_SHADER_ATI enabled. This patch works around this bug by making sure that GL_FRAGMENT_SHADER_ATI is disabled before deactivating a context, and reactivates it afterwards. The context manager keeps GL_ATI_FRAGMENT_SHADER generally enabled, except if the context is in 2D blit mode. --- dlls/wined3d/context.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0934180..d20f5f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -351,6 +351,11 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar /* Set up the context defaults */ oldCtx = pwglGetCurrentContext(); oldDrawable = pwglGetCurrentDC(); + if(oldCtx && oldDrawable && GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* See comment in ActivateContext context switching */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; @@ -414,9 +419,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + s - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } - } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { - glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } if(GL_SUPPORT(ARB_POINT_SPRITE)) { @@ -428,9 +430,16 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); + /* Never keep GL_FRAGMENT_SHADER_ATI enabled on a context that we switch away from, + * but enable it for the first context we create, and reenable it on the old context + */ if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); } + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } out: return ret; @@ -928,9 +937,23 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + + if(GL_SUPPORT(ATI_FRAGMENT_SHADER)) { + /* Mesa crashes when enabling a context with GL_FRAGMENT_SHADER_ATI enabled. + * Thus we disable it before deactivating any context, and re-enable it afterwards. + * + * This bug is filed as bug #15269 on bugs.freedesktop.org + */ + glDisable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + } + ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); + } else if(GL_SUPPORT(ATI_FRAGMENT_SHADER) && !context->last_was_blit) { + glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); } } if(This->activeContext->vshader_const_dirty) {

1 0

Stefan Dösinger : d3d9: Improve an ok line.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: de5a8db58b51be2f65baf3b9b67d79bc9c49a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5a8db58b51be2f65baf3b9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 23:06:38 2008 +0100 d3d9: Improve an ok line. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a22b168..d4e840a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6741,7 +6741,7 @@ static void alpha_test(IDirect3DDevice9 *device) green = (color & 0x0000ff00) >> 8; blue = (color & 0x000000ff); ok(red >= 0x7e && red <= 0x81 && green == 0x00 && blue >= 0x7e && blue <= 0x81, - "DSTALPHA on texture returned color %08x, expected foo\n", color); + "DSTALPHA on texture returned color %08x, expected 0x00800080\n", color); out: /* restore things */

1 0

Stefan Dösinger : wined3d: Initialize some ARB shader output parameters.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 20e63160df1be7f43af17c251247c8412d741b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e63160df1be7f43af17c251… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 3 11:41:02 2008 +0200 wined3d: Initialize some ARB shader output parameters. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7a841cd..a8d2c70 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1987,12 +1987,27 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF /* We need a constant to fixup the final position */ shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); - if((GLINFO_LOCATION).set_texcoord_w) { - int i; - for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { - if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && - This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { - shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values + * for output parameters. D3D in theory does not do that either, but some applications depend on a + * proper initialization of the secondary color, and programs using the fixed function pipeline without + * a replacement shader depend on the texcoord.w beeing set properly. + * + * GL_NV_vertex_program defines that all output values are initialized to {0.0, 0.0, 0.0, 1.0}. This + * assetion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So + * skip this if NV_vertex_program is supported. Otherwise, initialize the secondary color. For the tex- + * coords, we have a flag in the opengl caps. Many cards do not require the texcoord beeing set, and + * this can eat a number of instructions, so skip it unless this cap is set as well + */ + if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { + shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); + + if((GLINFO_LOCATION).set_texcoord_w) { + int i; + for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { + if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && + This->baseShader.reg_maps.texcoord_mask[i] != WINED3DSP_WRITEMASK_ALL) { + shader_addline(buffer, "MOV result.texcoord[%u].w, -helper_const.y;\n", i); + } } } }

1 0

Maarten Lankhorst : user32: Implement BroadcastSystemMessage.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 70a6495a31cc01d6ea4284d4a6dadf037d9b60df URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a6495a31cc01d6ea4284d4a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 1 12:15:55 2008 -0700 user32: Implement BroadcastSystemMessage. --- dlls/user32/message.c | 174 ++++++++++++++++++--- dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/broadcast.c | 348 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 4 +- dlls/user32/win.h | 1 + dlls/user32/winstation.c | 15 ++- include/wine/server_protocol.h | 3 +- server/protocol.def | 1 + server/trace.c | 1 + server/winstation.c | 9 +- 10 files changed, 530 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70a6495a31cc01d6ea428…

1 0

Jason Edmeades : comctl32: Add basic custom draw support for tooltips.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: f54570fdbd2b3d06586bd3824f5473c66b70fd00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54570fdbd2b3d06586bd3824… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Apr 3 00:25:38 2008 +0100 comctl32: Add basic custom draw support for tooltips. --- dlls/comctl32/tests/tooltips.c | 173 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 59 +++++++++++++- 2 files changed, 229 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f54570fdbd2b3d06586bd…

1 0

Austin English : ddraw: Spelling fixes.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 825baa23a2d77476b06299f853685216ef651ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825baa23a2d77476b06299f85… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 2 14:26:42 2008 -0500 ddraw: Spelling fixes. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/direct3d.c | 4 ++-- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 6 +++--- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 6 +++--- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/tests/visual.c | 2 +- dlls/ddraw/viewport.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=825baa23a2d77476b0629…

1 0

Alexander Dorofeyev : wined3d: Improve detection of device palette change.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: d6ba069d9e07590d2086dcd9489812b2cd598ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ba069d9e07590d2086dcd94… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:16 2008 +0300 wined3d: Improve detection of device palette change. --- dlls/d3d8/tests/visual.c | 56 ++++++++++++++++++---------------------- dlls/wined3d/cubetexture.c | 13 +++++++++ dlls/wined3d/device.c | 18 ++++++++++++- dlls/wined3d/surface.c | 18 +++++++----- dlls/wined3d/texture.c | 11 ++++++++ dlls/wined3d/wined3d_private.h | 2 + 6 files changed, 78 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ba069d9e07590d2086d…

1 0

Alexander Dorofeyev : wined3d: Support index in alpha in BltOverride colorfill codepath.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1c89795438894c3ee00606929fb7d091dfbaff59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c89795438894c3ee00606929… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:13 2008 +0300 wined3d: Support index in alpha in BltOverride colorfill codepath. Fixes a failure in ddraw p8_primary_test when running with opengl ddraw renderer. --- dlls/wined3d/surface.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e7f7391..91bc419 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3395,13 +3395,18 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * 'clear' expect it in ARGB format => we need to do some conversion :-) */ if (This->resource.format == WINED3DFMT_P8) { + DWORD alpha; + + if (primary_render_target_is_p8(myDevice)) alpha = DDBltFx->u5.dwFillColor << 24; + else alpha = 0xFF000000; + if (This->palette) { - color = ((0xFF000000) | + color = (alpha | (This->palette->palents[DDBltFx->u5.dwFillColor].peRed << 16) | (This->palette->palents[DDBltFx->u5.dwFillColor].peGreen << 8) | (This->palette->palents[DDBltFx->u5.dwFillColor].peBlue)); } else { - color = 0xFF000000; + color = alpha; } } else if (This->resource.format == WINED3DFMT_R5G6B5) {

1 0

Alexander Dorofeyev : ddraw/tests: Additional colorfill test in p8_primary_test.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 003f679cbe105e95b30c40c6b88df02e3722876e URL: http://source.winehq.org/git/wine.git/?a=commit;h=003f679cbe105e95b30c40c6b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:11 2008 +0300 ddraw/tests: Additional colorfill test in p8_primary_test. --- dlls/ddraw/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index dc4ff47..8eb39cd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1860,6 +1860,17 @@ static void p8_primary_test() "got R %02X G %02X B %02X, expected R FF G 00 B 00\n", GetRValue(color), GetGValue(color), GetBValue(color)); + memset(&ddbltfx, 0, sizeof(ddbltfx)); + ddbltfx.dwSize = sizeof(ddbltfx); + U5(ddbltfx).dwFillColor = 1; + hr = IDirectDrawSurface_Blt(Surface1, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + ok(hr == DD_OK, "IDirectDrawSurface_Blt failed with %08x\n", hr); + + color = getPixelColor_GDI(Surface1, 10, 10); + ok(GetRValue(color) == 0 && GetGValue(color) == 0xFF && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + memset (&ddsd, 0, sizeof (ddsd)); ddsd.dwSize = sizeof (ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;

1 0

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 8ec63a9cf78b73a0c733fc824b0c396ccb16cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec63a9cf78b73a0c733fc824… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:08 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DCubeTextureImpl_PreLoad. --- dlls/wined3d/cubetexture.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 9426448..c44b3f9 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -125,7 +125,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { } IWineD3DCubeTexture_BindTexture(iface); - ENTER_GL(); /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { @@ -152,7 +151,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;

1 0

Alexander Dorofeyev : wined3d: Remove ENTER_GL/ LEAVE_GL in IWineD3DTextureImpl_PreLoad.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 9b048221709c31c46f3dbc6ee4b6406c0961a452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b048221709c31c46f3dbc6ee… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:04 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DTextureImpl_PreLoad. --- dlls/wined3d/texture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 294dd1d..a6919ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -115,7 +115,7 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } IWineD3DTexture_BindTexture(iface); - ENTER_GL(); + /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { @@ -135,7 +135,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;

1 0

Alexander Dorofeyev : wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad .
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: b54553a2537d4b44b7e6d36caa6c893b1862b9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54553a2537d4b44b7e6d36ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:00 2008 +0300 wined3d: Avoid calling LoadTexture with gl lock held in IWineD3DSurfaceImpl_PreLoad. Needed to prevent ActivateContext being called while holding gl lock. --- dlls/wined3d/surface.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 28ffdcb..e7f7391 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -509,19 +509,22 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { } glBindTexture(This->glDescription.target, This->glDescription.textureName); checkGLcall("glBindTexture"); + LEAVE_GL(); IWineD3DSurface_LoadTexture(iface, FALSE); /* This is where we should be reducing the amount of GLMemoryUsed */ } else if (This->glDescription.textureName) { /* NOTE: the level 0 surface of a mpmapped texture must be loaded first! */ /* assume this is a coding error not a real error for now */ FIXME("Mipmap surface has a glTexture bound to it!\n"); + LEAVE_GL(); } if (This->resource.pool == WINED3DPOOL_DEFAULT) { /* Tell opengl to try and keep this texture in video ram (well mostly) */ GLclampf tmp; tmp = 0.9f; + ENTER_GL(); glPrioritizeTextures(1, &This->glDescription.textureName, &tmp); + LEAVE_GL(); } - LEAVE_GL(); } return; }

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DSurfaceImpl_Release.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1e6f02ed2b56944c5f74ccc9eb4ba90417ecbdc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6f02ed2b56944c5f74ccc9e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:57 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DSurfaceImpl_Release. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d164c2f..28ffdcb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -441,7 +441,9 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(This->Flags & SFLAG_PBO) { /* Delete the PBO */ + ENTER_GL(); GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + LEAVE_GL(); } if(This->Flags & SFLAG_DIBSECTION) { @@ -461,10 +463,12 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; + ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); HeapFree(GetProcessHeap(), 0, entry); } + LEAVE_GL(); TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This);

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_allocate_surface.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 088c34ec1c465728b5cb2d07bb1d69958bbc5279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c34ec1c465728b5cb2d07b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:54 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_allocate_surface. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e233ce2..d164c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -301,8 +301,10 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ This->Flags |= SFLAG_CLIENT; mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + ENTER_GL(); GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, width, height, 0 /* border */, This->resource.size, mem)); + LEAVE_GL(); } return;

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in surface_bind_and_dirtify.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: d5b400307bd02ff70adaf51caa4d8def7e89db0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b400307bd02ff70adaf51ca… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:50 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in surface_bind_and_dirtify. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 573ac36..e233ce2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,7 +47,9 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { * TODO: Track the current active texture per GL context instead of using glGet */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { + ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); + LEAVE_GL(); active_texture -= GL_TEXTURE0_ARB; } else { active_texture = 0;

1 0

Alexander Dorofeyev : ddraw: Set surface to NULL on failure in GetAttachedSurface.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 2caa797e76273852f3aa52491261e24a6d1229a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2caa797e76273852f3aa52491… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:11:43 2008 +0300 ddraw: Set surface to NULL on failure in GetAttachedSurface. --- dlls/ddraw/surface.c | 2 ++ dlls/ddraw/surface_thunks.c | 5 ++--- dlls/ddraw/tests/dsurface.c | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c48e07e..da152de 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -540,6 +540,8 @@ IDirectDrawSurfaceImpl_GetAttachedSurface(IDirectDrawSurface7 *iface, TRACE("(%p) Didn't find a valid surface\n", This); LeaveCriticalSection(&ddraw_cs); + + *Surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index ef6d48f..a0786bb 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -228,9 +228,8 @@ IDirectDrawSurface3Impl_GetAttachedSurface(LPDIRECTDRAWSURFACE3 This, hr = IDirectDrawSurface7_GetAttachedSurface(CONVERT(This), &caps, &pAttached7); - if (FAILED(hr)) return hr; - - *ppAttached = CONVERT_REV(pAttached7); + if (FAILED(hr)) *ppAttached = NULL; + else *ppAttached = CONVERT_REV(pAttached7); return hr; } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 7ff1fe7..1e35e37 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1012,6 +1012,7 @@ static void EnumTest(void) ok(rc == DD_OK, "GetAttachedSurface returned %08x\n", rc); rc = IDirectDrawSurface_GetAttachedSurface(ctx.expected[2], &ddsd.ddsCaps, &ctx.expected[3]); ok(rc == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", rc); + ok(!ctx.expected[3], "expected NULL pointer\n"); ctx.count = 0; rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); @@ -1077,6 +1078,9 @@ static void AttachmentTest7(void) ok(num == 0, "Second mip level has %d surfaces attached, expected 1\n", num); /* Done level 2 */ /* Mip level 3 is still needed */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface3, &caps, &surface4); + ok(hr == DDERR_NOTFOUND, "GetAttachedSurface returned %08x\n", hr); + ok(!surface4, "expected NULL pointer\n"); /* Try to attach a 16x16 miplevel - Should not work as far I can see */ memset(&ddsd, 0, sizeof(ddsd));

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 9183b472ebac3fd4642655bd2e8c75713b011dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183b472ebac3fd4642655bd2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Apr 3 00:43:09 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 55 ++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index e9550d5..384a197 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -2,7 +2,7 @@ * WineCfg resources * Norwegian Bokm�l Language Support * - * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +46,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Programminnstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte program der ogs�.", + LTEXT "Wine kan etterligne forskjellige Windows-versjoner for hvert program. Denne fanen er koblet med bibliotek- og grafikkfanene, s�nn at du kan endre innstillinger for hele systemet eller enkelte programmer der ogs�.", IDC_STATIC,15,20,227,30 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 @@ -62,27 +62,27 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,230,8 - LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", - IDC_STATIC,15,38,228,80 - CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,112,230,8 - + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,19,51,225,80 + + CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,126,228,28 + IDC_STATIC,19,138,225,28 LTEXT "St�rrelse:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,168,8,8,WS_DISABLED - CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,153,230,10 - - EDITTEXT IDC_DESKTOP_WIDTH,64,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,168,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,200,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,198,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,203,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,201,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,217,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Skjermoppl�sning (styrer skriftst�rrelse) ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -196,7 +196,7 @@ BEGIN EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "Skrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 + GROUPBOX " Spesielle mapper ",IDC_STATIC,8,114,244,100 CONTROL "Listevisning",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 @@ -222,7 +222,7 @@ BEGIN IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." - IDS_SHELL_FOLDER "Skallkatalog" + IDS_SHELL_FOLDER "Mappe" IDS_LINKS_TO "Peker til" END @@ -306,4 +306,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" IDC_SYSPARAMS_MSGBOX_TEXT "Meldingsvindutekst" + IDC_SYSPARAMS_APPWORKSPACE "Arbeidsomr�de i program" + IDC_SYSPARAMS_WINDOW_FRAME "Visrusramme" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiv kant" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiv kant" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrollerskygge" + IDC_SYSPARAMS_GRAY_TEXT "Gr� tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Merket kontroller" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "M�rk skygge i kontroller" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrollerlys" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Bakgrunn for skiftende kontroller" + IDC_SYSPARAMS_HOT_TRACKING "Merket element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient for aktiv tittellinje" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient for inaktiv tittellinje" + IDC_SYSPARAMS_MENU_HILIGHT "Menymerking" + IDC_SYSPARAMS_MENUBAR "Menylinje" END

1 0

Paul Vriens : rsaenh: Add some new flags to wincrypt.h and use one of them.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 51ee956b953501903ec13c9a2b052882d56429b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ee956b953501903ec13c9a2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:46:53 2008 +0200 rsaenh: Add some new flags to wincrypt.h and use one of them. --- dlls/rsaenh/rsaenh.c | 8 ++++---- include/wincrypt.h | 13 +++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e31bace..14e67d7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3027,11 +3027,11 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwTemp; HKEY hKey; - /* This is for dwParam 41, which does not seem to be documented - * on MSDN. IE6 SP1 asks for it in the 'About' dialog, however. + /* This is for dwParam PP_CRYPT_COUNT_KEY_USE. + * IE6 SP1 asks for it in the 'About' dialog. * Returning this BLOB seems to satisfy IE. The marked 0x00 seem * to be 'don't care's. If you know anything more specific about - * provider parameter 41, please report to wine-devel(a)winehq.org */ + * this provider parameter, please report to wine-devel(a)winehq.org */ static CONST BYTE abWTF[96] = { 0xb0, 0x25, 0x63, 0x86, 0x9c, 0xab, 0xb6, 0x37, 0xe8, 0x82, /**/0x00,/**/ 0x72, 0x06, 0xb2, /**/0x00,/**/ 0x3b, @@ -3175,7 +3175,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, sizeof(PROV_ENUMALGS_EX)); } - case 41: /* Undocumented. Asked for by IE About dialog */ + case PP_CRYPT_COUNT_KEY_USE: /* Asked for by IE About dialog */ return copy_param(pbData, pdwDataLen, abWTF, sizeof(abWTF)); default: diff --git a/include/wincrypt.h b/include/wincrypt.h index bf15b93..5d8b203 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1816,14 +1816,6 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' /* FLAGS Section */ -/* Provider Parameters */ -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#define PP_NAME 4 -#define PP_VERSION 5 -#define PP_CONTAINER 6 - #define CRYPT_FIRST 1 #define CRYPT_NEXT 2 @@ -1880,6 +1872,11 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define PP_USE_HARDWARE_RNG 38 #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +#define PP_CRYPT_COUNT_KEY_USE 41 +#define PP_USER_CERTSTORE 42 +#define PP_SMARTCARD_READER 43 +#define PP_SMARTCARD_GUID 45 +#define PP_ROOT_CERTSTORE 46 /* Values returned by CryptGetProvParam of PP_KEYSTORAGE */ #define CRYPT_SEC_DESCR 0x00000001

1 0

Paul Vriens : rsaenh/tests: Fix a typo.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 77d912e541eb793b2c05b8f6da21a57e315315aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d912e541eb793b2c05b8f6d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 3 08:11:20 2008 +0200 rsaenh/tests: Fix a typo. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5a7b474..1a8bb92 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1836,7 +1836,7 @@ static void test_null_provider(void) dataLen = sizeof(szName); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY,

1 0

Vitaliy Margolen : reg: Add Russian translation.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 3eff12c056109fd27b4e72a42ae2bcbe42cda026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eff12c056109fd27b4e72a42… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Apr 2 23:43:14 2008 -0600 reg: Add Russian translation. --- programs/reg/Ru.rc | 29 +++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc new file mode 100644 index 0000000..0d895a3 --- /dev/null +++ b/programs/reg/Ru.rc @@ -0,0 +1,29 @@ +/* + * Russian language support + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "�� :\n\nREG [ ADD | DELETE | QUERY ]\nREG <��> /?\n" + STRING_ADD_USAGE, "REG ADD <��> [/v <��> | /ve] [/t <��>] [/s <��>] [/d ��] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE <��> [/v <��> | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY <��> [/v <��> | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 125b3e3..1508517 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -26,3 +26,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc"

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
52
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 April 2008