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

Matteo Bruni : d3dx9: Improve a number of WARN messages.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 9008971bde5265bd88098b53a57cda66e15738a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9008971bde5265bd88098b53a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:13 2014 +0100 d3dx9: Improve a number of WARN messages. --- dlls/d3dx9_36/effect.c | 86 ++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9008971bde5265bd88098…

1 0

Matteo Bruni : d3dx9: Allow loading DDS volume textures into 2D textures.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: df3c573f63211f9bcafaed2d591f4c64dd9b59e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3c573f63211f9bcafaed2d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:14 2014 +0100 d3dx9: Allow loading DDS volume textures into 2D textures. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++- dlls/d3dx9_36/surface.c | 17 ++++++++++++--- dlls/d3dx9_36/tests/texture.c | 43 +++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/texture.c | 11 ++++++++-- 4 files changed, 65 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 0aef8cd..492b665 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -88,7 +88,8 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 5e87d94..97c71bf 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -539,7 +539,8 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d } HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, - DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) + DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, + unsigned int *loaded_miplevels) { HRESULT hr; @@ -553,13 +554,21 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const struct dds_header *header = src_data; const BYTE *pixels = (BYTE *)(header + 1); - /* Loading a cube texture as a simple texture is also supported (only first face texture is taken) */ - if ((src_info->ResourceType != D3DRTYPE_TEXTURE) && (src_info->ResourceType != D3DRTYPE_CUBETEXTURE)) + /* Loading a cube texture as a simple texture is also supported + * (only first face texture is taken). Same with volume textures. */ + if ((src_info->ResourceType != D3DRTYPE_TEXTURE) + && (src_info->ResourceType != D3DRTYPE_CUBETEXTURE) + && (src_info->ResourceType != D3DRTYPE_VOLUMETEXTURE)) + { + WARN("Trying to load a %u resource as a 2D texture, returning failure.\n", src_info->ResourceType); return D3DXERR_INVALIDDATA; + } width = src_info->Width; height = src_info->Height; mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); + if (src_info->ResourceType == D3DRTYPE_VOLUMETEXTURE) + mip_levels = 1; for (mip_level = 0; mip_level < mip_levels; mip_level++) { hr = calculate_dds_surface_size(src_info->Format, width, height, &src_pitch, &mip_level_size); @@ -578,6 +587,8 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, height = max(1, height / 2); } + *loaded_miplevels = mip_levels; + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 4a93ac6..a2fc551 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -25,7 +25,7 @@ #include "d3dx9tex.h" #include "resources.h" -static int has_2d_dxt5, has_cube_dxt5; +static int has_2d_dxt3, has_2d_dxt5, has_cube_dxt5; /* 2x2 16-bit dds, no mipmaps */ static const unsigned char dds_16bit[] = { @@ -1433,6 +1433,7 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; int i; + DWORD level_count; hr = D3DXCreateTextureFromFileInMemory(device, dds_16bit, sizeof(dds_16bit), &texture); ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); @@ -1464,12 +1465,46 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { for (i = 0; i < 16; i++) - ok(((BYTE*)lock_rect.pBits)[i] == dds_cube_map[128+i], "Byte at index %u is 0x%02x, expected 0x%02x\n", i, ((BYTE*)lock_rect.pBits)[i], dds_cube_map[144+i]); + ok(((BYTE *)lock_rect.pBits)[i] == dds_cube_map[128 + i], + "Byte at index %u is 0x%02x, expected 0x%02x.\n", + i, ((BYTE *)lock_rect.pBits)[i], dds_cube_map[128 + i]); IDirect3DTexture9_UnlockRect(texture, 0); } IDirect3DTexture9_Release(texture); } + + /* Volume textures work too. */ + hr = D3DXCreateTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &texture); + if (has_2d_dxt3) + ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); + else + todo_wine ok(hr == D3D_OK, "D3DXCreateTextureFromFileInMemory returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + type = IDirect3DTexture9_GetType(texture); + ok(type == D3DRTYPE_TEXTURE, "IDirect3DTexture9_GetType returned %u, expected %u.\n", type, D3DRTYPE_TEXTURE); + level_count = IDirect3DBaseTexture9_GetLevelCount((IDirect3DBaseTexture9 *)texture); + todo_wine ok(level_count == 3, "Texture has %u mip levels, 3 expected.\n", level_count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x.\n", hr, D3D_OK); + ok(desc.Width == 4, "Width is %u, expected 4.\n", desc.Width); + ok(desc.Height == 4, "Height is %u, expected 4.\n", desc.Height); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %#x, expected %#x.\n", hr, D3D_OK); + if (SUCCEEDED(hr)) + { + for (i = 0; i < 16; ++i) + ok(((BYTE *)lock_rect.pBits)[i] == dds_volume_map[128 + i], + "Byte at index %u is 0x%02x, expected 0x%02x.\n", + i, ((BYTE *)lock_rect.pBits)[i], dds_volume_map[128 + i]); + IDirect3DTexture9_UnlockRect(texture, 0); + } + /* The lower texture levels are apparently generated by filtering the level 0 surface + * I.e. following levels from the file are ignored. */ + IDirect3DTexture9_Release(texture); + } } static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) @@ -1821,7 +1856,9 @@ START_TEST(texture) return; } - /* Check whether DXT5 textures are supported */ + /* Check whether DXTn textures are supported. */ + has_2d_dxt3 = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT3)); hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_DXT5); has_2d_dxt5 = SUCCEEDED(hr); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index be86347..f5f754d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -602,6 +602,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet\n"); miplevels = imginfo.MipLevels; } + if (imginfo.ResourceType == D3DRTYPE_VOLUMETEXTURE + && D3DFMT_DXT1 <= imginfo.Format && imginfo.Format <= D3DFMT_DXT5 && miplevels > 1) + { + FIXME("Generation of mipmaps for compressed pixel formats is not implemented yet.\n"); + miplevels = 1; + } if (((file_width) && (width != imginfo.Width)) || ((file_height) && (height != imginfo.Height)) || @@ -640,10 +646,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi IDirect3DTexture9_GetSurfaceLevel(*texptr, 0, &surface); hr = D3DXLoadSurfaceFromFileInMemory(surface, palette, NULL, srcdata, srcdatasize, NULL, filter, colorkey, NULL); IDirect3DSurface9_Release(surface); + loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); } else { - hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo); + hr = load_texture_from_dds(*texptr, srcdata, palette, filter, colorkey, &imginfo, + &loaded_miplevels); } if (FAILED(hr)) @@ -654,7 +662,6 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi return hr; } - loaded_miplevels = min(IDirect3DTexture9_GetLevelCount(*texptr), imginfo.MipLevels); hr = D3DXFilterTexture((IDirect3DBaseTexture9*) *texptr, palette, loaded_miplevels - 1, mipfilter); if (FAILED(hr)) {

1 0

Matteo Bruni : d3dx9/tests: Replace a test giving inconsistent results on Windows.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: e32672f2d7d7969cf4f4f4239b0daea265b5c9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32672f2d7d7969cf4f4f4239… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 3 17:48:15 2014 +0100 d3dx9/tests: Replace a test giving inconsistent results on Windows. --- dlls/d3dx9_36/tests/mesh.c | 54 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3fd5d9d..24bcb82 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -6449,11 +6449,6 @@ static void test_weld_vertices(void) D3DXVECTOR3 position; SHORT normal[4]; }; - struct vertex_color_float4 - { - D3DXVECTOR3 position; - D3DXVECTOR4 color; - }; struct vertex_texcoord_float16_2 { D3DXVECTOR3 position; @@ -6481,7 +6476,6 @@ static void test_weld_vertices(void) UINT vertex_size_color_ubyte4 = sizeof(struct vertex_color_ubyte4); UINT vertex_size_texcoord_short2 = sizeof(struct vertex_texcoord_short2); UINT vertex_size_normal_short4 = sizeof(struct vertex_normal_short4); - UINT vertex_size_color_float4 = sizeof(struct vertex_color_float4); UINT vertex_size_texcoord_float16_2 = sizeof(struct vertex_texcoord_float16_2); UINT vertex_size_texcoord_float16_4 = sizeof(struct vertex_texcoord_float16_4); UINT vertex_size_normal_udec3 = sizeof(struct vertex_normal_udec3); @@ -6576,10 +6570,10 @@ static void test_weld_vertices(void) {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 2}, D3DDECL_END() }; - D3DVERTEXELEMENT9 declaration_color2_float4[] = + D3DVERTEXELEMENT9 declaration_color1[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 2}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, D3DDECL_END() }; D3DVERTEXELEMENT9 declaration_texcoord_float16_2[] = @@ -7443,34 +7437,38 @@ static void test_weld_vertices(void) const DWORD exp_face_remap26[] = {0, 1}; const DWORD exp_vertex_remap26[] = {0, 1, 2, 3, 4, 5}; const DWORD exp_new_num_vertices26 = ARRAY_SIZE(exp_vertices26); - /* Test 27. Weld color with usage index larger than 1. Check that the - * default epsilon of 1e-6f is used. */ - D3DXVECTOR4 zero_float4 = {0.0f, 0.0f, 0.0f, 0.0f}; - D3DXVECTOR4 almost_zero_float4 = {0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON, 0.0f + FLT_EPSILON}; - const struct vertex_color_float4 vertices27[] = + /* Test 27. Weld color with usage index 1 (specular). */ + /* Previously this test used float color values and index > 1 but that case + * appears to be effectively unhandled in native so the test gave + * inconsistent results. */ + const struct vertex_color vertices27[] = { - {{ 0.0f, 3.0f, 0.f}, zero_float4}, - {{ 2.0f, 3.0f, 0.f}, zero_float4}, - {{ 0.0f, 0.0f, 0.f}, zero_float4}, + {{ 0.0f, 3.0f, 0.0f}, 0x00000000}, + {{ 2.0f, 3.0f, 0.0f}, 0x10203040}, + {{ 0.0f, 0.0f, 0.0f}, 0x50607080}, - {{ 3.0f, 3.0f, 0.f}, almost_zero_float4}, - {{ 3.0f, 0.0f, 0.f}, zero_float4}, - {{ 1.0f, 0.0f, 0.f}, almost_zero_float4}, + {{ 3.0f, 3.0f, 0.0f}, 0x11213141}, + {{ 3.0f, 0.0f, 0.0f}, 0xffffffff}, + {{ 1.0f, 0.0f, 0.0f}, 0x51617181}, }; const DWORD indices27[] = {0, 1, 2, 3, 4, 5}; const DWORD attributes27[] = {0, 0}; const UINT num_vertices27 = ARRAY_SIZE(vertices27); const UINT num_faces27 = ARRAY_SIZE(indices27) / VERTS_PER_FACE; DWORD flags27 = D3DXWELDEPSILONS_WELDPARTIALMATCHES; - const D3DXWELDEPSILONS epsilons27 = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, 0.0f, 0.0f, 0.0f}; + const D3DXWELDEPSILONS epsilons27 = + { + 1.1f, 0.0f, 0.0f, 0.0f, 2.0f / 255.0f, 0.0f, + {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, 0.0f, 0.0f, 0.0f + }; const DWORD adjacency27[] = {-1, 1, -1, -1, -1, 0}; - const struct vertex_color_float4 exp_vertices27[] = + const struct vertex_color exp_vertices27[] = { - {{ 0.0f, 3.0f, 0.f}, zero_float4}, - {{ 2.0f, 3.0f, 0.f}, zero_float4}, - {{ 0.0f, 0.0f, 0.f}, zero_float4}, + {{ 0.0f, 3.0f, 0.0f}, 0x00000000}, + {{ 2.0f, 3.0f, 0.0f}, 0x10203040}, + {{ 0.0f, 0.0f, 0.0f}, 0x50607080}, - {{ 3.0f, 0.0f, 0.f}, zero_float4}, + {{ 3.0f, 0.0f, 0.0f}, 0xffffffff}, }; const DWORD exp_indices27[] = {0, 1, 2, 1, 3, 2}; const DWORD exp_face_remap27[] = {0, 1}; @@ -8064,8 +8062,8 @@ static void test_weld_vertices(void) num_vertices27, num_faces27, options, - declaration_color2_float4, - vertex_size_color_float4, + declaration_color1, + vertex_size_color, flags27, &epsilons27, adjacency27, @@ -8144,7 +8142,7 @@ static void test_weld_vertices(void) goto cleanup; } face_remap = HeapAlloc(GetProcessHeap(), 0, tc[i].num_faces * sizeof(*face_remap)); - if (!adjacency_out) + if (!face_remap) { skip("Couldn't allocate face_remap array.\n"); goto cleanup;

1 0

Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 376953e00a97cc6ff5e18e8a8e0cd7fb70b15629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376953e00a97cc6ff5e18e8a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 3 18:43:17 2014 +0100 oleaut32/tests: Fix compilation on systems that don't support nameless structs. --- dlls/oleaut32/tests/olefont.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 53afc8d..ded1838 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -433,8 +433,8 @@ static void test_font_events_disp(void) } case DISPID_FONT_SIZE: V_VT(&vararg) = VT_CY; - V_CY(&vararg).Lo = 25; - V_CY(&vararg).Hi = 0; + S(V_CY(&vararg)).Lo = 25; + S(V_CY(&vararg)).Hi = 0; break; case DISPID_FONT_BOLD: V_VT(&vararg) = VT_BOOL;

1 0

Piotr Caban : ole32: Fix DROPEFFECT value in OLEDD_TrackStateChange.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: efbd52983a171de920a185a8b28fb940915b2be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbd52983a171de920a185a8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:46:42 2014 +0100 ole32: Fix DROPEFFECT value in OLEDD_TrackStateChange. --- dlls/ole32/ole2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index aa6ad7c..dfe008f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2264,7 +2264,8 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) IDropTarget_DragOver(trackerInfo->curDragTarget, trackerInfo->dwKeyState, trackerInfo->curMousePos, - trackerInfo->pdwEffect); + trackerInfo->pdwEffect); + *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; } else { @@ -2306,6 +2307,7 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) trackerInfo->dwKeyState, trackerInfo->curMousePos, trackerInfo->pdwEffect); + *trackerInfo->pdwEffect &= trackerInfo->dwOKEffect; /* failed DragEnter() means invalid target */ if (hr != S_OK)

1 0

Piotr Caban : ole32: Add more DoDragDrop tests.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 6d1ab7fa16b3bb2ec93578d93bdbf2ddc71e4baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ab7fa16b3bb2ec93578d93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:47:07 2014 +0100 ole32: Add more DoDragDrop tests. --- dlls/ole32/tests/dragdrop.c | 177 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index d6eaf7a..36328df 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,6 +31,40 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(DataObject_EnumFormatEtc); +DEFINE_EXPECT(EnumFORMATETC_Next); +DEFINE_EXPECT(EnumFORMATETC_Reset); +DEFINE_EXPECT(DataObject_QueryGetData); +DEFINE_EXPECT(DropSource_QueryContinueDrag); +DEFINE_EXPECT(DropTarget_DragEnter); +DEFINE_EXPECT(DropSource_GiveFeedback); +DEFINE_EXPECT(DropTarget_Drop); +DEFINE_EXPECT(DropTarget_DragLeave); + static int droptarget_refs; /* helper macros to make tests a bit leaner */ @@ -68,7 +102,9 @@ static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + CHECK_EXPECT(DropTarget_DragEnter); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; } static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, @@ -76,11 +112,14 @@ static HRESULT WINAPI DropTarget_DragOver(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + ok(0, "unexpected call\n"); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; } static HRESULT WINAPI DropTarget_DragLeave(IDropTarget* iface) { + CHECK_EXPECT(DropTarget_DragLeave); return E_NOTIMPL; } @@ -88,7 +127,8 @@ static HRESULT WINAPI DropTarget_Drop(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - return E_NOTIMPL; + CHECK_EXPECT(DropTarget_Drop); + return 0xbeefbeef; } static const IDropTargetVtbl DropTarget_VTbl = @@ -104,7 +144,6 @@ static const IDropTargetVtbl DropTarget_VTbl = static IDropTarget DropTarget = { &DropTarget_VTbl }; -/** stub IDropSource **/ static HRESULT WINAPI DropSource_QueryInterface(IDropSource *iface, REFIID riid, void **ppObj) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -132,7 +171,7 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - /* always drop */ + CHECK_EXPECT(DropSource_QueryContinueDrag); return DRAGDROP_S_DROP; } @@ -140,6 +179,7 @@ static HRESULT WINAPI DropSource_GiveFeedback( IDropSource *iface, DWORD dwEffect) { + CHECK_EXPECT(DropSource_GiveFeedback); return DRAGDROP_S_USEDEFAULTCURSORS; } @@ -153,7 +193,75 @@ static const IDropSourceVtbl dropsource_vtbl = { static IDropSource DropSource = { &dropsource_vtbl }; -/** IDataObject stub **/ +static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, + REFIID riid, void **ppvObj) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) +{ + return 2; +} + +static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) +{ + return 1; +} + +static BOOL formats_enumerated; +static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, + ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) +{ + static FORMATETC format = { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + + CHECK_EXPECT2(EnumFORMATETC_Next); + + ok(celt == 1, "celt = %d\n", celt); + ok(rgelt != NULL, "rgelt == NULL\n"); + ok(pceltFetched == NULL, "pceltFetched != NULL\n"); + + if(formats_enumerated) + return S_FALSE; + + *rgelt = format; + formats_enumerated = TRUE; + return S_OK; +} + +static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) +{ + CHECK_EXPECT(EnumFORMATETC_Reset); + formats_enumerated = FALSE; + return S_OK; +} + +static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, + IEnumFORMATETC **ppenum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IEnumFORMATETCVtbl enumformatetc_vtbl = { + EnumFORMATETC_QueryInterface, + EnumFORMATETC_AddRef, + EnumFORMATETC_Release, + EnumFORMATETC_Next, + EnumFORMATETC_Skip, + EnumFORMATETC_Reset, + EnumFORMATETC_Clone +}; + +static IEnumFORMATETC EnumFORMATETC = { &enumformatetc_vtbl }; + static HRESULT WINAPI DataObject_QueryInterface( IDataObject *iface, REFIID riid, @@ -166,6 +274,8 @@ static HRESULT WINAPI DataObject_QueryInterface( IDataObject_AddRef(iface); return S_OK; } + + trace("DataObject_QueryInterface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -184,6 +294,7 @@ static HRESULT WINAPI DataObject_GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -192,6 +303,7 @@ static HRESULT WINAPI DataObject_GetDataHere( FORMATETC *pformatetc, STGMEDIUM *pmedium) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -199,6 +311,7 @@ static HRESULT WINAPI DataObject_QueryGetData( IDataObject *iface, FORMATETC *pformatetc) { + CHECK_EXPECT(DataObject_QueryGetData); return S_OK; } @@ -207,6 +320,7 @@ static HRESULT WINAPI DataObject_GetCanonicalFormatEtc( FORMATETC *pformatectIn, FORMATETC *pformatetcOut) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -216,6 +330,7 @@ static HRESULT WINAPI DataObject_SetData( STGMEDIUM *pmedium, BOOL fRelease) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -224,6 +339,9 @@ static HRESULT WINAPI DataObject_EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { + CHECK_EXPECT(DataObject_EnumFormatEtc); + *ppenumFormatEtc = &EnumFORMATETC; + formats_enumerated = FALSE; return S_OK; } @@ -234,6 +352,7 @@ static HRESULT WINAPI DataObject_DAdvise( IAdviseSink *pAdvSink, DWORD *pdwConnection) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -241,6 +360,7 @@ static HRESULT WINAPI DataObject_DUnadvise( IDataObject *iface, DWORD dwConnection) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -248,6 +368,7 @@ static HRESULT WINAPI DataObject_EnumDAdvise( IDataObject *iface, IEnumSTATDATA **ppenumAdvise) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -362,9 +483,10 @@ static void test_DoDragDrop(void) DWORD effect; HRESULT hr; HWND hwnd; + RECT rect; hwnd = CreateWindowA("WineOleTestClass", "Test", 0, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, NULL, NULL); ok(IsWindow(hwnd), "failed to create window\n"); @@ -396,6 +518,47 @@ static void test_DoDragDrop(void) hr = DoDragDrop(&DataObject, NULL, 0, &effect); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ShowWindow(hwnd, SW_SHOW); + GetWindowRect(hwnd, &rect); + ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); + SET_EXPECT(DataObject_EnumFormatEtc); + SET_EXPECT(EnumFORMATETC_Next); + SET_EXPECT(EnumFORMATETC_Reset); + SET_EXPECT(DataObject_QueryGetData); + SET_EXPECT(DropSource_QueryContinueDrag); + SET_EXPECT(DropTarget_DragEnter); + SET_EXPECT(DropSource_GiveFeedback); + SET_EXPECT(DropTarget_Drop); + hr = DoDragDrop(&DataObject, &DropSource, DROPEFFECT_COPY, &effect); + ok(hr == 0xbeefbeef, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); + todo_wine CHECK_CALLED(EnumFORMATETC_Next); + todo_wine CHECK_CALLED(EnumFORMATETC_Reset); + todo_wine CHECK_CALLED(DataObject_QueryGetData); + CHECK_CALLED(DropSource_QueryContinueDrag); + CHECK_CALLED(DropTarget_DragEnter); + CHECK_CALLED(DropSource_GiveFeedback); + CHECK_CALLED(DropTarget_Drop); + + SET_EXPECT(DataObject_EnumFormatEtc); + SET_EXPECT(EnumFORMATETC_Next); + SET_EXPECT(EnumFORMATETC_Reset); + SET_EXPECT(DataObject_QueryGetData); + SET_EXPECT(DropSource_QueryContinueDrag); + SET_EXPECT(DropTarget_DragEnter); + SET_EXPECT(DropSource_GiveFeedback); + SET_EXPECT(DropTarget_DragLeave); + hr = DoDragDrop(&DataObject, &DropSource, 0, &effect); + ok(hr == DRAGDROP_S_DROP, "got 0x%08x\n", hr); + todo_wine CHECK_CALLED(DataObject_EnumFormatEtc); + todo_wine CHECK_CALLED(EnumFORMATETC_Next); + todo_wine CHECK_CALLED(EnumFORMATETC_Reset); + todo_wine CHECK_CALLED(DataObject_QueryGetData); + CHECK_CALLED(DropSource_QueryContinueDrag); + CHECK_CALLED(DropTarget_DragEnter); + CHECK_CALLED(DropSource_GiveFeedback); + CHECK_CALLED(DropTarget_DragLeave); + OleUninitialize(); DestroyWindow(hwnd);

1 0

Grazvydas Ignotas : include: Remove unneeded semicolons and fix a typo.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 7e4fa636215ab4930c0110b2e47bfa692f9ab33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4fa636215ab4930c0110b2e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Mar 2 04:12:27 2014 +0200 include: Remove unneeded semicolons and fix a typo. --- include/ddk/imm.h | 2 +- include/loadperf.h | 2 +- include/msi.h | 6 +++--- include/shlobj.h | 4 ++-- include/shlwapi.h | 2 +- include/tapi.h | 6 +++--- include/winreg.h | 4 ++-- include/winsock2.h | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/ddk/imm.h b/include/ddk/imm.h index 51685d5..bbbd70a 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -143,7 +143,7 @@ DWORD WINAPI ImmGetIMCCSize(HIMCC); BOOL WINAPI ImmGenerateMessage(HIMC); LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); -#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); +#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage) BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); diff --git a/include/loadperf.h b/include/loadperf.h index d11186a..40de444 100644 --- a/include/loadperf.h +++ b/include/loadperf.h @@ -25,7 +25,7 @@ extern "C" { DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR); DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR); -#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll); +#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll) DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); diff --git a/include/msi.h b/include/msi.h index 9a7d562..8d0dff2 100644 --- a/include/msi.h +++ b/include/msi.h @@ -493,15 +493,15 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR); UINT WINAPI MsiConfigureProductA(LPCSTR, int, INSTALLSTATE); UINT WINAPI MsiConfigureProductW(LPCWSTR, int, INSTALLSTATE); -#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct); +#define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct) UINT WINAPI MsiConfigureProductExA(LPCSTR, int, INSTALLSTATE, LPCSTR); UINT WINAPI MsiConfigureProductExW(LPCWSTR, int, INSTALLSTATE, LPCWSTR); -#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx); +#define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx) UINT WINAPI MsiConfigureFeatureA(LPCSTR, LPCSTR, INSTALLSTATE); UINT WINAPI MsiConfigureFeatureW(LPCWSTR, LPCWSTR, INSTALLSTATE); -#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature); +#define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature) UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR); UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR); diff --git a/include/shlobj.h b/include/shlobj.h index 95369ad..9025a73 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -61,7 +61,7 @@ BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,DWORD,LPCWSTR,LPCWSTR,LPCW HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); -#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); @@ -72,7 +72,7 @@ HRESULT WINAPI SHLoadOLE(LPARAM); HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); -#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); +#define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite) UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); BOOL WINAPI SHRunControlPanel(LPCWSTR, HWND); diff --git a/include/shlwapi.h b/include/shlwapi.h index f3d6ca0..205d5e6 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -424,7 +424,7 @@ BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR); BOOL WINAPI PathIsFileSpecA(LPCSTR); BOOL WINAPI PathIsFileSpecW(LPCWSTR); -#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec); +#define PathIsFileSpec WINELIB_NAME_AW(PathIsFileSpec) BOOL WINAPI PathIsPrefixA(LPCSTR,LPCSTR); BOOL WINAPI PathIsPrefixW(LPCWSTR,LPCWSTR); diff --git a/include/tapi.h b/include/tapi.h index 98d995a..45ab122 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -918,11 +918,11 @@ DWORD WINAPI lineGetConfRelatedCalls(HCALL,LPLINECALLLIST); DWORD WINAPI lineGetCountry(DWORD,DWORD,LPLINECOUNTRYLIST); DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); DWORD WINAPI lineGetDevCapsW(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); -#define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps); +#define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps) DWORD WINAPI lineGetDevConfig(DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIDW(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCWSTR); -#define lineGetID WINELIB_NAME_AW(lineGetID); +#define lineGetID WINELIB_NAME_AW(lineGetID) DWORD WINAPI lineGetIcon(DWORD,LPCSTR,HICON *); DWORD WINAPI lineGetLineDevStatus(HLINE,LPLINEDEVSTATUS); DWORD WINAPI lineGetNewCalls(HLINE,DWORD,DWORD,LPLINECALLLIST); @@ -941,7 +941,7 @@ LONG WINAPI lineInitializeExW(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCWSTR,LPDWORD #define lineInitializeEx WINELIB_NAME_AW(lineInitializeEx) DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineMakeCallW(HLINE,LPHCALL,LPCWSTR,DWORD,LPLINECALLPARAMS); -#define lineMakeCall WINELIB_NAMEAW(lineMakeCall); +#define lineMakeCall WINELIB_NAME_AW(lineMakeCall) DWORD WINAPI lineMonitorDigits(HCALL,DWORD); DWORD WINAPI lineMonitorMedia(HCALL,DWORD); DWORD WINAPI lineMonitorTones(HCALL,LPLINEMONITORTONE,DWORD); diff --git a/include/winreg.h b/include/winreg.h index fb0b752..56d9650 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -87,10 +87,10 @@ WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); WINADVAPI BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); -#define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown); +#define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownExA(LPSTR,LPSTR,DWORD,BOOL,BOOL,DWORD); WINADVAPI BOOL WINAPI InitiateSystemShutdownExW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL,DWORD); -#define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx); +#define InitiateSystemShutdownEx WINELIB_NAME_AW(InitiateSystemShutdownEx) WINADVAPI LSTATUS WINAPI RegCloseKey(HKEY); WINADVAPI LSTATUS WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY); WINADVAPI LSTATUS WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY); diff --git a/include/winsock2.h b/include/winsock2.h index f189f79..04f3aea 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -724,7 +724,7 @@ typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWO typedef int (WINAPI *LPFN_WSAJOINLEAF)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINA)(LPWSAQUERYSETA,DWORD,LPHANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINW)(LPWSAQUERYSETW,DWORD,LPHANDLE); -#define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN); +#define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN) typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW);

1 0

Grazvydas Ignotas : winegcc: Define __stdcall and similar attributes to nothing on ARM.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: f5e28fff8ea36b553cc30fe54887ace873e64e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e28fff8ea36b553cc30fe54… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Mar 2 04:13:54 2014 +0200 winegcc: Define __stdcall and similar attributes to nothing on ARM. --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 8afe5af..e051d61 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -564,6 +564,16 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); } + else if (opts->target_cpu == CPU_ARM || opts->target_cpu == CPU_ARM64) + { + strarray_add(comp_args, "-D__stdcall="); + strarray_add(comp_args, "-D__cdecl="); + strarray_add(comp_args, "-D_stdcall="); + strarray_add(comp_args, "-D_cdecl="); + strarray_add(comp_args, "-D__fastcall="); + strarray_add(comp_args, "-D_fastcall="); + fastcall_done = 1; + } else { strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))");

1 0

Nikolay Sivov : fontsub: Added dll stub.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: fbd446519c66045ea7efff761754683d88836b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd446519c66045ea7efff761… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:54:04 2014 +0400 fontsub: Added dll stub. --- configure | 2 ++ configure.ac | 1 + dlls/fontsub/Makefile.in | 4 ++++ dlls/fontsub/fontsub.spec | 2 ++ dlls/fontsub/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index c6f4b39..dcd8581 100755 --- a/configure +++ b/configure @@ -1029,6 +1029,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib enable_fntcache +enable_fontsub enable_fusion enable_fwpuclnt enable_gameux @@ -16852,6 +16853,7 @@ wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fntcache enable_fntcache +wine_fn_config_dll fontsub enable_fontsub wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test wine_fn_config_dll fwpuclnt enable_fwpuclnt diff --git a/configure.ac b/configure.ac index 098a5bd..ee8cd1a 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,6 +2858,7 @@ WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fntcache) +WINE_CONFIG_DLL(fontsub) WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) WINE_CONFIG_DLL(fwpuclnt) diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in new file mode 100644 index 0000000..ac323b5 --- /dev/null +++ b/dlls/fontsub/Makefile.in @@ -0,0 +1,4 @@ +MODULE = fontsub.dll + +C_SRCS = \ + main.c diff --git a/dlls/fontsub/fontsub.spec b/dlls/fontsub/fontsub.spec new file mode 100644 index 0000000..dfb47fb --- /dev/null +++ b/dlls/fontsub/fontsub.spec @@ -0,0 +1,2 @@ +@ stub CreateFontPackage +@ stub MergeFontPackage diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c new file mode 100644 index 0000000..515c2d3 --- /dev/null +++ b/dlls/fontsub/main.c @@ -0,0 +1,40 @@ +/* + * Copyright 2014 Nikolay Sivov 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 + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontsub); + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +}

1 0

Nikolay Sivov : msxml3: Unify Invoke()/InvokeEx() tracing format.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 19eecac79ceb8fc2e5d54ead3b7297683689386f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19eecac79ceb8fc2e5d54ead3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 3 08:54:25 2014 +0400 msxml3: Unify Invoke()/InvokeEx() tracing format. --- dlls/msxml3/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 272f302..78d4c0c 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -417,7 +417,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, { DispatchEx *This = impl_from_IDispatchEx(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%x %s %x %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags,

1 0