March 2006 - Wine-Commits - list.winehq.org

Tag wine-0.9.11 : Alexandre Julliard : Release 0.9.11
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/tags/wine-0.9.11 Tag: 123b9dbc8d10a4e49774f7f22054271c626b8ad2 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=123b9dbc8d10a4e49774f7f220… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:38:15 2006 +0200 Release 0.9.11

1 0

Alexandre Julliard : Release 0.9.11.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: bb8a0a9f7ebbb7580047178f35565768d31b4db1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb8a0a9f7ebbb7580047178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:38:15 2006 +0200 Release 0.9.11. --- ANNOUNCE | 15 - ChangeLog | 1440 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1458 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bb8a0a9f7ebbb758004…

1 0

Alexandre Julliard : server: Avoid crash on startup when the configuration dir doesn't exist.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: c5c599d478d716548879f982f4d22a6d2c6c1d74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5c599d478d716548879f98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 13:06:04 2006 +0200 server: Avoid crash on startup when the configuration dir doesn't exist. --- server/request.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index 6f0ffb9..701d2aa 100644 --- a/server/request.c +++ b/server/request.c @@ -528,12 +528,12 @@ static void create_dir( const char *name } /* create the server directory and chdir to it */ -static void create_server_dir(void) +static void create_server_dir( const char *dir ) { char *p, *server_dir; struct stat st, st2; - if (!(server_dir = strdup( wine_get_server_dir() ))) fatal_error( "out of memory\n" ); + if (!(server_dir = strdup( dir ))) fatal_error( "out of memory\n" ); /* first create the base directory if needed */ @@ -579,10 +579,13 @@ static int create_server_lock(void) /* wait for the server lock */ int wait_for_lock(void) { + const char *server_dir = wine_get_server_dir(); int fd, r; struct flock fl; - create_server_dir(); + if (!server_dir) return 0; /* no server dir, so no lock to wait on */ + + create_server_dir( server_dir ); fd = create_server_lock(); fl.l_type = F_WRLCK; @@ -598,11 +601,14 @@ int wait_for_lock(void) /* kill the wine server holding the lock */ int kill_lock_owner( int sig ) { + const char *server_dir = wine_get_server_dir(); int fd, i, ret = 0; pid_t pid = 0; struct flock fl; - create_server_dir(); + if (!server_dir) return 0; /* no server dir, nothing to do */ + + create_server_dir( server_dir ); fd = create_server_lock(); for (i = 0; i < 10; i++) @@ -721,6 +727,7 @@ static void acquire_lock(void) /* open the master server socket and start waiting for new clients */ void open_master_socket(void) { + const char *server_dir = wine_get_server_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -728,7 +735,8 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); - create_server_dir(); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", wine_get_config_dir() ); + create_server_dir( server_dir ); if (!foreground) {

1 0

Alexandre Julliard : user/tests: Flush events before running the keyboard event test.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 510a6f70a89ff090c4128a0eaa50bc6757803f0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=510a6f70a89ff090c4128a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 12:51:54 2006 +0200 user/tests: Flush events before running the keyboard event test. --- dlls/user/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 326a279..a4ecbe5 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2314,6 +2314,7 @@ static void test_keyboard_input(HWND hwn ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); + flush_events(); ok(GetActiveWindow() == hwnd, "wrong active window %p\n", GetActiveWindow());

1 0

Alexandre Julliard : comctl32: Force a specific day value in the monthcal test.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 5fd23798ffc67a08d4ba2e823e089ff109c7e773 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fd23798ffc67a08d4ba2e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 12:45:59 2006 +0200 comctl32: Force a specific day value in the monthcal test. Avoids test failure when the current day happens to be the 31st... --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 89d3bc6..b5fb982 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -59,6 +59,7 @@ void test_monthcal(void) ok(st1[0].wYear != 2000, "Lover limit changed\n"); GetSystemTime(&st[0]); + st[0].wDay = 20; st[0].wMonth = 5; st[1] = st[0];

1 0

James Hawkins : advpack: LaunchINFSectionExW is available, so mark it so in the spec file.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: d04606b583c8e1c8ceaa5780dd006f812384714a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d04606b583c8e1c8ceaa578… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 12:50:37 2006 -0600 advpack: LaunchINFSectionExW is available, so mark it so in the spec file. --- dlls/advpack/advpack.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2d3731c..f6a85c7 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -39,7 +39,7 @@ # stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA @ stdcall LaunchINFSectionExA(ptr ptr str long) -# stdcall LaunchINFSectionExW(ptr ptr wstr long) +@ stdcall LaunchINFSectionExW(ptr ptr wstr long) @ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA @ stdcall NeedReboot(long) @ stdcall NeedRebootInit()

1 0

James Hawkins : advpack: Forward ExecuteCabA to its Unicode counterpart.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 017d1b0b564fafc6a15d2b7f42284a7d1dc45a9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=017d1b0b564fafc6a15d2b7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 12:26:59 2006 -0600 advpack: Forward ExecuteCabA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/install.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 252b779..2d3731c 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -14,7 +14,7 @@ @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stdcall ExecuteCabA(ptr ptr ptr) -# stdcall ExecuteCabW(ptr ptr ptr) +@ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExtractFilesA(str str long ptr ptr long) # stdcall ExtractFilesW(wstr wstr long ptr ptr long) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 042f761..80ed36e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -27,6 +27,7 @@ #include "winreg.h" #include "winver.h" #include "winternl.h" +#include "winnls.h" #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" @@ -86,6 +87,51 @@ HRESULT WINAPI DoInfInstall(const SETUPC /*********************************************************************** * ExecuteCabA (ADVPACK.@) + * + * See ExecuteCabW. + */ +HRESULT WINAPI ExecuteCabA(HWND hwnd, CABINFOA* pCab, LPVOID pReserved) +{ + UNICODE_STRING cab, inf, section; + CABINFOW cabinfo; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", hwnd, pCab, pReserved); + + if (!pCab) + return E_INVALIDARG; + + if (pCab->pszCab) + { + RtlCreateUnicodeStringFromAsciiz(&cab, pCab->pszCab); + cabinfo.pszCab = cab.Buffer; + } + else + cabinfo.pszCab = NULL; + + RtlCreateUnicodeStringFromAsciiz(&inf, pCab->pszInf); + RtlCreateUnicodeStringFromAsciiz(&section, pCab->pszSection); + + MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, + sizeof(cabinfo.szSrcPath) / sizeof(WCHAR)); + + cabinfo.pszInf = inf.Buffer; + cabinfo.pszSection = section.Buffer; + cabinfo.dwFlags = pCab->dwFlags; + + hr = ExecuteCabW(hwnd, &cabinfo, pReserved); + + if (pCab->pszCab) + RtlFreeUnicodeString(&cab); + + RtlFreeUnicodeString(&inf); + RtlFreeUnicodeString(&section); + + return hr; +} + +/*********************************************************************** + * ExecuteCabW (ADVPACK.@) * * Installs the INF file extracted from a specified cabinet file. * @@ -101,7 +147,7 @@ HRESULT WINAPI DoInfInstall(const SETUPC * BUGS * Unimplemented */ -HRESULT WINAPI ExecuteCabA( HWND hwnd, CABINFOA* pCab, LPVOID pReserved ) +HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) { FIXME("(%p %p %p): stub\n", hwnd, pCab, pReserved); return E_FAIL;

1 0

Robert Shearman : ole32: Remove unnecessary commenting out of the RPC interfaces in the dcom idl file .
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: fb5ec209cd89b08426e23aa25cad0ce639535174 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb5ec209cd89b08426e23aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:56:28 2006 +0100 ole32: Remove unnecessary commenting out of the RPC interfaces in the dcom idl file. --- dlls/ole32/dcom.idl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index 7d95f37..71120fb 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -215,7 +215,6 @@ interface IRemUnknown2 : IRemUnknown [out, size_is(cIids)] MInterfacePointer **ppMIF); } -cpp_quote("#if 0") [ uuid(99fcfec4-5260-101b-bbcb-00aa0021347a), pointer_default(unique) @@ -289,4 +288,3 @@ interface IRemoteActivation [out,size_is(Interfaces)] MInterfacePointer **ppInterfaceData, [out,size_is(Interfaces)] HRESULT *pResults); } -cpp_quote("#endif")

1 0

Robert Shearman : wininet: Fix some string length calculations.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: c564ee826f46e630dc21d93725535d2d20312ef2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c564ee826f46e630dc21d93… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:55:36 2006 +0100 wininet: Fix some string length calculations. Fix some string length calculations that didn't account for the different sized characters with Unicode. --- dlls/wininet/urlcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a4bdfa7..3557ea5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -943,8 +943,8 @@ static BOOL URLCache_CopyEntry( lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - dwRequiredSize += lenUrl + 1; - + dwRequiredSize += (lenUrl + 1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + /* FIXME: is source url optional? */ if (*lpdwBufferSize >= dwRequiredSize) { @@ -970,7 +970,7 @@ static BOOL URLCache_CopyEntry( { lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; } - dwRequiredSize += nLocalFilePathSize; + dwRequiredSize += nLocalFilePathSize * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)) ; if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4));

1 0

Robert Shearman : wininet: Only access the URL in the cache by the provided offset.
by Alexandre Julliard March 31, 2006

March 31, 2006

Module: wine Branch: refs/heads/master Commit: 4f40f1722605c745ce2c442e1f07a124b3415d03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f40f1722605c745ce2c442… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:55:15 2006 +0100 wininet: Only access the URL in the cache by the provided offset. --- dlls/wininet/urlcache.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f143512..a4bdfa7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -95,7 +95,7 @@ typedef struct _URL_CACHEFILE_ENTRY DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ - DWORD dwOffsetUrl; /* usually 0x68 */ + DWORD dwOffsetUrl; /* offset of start of url from start of entry */ BYTE CacheDir; /* index of cache directory this url is stored in */ BYTE Unknown4; /* usually zero */ WORD wUnknown5; /* usually 0x1010 */ @@ -112,7 +112,8 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wUnknownTime; /* usually same as wLastSyncTime */ DWORD dwUnknown7; /* usually zero */ DWORD dwUnknown8; /* usually zero */ - CHAR szSourceUrlName[1]; /* start of url */ + /* packing to dword align start of next field */ + /* CHAR szSourceUrlName[]; (url) */ /* packing to dword align start of next field */ /* CHAR szLocalFileName[]; (local file name exluding path) */ /* packing to dword align start of next field */ @@ -939,9 +940,9 @@ static BOOL URLCache_CopyEntry( ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4)); dwRequiredSize = DWORD_ALIGN(dwRequiredSize); if (bUnicode) - lenUrl = MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, NULL, 0); + lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else - lenUrl = strlen(pUrlEntry->szSourceUrlName); + lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); dwRequiredSize += lenUrl + 1; /* FIXME: is source url optional? */ @@ -949,9 +950,9 @@ static BOOL URLCache_CopyEntry( { lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, pUrlEntry->szSourceUrlName, (lenUrl + 1) * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1398,7 +1399,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); @@ -1483,7 +1484,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWST } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); if (!URLCache_CopyEntry( @@ -1704,7 +1705,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", pUrlEntry->szSourceUrlName); + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); pUrlEntry->dwHitRate++; @@ -2035,7 +2036,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn LPURLCACHE_HEADER pHeader; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; - DWORD dwBytesNeeded = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + DWORD dwBytesNeeded = DWORD_ALIGN(sizeof(*pUrlEntry)); DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwFileSizeLow = 0; @@ -2177,7 +2178,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwHitRate = 0; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; - pUrlEntry->dwOffsetUrl = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); pUrlEntry->dwSizeHigh = 0; pUrlEntry->dwSizeLow = dwFileSizeLow; pUrlEntry->dwSizeHigh = dwFileSizeHigh; @@ -2200,7 +2201,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwUnknown8 = 0; - strcpy(pUrlEntry->szSourceUrlName, achUrl); + strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); if (dwOffsetLocalFileName) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName); if (dwOffsetHeader)

1 0