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

Jacek Caban : mshtml: nsio.c code clean up.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 9d9553f9bbaf6066c72cc356d257aa415cd85c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9553f9bbaf6066c72cc356d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:54:10 2010 +0100 mshtml: nsio.c code clean up. --- dlls/mshtml/nsio.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a53bc3f..b95b9c1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -62,7 +62,7 @@ struct nsWineURI { windowref_t *window_ref; nsChannelBSC *channel_bsc; LPWSTR wine_url; - PRBool is_doc_uri; + BOOL is_doc_uri; BOOL use_wine_url; }; @@ -2162,8 +2162,6 @@ static nsresult create_uri(nsIURI *uri, HTMLWindow *window, NSContainer *contain if(uri) nsIURI_QueryInterface(uri, &IID_nsIURL, (void**)&ret->nsurl); - else - ret->nsurl = NULL; TRACE("retval=%p\n", ret); *_retval = ret;

1 0

Jacek Caban : mshtml: Moved asynchronous document binding to separated function.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 0bccfa873db617254ad77b064ce66520f6f27170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bccfa873db617254ad77b064… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:53:32 2010 +0100 mshtml: Moved asynchronous document binding to separated function. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 21 ++------------------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f2ef1af..8f91d38 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -740,6 +740,7 @@ void add_nsevent_listener(HTMLDocumentNode*,LPCWSTR); void set_window_bscallback(HTMLWindow*,nsChannelBSC*); void set_current_mon(HTMLWindow*,IMoniker*); HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*); +HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*); void abort_document_bindings(HTMLDocumentNode*); HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f660c98..b3ca1b0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1148,6 +1148,36 @@ void set_window_bscallback(HTMLWindow *window, nsChannelBSC *callback) } } +typedef struct { + task_t header; + HTMLWindow *window; + nsChannelBSC *bscallback; +} start_doc_binding_task_t; + +static void start_doc_binding_proc(task_t *_task) +{ + start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; + + start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); + IBindStatusCallback_Release(STATUSCLB(&task->bscallback->bsc)); +} + +HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) +{ + start_doc_binding_task_t *task; + + task = heap_alloc(sizeof(start_doc_binding_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->window = window; + task->bscallback = bscallback; + IBindStatusCallback_AddRef(STATUSCLB(&bscallback->bsc)); + + push_task(&task->header, start_doc_binding_proc, window->task_magic); + return S_OK; +} + void abort_document_bindings(HTMLDocumentNode *doc) { BSCallback *iter; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fde132a..3a5c4fe 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -808,19 +808,7 @@ static void start_binding_proc(task_t *_task) start_binding_task_t *task = (start_binding_task_t*)_task; start_binding(NULL, task->doc, (BSCallback*)task->bscallback, NULL); -} - -typedef struct { - task_t header; - HTMLWindow *window; - nsChannelBSC *bscallback; -} start_doc_binding_task_t; -static void start_doc_binding_proc(task_t *_task) -{ - start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; - - start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); IUnknown_Release((IUnknown*)task->bscallback); } @@ -844,14 +832,9 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan channelbsc_set_channel(bscallback, This, listener, context); if(is_doc_channel) { - start_doc_binding_task_t *task; - set_window_bscallback(window, bscallback); - - task = heap_alloc(sizeof(start_doc_binding_task_t)); - task->window = window; - task->bscallback = bscallback; - push_task(&task->header, start_doc_binding_proc, window->task_magic); + async_start_doc_binding(window, bscallback); + IUnknown_Release((IUnknown*)bscallback); }else { start_binding_task_t *task = heap_alloc(sizeof(start_binding_task_t));

1 0

Hans Leidekker : setupapi: Destination directory defaults to system directory.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 1b8ba2537111f0d691d2592bb4ffb6bc4fe4f20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8ba2537111f0d691d2592bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 3 14:37:17 2010 +0100 setupapi: Destination directory defaults to system directory. --- dlls/setupapi/queue.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 6a2b8d6..d302924 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -338,10 +338,17 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) static const WCHAR Dest[] = {'D','e','s','t','i','n','a','t','i','o','n','D','i','r','s',0}; static const WCHAR Def[] = {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; INFCONTEXT context; + WCHAR systemdir[MAX_PATH], *dir; + BOOL ret; - if (!SetupFindFirstLineW( hinf, Dest, section, &context ) && - !SetupFindFirstLineW( hinf, Dest, Def, &context )) return NULL; - return PARSER_get_dest_dir( &context ); + if (!(ret = SetupFindFirstLineW( hinf, Dest, section, &context ))) + ret = SetupFindFirstLineW( hinf, Dest, Def, &context ); + + if (ret && (dir = PARSER_get_dest_dir( &context ))) + return dir; + + GetSystemDirectoryW( systemdir, MAX_PATH ); + return strdupW( systemdir ); }

1 0

Jacek Caban : mshtml: Allow post data and headers to be passed to create_channelbsc.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 01b2388c2255a0e05525ad8607446f39c5067614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b2388c2255a0e05525ad860… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:53:49 2010 +0100 mshtml: Allow post data and headers to be passed to create_channelbsc. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 52 ++++++++++++++++++++++++++++++++--------- dlls/mshtml/nsio.c | 4 ++- dlls/mshtml/persist.c | 4 ++- 4 files changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8f91d38..bf6561c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -745,7 +745,7 @@ void abort_document_bindings(HTMLDocumentNode*); HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*); -nsChannelBSC *create_channelbsc(IMoniker*); +HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); IMoniker *get_channelbsc_mon(nsChannelBSC*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b3ca1b0..e326e3c 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1113,13 +1113,37 @@ static const BSCallbackVtbl nsChannelBSCVtbl = { nsChannelBSC_on_response }; -nsChannelBSC *create_channelbsc(IMoniker *mon) +HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD post_data_size, nsChannelBSC **retval) { - nsChannelBSC *ret = heap_alloc_zero(sizeof(*ret)); + nsChannelBSC *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA); - return ret; + if(headers) { + ret->bsc.headers = heap_strdupW(headers); + if(!ret->bsc.headers) { + IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); + return E_OUTOFMEMORY; + } + } + + if(post_data) { + ret->bsc.post_data = GlobalAlloc(0, post_data_size); + if(!ret->bsc.headers) { + IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); + return E_OUTOFMEMORY; + } + + memcpy(ret->bsc.post_data, post_data, post_data_size); + ret->bsc.post_data_len = post_data_size; + } + + *retval = ret; + return S_OK; } IMoniker *get_channelbsc_mon(nsChannelBSC *This) @@ -1229,8 +1253,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsIInputStream *post_data_stream, DWORD hlnf) { IHlinkFrame *hlink_frame; + nsChannelBSC *callback; IServiceProvider *sp; - BSCallback *callback; IBindCtx *bindctx; IMoniker *mon; IHlink *hlink; @@ -1247,16 +1271,20 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, if(FAILED(hres)) return hres; - callback = &create_channelbsc(NULL)->bsc; + hres = create_channelbsc(NULL, NULL, NULL, 0, &callback); + if(FAILED(hres)) { + IHlinkFrame_Release(hlink_frame); + return hres; + } if(post_data_stream) { - parse_post_data(post_data_stream, &callback->headers, &callback->post_data, - &callback->post_data_len); - TRACE("headers = %s post_data = %s\n", debugstr_w(callback->headers), - debugstr_an(callback->post_data, callback->post_data_len)); + parse_post_data(post_data_stream, &callback->bsc.headers, &callback->bsc.post_data, + &callback->bsc.post_data_len); + TRACE("headers = %s post_data = %s\n", debugstr_w(callback->bsc.headers), + debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); } - hres = CreateAsyncBindCtx(0, STATUSCLB(callback), NULL, &bindctx); + hres = CreateAsyncBindCtx(0, STATUSCLB(&callback->bsc), NULL, &bindctx); if(SUCCEEDED(hres)) hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hlink); @@ -1272,14 +1300,14 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ } - hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(callback), hlink); + hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, STATUSCLB(&callback->bsc), hlink); IMoniker_Release(mon); } IHlinkFrame_Release(hlink_frame); IBindCtx_Release(bindctx); - IBindStatusCallback_Release(STATUSCLB(callback)); + IBindStatusCallback_Release(STATUSCLB(&callback->bsc)); return hres; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3a5c4fe..a53bc3f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -826,8 +826,10 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan if(is_doc_channel) set_current_mon(window, mon); - bscallback = create_channelbsc(mon); + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); IMoniker_Release(mon); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; channelbsc_set_channel(bscallback, This, listener, context); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 86b0f02..d903ac7 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -259,7 +259,9 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(FAILED(hres)) return hres; - bscallback = create_channelbsc(mon); + hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); + if(FAILED(hres)) + return hres; hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); nsISupports_Release((nsISupports*)nsuri); /* FIXME */

1 0

Hans Leidekker : msi: Implement the RemoveEnvironmentStrings standard action.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: f62211198a67e4efcf4b62e01b65025eda44b536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62211198a67e4efcf4b62e01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 3 14:38:06 2010 +0100 msi: Implement the RemoveEnvironmentStrings standard action. --- dlls/msi/action.c | 195 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 159 insertions(+), 36 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4441030..08cf975 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5810,7 +5810,7 @@ static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) #define check_flag_combo(x, y) ((x) & ~(y)) == (y) -static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) +static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) { LPCWSTR cptr = *name; @@ -5891,18 +5891,8 @@ static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) return ERROR_SUCCESS; } -static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) +static UINT open_env_key( DWORD flags, HKEY *key ) { - MSIPACKAGE *package = param; - LPCWSTR name, value, component; - LPWSTR data = NULL, newval = NULL; - LPWSTR deformatted = NULL, ptr; - DWORD flags, type, size; - LONG res; - HKEY env = NULL, root; - LPCWSTR environment; - MSICOMPONENT *comp; - static const WCHAR user_env[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; static const WCHAR machine_env[] = @@ -5911,6 +5901,42 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) 'C','o','n','t','r','o','l','\\', 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', 'E','n','v','i','r','o','n','m','e','n','t',0}; + const WCHAR *env; + HKEY root; + LONG res; + + if (flags & ENV_MOD_MACHINE) + { + env = machine_env; + root = HKEY_LOCAL_MACHINE; + } + else + { + env = user_env; + root = HKEY_CURRENT_USER; + } + + res = RegOpenKeyExW( root, env, 0, KEY_ALL_ACCESS, key ); + if (res != ERROR_SUCCESS) + { + WARN("Failed to open key %s (%d)\n", debugstr_w(env), res); + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; +} + +static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPCWSTR name, value, component; + LPWSTR data = NULL, newval = NULL, deformatted = NULL, ptr; + DWORD flags, type, size; + UINT res; + HKEY env; + MSICOMPONENT *comp; + MSIRECORD *uirow; + int action = 0; component = MSI_RecordGetString(rec, 4); comp = get_loaded_component(package, component); @@ -5930,7 +5956,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) TRACE("name %s value %s\n", debugstr_w(name), debugstr_w(value)); - res = env_set_flags(&name, &value, &flags); + res = env_parse_flags(&name, &value, &flags); if (res != ERROR_SUCCESS || !value) goto done; @@ -5942,24 +5968,12 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) value = deformatted; - if (flags & ENV_MOD_MACHINE) - { - environment = machine_env; - root = HKEY_LOCAL_MACHINE; - } - else - { - environment = user_env; - root = HKEY_CURRENT_USER; - } - - res = RegCreateKeyExW(root, environment, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &env, NULL); + res = open_env_key( flags, &env ); if (res != ERROR_SUCCESS) goto done; - if (flags & ENV_ACT_REMOVE) - FIXME("Not removing environment variable on uninstall!\n"); + if (flags & ENV_MOD_MACHINE) + action |= 0x20000000; size = 0; type = REG_SZ; @@ -5970,6 +5984,8 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if ((res == ERROR_FILE_NOT_FOUND || !(flags & ENV_MOD_MASK))) { + action = 0x2; + /* Nothing to do. */ if (!value) { @@ -5990,6 +6006,8 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) } else { + action = 0x1; + /* Contrary to MSDN, +-variable to [~];path works */ if (flags & ENV_ACT_SETABSENT && !(flags & ENV_MOD_MASK)) { @@ -6010,7 +6028,10 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (flags & ENV_ACT_REMOVEMATCH && (!value || !lstrcmpW(data, value))) { - res = RegDeleteKeyW(env, name); + action = 0x4; + res = RegDeleteValueW(env, name); + if (res != ERROR_SUCCESS) + WARN("Failed to remove value %s (%d)\n", debugstr_w(name), res); goto done; } @@ -6037,6 +6058,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) { lstrcpyW(newval, value); ptr = newval + lstrlenW(value); + action |= 0x80000000; } lstrcpyW(ptr, data); @@ -6044,12 +6066,24 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) if (flags & ENV_MOD_APPEND) { lstrcatW(newval, value); + action |= 0x40000000; } } TRACE("setting %s to %s\n", debugstr_w(name), debugstr_w(newval)); res = RegSetValueExW(env, name, 0, type, (LPVOID)newval, size); + if (res) + { + WARN("Failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(newval), res); + } done: + uirow = MSI_CreateRecord( 3 ); + MSI_RecordSetStringW( uirow, 1, name ); + MSI_RecordSetStringW( uirow, 2, newval ); + MSI_RecordSetInteger( uirow, 3, action ); + ui_actiondata( package, szWriteEnvironmentStrings, uirow ); + msiobj_release( &uirow->hdr ); + if (env) RegCloseKey(env); msi_free(deformatted); msi_free(data); @@ -6074,6 +6108,102 @@ static UINT ACTION_WriteEnvironmentStrings( MSIPACKAGE *package ) return rc; } +static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPCWSTR name, value, component; + LPWSTR deformatted = NULL; + DWORD flags; + HKEY env; + MSICOMPONENT *comp; + MSIRECORD *uirow; + int action = 0; + LONG res; + UINT r; + + component = MSI_RecordGetString( rec, 4 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Component not scheduled for removal: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; + + name = MSI_RecordGetString( rec, 2 ); + value = MSI_RecordGetString( rec, 3 ); + + TRACE("name %s value %s\n", debugstr_w(name), debugstr_w(value)); + + r = env_parse_flags( &name, &value, &flags ); + if (r != ERROR_SUCCESS) + return r; + + if (!(flags & ENV_ACT_REMOVE)) + { + TRACE("Environment variable %s not marked for removal\n", debugstr_w(name)); + return ERROR_SUCCESS; + } + + if (value && !deformat_string( package, value, &deformatted )) + return ERROR_OUTOFMEMORY; + + value = deformatted; + + r = open_env_key( flags, &env ); + if (r != ERROR_SUCCESS) + { + r = ERROR_SUCCESS; + goto done; + } + + if (flags & ENV_MOD_MACHINE) + action |= 0x20000000; + + TRACE("Removing %s\n", debugstr_w(name)); + + res = RegDeleteValueW( env, name ); + if (res != ERROR_SUCCESS) + { + WARN("Failed to delete value %s (%d)\n", debugstr_w(name), res); + r = ERROR_SUCCESS; + } + +done: + uirow = MSI_CreateRecord( 3 ); + MSI_RecordSetStringW( uirow, 1, name ); + MSI_RecordSetStringW( uirow, 2, value ); + MSI_RecordSetInteger( uirow, 3, action ); + ui_actiondata( package, szRemoveEnvironmentStrings, uirow ); + msiobj_release( &uirow->hdr ); + + if (env) RegCloseKey( env ); + msi_free( deformatted ); + return r; +} + +static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','E','n','v','i','r','o','n','m','e','n','t','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveEnvironmentString, package ); + msiobj_release( &view->hdr ); + + return rc; +} + #define is_dot_dir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))) typedef struct @@ -6972,13 +7102,6 @@ static UINT ACTION_MigrateFeatureStates( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "MigrateFeatureStates", table ); } -static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { - 'E','n','v','i','r','o','n','m','e','n','t',0 }; - return msi_unimplemented_action_stub( package, "RemoveEnvironmentStrings", table ); -} - static UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) { static const WCHAR table[] = {

1 0

Nikolay Sivov : shell32: Remove WINAPI where it's not needed.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: ab0e037ee09716be92886601d94ca2c9e3d0da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0e037ee09716be92886601d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 05:16:49 2010 +0300 shell32: Remove WINAPI where it's not needed. --- dlls/shell32/pidl.c | 8 ++++---- dlls/shell32/pidl.h | 2 +- dlls/shell32/undocshell.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 0774fde..ecda891 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -92,7 +92,7 @@ static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat return ret; } -BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) +BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { LPSHELLFOLDER psfParent, lsf = psf; HRESULT ret = NO_ERROR; @@ -393,7 +393,7 @@ static HRESULT SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at return SHILCreateFromPathW(lpszDisplayName, ppidl, attributes); } -HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) +HRESULT SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { LPSHELLFOLDER sf; DWORD pchEaten; @@ -1050,7 +1050,7 @@ static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, * exists on disk. * exported by ordinal. */ -LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) +LPITEMIDLIST SHSimpleIDListFromPathA(LPCSTR lpszPath) { LPITEMIDLIST pidl = NULL; LPWSTR wPath = NULL; @@ -1072,7 +1072,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) return pidl; } -LPITEMIDLIST WINAPI SHSimpleIDListFromPathW(LPCWSTR lpszPath) +LPITEMIDLIST SHSimpleIDListFromPathW(LPCWSTR lpszPath) { LPITEMIDLIST pidl = NULL; diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 73bc3fb..3dbfaa6 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -271,6 +271,6 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl); LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl); LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); -BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); +BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index f8a1b70..513006d 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -52,10 +52,10 @@ BOOL WINAPI ILGetDisplayNameEx( LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl); void WINAPI ILGlobalFree(LPITEMIDLIST pidl); -LPITEMIDLIST WINAPI SHSimpleIDListFromPathA (LPCSTR lpszPath); -LPITEMIDLIST WINAPI SHSimpleIDListFromPathW (LPCWSTR lpszPath); +LPITEMIDLIST SHSimpleIDListFromPathA (LPCSTR lpszPath); +LPITEMIDLIST SHSimpleIDListFromPathW (LPCWSTR lpszPath); -HRESULT WINAPI SHILCreateFromPathW ( +HRESULT SHILCreateFromPathW ( LPCWSTR path, LPITEMIDLIST * ppidl, DWORD *attributes);

1 0

Jacek Caban : include: Added IHTMLPrivateWindow declaration.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 73a581370619edc652686d83e984d947d448aa27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a581370619edc652686d83e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:52:32 2010 +0100 include: Added IHTMLPrivateWindow declaration. --- include/mshtml.idl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 98edbbc..1941b92 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15407,3 +15407,23 @@ interface IElementBehaviorFactory : IUnknown } } /* library MSHTML */ + +interface IOleCommandTarget; + +/***************************************************************************** + * IHTMLPrivateWindow interface + */ +[ + object, + uuid(3050f6dc-98b5-11cf-bb82-00aa00bdce0b), + local +] +interface IHTMLPrivateWindow : IUnknown +{ + HRESULT SuperNavigate(BSTR url, BSTR arg2, BSTR arg3, BSTR arg4, VARIANT *post_data, VARIANT *headers, ULONG flags); + HRESULT GetPendingUrl(BSTR *url); + HRESULT SetPICSTarget(IOleCommandTarget *cmdtrg); + HRESULT PICSComplete(int arg); + HRESULT FindWindowByName(LPCWSTR name, IHTMLWindow2 **ret); + HRESULT GetAddressBarUrl(BSTR *url); +}

1 0

Hans Leidekker : msi: Strip leading text style label from control text before lookup in binary table .
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 7b6858546c7a1ed05e4ea85a6f1a387b75f3bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6858546c7a1ed05e4ea85a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 3 14:37:39 2010 +0100 msi: Strip leading text style label from control text before lookup in binary table. --- dlls/msi/dialog.c | 61 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5fd4bbd..ac2e95a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -801,11 +801,31 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/* strip any leading text style label from text field */ +static WCHAR *msi_get_binary_name( MSIPACKAGE *package, MSIRECORD *rec ) +{ + WCHAR *p, *text; + + text = msi_get_deformatted_field( package, rec, 10 ); + if (!text) + return NULL; + + p = text; + while (*p && *p != '{') p++; + if (!*p++) return text; + + while (*p && *p != '}') p++; + if (!*p++) return text; + + p = strdupW( p ); + msi_free( text ); + return p; +} + static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; UINT attributes, style; - LPWSTR text; TRACE("%p %p\n", dialog, rec); @@ -820,12 +840,19 @@ static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) control->handler = msi_dialog_button_handler; - /* set the icon */ - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hIcon = msi_load_icon( dialog->package->db, text, attributes ); - if( attributes & msidbControlAttributesIcon ) - SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); - msi_free( text ); + if (attributes & msidbControlAttributesIcon) + { + /* set the icon */ + LPWSTR name = msi_get_binary_name( dialog->package, rec ); + control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); + if (control->hIcon) + { + SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); + } + else + ERR("Failed to load icon %s\n", debugstr_w(name)); + msi_free( name ); + } return ERROR_SUCCESS; } @@ -1142,7 +1169,7 @@ static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) { UINT cx, cy, flags, style, attributes; msi_control *control; - LPWSTR text; + LPWSTR name; flags = LR_LOADFROMFILE; style = SS_BITMAP | SS_LEFT | WS_GROUP; @@ -1160,15 +1187,15 @@ static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) cx = msi_dialog_scale_unit( dialog, cx ); cy = msi_dialog_scale_unit( dialog, cy ); - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hBitmap = msi_load_picture( dialog->package->db, text, cx, cy, flags ); + name = msi_get_binary_name( dialog->package, rec ); + control->hBitmap = msi_load_picture( dialog->package->db, name, cx, cy, flags ); if( control->hBitmap ) SendMessageW( control->hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM) control->hBitmap ); else - ERR("Failed to load bitmap %s\n", debugstr_w(text)); + ERR("Failed to load bitmap %s\n", debugstr_w(name)); - msi_free( text ); + msi_free( name ); return ERROR_SUCCESS; } @@ -1177,7 +1204,7 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; DWORD attributes; - LPWSTR text; + LPWSTR name; TRACE("\n"); @@ -1185,13 +1212,13 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) SS_ICON | SS_CENTERIMAGE | WS_GROUP ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hIcon = msi_load_icon( dialog->package->db, text, attributes ); + name = msi_get_binary_name( dialog->package, rec ); + control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); if( control->hIcon ) SendMessageW( control->hwnd, STM_SETICON, (WPARAM) control->hIcon, 0 ); else - ERR("Failed to load bitmap %s\n", debugstr_w(text)); - msi_free( text ); + ERR("Failed to load bitmap %s\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; }

1 0

Nikolay Sivov : shell32: Implement SHParseDisplayName with basic tests.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: 500c78505382955e307b525a9750a1e0a87adb8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=500c78505382955e307b525a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 04:56:20 2010 +0300 shell32: Implement SHParseDisplayName with basic tests. --- dlls/shell32/pidl.c | 21 +++++++++-- dlls/shell32/shfldr_desktop.c | 6 ++-- dlls/shell32/tests/shlfolder.c | 78 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 3e61144..0774fde 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1326,9 +1326,24 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST *pidlist, SFGAOF attr_in, SFGAOF *attr_out) { - FIXME("%s %p %p %d %p stub!\n", debugstr_w(name), bindctx, pidlist, attr_in, attr_out); - if(pidlist) *pidlist = NULL; - return E_NOTIMPL; + IShellFolder *desktop; + HRESULT hr; + + TRACE("%s %p %p %d %p\n", debugstr_w(name), bindctx, pidlist, attr_in, attr_out); + + *pidlist = NULL; + + if (!name) return E_OUTOFMEMORY; + + hr = SHGetDesktopFolder(&desktop); + if (hr != S_OK) return hr; + + hr = IShellFolder_ParseDisplayName(desktop, NULL, bindctx, (LPWSTR)name, NULL, pidlist, &attr_in); + if (attr_out) *attr_out = attr_in; + + IShellFolder_Release(desktop); + + return hr; } /************************************************************************** diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index a08bb41..d6ccb72 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -151,11 +151,11 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), pchEaten, ppidl, pdwAttributes); - if (!lpszDisplayName || !ppidl) - return E_INVALIDARG; - + if (!ppidl) return E_INVALIDARG; *ppidl = 0; + if (!lpszDisplayName) return E_INVALIDARG; + if (pchEaten) *pchEaten = 0; /* strange but like the original */ diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 27c6ee8..9b19471 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -54,7 +54,7 @@ static void (WINAPI *pILFree)(LPITEMIDLIST); static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static LPITEMIDLIST (WINAPI *pILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); - +static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); static void init_function_pointers(void) { @@ -71,6 +71,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetPathFromIDListW); MAKEFUNC(SHGetSpecialFolderPathA); MAKEFUNC(SHGetSpecialFolderPathW); + MAKEFUNC(SHParseDisplayName); #undef MAKEFUNC #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) @@ -103,6 +104,18 @@ static void test_ParseDisplayName(void) hr = SHGetDesktopFolder(&IDesktopFolder); if(hr != S_OK) return; + /* null name and pidl */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, NULL, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + + /* null name */ + newPIDL = (ITEMIDLIST*)0xdeadbeef; + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, NULL, NULL, &newPIDL, 0); + ok(newPIDL == 0, "expected null, got %p\n", newPIDL); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); @@ -1962,6 +1975,68 @@ static void test_SHCreateShellItem(void) IShellFolder_Release(desktopfolder); } +static void test_SHParseDisplayName(void) +{ + static const WCHAR prefixW[] = {'w','t',0}; + LPITEMIDLIST pidl1, pidl2; + IShellFolder *desktop; + WCHAR dirW[MAX_PATH]; + WCHAR nameW[10]; + HRESULT hr; + BOOL ret; + + if (!pSHParseDisplayName) + { + win_skip("SHParseDisplayName isn't available\n"); + return; + } + +if (0) +{ + /* crashes on native */ + hr = pSHParseDisplayName(NULL, NULL, NULL, 0, NULL); + nameW[0] = 0; + hr = pSHParseDisplayName(nameW, NULL, NULL, 0, NULL); +} + + pidl1 = (LPITEMIDLIST)0xdeadbeef; + hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); + ok(hr == E_OUTOFMEMORY, "failed %08x\n", hr); + ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); + + /* dummy name */ + nameW[0] = 0; + hr = pSHParseDisplayName(nameW, NULL, &pidl1, 0, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "failed %08x\n", hr); + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, nameW, NULL, &pidl2, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + ret = pILIsEqual(pidl1, pidl2); + ok(ret == TRUE, "expected equal idls\n"); + pILFree(pidl1); + pILFree(pidl2); + + /* with path */ + GetTempPathW(sizeof(dirW)/sizeof(WCHAR), dirW); + GetTempFileNameW(dirW, prefixW, 0, dirW); + CreateFileW(dirW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + + hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, dirW, NULL, &pidl2, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + + ret = pILIsEqual(pidl1, pidl2); + ok(ret == TRUE, "expected equal idls\n"); + pILFree(pidl1); + pILFree(pidl2); + + DeleteFileW(dirW); + + IShellFolder_Release(desktop); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -1970,6 +2045,7 @@ START_TEST(shlfolder) OleInitialize(NULL); test_ParseDisplayName(); + test_SHParseDisplayName(); test_BindToObject(); test_EnumObjects_and_CompareIDs(); test_GetDisplayName();

1 0

Louis Lenders : wine.inf: Add windows\help directory.
by Alexandre Julliard March 3, 2010

March 3, 2010

Module: wine Branch: master Commit: cd172dff7cc622889e432ecbfe20ad6c880dfac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd172dff7cc622889e432ecbf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Mar 2 22:07:50 2010 +0100 wine.inf: Add windows\help directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e53a2f7..e4e3829 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2427,6 +2427,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [FakeDllsSection] ; create some directories first +10,help, 10,inf, 10,temp, 11,mui,

1 0