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

Mike McCormack : msi: Improve handling of short paths.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: c1513be48c414f4b862111ca5bd9bda85ab5c94b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1513be48c414f4b862111c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 21 19:40:36 2006 +0900 msi: Improve handling of short paths. --- dlls/msi/action.c | 94 +++++++++++++++++++++++++--------------------------- dlls/msi/action.h | 4 ++ dlls/msi/files.c | 10 ++++-- dlls/msi/helpers.c | 55 +++++++++++++++++++++++------- 4 files changed, 98 insertions(+), 65 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 60907a9..6501031 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1269,6 +1269,17 @@ static UINT load_feature(MSIRECORD * row return ERROR_SUCCESS; } +static LPWSTR folder_split_path(LPWSTR p, WCHAR ch) +{ + if (!p) + return p; + p = strchrW(p, ch); + if (!p) + return p; + *p = 0; + return p+1; +} + static UINT load_file(MSIRECORD *row, LPVOID param) { MSIPACKAGE* package = (MSIPACKAGE*)param; @@ -1293,7 +1304,7 @@ static UINT load_file(MSIRECORD *row, LP reduce_to_longfilename( file->FileName ); file->ShortName = msi_dup_record_field( row, 3 ); - reduce_to_shortfilename( file->ShortName ); + file->LongName = strdupW( folder_split_path(file->ShortName, '|')); file->FileSize = MSI_RecordGetInteger( row, 4 ); file->Version = msi_dup_record_field( row, 5 ); @@ -1411,7 +1422,6 @@ static UINT ACTION_FileCost(MSIPACKAGE * return ERROR_SUCCESS; } - static MSIFOLDER *load_folder( MSIPACKAGE *package, LPCWSTR dir ) { static const WCHAR Query[] = @@ -1420,10 +1430,10 @@ static MSIFOLDER *load_folder( MSIPACKAG 'W','H','E','R','E',' ', '`', 'D','i','r','e','c','t', 'o','r','y','`', ' ','=',' ','\'','%','s','\'', 0}; - LPWSTR ptargetdir, targetdir, srcdir; + static const WCHAR szDot[] = { '.',0 }; + LPWSTR p, tgt_short, tgt_long, src_short, src_long; LPCWSTR parent; - LPWSTR shortname = NULL; - MSIRECORD * row = 0; + MSIRECORD *row; MSIFOLDER *folder; TRACE("Looking for dir %s\n",debugstr_w(dir)); @@ -1444,54 +1454,40 @@ static MSIFOLDER *load_folder( MSIPACKAG if (!row) return NULL; - ptargetdir = targetdir = msi_dup_record_field(row,3); + p = msi_dup_record_field(row, 3); /* split src and target dir */ - if (strchrW(targetdir,':')) - { - srcdir=strchrW(targetdir,':'); - *srcdir=0; - srcdir ++; - } - else - srcdir=NULL; + tgt_short = p; + src_short = folder_split_path( p, ':' ); - /* for now only pick long filename versions */ - if (strchrW(targetdir,'|')) - { - shortname = targetdir; - targetdir = strchrW(targetdir,'|'); - *targetdir = 0; - targetdir ++; - } - /* for the sourcedir pick the short filename */ - if (srcdir && strchrW(srcdir,'|')) - { - LPWSTR p = strchrW(srcdir,'|'); - *p = 0; - } - - /* now check for root dirs */ - if (targetdir[0] == '.' && targetdir[1] == 0) - targetdir = NULL; - - if (targetdir) - { - TRACE(" TargetDefault = %s\n",debugstr_w(targetdir)); - msi_free( folder->TargetDefault); - folder->TargetDefault = strdupW(targetdir); - } - - if (srcdir) - folder->SourceDefault = strdupW(srcdir); - else if (shortname) - folder->SourceDefault = strdupW(shortname); - else if (targetdir) - folder->SourceDefault = strdupW(targetdir); - msi_free(ptargetdir); - TRACE(" SourceDefault = %s\n", debugstr_w( folder->SourceDefault )); + /* split the long and short pathes */ + tgt_long = folder_split_path( tgt_short, '|' ); + src_long = folder_split_path( src_short, '|' ); + + /* check for root dirs */ + if (!lstrcmpW(szDot, tgt_short)) + tgt_short = NULL; + if (!lstrcmpW(szDot, tgt_long)) + tgt_long = NULL; + + if (!tgt_long) + tgt_long = tgt_short; + if (!src_short) + src_short = tgt_long; + if (!src_long) + src_long = src_short; + + /* FIXME: use the target short path too */ + folder->TargetDefault = strdupW(tgt_long); + folder->SourceShortPath = strdupW(src_long); + folder->SourceLongPath = strdupW(src_long); + msi_free(p); + + TRACE("TargetDefault = %s\n",debugstr_w( folder->TargetDefault )); + TRACE("SourceLong = %s\n", debugstr_w( folder->SourceLongPath )); + TRACE("SourceShort = %s\n", debugstr_w( folder->SourceShortPath )); - parent = MSI_RecordGetString(row,2); + parent = MSI_RecordGetString(row, 2); if (parent) { folder->Parent = load_folder( package, parent ); diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 9b3e58d..be2654c 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -78,7 +78,8 @@ typedef struct tagMSIFOLDER struct list entry; LPWSTR Directory; LPWSTR TargetDefault; - LPWSTR SourceDefault; + LPWSTR SourceLongPath; + LPWSTR SourceShortPath; LPWSTR ResolvedTarget; LPWSTR ResolvedSource; @@ -109,6 +110,7 @@ typedef struct tagMSIFILE MSICOMPONENT *Component; LPWSTR FileName; LPWSTR ShortName; + LPWSTR LongName; INT FileSize; LPWSTR Version; LPWSTR Language; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b5c80ca..aa6f8e6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -328,9 +328,15 @@ static VOID set_file_source(MSIPACKAGE* { if (file->Attributes & msidbFileAttributesNoncompressed) { - LPWSTR p; + LPWSTR p, path; p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); - file->SourcePath = build_directory_name(2, p, file->ShortName); + path = build_directory_name(2, p, file->ShortName); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free(path); + path = build_directory_name(2, p, file->LongName); + } + file->SourcePath = path; msi_free(p); } else diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index af604a5..ffbde9f 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -355,21 +355,48 @@ LPWSTR resolve_folder(MSIPACKAGE *packag } else { - if (f->SourceDefault && f->SourceDefault[0]!='.') - path = build_directory_name( 3, p, f->SourceDefault, NULL ); - else - path = strdupW(p); - TRACE("source -> %s\n", debugstr_w(path)); + /* source may be in a few different places ... check each of them */ + path = NULL; - /* if the directory doesn't exist, use the root */ - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + /* try the long path directory */ + if (f->SourceLongPath) { - msi_free( path ); - path = get_source_root( package ); - TRACE("defaulting to %s\n", debugstr_w(path)); + path = build_directory_name( 3, p, f->SourceLongPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } } - else - f->ResolvedSource = strdupW( path ); + + /* try the short path directory */ + if (!path && f->SourceShortPath) + { + path = build_directory_name( 3, p, f->SourceShortPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } + } + + /* try the parent folder's path */ + if (!path) + { + path = strdupW(p); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + { + msi_free( path ); + path = NULL; + } + } + + /* try the root of the install */ + if (!path) + path = get_source_root( package ); + + TRACE("source -> %s\n", debugstr_w(path)); + f->ResolvedSource = strdupW( path ); } msi_free(p); } @@ -508,7 +535,8 @@ void ACTION_free_package_structures( MSI list_remove( &folder->entry ); msi_free( folder->Directory ); msi_free( folder->TargetDefault ); - msi_free( folder->SourceDefault ); + msi_free( folder->SourceLongPath ); + msi_free( folder->SourceShortPath ); msi_free( folder->ResolvedTarget ); msi_free( folder->ResolvedSource ); msi_free( folder->Property ); @@ -537,6 +565,7 @@ void ACTION_free_package_structures( MSI msi_free( file->File ); msi_free( file->FileName ); msi_free( file->ShortName ); + msi_free( file->LongName ); msi_free( file->Version ); msi_free( file->Language ); msi_free( file->SourcePath );

1 0

Robert Shearman : ntdll: Start of pooling support for RtlQueueWorkItem.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: f40f81b6d5e120529b6ef61aecf0b1068ff6ee8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f40f81b6d5e120529b6ef61… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:44:14 2006 +0000 ntdll: Start of pooling support for RtlQueueWorkItem. Start of pooling support for RtlQueueWorkItem. The algorithm implmented is very simple - if there are no free threads, create a new one. --- dlls/ntdll/threadpool.c | 137 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 124 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 10bda48..15726bb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -18,7 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> +#include <limits.h> #define NONAMELESSUNION #include "ntstatus.h" @@ -26,35 +30,123 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/list.h" + #include "ntdll_misc.h" WINE_DEFAULT_DEBUG_CHANNEL(threadpool); +#define WORKER_TIMEOUT 30000 /* 30 seconds */ + +static LONG num_workers; +static LONG num_work_items; +static LONG num_busy_workers; + +static struct list work_item_list = LIST_INIT(work_item_list); +static HANDLE work_item_event; + +static CRITICAL_SECTION threadpool_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &threadpool_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": threadpool_cs") } +}; +static CRITICAL_SECTION threadpool_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + struct work_item { + struct list entry; PRTL_WORK_ITEM_ROUTINE function; PVOID context; }; +inline static LONG interlocked_inc( PLONG dest ) +{ + return interlocked_xchg_add( (int *)dest, 1 ) + 1; +} + +inline static LONG interlocked_dec( PLONG dest ) +{ + return interlocked_xchg_add( (int *)dest, -1 ) - 1; +} + static void WINAPI worker_thread_proc(void * param) { - struct work_item *work_item_ptr = (struct work_item *)param; - struct work_item work_item; + interlocked_inc(&num_workers); /* free the work item memory sooner to reduce memory usage */ - work_item = *work_item_ptr; - RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); - - TRACE("executing %p(%p)\n", work_item.function, work_item.context); + while (TRUE) + { + if (num_work_items > 0) + { + struct list *item; + RtlEnterCriticalSection(&threadpool_cs); + item = list_head(&work_item_list); + if (item) + { + struct work_item *work_item_ptr = LIST_ENTRY(item, struct work_item, entry); + struct work_item work_item; + list_remove(&work_item_ptr->entry); + interlocked_dec(&num_work_items); + + RtlLeaveCriticalSection(&threadpool_cs); + + work_item = *work_item_ptr; + RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); + + TRACE("executing %p(%p)\n", work_item.function, work_item.context); + + interlocked_inc(&num_busy_workers); + + /* do the work */ + work_item.function(work_item.context); + + interlocked_dec(&num_busy_workers); + } + else + RtlLeaveCriticalSection(&threadpool_cs); + } + else + { + NTSTATUS status; + LARGE_INTEGER timeout; + timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); + status = NtWaitForSingleObject(work_item_event, FALSE, &timeout); + if (status != STATUS_WAIT_0) + break; + } + } - /* do the work */ - work_item.function(work_item.context); + interlocked_dec(&num_workers); RtlExitUserThread(0); /* never reached */ } +static NTSTATUS add_work_item_to_queue(struct work_item *work_item) +{ + NTSTATUS status; + + RtlEnterCriticalSection(&threadpool_cs); + list_add_tail(&work_item_list, &work_item->entry); + num_work_items++; + RtlLeaveCriticalSection(&threadpool_cs); + + if (!work_item_event) + { + HANDLE sem; + status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, LONG_MAX); + if (interlocked_cmpxchg_ptr( (PVOID *)&work_item_event, (PVOID)sem, 0 )) + NtClose(sem); /* somebody beat us to it */ + } + else + status = NtReleaseSemaphore(work_item_event, 1, NULL); + + return status; +} + /*********************************************************************** * RtlQueueWorkItem (NTDLL.@) * @@ -92,16 +184,35 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WO if (Flags != WT_EXECUTEDEFAULT) FIXME("Flags 0x%lx not supported\n", Flags); - /* FIXME: very crude implementation that doesn't support pooling at all */ - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, - NULL, 0, 0, - worker_thread_proc, work_item, &thread, NULL ); + status = add_work_item_to_queue(work_item); + + if ((status == STATUS_SUCCESS) && + ((num_workers == 0) || (num_workers == num_busy_workers))) + { + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, + NULL, 0, 0, + worker_thread_proc, NULL, &thread, NULL ); + if (status == STATUS_SUCCESS) + NtClose( thread ); + + /* NOTE: we don't care if we couldn't create the thread if there is at + * least one other available to process the request */ + if ((num_workers > 0) && (status != STATUS_SUCCESS)) + status = STATUS_SUCCESS; + } + if (status != STATUS_SUCCESS) { + RtlEnterCriticalSection(&threadpool_cs); + + interlocked_dec(&num_work_items); + list_remove(&work_item->entry); RtlFreeHeap(GetProcessHeap(), 0, work_item); + + RtlLeaveCriticalSection(&threadpool_cs); + return status; } - NtClose( thread ); return STATUS_SUCCESS; }

1 0

Robert Shearman : kernel: Add a test for QueueUserWorkItem.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 6f2b0fbf94b23fb98c050dd96d8b7f2084995e57 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f2b0fbf94b23fb98c050dd… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:43:06 2006 +0000 kernel: Add a test for QueueUserWorkItem. --- dlls/kernel/tests/thread.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 444217d..9788447 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -677,6 +677,42 @@ static void test_SetThreadContext(void) #endif /* __i386__ */ +static HANDLE finish_event; +static LONG times_executed; + +static DWORD CALLBACK work_function(void *p) +{ + LONG executed = InterlockedIncrement(&times_executed); + + if (executed == 100) + SetEvent(finish_event); + return 0; +} + +static void test_QueueUserWorkItem(void) +{ + int i; + DWORD wait_result; + DWORD before, after; + + finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); + + before = GetTickCount(); + + for (i = 0; i < 100; i++) + { + BOOL ret = QueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); + ok(ret, "QueueUserWorkItem failed with error %ld\n", GetLastError()); + } + + wait_result = WaitForSingleObject(finish_event, 10000); + + after = GetTickCount(); + trace("100 QueueUserWorkItem calls took %ldms\n", after - before); + ok(wait_result == WAIT_OBJECT_0, "wait failed with error 0x%lx\n", wait_result); + + ok(times_executed == 100, "didn't execute all of the work items\n"); +} START_TEST(thread) { @@ -702,4 +738,5 @@ START_TEST(thread) #ifdef __i386__ test_SetThreadContext(); #endif + test_QueueUserWorkItem(); }

1 0

Robert Shearman : oleaut: Better support for invoking methods with VT_VARIANT argument types.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 264b122d52405864db8c2807548bc65e88e9cc42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=264b122d52405864db8c280… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:22 2006 +0000 oleaut: Better support for invoking methods with VT_VARIANT argument types. --- dlls/oleaut32/typelib.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 317b44c..ede6de5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5110,7 +5110,10 @@ DispCallFunc( { VARIANT *arg = prgpvarg[i]; TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); - memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); + if (prgvt[i] == VT_VARIANT) + memcpy(&args[argspos], arg, _argsize(prgvt[i]) * sizeof(DWORD)); + else + memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); argspos += _argsize(prgvt[i]); } @@ -5231,20 +5234,26 @@ static HRESULT WINAPI ITypeInfo_fnInvoke else if (i < pDispParams->cArgs) { VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; - V_VT(&rgvarg[i]) = V_VT(src_arg); dump_Variant(src_arg); - /* FIXME: this doesn't work for VT_BYREF arguments if - * they are not the same type as in the paramdesc */ - if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) + if (rgvt[i] == VT_VARIANT) + VariantCopy(&rgvarg[i], src_arg); + else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); V_VT(&missing_arg[i]) = V_VT(src_arg); hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + V_VT(&rgvarg[i]) = rgvt[i]; } else + { + /* FIXME: this doesn't work for VT_BYREF arguments if + * they are not the same type as in the paramdesc */ + V_VT(&rgvarg[i]) = V_VT(src_arg); hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + V_VT(&rgvarg[i]) = rgvt[i]; + } if (FAILED(hres)) { @@ -5253,7 +5262,6 @@ static HRESULT WINAPI ITypeInfo_fnInvoke debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } - V_VT(&rgvarg[i]) = rgvt[i]; prgpvarg[i] = &rgvarg[i]; } else if (wParamFlags & PARAMFLAG_FOPT)

1 0

Robert Shearman : wininet: Document InternetCrackUrlW.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: dc03c0e3f364a8c4c6f907d357cc56384c9bce6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc03c0e3f364a8c4c6f907d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:03 2006 +0000 wininet: Document InternetCrackUrlW. --- dlls/wininet/internet.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cde3d52..0402d82 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1124,14 +1124,7 @@ static void ConvertUrlComponentValue(LPS /*********************************************************************** * InternetCrackUrlA (WININET.@) * - * Break up URL into its components - * - * TODO: Handle dwFlags - * - * RETURNS - * TRUE on success - * FALSE on failure - * + * See InternetCrackUrlW. */ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, LPURL_COMPONENTSA lpUrlComponents) @@ -1285,6 +1278,12 @@ static BOOL SetUrlComponentValueW(LPWSTR /*********************************************************************** * InternetCrackUrlW (WININET.@) + * + * Break up URL into its components + * + * RETURNS + * TRUE on success + * FALSE on failure */ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWORD dwFlags, LPURL_COMPONENTSW lpUC)

1 0

Robert Shearman : wininet: InternetCreateUrlW should return the number of bytes needed.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 80e4fb597537b6db4f38a35783131d6f0906a02e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e4fb597537b6db4f38a35… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:44:36 2006 +0000 wininet: InternetCreateUrlW should return the number of bytes needed. InternetCreateUrlW should return the number of bytes needed to store the URL, not the number of characters (reported by Sven Paschukat). --- dlls/wininet/http.c | 5 +++-- dlls/wininet/internet.c | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1a2638c..76f7b7e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2003,9 +2003,10 @@ static BOOL HTTP_HandleRedirect(LPWININE (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) return FALSE; - url_length++; /* for nul terminating character */ - orig_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + orig_url = HeapAlloc(GetProcessHeap(), 0, url_length); + /* convert from bytes to characters */ + url_length = url_length / sizeof(WCHAR) - 1; if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) { HeapFree(GetProcessHeap(), 0, orig_url); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 42eb61d..cde3d52 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3900,10 +3900,7 @@ static void convert_urlcomp_atow(LPURL_C /*********************************************************************** * InternetCreateUrlA (WININET.@) * - * RETURNS - * TRUE on success - * FALSE on failure - * + * See InternetCreateUrlW. */ BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA lpUrlComponents, DWORD dwFlags, LPSTR lpszUrl, LPDWORD lpdwUrlLength) @@ -3930,6 +3927,9 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM ret = InternetCreateUrlW(&urlCompW, dwFlags, urlW, lpdwUrlLength); + if (!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) + *lpdwUrlLength /= sizeof(WCHAR); + /* on success, lpdwUrlLength points to the size of urlW in WCHARS * minus one, so add one to leave room for NULL terminator */ @@ -3950,6 +3950,21 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM /*********************************************************************** * InternetCreateUrlW (WININET.@) * + * Creates a URL from its component parts. + * + * PARAMS + * lpUrlComponents [I] URL Components. + * dwFlags [I] Flags. See notes. + * lpszUrl [I] Buffer in which to store the created URL. + * lpdwUrlLength [I/O] On input, the length of the buffer pointed to by + * lpszUrl in characters. On output, the number of bytes + * required to store the URL including terminator. + * + * NOTES + * + * The dwFlags parameter can be zero or more of the following: + *|ICU_ESCAPE - Generates escape sequences for unsafe characters in the path and extra info of the URL. + * * RETURNS * TRUE on success * FALSE on failure @@ -3980,7 +3995,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (!lpszUrl || *lpdwUrlLength < dwLen) { - *lpdwUrlLength = dwLen + 1; /* terminating null */ + *lpdwUrlLength = (dwLen + 1) * sizeof(WCHAR); SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Alexandre Julliard : ntdll: Added a DLL_WINE_PREATTACH call to DllMain for builtins.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: c307f4990fe89b4a958efcc9107bf25aef6c01d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c307f4990fe89b4a958efcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 15:10:22 2006 +0100 ntdll: Added a DLL_WINE_PREATTACH call to DllMain for builtins. By returning FALSE from this call, a builtin dll can specify that we should try to load the native one instead. --- dlls/ntdll/loader.c | 16 +++++++++++++--- include/winnt.h | 4 +++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 967c298..88878c4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -58,7 +58,9 @@ static const char * const reason_names[] "PROCESS_DETACH", "PROCESS_ATTACH", "THREAD_ATTACH", - "THREAD_DETACH" + "THREAD_DETACH", + NULL, NULL, NULL, NULL, + "WINE_PREATTACH" }; static const WCHAR dllW[] = {'.','d','l','l',0}; @@ -1749,10 +1751,18 @@ static NTSTATUS load_dll( LPCWSTR load_p case LO_BUILTIN_NATIVE: case LO_DEFAULT: /* default is builtin,native */ nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); - if (nts == STATUS_SUCCESS) break; if (!handle) break; /* nothing else we can try */ /* file is not a builtin library, try without using the specified file */ - nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + if (nts != STATUS_SUCCESS) + nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); + if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && + !MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL )) + { + /* stub-only dll, try native */ + TRACE( "%s pre-attach returned FALSE, preferring native\n", debugstr_w(filename) ); + LdrUnloadDll( (*pwm)->ldr.BaseAddress ); + nts = STATUS_DLL_NOT_FOUND; + } if (nts == STATUS_DLL_NOT_FOUND && loadorder != LO_BUILTIN) nts = load_native_dll( load_path, filename, handle, flags, pwm ); break; diff --git a/include/winnt.h b/include/winnt.h index 199383b..053f014 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -469,7 +469,9 @@ typedef DWORD FLONG; #define DLL_PROCESS_ATTACH 1 /* attach process (load library) */ #define DLL_THREAD_ATTACH 2 /* attach new thread */ #define DLL_THREAD_DETACH 3 /* detach thread */ - +#ifdef __WINESRC__ +#define DLL_WINE_PREATTACH 8 /* called before process attach for Wine builtins */ +#endif /* u.x.wProcessorArchitecture (NT) */ #define PROCESSOR_ARCHITECTURE_INTEL 0

1 0

Alexandre Julliard : ddraw: Call DDRAW_ChooseDefaultDriver only on PROCESS_ATTACH.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 8b3e42682122908477e8439a1b67867fb3cf3494 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b3e42682122908477e8439… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 15:06:36 2006 +0100 ddraw: Call DDRAW_ChooseDefaultDriver only on PROCESS_ATTACH. --- dlls/ddraw/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index d9abebe..7783b37 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -677,10 +677,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, opengl_initialized = DDRAW_bind_to_opengl(); #endif /* HAVE_OPENGL */ s3tc_initialized = DDRAW_bind_to_s3tc(); - } - if (DDRAW_num_drivers > 0) - DDRAW_default_driver = DDRAW_ChooseDefaultDriver(); + if (DDRAW_num_drivers > 0) + DDRAW_default_driver = DDRAW_ChooseDefaultDriver(); + } return TRUE; }

1 0

Alexandre Julliard : dlls: Removed a number of dll symlinks that are no longer needed.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 02fa42dc82993cd9ed31dfa9b231649c60f671d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02fa42dc82993cd9ed31dfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 12:01:31 2006 +0100 dlls: Removed a number of dll symlinks that are no longer needed. --- dlls/Makefile.in | 721 +++++------------------------------------------- dlls/Maketest.rules.in | 2 dlls/make_dlls | 42 ++- 3 files changed, 98 insertions(+), 667 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=02fa42dc82993cd9ed3…

1 0

Alexandre Julliard : wcmd: Try executing the process even if the exe file doesn't exist.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 5ac2238ad074d652c70da4691c1028f264592888 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ac2238ad074d652c70da46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 12:00:17 2006 +0100 wcmd: Try executing the process even if the exe file doesn't exist. It may be a builtin exe in which case the CreateProcess call will succeed. --- programs/wcmd/wcmdmain.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 6bc9272..db092b5 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -594,11 +594,11 @@ char filetorun[MAX_PATH]; /* No batch file found, assume executable */ hinst = FindExecutable (param1, NULL, filetorun); - if ((int)hinst < 32) { - WCMD_print_error (); - return; - } - console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE); + if ((int)hinst < 32) + console = 0; + else + console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE); + ZeroMemory (&st, sizeof(STARTUPINFO)); st.cb = sizeof(STARTUPINFO); init_msvcrt_io_block(&st);

1 0