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

Rico Schüller : wined3d: Fix copy and past error.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 7cbdb298841addff5f170b6ae1ded158d7fc8eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbdb298841addff5f170b6ae… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 5 22:25:06 2008 +0100 wined3d: Fix copy and past error. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2e85eba..04af700 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3239,7 +3239,7 @@ void fillGLAttribFuncs(WineD3D_GL_Info *gl_info) { if(GL_SUPPORT(EXT_SECONDARY_COLOR)) { specular_funcs[WINED3DDECLTYPE_D3DCOLOR] = (void *) specular_d3dcolor; } else { - specular_funcs[WINED3DDECLTYPE_FLOAT3] = (void *) warn_no_specular_func; + specular_funcs[WINED3DDECLTYPE_D3DCOLOR] = (void *) warn_no_specular_func; } specular_funcs[WINED3DDECLTYPE_UBYTE4] = (void *) invalid_func; specular_funcs[WINED3DDECLTYPE_SHORT2] = (void *) invalid_func;

1 0

Andrew Talbot : msdmo: Assign to structs instead of using memcpy.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 8841da666fd392859b919906cc2b517485592d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8841da666fd392859b919906c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 5 21:35:04 2008 +0000 msdmo: Assign to structs instead of using memcpy. --- dlls/msdmo/dmort.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index 67d18aa..fe19100 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -168,9 +168,9 @@ HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst, if (!pdst || !psrc) return E_POINTER; - memcpy(&pdst->majortype, &psrc->majortype, sizeof(psrc->majortype)); - memcpy(&pdst->subtype, &psrc->subtype, sizeof(psrc->subtype)); - memcpy(&pdst->formattype, &psrc->formattype, sizeof(psrc->formattype)); + pdst->majortype = psrc->majortype; + pdst->subtype = psrc->subtype; + pdst->formattype = psrc->formattype; pdst->bFixedSizeSamples = psrc->bFixedSizeSamples; pdst->bTemporalCompression = psrc->bTemporalCompression;

1 0

Hans Leidekker : winhttp: Add a stub implementation of WinHttpDetectAutoProxyConfigUrl.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 3e3ce1fa5e7352a1894ddab976027e0110cf84b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3ce1fa5e7352a1894ddab97… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Mar 5 22:04:04 2008 +0100 winhttp: Add a stub implementation of WinHttpDetectAutoProxyConfigUrl. --- dlls/winhttp/main.c | 11 +++++++++++ dlls/winhttp/winhttp.spec | 2 +- include/winhttp.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index c3616b6..e90d6b4 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -94,6 +94,17 @@ BOOL WINAPI WinHttpCheckPlatform(void) } /*********************************************************************** + * WinHttpDetectAutoProxyConfigUrl (winhttp.@) + */ +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD flags, LPWSTR *url) +{ + FIXME("(%x %p)\n", flags, url); + + SetLastError(ERROR_WINHTTP_AUTODETECTION_FAILED); + return FALSE; +} + +/*********************************************************************** * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) */ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config) diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index e1562b6..912ff6a 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -8,7 +8,7 @@ @ stub WinHttpConnect @ stub WinHttpCrackUrl @ stub WinHttpCreateUrl -@ stub WinHttpDetectAutoProxyConfigUrl +@ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) @ stub WinHttpGetDefaultProxyConfiguration @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl diff --git a/include/winhttp.h b/include/winhttp.h index c57563d..ef2caff 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -60,6 +60,8 @@ typedef int INTERNET_SCHEME, *LPINTERNET_SCHEME; #define WINHTTP_ERROR_BASE 12000 +#define ERROR_WINHTTP_AUTODETECTION_FAILED (WINHTTP_ERROR_BASE + 180) + typedef struct { DWORD dwStructSize;

1 0

Alexandre Julliard : makefiles: Support non-standard import lib names in the global dll rules.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 41f36c49e0193e77c736b564aa7d32023e7c063f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f36c49e0193e77c736b564a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 6 11:54:03 2008 +0100 makefiles: Support non-standard import lib names in the global dll rules. --- dlls/Makedll.rules.in | 10 +++++----- dlls/d3dx9_36/Makefile.in | 9 --------- dlls/winspool.drv/Makefile.in | 9 --------- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 241fc52..965302f 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -15,7 +15,7 @@ MINGWAR = @MINGWAR@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec -SPEC_DEF = lib$(BASEMODULE).def +SPEC_DEF = $(BASEMODULE).def WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) ALL_LIBS = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) @@ -47,15 +47,15 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%) $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) -lib$(BASEMODULE).def: $(MAINSPEC) +$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC) $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) -lib$(BASEMODULE).def.a: $(IMPLIB_OBJS) +$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS) $(RM) $@ $(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS) $(RANLIB) $@ -lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS) +$(IMPORTLIB:%=lib%.a): $(SPEC_DEF) $(IMPLIB_OBJS) $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) $(MINGWAR) rs $@ $(IMPLIB_OBJS) @@ -106,7 +106,7 @@ uninstall:: # Misc. rules clean:: - $(RM) $(SPEC_DEF) + $(RM) $(SPEC_DEF) $(IMPORTLIBFILE) $(SPEC_DEF) $(SPEC_SRCS16:.spec=.spec.o): $(WINEBUILD) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index af1000f..3b0f062 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -11,13 +11,4 @@ C_SRCS = \ @MAKE_DLL_RULES@ -libd3dx9.def: $(MAINSPEC) - $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) - -libd3dx9.a: $(SPEC_DEF) - $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) - -clean:: - $(RM) $(IMPORTLIBFILE) - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 2fe1e51..bd87824 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -15,13 +15,4 @@ RC_SRCS = winspool.rc @MAKE_DLL_RULES@ -libwinspool.def: $(MAINSPEC) - $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) - -libwinspool.a: $(SPEC_DEF) - $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) - -clean:: - $(RM) $(IMPORTLIBFILE) - @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Andrew Talbot : msacm32.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 5f160e561e6467eb0b5b55c7f7794adbbdbcb55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f160e561e6467eb0b5b55c7f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 5 21:34:59 2008 +0000 msacm32.drv: Assign to structs instead of using memcpy. --- dlls/msacm32.drv/wavemap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 33e328d..38bb1f1 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -434,7 +434,7 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) MMTIME timepos; TRACE("(%p %p %08x)\n", wom, lpTime, dwParam2); - memcpy(&timepos, lpTime, sizeof(timepos)); + timepos = *lpTime; /* For TIME_MS, we're going to recalculate using TIME_BYTES */ if (lpTime->wType == TIME_MS) @@ -988,7 +988,7 @@ static DWORD widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2) MMTIME timepos; TRACE("(%p %p %08x)\n", wim, lpTime, dwParam2); - memcpy(&timepos, lpTime, sizeof(timepos)); + timepos = *lpTime; /* For TIME_MS, we're going to recalculate using TIME_BYTES */ if (lpTime->wType == TIME_MS)

1 0

Andrew Talbot : mshtml: Assign to structs instead of using memcpy.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: d52b9ddd675c287e4ca7c866639ca760f1477e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52b9ddd675c287e4ca7c8666… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 5 21:35:16 2008 +0000 mshtml: Assign to structs instead of using memcpy. --- dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/oleobj.c | 6 +++--- dlls/mshtml/persist.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index cad4877..85cf8dc 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -110,7 +110,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i if(!pIID) return E_POINTER; - memcpy(pIID, This->iid, sizeof(IID)); + *pIID = *This->iid; return S_OK; } diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 116cbde..5e7181c 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -103,7 +103,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite TRACE("hostinfo = {%u %08x %08x %s %s}\n", hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); - memcpy(&This->hostinfo, &hostinfo, sizeof(DOCHOSTUIINFO)); + This->hostinfo = hostinfo; } if(!This->has_key_path) { @@ -285,7 +285,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms if(SUCCEEDED(hres)) { if(lprcPosRect) { RECT rect; /* We need to pass rect as not const pointer */ - memcpy(&rect, lprcPosRect, sizeof(RECT)); + rect = *lprcPosRect; IOleDocumentView_SetRect(DOCVIEW(This), &rect); } IOleDocumentView_Show(DOCVIEW(This), TRUE); @@ -325,7 +325,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) if(!pClsid) return E_INVALIDARG; - memcpy(pClsid, &CLSID_HTMLDocument, sizeof(GUID)); + *pClsid = CLSID_HTMLDocument; return S_OK; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a1d50b4..8a629d7 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -577,7 +577,7 @@ static HRESULT WINAPI PersistFile_GetClassID(IPersistFile *iface, CLSID *pClassI if(!pClassID) return E_INVALIDARG; - memcpy(pClassID, &CLSID_HTMLDocument, sizeof(CLSID)); + *pClassID = CLSID_HTMLDocument; return S_OK; }

1 0

Maarten Lankhorst : include: Add flag for BROADCAST_QUERY_DENY.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: c8d8ddab110a89d2ad7a3bf5d7f33b1ed58306d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d8ddab110a89d2ad7a3bf5d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 5 13:10:45 2008 -0800 include: Add flag for BROADCAST_QUERY_DENY. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index b7b0475..fa36381 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1831,6 +1831,7 @@ typedef struct #define BSF_RETURNHDESK 0x00000200 #define BSF_LUID 0x00000400 +#define BROADCAST_QUERY_DENY 0x424D5144 /***** Window hooks *****/

1 0

Rico Schüller : ddraw: Fix diffuse and specular color types.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 4188af790ab718c4b224163780cd917d13f9d6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4188af790ab718c4b22416378… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 5 22:23:13 2008 +0100 ddraw: Fix diffuse and specular color types. --- dlls/ddraw/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eed378b..62aa9ba 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3708,14 +3708,14 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, { WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData; WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride; - WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4; + WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_D3DCOLOR; } if(VertexType & D3DFVF_SPECULAR) { WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData; WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride; - WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4; + WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_D3DCOLOR; } for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++) @@ -3857,14 +3857,14 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, { WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData; WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride; - WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4; + WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_D3DCOLOR; } if(VertexType & D3DFVF_SPECULAR) { WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData; WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride; - WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4; + WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_D3DCOLOR; } for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++)

1 0

Lei Zhang : quartz: Validate input for FilterGraph2_AddFilter.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 0831be5adcf440b6ffb8b68c75d0f65df1e7290f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0831be5adcf440b6ffb8b68c7… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 6 00:32:03 2008 -0800 quartz: Validate input for FilterGraph2_AddFilter. --- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/tests/filtergraph.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5b4b711..c6e2c22 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -347,6 +347,9 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, TRACE("(%p/%p)->(%p, %s (%p))\n", This, iface, pFilter, debugstr_w(pName), pName); + if (!pFilter) + return E_POINTER; + wszFilterName = CoTaskMemAlloc( (pName ? strlenW(pName) + 6 : 5) * sizeof(WCHAR) ); if (pName) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 758d339..2a2a806 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -148,6 +148,33 @@ static void test_graph_builder(void) releasefiltergraph(); } +static void test_graph_builder_addfilter(void) +{ + HRESULT hr; + IBaseFilter *pF = NULL; + static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; + + if (!createfiltergraph()) + return; + + hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); + ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned: %x\n", hr); + + /* create video filter */ + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (LPVOID*)&pF); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pF != NULL, "pF is NULL\n"); + if (!pF) { + skip("failed to created filter, skipping\n"); + return; + } + + hr = IGraphBuilder_AddFilter(pgraph, pF, NULL); + ok(hr == S_OK, "IGraphBuilder_AddFilter returned: %x\n", hr); + releasefiltergraph(); +} + static void test_filter_graph2(void) { HRESULT hr; @@ -167,5 +194,6 @@ START_TEST(filtergraph) CoInitialize(NULL); test_render_run(); test_graph_builder(); + test_graph_builder_addfilter(); test_filter_graph2(); }

1 0

James Hawkins : msi: Break out the publishing tests into their respective actions.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: c8acf21e0ce636207e1a4a0786dd3ee9780dbdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8acf21e0ce636207e1a4a078… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Mar 5 23:10:05 2008 -0600 msi: Break out the publishing tests into their respective actions. --- dlls/msi/tests/install.c | 705 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 529 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8acf21e0ce636207e1a4…

1 0