September 2013 - Wine-Commits

Huw Davies : fonts: Add a few more glyphs in wingding.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 66a4e6e33dec86c166c9ba0e1e32bcb9147a7455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a4e6e33dec86c166c9ba0e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 12 12:34:07 2013 +0100 fonts: Add a few more glyphs in wingding. --- fonts/wingding.sfd | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 4356 -> 6052 bytes 2 files changed, 445 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66a4e6e33dec86c166c9b…

1 0

Ken Thomases : winemac: Trace the pixel format in DescribePixelFormat().
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 53036b6917329eb8572f78ba1e5ef2cbd85dee3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53036b6917329eb8572f78ba1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 11 23:46:35 2013 -0500 winemac: Trace the pixel format in DescribePixelFormat(). --- dlls/winemac.drv/opengl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f2407fc..4749b44 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3363,6 +3363,8 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI descr->cStencilBits = pf->stencil_bits; descr->cAuxBuffers = pf->aux_buffers; descr->iLayerType = PFD_MAIN_PLANE; + + TRACE("%s\n", debugstr_pf(pf)); return nb_displayable_formats; }

1 0

Ken Thomases : winemac: Return failure from DescribePixelFormat() for invalid pixel format.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: a300efc852290e21d354303f99736606eca7e855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a300efc852290e21d354303f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 11 23:46:25 2013 -0500 winemac: Return failure from DescribePixelFormat() for invalid pixel format. Also use the proper function for checking the format and looking up the internal format description. --- dlls/winemac.drv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a3c5d48..f2407fc 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3307,16 +3307,16 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) */ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr) { - int ret = nb_displayable_formats; const pixel_format *pf; const struct color_mode *mode; TRACE("hdc %p fmt %d size %u descr %p\n", hdc, fmt, size, descr); - if (fmt <= 0 || fmt > ret || !descr) return ret; + if (!descr) return nb_displayable_formats; if (size < sizeof(*descr)) return 0; - pf = &pixel_formats[fmt - 1]; + if (!(pf = get_pixel_format(fmt, FALSE))) + return 0; memset(descr, 0, sizeof(*descr)); descr->nSize = sizeof(*descr); @@ -3363,7 +3363,7 @@ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRI descr->cStencilBits = pf->stencil_bits; descr->cAuxBuffers = pf->aux_buffers; descr->iLayerType = PFD_MAIN_PLANE; - return ret; + return nb_displayable_formats; } /***********************************************************************

1 0

Ken Thomases : winemac: Restrict DescribePixelFormat() to displayable pixel formats.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: d33a4da5ed397a1e0ecf4d1d02660b03e2eab2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33a4da5ed397a1e0ecf4d1d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 11 23:46:06 2013 -0500 winemac: Restrict DescribePixelFormat() to displayable pixel formats. --- dlls/winemac.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 7327e12..a3c5d48 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3307,7 +3307,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) */ int macdrv_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr) { - int ret = nb_formats; + int ret = nb_displayable_formats; const pixel_format *pf; const struct color_mode *mode;

1 0

André Hentschel : kernel32/tests: Add tests for ResolveDelayLoadedAPI.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 21c3cfe541c53e36334d16ad0a92c4bfd4155fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c3cfe541c53e36334d16ad0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 11 22:31:01 2013 +0200 kernel32/tests: Add tests for ResolveDelayLoadedAPI. --- dlls/kernel32/tests/loader.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3b72cc8..96d57f4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/test.h" +#include "delayloadhandler.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) @@ -43,6 +44,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE static BOOL is_child; static LONG *child_failures; +static WORD cb_count; static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); @@ -57,6 +59,9 @@ static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); +static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, + PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, + PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -2184,6 +2189,105 @@ if (0) ok(ret, "DeleteFile error %d\n", GetLastError()); } +static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) +{ + cb_count++; + return NULL; +} + +static void test_ResolveDelayLoadedAPI(void) +{ + HMODULE hlib; + int i; + static const char* td[] = + { + "advapi32.dll", + "comdlg32.dll", + }; + + if (!pResolveDelayLoadedAPI) + { + todo_wine win_skip("ResolveDelayLoadedAPI is not available\n"); + return; + } + + if (0) /* crashes on native */ + { + SetLastError(0xdeadbeef); + ok(!pResolveDelayLoadedAPI(NULL, NULL, NULL, NULL, NULL, 0), + "ResolveDelayLoadedAPI succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError changed to %x\n", GetLastError()); + + cb_count = 0; + SetLastError(0xdeadbeef); + ok(!pResolveDelayLoadedAPI(NULL, NULL, failuredllhook, NULL, NULL, 0), + "ResolveDelayLoadedAPI succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError changed to %x\n", GetLastError()); + ok(cb_count == 1, "Wrong callback count: %d\n", cb_count); + } + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + IMAGE_DELAYLOAD_DESCRIPTOR *delaydir; + ULONG size; + + SetLastError(0xdeadbeef); + hlib = LoadLibrary(td[i]); + ok(hlib != NULL, "LoadLibrary error %u\n", GetLastError()); + if (!hlib) + { + skip("couldn't load %s.\n", td[i]); + continue; + } + + delaydir = RtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &size); + if (!delaydir) + { + skip("haven't found section for delay import directory in %s.\n", td[i]); + FreeLibrary(hlib); + continue; + } + + for (;;) + { + const IMAGE_THUNK_DATA *itdn; + IMAGE_THUNK_DATA *itda; + HMODULE htarget; + int j; + + if (!delaydir->DllNameRVA || + !delaydir->ImportAddressTableRVA || + !delaydir->ImportNameTableRVA) break; + + itdn = RVAToAddr(delaydir->ImportNameTableRVA, hlib); + itda = RVAToAddr(delaydir->ImportAddressTableRVA, hlib); + htarget = LoadLibrary(RVAToAddr(delaydir->DllNameRVA, hlib)); + for (j = 0; itdn[j].u1.Ordinal; j++) + { + void *ret, *load; + + if (IMAGE_SNAP_BY_ORDINAL(itdn[j].u1.Ordinal)) + load = (void *)GetProcAddress(htarget, (LPSTR)IMAGE_ORDINAL(itdn[j].u1.Ordinal)); + else + { + const IMAGE_IMPORT_BY_NAME* iibn = RVAToAddr(itdn[j].u1.AddressOfData, hlib); + load = (void *)GetProcAddress(htarget, (char*)iibn->Name); + } + + cb_count = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[j], 0); + ok(ret != NULL, "ResolveDelayLoadedAPI failed\n"); + ok(ret == load, "expected %p, got %p\n", ret, load); + ok(ret == (void*)itda[j].u1.AddressOfData, "expected %p, got %p\n", + ret, (void*)itda[j].u1.AddressOfData); + ok(!cb_count, "Wrong callback count: %d\n", cb_count); + } + delaydir++; + } + FreeLibrary(hlib); + } +} + START_TEST(loader) { int argc; @@ -2203,6 +2307,7 @@ START_TEST(loader) pLdrUnlockLoaderLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "LdrUnlockLoaderLock"); pRtlAcquirePebLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "RtlReleasePebLock"); + pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "ResolveDelayLoadedAPI"); mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_loader"); ok(mapping != 0, "CreateFileMapping failed\n"); @@ -2227,4 +2332,5 @@ START_TEST(loader) test_ImportDescriptors(); test_section_access(); test_ExitProcess(); + test_ResolveDelayLoadedAPI(); }

1 0

Stefan Dösinger : wined3d: Pass stream info and needed fixups to buffer_find_decl.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: a0b56d9c59335f72c252f4dec96305744c20fbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b56d9c59335f72c252f4dec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 12 12:23:28 2013 +0200 wined3d: Pass stream info and needed fixups to buffer_find_decl. --- dlls/wined3d/buffer.c | 63 +++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f811a61..ecd47eb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -269,9 +269,11 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, return ret; } +#define WINED3D_BUFFER_FIXUP_D3DCOLOR 0x01 +#define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 + static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, const BOOL check_d3dcolor, const BOOL check_position, const BOOL is_ffp_color, - DWORD *stride_this_run) + UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -286,13 +288,11 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win format = attrib->format->id; /* Look for newly appeared conversion */ - if (check_d3dcolor && format == WINED3DFMT_B8G8R8A8_UNORM) + if (fixup_flags & WINED3D_BUFFER_FIXUP_D3DCOLOR && format == WINED3DFMT_B8G8R8A8_UNORM) { ret = buffer_process_converted_attribute(This, CONV_D3DCOLOR, attrib, stride_this_run); - - if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (check_position && si->position_transformed) + else if (fixup_flags & WINED3D_BUFFER_FIXUP_XYZRHW && si->position_transformed) { if (format != WINED3DFMT_R32G32B32A32_FLOAT) { @@ -310,14 +310,9 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win return ret; } -static BOOL buffer_find_decl(struct wined3d_buffer *This) +static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, + DWORD fixup_flags) { - struct wined3d_device *device = This->resource.device; - const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_stream_info *si = &device->stream_info; - const struct wined3d_state *state = &device->state; - BOOL support_d3dcolor = adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA]; - BOOL support_xyzrhw = adapter->d3d_info.xyzrhw; UINT stride_this_run = 0; BOOL ret = FALSE; @@ -330,9 +325,9 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) if(This->resource.usage & WINED3DUSAGE_STATICDECL) return FALSE; } - if (use_vs(state)) + if (!fixup_flags) { - TRACE("Vertex shaders used, no VBO conversion is needed\n"); + TRACE("No fixup required.\n"); if(This->conversion_map) { HeapFree(GetProcessHeap(), 0, This->conversion_map); @@ -391,29 +386,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, - TRUE, !support_xyzrhw, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; + fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; + ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, - !support_d3dcolor, FALSE, TRUE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, - TRUE, FALSE, FALSE, &stride_this_run) || ret; + fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) { @@ -769,7 +766,17 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ if (device->isInDraw && buffer->resource.bind_count > 0) { - decl_changed = buffer_find_decl(buffer); + DWORD fixup_flags = 0; + + if (!use_vs(&device->state)) + { + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; + if (!context->d3d_info->xyzrhw) + fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; + } + + decl_changed = buffer_find_decl(buffer, &device->stream_info, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; }

1 0

Henri Verbeet : d3d8: Avoid LPVOID.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: ce81f0809d50956d7bdfaceba604cf2ee6454e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce81f0809d50956d7bdfaceba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:55 2013 +0200 d3d8: Avoid LPVOID. --- dlls/d3d8/d3d8_main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index d03bcba..1157465 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -57,11 +57,10 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst); return TRUE; }

1 0

Henri Verbeet : ddrawex: Avoid LPVOID.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 545f83bc8f693c227347d14cfdf51dc98fd04681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545f83bc8f693c227347d14cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:54 2013 +0200 ddrawex: Avoid LPVOID. --- dlls/ddrawex/ddrawex_private.h | 2 +- dlls/ddrawex/main.c | 23 +++++++++-------------- dlls/ddrawex/tests/ddrawex.c | 2 +- dlls/ddrawex/tests/ddrawex.h | 2 +- dlls/ddrawex/tests/surface.c | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 9fbb37f..be602b5 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(CreateDirectDraw)(THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE; - STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) PURE; + STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE; }; #undef INTERFACE diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index d1c0fda..be989ef 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -43,7 +43,7 @@ typedef struct { IClassFactory IClassFactory_iface; LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); + HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID iid, void **out); } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -215,13 +215,8 @@ static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) return ref; } -/******************************************************************************* - * IDirectDrawFactoryImpl_DirectDrawEnumerate - *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory* iface, - LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext) +static HRESULT WINAPI IDirectDrawFactoryImpl_DirectDrawEnumerate(IDirectDrawFactory *iface, + LPDDENUMCALLBACKW cb, void *ctx) { FIXME("Stub!\n"); return E_FAIL; @@ -286,11 +281,11 @@ HRESULT WINAPI DllCanUnloadNow(void) /******************************************************************************* * DllGetClassObject [DDRAWEX.@] */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { IClassFactoryImpl *factory; - TRACE("ddrawex (%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("rclsid %s, riid %s, out %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), out); if (!IsEqualGUID( &IID_IClassFactory, riid) && !IsEqualGUID( &IID_IUnknown, riid)) @@ -310,7 +305,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory->pfnCreateInstance = CreateDirectDrawFactory; - *ppv = factory; + *out = factory; return S_OK; } @@ -319,13 +314,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /*********************************************************************** * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch (reason) { case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls( hInstDLL ); + instance = inst; + DisableThreadLibraryCalls( inst ); break; } return TRUE; diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7a6440b..c07e694 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -25,7 +25,7 @@ #include "unknwn.h" static IDirectDrawFactory *factory; -static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); static IDirectDraw *createDD(void) { diff --git a/dlls/ddrawex/tests/ddrawex.h b/dlls/ddrawex/tests/ddrawex.h index f57adcf..15dd812 100644 --- a/dlls/ddrawex/tests/ddrawex.h +++ b/dlls/ddrawex/tests/ddrawex.h @@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(CreateDirectDraw)(THIS_ GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw) PURE; - STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) PURE; + STDMETHOD(_DirectDrawEnumerate)(THIS_ LPDDENUMCALLBACKW cb, void *ctx) PURE; }; #undef INTERFACE diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index ecf0084..d81bc4e 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -27,7 +27,7 @@ #include "unknwn.h" static IDirectDrawFactory *factory; -static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); static IDirectDraw *createDD(void) {

1 0

Henri Verbeet : wined3d: Make primary_render_target_is_p8() work on a swapchain.
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 1b53cbd8de7f9d74c73f17db80ae75fdc6b9d3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b53cbd8de7f9d74c73f17db8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 12 09:20:51 2013 +0200 wined3d: Make primary_render_target_is_p8() work on a swapchain. --- dlls/wined3d/surface.c | 22 ++++++++-------------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f1a3683..b64c8e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1289,12 +1289,6 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -/* This function checks if the primary render target uses the 8bit paletted format. */ -static BOOL primary_render_target_is_p8(const struct wined3d_device *device) -{ - return device->swapchains[0]->desc.backbuffer_format == WINED3DFMT_P8_UINT; -} - static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, DWORD color, struct wined3d_color *float_color) { @@ -1316,7 +1310,7 @@ static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface float_color->g = 0.0f; float_color->b = 0.0f; } - float_color->a = primary_render_target_is_p8(device) ? color / 255.0f : 1.0f; + float_color->a = swapchain_is_p8(device->swapchains[0]) ? color / 255.0f : 1.0f; break; case WINED3DFMT_B5G6R5_UNORM: @@ -1780,7 +1774,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int dst_pitch = 0; /* In case of P8 the index is stored in the alpha component if the primary render target uses P8. */ - if (format->id == WINED3DFMT_P8_UINT && primary_render_target_is_p8(surface->resource.device)) + if (format->id == WINED3DFMT_P8_UINT && swapchain_is_p8(surface->resource.device->swapchains[0])) { gl_format = GL_ALPHA; gl_type = GL_UNSIGNED_BYTE; @@ -3806,7 +3800,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r { case WINED3DFMT_P8_UINT: { - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) { /* In case of P8 render targets the index is stored in the alpha component */ fmt = GL_ALPHA; @@ -3942,14 +3936,12 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } } - context_release(context); - /* For P8 textures we need to perform an inverse palette lookup. This is * done by searching for a palette index which matches the RGB value. * Note this isn't guaranteed to work when there are multiple entries for * the same color but we have no choice. In case of P8 render targets, * the index is stored in the alpha component so no conversion is needed. */ - if (surface->resource.format->id == WINED3DFMT_P8_UINT && !primary_render_target_is_p8(device)) + if (surface->resource.format->id == WINED3DFMT_P8_UINT && !swapchain_is_p8(context->swapchain)) { const PALETTEENTRY *pal = NULL; DWORD width = pitch / 3; @@ -3986,6 +3978,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r } HeapFree(GetProcessHeap(), 0, mem); } + + context_release(context); } /* Read the framebuffer contents into a texture. Note that this function @@ -4108,7 +4102,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 * is slow. Further RGB->P8 conversion is not possible because palettes can have * duplicate entries. Store the color key in the unused alpha component to speed the * download up and to make conversion unneeded. */ - index_in_alpha = primary_render_target_is_p8(device); + index_in_alpha = swapchain_is_p8(device->swapchains[0]); if (!pal) { @@ -4838,7 +4832,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, * contains the palette index. Which means that the colorkey is one of * the palette entries. In other cases pixels that should be masked * away have alpha set to 0. */ - if (primary_render_target_is_p8(device)) + if (swapchain_is_p8(context->swapchain)) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, (float)src_surface->src_blt_color_key.color_space_low_value / 256.0f); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3548094..44d6e38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2569,6 +2569,11 @@ struct wined3d_swapchain HWND backup_wnd; }; +static inline BOOL swapchain_is_p8(const struct wined3d_swapchain *swapchain) +{ + return swapchain->desc.backbuffer_format == WINED3DFMT_P8_UINT; +} + void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : kernel32/tests: Some tests for CopyFile2().
by Alexandre Julliard Sept. 12, 2013

Sept. 12, 2013

Module: wine Branch: master Commit: 33f61eccfa12ef19fbe04e27971d384f15fac68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f61eccfa12ef19fbe04e279… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 12 11:26:25 2013 +0400 kernel32/tests: Some tests for CopyFile2(). --- dlls/kernel32/tests/file.c | 235 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 233 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33f61eccfa12ef19fbe04…

1 0