April 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: e04f6be3818e925e654cd2906113cec2cc77bb6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04f6be3818e925e654cd2906… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 9 20:28:22 2007 +0100 crypt32: Constify some variables. --- dlls/crypt32/cert.c | 18 +++++++++--------- dlls/crypt32/crl.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b39c3ca..d20a49f 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -731,7 +731,7 @@ BOOL WINAPI CertCompareCertificateName(DWORD dwCertEncodingType, * insignificant if it's a leading 0 for positive numbers or a leading 0xff * for negative numbers. pInt is assumed to be little-endian. */ -static DWORD CRYPT_significantBytes(PCRYPT_INTEGER_BLOB pInt) +static DWORD CRYPT_significantBytes(const CRYPT_INTEGER_BLOB *pInt) { DWORD ret = pInt->cbData; @@ -1350,7 +1350,7 @@ BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV hCryptProv, static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pubKeyInfo, - PCERT_SIGNED_CONTENT_INFO signedCert) + const CERT_SIGNED_CONTENT_INFO *signedCert) { BOOL ret; HCRYPTKEY key; @@ -1911,7 +1911,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, * pInfo is NULL, from the attributes of hProv. */ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, - PCRYPT_KEY_PROV_INFO pInfo, HCRYPTPROV hProv) + const CRYPT_KEY_PROV_INFO *pInfo, HCRYPTPROV hProv) { CRYPT_KEY_PROV_INFO info = { 0 }; BOOL ret; @@ -1995,7 +1995,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, /* Creates a signed certificate context from the unsigned, encoded certificate * in blob, using the crypto provider hProv and the signature algorithm sigAlgo. */ -static PCCERT_CONTEXT CRYPT_CreateSignedCert(PCRYPT_DER_BLOB blob, +static PCCERT_CONTEXT CRYPT_CreateSignedCert(const CRYPT_DER_BLOB *blob, HCRYPTPROV hProv, PCRYPT_ALGORITHM_IDENTIFIER sigAlgo) { PCCERT_CONTEXT context = NULL; @@ -2050,11 +2050,11 @@ static PCCERT_CONTEXT CRYPT_CreateSignedCert(PCRYPT_DER_BLOB blob, * pubKey: The public key of the certificate. Must not be NULL. * pExtensions: Extensions to be included with the certificate. Optional. */ -static void CRYPT_MakeCertInfo(PCERT_INFO info, PCRYPT_DATA_BLOB pSerialNumber, - PCERT_NAME_BLOB pSubjectIssuerBlob, - PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, PSYSTEMTIME pStartTime, - PSYSTEMTIME pEndTime, PCERT_PUBLIC_KEY_INFO pubKey, - PCERT_EXTENSIONS pExtensions) +static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNumber, + const CERT_NAME_BLOB *pSubjectIssuerBlob, + const CRYPT_ALGORITHM_IDENTIFIER *pSignatureAlgorithm, const SYSTEMTIME *pStartTime, + const SYSTEMTIME *pEndTime, const CERT_PUBLIC_KEY_INFO *pubKey, + const CERT_EXTENSIONS *pExtensions) { static CHAR oid[] = szOID_RSA_SHA1RSA; diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 37677a6..32c4f3a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -473,7 +473,7 @@ BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, return TRUE; } -static PCRL_ENTRY CRYPT_FindCertificateInCRL(PCERT_INFO cert, PCRL_INFO crl) +static PCRL_ENTRY CRYPT_FindCertificateInCRL(PCERT_INFO cert, const CRL_INFO *crl) { DWORD i; PCRL_ENTRY entry = NULL;

1 0

Paul Vriens : advapi32/tests: Make sure NT4 and W2K tests don't fail.
by Alexandre Julliard April 10, 2007

April 10, 2007

Module: wine Branch: master Commit: 1e3b6afa574ca84132ed1d1ad451a6c230784ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3b6afa574ca84132ed1d1ad… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Apr 10 11:29:10 2007 +0200 advapi32/tests: Make sure NT4 and W2K tests don't fail. --- dlls/advapi32/tests/registry.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1d9fab6..0b6a25a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -657,10 +657,22 @@ static void test_reg_delete_key(void) DWORD ret; ret = RegDeleteKey(hkey_main, NULL); - ok(ret == ERROR_INVALID_PARAMETER || - ret == ERROR_ACCESS_DENIED || - ret == ERROR_BADKEY, /* Win95 */ - "ret=%d\n", ret); + + /* There is a bug in NT4 and W2K that doesn't check if the subkey is NULL. If + * there are also no subkeys available it will delete the key pointed to by hkey_main. + * Not re-creating will make some next tests fail. + */ + if (ret == ERROR_SUCCESS) + { + trace("We are probably running on NT4 or W2K as the main key is deleted," + " re-creating the main key\n"); + setup_main_key(); + } + else + ok(ret == ERROR_INVALID_PARAMETER || + ret == ERROR_ACCESS_DENIED || + ret == ERROR_BADKEY, /* Win95 */ + "ret=%d\n", ret); } static void test_reg_save_key(void)

1 0

lostwages/wwn wn20070410_328.xml
by WineHQ April 10, 2007

April 10, 2007

ChangeSet ID: 31040 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/04/10 12:27:04 Modified files: wwn : wn20070410_328.xml Log message: WWN #328: Update section tag with title. Patch: http://cvs.winehq.org/patch.py?id=31040 Old revision New revision Changes Path 1.1 1.2 +6 -6 lostwages/wwn/wn20070410_328.xml Index: lostwages/wwn/wn20070410_328.xml diff -u -p lostwages/wwn/wn20070410_328.xml:1.1 lostwages/wwn/wn20070410_328.xml:1.2 --- lostwages/wwn/wn20070410_328.xml:1.1 10 Apr 2007 17:27: 4 -0000 +++ lostwages/wwn/wn20070410_328.xml 10 Apr 2007 17:27: 4 -0000 @@ -428,15 +428,15 @@ winmm and dsound failing.</quote> </section> <section - title="" - subject="" - archive="http://www.winehq.com/pipermail/wine-devel/2007-February/.html" - posts="" + title="Nautilus File Management" + subject="Wine desktop integration: current directory of app launched with doubleclick?" + archive="http://www.winehq.com/pipermail/wine-devel/2007-April/055728.html" + posts="2" > -<topic></topic> +<topic>Integration</topic> <p>Dan Kegel reported a recent experience using Debian/Ubuntu:</p> <quote who="Dan Kegel"><p> -I *almost* have a great success story to report; the only thing +I <i>almost</i> have a great success story to report; the only thing keeping it from being a success story is the current directory chosen by Nautilus when double-clicking on .exe files. </p><p>

1 0

lostwages/ news/2007041001.xml wwn/wn20070410_ ...
by WineHQ April 10, 2007

April 10, 2007

ChangeSet ID: 31039 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/04/10 11:49:23 Added files: news : 2007041001.xml wwn : wn20070410_328.xml Log message: WWN #328 Patch: http://cvs.winehq.org/patch.py?id=31039 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007041001.xml Added 1.1 +0 -0 lostwages/wwn/wn20070410_328.xml

1 0

Alexandre Julliard : setupapi: Avoid using sizeof in traces.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: aa12152e7b6edfaca2eebb63cdf78716a78b2652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa12152e7b6edfaca2eebb63c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 14:15:34 2007 +0200 setupapi: Avoid using sizeof in traces. --- dlls/setupapi/tests/misc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f679a87..99f4dbb 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -340,8 +340,8 @@ static void test_SetupGetFileCompressionInfoEx(void) ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); - ok(source_size == sizeof(comp_lzx), "got %d, expected %d\n", source_size, sizeof(comp_lzx)); - ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(source_size == sizeof(comp_lzx), "got %d\n", source_size); + ok(target_size == sizeof(uncompressed), "got %d\n", target_size); ok(type == FILE_COMPRESSION_WINLZA, "got %d, expected FILE_COMPRESSION_WINLZA\n", type); DeleteFileA(source); @@ -351,8 +351,8 @@ static void test_SetupGetFileCompressionInfoEx(void) ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); - ok(source_size == sizeof(comp_zip), "got %d, expected %d\n", source_size, sizeof(comp_zip)); - ok(target_size == sizeof(comp_zip), "got %d, expected %d\n", target_size, sizeof(comp_zip)); + ok(source_size == sizeof(comp_zip), "got %d\n", source_size); + ok(target_size == sizeof(comp_zip), "got %d\n", target_size); ok(type == FILE_COMPRESSION_NONE, "got %d, expected FILE_COMPRESSION_NONE\n", type); DeleteFileA(source); @@ -362,8 +362,8 @@ static void test_SetupGetFileCompressionInfoEx(void) ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); - ok(source_size == sizeof(comp_cab_lzx), "got %d, expected %d\n", source_size, sizeof(comp_cab_lzx)); - ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(source_size == sizeof(comp_cab_lzx), "got %d\n", source_size); + ok(target_size == sizeof(uncompressed), "got %d\n", target_size); ok(type == FILE_COMPRESSION_MSZIP, "got %d, expected FILE_COMPRESSION_MSZIP\n", type); DeleteFileA(source); @@ -373,8 +373,8 @@ static void test_SetupGetFileCompressionInfoEx(void) ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); - ok(source_size == sizeof(comp_cab_zip), "got %d, expected %d\n", source_size, sizeof(comp_cab_zip)); - ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(source_size == sizeof(comp_cab_zip), "got %d\n", source_size); + ok(target_size == sizeof(uncompressed), "got %d\n", target_size); ok(type == FILE_COMPRESSION_MSZIP, "got %d, expected FILE_COMPRESSION_MSZIP\n", type); DeleteFileA(source); }

1 0

Detlef Riekenberg : localspl/tests: Remove duplicate tests.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: d770f843c153daff3159a7412afd7541fbfcecfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d770f843c153daff3159a7412… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 6 22:47:23 2007 +0200 localspl/tests: Remove duplicate tests. --- dlls/localspl/tests/localmon.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index af2611e..6f4bd82 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -58,13 +58,6 @@ static BOOL (WINAPI *pXcvOpenPort)(LPCWSTR, ACCESS_MASK, PHANDLE phXcv); static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); -static HMODULE hlocalui; -static PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID); -static PMONITORUI pui; -static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); -static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); -static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); - static HANDLE hXcv; static HANDLE hXcv_noaccess; @@ -975,7 +968,6 @@ START_TEST(localmon) ok(res != 0, "with %u\n", GetLastError()); pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); - pInitializePrintMonitorUI = (void *) GetProcAddress(hdll, "InitializePrintMonitorUI"); if (!pInitializePrintMonitor) { /* The Monitor for "Local Ports" was in a seperate dll before w2k */ @@ -1026,31 +1018,6 @@ START_TEST(localmon) } } - if ((!pInitializePrintMonitorUI) && (hXcv)) { - /* The user interface for "Local Ports" is in a separate dll since w2k */ - BYTE buffer[MAX_PATH]; - DWORD len; - - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, MAX_PATH, &len); - if (res == ERROR_SUCCESS) hlocalui = LoadLibraryW( (LPWSTR) buffer); - if (hlocalui) pInitializePrintMonitorUI = (void *) GetProcAddress(hlocalui, "InitializePrintMonitorUI"); - } - - if (pInitializePrintMonitorUI) { - pui = pInitializePrintMonitorUI(); - if (pui) { - numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *); - ok( numentries == 3, - "dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries); - - if (numentries > 2) { - pAddPortUI = pui->pfnAddPortUI; - pConfigurePortUI = pui->pfnConfigurePortUI; - pDeletePortUI = pui->pfnDeletePortUI; - } - } - } - test_InitializePrintMonitor(); test_AddPort();

1 0

Detlef Riekenberg : localui/tests: Add initial test.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: 62e92795e4d4beeb4d11284bdfbd1cf9daff9717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e92795e4d4beeb4d11284bd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 6 22:33:17 2007 +0200 localui/tests: Add initial test. --- .gitignore | 4 ++ Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/localui/tests/Makefile.in | 13 ++++++ dlls/localui/tests/localui.c | 91 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 119 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6061205..c2709e8 100644 --- a/.gitignore +++ b/.gitignore @@ -282,6 +282,9 @@ dlls/localspl/localspl.res dlls/localspl/tests/*.ok dlls/localspl/tests/localspl_crosstest.exe dlls/localspl/tests/testlist.c +dlls/localui/tests/*.ok +dlls/localui/tests/localui_crosstest.exe +dlls/localui/tests/testlist.c dlls/lz32/liblz32.def dlls/lz32/tests/*.ok dlls/lz32/tests/lz32_crosstest.exe @@ -826,6 +829,7 @@ programs/winetest/iphlpapi_test.exe programs/winetest/itss_test.exe programs/winetest/kernel32_test.exe programs/winetest/localspl_test.exe +programs/winetest/localui_test.exe programs/winetest/lz32_test.exe programs/winetest/mapi32_test.exe programs/winetest/mlang_test.exe diff --git a/Makefile.in b/Makefile.in index 877f215..7fa8ef0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -255,6 +255,7 @@ ALL_MAKEFILES = \ dlls/localspl/Makefile \ dlls/localspl/tests/Makefile \ dlls/localui/Makefile \ + dlls/localui/tests/Makefile \ dlls/lz32/Makefile \ dlls/lz32/tests/Makefile \ dlls/mapi32/Makefile \ @@ -595,6 +596,7 @@ dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rule dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules dlls/localui/Makefile: dlls/localui/Makefile.in dlls/Makedll.rules +dlls/localui/tests/Makefile: dlls/localui/tests/Makefile.in dlls/Maketest.rules dlls/lz32/Makefile: dlls/lz32/Makefile.in dlls/Makedll.rules dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules dlls/mapi32/Makefile: dlls/mapi32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 9cf3cbb..e240093 100755 --- a/configure +++ b/configure @@ -20398,6 +20398,8 @@ ac_config_files="$ac_config_files dlls/localspl/tests/Makefile" ac_config_files="$ac_config_files dlls/localui/Makefile" +ac_config_files="$ac_config_files dlls/localui/tests/Makefile" + ac_config_files="$ac_config_files dlls/lz32/Makefile" ac_config_files="$ac_config_files dlls/lz32/tests/Makefile" @@ -21517,6 +21519,7 @@ do "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; "dlls/localspl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/tests/Makefile" ;; "dlls/localui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/Makefile" ;; + "dlls/localui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/tests/Makefile" ;; "dlls/lz32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/Makefile" ;; "dlls/lz32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/tests/Makefile" ;; "dlls/mapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; diff --git a/configure.ac b/configure.ac index f97fd3a..6d9e2cf 100644 --- a/configure.ac +++ b/configure.ac @@ -1589,6 +1589,7 @@ AC_CONFIG_FILES([dlls/kernel32/tests/Makefile]) AC_CONFIG_FILES([dlls/localspl/Makefile]) AC_CONFIG_FILES([dlls/localspl/tests/Makefile]) AC_CONFIG_FILES([dlls/localui/Makefile]) +AC_CONFIG_FILES([dlls/localui/tests/Makefile]) AC_CONFIG_FILES([dlls/lz32/Makefile]) AC_CONFIG_FILES([dlls/lz32/tests/Makefile]) AC_CONFIG_FILES([dlls/mapi32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index ea5c76c..a0dcea0 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -244,6 +244,7 @@ TESTSUBDIRS = \ itss/tests \ kernel32/tests \ localspl/tests \ + localui/tests \ lz32/tests \ mapi32/tests \ mlang/tests \ diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in new file mode 100644 index 0000000..191a312 --- /dev/null +++ b/dlls/localui/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = localui.dll +IMPORTS = kernel32 + +CTESTS = \ + localui.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c new file mode 100644 index 0000000..e3a1813 --- /dev/null +++ b/dlls/localui/tests/localui.c @@ -0,0 +1,91 @@ +/* + * Unit test suite for the Local Printmonitor User Interface + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winreg.h" + +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/test.h" + + +/* ##### */ + +static HMODULE hdll; +static PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID); +static PMONITORUI pui; +static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); +static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); +static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); + +/* ########################### */ + +static LPCSTR load_functions(void) +{ + LPCSTR ptr; + + ptr = "localui.dll"; + hdll = LoadLibraryA(ptr); + if (!hdll) return ptr; + + ptr = "InitializePrintMonitorUI"; + pInitializePrintMonitorUI = (VOID *) GetProcAddress(hdll, ptr); + if (!pInitializePrintMonitorUI) return ptr; + + return NULL; +} + + +/* ########################### */ + +START_TEST(localui) +{ + LPCSTR ptr; + DWORD numentries; + + + /* localui.dll does not exist before w2k */ + ptr = load_functions(); + if (ptr) { + skip("%s not found\n", ptr); + return; + } + + pui = pInitializePrintMonitorUI(); + if (pui) { + numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *); + ok( numentries == 3, + "dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries); + + if (numentries > 2) { + pAddPortUI = pui->pfnAddPortUI; + pConfigurePortUI = pui->pfnConfigurePortUI; + pDeletePortUI = pui->pfnDeletePortUI; + } + } + +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 056d636..d9e6d22 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -45,6 +45,7 @@ TESTBINS = \ itss_test.exe \ kernel32_test.exe \ localspl_test.exe \ + localui_test.exe \ lz32_test.exe \ mapi32_test.exe \ mlang_test.exe \ @@ -128,6 +129,8 @@ kernel32_test.exe: $(DLLDIR)/kernel32/tests/kernel32_test.exe$(DLLEXT) cp $(DLLDIR)/kernel32/tests/kernel32_test.exe$(DLLEXT) $@ && $(STRIP) $@ localspl_test.exe: $(DLLDIR)/localspl/tests/localspl_test.exe$(DLLEXT) cp $(DLLDIR)/localspl/tests/localspl_test.exe$(DLLEXT) $@ && $(STRIP) $@ +localui_test.exe: $(DLLDIR)/localui/tests/localui_test.exe$(DLLEXT) + cp $(DLLDIR)/localui/tests/localui_test.exe$(DLLEXT) $@ && $(STRIP) $@ lz32_test.exe: $(DLLDIR)/lz32/tests/lz32_test.exe$(DLLEXT) cp $(DLLDIR)/lz32/tests/lz32_test.exe$(DLLEXT) $@ && $(STRIP) $@ mapi32_test.exe: $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 2401ac1..0e62589 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -168,6 +168,7 @@ iphlpapi_test.exe TESTRES "iphlpapi_test.exe" itss_test.exe TESTRES "itss_test.exe" kernel32_test.exe TESTRES "kernel32_test.exe" localspl_test.exe TESTRES "localspl_test.exe" +localui_test.exe TESTRES "localui_test.exe" lz32_test.exe TESTRES "lz32_test.exe" mapi32_test.exe TESTRES "mapi32_test.exe" mlang_test.exe TESTRES "mlang_test.exe"

1 0

Detlef Riekenberg : localui: Add localui.dll with stubs.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: d24bc087833629dfedbbd7255f7349757479f7df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24bc087833629dfedbbd7255… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 6 22:33:01 2007 +0200 localui: Add localui.dll with stubs. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/localui/Makefile.in | 13 ++++ dlls/localui/localui.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ dlls/localui/localui.spec | 1 + 7 files changed, 168 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 63424a9..877f215 100644 --- a/Makefile.in +++ b/Makefile.in @@ -254,6 +254,7 @@ ALL_MAKEFILES = \ dlls/kernel32/tests/Makefile \ dlls/localspl/Makefile \ dlls/localspl/tests/Makefile \ + dlls/localui/Makefile \ dlls/lz32/Makefile \ dlls/lz32/tests/Makefile \ dlls/mapi32/Makefile \ @@ -593,6 +594,7 @@ dlls/kernel32/Makefile: dlls/kernel32/Makefile.in dlls/Makedll.rules dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rules dlls/localspl/Makefile: dlls/localspl/Makefile.in dlls/Makedll.rules dlls/localspl/tests/Makefile: dlls/localspl/tests/Makefile.in dlls/Maketest.rules +dlls/localui/Makefile: dlls/localui/Makefile.in dlls/Makedll.rules dlls/lz32/Makefile: dlls/lz32/Makefile.in dlls/Makedll.rules dlls/lz32/tests/Makefile: dlls/lz32/tests/Makefile.in dlls/Maketest.rules dlls/mapi32/Makefile: dlls/mapi32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 9c83ac7..9cf3cbb 100755 --- a/configure +++ b/configure @@ -20396,6 +20396,8 @@ ac_config_files="$ac_config_files dlls/localspl/Makefile" ac_config_files="$ac_config_files dlls/localspl/tests/Makefile" +ac_config_files="$ac_config_files dlls/localui/Makefile" + ac_config_files="$ac_config_files dlls/lz32/Makefile" ac_config_files="$ac_config_files dlls/lz32/tests/Makefile" @@ -21514,6 +21516,7 @@ do "dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;; "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; "dlls/localspl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/tests/Makefile" ;; + "dlls/localui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/Makefile" ;; "dlls/lz32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/Makefile" ;; "dlls/lz32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/lz32/tests/Makefile" ;; "dlls/mapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 921fdcf..f97fd3a 100644 --- a/configure.ac +++ b/configure.ac @@ -1588,6 +1588,7 @@ AC_CONFIG_FILES([dlls/kernel32/Makefile]) AC_CONFIG_FILES([dlls/kernel32/tests/Makefile]) AC_CONFIG_FILES([dlls/localspl/Makefile]) AC_CONFIG_FILES([dlls/localspl/tests/Makefile]) +AC_CONFIG_FILES([dlls/localui/Makefile]) AC_CONFIG_FILES([dlls/lz32/Makefile]) AC_CONFIG_FILES([dlls/lz32/tests/Makefile]) AC_CONFIG_FILES([dlls/mapi32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0675a9c..ea5c76c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -87,6 +87,7 @@ BASEDIRS = \ itss \ kernel32 \ localspl \ + localui \ lz32 \ mapi32 \ mciavi32 \ diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in new file mode 100644 index 0000000..7505c15 --- /dev/null +++ b/dlls/localui/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = localui.dll +IMPORTS = kernel32 + +C_SRCS = \ + localui.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c new file mode 100644 index 0000000..ae512e0 --- /dev/null +++ b/dlls/localui/localui.c @@ -0,0 +1,147 @@ +/* + * Implementation of the Local Printmonitor User Interface + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" + +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(localui); + +static HINSTANCE LOCALUI_hInstance; + +/***************************************************** + * localui_AddPortUI [exported through MONITORUI] + * + * Display a Dialog to add a local Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box or NULL + * pMonitorName[I] Name of the Monitor, that should be used to add a Port or NULL + * ppPortName [O] PTR to PTR of a buffer, that receive the Name of the new Port or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorName, PWSTR *ppPortName) +{ + FIXME("(%s, %p, %s, %p) stub\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName), ppPortName); + return TRUE; +} + + +/***************************************************** + * localui_ConfigurePortUI [exported through MONITORUI] + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box or NULL + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) +{ + FIXME("(%s, %p, %s) stub\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + return TRUE; +} + +/***************************************************** + * localui_DeletePortUI [exported through MONITORUI] + * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) +{ + FIXME("(%s, %p, %s) stub\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + return TRUE; +} + +/***************************************************** + * InitializePrintMonitorUI (LOCALUI.@) + * + * Initialize the User-Interface for the Local Ports + * + * RETURNS + * Success: Pointer to a MONITORUI Structure + * Failure: NULL + * + */ + +PMONITORUI WINAPI InitializePrintMonitorUI(void) +{ + static MONITORUI mymonitorui = + { + sizeof(MONITORUI), + localui_AddPortUI, + localui_ConfigurePortUI, + localui_DeletePortUI + }; + + TRACE("=> %p\n", &mymonitorui); + return &mymonitorui; +} + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + LOCALUI_hInstance = hinstDLL; + break; + } + return TRUE; +} diff --git a/dlls/localui/localui.spec b/dlls/localui/localui.spec new file mode 100644 index 0000000..dafed22 --- /dev/null +++ b/dlls/localui/localui.spec @@ -0,0 +1 @@ +@ stdcall InitializePrintMonitorUI()

1 0

Hans Leidekker : setupapi: Remove debug traces from allocation routines.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: c26a816f199a27dec5fa2b18c97c155933f5fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26a816f199a27dec5fa2b18c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 8 13:19:31 2007 +0200 setupapi: Remove debug traces from allocation routines. --- dlls/setupapi/misc.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index dcc76bf..e77bf87 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -51,7 +51,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); */ VOID WINAPI MyFree(LPVOID lpMem) { - TRACE("%p\n", lpMem); HeapFree(GetProcessHeap(), 0, lpMem); } @@ -70,7 +69,6 @@ VOID WINAPI MyFree(LPVOID lpMem) */ LPVOID WINAPI MyMalloc(DWORD dwSize) { - TRACE("%u\n", dwSize); return HeapAlloc(GetProcessHeap(), 0, dwSize); } @@ -95,8 +93,6 @@ LPVOID WINAPI MyMalloc(DWORD dwSize) */ LPVOID WINAPI MyRealloc(LPVOID lpSrc, DWORD dwSize) { - TRACE("%p %u\n", lpSrc, dwSize); - if (lpSrc == NULL) return HeapAlloc(GetProcessHeap(), 0, dwSize); @@ -123,8 +119,6 @@ LPWSTR WINAPI DuplicateString(LPCWSTR lpSrc) { LPWSTR lpDst; - TRACE("%s\n", debugstr_w(lpSrc)); - lpDst = MyMalloc((lstrlenW(lpSrc) + 1) * sizeof(WCHAR)); if (lpDst == NULL) return NULL; @@ -285,8 +279,6 @@ LPWSTR WINAPI MultiByteToUnicode(LPCSTR lpMultiByteStr, UINT uCodePage) LPWSTR lpUnicodeStr; int nLength; - TRACE("%s %d\n", debugstr_a(lpMultiByteStr), uCodePage); - nLength = MultiByteToWideChar(uCodePage, 0, lpMultiByteStr, -1, NULL, 0); if (nLength == 0) @@ -328,8 +320,6 @@ LPSTR WINAPI UnicodeToMultiByte(LPCWSTR lpUnicodeStr, UINT uCodePage) LPSTR lpMultiByteStr; int nLength; - TRACE("%s %d\n", debugstr_w(lpUnicodeStr), uCodePage); - nLength = WideCharToMultiByte(uCodePage, 0, lpUnicodeStr, -1, NULL, 0, NULL, NULL); if (nLength == 0)

1 0

Hans Leidekker : setupapi: Add tests for SetupDecompressOrCopyFile.
by Alexandre Julliard April 9, 2007

April 9, 2007

Module: wine Branch: master Commit: 9970ccb9a51983219a2f7583fc80ad5628bc6dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9970ccb9a51983219a2f7583f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 8 13:19:22 2007 +0200 setupapi: Add tests for SetupDecompressOrCopyFile. --- dlls/setupapi/tests/misc.c | 121 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 2c5c0f3..f679a87 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -258,6 +258,25 @@ static void create_source_file(LPSTR filename, const BYTE *data, DWORD size) CloseHandle(handle); } +static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size) +{ + DWORD read; + HANDLE handle; + BOOL ret = FALSE; + LPBYTE buffer; + + handle = CreateFileA(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer) + { + ReadFile(handle, buffer, size, &read, NULL); + if (read == size && !memcmp(data, buffer, size)) ret = TRUE; + HeapFree(GetProcessHeap(), 0, buffer); + } + CloseHandle(handle); + return ret; +} + static const BYTE uncompressed[] = { 'u','n','c','o','m','p','r','e','s','s','e','d','\r','\n' }; @@ -360,10 +379,112 @@ static void test_SetupGetFileCompressionInfoEx(void) DeleteFileA(source); } +static void test_SetupDecompressOrCopyFile(void) +{ + DWORD ret; + char source[MAX_PATH], target[MAX_PATH], temp[MAX_PATH], *p; + UINT type; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "doc", 0, source); + GetTempFileNameA(temp, "doc", 0, target); + + /* parameter tests */ + + create_source_file(source, uncompressed, sizeof(uncompressed)); + + ret = SetupDecompressOrCopyFileA(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n"); + + type = FILE_COMPRESSION_NONE; + ret = SetupDecompressOrCopyFileA(NULL, target, &type); + ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n"); + + ret = SetupDecompressOrCopyFileA(source, NULL, &type); + ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n"); + + type = 5; /* try an invalid compression type */ + ret = SetupDecompressOrCopyFileA(source, target, &type); + ok(ret == ERROR_INVALID_PARAMETER, "SetupDecompressOrCopyFile failed unexpectedly\n"); + + DeleteFileA(target); + + /* no compression tests */ + + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, uncompressed, sizeof(uncompressed)), "incorrect target file\n"); + + /* try overwriting existing file */ + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + DeleteFileA(target); + + type = FILE_COMPRESSION_NONE; + ret = SetupDecompressOrCopyFileA(source, target, &type); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, uncompressed, sizeof(uncompressed)), "incorrect target file\n"); + DeleteFileA(target); + + type = FILE_COMPRESSION_WINLZA; + ret = SetupDecompressOrCopyFileA(source, target, &type); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, uncompressed, sizeof(uncompressed)), "incorrect target file\n"); + DeleteFileA(target); + + /* lz compression tests */ + + create_source_file(source, comp_lzx, sizeof(comp_lzx)); + + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + DeleteFileA(target); + + /* zip compression tests */ + + create_source_file(source, comp_zip, sizeof(comp_zip)); + + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, comp_zip, sizeof(comp_zip)), "incorrect target file\n"); + DeleteFileA(target); + + /* cabinet compression tests */ + + create_source_file(source, comp_cab_zip, sizeof(comp_cab_zip)); + + p = strrchr(target, '\\'); + lstrcpyA(p + 1, "wine"); + + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, uncompressed, sizeof(uncompressed)), "incorrect target file\n"); + + /* try overwriting existing file */ + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + + /* try zip compression */ + type = FILE_COMPRESSION_MSZIP; + ret = SetupDecompressOrCopyFileA(source, target, &type); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, uncompressed, sizeof(uncompressed)), "incorrect target file\n"); + + /* try no compression */ + type = FILE_COMPRESSION_NONE; + ret = SetupDecompressOrCopyFileA(source, target, &type); + ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); + ok(compare_file_data(target, comp_cab_zip, sizeof(comp_cab_zip)), "incorrect target file\n"); + + DeleteFileA(target); + DeleteFileA(source); +} + START_TEST(misc) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_SetupCopyOEMInf(); test_SetupGetFileCompressionInfoEx(); + test_SetupDecompressOrCopyFile(); }

1 0