October 2011 - Wine-Commits

Andrew Talbot : msacm32: Mark fall-through in switch statement.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: a051be53d25251f1d3208ebab67e0137d7c1ad2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a051be53d25251f1d3208ebab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:37 2011 +0100 msacm32: Mark fall-through in switch statement. --- dlls/msacm32/msacm32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index d3160e3..6552812 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -87,6 +87,7 @@ DWORD WINAPI acmGetVersion(void) return 0x04000565; /* 4.0.1381 */ default: FIXME("%x not supported\n", version.dwPlatformId); + /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ }

1 0

Nikolay Sivov : msxml3: Accept disabling of external entities loading.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: ad336be675ed9a1c95fa4f441040c95c92bc5b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad336be675ed9a1c95fa4f441… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 4 16:27:39 2011 -0500 msxml3: Accept disabling of external entities loading. --- dlls/msxml3/saxreader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fca390a..0460533 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,6 +49,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +enum ReaderFeatures +{ + ExhaustiveErrors = 1 << 1, + ExternalGeneralEntities = 1 << 2, + ExternalParameterEntities = 1 << 3, + ForcedResync = 1 << 4, + NamespacePrefixes = 1 << 5, + Namespace = 1 << 6, + ParameterEntities = 1 << 7, + PreserveSystemIndentifiers = 1 << 8, + ProhibitDTD = 1 << 9, + SchemaValidation = 1 << 10, + ServerHttpRequest = 1 << 11, + SuppressValidationfatalError = 1 << 12, + UseInlineSchema = 1 << 13, + UseSchemaLocation = 1 << 14 +}; + struct bstrpool { BSTR *pool; @@ -72,6 +90,7 @@ typedef struct _saxreader xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; + enum ReaderFeatures features; } saxreader; typedef struct _saxlocator @@ -180,6 +199,23 @@ static const WCHAR PropertyXMLDeclVersionW[] = { 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; +/* feature names */ +static const WCHAR FeatureExternalGeneralEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/', + 'f','e','a','t','u','r','e','s','/','e','x','t','e','r','n','a','l','-','g','e','n','e','r','a','l', + '-','e','n','t','i','t','i','e','s',0 +}; + +static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) +{ + if (value == VARIANT_TRUE) + reader->features |= feature; + else + reader->features &= ~feature; + + return S_OK; +} + static inline BOOL has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || @@ -2568,12 +2604,17 @@ static HRESULT WINAPI saxxmlreader_getFeature( static HRESULT WINAPI saxxmlreader_putFeature( IVBSAXXMLReader* iface, - const WCHAR *pFeature, - VARIANT_BOOL vfValue) + const WCHAR *feature, + VARIANT_BOOL value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(pFeature), vfValue); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature), value); + + if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) + return set_feature_value(This, ExternalGeneralEntities, value); + + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -2964,6 +3005,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; + reader->features = 0; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Piotr Caban : msvcrt: Fix wcsncpy_s implementation.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 8df606fea4c12f9e48626fd9bd5aef1e19be666a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df606fea4c12f9e48626fd9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 23:03:03 2011 +0200 msvcrt: Fix wcsncpy_s implementation. --- dlls/msvcrt/tests/string.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msvcrt/wcs.c | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6eaa74a..979f874 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -61,6 +61,7 @@ static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static int (__cdecl *p_wcsncpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc, size_t count); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); @@ -615,7 +616,7 @@ static void test_wcscpy_s(void) if(!p_wcscpy_s) { - skip("wcscpy_s not found\n"); + win_skip("wcscpy_s not found\n"); return; } @@ -648,6 +649,39 @@ static void test_wcscpy_s(void) ret = p_wcscpy_s(szDestShort, 8, szLongText); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); + + if(!p_wcsncpy_s) + { + win_skip("wcsncpy_s not found\n"); + return; + } + + ret = p_wcsncpy_s(NULL, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == EINVAL, "p_wcsncpy_s expect EINVAL got %d\n", ret); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 18, NULL, 1); + ok(ret == EINVAL, "expected EINVAL got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 18, NULL, 0); + ok(ret == 0, "expected ERROR_SUCCESS got %d\n", ret); + ok(szDest[0] == 0, "szDest[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 0, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(szDest[0] == 0 || ret == EINVAL, "szDest[0] not 0\n"); + + ret = p_wcsncpy_s(szDest, 18, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDestShort, 8, szLongText, sizeof(szLongText)/sizeof(WCHAR)); + ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); + ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); } static void test__wcsupr_s(void) @@ -2027,6 +2061,7 @@ START_TEST(string) p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); + p_wcsncpy_s = (void *)GetProcAddress( hMsvcrt,"wcsncpy_s" ); p_wcsncat_s = (void *)GetProcAddress( hMsvcrt,"wcsncat_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0327ccb..ed0536a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1210,7 +1210,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co if (!wcSrc) { - return MSVCRT_EINVAL; + return count ? MSVCRT_EINVAL : 0; } size = min(strlenW(wcSrc), count);

1 0

Francois Gouget : kernel32/tests: Better check the NT path returned by QueryFullProcessImageName().
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 1d1ebefff185c3f35c99c0384a9c18f35548ef25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1ebefff185c3f35c99c0384… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 3 23:55:09 2011 +0200 kernel32/tests: Better check the NT path returned by QueryFullProcessImageName(). --- dlls/kernel32/tests/process.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index dfb2d2a..65c2836 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1739,10 +1739,10 @@ static void test_QueryFullProcessImageNameA(void) static void test_QueryFullProcessImageNameW(void) { HANDLE hSelf; - WCHAR module_name[1024]; + WCHAR module_name[1024], device[1024]; WCHAR deviceW[] = {'\\','D', 'e','v','i','c','e',0}; WCHAR buf[1024]; - DWORD size; + DWORD size, len; if (!pQueryFullProcessImageNameW) { @@ -1787,13 +1787,6 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(0, size); expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); - /* native path */ - size = sizeof(buf) / sizeof(buf[0]); - expect_eq_d(TRUE, pQueryFullProcessImageNameW(hSelf, PROCESS_NAME_NATIVE, buf, &size)); - expect_eq_d(lstrlenW(buf), size); - ok(buf[0] == '\\', "NT path should begin with '\\'\n"); - todo_wine ok(memcmp(buf, deviceW, sizeof(WCHAR)*lstrlenW(deviceW)) == 0, "NT path should begin with \\Device\n"); - /* Buffer too small */ size = lstrlenW(module_name)/2; SetLastError(0xdeadbeef); @@ -1803,6 +1796,33 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); expect_eq_ws_i(module_name, buf); /* buffer not changed */ + + /* native path */ + size = sizeof(buf) / sizeof(buf[0]); + expect_eq_d(TRUE, pQueryFullProcessImageNameW(hSelf, PROCESS_NAME_NATIVE, buf, &size)); + expect_eq_d(lstrlenW(buf), size); + ok(buf[0] == '\\', "NT path should begin with '\\'\n"); + todo_wine ok(memcmp(buf, deviceW, sizeof(WCHAR)*lstrlenW(deviceW)) == 0, "NT path should begin with \\Device\n"); + + module_name[2] = '\0'; + *device = '\0'; + size = QueryDosDeviceW(module_name, device, sizeof(device)); + ok(size, "QueryDosDeviceW failed: le=%u\n", GetLastError()); + len = lstrlenW(device); + ok(size >= len+2, "expected %d to be greater than %d+2 = strlen(%s)\n", size, len, wine_dbgstr_w(device)); + + if (size >= lstrlenW(buf)) + { + ok(0, "expected %s\\ to match the start of %s\n", wine_dbgstr_w(device), wine_dbgstr_w(buf)); + } + else + { + todo_wine ok(buf[len] == '\\', "expected '%c' to be a '\\' in %s\n", buf[len], wine_dbgstr_w(module_name)); + buf[len] = '\0'; + todo_wine ok(lstrcmpiW(device, buf) == 0, "expected %s to match %s\n", wine_dbgstr_w(device), wine_dbgstr_w(buf)); + todo_wine ok(lstrcmpiW(module_name+3, buf+len+1) == 0, "expected '%s' to match '%s'\n", wine_dbgstr_w(module_name+3), wine_dbgstr_w(buf+len+1)); + } + CloseHandle(hSelf); }

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawPalette for application provided interfaces .
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: a8616b7fcb75e694b45c15c48a4d9550c8aca9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8616b7fcb75e694b45c15c48… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:08 2011 -0500 ddraw: Use unsafe_impl_from_IDirectDrawPalette for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/palette.c | 7 +++++++ dlls/ddraw/surface.c | 2 +- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0572172..7898d28 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -369,6 +369,8 @@ struct IDirectDrawPaletteImpl IUnknown *ifaceToRelease; }; +IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) DECLSPEC_HIDDEN; + HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index b68cf82..ff78411 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -258,6 +258,13 @@ static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = IDirectDrawPaletteImpl_SetEntries }; +IDirectDrawPaletteImpl *unsafe_impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &ddraw_palette_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawPaletteImpl, lpVtbl); +} + HRESULT ddraw_palette_init(IDirectDrawPaletteImpl *palette, IDirectDrawImpl *ddraw, DWORD flags, PALETTEENTRY *entries) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4cd1452..7c70f0f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4288,7 +4288,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); IDirectDrawPalette *oldPal; IDirectDrawSurfaceImpl *surf; - IDirectDrawPaletteImpl *PalImpl = (IDirectDrawPaletteImpl *)Pal; + IDirectDrawPaletteImpl *PalImpl = unsafe_impl_from_IDirectDrawPalette(Pal); HRESULT hr; TRACE("iface %p, palette %p.\n", iface, Pal);

1 0

Ričardas Barkauskas : ddraw/tests: IDirect3DViewport3, IDirect3DViewport2 and IDirect3DViewport use same implementation.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: f0354fde023e68f7f66ffa6381ad572af6b5ccd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0354fde023e68f7f66ffa638… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:32 2011 -0500 ddraw/tests: IDirect3DViewport3, IDirect3DViewport2 and IDirect3DViewport use same implementation. --- dlls/ddraw/tests/d3d.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 40a58e8..4cd9346 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1186,6 +1186,7 @@ static void ViewportTest(void) { HRESULT hr; LPDIRECT3DVIEWPORT2 Viewport2; + IDirect3DViewport3 *Viewport3; D3DVIEWPORT vp1_data, ret_vp1_data; D3DVIEWPORT2 vp2_data, ret_vp2_data; float infinity; @@ -1197,6 +1198,12 @@ static void ViewportTest(void) hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport2, (void**) &Viewport2); ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr); + ok(Viewport2 == (IDirect3DViewport2 *)Viewport, "IDirect3DViewport2 iface diffrent from IDirect3DViewport\n"); + + hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport3, (void**) &Viewport3); + ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr); + ok(Viewport3 == (IDirect3DViewport3 *)Viewport, "IDirect3DViewport3 iface diffrent from IDirect3DViewport\n"); + IDirect3DViewport3_Release(Viewport3); vp1_data.dwSize = sizeof(vp1_data); vp1_data.dwX = 0;

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport3 for application provided interfaces .
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: f44734b7240d7c096db9ec308092aae934f48687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44734b7240d7c096db9ec308… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:37 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport3 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f587126..a2f0007 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -469,6 +469,8 @@ struct IDirect3DViewportImpl IDirect3DMaterialImpl *background; }; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; + /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 28e1eaf..eb43aa3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -750,7 +750,7 @@ IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Viewport) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Viewport); TRACE("iface %p, viewport %p.\n", iface, Viewport); @@ -808,7 +808,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, static HRESULT WINAPI IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport) { IDirect3DDeviceImpl *device = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)viewport; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(viewport); TRACE("iface %p, viewport %p.\n", iface, viewport); @@ -875,7 +875,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport3; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Viewport3); struct list *entry; TRACE("iface %p, viewport %p, next %p, flags %#x.\n", @@ -1703,7 +1703,7 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Direct3DViewport3) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport3; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport3(Direct3DViewport3); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 7dc3dd4..741090d 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1115,6 +1115,13 @@ static const struct IDirect3DViewport3Vtbl d3d_viewport_vtbl = IDirect3DViewportImpl_Clear2, }; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, lpVtbl); +} + void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) { viewport->lpVtbl = &d3d_viewport_vtbl;

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DViewport2 for application provided interfaces .
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 38982ddf114aceff064afff88a3d73250be61c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38982ddf114aceff064afff88… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Mon Oct 3 17:14:59 2011 -0500 ddraw: Use unsafe_impl_from_IDirect3DViewport2 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/viewport.c | 8 ++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b50c0bc..e75acc0 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -470,6 +470,7 @@ struct IDirect3DViewportImpl }; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *iface) DECLSPEC_HIDDEN; +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface) DECLSPEC_HIDDEN; IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) DECLSPEC_HIDDEN; /* Helper functions */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a2e27ac..8cfeac1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -771,7 +771,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); @@ -832,7 +832,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *ifa IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); @@ -927,7 +927,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface IDirect3DViewport2 *Viewport2, IDirect3DViewport2 **lplpDirect3DViewport2, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Viewport2); IDirect3DViewport3 *res; HRESULT hr; @@ -1749,7 +1749,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2 IDirect3DViewport2 *Direct3DViewport2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport2; + IDirect3DViewportImpl *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2); TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index bbff45b..1becbc7 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1127,6 +1127,14 @@ IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport3(IDirect3DViewport3 *i return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); } +IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport2(IDirect3DViewport2 *iface) +{ + /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */ + if (!iface) return NULL; + assert(iface->lpVtbl == (IDirect3DViewport2Vtbl *)&d3d_viewport_vtbl); + return CONTAINING_RECORD(iface, IDirect3DViewportImpl, IDirect3DViewport3_iface); +} + IDirect3DViewportImpl *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface) { /* IDirect3DViewport and IDirect3DViewport3 use the same iface. */

1 0

Hans Leidekker : mspatcha: Forward ApplyPatchToFileA to ApplyPatchToFileW.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 50110d4bbde7589155284880a57a6ffdb283b233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50110d4bbde7589155284880a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 14:59:41 2011 -0500 mspatcha: Forward ApplyPatchToFileA to ApplyPatchToFileW. --- dlls/mspatcha/mspatcha.spec | 2 +- dlls/mspatcha/mspatcha_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec index ca9bc7d..40feedf 100644 --- a/dlls/mspatcha/mspatcha.spec +++ b/dlls/mspatcha/mspatcha.spec @@ -1,4 +1,4 @@ -1 stub ApplyPatchToFileA +1 stdcall ApplyPatchToFileA(str str str long) 2 stub ApplyPatchToFileByHandles 3 stub ApplyPatchToFileByHandlesEx 4 stub ApplyPatchToFileExA diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 0110a41..ed763c9 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -24,6 +24,8 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "patchapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); @@ -49,6 +51,45 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +/***************************************************** + * ApplyPatchToFileA (MSPATCHA.6) + */ +BOOL WINAPI ApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_file, ULONG apply_flags) +{ + BOOL ret; + WCHAR *patch_fileW, *new_fileW, *old_fileW = NULL; + + if (!(patch_fileW = strdupAW( patch_file ))) return FALSE; + if (old_file && !(old_fileW = strdupAW( old_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + return FALSE; + } + if (!(new_fileW = strdupAW( new_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + return FALSE; + } + ret = ApplyPatchToFileW( patch_fileW, old_fileW, new_fileW, apply_flags ); + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + HeapFree( GetProcessHeap(), 0, new_fileW ); + return ret; +} + /***************************************************** * ApplyPatchToFileW (MSPATCHA.6) */

1 0

Francois Gouget : kernel32/tests: Test K32GetProcessImageFileNameA() and improve the QueryFullProcessImageNameA() tests.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 80ba9f35979a8042197c26019f84dad6074172e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ba9f35979a8042197c26019… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 4 05:11:40 2011 +0200 kernel32/tests: Test K32GetProcessImageFileNameA() and improve the QueryFullProcessImageNameA() tests. --- dlls/kernel32/tests/process.c | 64 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 61e3069..dfb2d2a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -62,6 +62,7 @@ static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); +static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); /* ############################### */ static char base[MAX_PATH]; @@ -204,6 +205,7 @@ static int init(void) pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); + pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); return 1; } @@ -1638,21 +1640,70 @@ static void test_GetProcessVersion(void) CloseHandle(pi.hThread); } -static void test_ProcessNameA(void) +static void test_GetProcessImageFileNameA(void) +{ + DWORD rc; + CHAR process[MAX_PATH]; + static const char harddisk[] = "\\Device\\HarddiskVolume"; + + if (!pK32GetProcessImageFileNameA) + { + win_skip("K32GetProcessImageFileNameA is unavailable\n"); + return; + } + + /* callers must guess the buffer size */ + SetLastError(0xdeadbeef); + rc = pK32GetProcessImageFileNameA(GetCurrentProcess(), NULL, 0); + ok(!rc && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "K32GetProcessImageFileNameA(no buffer): returned %u, le=%u\n", rc, GetLastError()); + + *process = '\0'; + rc = pK32GetProcessImageFileNameA(GetCurrentProcess(), process, sizeof(process)); + expect_eq_d(rc, lstrlenA(process)); + if (strncmp(process, harddisk, lstrlenA(harddisk))) + { + todo_wine win_skip("%s is probably on a network share, skipping tests\n", process); + return; + } + + if (!pQueryFullProcessImageNameA) + win_skip("QueryFullProcessImageNameA unavailable (added in Windows Vista)\n"); + else + { + CHAR image[MAX_PATH]; + DWORD length; + + length = sizeof(image); + expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), PROCESS_NAME_NATIVE, image, &length)); + expect_eq_d(length, lstrlenA(image)); + ok(lstrcmpi(process, image) == 0, "expected '%s' to be equal to '%s'\n", process, image); + } +} + +static void test_QueryFullProcessImageNameA(void) { #define INIT_STR "Just some words" DWORD length, size; - CHAR buf[1024]; + CHAR buf[MAX_PATH], module[MAX_PATH]; if (!pQueryFullProcessImageNameA) { win_skip("QueryFullProcessImageNameA unavailable (added in Windows Vista)\n"); return; } + + *module = '\0'; + SetLastError(0); /* old Windows don't reset it on success */ + size = GetModuleFileNameA(NULL, module, sizeof(module)); + ok(size && GetLastError() != ERROR_INSUFFICIENT_BUFFER, "GetModuleFileName failed: %u le=%u\n", size, GetLastError()); + /* get the buffer length without \0 terminator */ - length = 1024; + length = sizeof(buf); expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &length)); expect_eq_d(length, lstrlenA(buf)); + ok((buf[0] == '\\' && buf[1] == '\\') || + lstrcmpi(buf, module) == 0, "expected %s to match %s\n", buf, module); /* when the buffer is too small * - function fail with error ERROR_INSUFFICIENT_BUFFER @@ -1685,7 +1736,7 @@ static void test_ProcessNameA(void) expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); } -static void test_ProcessName(void) +static void test_QueryFullProcessImageNameW(void) { HANDLE hSelf; WCHAR module_name[1024]; @@ -1888,8 +1939,9 @@ START_TEST(process) test_ExitCode(); test_OpenProcess(); test_GetProcessVersion(); - test_ProcessNameA(); - test_ProcessName(); + test_GetProcessImageFileNameA(); + test_QueryFullProcessImageNameA(); + test_QueryFullProcessImageNameW(); test_Handles(); test_SystemInfo(); test_RegistryQuota();

1 0