July 2011 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9: Fix an error check in D3DXLoadMeshFromXResource.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: c4d29bdb18e93a042c41610d335112d5872b6450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d29bdb18e93a042c41610d3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 19 16:15:36 2011 +0200 d3dx9: Fix an error check in D3DXLoadMeshFromXResource. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 94a291f..0d17941 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3376,7 +3376,7 @@ HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, if (!resinfo) return D3DXERR_INVALIDDATA; hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if (!FAILED(hr)) return D3DXERR_INVALIDDATA; + if (FAILED(hr)) return D3DXERR_INVALIDDATA; return D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency, materials, effect_instances, num_materials, mesh);

1 0

Mariusz Pluciński : include: Add FOLDERTYPEID types and values definitions.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 310ab8a22cf43b622a2ccae034ff999f4ad303af URL: http://source.winehq.org/git/wine.git/?a=commit;h=310ab8a22cf43b622a2ccae03… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:15:57 2011 +0200 include: Add FOLDERTYPEID types and values definitions. --- include/shlguid.h | 31 +++++++++++++++++++++++++++++++ include/shtypes.idl | 13 ++++++++++++- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index a19b70c..f01ec73 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -162,6 +162,37 @@ DEFINE_GUID(VID_Thumbnails, 0x8bebb290, 0x52d0, 0x11d0, 0xb7, 0xf4, 0x00, 0xc0, DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* FOLDERTYPEID */ +DEFINE_GUID(FOLDERTYPEID_Communications, 0x91475fe5, 0x586b, 0x4eba, 0x8d, 0x75, 0xd1, 0x74, 0x34, 0xb8, 0xcd, 0xf6); +DEFINE_GUID(FOLDERTYPEID_CompressedFolder, 0x80213e82, 0xbcfd, 0x4c4f, 0x88, 0x17, 0xbb, 0x27, 0x60, 0x12, 0x67, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Contacts, 0xde2b70ec, 0x9bf7, 0x4a93, 0xbd, 0x3d, 0x24, 0x3f, 0x78, 0x81, 0xd4, 0x92); +DEFINE_GUID(FOLDERTYPEID_ControlPanelCategory, 0xde4f0660, 0xfa10, 0x4b8f, 0xa4, 0x94, 0x06, 0x8b, 0x20, 0xb2, 0x23, 0x07); +DEFINE_GUID(FOLDERTYPEID_ControlPanelClassic, 0x0c3794f3, 0xb545, 0x43aa, 0xa3, 0x29, 0xc3, 0x74, 0x30, 0xc5, 0x8d, 0x2a); +DEFINE_GUID(FOLDERTYPEID_Documents, 0x7d49d726, 0x3c21, 0x4f05, 0x99, 0xaa, 0xfd, 0xc2, 0xc9, 0x47, 0x46, 0x56); +DEFINE_GUID(FOLDERTYPEID_Games, 0xb689b0d0, 0x76d3, 0x4cbb, 0x87, 0xf7, 0x58, 0x5d, 0x0e, 0x0c, 0xe0, 0x70); +DEFINE_GUID(FOLDERTYPEID_Generic, 0x5c4f28b5, 0xf869, 0x4e84, 0x8e, 0x60, 0xf1, 0x1d, 0xb9, 0x7c, 0x5c, 0xc7); +DEFINE_GUID(FOLDERTYPEID_GenericLibrary, 0x5f4eab9a, 0x6833, 0x4f61, 0x89, 0x9d, 0x31, 0xcf, 0x46, 0x97, 0x9d, 0x49); +DEFINE_GUID(FOLDERTYPEID_GenericSearchResults, 0x7fde1a1e, 0x8b31, 0x49a5, 0x93, 0xb8, 0x6b, 0xe1, 0x4c, 0xfa, 0x49, 0x43); +DEFINE_GUID(FOLDERTYPEID_Invalid, 0x57807898, 0x8c4f, 0x4462, 0xbb, 0x63, 0x71, 0x04, 0x23, 0x80, 0xb1, 0x09); +DEFINE_GUID(FOLDERTYPEID_Music, 0x94d6ddcc, 0x4a68, 0x4175, 0xa3, 0x74, 0xbd, 0x58, 0x4a, 0x51, 0x0b, 0x78); +DEFINE_GUID(FOLDERTYPEID_NetworkExplorer, 0x25cc242b, 0x9a7c, 0x4f51, 0x80, 0xe0, 0x7a, 0x29, 0x28, 0xfe, 0xbe, 0x42); +DEFINE_GUID(FOLDERTYPEID_OpenSearch, 0x8faf9629, 0x1980, 0x46ff, 0x80, 0x23, 0x9d, 0xce, 0xab, 0x9c, 0x3e, 0xe3); +DEFINE_GUID(FOLDERTYPEID_OtherUsers, 0xb337fd00, 0x9dd5, 0x4635, 0xa6, 0xd4, 0xda, 0x33, 0xfd, 0x10, 0x2b, 0x7a); +DEFINE_GUID(FOLDERTYPEID_Pictures, 0xb3690e58, 0xe961, 0x423b, 0xb6, 0x87, 0x38, 0x6e, 0xbf, 0xd8, 0x32, 0x39); +DEFINE_GUID(FOLDERTYPEID_Printers, 0x2c7bbec6, 0xc844, 0x4a0a, 0x91, 0xfa, 0xce, 0xf6, 0xf5, 0x9c, 0xfd, 0xa1); +DEFINE_GUID(FOLDERTYPEID_PublishedItems, 0x7f2f5b96, 0xff74, 0x41da, 0xaf, 0xd8, 0x1c, 0x78, 0xa5, 0xf3, 0xae, 0xa2); +DEFINE_GUID(FOLDERTYPEID_RecordedTV, 0x5557a28f, 0x5da6, 0x4f83, 0x88, 0x09, 0xc2, 0xc9, 0x8a, 0x11, 0xa6, 0xfa); +DEFINE_GUID(FOLDERTYPEID_RecycleBin, 0xd6d9e004, 0xcd87, 0x442b, 0x9d, 0x57, 0x5e, 0x0a, 0xeb, 0x4f, 0x6f, 0x72); +DEFINE_GUID(FOLDERTYPEID_SavedGames, 0xd0363307, 0x28cb, 0x4106, 0x9f, 0x23, 0x29, 0x56, 0xe3, 0xe5, 0xe0, 0xe7); +DEFINE_GUID(FOLDERTYPEID_SearchConnector, 0x982725ee, 0x6f47, 0x479e, 0xb4, 0x47, 0x81, 0x2b, 0xfa, 0x7d, 0x2e, 0x8f); +DEFINE_GUID(FOLDERTYPEID_Searches, 0x0b0ba2e3, 0x405f, 0x415e, 0xa6, 0xee, 0xca, 0xd6, 0x25, 0x20, 0x78, 0x53); +DEFINE_GUID(FOLDERTYPEID_SearchHome, 0x834d8a44, 0x0974, 0x4ed6, 0x86, 0x6e, 0xf2, 0x03, 0xd8, 0x0b, 0x38, 0x10); +DEFINE_GUID(FOLDERTYPEID_SoftwareExplorer, 0xd674391b, 0x52d9, 0x4e07, 0x83, 0x4e, 0x67, 0xc9, 0x86, 0x10, 0xf3, 0x9d); +DEFINE_GUID(FOLDERTYPEID_StartMenu, 0xef87b4cb, 0xf2ce, 0x4785, 0x86, 0x58, 0x4c, 0xa6, 0xc6, 0x3e, 0x38, 0xc6); +DEFINE_GUID(FOLDERTYPEID_UserFiles, 0xcd0fc69b, 0x71e2, 0x46e5, 0x96, 0x90, 0x5b, 0xcd, 0x9f, 0x57, 0xaa, 0xb3); +DEFINE_GUID(FOLDERTYPEID_UsersLibraries, 0xc4d98f09, 0x6124, 0x4fe0, 0x99, 0x42, 0x82, 0x64, 0x16, 0x08, 0x2d, 0xa9); +DEFINE_GUID(FOLDERTYPEID_Videos, 0x5fa96407, 0x7e77, 0x483c, 0xac, 0x93, 0x69, 0x1d, 0x05, 0x85, 0x0d, 0xe8); + /* IExplorerBrowser */ DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); diff --git a/include/shtypes.idl b/include/shtypes.idl index 94b0c61..d8d7bad 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -113,7 +113,6 @@ typedef [v1_enum] enum tagSHCOLSTATE typedef DWORD SHCOLSTATEF; typedef GUID KNOWNFOLDERID; -typedef GUID FOLDERTYPEID; cpp_quote("#if 0") typedef KNOWNFOLDERID *REFKNOWNFOLDERID; @@ -124,3 +123,15 @@ cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID &") cpp_quote("#else") cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST") cpp_quote("#endif") + +typedef GUID FOLDERTYPEID; + +cpp_quote("#if 0") +typedef FOLDERTYPEID *REFFOLDERTYPEID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID &") +cpp_quote("#else") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID * __MIDL_CONST") +cpp_quote("#endif")

1 0

Henri Verbeet : wined3d: Make the priv parameter to map_register() const.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: c6c76f5a1a2bf95f63873de90231fea72be75163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c76f5a1a2bf95f63873de90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:13 2011 +0200 wined3d: Make the priv parameter to map_register() const. --- dlls/wined3d/shader_sm4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d0b36c6..19f8c30 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -230,7 +230,7 @@ static void map_sysval(enum wined3d_sysval_semantic sysval, struct wined3d_shade } } -static void map_register(struct wined3d_sm4_data *priv, struct wined3d_shader_register *reg) +static void map_register(const struct wined3d_sm4_data *priv, struct wined3d_shader_register *reg) { switch (priv->shader_version.type) {

1 0

Henri Verbeet : wined3d: Make the query parameter to wined3d_event_query_test() const.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 2e636aae296eedebd388beaa346a807628f1632d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e636aae296eedebd388beaa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:14 2011 +0200 wined3d: Make the query parameter to wined3d_event_query_test() const. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 2deb337..edc6864 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -35,7 +35,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) HeapFree(GetProcessHeap(), 0, query); } -static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, +static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, struct wined3d_device *device) { struct wined3d_context *context;

1 0

Henri Verbeet : wined3d: Make the query parameter to wined3d_event_query_finish() const.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 6ffd0668341c0410c11fa8654be2e51c5bbb4f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffd0668341c0410c11fa8654… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:15 2011 +0200 wined3d: Make the query parameter to wined3d_event_query_finish() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index edc6864..b26fc26 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -110,7 +110,7 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win return ret; } -enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, +enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, struct wined3d_device *device) { struct wined3d_context *context; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0d0ecf2..77ea8c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1041,7 +1041,7 @@ enum wined3d_event_query_result }; void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; -enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, +enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added creation tests.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 68c6f58e6ef8ed6ee0c5f10d65ec7ed125125ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c6f58e6ef8ed6ee0c5f10d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 13:46:50 2011 +0200 vbscript: Added creation tests. --- configure | 1 + configure.ac | 1 + dlls/vbscript/tests/Makefile.in | 7 ++++ dlls/vbscript/tests/vbscript.c | 71 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d6a4958..4ecbcb6 100755 --- a/configure +++ b/configure @@ -15124,6 +15124,7 @@ wine_fn_config_lib uuid wine_fn_config_dll uxtheme enable_uxtheme implib wine_fn_config_test dlls/uxtheme/tests uxtheme_test wine_fn_config_dll vbscript enable_vbscript +wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index cd5fc18..b213923 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,6 +2797,7 @@ WINE_CONFIG_LIB(uuid) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) +WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in new file mode 100644 index 0000000..87742f0 --- /dev/null +++ b/dlls/vbscript/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = vbscript.dll +IMPORTS = ole32 + +C_SRCS = \ + vbscript.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c new file mode 100644 index 0000000..7de424f --- /dev/null +++ b/dlls/vbscript/tests/vbscript.c @@ -0,0 +1,71 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <initguid.h> +#include <ole2.h> +#include <activscp.h> + +#include "wine/test.h" + +DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); + +static void test_vbscript(void) +{ + IActiveScriptParse *parser; + IActiveScript *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&vbscript); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); + + IActiveScriptParse64_Release(parser); + IActiveScript_Release(vbscript); +} + +static BOOL check_vbscript(void) +{ + IActiveScript *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&vbscript); + if(SUCCEEDED(hres)) + IActiveScript_Release(vbscript); + + return hres == S_OK; +} + + +START_TEST(vbscript) +{ + CoInitialize(NULL); + + if(check_vbscript()) + test_vbscript(); + else + win_skip("VBScript engine not available\n"); + + CoUninitialize(); +}

1 0

Alexandre Julliard : gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: 1f8a0eb40e75f24b16b6c93173af777548259400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8a0eb40e75f24b16b6c9317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 17:35:17 2011 +0200 gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers. --- dlls/gdi32/gdi_private.h | 3 +++ include/wine/gdi_driver.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7fa14d3..21a92c8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -273,6 +273,9 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +#define GET_DC_PHYSDEV(dc,func) \ + get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) + /* bitmap object */ typedef struct tagBITMAPOBJ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2c05d82..3a9685c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -200,7 +200,7 @@ static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) return dev; } -#define GET_DC_PHYSDEV(dc,func) get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(DC_FUNCTIONS,func)) -#define GET_NEXT_PHYSDEV(dev,func) get_physdev_entry_point( (dev)->next, FIELD_OFFSET(DC_FUNCTIONS,func)) +#define GET_NEXT_PHYSDEV(dev,func) \ + get_physdev_entry_point( (dev)->next, FIELD_OFFSET(struct gdi_dc_funcs,func)) #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Alexandre Julliard : gdi32: Add inline helpers to compute DIB stride and total size.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: eb87e694a2b8a42df0db9612e577115000d8a57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb87e694a2b8a42df0db9612e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:09:03 2011 +0200 gdi32: Add inline helpers to compute DIB stride and total size. --- dlls/gdi32/brush.c | 4 +-- dlls/gdi32/dib.c | 50 ++-------------------------------------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/objects.c | 4 +- dlls/gdi32/enhmfdrv/bitblt.c | 19 +++++---------- dlls/gdi32/enhmfdrv/objects.c | 6 +--- dlls/gdi32/gdi_private.h | 14 +++++++++- dlls/gdi32/mfdrv/bitblt.c | 32 ++++++++------------------ dlls/gdi32/mfdrv/objects.c | 6 +--- 9 files changed, 39 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb87e694a2b8a42df0db9…

1 0

Alexandre Julliard : gdi32: Add format conversion to the null driver StretchBlt implementation.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: cc8c831c4dc1a7901f5c64a7c155ffddb956efc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8c831c4dc1a7901f5c64a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:10:30 2011 +0200 gdi32: Add format conversion to the null driver StretchBlt implementation. --- dlls/gdi32/bitblt.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 8bd404c..e87ecfd 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -149,15 +149,9 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } } -static DWORD convert_bits( const BITMAPINFO *src_info, struct gdi_image_bits *src_bits, - const RECT *src_rect, BITMAPINFO *dst_info, struct gdi_image_bits *dst_bits ) +static void free_heap_bits( struct gdi_image_bits *bits ) { - FIXME( "%u -> %u not implemented\n", src_info->bmiHeader.biBitCount, dst_info->bmiHeader.biBitCount ); - dst_bits->ptr = src_bits->ptr; - dst_bits->offset = src_bits->offset; - dst_bits->is_copy = src_bits->is_copy; - dst_bits->free = NULL; - return ERROR_SUCCESS; + HeapFree( GetProcessHeap(), 0, bits->ptr ); } /* nulldrv fallback implementation using StretchDIBits */ @@ -229,14 +223,20 @@ try_get_image: if (err == ERROR_BAD_FORMAT) { RECT src_rect = src->visrect; - offset_rect( &src_rect, src_bits.offset - src->visrect.left, -src->visrect.top ); - err = convert_bits( src_info, &src_bits, &src_rect, dst_info, &dst_bits ); - if (!err) + offset_rect( &src_rect, src_bits.offset - src->visrect.left, -src->visrect.top ); + dst_info->bmiHeader.biWidth = src_rect.right - src_rect.left; + dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); + if (dst_bits.ptr) { - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, &dst->visrect, rop ); + dst_bits.is_copy = TRUE; + dst_bits.offset = 0; + dst_bits.free = free_heap_bits; + if (!(err = convert_bitmapinfo( src_info, src_bits.ptr, &src_rect, dst_info, dst_bits.ptr ))) + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, &dst->visrect, rop ); if (dst_bits.free) dst_bits.free( &dst_bits ); } + else err = ERROR_OUTOFMEMORY; } if (src_bits.free) src_bits.free( &src_bits ); return !err;

1 0

Frédéric Delanoy : cmd/tests: Test that ErrorLevel is set to 9009 when unknown commands are encountered.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: a28c7caf3e8409cc48a112d41eb6bd69642419dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28c7caf3e8409cc48a112d41… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 19 09:49:26 2011 +0200 cmd/tests: Test that ErrorLevel is set to 9009 when unknown commands are encountered. --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a0b243e..764697b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -331,6 +331,9 @@ if not exist foo ( ) echo -----------Testing Errorlevel----------- +rem WARNING: Do *not* add tests using ErrorLevel after this section +should_not_exist 2> nul > nul +echo %ErrorLevel% rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak rem See http://www.robvanderwoude.com/exit.php call :setError 1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3ddd824..07a503ec 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -169,6 +169,7 @@ non-empty dir not removed recursive rmdir succeeded recursive rmdir succeeded -----------Testing Errorlevel----------- +9009 1 errorlevel just right, good abc0def(a)or_broken@abc1def

1 0