wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Alexandre Julliard : ws2_32/tests: Reorder includes so that winsock. h is included before system headers.
by Alexandre Julliard 16 Jun '10

16 Jun '10

Module: wine Branch: master Commit: 76efc82860b4d2d53e81370e67207d0a842d5e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76efc82860b4d2d53e81370e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 22:55:48 2010 +0200 ws2_32/tests: Reorder includes so that winsock.h is included before system headers. --- dlls/ws2_32/tests/sock.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6356d9f..c405053 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -20,20 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> -#include <stdarg.h> - -#include "ntstatus.h" +#include <ntstatus.h> #define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> -#include <winsock2.h> +#include <windows.h> #include <ws2tcpip.h> #include <mswsock.h> +#include <stdio.h> #include "wine/test.h" -#include <winnt.h> -#include <winerror.h> -#include <winuser.h> #define MAX_CLIENTS 4 /* Max number of clients */ #define NUM_TESTS 4 /* Number of tests performed */

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 + +@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/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

Detlef Riekenberg : winspool: Support the spooler in GetPrinterData.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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

Sven Baars : oleacc: Fix Dutch translation.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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

Rico Schüller : wined3d: Improve fglrx glsl spam filter.
by Alexandre Julliard 15 Jun '10

15 Jun '10

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

Andrew Nguyen : winex11.drv: Report a non-zero COLORRES capability value.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: b4d58fe58faf960f6914a91b4f9ca0052f90689a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d58fe58faf960f6914a91b4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 00:26:20 2010 -0500 winex11.drv: Report a non-zero COLORRES capability value. --- dlls/gdi32/tests/dc.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 10 +++++++++- 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b081376..5d56caa 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -556,6 +556,45 @@ static void test_boundsrect_invalid(void) DeleteDC(hdc); } +static void test_desktop_colorres(void) +{ + HDC hdc = GetDC(NULL); + int bitspixel, colorres; + + bitspixel = GetDeviceCaps(hdc, BITSPIXEL); + ok(bitspixel != 0, "Expected to get valid BITSPIXEL capability value\n"); + + colorres = GetDeviceCaps(hdc, COLORRES); + ok(colorres != 0 || + broken(colorres == 0), /* Win9x */ + "Expected to get valid COLORRES capability value\n"); + + if (colorres) + { + switch (bitspixel) + { + case 8: + ok(colorres == 18, + "Expected COLORRES to be 18, got %d\n", colorres); + break; + case 16: + ok(colorres == 16, + "Expected COLORRES to be 16, got %d\n", colorres); + break; + case 24: + case 32: + ok(colorres == 24, + "Expected COLORRES to be 24, got %d\n", bitspixel); + break; + default: + ok(0, "Got unknown BITSPIXEL %d with COLORRES %d\n", bitspixel, colorres); + break; + } + } + + DeleteDC(hdc); +} + START_TEST(dc) { test_savedc(); @@ -565,4 +604,5 @@ START_TEST(dc) test_DC_bitmap(); test_DeleteDC(); test_boundsrect_invalid(); + test_desktop_colorres(); } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ba6cc51..1462b5e 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -235,6 +235,15 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) return text_caps; case CLIPCAPS: return CP_REGION; + case COLORRES: + /* The observed correspondence between BITSPIXEL and COLORRES is: + * BITSPIXEL: 8 -> COLORRES: 18 + * BITSPIXEL: 16 -> COLORRES: 16 + * BITSPIXEL: 24 -> COLORRES: 24 + * (note that depth_to_bpp never chooses a bpp of 24) + * BITSPIXEL: 32 -> COLORRES: 24 */ + return (screen_bpp <= 8) ? 18 : + (screen_bpp == 32) ? 24 : screen_bpp; case RASTERCAPS: return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | @@ -258,7 +267,6 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) case SIZEPALETTE: return palette_size; case NUMRESERVED: - case COLORRES: case PHYSICALWIDTH: case PHYSICALHEIGHT: case PHYSICALOFFSETX:

1 0

Alexandre Julliard : winegcc: Load the Unicode argv dynamically from the generated stub.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 5f7bbb2ab2ce4f2d66e610e8f5039733dea2653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7bbb2ab2ce4f2d66e610e8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 18:28:29 2010 +0200 winegcc: Load the Unicode argv dynamically from the generated stub. --- tools/winegcc/winegcc.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0dc7cc4..fd31060 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -561,10 +561,17 @@ static const char *mingw_unicode_hack( struct options *opts ) char *main_stub = get_temp_file( opts->output_name, ".c" ); create_file( main_stub, 0644, - "#include <stdlib.h>\n" - "extern int wmain(int,wchar_t**);\n" + "#include <stdarg.h>\n" + "#include <windef.h>\n" + "#include <winbase.h>\n" "int main( int argc, char *argv[] )\n{\n" - " return wmain( argc, __wargv );\n}\n" ); + " int wargc;\n" + " wchar_t **wargv, **wenv;\n" + " HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" + " void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" + " int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" + " __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n" + " return wmain( wargc, wargv );\n}\n" ); return compile_to_object( opts, main_stub, NULL ); } @@ -736,7 +743,8 @@ static void build(struct options* opts) if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); - if (!opts->shared && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); + if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) + add_library(opts, lib_dirs, files, "msvcrt"); for ( j = 0; j < files->size; j++ ) { @@ -768,12 +776,8 @@ static void build(struct options* opts) if (ext) *ext = 0; p += 3; - /* don't use Wine's msvcrt on mingw */ - if (strcmp( p, "msvcrt" ) || opts->target_platform == PLATFORM_CYGWIN) - { - strarray_add(link_args, strmake("-L%s", lib )); - strarray_add(link_args, strmake("-l%s", p )); - } + strarray_add(link_args, strmake("-L%s", lib )); + strarray_add(link_args, strmake("-l%s", p )); free( lib ); break; }

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

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

← Newer
1
...
34
35
36
37
38
39
40
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010