June 2010 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 88a016184dcd6a88bfdf046da971fcaf7a8efce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a016184dcd6a88bfdf046da… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jun 15 11:54:23 2010 -0700 crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore. --- dlls/crypt32/store.c | 33 +++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 3 --- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index dc18786..df12e3e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -724,6 +724,34 @@ static PWINECRYPT_CERTSTORE CRYPT_PKCSOpenStore(HCRYPTPROV hCryptProv, return store; } +static PWINECRYPT_CERTSTORE CRYPT_SerializedOpenStore(HCRYPTPROV hCryptProv, + DWORD dwFlags, const void *pvPara) +{ + HCERTSTORE store; + const CRYPT_DATA_BLOB *data = pvPara; + + TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara); + + if (dwFlags & CERT_STORE_DELETE_FLAG) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; + } + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (store) + { + if (!CRYPT_ReadSerializedStoreFromBlob(data, store)) + { + CertCloseStore(store, 0); + store = NULL; + } + } + TRACE("returning %p\n", store); + return (PWINECRYPT_CERTSTORE)store; +} + static PWINECRYPT_CERTSTORE CRYPT_PhysOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -761,6 +789,9 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, case LOWORD(CERT_STORE_PROV_PKCS7): openFunc = CRYPT_PKCSOpenStore; break; + case LOWORD(CERT_STORE_PROV_SERIALIZED): + openFunc = CRYPT_SerializedOpenStore; + break; case LOWORD(CERT_STORE_PROV_REG): openFunc = CRYPT_RegOpenStore; break; @@ -801,6 +832,8 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, openFunc = CRYPT_SysOpenStoreW; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_PKCS7)) openFunc = CRYPT_PKCSOpenStore; + else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SERIALIZED)) + openFunc = CRYPT_SerializedOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION)) openFunc = CRYPT_CollectionOpenStore; else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY)) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 652eac9..3d55935 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1780,11 +1780,9 @@ static void testSerializedStore(void) blob.pbData = (BYTE *)serializedStoreWithCert; store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, CERT_STORE_DELETE_FLAG, &blob); - todo_wine ok(!store && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "Expected ERROR_CALL_NOT_IMPLEMENTED, got %08x\n", GetLastError()); store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) { @@ -1806,7 +1804,6 @@ static void testSerializedStore(void) blob.cbData = sizeof(serializedStoreWithCertAndCRL); blob.pbData = (BYTE *)serializedStoreWithCertAndCRL; store = CertOpenStore(CERT_STORE_PROV_SERIALIZED, 0, 0, 0, &blob); - todo_wine ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (store) {

1 0

Detlef Riekenberg : winspool/tests: Test GetPrinterData/ Ex for the print spooler.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: fa69a8b1b2be8feb6a60e5ca3e6165822e8b0942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa69a8b1b2be8feb6a60e5ca3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 15 17:25:17 2010 +0200 winspool/tests: Test GetPrinterData/Ex for the print spooler. --- dlls/winspool.drv/tests/info.c | 146 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 139 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 1b552fe..be7be7d 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -38,6 +38,7 @@ #define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 +static CHAR defaultspooldirectory[] = "DefaultSpoolDirectory"; static CHAR does_not_exist_dll[]= "does_not_exist.dll"; static CHAR does_not_exist[] = "does_not_exist"; static CHAR empty[] = ""; @@ -66,13 +67,14 @@ static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; static HANDLE hwinspool; -static BOOL (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD); -static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); -static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); +static BOOL (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); +static BOOL (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD); +static DWORD (WINAPI * pGetPrinterDataExA)(HANDLE, LPCSTR, LPCSTR, LPDWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); -static BOOL (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); +static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); +static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); /* ################################ */ @@ -2329,6 +2331,133 @@ static void test_GetPrinter(void) /* ########################### */ +static void test_GetPrinterData(void) +{ + HANDLE hprn = 0; + DWORD res; + DWORD type; + CHAR buffer[MAX_PATH + 1]; + DWORD needed; + DWORD len; + + /* ToDo: test parameter validation, test with the default printer */ + + SetLastError(0xdeadbeef); + res = OpenPrinter(NULL, &hprn, NULL); + if (!res) + { + /* printserver not available on win9x */ + if (!on_win9x) + win_skip("Unable to open the printserver: %d\n", GetLastError()); + return; + } + + memset(buffer, '#', sizeof(buffer)); + buffer[MAX_PATH] = 0; + type = 0xdeadbeef; + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = GetPrinterDataA(hprn, defaultspooldirectory, &type, (LPBYTE) buffer, sizeof(buffer), &needed); + + len = lstrlenA(buffer) + sizeof(CHAR); + /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ + ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", + res, type, needed, buffer, len, len * sizeof(WCHAR)); + /* ToDo: test SPLREG_* */ + + SetLastError(0xdeadbeef); + res = ClosePrinter(hprn); + ok(res, "ClosePrinter error %d\n", GetLastError()); +} + +/* ########################### */ + +static void test_GetPrinterDataEx(void) +{ + HANDLE hprn = 0; + DWORD res; + DWORD type; + CHAR buffer[MAX_PATH + 1]; + DWORD needed; + DWORD len; + + /* not present before w2k */ + if (!pGetPrinterDataExA) { + win_skip("GetPrinterDataEx not found\n"); + return; + } + + /* ToDo: test parameter validation, test with the default printer */ + + SetLastError(0xdeadbeef); + res = OpenPrinter(NULL, &hprn, NULL); + if (!res) + { + win_skip("Unable to open the printserver: %d\n", GetLastError()); + return; + } + + /* keyname is ignored, when hprn is a HANDLE for a printserver */ + memset(buffer, '#', sizeof(buffer)); + buffer[MAX_PATH] = 0; + type = 0xdeadbeef; + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, &type, + (LPBYTE) buffer, sizeof(buffer), &needed); + + len = lstrlenA(buffer) + sizeof(CHAR); + /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ + ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", + res, type, needed, buffer, len, len * sizeof(WCHAR)); + + memset(buffer, '#', sizeof(buffer)); + buffer[MAX_PATH] = 0; + type = 0xdeadbeef; + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetPrinterDataExA(hprn, "", defaultspooldirectory, &type, + (LPBYTE) buffer, sizeof(buffer), &needed); + len = lstrlenA(buffer) + sizeof(CHAR); + ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", + res, type, needed, buffer, len, len * sizeof(WCHAR)); + + memset(buffer, '#', sizeof(buffer)); + buffer[MAX_PATH] = 0; + type = 0xdeadbeef; + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + /* Wine uses GetPrinterDataEx with "PrinterDriverData" to implement GetPrinterData */ + res = pGetPrinterDataExA(hprn, "PrinterDriverData", defaultspooldirectory, + &type, (LPBYTE) buffer, sizeof(buffer), &needed); + len = lstrlenA(buffer) + sizeof(CHAR); + ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", + res, type, needed, buffer, len, len * sizeof(WCHAR)); + + + memset(buffer, '#', sizeof(buffer)); + buffer[MAX_PATH] = 0; + type = 0xdeadbeef; + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetPrinterDataExA(hprn, does_not_exist, defaultspooldirectory, &type, + (LPBYTE) buffer, sizeof(buffer), &needed); + len = lstrlenA(buffer) + sizeof(CHAR); + ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", + res, type, needed, buffer, len, len * sizeof(WCHAR)); + + SetLastError(0xdeadbeef); + res = ClosePrinter(hprn); + ok(res, "ClosePrinter error %d\n", GetLastError()); +} + +/* ########################### */ + static void test_GetPrinterDriver(void) { HANDLE hprn; @@ -2691,13 +2820,14 @@ static void test_DeviceCapabilities(void) START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); + pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); + pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); - pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); + pGetPrinterDataExA = (void *) GetProcAddress(hwinspool, "GetPrinterDataExA"); pGetPrinterDriverW = (void *) GetProcAddress(hwinspool, "GetPrinterDriverW"); - pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW"); pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); + pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); - pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); on_win9x = check_win9x(); if (on_win9x) @@ -2727,6 +2857,8 @@ START_TEST(info) test_GetPrintProcessorDirectory(); test_OpenPrinter(); test_GetPrinter(); + test_GetPrinterData(); + test_GetPrinterDataEx(); test_GetPrinterDriver(); test_SetDefaultPrinter(); test_XcvDataW_MonitorUI();

1 0

Marcus Meissner : atl: Also handle struct sizes for 64bit.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: b3f042558035c2f98714d833ed3bae66fd608a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f042558035c2f98714d833e… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jun 15 11:04:33 2010 +0200 atl: Also handle struct sizes for 64bit. --- configure | 1 + configure.ac | 1 + dlls/atl/atl_main.c | 13 ++++- dlls/atl/tests/Makefile.in | 11 +++++ dlls/atl/tests/module.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 5e20b93..a01d5f6 100755 --- a/configure +++ b/configure @@ -14288,6 +14288,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl wine_fn_config_dll atl enable_atl atl +wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 avicap32 wine_fn_config_dll avifil32 enable_avifil32 avifil32 diff --git a/configure.ac b/configure.ac index eed1487..61f376e 100644 --- a/configure.ac +++ b/configure.ac @@ -2224,6 +2224,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(appwiz.cpl) WINE_CONFIG_DLL(atl,,[atl]) +WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[avicap32]) WINE_CONFIG_DLL(avifil32,,[avifil32]) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index fedfc1a..ea8be78 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -53,7 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -#define ATLVer1Size 100 +#define ATLVer1Size FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer) HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE h) { @@ -63,9 +63,16 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULEW* pM, _ATL_OBJMAP_ENTRYW* p, HINSTANCE FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); size = pM->cbSize; - if (size != sizeof(_ATL_MODULEW) && size != ATLVer1Size) + switch (size) { - FIXME("Unknown structure version (size %i)\n",size); + case ATLVer1Size: + case sizeof(_ATL_MODULEW): +#ifdef _WIN64 + case sizeof(_ATL_MODULEW) + sizeof(void *): +#endif + break; + default: + WARN("Unknown structure version (size %i)\n",size); return E_INVALIDARG; } diff --git a/dlls/atl/tests/Makefile.in b/dlls/atl/tests/Makefile.in new file mode 100644 index 0000000..b9752d4 --- /dev/null +++ b/dlls/atl/tests/Makefile.in @@ -0,0 +1,11 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = atl.dll +IMPORTS = atl oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32 + +C_SRCS = \ + module.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c new file mode 100644 index 0000000..294d87b --- /dev/null +++ b/dlls/atl/tests/module.c @@ -0,0 +1,104 @@ +/* + * ATL test program + * + * Copyright 2010 Marcus Meissner + * + * + * 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 <stdio.h> + +#define COBJMACROS + +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <winnls.h> +#include <winerror.h> +#include <winnt.h> +#include <initguid.h> +#include <wtypes.h> +#include <olectl.h> +#include <ocidl.h> + +struct _ATL_OBJMAP_ENTRYW; +struct _AtlCreateWndData; +struct _ATL_TERMFUNC_ELEM; + +struct _ATL_MODULEW +{ + UINT cbSize; + HINSTANCE m_hInst; + HINSTANCE m_hInstResource; + HINSTANCE m_hInstTypeLib; + struct _ATL_OBJMAP_ENTRYW* m_pObjMap; + LONG m_nLockCnt; + HANDLE m_hHeap; + union + { + CRITICAL_SECTION m_csTypeInfoHolder; + CRITICAL_SECTION m_csStaticDataInit; + } u; + CRITICAL_SECTION m_csWindowCreate; + CRITICAL_SECTION m_csObjMap; + + DWORD dwAtlBuildVer; + struct _AtlCreateWndData* m_pCreateWndList; + BOOL m_bDestroyHeap; + GUID* pguidVer; + DWORD m_dwHeaps; + HANDLE* m_phHeaps; + int m_nHeap; + struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; +}; + +HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); + +#define MAXSIZE 512 +static void test_StructSize(void) +{ + struct _ATL_MODULEW *tst; + HRESULT hres; + int i; + + tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); + + switch (i) { + case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): + case sizeof(struct _ATL_MODULEW): +#ifdef _WIN64 + case sizeof(struct _ATL_MODULEW) + sizeof(void *): +#endif + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } +} + +START_TEST(module) +{ + test_StructSize(); +}

1 0

Detlef Riekenberg : winspool: Support the spooler in GetPrinterData.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: ce51d9d0c966c542851940a11c415a085ea436d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce51d9d0c966c542851940a11… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 15 17:25:16 2010 +0200 winspool: Support the spooler in GetPrinterData. --- dlls/winspool.drv/info.c | 78 ++++++++++++++++++++++++++++++--------------- tools/wine.inf.in | 1 + 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4993a78..3f97ebd 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5354,27 +5354,40 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPCSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { - HKEY hkeyPrinter, hkeySubkey; + opened_printer_t *printer; + HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; - TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter, - debugstr_a(pKeyName), debugstr_a(pValueName), pType, pData, nSize, - pcbNeeded); + TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName), + debugstr_a(pValueName), pType, pData, nSize, pcbNeeded); - if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter)) - != ERROR_SUCCESS) - return ret; + printer = get_opened_printer(hPrinter); + if(!printer) return ERROR_INVALID_HANDLE; - if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) - != ERROR_SUCCESS) { - WARN("Can't open subkey %s\n", debugstr_a(pKeyName)); - RegCloseKey(hkeyPrinter); - return ret; + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + if (ret) return ret; + + if (printer->name) { + + ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); + if (ret) { + RegCloseKey(hkeyPrinters); + return ret; + } + if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { + WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret); + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + return ret; + } } *pcbNeeded = nSize; - ret = RegQueryValueExA(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded); + ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName, + 0, pType, pData, pcbNeeded); + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); return ret; } @@ -5385,27 +5398,40 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { - HKEY hkeyPrinter, hkeySubkey; + opened_printer_t *printer; + HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; - TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter, - debugstr_w(pKeyName), debugstr_w(pValueName), pType, pData, nSize, - pcbNeeded); + TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName), + debugstr_w(pValueName), pType, pData, nSize, pcbNeeded); - if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter)) - != ERROR_SUCCESS) - return ret; + printer = get_opened_printer(hPrinter); + if(!printer) return ERROR_INVALID_HANDLE; - if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) - != ERROR_SUCCESS) { - WARN("Can't open subkey %s\n", debugstr_w(pKeyName)); - RegCloseKey(hkeyPrinter); - return ret; + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + if (ret) return ret; + + if (printer->name) { + + ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); + if (ret) { + RegCloseKey(hkeyPrinters); + return ret; + } + if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { + WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret); + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + return ret; + } } *pcbNeeded = nSize; - ret = RegQueryValueExW(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded); + ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName, + 0, pType, pData, pcbNeeded); + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); return ret; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b8f4a82..63a78d2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -1009,6 +1009,7 @@ HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" [Printing] HKLM,%Control%\Print\Monitors\Local Port,"Driver",2,"localspl.dll" +HKLM,%Control%\Print\Printers,"DefaultSpoolDirectory",2,"%11%\spool\printers" HKLM,%CurrentVersionNT%\Ports,"FILE:",,"" HKLM,%CurrentVersionNT%\Ports,"LPT1:",,"" HKLM,%CurrentVersionNT%\Ports,"LPT2:",,""

1 0

Alexandre Julliard : winedevice: Fix up protections before writing to the NT header.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: fe1360252fea60fc0b0fe55635e53aaaf793de99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1360252fea60fc0b0fe5563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 14:29:25 2010 +0200 winedevice: Fix up protections before writing to the NT header. --- programs/winedevice/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index bd65654..e0cd07b 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -100,7 +100,10 @@ static HMODULE load_driver_module( const WCHAR *name ) if (!rel) goto error; } /* make sure we don't try again */ + size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; + VirtualProtect( nt, size, PAGE_READWRITE, &old ); nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; + VirtualProtect( nt, size, old, NULL ); } }

1 0

Rico Schüller : wined3d: Improve fglrx glsl spam filter.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: c223e73bbb6dad17123f5bb5fd3f3c34c9bb282d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223e73bbb6dad17123f5bb5f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jun 15 17:20:39 2010 +0200 wined3d: Improve fglrx glsl spam filter. --- dlls/wined3d/glsl_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba16eae..9781a4b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -203,10 +203,13 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx, with \n */ "Fragment shader was successfully compiled to run on hardware.", /* fglrx, no \n */ "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, vertex shader(s) linked. \n", /* fglrx, with \n */ "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ + "Vertex shader(s) linked, no fragment shader(s) defined. \n", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, no vertex shader(s) defined. \n", /* fglrx, with \n */ "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ };

1 0

Alexandre Julliard : include: Define the SPLREG winspool string constants.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: 44fedb5404d24d9771222b460ecae12bc883fb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fedb5404d24d9771222b460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 17:25:56 2010 +0200 include: Define the SPLREG winspool string constants. --- include/winspool.h | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 292 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44fedb5404d24d9771222…

1 0

Nikolay Sivov : winhlp32: Added missed Russian resource.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: 5c5b9a69334117c369c8f7e6759f426e8e4145ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5b9a69334117c369c8f7e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 14 23:54:50 2010 +0400 winhlp32: Added missed Russian resource. --- programs/winhlp32/Ru.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index 165094f..e1a7d25 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -80,6 +80,14 @@ CAPTION "Указатель" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Поиск" +{ + LTEXT "Не реализовано", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE {

1 0

André Hentschel : propsys: Mention that the functions are stubs.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: 164369736521bc6c2c9e5ea762a0c77b48465757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164369736521bc6c2c9e5ea76… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 14 21:26:39 2010 +0200 propsys: Mention that the functions are stubs. --- dlls/propsys/propsys_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index d2b1744..cdda06d 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { - FIXME("%s\n", debugstr_w(path)); + FIXME("%s stub\n", debugstr_w(path)); return S_OK; } HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) { - FIXME("%s\n", debugstr_w(path)); + FIXME("%s stub\n", debugstr_w(path)); return E_NOTIMPL; }

1 0

Sven Baars : oleacc: Fix Dutch translation.
by Alexandre Julliard June 15, 2010

June 15, 2010

Module: wine Branch: master Commit: ec25a446cd45de6be6deffa95b04973fe217e4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec25a446cd45de6be6deffa95… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 15 17:40:05 2010 +0200 oleacc: Fix Dutch translation. --- dlls/oleacc/oleacc_Nl.rc | 66 +++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc index 47daa1f..8c9552b 100644 --- a/dlls/oleacc/oleacc_Nl.rc +++ b/dlls/oleacc/oleacc_Nl.rc @@ -25,44 +25,44 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { 0 "onbekend object" /* undocumented */ - ROLE_SYSTEM_TITLEBAR "titel balk" - ROLE_SYSTEM_MENUBAR "menu balk" - ROLE_SYSTEM_SCROLLBAR "scroll balk" + ROLE_SYSTEM_TITLEBAR "titelbalk" + ROLE_SYSTEM_MENUBAR "menubalk" + ROLE_SYSTEM_SCROLLBAR "scrollbalk" ROLE_SYSTEM_GRIP "handvat" ROLE_SYSTEM_SOUND "geluid" ROLE_SYSTEM_CURSOR "cursor" - ROLE_SYSTEM_CARET "tekst cursor" - ROLE_SYSTEM_ALERT "alarm" + ROLE_SYSTEM_CARET "tekstcursor" + ROLE_SYSTEM_ALERT "waarschuwing" ROLE_SYSTEM_WINDOW "venster" ROLE_SYSTEM_CLIENT "client" - ROLE_SYSTEM_MENUPOPUP "popup menu" - ROLE_SYSTEM_MENUITEM "menu item" - ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_MENUPOPUP "popupmenu" + ROLE_SYSTEM_MENUITEM "menu-item" + ROLE_SYSTEM_TOOLTIP "tooltip" ROLE_SYSTEM_APPLICATION "programma" ROLE_SYSTEM_DOCUMENT "document" ROLE_SYSTEM_PANE "sectie" ROLE_SYSTEM_CHART "diagram" - ROLE_SYSTEM_DIALOG "keuze" - ROLE_SYSTEM_BORDER "randen" + ROLE_SYSTEM_DIALOG "dialoog" + ROLE_SYSTEM_BORDER "rand" ROLE_SYSTEM_GROUPING "groepering" - ROLE_SYSTEM_SEPARATOR "separator" - ROLE_SYSTEM_TOOLBAR "knoppen balk" - ROLE_SYSTEM_STATUSBAR "status balk" + ROLE_SYSTEM_SEPARATOR "scheidingsteken" + ROLE_SYSTEM_TOOLBAR "gereedschapsbalk" + ROLE_SYSTEM_STATUSBAR "statusbalk" ROLE_SYSTEM_TABLE "tabel" - ROLE_SYSTEM_COLUMNHEADER "kolom hoofd" - ROLE_SYSTEM_ROWHEADER "rij hoofd" + ROLE_SYSTEM_COLUMNHEADER "kolomtitel" + ROLE_SYSTEM_ROWHEADER "rij-titel" ROLE_SYSTEM_COLUMN "kolom" ROLE_SYSTEM_ROW "rij" ROLE_SYSTEM_CELL "cel" ROLE_SYSTEM_LINK "link" - ROLE_SYSTEM_HELPBALLOON "help ballon" + ROLE_SYSTEM_HELPBALLOON "help-ballon" ROLE_SYSTEM_CHARACTER "karakter" ROLE_SYSTEM_LIST "lijst" - ROLE_SYSTEM_LISTITEM "lijst onderdeel" - ROLE_SYSTEM_OUTLINE "outline" - ROLE_SYSTEM_OUTLINEITEM "outline onderdeel" - ROLE_SYSTEM_PAGETAB "pagina tab" - ROLE_SYSTEM_PROPERTYPAGE "eigenschappen pagina" + ROLE_SYSTEM_LISTITEM "lijstonderdeel" + ROLE_SYSTEM_OUTLINE "omtrek" + ROLE_SYSTEM_OUTLINEITEM "omtrekonderdeel" + ROLE_SYSTEM_PAGETAB "paginatab" + ROLE_SYSTEM_PROPERTYPAGE "eigenschap-pagina" ROLE_SYSTEM_INDICATOR "indicator" ROLE_SYSTEM_GRAPHIC "grafisch" ROLE_SYSTEM_STATICTEXT "vaste tekst" @@ -70,23 +70,23 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_PUSHBUTTON "drukknop" ROLE_SYSTEM_CHECKBUTTON "aankruisvakje" ROLE_SYSTEM_RADIOBUTTON "radioknop" - ROLE_SYSTEM_COMBOBOX "combo box" - ROLE_SYSTEM_DROPLIST "selectie box" + ROLE_SYSTEM_COMBOBOX "combinatievak" + ROLE_SYSTEM_DROPLIST "selectievak" ROLE_SYSTEM_PROGRESSBAR "voortgangsbalk" - ROLE_SYSTEM_DIAL "draaiknop" - ROLE_SYSTEM_HOTKEYFIELD "hotkey veld" + ROLE_SYSTEM_DIAL "bellen" + ROLE_SYSTEM_HOTKEYFIELD "sneltoetsveld" ROLE_SYSTEM_SLIDER "schuifknop" - ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_SPINBUTTON "draaischijf" ROLE_SYSTEM_DIAGRAM "diagram" ROLE_SYSTEM_ANIMATION "animatie" ROLE_SYSTEM_EQUATION "formule" - ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop" - ROLE_SYSTEM_BUTTONMENU "menu knop" - ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop" + ROLE_SYSTEM_BUTTONDROPDOWN "dropdownknop" + ROLE_SYSTEM_BUTTONMENU "menuknop" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid dropdownknop" ROLE_SYSTEM_WHITESPACE "lege ruimte" - ROLE_SYSTEM_PAGETABLIST "pagina tab lijst" + ROLE_SYSTEM_PAGETABLIST "paginatablijst" ROLE_SYSTEM_CLOCK "klok" - ROLE_SYSTEM_SPLITBUTTON "splits knop" - ROLE_SYSTEM_IPADDRESS "IP adres" - ROLE_SYSTEM_OUTLINEBUTTON "outline knop" + ROLE_SYSTEM_SPLITBUTTON "splitsknop" + ROLE_SYSTEM_IPADDRESS "IP-adres" + ROLE_SYSTEM_OUTLINEBUTTON "omtrekknop" }

1 0