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

Juan Lang : crypt32: Add support for CERT_STORE_PROV_SERIALIZED to CertOpenStore.
by Alexandre Julliard 16 Jun '10

16 Jun '10

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 15 Jun '10

15 Jun '10

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 15 Jun '10

15 Jun '10

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

Alexandre Julliard : include: Define the SPLREG winspool string constants.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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 15 Jun '10

15 Jun '10

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

Damjan Jovanovic : kernel32: Add a CopyFile test.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 6e5a22c733282a767c0d306d82b88de9520431bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5a22c733282a767c0d306d8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 15 07:22:43 2010 +0200 kernel32: Add a CopyFile test. --- dlls/kernel32/tests/file.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 550fc95..7e6b3de 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -640,7 +640,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(retok, - "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying from a delete-locked source is unreliable */ @@ -648,7 +648,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */, - "copying from a delete-locked file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying from a delete-locked file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a write-locked destination fails */ @@ -656,7 +656,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, - "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a r+w opened, w shared destination mostly succeeds */ @@ -664,7 +664,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */, - "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a delete-locked destination fails, even when the destination is delete-shared */ @@ -675,10 +675,18 @@ static void test_CopyFileA(void) { retok = CopyFileA(source, dest, FALSE); ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, - "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); } + /* copy to a file that's opened the way Wine opens the source */ + hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(retok || broken(GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */, + "copying to a file opened the way Wine opens the source failed (ret=%d, err=%d)\n", retok, GetLastError()); + CloseHandle(hfile); + /* make sure that destination has correct size */ hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");

1 0

Dylan Smith : wordpad: Fix failing GetDlgItem that forced screen repaint.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 250855bfb0fd5535757bc4707cae7b36c321afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=250855bfb0fd5535757bc4707… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 15 00:07:40 2010 -0400 wordpad: Fix failing GetDlgItem that forced screen repaint. The rebar is the parent of the ruler, not the top level window, so GetDlgItem was returning NULL when the window is resized. As a result the screen was being invalidated and repainted instead of the ruler. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 3b8b6bc..d73a79b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2546,7 +2546,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); - HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); + HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER); int rebarHeight = 0; if (hwndStatusBar)

1 0

André Hentschel : propsys: Mention that the functions are stubs.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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

Alexandre Julliard : ntdll: Make the DOS area accessible even when not using it to hide bugs in broken apps .
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 903488b35470604212d4d3f8ce5a176a7161ba7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=903488b35470604212d4d3f8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 11:36:40 2010 +0200 ntdll: Make the DOS area accessible even when not using it to hide bugs in broken apps. --- dlls/ntdll/virtual.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a9e25c8..23a5d4c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1355,6 +1355,10 @@ void virtual_init(void) virtual_heap = RtlCreateHeap( HEAP_NO_SERIALIZE, heap_base, VIRTUAL_HEAP_SIZE, VIRTUAL_HEAP_SIZE, NULL, NULL ); create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE ); + + /* make the DOS area accessible to hide bugs in broken apps like Excel 2003 */ + if (wine_mmap_is_in_reserved_area( (void *)0x10000, 0x100000 ) == 1) + wine_anon_mmap( (void *)0x10000, 0x100000, PROT_READ | PROT_WRITE, MAP_FIXED ); }

1 0

Alexandre Julliard : winedevice: Fix up protections before writing to the NT header.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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