May 2008 - Wine-Commits - list.winehq.org

James Hawkins : kernel32: Remove a test that fails on all platforms.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: ed4e0a08bc41a57badfdfc954d0dad61ca9f5391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4e0a08bc41a57badfdfc954… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 00:12:56 2008 -0500 kernel32: Remove a test that fails on all platforms. --- dlls/kernel32/tests/process.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 3a3743a..8443879 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -470,8 +470,6 @@ static void test_Startup(void) GetStartupInfoA(&si); okChildInt("StartupInfoA", "cb", startup.cb); okChildString("StartupInfoA", "lpDesktop", si.lpDesktop); - ok (si.lpTitle == NULL || !strncmp(si.lpTitle, selfname, strlen(selfname)), - "StartupInfoA:lpTitle expected something starting with '%s' or null, got '%s'\n", selfname, si.lpTitle); okChildInt("StartupInfoA", "dwX", startup.dwX); okChildInt("StartupInfoA", "dwY", startup.dwY); okChildInt("StartupInfoA", "dwXSize", startup.dwXSize);

1 0

James Hawkins : ntdll: Remove NULL checks for attr, which has already been dereferenced.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 36e73d296b0174461b2f091988ff045701b0bb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e73d296b0174461b2f09198… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 00:48:29 2008 -0500 ntdll: Remove NULL checks for attr, which has already been dereferenced. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 812c9bd..5977300 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1956,8 +1956,8 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ SERVER_START_REQ( open_mapping ) { req->access = access; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; + req->attributes = attr->Attributes; + req->rootdir = attr->RootDirectory; wine_server_add_data( req, attr->ObjectName->Buffer, len ); if (!(ret = wine_server_call( req ))) *handle = reply->handle; }

1 0

James Hawkins : msi: Check that the file key is valid before installing the assembly.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 70cd6bfbbd85e9caab0ec9e01314d605588eb109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cd6bfbbd85e9caab0ec9e01… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 00:35:42 2008 -0500 msi: Check that the file key is valid before installing the assembly. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0e931a1..02beb0c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5663,6 +5663,11 @@ static UINT ITERATE_PublishAssembly( MSIRECORD *rec, LPVOID param ) /* FIXME: extract all files belonging to this component */ file = msi_find_file(package, comp->KeyPath); + if (!file) + { + ERR("File %s not found\n", debugstr_w(comp->KeyPath)); + return ERROR_FUNCTION_FAILED; + } GetTempPathW(MAX_PATH, path);

1 0

Andrew Talbot : cryptnet: Remove unused function.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 2289717a5980fba0559585ec779b001d822792ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2289717a5980fba0559585ec7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 19 22:13:13 2008 +0100 cryptnet: Remove unused function. --- dlls/cryptnet/cryptnet_main.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 30f9350..5bf1afe 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -453,17 +453,6 @@ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, return ret; } -static inline LPWSTR strndupW(LPWSTR string, int len) -{ - LPWSTR ret = NULL; - if (string && (ret = CryptMemAlloc((len + 1) * sizeof(WCHAR))) != NULL) - { - memcpy(ret, string, len * sizeof(WCHAR)); - ret[len] = 0; - } - return ret; -} - /* Parses the URL, and sets components's lpszHostName and lpszUrlPath members * to NULL-terminated copies of those portions of the URL (to be freed with * CryptMemFree.)

1 0

James Hawkins : hhctrl.ocx: Check the filename param before dereferencing it.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 9f42e8eb63d5b69fd800c721972df21991b7fb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f42e8eb63d5b69fd800c7219… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 20 00:40:27 2008 -0500 hhctrl.ocx: Check the filename param before dereferencing it. --- dlls/hhctrl.ocx/hhctrl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index a555a42..a224b64 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -108,6 +108,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat FIXME("Not all HH cases handled correctly\n"); + if (!filename) + return NULL; + index = strstrW(filename, delimW); if (index) { @@ -141,6 +144,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat HHInfo *info; LPWSTR url; + if (!filename) + return NULL; + info = CreateHelpViewer(filename); if(!info) return NULL;

1 0

Alexandre Julliard : ntdll: Move signal unmasking to make sure injected code runs on the correct stack .
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: c9504d94479ef3ac0e10cd1db3e906c9075b17b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9504d94479ef3ac0e10cd1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 20 10:59:20 2008 +0200 ntdll: Move signal unmasking to make sure injected code runs on the correct stack. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b0000b8..c05e01f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2360,6 +2360,8 @@ static NTSTATUS attach_process_dlls( void *wm ) { NTSTATUS status; + pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + RtlEnterCriticalSection( &loader_section ); if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) { @@ -2418,8 +2420,6 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; - pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); - status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error;

1 0

Andrew Talbot : mshtml: Remove unused function.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: 3d42a0ee6526a735ea734daf0036b7f0f26725cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d42a0ee6526a735ea734daf0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 19 22:13:18 2008 +0100 mshtml: Remove unused function. --- dlls/mshtml/txtrange.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 2fbc0bf..841d971 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -202,11 +202,6 @@ static void wstrbuf_append_len(wstrbuf_t *buf, LPCWSTR str, int len) buf->buf[buf->len] = 0; } -static inline void wstrbuf_append(wstrbuf_t *buf, LPCWSTR str) -{ - wstrbuf_append_len(buf, str, strlenW(str)); -} - static void wstrbuf_append_nodetxt(wstrbuf_t *buf, LPCWSTR str, int len) { const WCHAR *s = str;

1 0

Andrew Talbot : advapi32: Remove unused file-static variables.
by Alexandre Julliard May 20, 2008

May 20, 2008

Module: wine Branch: master Commit: cca1854e96b33286b5a45eb378663f52e1e1a3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca1854e96b33286b5a45eb37… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon May 19 22:13:09 2008 +0100 advapi32: Remove unused file-static variables. --- dlls/advapi32/service.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 29c1a09..fc5be79 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -45,12 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(service); -static const WCHAR szLocalSystem[] = {'L','o','c','a','l','S','y','s','t','e','m',0}; static const WCHAR szServiceManagerKey[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'S','e','r','v','i','c','e','s',0 }; -static const WCHAR szSCMLock[] = {'A','D','V','A','P','I','_','S','C','M', - 'L','O','C','K',0}; void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) {

1 0

Alexandre Julliard : ntdll/tests: Make sure to clear the DF flag on return from the exception.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: bb4119e1fdcf87fa5301a1cb3277c31d34ff2c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4119e1fdcf87fa5301a1cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 19 23:19:24 2008 +0200 ntdll/tests: Make sure to clear the DF flag on return from the exception. --- dlls/ntdll/tests/exception.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0aa880a..8116503 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -503,6 +503,7 @@ static DWORD direction_flag_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATI ok( context->EFlags & 0x400, "context eflags has DF bit cleared\n" ); got_exception++; context->Eip++; /* skip cli */ + context->EFlags &= ~0x400; /* make sure it is cleared on return */ return ExceptionContinueExecution; }

1 0

Paul Vriens : shell32/tests: Fix test when running on Wine.
by Alexandre Julliard May 19, 2008

May 19, 2008

Module: wine Branch: master Commit: 13e609fdb308e392c5cae79e63f1fffcac9814cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e609fdb308e392c5cae79e6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon May 19 21:27:22 2008 +0200 shell32/tests: Fix test when running on Wine. --- dlls/shell32/tests/shelllink.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index a331b10..fe923d3 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -86,9 +86,7 @@ static LPITEMIDLIST path_to_pidl(const char* path) MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); r=pSHILCreateFromPath(pathW, &pidl, NULL); - todo_wine { ok(SUCCEEDED(r), "SHILCreateFromPath failed (0x%08x)\n", r); - } HeapFree(GetProcessHeap(), 0, pathW); } return pidl; @@ -170,9 +168,9 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(lstrcmpi(buffer,str)==0, "GetPath returned '%s'\n", buffer); - /* Get some a real path to play with */ - r=GetModuleFileName(NULL, mypath, sizeof(mypath)); - ok(r>=0 && r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r); + /* Get some real path to play with */ + GetWindowsDirectoryA( mypath, sizeof(mypath)-12 ); + strcat(mypath, "\\regedit.exe"); /* Test the interaction of SetPath and SetIDList */ tmp_pidl=NULL; @@ -190,9 +188,7 @@ static void test_get_set(void) } pidl=path_to_pidl(mypath); - todo_wine { ok(pidl!=NULL, "path_to_pidl returned a NULL pidl\n"); - } if (pidl) { @@ -211,7 +207,9 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); + todo_wine ok(lstrcmpi(buffer, mypath)==0, "GetPath returned '%s'\n", buffer); + } /* test path with quotes (Win98 IShellLinkA_SetPath returns S_FALSE, WinXP returns S_OK) */

1 0