September 2006 - Wine-commits

lostwages/templates/en press.template who.template
by Jeremy Newman 12 Sep '06

12 Sep '06

ChangeSet ID: 28026 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/09/12 11:13:02 Modified files: templates/en : press.template who.template Log message: Tom Wickline <twickline(a)gmail.com> site updates and corrections Patch: http://cvs.winehq.org/patch.py?id=28026 Old revision New revision Changes Path 1.38 1.39 +7 -2 lostwages/templates/en/press.template 1.28 1.29 +16 -2 lostwages/templates/en/who.template Index: lostwages/templates/en/press.template diff -u -p lostwages/templates/en/press.template:1.38 lostwages/templates/en/press.template:1.39 --- lostwages/templates/en/press.template:1.38 12 Sep 2006 16:13: 2 -0000 +++ lostwages/templates/en/press.template 12 Sep 2006 16:13: 2 -0000 @@ -3,8 +3,9 @@ <h1>Press articles covering Wine</h1> <ul> - <li> <a href="http://www.theinquirer.net/default.aspx?article=34181">TheINQUIRER</a> September 5, 2006 - Crossover allows Windows to run on a Mac - <li> <a href="http://apple.slashdot.org/article.pl?sid=06/09/05/2213244">Slashdot</a> September 5, 2006 - Codeweavers Releases CrossOver For Intel Mac + <li> <a href="http://www.theinquirer.net/default.aspx?article=34181">TheINQUIRER</a> September 6, 2006 - Crossover allows Windows to run on a Mac + <li> <a href="http://apple.slashdot.org/article.pl?sid=06/09/05/2213244">Slashdot</a> September 5, 2006 - Codeweavers Releases CrossOver For Intel Mac + <li> <a href=" http://www.tuxmagazine.com/node/1000223">TuxMagazine</a> September 2, 2006 - Issue #17 Has articles covering Wine and CrossOver Office <li> <a href="http://www.linux-gamers.net/modules/news/article.php?storyid=1767">Linux-Gamers</a> August 28, 2006 - A tool to capture in-game videos <li> <a href="http://www.linux-gamers.net/modules/wiwimod/index.php?page=HOWTO%20Steam">Linux-Gamers</a> August 11, 2006 - Steam, Half-Life, Half-Life 2, Counter-Strike 1.6 and Source with Wine <li> <a href="http://www.linux.com/article.pl?sid=06/07/27/183221">Linux.com</a> August 3, 2006 - How to launch Windows binaries on Linux directly @@ -12,11 +13,15 @@ <li> <a href="http://www.infoworld.com/article/06/07/10/28OPopenent_1.html">InfoWorld </a> July 10, 2006 - Windows apps cross over to the Mac <li> <a href="http://www.macworld.co.uk/news/index.cfm?NewsID=15152">Macworld</a> July 5, 2006 - CrossOver lets Windows apps run on OS X, sans Windows <li> <a href="http://www.pc-magazin.de/common/nws/einemeldung.php?id=46304">pc-magazin.de</a> July 5, 2006 - Interview with Alexandre Julliard + <li> <a href="http://news.cnet.co.uk/software/0,39029694,49281075,00.htm">CNET</a> July 3, 2006 - Wine lets Windows run on a Mac + <li> <a href="http://luhit.wordpress.com/2006/07/01/mac-crossover-wine-to-join-the-party-…">Luhit</a> July 1, 2006 - CrossOver Wine to join the party with BootCamp & Parallels + <li> <a href="http://news.com.com/Turning+Wine+into+Windows+on+a+Mac/2100-1016_3-6089859.…">News.com</a> June 30, 2006 - Turning Wine into Windows on a Mac <li> <a href="http://www.linux.com/article.pl?sid=06/06/07/1920213">Linux.com</a> June 13, 2006 - Wine Doors opens Windows under Linux <li> <a href="http://linuxhelp.blogspot.com/2006/05/wine-open-source-project-which-could.…">linuxhelp</a> June 13, 2006 - WINE - could be the tipping point <li> <a href="http://www.linuxtoday.com/infrastructure/2006052601826NWSWRL">LinuxToday</a> May 26, 2006 - Google's Picasa Painted to a Linux Canvas <li> <a href="http://www.osnews.com/story.php?news_id=14720">OSNews</a> May 6, 2006 - Google's Picasa Ported to Linux Using Wine <li> <a href="http://business.newsforge.com/business/06/04/27/155209.shtml">NewsForge</a> April 27, 2006 - Wine desktops (About Ulrich Czekalla's presentation on Wine) + <li> <a href="http://www.wired.com/news/technology/computers/0,70604-0.html">Wired</a> April 6, 2006 - Windows on Mac, Simultaneously <li> <a href="http://www.linuxjournal.com/article/8802">LinxJournal</a> March 30, 2006 - Running Sound Applications under Wine <li> <a href="http://www.desktoplinux.com/news/NS7185675297.html">DesktopLinux.com</a> March 8, 2006 - Versora, CodeWeavers spin Linux migration bundle <li> <a href="http://linuxrevolution.blogspot.com/2006/02/mac-apps-on-linux.html">linuxrevolution</a> Febuary 19, 2006 - Mac Apps on Linux? Index: lostwages/templates/en/who.template diff -u -p lostwages/templates/en/who.template:1.28 lostwages/templates/en/who.template:1.29 --- lostwages/templates/en/who.template:1.28 12 Sep 2006 16:13: 2 -0000 +++ lostwages/templates/en/who.template 12 Sep 2006 16:13: 2 -0000 @@ -139,8 +139,8 @@ Please email additions, corrections, and <b>Email:</b> wdev -at- foltman dot com</td> <td></td></tr></table> <p> - Ex-game and audio developer who now earns for a living by doing boring - web work at a large Polish Internet portal. In the non-existent spare + Ex-game and audio developer who now earns a living by doing boring + web work at a large Polish Internet portal. In his non-existent spare time, he works on the rich text editor clone for Wine. </p></blockquote> @@ -264,6 +264,20 @@ Please email additions, corrections, and Kevin also enjoys paintball and skiing. </p></blockquote> +<h3>Phil Krylov</h3><blockquote> + <table border="0"><tr> + <td width="300"><b>Location:</b> Moscow, Russia<br /></td> + <td><b>IRC Nick:</b> philkrylov</td></tr> + <tr><td> + <b>Email:</b> phil -at- newstar dot rinet dot ru</td> + <td></td></tr></table> + <p> + Phil mostly specializes in Richedit code, however, he also + has contributed in other areas. Currently he works as a SAS data + warehouse administrator, but seeks any chance to be paid for making + Free/OSS software. + </p></blockquote> + <h3>Tony Lambregts</h3><blockquote> <table border="0"><tr> <td width="300"><b>Location:</b> St. Albert, Alberta, Canada<br /></td>

1 0

Alexandre Julliard : configure: Fix left-over reference to kernel directory .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 1c60e3bfc5d3c5a2eddd25c1cdcc9913092db939 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c60e3bfc5d3c5a2eddd25c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 16:10:51 2006 +0200 configure: Fix left-over reference to kernel directory. --- configure | 8 ++++---- configure.ac | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index da83a19..075edc1 100755 --- a/configure +++ b/configure @@ -23769,7 +23769,7 @@ ac_config_commands="$ac_config_commands ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" -ac_config_commands="$ac_config_commands dlls/kernel/nls" +ac_config_commands="$ac_config_commands dlls/kernel32/nls" ac_config_commands="$ac_config_commands dlls/user/resources" @@ -24343,7 +24343,7 @@ do "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "dlls/gdi/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;; "dlls/gdi/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; - "dlls/kernel/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/nls" ;; + "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; "dlls/user/resources") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;; "dlls/wineps.drv/data") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps.drv/data" ;; "include/wine") CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;; @@ -25350,8 +25350,8 @@ echo "$as_me: executing $ac_file command echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;; "dlls/gdi/mfdrv":C) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5 echo "$as_me: creating dlls/gdi/mfdrv" >&6;} && mkdir "dlls/gdi/mfdrv") ;; - "dlls/kernel/nls":C) test -d "dlls/kernel/nls" || ({ echo "$as_me:$LINENO: creating dlls/kernel/nls" >&5 -echo "$as_me: creating dlls/kernel/nls" >&6;} && mkdir "dlls/kernel/nls") ;; + "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ echo "$as_me:$LINENO: creating dlls/kernel32/nls" >&5 +echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;; "dlls/user/resources":C) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5 echo "$as_me: creating dlls/user/resources" >&6;} && mkdir "dlls/user/resources") ;; "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps.drv/data" >&5 diff --git a/configure.ac b/configure.ac index 9935857..14ef9b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,7 +1461,7 @@ AH_TOP([#define __WINE_CONFIG_H]) WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) -WINE_CONFIG_EXTRA_DIR(dlls/kernel/nls) +WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) WINE_CONFIG_EXTRA_DIR(dlls/user/resources) WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data) WINE_CONFIG_EXTRA_DIR(include/wine)

1 0

Paul Vriens : wintrust: Implemented WintrustAddDefaultForUsage.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 181574a1b4ee9d880181b8e68840054463566b57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=181574a1b4ee9d880181b8e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 14:28:05 2006 +0200 wintrust: Implemented WintrustAddDefaultForUsage. --- dlls/wintrust/register.c | 75 +++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/register.c | 31 ++++++----------- 2 files changed, 85 insertions(+), 21 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 1f1fc86..aa9d75a 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -681,12 +681,83 @@ static void WINTRUST_RegisterGenChainVer /*********************************************************************** * WintrustAddDefaultForUsage (WINTRUST.@) + * + * Write OID and callback functions to the registry. + * + * PARAMS + * pszUsageOID [I] Pointer to a GUID. + * psDefUsage [I] Pointer to a structure that specifies the callback functions. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + * + * NOTES + * WintrustAddDefaultForUsage will only return TRUE or FALSE, no last + * error is set, not even when the registry cannot be written to. */ BOOL WINAPI WintrustAddDefaultForUsage(const CHAR *pszUsageOID, CRYPT_PROVIDER_REGDEFUSAGE *psDefUsage) { - FIXME("(%s %p) stub\n", debugstr_a(pszUsageOID), psDefUsage); - return FALSE; + static const WCHAR CBAlloc[] = {'C','a','l','l','b','a','c','k','A','l','l','o','c','F','u','n','c','t','i','o','n', 0}; + static const WCHAR CBFree[] = {'C','a','l','l','b','a','c','k','F','r','e','e','F','u','n','c','t','i','o','n', 0}; + LONG Res = ERROR_SUCCESS; + LONG WriteUsageError = ERROR_SUCCESS; + DWORD Len; + WCHAR GuidString[39]; + + TRACE("(%s %p)\n", debugstr_a(pszUsageOID), psDefUsage); + + /* Some sanity checks. */ + if (!pszUsageOID || + !psDefUsage || + !psDefUsage->pgActionID || + (psDefUsage->cbStruct != sizeof(CRYPT_PROVIDER_REGDEFUSAGE))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (psDefUsage->pwszDllName) + { + Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, Dll, psDefUsage->pwszDllName); + if (Res != ERROR_SUCCESS) WriteUsageError = Res; + } + if (psDefUsage->pwszLoadCallbackDataFunctionName) + { + WCHAR* CallbackW; + + Len = MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszLoadCallbackDataFunctionName, -1, NULL, 0 ); + CallbackW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszLoadCallbackDataFunctionName, -1, CallbackW, Len ); + + Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, CBAlloc, CallbackW); + if (Res != ERROR_SUCCESS) WriteUsageError = Res; + + HeapFree(GetProcessHeap(), 0, CallbackW); + } + if (psDefUsage->pwszFreeCallbackDataFunctionName) + { + WCHAR* CallbackW; + + Len = MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszFreeCallbackDataFunctionName, -1, NULL, 0 ); + CallbackW = HeapAlloc( GetProcessHeap(), 0, Len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, psDefUsage->pwszFreeCallbackDataFunctionName, -1, CallbackW, Len ); + + Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, CBFree, CallbackW); + if (Res != ERROR_SUCCESS) WriteUsageError = Res; + + HeapFree(GetProcessHeap(), 0, CallbackW); + } + + WINTRUST_Guid2Wstr(psDefUsage->pgActionID, GuidString); + Res = WINTRUST_WriteSingleUsageEntry(pszUsageOID, DefaultId, GuidString); + if (Res != ERROR_SUCCESS) WriteUsageError = Res; + + if (WriteUsageError != ERROR_SUCCESS) + return FALSE; + + return TRUE; } /*********************************************************************** diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 3640aa4..eb34aa4 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -176,17 +176,15 @@ static void test_AddDefaultForUsage(void SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(NULL, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - todo_wine - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); /* NULL defusage */ SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - todo_wine - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); /* NULL oid and proper defusage */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -198,9 +196,8 @@ static void test_AddDefaultForUsage(void SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(NULL, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - todo_wine - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); /* Just the ActionID */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -208,8 +205,7 @@ static void test_AddDefaultForUsage(void DefUsage.pgActionID = &ActionID; SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - todo_wine - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); + ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08lx\n", GetLastError()); @@ -221,9 +217,8 @@ static void test_AddDefaultForUsage(void DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - todo_wine - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -235,9 +230,8 @@ static void test_AddDefaultForUsage(void SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - todo_wine - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); /* All OK */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -248,8 +242,7 @@ static void test_AddDefaultForUsage(void DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - todo_wine - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); + ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); ok (GetLastError() == 0xdeadbeef, "Last error should not have been changed: 0x%08lx\n", GetLastError());

1 0

Paul Vriens : wintrust: Added tests for WintrustAddDefaultForUsage.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 199c5f0ba9e56f8fda5dadfa913ee9eae7d993bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=199c5f0ba9e56f8fda5dadf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 13:18:48 2006 +0200 wintrust: Added tests for WintrustAddDefaultForUsage. --- dlls/wintrust/tests/Makefile.in | 2 - dlls/wintrust/tests/register.c | 108 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 82fffae..f346f53 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wintrust.dll -IMPORTS = user32 kernel32 +IMPORTS = user32 advapi32 kernel32 CTESTS = \ register.c diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 3f95962..3640aa4 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -24,10 +24,12 @@ #include <stdio.h> #include "windows.h" #include "softpub.h" #include "wintrust.h" +#include "winreg.h" #include "wine/test.h" static BOOL (WINAPI * pWintrustAddActionID)(GUID*, DWORD, CRYPT_REGISTER_ACTIONID*); +static BOOL (WINAPI * pWintrustAddDefaultForUsage)(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*); static BOOL (WINAPI * pWintrustRemoveActionID)(GUID*); static HMODULE hWintrust = 0; @@ -51,6 +53,7 @@ static BOOL InitFunctionPtrs(void) } WINTRUST_GET_PROC(WintrustAddActionID) + WINTRUST_GET_PROC(WintrustAddDefaultForUsage) WINTRUST_GET_PROC(WintrustRemoveActionID) return TRUE; @@ -60,7 +63,7 @@ static void test_AddRem_ActionID(void) { static WCHAR DummyDllW[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; static WCHAR DummyFunctionW[] = {'d','u','m','m','y','f','u','n','c','t','i','o','n',0 }; - GUID ActionID = { 0xdeadbe, 0xefde, 0xadbe, { 0xef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe }}; + GUID ActionID = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; CRYPT_REGISTER_ACTIONID ActionIDFunctions; CRYPT_TRUST_REG_ENTRY EmptyProvider = { 0, NULL, NULL }; CRYPT_TRUST_REG_ENTRY DummyProvider = { sizeof(CRYPT_TRUST_REG_ENTRY), DummyDllW, DummyFunctionW }; @@ -158,12 +161,115 @@ static void test_AddRem_ActionID(void) "Expected 0xdeadbeef, got %ld.\n", GetLastError()); } +static void test_AddDefaultForUsage(void) +{ + BOOL ret; + LONG res; + static GUID ActionID = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; + static WCHAR DummyDllW[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; + static CHAR DummyFunction[] = "dummyfunction"; + static const CHAR oid[] = "1.2.3.4.5.6.7.8.9.10"; + static const CHAR Usages[] = "SOFTWARE\\Microsoft\\Cryptography\\Providers\\Trust\\Usages\\1.2.3.4.5.6.7.8.9.10"; + static CRYPT_PROVIDER_REGDEFUSAGE DefUsage; + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(NULL, NULL); + ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* NULL defusage */ + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(oid, NULL); + ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* NULL oid and proper defusage */ + memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); + DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); + DefUsage.pgActionID = &ActionID; + DefUsage.pwszDllName = DummyDllW; + DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; + DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(NULL, &DefUsage); + ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* Just the ActionID */ + memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); + DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); + DefUsage.pgActionID = &ActionID; + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(oid, &DefUsage); + todo_wine + ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); + ok (GetLastError() == 0xdeadbeef, + "Last error should not have been changed: 0x%08lx\n", GetLastError()); + + /* No ActionID */ + memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); + DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); + DefUsage.pwszDllName = DummyDllW; + DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; + DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; + ret = pWintrustAddDefaultForUsage(oid, &DefUsage); + ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* cbStruct set to 0 */ + memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); + DefUsage.cbStruct = 0; + DefUsage.pgActionID = &ActionID; + DefUsage.pwszDllName = DummyDllW; + DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; + DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(oid, &DefUsage); + ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); + todo_wine + ok (GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError()); + + /* All OK */ + memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); + DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); + DefUsage.pgActionID = &ActionID; + DefUsage.pwszDllName = DummyDllW; + DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; + DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; + SetLastError(0xdeadbeef); + ret = pWintrustAddDefaultForUsage(oid, &DefUsage); + todo_wine + ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); + ok (GetLastError() == 0xdeadbeef, + "Last error should not have been changed: 0x%08lx\n", GetLastError()); + + /* There is no corresponding remove for WintrustAddDefaultForUsage + * so we delete the registry key manually. + */ + if (ret) + { + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, Usages); + ok (res == ERROR_SUCCESS, "Key delete failed : 0x%08lx\n", res); + } +} + START_TEST(register) { if(!InitFunctionPtrs()) return; test_AddRem_ActionID(); + test_AddDefaultForUsage(); FreeLibrary(hWintrust); }

1 0

Paul Vriens : wintrust: Added stubbed WintrustAddDefaultForUsage.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 1f05420b5cf31f6d834dad9ed8e8064bb3cee7e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f05420b5cf31f6d834dad9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 12 13:18:25 2006 +0200 wintrust: Added stubbed WintrustAddDefaultForUsage. --- dlls/wintrust/register.c | 10 ++++++++++ dlls/wintrust/wintrust.spec | 2 +- include/wintrust.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 7037f09..1f1fc86 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -680,6 +680,16 @@ static void WINTRUST_RegisterGenChainVer } /*********************************************************************** + * WintrustAddDefaultForUsage (WINTRUST.@) + */ +BOOL WINAPI WintrustAddDefaultForUsage(const CHAR *pszUsageOID, + CRYPT_PROVIDER_REGDEFUSAGE *psDefUsage) +{ + FIXME("(%s %p) stub\n", debugstr_a(pszUsageOID), psDefUsage); + return FALSE; +} + +/*********************************************************************** * DllRegisterServer (WINTRUST.@) */ HRESULT WINAPI DllRegisterServer(void) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index f7a4221..5335605 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -111,7 +111,7 @@ @ stdcall WinVerifyTrust(long ptr ptr) @ stdcall WinVerifyTrustEx(long ptr ptr) @ stdcall WintrustAddActionID(ptr long ptr) -@ stub WintrustAddDefaultForUsage +@ stdcall WintrustAddDefaultForUsage(ptr ptr) @ stub WintrustCertificateTrust @ stub WintrustGetDefaultForUsage @ stdcall WintrustGetRegPolicyFlags(ptr) diff --git a/include/wintrust.h b/include/wintrust.h index b6c8785..9c4f7c9 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -135,6 +135,15 @@ typedef struct _CRYPT_REGISTER_ACTIONID CRYPT_TRUST_REG_ENTRY sCleanupProvider; } CRYPT_REGISTER_ACTIONID, *PCRYPT_REGISTER_ACTIONID; +typedef struct _CRYPT_PROVIDER_REGDEFUSAGE +{ + DWORD cbStruct; + GUID *pgActionID; + WCHAR *pwszDllName; + char *pwszLoadCallbackDataFunctionName; + char *pwszFreeCallbackDataFunctionName; +} CRYPT_PROVIDER_REGDEFUSAGE, *PCRYPT_PROVIDER_REGDEFUSAGE; + typedef struct _CRYPT_PROVUI_DATA { DWORD cbStruct; DWORD dwFinalError; @@ -316,6 +325,7 @@ #endif BOOL WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*); BOOL WINAPI WintrustRemoveActionID(GUID*); BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*); +BOOL WINAPI WintrustAddDefaultForUsage(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); LONG WINAPI WinVerifyTrust(HWND,GUID*,LPVOID); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*);

1 0

Alexandre Julliard : secur32: Use _exit instead of exit in child process to avoid flushing things twice.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 15ccaf545a6301e21ae0a24ab396706f3eeeda7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15ccaf545a6301e21ae0a24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 14:50:33 2006 +0200 secur32: Use _exit instead of exit in child process to avoid flushing things twice. --- dlls/secur32/dispatcher.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index f9f37e4..27c1f9a 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -104,7 +104,7 @@ SECURITY_STATUS fork_helper(PNegoHelper /* Whoops, we shouldn't get here. Big badaboom.*/ write(STDOUT_FILENO, "BH\n", 3); - exit(1); + _exit(1); } else {

1 0

Alexandre Julliard : winex11.drv: Fixed and simplified the opengl extension registration.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 9d5def307effd580e3a7ed6f15fce7c271694e94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d5def307effd580e3a7ed6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 11:50:36 2006 +0200 winex11.drv: Fixed and simplified the opengl extension registration. --- dlls/winex11.drv/opengl.c | 130 +++++++++++++-------------------------------- 1 files changed, 37 insertions(+), 93 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8d672e4..8c10395 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -25,6 +25,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include <stdlib.h> #include <string.h> @@ -103,7 +104,6 @@ typedef struct wine_glextension { const char *funcName; void *funcAddress; } extEntryPoints[8]; - int extNumEntryPoints; } WineGLExtension; struct WineGLInfo { @@ -130,9 +130,11 @@ static int use_render_texture_emulation static int use_render_texture_ati = 0; static int swap_interval = 1; -static WineGLExtension *WineGLExtensionList = NULL; -long WineGLExtensionListSize = 0; -void X11DRV_WineGL_LoadExtensions(); +#define MAX_EXTENSIONS 16 +static const WineGLExtension *WineGLExtensionList[MAX_EXTENSIONS]; +static int WineGLExtensionListSize; + +static void X11DRV_WineGL_LoadExtensions(void); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); @@ -1314,7 +1316,7 @@ HDC WINAPI X11DRV_wglGetCurrentReadDCARB PROC X11DRV_wglGetProcAddress(LPCSTR lpszProc) { int i, j; - WineGLExtension *ext; + const WineGLExtension *ext; int padding = 32 - strlen(lpszProc); if (padding < 0) @@ -1322,8 +1324,8 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps TRACE("('%s'):%*s", lpszProc, padding, " "); for (i = 0; i < WineGLExtensionListSize; ++i) { - ext = &WineGLExtensionList[i]; - for (j = 0; j < ext->extNumEntryPoints; ++j) { + ext = WineGLExtensionList[i]; + for (j = 0; ext->extEntryPoints[j].funcName; ++j) { if (strcmp(ext->extEntryPoints[j].funcName, lpszProc) == 0) { TRACE("(%p) - WineGL\n", ext->extEntryPoints[j].funcAddress); return ext->extEntryPoints[j].funcAddress; @@ -2309,28 +2311,19 @@ static BOOL glxRequireExtension(const ch return TRUE; } -BOOL X11DRV_WineGL_RegisterExtension(const WineGLExtension * ext) +static BOOL register_extension(const WineGLExtension * ext) { int i; - if (WineGLExtensionListSize == 0) - { - WineGLExtensionList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineGLExtension)); - } - else - { - WineGLExtensionList = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, WineGLExtensionList, (WineGLExtensionListSize + 1) * sizeof(WineGLExtension)); - } - - WineGLExtensionList[WineGLExtensionListSize] = *ext; - ++WineGLExtensionListSize; + assert( WineGLExtensionListSize < MAX_EXTENSIONS ); + WineGLExtensionList[WineGLExtensionListSize++] = ext; strcat(WineGLInfo.wglExtensions, " "); strcat(WineGLInfo.wglExtensions, ext->extName); TRACE("'%s'\n", ext->extName); - for (i = 0; i < ext->extNumEntryPoints; ++i) + for (i = 0; ext->extEntryPoints[i].funcName; ++i) TRACE(" - '%s'\n", ext->extEntryPoints[i].funcName); return TRUE; @@ -2344,12 +2337,6 @@ static const WineGLExtension WGL_ARB_ext } }; -/* WGL_ARB_extensions_string */ -static void WineGLExtension__WGL_ARB_extensions_string() -{ - X11DRV_WineGL_RegisterExtension(&WGL_ARB_extensions_string); -} - static const WineGLExtension WGL_ARB_make_current_read = { "WGL_ARB_make_current_read", @@ -2359,29 +2346,11 @@ static const WineGLExtension WGL_ARB_mak } }; -/* WGL_ARB_make_current_read */ -static void WineGLExtension__WGL_ARB_make_current_read() -{ - if (glxRequireVersion(3) == FALSE) - return; - - X11DRV_WineGL_RegisterExtension(&WGL_ARB_make_current_read); -} - static const WineGLExtension WGL_ARB_multisample = { "WGL_ARB_multisample", }; -/* WGL_ARB_multisample */ -static void WineGLExtension__WGL_ARB_multisample() -{ - if (glxRequireExtension("GLX_ARB_multisample") == FALSE) - return; - - X11DRV_WineGL_RegisterExtension(&WGL_ARB_multisample); -} - static const WineGLExtension WGL_ARB_pbuffer = { "WGL_ARB_pbuffer", @@ -2395,15 +2364,6 @@ static const WineGLExtension WGL_ARB_pbu } }; -/* WGL_ARB_pbuffer */ -static void WineGLExtension__WGL_ARB_pbuffer() -{ - if ((glxRequireVersion(3) == FALSE) || (glxRequireExtension("GLX_SGIX_pbuffer") == FALSE)) - return; - - X11DRV_WineGL_RegisterExtension(&WGL_ARB_pbuffer); -} - static const WineGLExtension WGL_ARB_pixel_format = { "WGL_ARB_pixel_format", @@ -2414,12 +2374,6 @@ static const WineGLExtension WGL_ARB_pix } }; -/* WGL_ARB_pixel_format */ -static void WineGLExtension__WGL_ARB_pixel_format() -{ - X11DRV_WineGL_RegisterExtension(&WGL_ARB_pixel_format); -} - static const WineGLExtension WGL_ARB_render_texture = { "WGL_ARB_render_texture", @@ -2429,16 +2383,6 @@ static const WineGLExtension WGL_ARB_ren } }; -/* WGL_ARB_render_texture */ -static void WineGLExtension__WGL_ARB_render_texture() -{ - if (glxRequireExtension("GLX_ATI_render_texture") == FALSE && - glxRequireExtension("GLX_ARB_render_texture") == FALSE) - return; - - X11DRV_WineGL_RegisterExtension(&WGL_ARB_render_texture); -} - static const WineGLExtension WGL_EXT_extensions_string = { "WGL_EXT_extensions_string", @@ -2447,12 +2391,6 @@ static const WineGLExtension WGL_EXT_ext } }; -/* WGL_EXT_extensions_string */ -static void WineGLExtension__WGL_EXT_extensions_string() -{ - X11DRV_WineGL_RegisterExtension(&WGL_EXT_extensions_string); -} - static const WineGLExtension WGL_EXT_swap_control = { "WGL_EXT_swap_control", @@ -2462,33 +2400,39 @@ static const WineGLExtension WGL_EXT_swa } }; -/* WGL_EXT_swap_control */ -static void WineGLExtension__WGL_EXT_swap_control() -{ - if (glxRequireExtension("GLX_SGI_swap_control") == FALSE) - return; - - X11DRV_WineGL_RegisterExtension(&WGL_EXT_swap_control); -} - /** * X11DRV_WineGL_LoadExtensions */ -void X11DRV_WineGL_LoadExtensions(void) +static void X11DRV_WineGL_LoadExtensions(void) { WineGLInfo.wglExtensions[0] = 0; + /* ARB Extensions */ - WineGLExtension__WGL_ARB_extensions_string(); - WineGLExtension__WGL_ARB_make_current_read(); - WineGLExtension__WGL_ARB_multisample(); - WineGLExtension__WGL_ARB_pbuffer(); - WineGLExtension__WGL_ARB_pixel_format(); - WineGLExtension__WGL_ARB_render_texture(); + + register_extension(&WGL_ARB_extensions_string); + + if (glxRequireVersion(3)) + register_extension(&WGL_ARB_make_current_read); + + if (glxRequireExtension("GLX_ARB_multisample")) + register_extension(&WGL_ARB_multisample); + + if (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer")) + register_extension(&WGL_ARB_pbuffer); + + register_extension(&WGL_ARB_pixel_format); + + if (glxRequireExtension("GLX_ATI_render_texture") || + glxRequireExtension("GLX_ARB_render_texture")) + register_extension(&WGL_ARB_render_texture); /* EXT Extensions */ - WineGLExtension__WGL_EXT_extensions_string(); - WineGLExtension__WGL_EXT_swap_control(); + + register_extension(&WGL_EXT_extensions_string); + + if (glxRequireExtension("GLX_SGI_swap_control")) + register_extension(&WGL_EXT_swap_control); }

1 0

Alexandre Julliard : crypt32: Comment out an unreliable test.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 8e06fc4c0dc8e5886da79dd10f2f8e3052b3602a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e06fc4c0dc8e5886da79dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 14:45:48 2006 +0200 crypt32: Comment out an unreliable test. --- dlls/crypt32/tests/encode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 50e3725..b7d5341 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -199,7 +199,7 @@ static void test_decodeInt(DWORD dwEncod static const BYTE bigInt[] = { 2, 5, 0xff, 0xfe, 0xff, 0xfe, 0xff }; static const BYTE testStr[] = { 0x16, 4, 't', 'e', 's', 't' }; static const BYTE longForm[] = { 2, 0x81, 0x01, 0x01 }; - static const BYTE bigBogus[] = { 0x02, 0x84, 0x01, 0xff, 0xff, 0xf9 }; + /* static const BYTE bigBogus[] = { 0x02, 0x84, 0x01, 0xff, 0xff, 0xf9 }; */ BYTE *buf = NULL; DWORD bufSize = 0; int i; @@ -324,10 +324,12 @@ static void test_decodeInt(DWORD dwEncod /* This will try to decode the buffer and overflow it, check that it's * caught. */ +#if 0 /* a large buffer isn't guaranteed to crash, it depends on memory allocation order */ ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, bigBogus, 0x01ffffff, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); ok(!ret && GetLastError() == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08lx\n", GetLastError()); +#endif } static const BYTE bin18[] = {0x0a,0x01,0x01};

1 0

Roderick Colenbrander : opengl32: Remove unused code.
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 4287bf392b541255cf06e3a355086b2760f47f9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4287bf392b541255cf06e3a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 3 14:08:39 2006 +0200 opengl32: Remove unused code. --- dlls/opengl32/Makefile.in | 3 dlls/opengl32/wgl.c | 164 ----- dlls/opengl32/wgl_ext.c | 1496 --------------------------------------------- dlls/opengl32/wgl_ext.h | 45 - 4 files changed, 2 insertions(+), 1706 deletions(-) delete mode 100644 dlls/opengl32/wgl_ext.c delete mode 100644 dlls/opengl32/wgl_ext.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4287bf392b541255cf0…

1 0

Roderick Colenbrander : winex11.drv: Move WGL extension code to winex11.drv .
by Alexandre Julliard 12 Sep '06

12 Sep '06

Module: wine Branch: master Commit: 12dbce5c938a060721a70411d579b4e6eec2c4a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12dbce5c938a060721a7041… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 11 21:28:32 2006 +0200 winex11.drv: Move WGL extension code to winex11.drv. --- dlls/opengl32/wgl.c | 53 - dlls/winex11.drv/opengl.c | 1555 ++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winex11.drv.spec | 1 include/wine/wgl.h | 180 ++++ 4 files changed, 1705 insertions(+), 84 deletions(-) create mode 100644 include/wine/wgl.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=12dbce5c938a060721a…

1 0