February 2010 - Wine-commits

Piotr Caban : urlmon: Fixed CoInternetGetSecurityUrl implementation.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 1db3e475113d393e5c99094440b9801142fdd9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db3e475113d393e5c9909444… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 9 01:08:16 2010 +0100 urlmon: Fixed CoInternetGetSecurityUrl implementation. --- dlls/urlmon/sec_mgr.c | 80 ++++++++++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 3216333..81f2f50 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1240,28 +1240,44 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM */ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) { - WCHAR url[INTERNET_MAX_URL_LENGTH], domain[INTERNET_MAX_URL_LENGTH]; + WCHAR buf1[INTERNET_MAX_URL_LENGTH], buf2[INTERNET_MAX_URL_LENGTH]; + LPWSTR url, domain; DWORD len; HRESULT hres; TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); - hres = CoInternetParseUrl(pwzUrl, PARSE_SECURITY_URL, 0, url, INTERNET_MAX_URL_LENGTH, &len, 0); - if(hres==S_OK) { - if(psuAction == PSU_DEFAULT) - hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); + url = buf1; + domain = buf2; + strcpyW(url, pwzUrl); + + while(1) { + hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, domain, INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres!=S_OK || !strcmpW(url, domain)) + break; + + if(url == buf1) { + url = buf2; + domain = buf1; + } else { + url = buf1; + domain = buf2; + } + } - if(psuAction==PSU_SECURITY_URL_ONLY || hres!=S_OK) { - len = lstrlenW(url)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; + if(psuAction==PSU_SECURITY_URL_ONLY) { + len = lstrlenW(url)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; - memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); - return S_OK; - } + memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); + return S_OK; + } + hres = CoInternetParseUrl(url, PARSE_SECURITY_DOMAIN, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + if(SUCCEEDED(hres)) { len++; *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); if(!*ppwzSecUrl) @@ -1271,33 +1287,31 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA return S_OK; } - if(psuAction == PSU_DEFAULT) { - hres = CoInternetParseUrl(pwzUrl, PARSE_ROOTDOCUMENT, 0, url, 0, &len, 0); - if(hres == S_FALSE) { - hres = CoInternetParseUrl(pwzUrl, PARSE_SCHEMA, 0, domain, - INTERNET_MAX_URL_LENGTH, &len, 0); + hres = CoInternetParseUrl(url, PARSE_ROOTDOCUMENT, 0, domain, 0, &len, 0); + if(hres == S_FALSE) { + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, domain, + INTERNET_MAX_URL_LENGTH, &len, 0); + if(hres == S_OK) { + domain[len] = ':'; + hres = CoInternetParseUrl(url, PARSE_DOMAIN, 0, domain+len+1, + INTERNET_MAX_URL_LENGTH-len-1, &len, 0); if(hres == S_OK) { - domain[len] = ':'; - hres = CoInternetParseUrl(pwzUrl, PARSE_DOMAIN, 0, domain+len+1, - INTERNET_MAX_URL_LENGTH-len-1, &len, 0); - if(hres == S_OK) { - len = lstrlenW(domain)+1; - *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ppwzSecUrl) - return E_OUTOFMEMORY; - - memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); - return S_OK; - } + len = lstrlenW(domain)+1; + *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ppwzSecUrl) + return E_OUTOFMEMORY; + + memcpy(*ppwzSecUrl, domain, len*sizeof(WCHAR)); + return S_OK; } } } - len = lstrlenW(pwzUrl)+1; + len = lstrlenW(url)+1; *ppwzSecUrl = CoTaskMemAlloc(len*sizeof(WCHAR)); if(!*ppwzSecUrl) return E_OUTOFMEMORY; - memcpy(*ppwzSecUrl, pwzUrl, len*sizeof(WCHAR)); + memcpy(*ppwzSecUrl, url, len*sizeof(WCHAR)); return S_OK; }

1 0

Piotr Caban : urlmon/tests: Added more url parsing tests.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: c0bfc2fb95dd3e667b8b5d18036f26d92622c741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bfc2fb95dd3e667b8b5d180… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 9 01:08:43 2010 +0100 urlmon/tests: Added more url parsing tests. --- dlls/urlmon/tests/misc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dd6ba6d..467aa7c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -780,7 +780,19 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - CHECK_EXPECT(ParseUrl); + CHECK_EXPECT2(ParseUrl); + + if(ParseAction == PARSE_SECURITY_URL) { + if(pcchResult) + *pcchResult = sizeof(url1)/sizeof(WCHAR); + + if(cchResult<sizeof(url1)/sizeof(WCHAR)) + return S_FALSE; + + memcpy(pwzResult, url1, sizeof(url1)); + return S_OK; + } + return E_NOTIMPL; } @@ -825,7 +837,7 @@ static IClassFactory *expect_cf; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { - CHECK_EXPECT(QI_IInternetProtocolInfo); + CHECK_EXPECT2(QI_IInternetProtocolInfo); ok(iface == expect_cf, "unexpected iface\n"); *ppv = &protocol_info; return qiret; @@ -896,6 +908,7 @@ static void test_NameSpace(void) { IInternetSession *session; WCHAR buf[200]; + LPWSTR sec_url; DWORD size; HRESULT hres; @@ -943,6 +956,35 @@ static void test_NameSpace(void) CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl); + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl); + + hres = CoInternetParseUrl(url8, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + ok(size == sizeof(url1)/sizeof(WCHAR), "Size = %d, expected %d\n", + size, sizeof(url1)/sizeof(WCHAR)); + if(size == sizeof(url1)/sizeof(WCHAR)) + ok(!memcmp(buf, url1, sizeof(url1)), "Encoded url = %s\n", wine_dbgstr_w(buf)); + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl); + + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl); + + hres = CoInternetGetSecurityUrl(url8, &sec_url, PSU_SECURITY_URL_ONLY, 0); + ok(hres == S_OK, "CoInternetGetSecurityUrl failed: %08x\n", hres); + if(hres == S_OK) { + ok(lstrlenW(sec_url)>sizeof(wszFile)/sizeof(WCHAR) && + !memcmp(sec_url, wszFile, sizeof(wszFile)-sizeof(WCHAR)), + "Encoded url = %s\n", wine_dbgstr_w(sec_url)); + CoTaskMemFree(sec_url); + } + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl); + hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres);

1 0

Alexandre Julliard : makefiles: Move the CROSSOBJS dependency to the generated default dependencies.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: bf84c6120ae0c76eebed3f31884547cfdda0be1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf84c6120ae0c76eebed3f318… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:54:05 2010 +0100 makefiles: Move the CROSSOBJS dependency to the generated default dependencies. Get rid of a remaining C_SRCS16 reference. --- configure | 2 +- configure.ac | 2 +- dlls/Maketest.rules.in | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 9edb711..a0935bd 100755 --- a/configure +++ b/configure @@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 0549119..3c651be 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 446ae72..2cd642b 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -51,8 +51,6 @@ crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSWINEGCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) -$(CROSSOBJS): $(IDL_GEN_HEADERS) - # Rules for cleaning testclean::

1 0

Alexandre Julliard : makefiles: Generate a general catch-all dependency on .tab.h files to replace the manually maintained ones.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 9644d1dcd7e0ea6a5ec77f667e9c07d3ab938186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9644d1dcd7e0ea6a5ec77f667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:58:00 2010 +0100 makefiles: Generate a general catch-all dependency on .tab.h files to replace the manually maintained ones. --- configure | 2 +- configure.ac | 2 +- dlls/jscript/Makefile.in | 2 -- dlls/msi/Makefile.in | 2 -- libs/wpp/Makefile.in | 2 -- programs/winedbg/Makefile.in | 2 -- tools/widl/Makefile.in | 2 -- tools/wmc/Makefile.in | 2 -- tools/wrc/Makefile.in | 2 -- 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/configure b/configure index a0935bd..1ad05bf 100755 --- a/configure +++ b/configure @@ -13644,7 +13644,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/configure.ac b/configure.ac index 3c651be..4d7e1ab 100644 --- a/configure.ac +++ b/configure.ac @@ -2088,7 +2088,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: Makefile: dummy -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) +\$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 6373796..587825a 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -45,5 +45,3 @@ BISON_SRCS = \ parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -lex.o: parser.tab.h diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 8600b9f..ec0de40 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -91,5 +91,3 @@ RC_SRCS = \ sql.tab.c: sql.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -tokenize.o: sql.tab.h diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 713ee4d..48869a7 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -23,5 +23,3 @@ $(MODULE): $(OBJS) ppy.tab.c: ppy.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -ppl.yy.o: ppy.tab.h diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index e4880fb..f3aef2c 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -64,5 +64,3 @@ uninstall:: dbg.tab.c: dbg.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -debug.yy.o: dbg.tab.h diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index d0fea83..21b8443 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -45,5 +45,3 @@ uninstall:: parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -parser.yy.o: parser.tab.h diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index fba92ea..05f7e90 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -40,5 +40,3 @@ uninstall:: mcy.tab.c: mcy.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -mcl.o: mcy.tab.h diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index c8a8534..3aa8647 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -45,5 +45,3 @@ uninstall:: parser.tab.c: parser.tab.h # for parallel makes @DEPENDENCIES@ # everything below this line is overwritten by make depend - -parser.yy.o: parser.tab.h

1 0

Alexandre Julliard : makefiles: Generate the winetest rules from the WINE_CONFIG_TEST macro.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: d5addea2794311d8220b760b271468afcb3b77bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5addea2794311d8220b760b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 21:27:54 2010 +0100 makefiles: Generate the winetest rules from the WINE_CONFIG_TEST macro. --- aclocal.m4 | 10 +- configure | 658 ++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 20 +-- tools/make_makefiles | 4 +- 4 files changed, 652 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5addea2794311d8220b7…

1 0

Alexandre Julliard : makefiles: Generate the list of test binaries from configure.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 454fb3c1daf1da43f2d270188b12610f68240b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454fb3c1daf1da43f2d270188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 21:29:13 2010 +0100 makefiles: Generate the list of test binaries from configure. --- aclocal.m4 | 2 + configure | 215 +++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + programs/winetest/Makefile.in | 4 +- 4 files changed, 219 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454fb3c1daf1da43f2d27…

1 0

Stefan Dösinger : wined3d: Don' t record dirty areas in a readonly lock.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 8625f0cdbf28cb6c456323d6b5589ad80bffb380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8625f0cdbf28cb6c456323d6b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:22:24 2010 +0100 wined3d: Don't record dirty areas in a readonly lock. --- dlls/wined3d/buffer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f3d3492..3c7a2b9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1086,7 +1086,10 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags); flags = buffer_sanitize_flags(flags); - if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; + if (!(flags & WINED3DLOCK_READONLY)) + { + if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY; + } count = InterlockedIncrement(&This->lock_count);

1 0

Stefan Dösinger : wined3d: Don' t use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: 24e2308670481513c62482d1e127e83fdf41c2f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e2308670481513c62482d1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:24:36 2010 +0100 wined3d: Don't use GL_MAP_FLUSH_EXPLICIT_BIT without GL_MAP_WRITE_BIT. --- dlls/wined3d/buffer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3c7a2b9..e22d311 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1061,9 +1061,9 @@ static DWORD buffer_sanitize_flags(DWORD flags) static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) { - GLbitfield ret = GL_MAP_FLUSH_EXPLICIT_BIT; + GLbitfield ret = 0; - if (!(d3d_flags & WINED3DLOCK_READONLY)) ret |= GL_MAP_WRITE_BIT; + if (!(d3d_flags & WINED3DLOCK_READONLY)) ret = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (d3d_flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) {

1 0

Stefan Dösinger : d3d: Make sure vertexbuffer lock doesn't return a NULL pointer.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: bb035638d0ee54dcda843cbc7ada1aa90637a91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb035638d0ee54dcda843cbc7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 8 12:28:26 2010 +0100 d3d: Make sure vertexbuffer lock doesn't return a NULL pointer. --- dlls/d3d8/tests/buffer.c | 1 + dlls/d3d9/tests/buffer.c | 1 + dlls/ddraw/tests/d3d.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/buffer.c b/dlls/d3d8/tests/buffer.c index 725e642..a4082c5 100644 --- a/dlls/d3d8/tests/buffer.c +++ b/dlls/d3d8/tests/buffer.c @@ -104,6 +104,7 @@ static void lock_flag_test(IDirect3DDevice8 *device) if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer8_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer8_Unlock failed, 0x%08x\n", hr); } diff --git a/dlls/d3d9/tests/buffer.c b/dlls/d3d9/tests/buffer.c index a10cefd..1347121 100644 --- a/dlls/d3d9/tests/buffer.c +++ b/dlls/d3d9/tests/buffer.c @@ -103,6 +103,7 @@ static void lock_flag_test(IDirect3DDevice9 *device) if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed, 0x%08x\n", hr); } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 2d17487..134db9f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3216,6 +3216,7 @@ static void VertexBufferLockRest(void) test_data[i].debug_string, hr, test_data[i].result); if(SUCCEEDED(hr)) { + ok(data != NULL, "The data pointer returned by Lock is NULL\n"); hr = IDirect3DVertexBuffer7_Unlock(buffer); ok(hr == D3D_OK, "IDirect3DVertexBuffer7_Unlock failed, 0x%08x\n", hr); }

1 0

Alexandre Julliard : makefiles: Build the libs subdirectories directly from the top-level makefile.
by Alexandre Julliard 09 Feb '10

09 Feb '10

Module: wine Branch: master Commit: bb26242f4e88f9817571e0990eb679a0c80ebb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb26242f4e88f9817571e0990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:43:03 2010 +0100 makefiles: Build the libs subdirectories directly from the top-level makefile. --- Makefile.in | 40 ++++++++++++++++++++++++---------------- configure | 9 --------- configure.ac | 1 - libs/Makefile.in | 21 --------------------- 4 files changed, 24 insertions(+), 47 deletions(-) diff --git a/Makefile.in b/Makefile.in index 08349b3..7282cd1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,18 +33,23 @@ SUBDIRS = \ documentation \ fonts \ include \ - libs \ + libs/port \ + libs/wine \ + libs/wpp \ loader \ programs \ server \ tools # Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = @ALL_TOP_DIRS@ +INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls +# Sub-directories that don't have a makefile +EXTRASUBDIRS = libs + all: wine @echo "Wine build complete." @@ -75,20 +80,23 @@ uninstall:: # Dependencies between directories all: $(INSTALLSUBDIRS) -dlls: include libs tools -fonts loader server: libs tools -programs: dlls include libs tools -include: libs tools -tools: libs - -dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs tools include -fonts/__install__ fonts/__install-lib__: libs tools -include/__install__ include/__install-dev__: include libs tools -libs/__install__ libs/__install-lib__ libs/__install-dev__: libs -loader/__install__ loader/__install-lib__: libs tools -server/__install__ server/__install-lib__: libs tools -programs/__install__: libs tools include dlls/__install__ -programs/__install-lib__: libs tools include dlls/__install-lib__ + +dlls programs: libs/port libs/wine libs/wpp tools include +loader server: libs/port libs/wine tools +fonts include: tools +programs: dlls +tools: libs/port libs/wine libs/wpp +libs/wine: libs/port + +dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs/port libs/wine libs/wpp tools include +programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include +fonts/__install__ fonts/__install-lib__: tools +include/__install__ include/__install-dev__: include +libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine +loader/__install__ loader/__install-lib__: libs/port libs/wine tools +server/__install__ server/__install-lib__: libs/port libs/wine tools +programs/__install__: dlls/__install__ +programs/__install-lib__: dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools RECURSE_TARGETS = \ diff --git a/configure b/configure index dba6223..4bb5081 100755 --- a/configure +++ b/configure @@ -18319,14 +18319,6 @@ include/Makefile: include/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files include/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ - libs/Makefile" -test "x$enable_libs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ - libs" -ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -libs/Makefile: libs/Makefile.in Make.rules config.status" -ac_config_files="$ac_config_files libs/Makefile" - -ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/port/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS @@ -20119,7 +20111,6 @@ do "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; "libs/port/Makefile") CONFIG_FILES="$CONFIG_FILES libs/port/Makefile" ;; "libs/wine/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;; "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; diff --git a/configure.ac b/configure.ac index 24aac13..63b3cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2606,7 +2606,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([libs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([libs/port/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) diff --git a/libs/Makefile.in b/libs/Makefile.in deleted file mode 100644 index ad6a2fc..0000000 --- a/libs/Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = none - -SUBDIRS = \ - port \ - wine \ - wpp - -INSTALLSUBDIRS = \ - wine - -(a)MAKE_RULES@ - -all: $(SUBDIRS) - -# Directory dependencies - -wine wine/__install__ wine/__install-lib__: port

1 0