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

Andrew Eikum : oleaut32: Convert TLBImpLib to use standard linked list.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 3d03a5e23975e11ee4600e194ad70f92cc73b2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d03a5e23975e11ee4600e194… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 15 15:52:46 2011 -0500 oleaut32: Convert TLBImpLib to use standard linked list. --- dlls/oleaut32/typelib.c | 72 ++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4637bf2..7d5b85a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -977,7 +977,7 @@ typedef struct tagTLBImpLib struct tagITypeLibImpl *pImpTypeLib; /* pointer to loaded typelib, or NULL if not yet loaded */ - struct tagTLBImpLib * next; + struct list entry; } TLBImpLib; /* internal ITypeLib data */ @@ -1000,7 +1000,7 @@ typedef struct tagITypeLibImpl int TypeInfoCount; /* nr of typeinfo's in librarry */ struct tagITypeInfoImpl **typeinfos; struct list custdata_list; - TLBImpLib * pImpLibs; /* linked list to all imported typelibs */ + struct list implib_list; int ctTypeDesc; /* number of items in type desc array */ TYPEDESC * pTypeDesc; /* array of TypeDescriptions found in the library. Only used while reading MSFT @@ -2275,17 +2275,18 @@ static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, if(!MSFT_HREFTYPE_INTHISFILE( offset)) { /* external typelib */ MSFT_ImpInfo impinfo; - TLBImpLib *pImpLib=(pcx->pLibInfo->pImpLibs); + TLBImpLib *pImpLib; TRACE_(typelib)("offset %x, masked offset %x\n", offset, offset + (offset & 0xfffffffc)); MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - while (pImpLib){ /* search the known offsets of all import libraries */ - if(pImpLib->offset==impinfo.oImpFile) break; - pImpLib=pImpLib->next; - } - if(pImpLib){ + + LIST_FOR_EACH_ENTRY(pImpLib, &pcx->pLibInfo->implib_list, TLBImpLib, entry) + if(pImpLib->offset==impinfo.oImpFile) + break; + + if(&pImpLib->entry != &pcx->pLibInfo->implib_list){ ref->reference = offset; ref->pImpTLInfo = pImpLib; if(impinfo.flags & MSFT_IMPINFO_OFFSET_IS_GUID) { @@ -2979,6 +2980,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) pTypeLibImpl->lpVtblTypeComp = &tlbtcvt; pTypeLibImpl->ref = 1; + list_init(&pTypeLibImpl->implib_list); list_init(&pTypeLibImpl->custdata_list); list_init(&pTypeLibImpl->ref_list); pTypeLibImpl->dispatch_href = -1; @@ -3140,7 +3142,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* imported type libs */ if(tlbSegDir.pImpFiles.offset>0) { - TLBImpLib **ppImpLib = &(pTypeLibImpl->pImpLibs); + TLBImpLib *pImpLib; int oGuid, offset = tlbSegDir.pImpFiles.offset; UINT16 size; @@ -3148,25 +3150,25 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) { char *name; - *ppImpLib = heap_alloc_zero(sizeof(TLBImpLib)); - (*ppImpLib)->offset = offset - tlbSegDir.pImpFiles.offset; + pImpLib = heap_alloc_zero(sizeof(TLBImpLib)); + pImpLib->offset = offset - tlbSegDir.pImpFiles.offset; MSFT_ReadLEDWords(&oGuid, sizeof(INT), &cx, offset); - MSFT_ReadLEDWords(&(*ppImpLib)->lcid, sizeof(LCID), &cx, DO_NOT_SEEK); - MSFT_ReadLEWords(&(*ppImpLib)->wVersionMajor, sizeof(WORD), &cx, DO_NOT_SEEK); - MSFT_ReadLEWords(&(*ppImpLib)->wVersionMinor, sizeof(WORD), &cx, DO_NOT_SEEK); + MSFT_ReadLEDWords(&pImpLib->lcid, sizeof(LCID), &cx, DO_NOT_SEEK); + MSFT_ReadLEWords(&pImpLib->wVersionMajor, sizeof(WORD), &cx, DO_NOT_SEEK); + MSFT_ReadLEWords(&pImpLib->wVersionMinor, sizeof(WORD), &cx, DO_NOT_SEEK); MSFT_ReadLEWords(& size, sizeof(UINT16), &cx, DO_NOT_SEEK); size >>= 2; name = heap_alloc_zero(size+1); MSFT_Read(name, size, &cx, DO_NOT_SEEK); - (*ppImpLib)->name = TLB_MultiByteToBSTR(name); + pImpLib->name = TLB_MultiByteToBSTR(name); heap_free(name); - MSFT_ReadGuid(&(*ppImpLib)->guid, oGuid, &cx); + MSFT_ReadGuid(&pImpLib->guid, oGuid, &cx); offset = (offset + sizeof(INT) + sizeof(DWORD) + sizeof(LCID) + sizeof(UINT16) + size + 3) & ~3; - ppImpLib = &(*ppImpLib)->next; + list_add_tail(&pTypeLibImpl->implib_list, &pImpLib->entry); } } @@ -3434,25 +3436,24 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, if(sscanf(refname, "*\\R%x*#%x", &lib_offs, &type_num) != 2) FIXME_(typelib)("Can't sscanf ref\n"); if(lib_offs != 0xffff) { - TLBImpLib **import = &pTL->pImpLibs; + TLBImpLib *import; - while(*import) { - if((*import)->offset == lib_offs) - break; - import = &(*import)->next; - } - if(!*import) { + LIST_FOR_EACH_ENTRY(import, &pTL->implib_list, TLBImpLib, entry) + if(import->offset == lib_offs) + break; + + if(&import->entry == &pTL->implib_list) { char fname[MAX_PATH+1]; int len; - *import = heap_alloc_zero(sizeof(**import)); - (*import)->offset = lib_offs; + import = heap_alloc_zero(sizeof(*import)); + import->offset = lib_offs; TLB_GUIDFromString( pNameTable + lib_offs + 4, - &(*import)->guid); + &import->guid); if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%x#%s", - &(*import)->wVersionMajor, - &(*import)->wVersionMinor, - &(*import)->lcid, fname) != 4) { + &import->wVersionMajor, + &import->wVersionMinor, + &import->lcid, fname) != 4) { FIXME_(typelib)("can't sscanf ref %s\n", pNameTable + lib_offs + 40); } @@ -3460,12 +3461,13 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, if(fname[len-1] != '#') FIXME("fname = %s\n", fname); fname[len-1] = '\0'; - (*import)->name = TLB_MultiByteToBSTR(fname); + import->name = TLB_MultiByteToBSTR(fname); + list_add_tail(&pTL->implib_list, &import->entry); } - ref_type->pImpTLInfo = *import; + ref_type->pImpTLInfo = import; /* Store a reference to IDispatch */ - if(pTL->dispatch_href == -1 && IsEqualGUID(&(*import)->guid, &IID_StdOle) && type_num == 4) + if(pTL->dispatch_href == -1 && IsEqualGUID(&import->guid, &IID_StdOle) && type_num == 4) pTL->dispatch_href = typelib_ref; } else { /* internal ref */ @@ -4281,13 +4283,13 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(This->pTypeDesc); - for (pImpLib = This->pImpLibs; pImpLib; pImpLib = pImpLibNext) + LIST_FOR_EACH_ENTRY_SAFE(pImpLib, pImpLibNext, &This->implib_list, TLBImpLib, entry) { if (pImpLib->pImpTypeLib) ITypeLib_Release((ITypeLib *)pImpLib->pImpTypeLib); SysFreeString(pImpLib->name); - pImpLibNext = pImpLib->next; + list_remove(&pImpLib->entry); heap_free(pImpLib); }

1 0

Stefan Dösinger : d3d9: Test depth stencil size mismatches.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 5e9884a48861962f93ce1ca37f3b67c009cd1ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9884a48861962f93ce1ca37… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 10 20:11:50 2011 +0100 d3d9: Test depth stencil size mismatches. --- dlls/d3d9/tests/visual.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9a40891..54aa586 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11661,6 +11661,111 @@ static void srgbwrite_format_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(backbuffer); } +static void ds_size_test(IDirect3DDevice9 *device) +{ + IDirect3DSurface9 *ds, *rt, *old_rt, *old_ds, *readback; + HRESULT hr; + DWORD color; + DWORD num_passes; + struct + { + float x, y, z; + } + quad[] = + { + {-1.0, -1.0, 0.0 }, + {-1.0, 1.0, 0.0 }, + { 1.0, -1.0, 0.0 }, + { 1.0, 1.0, 0.0 } + }; + + hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 32, 32, D3DFMT_D24X8, D3DMULTISAMPLE_NONE, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); + ok(SUCCEEDED(hr), "IDirect3DDevice9_ValidateDevice failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &old_rt); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &old_ds); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); + ok(SUCCEEDED(hr), "IDirect3DDevice9_ValidateDevice failed, hr %#x.\n", hr); + + /* The D3DCLEAR_TARGET clear works. D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER returns OK, + * but does not change the surface's contents. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000FF, 0.0f, 0); + ok(SUCCEEDED(hr), "Target clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 0.2f, 0); + ok(SUCCEEDED(hr), "Z Buffer clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 0.5f, 0); + ok(SUCCEEDED(hr), "Target and Z Buffer clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); + ok(SUCCEEDED(hr), "IDirect3DDevice9_GetRenderTargetData failed, hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 2, 2); + ok(color == 0x000000FF, "DS size test: Pixel (2, 2) after clear is %#x, expected 0x000000FF\n", color); + color = getPixelColorFromSurface(readback, 31, 31); + ok(color == 0x000000FF, "DS size test: Pixel (31, 31) after clear is %#x, expected 0x000000FF\n", color); + color = getPixelColorFromSurface(readback, 32, 32); + ok(color == 0x000000FF, "DS size test: Pixel (32, 32) after clear is %#x, expected 0x000000FF\n", color); + color = getPixelColorFromSurface(readback, 63, 63); + ok(color == 0x000000FF, "DS size test: Pixel (63, 63) after clear is %#x, expected 0x000000FF\n", color); + + /* Turning on any depth-related state results in a ValidateDevice failure */ + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); + ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); + ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); + + /* Try to draw with the device in an invalid state */ + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, old_ds); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); + ok(SUCCEEDED(hr), "IDirect3DDevice9_ValidateDevice failed, hr %#x.\n", hr); + + IDirect3DSurface9_Release(readback); + IDirect3DSurface9_Release(ds); + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(old_rt); + IDirect3DSurface9_Release(old_ds); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -11738,6 +11843,7 @@ START_TEST(visual) skip("No mipmap support\n"); } offscreen_test(device_ptr); + ds_size_test(device_ptr); alpha_test(device_ptr); shademode_test(device_ptr); srgbtexture_test(device_ptr);

1 0

Stefan Dösinger : wined3d: Ignore clears when the framebuffer setup is broken.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 38c213ecda04b8b78278481fa47e47c3da8f1857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c213ecda04b8b78278481fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 11:15:25 2011 +0100 wined3d: Ignore clears when the framebuffer setup is broken. --- dlls/wined3d/device.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 735cbca..be6f900 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4780,11 +4780,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD rect TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, depth %.8e, stencil %u.\n", iface, rect_count, rects, flags, color, depth, stencil); - if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !device->depth_stencil) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); - /* TODO: What about depth stencil buffers without stencil bits? */ - return WINED3DERR_INVALIDCALL; + IWineD3DSurfaceImpl *ds = device->depth_stencil; + if (!ds) + { + WARN("Clearing depth and/or stencil without a depth stencil buffer attached, returning WINED3DERR_INVALIDCALL\n"); + /* TODO: What about depth stencil buffers without stencil bits? */ + return WINED3DERR_INVALIDCALL; + } + else if (flags & WINED3DCLEAR_TARGET) + { + if(ds->resource.width < device->render_targets[0]->resource.width || + ds->resource.height < device->render_targets[0]->resource.height) + { + WARN("Silently ignoring depth and target clear with mismatching sizes\n"); + return WINED3D_OK; + } + } } device_get_draw_rect(device, &draw_rect);

1 0

Francois Gouget : kernel32: Some spelling tweaks and fixes for the error messages.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 2d441f52ddfb6e761639777bbc19c021486ee93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d441f52ddfb6e761639777bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:11:08 2011 +0100 kernel32: Some spelling tweaks and fixes for the error messages. --- dlls/kernel32/winerror.mc | 18 +++++----- po/ar.po | 50 +++++++++++++------------ po/bg.po | 58 ++++++++++++++++------------- po/ca.po | 47 ++++++++++++------------ po/cs.po | 61 ++++++++++++++++++------------- po/da.po | 59 +++++++++++++++++++----------- po/de.po | 59 +++++++++++++++++++----------- po/el.po | 53 ++++++++++++++------------- po/en.po | 86 ++++++++++++++++++++++---------------------- po/en_US.po | 88 ++++++++++++++++++++++---------------------- po/eo.po | 57 ++++++++++++++++------------- po/es.po | 59 +++++++++++++++++------------- po/fa.po | 50 +++++++++++++------------ po/fi.po | 58 ++++++++++++++++------------- po/fr.po | 60 +++++++++++++++++++----------- po/he.po | 57 ++++++++++++++++------------- po/hi.po | 44 +++++++++++----------- po/hu.po | 53 +++++++++++++++------------ po/it.po | 59 +++++++++++++++++++----------- po/ja.po | 60 +++++++++++++++++++----------- po/ko.po | 60 +++++++++++++++++++----------- po/lt.po | 60 +++++++++++++++++++----------- po/ml.po | 44 +++++++++++----------- po/nb_NO.po | 59 +++++++++++++++++++----------- po/nl.po | 59 +++++++++++++++++++----------- po/or.po | 44 +++++++++++----------- po/pa.po | 44 +++++++++++----------- po/pl.po | 60 +++++++++++++++++++----------- po/pt_BR.po | 59 +++++++++++++++++++----------- po/pt_PT.po | 59 +++++++++++++++++++----------- po/rm.po | 44 +++++++++++----------- po/ro.po | 57 +++++++++++++++++------------ po/ru.po | 60 +++++++++++++++++++----------- po/sk.po | 55 +++++++++++++++------------- po/sl.po | 60 ++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 54 +++++++++++++++------------- po/sr_RS(a)latin.po | 55 +++++++++++++++------------- po/sv.po | 59 +++++++++++++++++++----------- po/te.po | 44 +++++++++++----------- po/th.po | 56 +++++++++++++++------------- po/tr.po | 57 +++++++++++++++++------------ po/uk.po | 62 ++++++++++++++++++++------------ po/wa.po | 50 +++++++++++++------------ po/wine.pot | 44 +++++++++++----------- po/zh_CN.po | 56 ++++++++++++++++------------- po/zh_TW.po | 56 ++++++++++++++++------------- 46 files changed, 1450 insertions(+), 1103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d441f52ddfb6e7616397…

1 0

Francois Gouget : mscoree: Force_get_runtime_info() is not used so remove it.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: d007d9feeaecee144802648e85011cc81c1fe20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d007d9feeaecee144802648e8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:59:13 2011 +0100 mscoree: Force_get_runtime_info() is not used so remove it. --- dlls/mscoree/metahost.c | 5 ----- dlls/mscoree/mscoree_private.h | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fb03fb1..878cdee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1316,8 +1316,3 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, return CLR_E_SHIM_RUNTIME; } - -HRESULT force_get_runtime_info(ICLRRuntimeInfo **result) -{ - return IUnknown_QueryInterface((IUnknown*)&runtimes[0], &IID_ICLRRuntimeInfo, (void**)result); -} diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index aa0ee2e..5428f17 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -51,8 +51,6 @@ typedef struct CLRRuntimeInfo extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); -extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); - extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk);

1 0

Francois Gouget : d3dx9_36/tests: Replace a malloc() with HeapAlloc() +HeapFree().
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: cb5e480fafe55a14c79af59e20746d3e86f652f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5e480fafe55a14c79af59e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:57:16 2011 +0100 d3dx9_36/tests: Replace a malloc() with HeapAlloc()+HeapFree(). --- dlls/d3dx9_36/tests/mesh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4f4adcf..b54a92b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2852,7 +2852,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOA char name[256]; OUTLINETEXTMETRIC otm; GLYPHMETRICS gm; - GLYPHMETRICSFLOAT *glyphmetrics_float = malloc(sizeof(GLYPHMETRICSFLOAT) * strlen(text)); + GLYPHMETRICSFLOAT *glyphmetrics_float = HeapAlloc(GetProcessHeap(), 0, sizeof(GLYPHMETRICSFLOAT) * strlen(text)); int i; LOGFONT lf; HFONT font = NULL, oldfont = NULL; @@ -2913,6 +2913,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, LPCSTR text, FLOA d3dxmesh->lpVtbl->Release(d3dxmesh); SelectObject(hdc, oldfont); + HeapFree(GetProcessHeap(), 0, glyphmetrics_float); } static void D3DXCreateTextTest(void)

1 0

Francois Gouget : msxml3: Make ConnectionPoint_Init() and BindStatusCallback_Detach() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 462d325eb24a13d1f3be5c3e427a1f1686adbab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d325eb24a13d1f3be5c3e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:30:45 2011 +0100 msxml3: Make ConnectionPoint_Init() and BindStatusCallback_Detach() static. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/httprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 43bcb77..a634750 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3295,7 +3295,7 @@ static const IConnectionPointVtbl ConnectionPointVtbl = ConnectionPoint_EnumConnections }; -void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) +static void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) { cp->lpVtblConnectionPoint = &ConnectionPointVtbl; cp->doc = doc; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f6ee116..d49840f 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -152,7 +152,7 @@ static inline BindStatusCallback *impl_from_IHttpNegotiate( IHttpNegotiate *ifac return CONTAINING_RECORD(iface, BindStatusCallback, IHttpNegotiate_iface); } -void BindStatusCallback_Detach(BindStatusCallback *bsc) +static void BindStatusCallback_Detach(BindStatusCallback *bsc) { if (bsc) {

1 0

Francois Gouget : msvcrt: Export _wcsupr_s_l().
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: c075968baf534ecfd1733eab42c2d6e449e0d2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c075968baf534ecfd1733eab4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:33:35 2011 +0100 msvcrt: Export _wcsupr_s_l(). --- dlls/msvcrt/msvcrt.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 68eab2e..2ac0804 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1093,7 +1093,7 @@ @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s -# stub _wcsupr_s_l +@ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l # stub _wcsxfrm_l @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32

1 0

Francois Gouget : shell32/tests: Make test_ShellItemGetAttributes() static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 91de605dd2cc11d45ccbefcd0367481b3cc5864f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91de605dd2cc11d45ccbefcd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:56 2011 +0100 shell32/tests: Make test_ShellItemGetAttributes() static. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3d9c959..cc68280 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3673,7 +3673,7 @@ static void test_ShellItemBindToHandler(void) pILFree(pidl_desktop); } -void test_ShellItemGetAttributes(void) +static void test_ShellItemGetAttributes(void) { IShellItem *psi; LPITEMIDLIST pidl_desktop;

1 0

Francois Gouget : quartz: Make some functions static.
by Alexandre Julliard March 16, 2011

March 16, 2011

Module: wine Branch: master Commit: 78c605c3c9ba46ed75ed6d27962589d79dc54274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c605c3c9ba46ed75ed6d279… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 16 08:32:44 2011 +0100 quartz: Make some functions static. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/pin.c | 2 +- dlls/quartz/quartz_private.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 3659326..7cdaba6 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -405,7 +405,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; ACMWrapperImpl *This = (ACMWrapperImpl *)iface; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index dcd8093..e7e1de7 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -426,7 +426,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; AVIDecImpl *This = (AVIDecImpl *)iface; diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 297b2d6..852fd4b 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -42,7 +42,7 @@ typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg ); * Return the first received error code (E_NOTIMPL is ignored) * If no errors occur: return the first received non-error-code that isn't S_OK */ -HRESULT updatehres( HRESULT original, HRESULT new ) +static HRESULT updatehres( HRESULT original, HRESULT new ) { if (FAILED( original ) || new == E_NOTIMPL) return original; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 4bc9de5..f627dc8 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -71,7 +71,6 @@ extern void video_unregister_windowclass(void) DECLSPEC_HIDDEN; BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards); void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); -HRESULT updatehres( HRESULT original, HRESULT new ); typedef struct StdMediaSample2 {

1 0