February 2008 - Wine-Commits

Jeremy Newman : replace session management routines with memcached
by Jeremy Newman Feb. 8, 2008

Feb. 8, 2008

Module: appdb Branch: master Commit: 7666f6d0dad9dec741c89c28f0fad5921d9c2e6f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7666f6d0dad9dec741c89c28… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 8 13:15:54 2008 -0600 replace session management routines with memcached --- cron/cleanup.php | 65 --------------------- include/incl.php | 31 +++------- include/session.php | 144 ++++++++++++++++++++++++++++++++-------------- tables/appdb_tables.sql | 13 ---- tables/create_tables | 6 +- tables/session_list.sql | 13 ---- unit_test/run_tests.php | 1 - 7 files changed, 113 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=7666f6d0dad9dec741c8…

1 0

Alexandre Julliard : Wine release 0.9.55
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: website Branch: master Commit: c773bcce57cd45274f43e9358488dee84d4bb5fa URL: http://source.winehq.org/git/website.git/?a=commit;h=c773bcce57cd45274f43e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 16:54:33 2008 +0100 Wine release 0.9.55 --- news/2008020801.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/news/2008020801.xml b/news/2008020801.xml new file mode 100644 index 0000000..1e88408 --- /dev/null +++ b/news/2008020801.xml @@ -0,0 +1,25 @@ +<news> +<date>February 8, 2008</date> +<title>Wine 0.9.55 Released</title> +<body> +<p>Wine 0.9.55 was released today, with the following main changes:</p> + +<ul> +<li>Direct3D improvements, including driver version emulation.</li> +<li>Beginnings of support for OLE objects in Richedit.</li> +<li>Several fixes to the animation control.</li> +<li>A bunch of fixes for regression test failures.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.55.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.55">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.55 : Alexandre Julliard : Release 0.9.55
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: refs/tags/wine-0.9.55 Tag: f1ad97b55b8ec27331ff1d842df592e77cdf0d2c URL: http://source.winehq.org/git/wine.git/?a=tag;h=f1ad97b55b8ec27331ff1d842df5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 16:44:36 2008 +0100 Release 0.9.55

1 0

Alexandre Julliard : Release 0.9.55.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 1991e9f9406ae8f72663aace7e2cfa6afc76e748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1991e9f9406ae8f72663aace7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 16:44:36 2008 +0100 Release 0.9.55. --- ANNOUNCE | 707 ++++++++++++++++++---------------------- ChangeLog | 1083 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1411 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1991e9f9406ae8f72663a…

1 0

Alistair Leslie-Hughes : msxml3: Corrected test text.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 587328312bc6ce3496b22493c211b7c14628dec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=587328312bc6ce3496b22493c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 8 21:40:39 2008 +1100 msxml3: Corrected test text. --- dlls/msxml3/tests/xmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 89c73cf..0d1c90a 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -270,7 +270,7 @@ static void test_createElement(void) V_I4(&vType) = -1; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - ok(hr == E_NOTIMPL, "Expected S_OK, got %d\n", hr); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %d\n", hr); ok(element == NULL, "Expected NULL element\n"); if (element != NULL)

1 0

Dmitry Timoshkov : kernel32: Separate modifier from charset before detecting the charset codepage.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 667dad2331fc35441da9490ab795e90d07b376a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667dad2331fc35441da9490ab… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Feb 8 20:03:39 2008 +0800 kernel32: Separate modifier from charset before detecting the charset codepage. --- dlls/kernel32/locale.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a8bd099..a13c346 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -351,6 +351,8 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) static const WCHAR latnW[] = {'-','L','a','t','n',0}; WCHAR *p; + TRACE("%s\n", debugstr_w(str)); + name->country = name->charset = name->script = name->modifier = NULL; name->lcid = MAKELCID( MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), SORT_DEFAULT ); name->matches = 0; @@ -395,7 +397,6 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) { *p++ = 0; name->charset = p; - name->codepage = find_charset( name->charset ); p = strchrW( p, '@' ); } if (p) @@ -404,6 +405,9 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) name->modifier = p; } + if (name->charset) + name->codepage = find_charset( name->charset ); + /* rebuild a Windows name if possible */ if (name->charset) goto done; /* can't specify charset in Windows format */

1 0

Reece H. Dunn : user32: Make the listbox tests pass in directories other than dlls/user32/tests.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 01af8501b992896a5fff38da365896b7708cc705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af8501b992896a5fff38da3… Author: Reece H. Dunn <msclrhd(a)hotmail.com> Date: Fri Feb 8 08:45:31 2008 +0000 user32: Make the listbox tests pass in directories other than dlls/user32/tests. --- dlls/user32/tests/listbox.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 3645190..18b7951 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -559,6 +559,11 @@ static void test_listbox_LB_DIR() char pathBuffer[MAX_PATH]; char * p; char driveletter; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d", GetLastError()); + CloseHandle( file ); /* NOTE: for this test to succeed, there must be no subdirectories under the current directory. In addition, there must be at least @@ -965,6 +970,8 @@ static void test_listbox_LB_DIR() ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } DestroyWindow(hList); + + DeleteFileA( "wtest1.tmp.c" ); } HWND g_listBox; @@ -1045,6 +1052,11 @@ static void test_listbox_dlgdir(void) char tempBuffer[MAX_PATH]; char * p; char driveletter; + HANDLE file; + + file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d", GetLastError()); + CloseHandle( file ); /* NOTE: for this test to succeed, there must be no subdirectories under the current directory. In addition, there must be at least @@ -1436,6 +1448,8 @@ static void test_listbox_dlgdir(void) } } DestroyWindow(hWnd); + + DeleteFileA( "wtest1.tmp.c" ); } START_TEST(listbox)

1 0

Detlef Riekenberg : winspool: Use the backend for AddPrinterDriverEx.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 6ec7c2dca0ff6d3375fce0b4b0f4d227c8c432f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec7c2dca0ff6d3375fce0b4b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 8 00:41:24 2008 +0100 winspool: Use the backend for AddPrinterDriverEx. --- dlls/winspool.drv/info.c | 216 +-------------------------------------------- 1 files changed, 5 insertions(+), 211 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2ccaa3c..4ba9f28 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -86,14 +86,6 @@ static CRITICAL_SECTION printer_handles_cs = { &printer_handles_cs_debug, -1, 0, /* ############################### */ typedef struct { - WCHAR src[MAX_PATH+MAX_PATH]; - WCHAR dst[MAX_PATH+MAX_PATH]; - DWORD srclen; - DWORD dstlen; - DWORD copyflags; -} apd_data_t; - -typedef struct { struct list entry; LPWSTR name; LPWSTR dllname; @@ -353,67 +345,11 @@ static LPSTR strdupWtoA( LPCWSTR str ) } /****************************************************************** - * apd_copyfile [internal] - * - * Copy a file from the driverdirectory to the versioned directory - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - */ -static BOOL apd_copyfile(LPWSTR filename, apd_data_t *apd) -{ - LPWSTR ptr; - LPWSTR srcname; - DWORD res; - - apd->src[apd->srclen] = '\0'; - apd->dst[apd->dstlen] = '\0'; - - if (!filename || !filename[0]) { - /* nothing to copy */ - return TRUE; - } - - ptr = strrchrW(filename, '\\'); - if (ptr) { - ptr++; - } - else - { - ptr = filename; - } - - if (apd->copyflags & APD_COPY_FROM_DIRECTORY) { - /* we have an absolute Path */ - srcname = filename; - } - else - { - srcname = apd->src; - lstrcatW(srcname, ptr); - } - lstrcatW(apd->dst, ptr); - - TRACE("%s => %s\n", debugstr_w(filename), debugstr_w(apd->dst)); - - /* FIXME: handle APD_COPY_NEW_FILES */ - res = CopyFileW(srcname, apd->dst, FALSE); - TRACE("got %u with %u\n", res, GetLastError()); - - /* FIXME: install of wineps.drv must be fixed, before we return the real result - return res; - */ - return TRUE; -} - - -/****************************************************************** * Return the number of bytes for an multi_sz string. * The result includes all \0s * (specifically the extra \0, that is needed as multi_sz terminator). */ +#if 0 static int multi_sz_lenW(const WCHAR *str) { const WCHAR *ptr = str; @@ -425,7 +361,7 @@ static int multi_sz_lenW(const WCHAR *str) return (ptr - str + 1) * sizeof(WCHAR); } - +#endif /* ################################ */ static int multi_sz_lenA(const char *str) @@ -6396,18 +6332,10 @@ BOOL WINAPI AddPrinterConnectionW( LPWSTR pName ) */ BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags) { - const printenv_t *env; - apd_data_t apd; - DRIVER_INFO_8W di; - LPWSTR ptr; - HKEY hroot; - HKEY hdrv; - DWORD disposition; - DWORD len; - LONG lres; - TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + if ((backend == NULL) && !load_backend()) return FALSE; + if (level < 2 || level == 5 || level == 7 || level > 8) { SetLastError(ERROR_INVALID_LEVEL); return FALSE; @@ -6418,141 +6346,7 @@ BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, return FALSE; } - if ((dwFileCopyFlags & ~APD_COPY_FROM_DIRECTORY) != APD_COPY_ALL_FILES) { - FIXME("Flags 0x%x ignored (Fallback to APD_COPY_ALL_FILES)\n", dwFileCopyFlags & ~APD_COPY_FROM_DIRECTORY); - } - - ptr = get_servername_from_name(pName); - HeapFree(GetProcessHeap(), 0, ptr); - if (ptr) { - FIXME("not supported for server: %s\n", debugstr_w(pName)); - SetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - /* we need to set all entries in the Registry, independent from the Level of - DRIVER_INFO, that the caller supplied */ - - ZeroMemory(&di, sizeof(di)); - if (pDriverInfo && (level < (sizeof(di_sizeof) / sizeof(di_sizeof[0])))) { - memcpy(&di, pDriverInfo, di_sizeof[level]); - } - - /* dump the most used infos */ - TRACE("%p: .cVersion : 0x%x/%d\n", pDriverInfo, di.cVersion, di.cVersion); - TRACE("%p: .pName : %s\n", di.pName, debugstr_w(di.pName)); - TRACE("%p: .pEnvironment: %s\n", di.pEnvironment, debugstr_w(di.pEnvironment)); - TRACE("%p: .pDriverPath : %s\n", di.pDriverPath, debugstr_w(di.pDriverPath)); - TRACE("%p: .pDataFile : %s\n", di.pDataFile, debugstr_w(di.pDataFile)); - TRACE("%p: .pConfigFile : %s\n", di.pConfigFile, debugstr_w(di.pConfigFile)); - TRACE("%p: .pHelpFile : %s\n", di.pHelpFile, debugstr_w(di.pHelpFile)); - /* dump only the first of the additional Files */ - TRACE("%p: .pDependentFiles: %s\n", di.pDependentFiles, debugstr_w(di.pDependentFiles)); - - - /* check environment */ - env = validate_envW(di.pEnvironment); - if (env == NULL) return FALSE; /* ERROR_INVALID_ENVIRONMENT */ - - /* fill the copy-data / get the driverdir */ - len = sizeof(apd.src) - sizeof(Version3_SubdirW) - sizeof(WCHAR); - if (!GetPrinterDriverDirectoryW(NULL, (LPWSTR) env->envname, 1, - (LPBYTE) apd.src, len, &len)) { - /* Should never Fail */ - return FALSE; - } - memcpy(apd.dst, apd.src, len); - lstrcatW(apd.src, backslashW); - apd.srclen = lstrlenW(apd.src); - lstrcatW(apd.dst, env->versionsubdir); - lstrcatW(apd.dst, backslashW); - apd.dstlen = lstrlenW(apd.dst); - apd.copyflags = dwFileCopyFlags; - CreateDirectoryW(apd.src, NULL); - CreateDirectoryW(apd.dst, NULL); - - /* Fill the Registry for the Driver */ - hroot = WINSPOOL_OpenDriverReg(env->envname, TRUE); - if(!hroot) { - ERR("Can't create Drivers key\n"); - return FALSE; - } - - if ((lres = RegCreateKeyExW(hroot, di.pName, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_QUERY_VALUE, NULL, - &hdrv, &disposition)) != ERROR_SUCCESS) { - - ERR("can't create driver %s: %u\n", debugstr_w(di.pName), lres); - RegCloseKey(hroot); - SetLastError(lres); - return FALSE; - } - RegCloseKey(hroot); - - if (disposition == REG_OPENED_EXISTING_KEY) { - TRACE("driver %s already installed\n", debugstr_w(di.pName)); - RegCloseKey(hdrv); - SetLastError(ERROR_PRINTER_DRIVER_ALREADY_INSTALLED); - return FALSE; - } - - /* Verified with the Adobe PS Driver, that w2k does not use di.Version */ - RegSetValueExW(hdrv, VersionW, 0, REG_DWORD, (LPBYTE) &env->driverversion, - sizeof(DWORD)); - - RegSetValueExW(hdrv, DriverW, 0, REG_SZ, (LPBYTE) di.pDriverPath, - (lstrlenW(di.pDriverPath)+1)* sizeof(WCHAR)); - apd_copyfile(di.pDriverPath, &apd); - - RegSetValueExW(hdrv, Data_FileW, 0, REG_SZ, (LPBYTE) di.pDataFile, - (lstrlenW(di.pDataFile)+1)* sizeof(WCHAR)); - apd_copyfile(di.pDataFile, &apd); - - RegSetValueExW(hdrv, Configuration_FileW, 0, REG_SZ, (LPBYTE) di.pConfigFile, - (lstrlenW(di.pConfigFile)+1)* sizeof(WCHAR)); - apd_copyfile(di.pConfigFile, &apd); - - /* settings for level 3 */ - RegSetValueExW(hdrv, Help_FileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, - di.pHelpFile ? (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR) : 0); - apd_copyfile(di.pHelpFile, &apd); - - - ptr = di.pDependentFiles; - RegSetValueExW(hdrv, Dependent_FilesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, - di.pDependentFiles ? multi_sz_lenW(di.pDependentFiles) : 0); - while ((ptr != NULL) && (ptr[0])) { - if (apd_copyfile(ptr, &apd)) { - ptr += lstrlenW(ptr) + 1; - } - else - { - WARN("Failed to copy %s\n", debugstr_w(ptr)); - ptr = NULL; - } - } - - /* The language-Monitor was already copied to "%SystemRoot%\system32" */ - RegSetValueExW(hdrv, MonitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, - di.pMonitorName ? (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR) : 0); - - RegSetValueExW(hdrv, DatatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, - di.pDefaultDataType ? (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR) : 0); - - /* settings for level 4 */ - RegSetValueExW(hdrv, Previous_NamesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, - di.pszzPreviousNames ? multi_sz_lenW(di.pszzPreviousNames) : 0); - - if (level > 5) FIXME("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName)); - - - RegCloseKey(hdrv); - FIXME("### DrvDriverEvent(...,DRIVEREVENT_INITIALIZE) not implemented yet\n"); - - - TRACE("=> TRUE with %u\n", GetLastError()); - return TRUE; - + return backend->fpAddPrinterDriverEx(pName, level, pDriverInfo, dwFileCopyFlags); } /******************************************************************************

1 0

Detlef Riekenberg : localspl: Implement fpAddPrinterDriverEx.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 5df0dc5846e194d4cc8b2e8773f4d6272c4bf31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df0dc5846e194d4cc8b2e877… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 8 00:39:49 2008 +0100 localspl: Implement fpAddPrinterDriverEx. --- dlls/localspl/localspl_main.c | 375 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 373 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5df0dc5846e194d4cc8b2…

1 0

Paul Vriens : rpcrt4/tests: Skip rest of the tests if we fail.
by Alexandre Julliard Feb. 8, 2008

Feb. 8, 2008

Module: wine Branch: master Commit: 8554db9f5c4eadc031d51138db35d2f2b10bb92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8554db9f5c4eadc031d51138d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Feb 8 10:51:14 2008 +0100 rpcrt4/tests: Skip rest of the tests if we fail. --- dlls/rpcrt4/tests/rpc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index cca1fa1..a95ff50 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -325,6 +325,12 @@ static void test_towers(void) ret = TowerConstruct(&mapi_if_id, &ndr_syntax, "ncacn_ip_tcp", "135", "10.0.0.1", &tower); ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); + if (ret == RPC_S_INVALID_RPC_PROTSEQ) + { + /* Windows Vista fails with this error and crashes if we continue */ + skip("TowerConstruct failed, we are most likely on Windows Vista\n"); + return; + } /* first check we have the right amount of data */ ok(tower->tower_length == sizeof(tower_data_tcp_ip1) ||

1 0