September 2009 - Wine-commits

Jacek Caban : mshtml: Fixed tests.
by Alexandre Julliard 15 Sep '09

15 Sep '09

Module: wine Branch: master Commit: a7e8cdf3732086b9e3f7ddeb1503e3b4d64e135a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e8cdf3732086b9e3f7ddeb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 11 18:41:45 2009 +0200 mshtml: Fixed tests. Based on Paul Vriens's feedback. --- dlls/mshtml/tests/htmldoc.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 15aeca4..1eb0cea 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2763,7 +2763,12 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) test_readyState((IUnknown*)persist); } -static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) +#define DWL_VERBDONE 0x0001 +#define DWL_CSS 0x0002 +#define DWL_TRYCSS 0x0004 +#define DWL_HTTP 0x0008 + +static void test_download(DWORD flags) { HWND hwnd; MSG msg; @@ -2773,17 +2778,16 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) test_readyState(NULL); - if(verb_done) { + if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); - if(!load_from_stream) - SET_EXPECT(GetHostInfo); - } + if((flags & DWL_VERBDONE) && !load_from_stream) + SET_EXPECT(GetHostInfo); SET_EXPECT(SetStatusText); SET_EXPECT(Exec_SETDOWNLOADSTATE_1); SET_EXPECT(GetDropTarget); - if(css_try_dwl) + if(flags & DWL_TRYCSS) SET_EXPECT(Exec_ShellDocView_84); - if(css_dwl) { + if(flags & DWL_CSS) { SET_EXPECT(CreateInstance); SET_EXPECT(Start); SET_EXPECT(LockRequest); @@ -2817,17 +2821,18 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) DispatchMessage(&msg); } - if(verb_done) { + if(flags & DWL_VERBDONE) CHECK_CALLED(Exec_SETPROGRESSMAX); - if(!load_from_stream) - CHECK_CALLED(GetHostInfo); - } + if(flags & DWL_HTTP) + SET_CALLED(Exec_SETPROGRESSMAX); + if((flags & DWL_VERBDONE) && !load_from_stream) + CHECK_CALLED(GetHostInfo); CHECK_CALLED(SetStatusText); CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(GetDropTarget); - if(css_try_dwl) + if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); - if(css_dwl) { + if(flags & DWL_CSS) { if(called_CreateInstance) { CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); @@ -3878,7 +3883,7 @@ static void test_HTMLDocument(BOOL do_load) test_Activate(unk, CLIENTSITE_EXPECTPATH); if(do_load) { - test_download(FALSE, TRUE, TRUE); + test_download(DWL_CSS|DWL_TRYCSS); test_GetCurMoniker(unk, &Moniker, NULL); } @@ -3973,7 +3978,7 @@ static void test_HTMLDocument_hlink(void) return; } - test_download(FALSE, TRUE, TRUE); + test_download(DWL_CSS|DWL_TRYCSS); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); @@ -4025,7 +4030,7 @@ static void test_HTMLDocument_http(void) return; } - test_download(FALSE, FALSE, FALSE); + test_download(DWL_HTTP); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); @@ -4077,7 +4082,7 @@ static void test_HTMLDocument_StreamLoad(void) test_GetCurMoniker(unk, NULL, NULL); test_StreamLoad(unk); - test_download(TRUE, FALSE, TRUE); + test_download(DWL_VERBDONE|DWL_TRYCSS); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_UIDeactivate(); @@ -4158,7 +4163,7 @@ static void test_editing_mode(BOOL do_load) IOleObject_Release(oleobj); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); - test_download(TRUE, do_load, do_load); + test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI);

1 0

Zachary Goldberg : WWN 359
by Jeremy Newman 14 Sep '09

14 Sep '09

Module: website Branch: master Commit: 5b22ad82ce238db401174ec6cdae9f8a739fe0ec URL: http://source.winehq.org/git/website.git/?a=commit;h=5b22ad82ce238db401174e… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Sun Sep 13 18:56:46 2009 -0400 WWN 359 --- news/en/2009091301.xml | 12 + wwn/en/wn20090913_359.xml | 4666 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4678 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5b22ad82ce238db401…

1 0

Paul Vriens : ntdll/tests: Fix some test failures on several platforms.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 4e6db1e18637106aef1f736dad6e9fcd6ff6dc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6db1e18637106aef1f736da… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Sep 11 16:38:31 2009 +0200 ntdll/tests: Fix some test failures on several platforms. --- dlls/ntdll/tests/file.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 48b9ce8..a8052b1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -801,7 +801,8 @@ static void test_file_basic_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - ok ( fbi.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not FILE_ATTRIBUTE_ARCHIVE\n", fbi.FileAttributes ); + ok ( (fbi.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, + "attribute %x not expected\n", fbi.FileAttributes ); /* Then SYSTEM */ /* Clear fbi to avoid setting times */ @@ -859,14 +860,16 @@ static void test_file_all_information(void) /* Check default first */ res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - ok ( fai_buf.fai.BasicInformation.FileAttributes == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not FILE_ATTRIBUTE_ARCHIVE\n", fai_buf.fai.BasicInformation.FileAttributes ); + ok ( (fai_buf.fai.BasicInformation.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, + "attribute %x not expected\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Then SYSTEM */ /* Clear fbi to avoid setting times */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); fai_buf.fai.BasicInformation.FileAttributes = FILE_ATTRIBUTE_SYSTEM; res = pNtSetInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); - ok ( res == STATUS_NOT_IMPLEMENTED, "shouldn't be able to set FileAllInformation, res %x\n", res); + todo_wine + ok ( res == STATUS_INVALID_INFO_CLASS, "shouldn't be able to set FileAllInformation, res %x\n", res); res = pNtSetInformationFile(h, &io, &fai_buf.fai.BasicInformation, sizeof fai_buf.fai.BasicInformation, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't set system attribute\n"); @@ -911,7 +914,8 @@ static void test_file_both_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBothDirectoryInformation); - ok ( res == STATUS_NOT_IMPLEMENTED, "whoops, vista doesn't implement this one?\n"); + todo_wine + ok ( res == STATUS_INVALID_INFO_CLASS, "shouldn't be able to query FileBothDirectoryInformation, res %x\n", res); CloseHandle( h ); }

1 0

Hans Leidekker : msi: Set ProductState property.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 5669e67d4828d7abf3c30378b22b732dbb8b0a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5669e67d4828d7abf3c30378b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 11 15:46:12 2009 +0200 msi: Set ProductState property. --- dlls/msi/package.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 82de944..f74bf05 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -453,13 +453,14 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szTime[] = {'T','i','m','e',0}; static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; + static const WCHAR szProductState[] = {'P','r','o','d','u','c','t','S','t','a','t','e',0}; /* * Other things that probably should be set: * * ComputerName LogonUser VirtualMemory * ShellAdvSupport DefaultUIFont PackagecodeChanging - * ProductState CaptionHeight BorderTop BorderSide TextHeight + * CaptionHeight BorderTop BorderSide TextHeight * RedirectedDllSupport */ @@ -658,6 +659,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW(bufstr, szIntFormat, langid); MSI_SetPropertyW( package, szSystemLangID, bufstr ); + + sprintfW(bufstr, szIntFormat, MsiQueryProductStateW(package->ProductCode)); + MSI_SetPropertyW( package, szProductState, bufstr ); } static UINT msi_load_summary_properties( MSIPACKAGE *package ) @@ -804,12 +808,14 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) create_temp_property_table( package ); msi_clone_properties( package ); - set_installer_properties(package); - sprintfW(uilevel,szpi,gUILevel); - MSI_SetPropertyW(package, szLevel, uilevel); package->ProductCode = msi_dup_property( package, szProductCode ); set_installed_prop( package ); + set_installer_properties( package ); + + sprintfW(uilevel,szpi,gUILevel); + MSI_SetPropertyW(package, szLevel, uilevel); + r = msi_load_summary_properties( package ); if (r != ERROR_SUCCESS) {

1 0

Alexandre Julliard : quartz: Add proxies for strmif.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: c81ac66d87f8f3d5c14c30863196d1c3330e39ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81ac66d87f8f3d5c14c30863… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 13:40:17 2009 +0200 quartz: Add proxies for strmif.idl. --- .gitignore | 2 + dlls/quartz/Makefile.in | 7 ++- dlls/quartz/main.c | 104 +++++++++++++++++++++++++++-------------- dlls/quartz/quartz_strmif.idl | 22 +++++++++ dlls/quartz/regsvr.c | 59 +++-------------------- 5 files changed, 107 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c81ac66d87f8f3d5c14c3…

1 0

Alexandre Julliard : include: Fix an idl string type.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 496d487c09f5885b2818f0fc06f5cd084503bcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496d487c09f5885b2818f0fc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 13:39:32 2009 +0200 include: Fix an idl string type. --- include/axextend.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index bbbf179..c546a7e 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -266,7 +266,7 @@ interface IFilterMapper2 : IUnknown HRESULT UnregisterFilter ( [in] const CLSID *pclsidCategory, - [in] const OLECHAR *szInstance, + [in] LPCOLESTR szInstance, [in] REFCLSID Filter ); @@ -275,7 +275,7 @@ interface IFilterMapper2 : IUnknown [in] LPCWSTR Name, [in, out] IMoniker **ppMoniker, [in] const CLSID *pclsidCategory, - [in] const OLECHAR *szInstance, + [in] LPCOLESTR szInstance, [in] const REGFILTER2 *prf2 );

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetDesc().
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: f1d4ab32243b9bcb33550afa8cf97b8529b03382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d4ab32243b9bcb33550afa8… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 10 21:27:11 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetDesc(). --- dlls/d3d10/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d468896..d1bd7ee 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1677,9 +1677,39 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, D3D10_EFFECT_VARIABLE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if(This == &null_variable) + { + WARN("Null variable specified\n"); + return E_FAIL; + } + + if(!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + memset(desc, 0, sizeof(*desc)); + desc->Name = This->name; + desc->Semantic = This->semantic; + desc->Flags = This->flag; + desc->Annotations = This->annotation_count; + desc->BufferOffset = This->buffer_offset; + + if( This->flag == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + { + desc->ExplicitBindPoint = This->buffer_offset; + } + else if(This->flag) + { + FIXME("Unhandled flag %#x!\n", This->flag); + } + + return S_OK; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByIndex(

1 0

Rico Schüller : d3d10: Add variable semantic parsing.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 3517d75f43e9f984aaef68a00009dffa8b35ac36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3517d75f43e9f984aaef68a00… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Sep 10 21:00:22 2009 +0200 d3d10: Add variable semantic parsing. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 53 +++++++++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f3ca4d5..74d4daf 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -94,6 +94,7 @@ struct d3d10_effect_variable struct d3d10_effect *effect; char *name; + char *semantic; DWORD buffer_offset; DWORD annotation_count; DWORD flag; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fa9c509..d468896 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -60,13 +60,13 @@ static struct d3d10_effect_pass null_pass = static struct d3d10_effect_local_buffer null_local_buffer = {&d3d10_effect_constant_buffer_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL}; static struct d3d10_effect_variable null_variable = - {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; static struct d3d10_effect_variable null_scalar_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; static struct d3d10_effect_variable null_vector_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; static struct d3d10_effect_variable null_matrix_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; static inline void read_dword(const char **ptr, DWORD *d) { @@ -150,22 +150,26 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, return hr; } -static char *copy_name(const char *ptr) +static BOOL copy_name(const char *ptr, char **name) { size_t name_len; - char *name; name_len = strlen(ptr) + 1; - name = HeapAlloc(GetProcessHeap(), 0, name_len); - if (!name) + if( name_len == 1 ) + { + return TRUE; + } + + *name = HeapAlloc(GetProcessHeap(), 0, name_len); + if (!*name) { ERR("Failed to allocate name memory.\n"); - return NULL; + return FALSE; } - memcpy(name, ptr, name_len); + memcpy(*name, ptr, name_len); - return name; + return TRUE; } static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) @@ -306,8 +310,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con read_dword(&ptr, &offset); TRACE("Type name at offset %#x.\n", offset); - t->name = copy_name(data + offset); - if (!t->name) + if (!copy_name(data + offset, &t->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -431,8 +434,7 @@ static HRESULT parse_fx10_variable_head(struct d3d10_effect_variable *v, const c read_dword(ptr, &offset); TRACE("Variable name at offset %#x.\n", offset); - v->name = copy_name(data + offset); - if (!v->name) + if (!copy_name(data + offset, &v->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -550,8 +552,7 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co read_dword(ptr, &offset); TRACE("Pass name at offset %#x.\n", offset); - p->name = copy_name(data + offset); - if (!p->name) + if (!copy_name(data + offset, &p->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -610,8 +611,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char read_dword(ptr, &offset); TRACE("Technique name at offset %#x.\n", offset); - t->name = copy_name(data + offset); - if (!t->name) + if (!copy_name(data + offset, &t->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -664,13 +664,22 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) { + DWORD offset; unsigned int i; HRESULT hr; hr = parse_fx10_variable_head(v, ptr, data); if (FAILED(hr)) return hr; - skip_dword_unknown(ptr, 1); + read_dword(ptr, &offset); + TRACE("Variable semantic at offset %#x.\n", offset); + + if (!copy_name(data + offset, &v->semantic)) + { + ERR("Failed to copy semantic.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); @@ -713,8 +722,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons read_dword(ptr, &offset); TRACE("Local buffer name at offset %#x.\n", offset); - l->name = copy_name(data + offset); - if (!l->name) + if (!copy_name(data + offset, &l->name)) { ERR("Failed to copy name.\n"); return E_OUTOFMEMORY; @@ -988,6 +996,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) TRACE("variable %p.\n", v); HeapFree(GetProcessHeap(), 0, v->name); + HeapFree(GetProcessHeap(), 0, v->semantic); if (v->annotations) { unsigned int i;

1 0

Ismael Barros : dpwsockx: Implementation of SPInit.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 5a9ecdef436510e7e4b31099ba50f792a4917f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9ecdef436510e7e4b31099b… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Sep 10 20:06:02 2009 +0200 dpwsockx: Implementation of SPInit. --- dlls/dpwsockx/Makefile.in | 2 +- dlls/dpwsockx/dpwsockx_dll.h | 68 +++++++++++++++++++++++++++++++++++++++++ dlls/dpwsockx/dpwsockx_main.c | 20 ++++++++++++ 3 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index c2c5f8c..bb02089 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpwsockx.dll -IMPORTS = dxguid kernel32 +IMPORTS = dxguid kernel32 ws2_32 C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h index 08ae11c..a9454da 100644 --- a/dlls/dpwsockx/dpwsockx_dll.h +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -21,10 +21,78 @@ #include "windef.h" #include "winbase.h" +#include "winsock2.h" #include "winnt.h" #include "wine/dplaysp.h" +typedef struct tagDPWS_THREADDATA +{ + BOOL is_running; + SOCKET sock; + SOCKADDR_IN addr; + HANDLE handle; + LPDIRECTPLAYSP lpISP; +} DPWS_THREADDATA, *LPDPWS_THREADDATA; + +typedef struct tagDPWS_DATA +{ + SOCKET sock; + DPWS_THREADDATA tcp_listener, udp_listener, dplaysrv; + SOCKADDR_IN nameserverAddr; + LPDIRECTPLAYSP lpISP; +} DPWS_DATA, *LPDPWS_DATA; + + + +#ifdef WORDS_BIGENDIAN + +static inline u_short __dpws_ushort_swap(u_short s) +{ + return (s >> 8) | (s << 8); +} +static inline u_long __dpws_ulong_swap(u_long l) +{ + return ((u_long)__dpws_ushort_swap((u_short)l) << 16) | __dpws_ushort_swap((u_short)(l >> 16)); +} + +#define dpws_letohl(l) __dpws_ulong_swap(l) +#define dpws_letohs(s) __dpws_ushort_swap(s) +#define dpws_htolel(l) __dpws_ulong_swap(l) +#define dpws_htoles(s) __dpws_ushort_swap(s) + +#else /* WORDS_BIGENDIAN */ + +#define dpws_letohl(l) ((u_long)(l)) +#define dpws_letohs(s) ((u_short)(s)) +#define dpws_htolel(l) ((u_long)(l)) +#define dpws_htoles(s) ((u_short)(s)) + +#endif /* WORDS_BIGENDIAN */ + + +#include "pshpack1.h" + +typedef struct tagDPSP_MSG_HEADER +{ + DWORD mixed; + SOCKADDR_IN SockAddr; +} DPSP_MSG_HEADER, *LPDPSP_MSG_HEADER; +typedef const DPSP_MSG_HEADER* LPCDPSP_MSG_HEADER; + +#include "poppack.h" + + +#define DPSP_MSG_TOKEN_REMOTE 0xFAB00000 +#define DPSP_MSG_TOKEN_FORWARDED 0xCAB00000 +#define DPSP_MSG_TOKEN_SERVER 0xBAB00000 + +#define DPSP_MSG_MAKE_MIXED(s,t) dpws_htolel((s) | (t)) +#define DPSP_MSG_SIZE(m) (dpws_letohl(m) & 0x000FFFFF) +#define DPSP_MSG_TOKEN(m) (dpws_letohl(m) & 0xFFF00000) + + + HRESULT WINAPI SPInit( LPSPINITDATA ); #endif /* __WINE_DPWSOCKX_DLL_H */ diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index e8fe902..ff6f5b5 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winsock2.h" #include "dpwsockx_dll.h" #include "wine/debug.h" #include "dplay.h" @@ -205,6 +206,9 @@ static void setup_callbacks( LPDPSP_SPCALLBACKS lpCB ) */ HRESULT WINAPI SPInit( LPSPINITDATA lpspData ) { + WSADATA wsaData; + DPWS_DATA dpwsData; + TRACE( "Initializing library for %s (%s)\n", wine_dbgstr_guid(lpspData->lpGuid), debugstr_w(lpspData->lpszName) ); @@ -217,5 +221,21 @@ HRESULT WINAPI SPInit( LPSPINITDATA lpspData ) /* Assign callback functions */ setup_callbacks( lpspData->lpCB ); + /* Load Winsock 2.0 DLL */ + if ( WSAStartup( MAKEWORD(2, 0), &wsaData ) != 0 ) + { + ERR( "WSAStartup() failed\n" ); + return DPERR_UNAVAILABLE; + } + + /* Initialize internal data */ + memset( &dpwsData, 0, sizeof(DPWS_DATA) ); + dpwsData.lpISP = lpspData->lpISP; + IDirectPlaySP_SetSPData( lpspData->lpISP, &dpwsData, sizeof(DPWS_DATA), + DPSET_LOCAL ); + + /* dplay needs to know the size of the header */ + lpspData->dwSPHeaderSize = sizeof(DPSP_MSG_HEADER); + return DP_OK; }

1 0

Ge van Geldorp : urlmon/tests: Fix tests for IE8.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: ec09345523d96a30eba15999cc9f14fedc94f9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec09345523d96a30eba15999c… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Fri Sep 11 12:22:38 2009 +0200 urlmon/tests: Fix tests for IE8. --- dlls/urlmon/tests/url.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5badf86..53646d1 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -86,9 +86,11 @@ DEFINE_EXPECT(QueryInterface_IBindStatusCallbackHolder); DEFINE_EXPECT(QueryInterface_IInternetBindInfo); DEFINE_EXPECT(QueryInterface_IAuthenticate); DEFINE_EXPECT(QueryInterface_IInternetProtocol); +DEFINE_EXPECT(QueryInterface_IWindowForBindingUI); DEFINE_EXPECT(QueryService_IAuthenticate); DEFINE_EXPECT(QueryService_IInternetProtocol); DEFINE_EXPECT(QueryService_IInternetBindInfo); +DEFINE_EXPECT(QueryService_IWindowForBindingUI); DEFINE_EXPECT(BeginningTransaction); DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(QueryInterface_IHttpNegotiate2); @@ -1099,6 +1101,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return E_NOTIMPL; } + if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { + CHECK_EXPECT(QueryService_IWindowForBindingUI); + return E_NOTIMPL; + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_NOINTERFACE; } @@ -1174,6 +1181,11 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF /* TODO */ CHECK_EXPECT2(QueryInterface_IInternetBindInfo); } + else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) + { + CHECK_EXPECT2(QueryInterface_IWindowForBindingUI); + return E_NOINTERFACE; + } else { ok(0, "unexpected interface %s\n", debugstr_guid(riid)); @@ -2259,6 +2271,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) SET_EXPECT(QueryInterface_IInternetBindInfo); SET_EXPECT(QueryService_IInternetBindInfo); SET_EXPECT(QueryInterface_IHttpNegotiate); + SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(QueryService_IWindowForBindingUI); SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); @@ -2338,6 +2352,8 @@ static void test_BindToStorage(int protocol, BOOL emul, DWORD t) CLEAR_CALLED(QueryInterface_IInternetBindInfo); CLEAR_CALLED(QueryService_IInternetBindInfo); CHECK_CALLED(QueryInterface_IHttpNegotiate); + CLEAR_CALLED(QueryInterface_IWindowForBindingUI); + CLEAR_CALLED(QueryService_IWindowForBindingUI); CHECK_CALLED(BeginningTransaction); if (have_IHttpNegotiate2) { @@ -2443,6 +2459,8 @@ static void test_BindToObject(int protocol, BOOL emul) SET_EXPECT(GetRootSecurityId); SET_EXPECT(Obj_OnProgress_FINDINGRESOURCE); SET_EXPECT(Obj_OnProgress_CONNECTING); + SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(QueryService_IWindowForBindingUI); } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) SET_EXPECT(Obj_OnProgress_SENDINGREQUEST); @@ -2526,6 +2544,8 @@ static void test_BindToObject(int protocol, BOOL emul) /* IE7 does call this */ CLEAR_CALLED(Obj_OnProgress_CONNECTING); } + CLEAR_CALLED(QueryInterface_IWindowForBindingUI); + CLEAR_CALLED(QueryService_IWindowForBindingUI); } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) { if(urls[test_protocol] == SHORT_RESPONSE_URL) @@ -2591,6 +2611,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); + SET_EXPECT(QueryInterface_IWindowForBindingUI); } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) SET_EXPECT(OnProgress_SENDINGREQUEST); @@ -2633,6 +2654,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) CHECK_CALLED(QueryInterface_IHttpNegotiate2); CHECK_CALLED(GetRootSecurityId); } + CLEAR_CALLED(QueryInterface_IWindowForBindingUI); } if(test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_SENDINGREQUEST);

1 0