May 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : xmllite/reader: Create reader input with same IMalloc as reader.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0ae578b71cb1319f61415ef5644f2c1fbe8e9159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae578b71cb1319f61415ef56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 21:53:55 2014 +0400 xmllite/reader: Create reader input with same IMalloc as reader. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index deb2d2e..d8b81ea 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2517,7 +2517,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &readerinput); + This->imalloc, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; This->input = impl_from_IXmlReaderInput(readerinput); }

1 0

Martin Storsjo : ntdll: Don' t write uninitialized bytes at the end of filenames.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 114444ca9cc1f855febfd6ae9c28cc8b69172f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114444ca9cc1f855febfd6ae9… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:04 2014 +0300 ntdll: Don't write uninitialized bytes at the end of filenames. --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 890fb71..50bf66a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1484,7 +1484,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK assert(0); return NULL; } - memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); + memcpy( filename, long_nameW, long_len * sizeof(WCHAR) ); io->Information += total_len; return info; }

1 0

Jacek Caban : oleaut32: Use debugstr_variant in variant.c where appropriate.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 9677454f7d80483be6e6d8297d9f01f99d70217e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9677454f7d80483be6e6d8297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 14:55:36 2014 +0200 oleaut32: Use debugstr_variant in variant.c where appropriate. --- dlls/oleaut32/variant.c | 110 ++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9677454f7d80483be6e6d…

1 0

Huw Davies : wininet/tests: Don't test GetLastError() on success.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fec1ed454ce4ccc136c66511404975b9fcb1d503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1ed454ce4ccc136c665114… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 14:06:05 2014 +0100 wininet/tests: Don't test GetLastError() on success. --- dlls/wininet/tests/url.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index e1f8612..3e9a1d4 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -851,12 +851,9 @@ static void InternetCreateUrlA_test(void) /* alloc-ed szUrl, NULL lpszScheme * shows that it uses nScheme instead */ - SetLastError(0xdeadbeef); urlComp.lpszScheme = NULL; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); @@ -864,48 +861,36 @@ static void InternetCreateUrlA_test(void) * any nScheme out of range seems ignored */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.nScheme = -3; len++; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); /* test valid lpUrlComponents, alloc-ed szUrl */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(strstr(szUrl, "80") == NULL, "Didn't expect to find 80 in szUrl\n"); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); /* valid username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 41, "Expected len 41, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL2), "Expected %s, got %s\n", CREATE_URL2, szUrl); /* valid username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); @@ -927,39 +912,30 @@ static void InternetCreateUrlA_test(void) * if password is provided, username has to exist */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); /* NULL username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = NULL; urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 32, "Expected len 32, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL4, szUrl); /* empty username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl);

1 0

Alexandre Julliard : d3d10_1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: c5b19d4ad0e9000f5479c174c8e63e3fd7408cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b19d4ad0e9000f5479c174c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:28 2014 +0200 d3d10_1: Remove unnecessary DllMain implementation. --- dlls/d3d10_1/d3d10_1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 721fe7d..a619004 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,18 +63,6 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) {

1 0

Alexandre Julliard : d3d8: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 4df26c56d832e94d138009bc28bb87701f1822c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26c56d832e94d138009bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:12 2014 +0200 d3d8: Remove unnecessary DllMain implementation. --- dlls/d3d8/d3d8_main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 2b6ada4..8ac704c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -56,15 +56,6 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * ValidateVertexShader (D3D8.@) *

1 0

Alexandre Julliard : dciman32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 16352f0aeeb4a5429a9b9b78f75baa20cefd564d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16352f0aeeb4a5429a9b9b78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:14 2014 +0200 dciman32: Remove unnecessary DllMain implementation. --- dlls/dciman32/dciman_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c index 2287c78..c693492 100644 --- a/dlls/dciman32/dciman_main.c +++ b/dlls/dciman32/dciman_main.c @@ -31,18 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI

1 0

Alexandre Julliard : advpack: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0289ea0e43ad099db86642e1776313c8b5ac36c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289ea0e43ad099db86642e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:03 2014 +0200 advpack: Remove unnecessary DllMain implementation. --- dlls/advpack/advpack.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 296abb5..83dda08 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -208,19 +208,6 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges.

1 0

Alexandre Julliard : msimg32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 693faf2a7d47f1886cdb005e0f7ca296a71e05c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693faf2a7d47f1886cdb005e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:20 2014 +0200 msimg32: Remove unnecessary DllMain implementation. --- dlls/msimg32/msimg32_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c index 9e859c8..34beb3c 100644 --- a/dlls/msimg32/msimg32_main.c +++ b/dlls/msimg32/msimg32_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimg32); -/*********************************************************************** - * DllInitialize (MSIMG32.@) - * - * MSIMG32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - /****************************************************************************** * vSetDdrawflag (MSIMG32.@) */

1 0

Alexandre Julliard : wintrust: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6eb922f1d461d0afcc5e3d4e547e4a4bd6e512d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb922f1d461d0afcc5e3d4e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:25 2014 +0200 wintrust: Remove unnecessary DllMain implementation. --- dlls/wintrust/wintrust_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 9b8dd85..58e3ac3 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -59,20 +59,6 @@ void WINAPI WINTRUST_Free(void *p) } /*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - -/*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert )

1 0

Stefan Dösinger : wined3d: Move get_dc palette updates to ddraw.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fd0189bbfa1ccc3832aaf01fb61a15fbc6ee9e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0189bbfa1ccc3832aaf01fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 16:13:31 2014 +0200 wined3d: Move get_dc palette updates to ddraw. --- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 19 +++++++++++++++++-- dlls/wined3d/palette.c | 6 ++++++ dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2bf8132..8cc5201 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -575,6 +575,13 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +static inline BOOL format_is_paletteindexed(const DDPIXELFORMAT *fmt) +{ + DWORD flags = DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 + | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8; + return !!(fmt->dwFlags & flags); +} + /* Used for generic dumping */ struct flag_info { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e184cfd..4f270fd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1798,10 +1798,7 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID static BOOL validate_surface_palette(struct ddraw_surface *surface) { - return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) + return !format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat) || surface->palette; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2efc98c..3f230a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -461,8 +461,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD return DDERR_INVALIDSURFACETYPE; } - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + if (!format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) return DDERR_INVALIDPIXELFORMAT; wined3d_mutex_lock(); @@ -2017,6 +2016,22 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); + + if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; + + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + } + wined3d_mutex_unlock(); switch(hr) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e103b5b..24b344c 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -83,6 +83,12 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, return WINED3D_OK; } +void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc) +{ + if (SetDIBColorTable(dc, 0, 256, palette->colors) != 256) + ERR("Failed to set DIB color table.\n"); +} + HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea27ab..023439d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1378,7 +1378,7 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) { - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); + wined3d_palette_apply_to_dc(palette, surface->hDC); x11_copy_to_screen(surface->swapchain, NULL); } } @@ -3122,31 +3122,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) surface_load_location(surface, WINED3D_LOCATION_DIB); surface_invalidate_location(surface, ~WINED3D_LOCATION_DIB); - if (surface->resource.format->id == WINED3DFMT_P8_UINT - || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) - { - /* GetDC on palettized formats is unsupported in D3D9, and the method - * is missing in D3D8, so this should only be used for DX <=7 - * surfaces (with non-device palettes). */ - const RGBQUAD *colors = NULL; - - if (surface->palette) - { - colors = surface->palette->colors; - } - else - { - struct wined3d_swapchain *swapchain = surface->resource.device->swapchains[0]; - struct wined3d_surface *dds_primary = swapchain->front_buffer; - - if (dds_primary && dds_primary->palette) - colors = dds_primary->palette->colors; - } - - if (colors) - SetDIBColorTable(surface->hDC, 0, 256, colors); - } - surface->flags |= SFLAG_DCINUSE; surface->resource.map_count++; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 41b3158..f1a45dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,6 +160,7 @@ @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db36fbf..328b595 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2261,6 +2261,7 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); +void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

1 0

Nikolay Sivov : xmllite/writer: Implement Flush() method.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: caeecfa223013941f44e9974a51f9bb3bd2b2a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caeecfa223013941f44e9974a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:50:31 2014 +0400 xmllite/writer: Implement Flush() method. --- dlls/xmllite/tests/writer.c | 14 +++++++------- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2fcd5f2..b6b8fe3 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -170,24 +170,24 @@ static void test_writestartdocument(void) hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); ok(hr == S_OK, "got 0x%08x\n", hr); + /* nothing written yet */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == E_NOTIMPL) - { - IStream_Release(stream); - IXmlWriter_Release(writer); - return; - } hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 745da79..0a1d361 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,6 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes + * 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 @@ -62,6 +63,7 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; + ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -223,6 +225,11 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +static inline void reset_output_buffer(xmlwriteroutput *output) +{ + output->stream_written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -243,6 +250,31 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu return hr; } +static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) +{ + struct output_buffer *buffer; + ULONG written = 0, len; + HRESULT hr; + + if (!output || !output->stream) + return S_OK; + + buffer = &output->buffer; + + len = buffer->written - output->stream_written; + if (!len) + return S_OK; + + hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + return hr; + } + + output->stream_written += written; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -295,6 +327,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { + reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -662,9 +695,9 @@ static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + return writeroutput_flush_stream(This->output); } static const struct IXmlWriterVtbl xmlwriter_vtbl = @@ -825,6 +858,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; + writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : xmllite/writer: Initial support for starting a document.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a0f67c36956dd8998a0e79e675fcc7d7151b2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f67c36956dd8998a0e79e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:49:37 2014 +0400 xmllite/writer: Initial support for starting a document. --- dlls/xmllite/reader.c | 13 ++-- dlls/xmllite/tests/writer.c | 20 ++++-- dlls/xmllite/writer.c | 154 +++++++++++++++++++++++++++++++++++++--- dlls/xmllite/xmllite_private.h | 9 +++ 4 files changed, 175 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f67c36956dd8998a0e7…

1 0

Nikolay Sivov : xmllite/writer: Initial support of output buffer creation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71ab66efa04f80ef788a485295f10dd9e0d48191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ab66efa04f80ef788a48529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:47:26 2014 +0400 xmllite/writer: Initial support of output buffer creation. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/writer.c | 83 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++ dlls/xmllite/xmllite_private.h | 3 +- 4 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8b81ea..e772a08 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -554,7 +554,7 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +HRESULT get_code_page(xml_encoding encoding, UINT *cp) { if (encoding == XmlEncoding_Unknown) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 738844f..0f86fb9 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -143,6 +143,88 @@ static void test_writeroutput(void) IUnknown_Release(output); } +static void test_writestartdocument(void) +{ + static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* output not set */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); +todo_wine + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + if (hr == E_NOTIMPL) { + IXmlWriter_Release(writer); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, fullprolog, strlen(fullprolog)), "got %s, expected %s\n", ptr, fullprolog); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -150,4 +232,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); + test_writestartdocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2432602..10d73cb 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -34,6 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +struct output_buffer +{ + char *data; + unsigned int allocated; + unsigned int written; + UINT codepage; +}; + typedef struct { IXmlWriterOutput IXmlWriterOutput_iface; @@ -42,6 +50,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + struct output_buffer buffer; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -107,6 +116,36 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static HRESULT init_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + const int initial_len = 0x2000; + HRESULT hr; + UINT cp; + + hr = get_code_page(output->encoding, &cp); + if (FAILED(hr)) return hr; + + buffer->data = writeroutput_alloc(output, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->allocated = initial_len; + buffer->written = 0; + buffer->codepage = cp; + + return S_OK; +} + +static void free_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + writeroutput_free(output, buffer->data); + buffer->data = NULL; + buffer->allocated = 0; + buffer->written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -572,6 +611,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); + free_output_buffer(This); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -627,11 +667,14 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; + HRESULT hr; TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); if (!stream || !output) return E_INVALIDARG; + *output = NULL; + if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else @@ -644,6 +687,11 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); writeroutput->stream = NULL; + hr = init_output_buffer(writeroutput); + if (FAILED(hr)) { + IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 96a78fa..642aabe 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -60,6 +60,7 @@ typedef enum XmlEncoding_Unknown } xml_encoding; -xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN; +xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; +HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */

1 0

Hans Leidekker : winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 552225632827ffe66a3a8f4045628cc8762b1a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552225632827ffe66a3a8f404… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:48 2014 +0200 winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/pac.js | 244 ----------------------- dlls/winhttp/rsrc.rc | 3 - dlls/winhttp/session.c | 484 ++++++---------------------------------------- 4 files changed, 58 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552225632827ffe66a3a8…

1 0

Frédéric Delanoy : oleacc: Add message context for object state string resources.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d1dbc024b5c8ba0b9d6b539cd1a47562a34e6e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dbc024b5c8ba0b9d6b539cd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 15 09:14:59 2014 +0200 oleacc: Add message context for object state string resources. --- dlls/oleacc/oleacc.rc | 64 ++++++++++++++++++++++++------------------------- po/ar.po | 44 +++++++++++++++++++++++++++++++--- po/bg.po | 45 ++++++++++++++++++++++++++++++---- po/ca.po | 44 +++++++++++++++++++++++++++++++--- po/cs.po | 44 +++++++++++++++++++++++++++++++--- po/da.po | 44 +++++++++++++++++++++++++++++++--- po/de.po | 44 +++++++++++++++++++++++++++++++--- po/el.po | 42 +++++++++++++++++++++++++++++--- po/en.po | 32 +++++++++++++++++++++++++ po/en_US.po | 32 +++++++++++++++++++++++++ po/eo.po | 48 +++++++++++++++++++++++++++++++++---- po/es.po | 44 +++++++++++++++++++++++++++++++--- po/fa.po | 41 ++++++++++++++++++++++++++++--- po/fi.po | 44 +++++++++++++++++++++++++++++++--- po/fr.po | 44 +++++++++++++++++++++++++++++++--- po/he.po | 48 +++++++++++++++++++++++++++++++++---- po/hi.po | 32 +++++++++++++++++++++++++ po/hr.po | 44 +++++++++++++++++++++++++++++++--- po/hu.po | 44 +++++++++++++++++++++++++++++++--- po/it.po | 44 +++++++++++++++++++++++++++++++--- po/ja.po | 44 +++++++++++++++++++++++++++++++--- po/ko.po | 44 +++++++++++++++++++++++++++++++--- po/lt.po | 44 +++++++++++++++++++++++++++++++--- po/ml.po | 32 +++++++++++++++++++++++++ po/nb_NO.po | 44 +++++++++++++++++++++++++++++++--- po/nl.po | 44 +++++++++++++++++++++++++++++++--- po/or.po | 32 +++++++++++++++++++++++++ po/pa.po | 32 +++++++++++++++++++++++++ po/pl.po | 44 +++++++++++++++++++++++++++++++--- po/pt_BR.po | 44 +++++++++++++++++++++++++++++++--- po/pt_PT.po | 44 +++++++++++++++++++++++++++++++--- po/rm.po | 35 ++++++++++++++++++++++++++- po/ro.po | 44 +++++++++++++++++++++++++++++++--- po/ru.po | 44 +++++++++++++++++++++++++++++++--- po/sk.po | 43 ++++++++++++++++++++++++++++++--- po/sl.po | 44 +++++++++++++++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 47 ++++++++++++++++++++++++++++++++---- po/sr_RS(a)latin.po | 47 ++++++++++++++++++++++++++++++++---- po/sv.po | 44 +++++++++++++++++++++++++++++++--- po/te.po | 32 +++++++++++++++++++++++++ po/th.po | 48 +++++++++++++++++++++++++++++++++---- po/tr.po | 44 +++++++++++++++++++++++++++++++--- po/uk.po | 44 +++++++++++++++++++++++++++++++--- po/wa.po | 44 ++++++++++++++++++++++++++++++---- po/wine.pot | 32 +++++++++++++++++++++++++ po/zh_CN.po | 48 +++++++++++++++++++++++++++++++++---- po/zh_TW.po | 44 +++++++++++++++++++++++++++++++--- 47 files changed, 1847 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1dbc024b5c8ba0b9d6b5…

1 0

Hans Leidekker : jsproxy: Implement InternetGetProxyInfo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: f7c8f5b3e45d688e3facebd80396d10de4a44b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c8f5b3e45d688e3facebd80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:31 2014 +0200 jsproxy: Implement InternetGetProxyInfo. --- dlls/jsproxy/Makefile.in | 3 + dlls/jsproxy/jsproxy.spec | 2 +- dlls/jsproxy/main.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jsproxy/pac.js | 244 +++++++++++++++++++++++ dlls/jsproxy/rsrc.rc | 20 ++ 5 files changed, 748 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c8f5b3e45d688e3face…

1 0

Hans Leidekker : jsproxy: New dll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: ae542221a074f7459f28a623498421a59516192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae542221a074f7459f28a6234… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:07 2014 +0200 jsproxy: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/jsproxy/Makefile.in | 5 +++++ dlls/jsproxy/jsproxy.spec | 5 +++++ dlls/jsproxy/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index e5a26d1..4bcbfd8 100755 --- a/configure +++ b/configure @@ -1063,6 +1063,7 @@ enable_itircl enable_itss enable_joy_cpl enable_jscript +enable_jsproxy enable_kernel32 enable_ktmw32 enable_loadperf @@ -16937,6 +16938,7 @@ wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll joy.cpl enable_joy_cpl po wine_fn_config_dll jscript enable_jscript clean,po wine_fn_config_test dlls/jscript/tests jscript_test +wine_fn_config_dll jsproxy enable_jsproxy implib wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 diff --git a/configure.ac b/configure.ac index 673323a..de5aa41 100644 --- a/configure.ac +++ b/configure.ac @@ -2914,6 +2914,7 @@ WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(joy.cpl,,[po]) WINE_CONFIG_DLL(jscript,,[clean,po]) WINE_CONFIG_TEST(dlls/jscript/tests) +WINE_CONFIG_DLL(jsproxy,,[implib]) WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in new file mode 100644 index 0000000..41b59ea --- /dev/null +++ b/dlls/jsproxy/Makefile.in @@ -0,0 +1,5 @@ +MODULE = jsproxy.dll +IMPORTLIB = jsproxy + +C_SRCS = \ + main.c diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec new file mode 100644 index 0000000..21943df --- /dev/null +++ b/dlls/jsproxy/jsproxy.spec @@ -0,0 +1,5 @@ +@ stub InternetInitializeAutoProxyDll +@ stub InternetInitializeExAutoProxyDll +@ stub InternetDeInitializeAutoProxyDll +@ stub InternetDeInitializeExAutoProxyDll +@ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c new file mode 100644 index 0000000..fa9703d --- /dev/null +++ b/dlls/jsproxy/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2014 Hans Leidekker 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static HINSTANCE instance; + +WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); + +/****************************************************************** + * DllMain (jsproxy.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Hans Leidekker : include: Add missing proxy definitions.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a8ec0edfa88dde40cdfe50dee34b1752b07b0a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ec0edfa88dde40cdfe50dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:04:54 2014 +0200 include: Add missing proxy definitions. --- include/wininet.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 5cc3fd5..331055c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1720,6 +1720,36 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) +typedef struct AutoProxyHelperVtbl +{ + BOOL (WINAPI *IsResolvable)(LPSTR); + DWORD (WINAPI *GetIPAddress)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostName)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNet)(LPSTR, LPSTR, LPSTR); + BOOL (WINAPI *IsResolvableEx)(LPSTR); + DWORD (WINAPI *GetIPAddressEx)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostNameEx)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNetEx)(LPSTR, LPSTR); + DWORD (WINAPI *SortIpList)(LPSTR, LPSTR, LPDWORD); +} AutoProxyHelperVtbl; + +typedef struct AutoProxyHelperFunctions +{ + const struct AutoProxyHelperVtbl *lpVtbl; +} AutoProxyHelperFunctions; + +typedef struct +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; + +typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); +typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, + LPAUTO_PROXY_SCRIPT_BUFFER); + BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD);

1 0

Huw Davies : shell32/tests: Fix tests on win 8.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6f7650aec11f2bc8f10d46a36207ba23f92eeb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7650aec11f2bc8f10d46a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:12 2014 +0100 shell32/tests: Fix tests on win 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3e51c8a..474f605 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -779,7 +779,8 @@ static void test_GetDisplayName(void) if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */ - (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */ + (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)) || /* Win7 */ + (pidlLast->mkid.cb >= 102 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[72], wszFileName)), /* Win8 */ "Filename should be stored as wchar-string at this position!\n"); } @@ -1853,8 +1854,9 @@ static void test_ITEMIDLIST_format(void) { } ok (!lstrcmpW(wszFile[i], name) || - !lstrcmpW(wszFile[i], name + 9) || /* Vista */ - !lstrcmpW(wszFile[i], name + 11), /* Win7 */ + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11) || /* Win7 */ + !lstrcmpW(wszFile[i], name + 13), /* Win8 */ "The filename should be stored in unicode at this position!\n"); } } @@ -3969,7 +3971,8 @@ static void test_GetUIObject(void) } max_id_check -= baseItem; ok((max_id_check == max_id) || - (max_id_check == max_id-1 /* Win 7 */), + (max_id_check == max_id-1) || /* Win 7 */ + (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); #define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA)

1 0

Hans Leidekker : jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8545a971c94358c904a657859aff2fe9c943a49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8545a971c94358c904a657859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:17 2014 +0200 jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll. --- dlls/jsproxy/jsproxy.spec | 4 +- dlls/jsproxy/main.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 21943df..f557fe6 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,5 @@ -@ stub InternetInitializeAutoProxyDll +@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll @ stub InternetInitializeExAutoProxyDll -@ stub InternetDeInitializeAutoProxyDll +@ stdcall InternetDeInitializeAutoProxyDll(str long) @ stub InternetDeInitializeExAutoProxyDll @ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index fa9703d..9305ff8 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -23,12 +23,23 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "wininet.h" #include "wine/debug.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); +static CRITICAL_SECTION cs_jsproxy; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_jsproxy, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_jsproxy") } +}; +static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; + /****************************************************************** * DllMain (jsproxy.@) */ @@ -46,3 +57,101 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *strdupAW( const char *src, DWORD len ) +{ + WCHAR *dst = NULL; + if (src) + { + int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } + return dst; +} + +static struct pac_script +{ + WCHAR *text; +} pac_script; +static struct pac_script *global_script = &pac_script; + +/****************************************************************** + * InternetDeInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) +{ + TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + + EnterCriticalSection( &cs_jsproxy ); + + heap_free( global_script->text ); + global_script->text = NULL; + + LeaveCriticalSection( &cs_jsproxy ); + return TRUE; +} + +static WCHAR *load_script( const char *filename ) +{ + HANDLE handle; + DWORD size, bytes_read; + char *buffer; + int len; + WCHAR *script = NULL; + + handle = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + size = GetFileSize( handle, NULL ); + if (!(buffer = heap_alloc( size ))) goto done; + if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; + + len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); + if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); + script[len] = 0; + +done: + CloseHandle( handle ); + heap_free( buffer ); + return script; +} + +/****************************************************************** + * InternetInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile, LPSTR mime, + AutoProxyHelperFunctions *callbacks, + LPAUTO_PROXY_SCRIPT_BUFFER buffer ) +{ + BOOL ret = FALSE; + + TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + + if (callbacks) FIXME( "callbacks not supported\n" ); + + EnterCriticalSection( &cs_jsproxy ); + + if (global_script->text) + { + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && + (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + + LeaveCriticalSection( &cs_jsproxy ); + return ret; +}

1 0

Huw Davies : shell32/tests: Fix the tests when run from the top directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d87aa43ce56630a5031ce492a8ac475b1ad97b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87aa43ce56630a5031ce492a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:11 2014 +0100 shell32/tests: Fix the tests when run from the top directory. --- dlls/shell32/tests/shlfolder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f096476..3e51c8a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -533,12 +533,13 @@ if (0) IShellFolder_Release(psfSystemDir); - GetCurrentDirectoryA(MAX_PATH, buf); - if(!lstrlenA(buf)) + cChars = GetCurrentDirectoryA(MAX_PATH, buf); + if(!cChars) { skip("Failed to get current directory, skipping tests.\n"); return; } + if(buf[cChars-1] != '\\') lstrcatA(buf, "\\"); SHGetDesktopFolder(&psfDesktop); @@ -546,7 +547,6 @@ if (0) /* .html */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_html); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -590,7 +590,6 @@ if (0) /* .txt */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_txt); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -604,6 +603,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); @@ -616,7 +616,6 @@ if (0) /* .foo */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_foo); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -630,6 +629,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);

1 0

Henri Verbeet : d2d1: Add the ID2D1LinearGradientBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 04af7227da3ba5f0380bb746151861bb9f61864b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af7227da3ba5f0380bb7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:35 2014 +0200 d2d1: Add the ID2D1LinearGradientBrush interface. --- include/d2d1.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 21af6a7..3a7901f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -659,5 +659,25 @@ interface ID2D1GradientStopCollection : ID2D1Resource D2D1_EXTEND_MODE GetExtendMode(); } +[ + local, + object, + uuid(2cd906ab-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1LinearGradientBrush : ID2D1Brush +{ + void SetStartPoint( + [in] D2D1_POINT_2F start_point + ); + void SetEndPoint( + [in] D2D1_POINT_2F end_point + ); + D2D1_POINT_2F GetStartPoint(); + D2D1_POINT_2F GetEndPoint(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GradientStopCollection interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 36c438145d7c4c50dd553b27c7f3867d4618bcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c438145d7c4c50dd553b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:34 2014 +0200 d2d1: Add the ID2D1GradientStopCollection interface. --- include/d2d1.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 7f7de1d..21af6a7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -191,6 +191,13 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, } D2D1_BITMAP_INTERPOLATION_MODE; +typedef enum D2D1_GAMMA +{ + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff, +} D2D1_GAMMA; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -248,6 +255,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION D2D1_MATRIX_3X2_F transform; } D2D1_DRAWING_STATE_DESCRIPTION; +typedef struct D2D1_GRADIENT_STOP +{ + float position; + D2D1_COLOR_F color; +} D2D1_GRADIENT_STOP; + [ local, object, @@ -630,5 +643,21 @@ interface ID2D1SolidColorBrush : ID2D1Brush D2D1_COLOR_F GetColor(); } +[ + local, + object, + uuid(2cd906a7-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GradientStopCollection : ID2D1Resource +{ + UINT32 GetGradientStopCount(); + void GetGradientStops( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_GAMMA GetColorInterpolationGamma(); + D2D1_EXTEND_MODE GetExtendMode(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d156bf03a6bed139e3aaf32f829e07047f6f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d156bf03a6bed139e3aaf32f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:32 2014 +0200 d2d1: Add the ID2D1BitmapBrush interface. --- include/d2d1.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2ea05f1..88a733f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -33,6 +33,18 @@ typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +enum +{ + D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, + D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, + D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC = 2, + D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR = 3, + D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC = 4, + D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC = 5, + D2D1_INTERPOLATION_MODE_DEFINITION_FANT = 6, + D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7, +}; + typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, @@ -163,6 +175,21 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, } D2D1_TEXT_ANTIALIAS_MODE; +typedef enum D2D1_EXTEND_MODE +{ + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_EXTEND_MODE; + +typedef enum D2D1_BITMAP_INTERPOLATION_MODE +{ + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_INTERPOLATION_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -562,5 +589,32 @@ interface ID2D1Brush : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906aa-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapBrush : ID2D1Brush +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + void SetInterpolationMode( + [in] D2D1_BITMAP_INTERPOLATION_MODE mode + ); + void SetBitmap( + [in] ID2D1Bitmap *bitmap + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_BITMAP_INTERPOLATION_MODE GetInterpolationMode(); + void GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0