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

Christian Costa : d3dx9_36: Implement ID3DXConstantTableImpl_GetDesc + tests.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 70b79445f6f50202528c110a1465a55450871602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b79445f6f50202528c110a1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:05 2010 +0100 d3dx9_36: Implement ID3DXConstantTableImpl_GetDesc + tests. --- dlls/d3dx9_36/shader.c | 30 +++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/shader.c | 14 ++++++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b9deec1..10dc631 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -281,6 +281,7 @@ typedef struct ID3DXConstantTableImpl { LONG ref; LPVOID ctab; DWORD size; + D3DXCONSTANTTABLE_DESC desc; } ID3DXConstantTableImpl; /*** IUnknown methods ***/ @@ -353,9 +354,14 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable* iface, { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(%p): stub\n", This, desc); + TRACE("(%p)->(%p)\n", This, desc); - return E_NOTIMPL; + if (!desc) + return D3DERR_INVALIDCALL; + + memcpy(desc, &This->desc, sizeof(This->desc)); + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* iface, D3DXHANDLE constant, @@ -590,10 +596,11 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, DWORD flags, LPD3DXCONSTANTTABLE* constant_table) { - ID3DXConstantTableImpl* object; + ID3DXConstantTableImpl* object = NULL; HRESULT hr; LPCVOID data; UINT size; + D3DXSHADER_CONSTANTTABLE* ctab_header; FIXME("(%p, %x, %p): semi-stub\n", byte_code, flags, constant_table); @@ -614,6 +621,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; + if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) + goto error; + object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { @@ -624,9 +634,23 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->size = size; memcpy(object->ctab, data, object->size); + ctab_header = (D3DXSHADER_CONSTANTTABLE*)data; + if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) + goto error; + object->desc.Creator = ctab_header->Creator ? (LPCSTR)object->ctab + ctab_header->Creator : NULL; + object->desc.Version = ctab_header->Version; + object->desc.Constants = ctab_header->Constants; + *constant_table = (LPD3DXCONSTANTTABLE)object; return D3D_OK; + +error: + + HeapFree(GetProcessHeap(), 0, object->ctab); + HeapFree(GetProcessHeap(), 0, object); + + return D3DXERR_INVALIDDATA; } HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c49d089..255e84a 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -43,7 +43,7 @@ static const DWORD simple_ps[] = { static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ - 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000010, 0xfffe0300, 0x00000000, /* CTAB comment */ 0x00000000, 0x00000000, 0x00000000, 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ @@ -120,6 +120,7 @@ static void test_get_shader_constant_table_ex(void) HRESULT hr; LPVOID data; DWORD size; + D3DXCONSTANTTABLE_DESC desc; hr = D3DXGetShaderConstantTableEx(NULL, 0, &constant_table); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -130,7 +131,7 @@ static void test_get_shader_constant_table_ex(void) /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); if (constant_table) ID3DXConstantTable_Release(constant_table); hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); @@ -144,6 +145,15 @@ static void test_get_shader_constant_table_ex(void) data = ID3DXConstantTable_GetBufferPointer(constant_table); ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n"); + hr = ID3DXConstantTable_GetDesc(constant_table, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXConstantTable_GetDesc(constant_table, &desc); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(desc.Creator == (LPCSTR)data + 0x10, "Got result %p, expected %p\n", desc.Creator, (LPCSTR)data + 0x10); + ok(desc.Version == D3DVS_VERSION(3, 0), "Got result %x, expected %x\n", desc.Version, D3DVS_VERSION(3, 0)); + ok(desc.Constants == 0, "Got result %x, expected 0\n", desc.Constants); + ID3DXConstantTable_Release(constant_table); } }

1 0

Christian Costa : d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 441ee394958d6560292bc2ec84445c2ed5dd0308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441ee394958d6560292bc2ec8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:11 2010 +0100 d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 10 ++++++++++ include/d3dx9shader.h | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 10dc631..a87911e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -374,6 +374,15 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return E_NOTIMPL; } +static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(LPD3DXCONSTANTTABLE iface, D3DXHANDLE constant) +{ + ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; + + FIXME("(%p)->(%p): stub\n", This, constant); + + return (UINT)-1; +} + static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; @@ -571,6 +580,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = /*** ID3DXConstantTable methods ***/ ID3DXConstantTableImpl_GetDesc, ID3DXConstantTableImpl_GetConstantDesc, + ID3DXConstantTableImpl_GetSamplerIndex, ID3DXConstantTableImpl_GetConstant, ID3DXConstantTableImpl_GetConstantByName, ID3DXConstantTableImpl_GetConstantByElement, diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 2fee386..30a57b0 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -129,6 +129,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE; STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE; + STDMETHOD_(UINT, GetSamplerIndex)(THIS_ D3DXHANDLE hConstant) PURE; STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; @@ -161,6 +162,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ #define ID3DXConstantTable_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->lpVtbl->GetConstantDesc(p,a,b,c) +#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->lpVtbl->GetSamplerIndex(p,a) #define ID3DXConstantTable_GetConstant(p,a,b) (p)->lpVtbl->GetConstant(p,a,b) #define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->lpVtbl->GetConstantByName(p,a,b) #define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->lpVtbl->GetConstantElement(p,a,b) @@ -191,6 +193,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ #define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a) #define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c) +#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetConstantDesc(a) #define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b) #define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b) #define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)

1 0

Eric Pouech : dbghelp: Moved the ELF' s module information into the new scheme.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: fe2ae803eeb4c9f65ddea32a761444ae0e9cea3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2ae803eeb4c9f65ddea32a7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:31:56 2010 +0100 dbghelp: Moved the ELF's module information into the new scheme. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/elf_module.c | 94 +++++++++++++++++++++++----------------- dlls/dbghelp/module.c | 1 - 3 files changed, 56 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe2ae803eeb4c9f65ddea…

1 0

Eric Pouech : dbghelp: Move the mach-o information into the modfmt structure.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: cecb80a4e89e9d60357c4522ebfd933dc2572dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecb80a4e89e9d60357c4522e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Mar 18 21:32:02 2010 +0100 dbghelp: Move the mach-o information into the modfmt structure. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/macho_module.c | 46 ++++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5957804..5ea2e82 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -322,6 +322,7 @@ enum format_info { DFI_ELF, DFI_PE, + DFI_MACHO, DFI_DWARF, DFI_LAST }; @@ -339,6 +340,7 @@ struct module_format struct elf_module_info* elf_info; struct dwarf2_module_info_s* dwarf2_info; struct pe_module_info* pe_info; + struct macho_module_info* macho_info; } u; }; @@ -354,8 +356,6 @@ struct module /* specific information for debug types */ struct module_format* format_info[DFI_LAST]; - struct macho_module_info* macho_info; - /* memory allocation pool */ struct pool pool; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 379596b..44fa4f2 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -655,9 +655,10 @@ static int macho_parse_symtab(struct macho_file_map* fmap, sc->stroff, sc->strsize, (const void**)&stab, (const void**)&stabstr)) return 0; - if (!stabs_parse(mdi->module, mdi->module->macho_info->load_addr - fmap->segs_start, - stab, sc->nsyms * sizeof(struct nlist), - stabstr, sc->strsize, macho_stabs_def_cb, mdi)) + if (!stabs_parse(mdi->module, + mdi->module->format_info[DFI_MACHO]->u.macho_info->load_addr - fmap->segs_start, + stab, sc->nsyms * sizeof(struct nlist), + stabstr, sc->strsize, macho_stabs_def_cb, mdi)) ret = -1; macho_unmap_ranges(fmap, sc->symoff, sc->nsyms * sizeof(struct nlist), @@ -703,7 +704,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt { case SymTagFunction: func = (struct symt_function*)sym; - if (func->address == module->macho_info->load_addr) + if (func->address == module->format_info[DFI_MACHO]->u.macho_info->load_addr) { TRACE("Adjusting function %p/%s!%s from 0x%08lx to 0x%08lx\n", func, debugstr_w(module->module.ModuleName), sym->hash_elt.name, @@ -720,7 +721,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt { case DataIsGlobal: case DataIsFileStatic: - if (data->u.var.offset == module->macho_info->load_addr) + if (data->u.var.offset == module->format_info[DFI_MACHO]->u.macho_info->load_addr) { TRACE("Adjusting data symbol %p/%s!%s from 0x%08lx to 0x%08lx\n", data, debugstr_w(module->module.ModuleName), sym->hash_elt.name, @@ -879,7 +880,7 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) TRACE("(%p, %p/%d)\n", module, fmap, fmap ? fmap->fd : -1); - if (module->type != DMT_MACHO || !module->macho_info) + if (module->type != DMT_MACHO || !module->format_info[DFI_MACHO]->u.macho_info) { ERR("Bad Mach-O module '%s'\n", debugstr_w(module->module.LoadedImageName)); return FALSE; @@ -963,26 +964,34 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, if (macho_info->flags & MACHO_INFO_MODULE) { - struct macho_module_info *macho_module_info = - HeapAlloc(GetProcessHeap(), 0, sizeof(struct macho_module_info)); - if (!macho_module_info) goto leave; + struct macho_module_info *macho_module_info; + struct module_format* modfmt = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct macho_module_info)); + if (!modfmt) goto leave; macho_info->module = module_new(pcs, filename, DMT_MACHO, FALSE, load_addr, fmap.segs_size, 0, calc_crc32(fmap.fd)); if (!macho_info->module) { - HeapFree(GetProcessHeap(), 0, macho_module_info); + HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } - macho_info->module->macho_info = macho_module_info; - macho_info->module->macho_info->load_addr = load_addr; + macho_module_info = (void*)(modfmt + 1); + macho_info->module->format_info[DFI_MACHO] = modfmt; + + modfmt->module = macho_info->module; + modfmt->remove = NULL; + modfmt->loc_compute = NULL; + modfmt->u.macho_info = macho_module_info; + + macho_module_info->load_addr = load_addr; if (dbghelp_options & SYMOPT_DEFERRED_LOADS) macho_info->module->module.SymType = SymDeferred; else if (!macho_load_debug_info(macho_info->module, &fmap)) ret = FALSE; - macho_info->module->macho_info->in_use = 1; - macho_info->module->macho_info->is_loader = 0; + macho_info->module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; + macho_info->module->format_info[DFI_MACHO]->u.macho_info->is_loader = 0; TRACE("module = %p\n", macho_info->module); } @@ -1109,7 +1118,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam if ((module = module_is_already_loaded(pcs, filename))) { macho_info->module = module; - module->macho_info->in_use = 1; + module->format_info[DFI_MACHO]->u.macho_info->in_use = 1; return module->module.SymType; } @@ -1231,7 +1240,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) for (module = pcs->lmodules; module; module = module->next) { if (module->type == DMT_MACHO && !module->is_virtual) - module->macho_info->in_use = 0; + module->format_info[DFI_MACHO]->u.macho_info->in_use = 0; } ms.pcs = pcs; @@ -1243,7 +1252,8 @@ BOOL macho_synchronize_module_list(struct process* pcs) while (module) { if (module->type == DMT_MACHO && !module->is_virtual && - !module->macho_info->in_use && !module->macho_info->is_loader) + !module->format_info[DFI_MACHO]->u.macho_info->in_use && + !module->format_info[DFI_MACHO]->u.macho_info->is_loader) { module_remove(pcs, module); /* restart all over */ @@ -1297,7 +1307,7 @@ BOOL macho_read_wine_loader_dbg_info(struct process* pcs) TRACE("(%p/%p)\n", pcs, pcs->handle); macho_info.flags = MACHO_INFO_DEBUG_HEADER | MACHO_INFO_MODULE; if (!macho_search_loader(pcs, &macho_info)) return FALSE; - macho_info.module->macho_info->is_loader = 1; + macho_info.module->format_info[DFI_MACHO]->u.macho_info->is_loader = 1; module_set_module(macho_info.module, S_WineLoaderW); return (pcs->dbg_hdr_addr = macho_info.dbg_hdr_addr) != 0; }

1 0

Nikolay Sivov : shell32: Add IPersistFile:: GetCurFile implementation for IShellLink.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: b774baa35c6faf3135240dd860321372d06e16ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b774baa35c6faf3135240dd86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 19 00:52:41 2010 +0300 shell32: Add IPersistFile::GetCurFile implementation for IShellLink. --- dlls/shell32/shelllink.c | 36 +++++++++++++++++++++-- dlls/shell32/tests/shelllink.c | 60 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 1718df7..88a188f 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -161,6 +161,8 @@ typedef struct BOOL bDirty; INT iIdOpen; /* id of the "Open" entry in the context menu */ IUnknown *site; + + LPOLESTR filepath; /* file path returned by IPersistFile::GetCurFile */ } IShellLinkImpl; static inline IShellLinkImpl *impl_from_IShellLinkW( IShellLinkW *iface ) @@ -307,6 +309,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This ) HeapFree(GetProcessHeap(), 0, This->sPathRel); HeapFree(GetProcessHeap(), 0, This->sProduct); HeapFree(GetProcessHeap(), 0, This->sComponent); + HeapFree(GetProcessHeap(), 0, This->filepath); if (This->site) IUnknown_Release( This->site ); @@ -392,6 +395,11 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile r = IPersistStream_Load(StreamThis, stm); ShellLink_UpdatePath(This->sPathRel, pszFileName, This->sWorkDir, &This->sPath); IStream_Release( stm ); + + /* update file path */ + HeapFree(GetProcessHeap(), 0, This->filepath); + This->filepath = strdupW(pszFileName); + This->bDirty = FALSE; } TRACE("-- returning hr %08x\n", r); @@ -477,6 +485,10 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); + /* update file path */ + HeapFree(GetProcessHeap(), 0, This->filepath); + This->filepath = strdupW(pszFileName); + This->bDirty = FALSE; } else @@ -496,11 +508,26 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST return NOERROR; } -static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *ppszFileName) +static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) { - IShellLinkImpl *This = impl_from_IPersistFile(iface); - FIXME("(%p)->(%p): stub\n", This, ppszFileName); - return NOERROR; + IShellLinkImpl *This = impl_from_IPersistFile(iface); + IMalloc *pMalloc; + + TRACE("(%p)->(%p)\n", This, filename); + + if (!This->filepath) + { + *filename = NULL; + return S_FALSE; + } + + SHGetMalloc(&pMalloc); + *filename = IMalloc_Alloc(pMalloc, (strlenW(This->filepath)+1)*sizeof(WCHAR)); + if (!*filename) return E_OUTOFMEMORY; + + strcpyW(*filename, This->filepath); + + return S_OK; } static const IPersistFileVtbl pfvt = @@ -1239,6 +1266,7 @@ HRESULT WINAPI IShellLink_Constructor( IUnknown *pUnkOuter, sl->bDirty = FALSE; sl->iIdOpen = -1; sl->site = NULL; + sl->filepath = NULL; TRACE("(%p)->()\n",sl); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index bb2d5b3..52a21f1 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -421,6 +421,22 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r); if (SUCCEEDED(r)) { + CHAR buff[MAX_PATH], buff2[MAX_PATH]; + IMalloc *pmalloc; + LPOLESTR str; + + if (0) + { + /* crashes on XP */ + r = IPersistFile_GetCurFile(pf, NULL); + } + + /* test GetCurFile before ::Save */ + str = (LPWSTR)0xdeadbeef; + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_FALSE, "got 0x%08x\n", r); + ok(str == NULL, "got %p\n", str); + r = IPersistFile_Save(pf, path, TRUE); if (save_fails) { @@ -432,6 +448,18 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) { lok(SUCCEEDED(r), "save failed (0x%08x)\n", r); } + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + + WideCharToMultiByte( CP_ACP, 0, str, -1, buff, sizeof(buff), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, path, -1, buff2, sizeof(buff2), NULL, NULL ); + + lok(!strcmp(buff, buff2), "Expected %s, got %s\n", buff2, buff); + + SHGetMalloc(&pmalloc); + IMalloc_Free(pmalloc, str); IPersistFile_Release(pf); } @@ -444,6 +472,9 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) IShellLinkA *sl; IPersistFile *pf; char buffer[INFOTIPSIZE]; + CHAR buff[MAX_PATH], buff2[MAX_PATH]; + IMalloc *pmalloc; + LPOLESTR str; r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); @@ -459,8 +490,28 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) return; } + SHGetMalloc(&pmalloc); + + /* test GetCurFile before ::Load */ + str = (LPWSTR)0xdeadbeef; + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_FALSE, "got 0x%08x\n", r); + lok(str == NULL, "got %p\n", str); + r = IPersistFile_Load(pf, path, STGM_READ); lok(SUCCEEDED(r), "load failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + + WideCharToMultiByte( CP_ACP, 0, str, -1, buff, sizeof(buff), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, path, -1, buff2, sizeof(buff2), NULL, NULL ); + + lok(!strcmp(buff, buff2), "Expected %s, got %s\n", buff2, buff); + + IMalloc_Free(pmalloc, str); + IPersistFile_Release(pf); if (FAILED(r)) { @@ -744,10 +795,11 @@ static void test_datalink(void) r = IShellLinkW_SetPath(sl, lnk); ok(r == S_OK, "set path failed\n"); - /* - * The following crashes: - * r = IShellLinkDataList_GetFlags( dl, NULL ); - */ +if (0) +{ + /* the following crashes */ + r = IShellLinkDataList_GetFlags( dl, NULL ); +} flags = 0; r = IShellLinkDataList_GetFlags( dl, &flags );

1 0

Paul Vriens : d3d8/tests: Fix timeouts on Win9x/WinMe.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: dcb62f265d88531a4fef2a5289f4fe1fe00034ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb62f265d88531a4fef2a528… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 19 10:03:45 2010 +0100 d3d8/tests: Fix timeouts on Win9x/WinMe. --- dlls/d3d8/tests/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c6613ca..c0e1985 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1543,7 +1543,7 @@ static void test_wndproc(void) HANDLE thread; LONG_PTR proc; ULONG ref; - DWORD res; + DWORD res, tid; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1564,7 +1564,7 @@ static void test_wndproc(void) WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); - thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); res = WaitForSingleObject(thread_params.window_created, INFINITE); @@ -1674,7 +1674,7 @@ static void test_wndproc_windowed(void) HANDLE thread; LONG_PTR proc; ULONG ref; - DWORD res; + DWORD res, tid; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1695,7 +1695,7 @@ static void test_wndproc_windowed(void) WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); - thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); res = WaitForSingleObject(thread_params.window_created, INFINITE);

1 0

Paul Vriens : d3d9/tests: Fix timeouts on Win9x/WinMe.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: a0da7b6d3b9da4b80a54a01bca044753d7f0bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0da7b6d3b9da4b80a54a01bc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 19 10:03:48 2010 +0100 d3d9/tests: Fix timeouts on Win9x/WinMe. --- dlls/d3d9/tests/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5ef2910..eb424e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2388,7 +2388,7 @@ static void test_wndproc(void) HANDLE thread; LONG_PTR proc; ULONG ref; - DWORD res; + DWORD res, tid; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2409,7 +2409,7 @@ static void test_wndproc(void) WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); - thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); res = WaitForSingleObject(thread_params.window_created, INFINITE); @@ -2519,7 +2519,7 @@ static void test_wndproc_windowed(void) HANDLE thread; LONG_PTR proc; ULONG ref; - DWORD res; + DWORD res, tid; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2540,7 +2540,7 @@ static void test_wndproc_windowed(void) WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); device_window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); - thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, NULL); + thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); res = WaitForSingleObject(thread_params.window_created, INFINITE);

1 0

Paul Vriens : user32/tests: Fix timeouts on Win9x/WinMe.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: b897a37f384055e1b84722b9ba5ed4bc50385960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b897a37f384055e1b84722b9b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 19 10:03:58 2010 +0100 user32/tests: Fix timeouts on Win9x/WinMe. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9793af2..af0fa49 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2505,7 +2505,7 @@ static void test_SetForegroundWindow(HWND hwnd) { struct create_window_thread_params thread_params; HANDLE thread; - DWORD res; + DWORD res, tid; BOOL ret; HWND hwnd2; MSG msg; @@ -2589,7 +2589,7 @@ static void test_SetForegroundWindow(HWND hwnd) ok(!!thread_params.window_created, "CreateEvent failed, last error %#x.\n", GetLastError()); thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); - thread = CreateThread(NULL, 0, create_window_thread, &thread_params, 0, NULL); + thread = CreateThread(NULL, 0, create_window_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); res = WaitForSingleObject(thread_params.window_created, INFINITE); ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError());

1 0

Francois Gouget : include: Also define the WSAxxx error codes in winerror.h .
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 0c0c87a99eb50948f6ae2cce7a713fed9d845906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0c87a99eb50948f6ae2cce7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 19 10:12:46 2010 +0100 include: Also define the WSAxxx error codes in winerror.h. This matches the PSK. --- include/winerror.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winsock.h | 2 +- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 0bab882..6a56f74 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1550,6 +1550,85 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DNS_STATUS_CONTINUE_NEEDED 9801 #define DNS_ERROR_NO_TCPIP 9851 #define DNS_ERROR_NO_DNS_SERVERS 9852 + +/* + * Also defined in winsock.h. + * + * All Windows Sockets error constants are biased by WSABASEERR from + * the "normal" + */ +#define WSABASEERR 10000 +/* + * Windows Sockets definitions of regular Microsoft C error constants + */ +#define WSAEINTR (WSABASEERR+4) +#define WSAEBADF (WSABASEERR+9) +#define WSAEACCES (WSABASEERR+13) +#define WSAEFAULT (WSABASEERR+14) +#define WSAEINVAL (WSABASEERR+22) +#define WSAEMFILE (WSABASEERR+24) + +/* + * Windows Sockets definitions of regular Berkeley error constants + */ +#define WSAEWOULDBLOCK (WSABASEERR+35) +#define WSAEINPROGRESS (WSABASEERR+36) +#define WSAEALREADY (WSABASEERR+37) +#define WSAENOTSOCK (WSABASEERR+38) +#define WSAEDESTADDRREQ (WSABASEERR+39) +#define WSAEMSGSIZE (WSABASEERR+40) +#define WSAEPROTOTYPE (WSABASEERR+41) +#define WSAENOPROTOOPT (WSABASEERR+42) +#define WSAEPROTONOSUPPORT (WSABASEERR+43) +#define WSAESOCKTNOSUPPORT (WSABASEERR+44) +#define WSAEOPNOTSUPP (WSABASEERR+45) +#define WSAEPFNOSUPPORT (WSABASEERR+46) +#define WSAEAFNOSUPPORT (WSABASEERR+47) +#define WSAEADDRINUSE (WSABASEERR+48) +#define WSAEADDRNOTAVAIL (WSABASEERR+49) +#define WSAENETDOWN (WSABASEERR+50) +#define WSAENETUNREACH (WSABASEERR+51) +#define WSAENETRESET (WSABASEERR+52) +#define WSAECONNABORTED (WSABASEERR+53) +#define WSAECONNRESET (WSABASEERR+54) +#define WSAENOBUFS (WSABASEERR+55) +#define WSAEISCONN (WSABASEERR+56) +#define WSAENOTCONN (WSABASEERR+57) +#define WSAESHUTDOWN (WSABASEERR+58) +#define WSAETOOMANYREFS (WSABASEERR+59) +#define WSAETIMEDOUT (WSABASEERR+60) +#define WSAECONNREFUSED (WSABASEERR+61) +#define WSAELOOP (WSABASEERR+62) +#define WSAENAMETOOLONG (WSABASEERR+63) +#define WSAEHOSTDOWN (WSABASEERR+64) +#define WSAEHOSTUNREACH (WSABASEERR+65) +#define WSAENOTEMPTY (WSABASEERR+66) +#define WSAEPROCLIM (WSABASEERR+67) +#define WSAEUSERS (WSABASEERR+68) +#define WSAEDQUOT (WSABASEERR+69) +#define WSAESTALE (WSABASEERR+70) +#define WSAEREMOTE (WSABASEERR+71) + +/* + * Extended Windows Sockets error constant definitions + */ +#define WSASYSNOTREADY (WSABASEERR+91) +#define WSAVERNOTSUPPORTED (WSABASEERR+92) +#define WSANOTINITIALISED (WSABASEERR+93) +#define WSAEDISCON (WSABASEERR+101) +#define WSAENOMORE (WSABASEERR+102) +#define WSAECANCELLED (WSABASEERR+103) +#define WSAEINVALIDPROCTABLE (WSABASEERR+104) +#define WSAEINVALIDPROVIDER (WSABASEERR+105) +#define WSAEPROVIDERFAILEDINIT (WSABASEERR+106) +#define WSASYSCALLFAILURE (WSABASEERR+107) +#define WSASERVICE_NOT_FOUND (WSABASEERR+108) +#define WSATYPE_NOT_FOUND (WSABASEERR+109) +#define WSA_E_NO_MORE (WSABASEERR+110) +#define WSA_E_CANCELLED (WSABASEERR+111) +#define WSAEREFUSED (WSABASEERR+112) + + #define ERROR_SXS_SECTION_NOT_FOUND 14000 #define ERROR_SXS_CANT_GEN_ACTCTX 14001 #define ERROR_SXS_INVALID_ACTCTXDATA_FORMAT 14002 diff --git a/include/winsock.h b/include/winsock.h index 69819d5..95b4a51 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -853,7 +853,7 @@ typedef struct WS(WSAData) /* * All Windows Sockets error constants are biased by WSABASEERR from - * the "normal" + * the "normal". They are also defined in winerror.h. */ #define WSABASEERR 10000 /*

1 0

Francois Gouget : server: Don't include winsock. h to avoid creating a dependency on generated headers.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: bc8d21b5d7bb7735ed0d140744cb9b1655f776f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8d21b5d7bb7735ed0d14074… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 19 10:16:04 2010 +0100 server: Don't include winsock.h to avoid creating a dependency on generated headers. The dependency does not really exist thanks to various #ifdefs, but makedep does not know that and records it which causes a build failure. --- server/sock.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index ed89ca2..5eaed6b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -51,6 +51,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "winerror.h" #include "process.h" #include "file.h" @@ -59,11 +60,34 @@ #include "request.h" #include "user.h" -/* To avoid conflicts with the Unix socket headers. Plus we only need a few - * macros anyway. +/* From winsock.h */ +#define FD_MAX_EVENTS 10 +#define FD_READ_BIT 0 +#define FD_WRITE_BIT 1 +#define FD_OOB_BIT 2 +#define FD_ACCEPT_BIT 3 +#define FD_CONNECT_BIT 4 +#define FD_CLOSE_BIT 5 + +/* + * Define flags to be used with the WSAAsyncSelect() call. */ -#define USE_WS_PREFIX -#include "winsock2.h" +#define FD_READ 0x00000001 +#define FD_WRITE 0x00000002 +#define FD_OOB 0x00000004 +#define FD_ACCEPT 0x00000008 +#define FD_CONNECT 0x00000010 +#define FD_CLOSE 0x00000020 + +/* internal per-socket flags */ +#define FD_WINE_LISTENING 0x10000000 +#define FD_WINE_NONBLOCKING 0x20000000 +#define FD_WINE_CONNECTED 0x40000000 +#define FD_WINE_RAW 0x80000000 +#define FD_WINE_INTERNAL 0xFFFF0000 + +/* Constants for WSAIoctl() */ +#define WSA_FLAG_OVERLAPPED 0x01 struct sock {

1 0