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

Henri Verbeet : d3d9/tests: Use a separate device for yuv_color_test().
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 2e0e4f91ff1d8c84af423cc3508b093021d43659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0e4f91ff1d8c84af423cc35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:11 2014 +0200 d3d9/tests: Use a separate device for yuv_color_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e47a864..b4506b2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10948,7 +10948,7 @@ done: DestroyWindow(window); } -static void yuv_color_test(IDirect3DDevice9 *device) +static void yuv_color_test(void) { HRESULT hr; IDirect3DSurface9 *surface, *target; @@ -10957,7 +10957,10 @@ static void yuv_color_test(IDirect3DDevice9 *device) IDirect3D9 *d3d; D3DCOLOR color; D3DFORMAT skip_once = D3DFMT_UNKNOWN; + IDirect3DDevice9 *device; D3DSURFACE_DESC desc; + ULONG refcount; + HWND window; static const struct { @@ -11007,8 +11010,16 @@ static void yuv_color_test(IDirect3DDevice9 *device) {0x1c6b1cff, D3DFMT_YUY2, "D3DFMT_YUY2", 0x006dff45, 0x0000d500}, }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &target); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DSurface9_GetDesc(target, &desc); @@ -11080,7 +11091,11 @@ static void yuv_color_test(IDirect3DDevice9 *device) } IDirect3DSurface9_Release(target); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D9_Release(d3d); + DestroyWindow(window); } static void yuv_layout_test(void) @@ -16481,11 +16496,11 @@ START_TEST(visual) pointsize_test(device_ptr); tssargtemp_test(device_ptr); np2_stretch_rect_test(device_ptr); - yuv_color_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + yuv_color_test(); yuv_layout_test(); zwriteenable_test(); alphatest_test();

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcEnumTasks.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: a67565edc48629723535ebd30d22d731d116bd83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67565edc48629723535ebd30… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 4 15:15:29 2014 +0900 schedsvc: Implement SchRpcEnumTasks. --- dlls/schedsvc/schedsvc.c | 110 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a1fa4e0..1b62b94 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -350,6 +350,11 @@ static inline BOOL is_directory(const WIN32_FIND_DATAW *data) return FALSE; } +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { @@ -461,8 +466,109 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + HRESULT hr = S_OK; + WCHAR *full_name; + WCHAR pathW[MAX_PATH]; + WIN32_FIND_DATAW data; + HANDLE handle; + DWORD allocated, count, index; + TASK_NAMES list; + + TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + + *n_names = 0; + *names = NULL; + + if (flags & ~TASK_ENUM_HIDDEN) return E_INVALIDARG; + + if (!n_requested) n_requested = ~0u; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (strlenW(full_name) + 2 > MAX_PATH) + { + heap_free(full_name); + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + strcpyW(pathW, full_name); + strcatW(pathW, allW); + + heap_free(full_name); + + allocated = 64; + list = heap_alloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + + index = count = 0; + + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + { + heap_free(list); + if (GetLastError() == ERROR_PATH_NOT_FOUND) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return HRESULT_FROM_WIN32(GetLastError()); + } + + do + { + if (is_file(&data) && index++ >= *start_index) + { + if (count >= allocated) + { + TASK_NAMES new_list; + allocated *= 2; + new_list = heap_realloc(list, allocated * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + list = new_list; + } + + TRACE("adding %s\n", debugstr_w(data.cFileName)); + + list[count] = heap_strdupW(data.cFileName); + if (!list[count]) + { + hr = E_OUTOFMEMORY; + break; + } + + count++; + + if (count >= n_requested) + { + hr = S_FALSE; + break; + } + } + } while (FindNextFileW(handle, &data)); + + FindClose(handle); + + if (FAILED(hr)) + { + free_list(list, count); + return hr; + } + + *n_names = count; + + if (count) + { + *names = list; + *start_index = index; + return hr; + } + + heap_free(list); + *names = NULL; + return *start_index ? S_FALSE : S_OK; } HRESULT __cdecl SchRpcEnumInstances(const WCHAR *path, DWORD flags, DWORD *n_guids, GUID **guids)

1 0

Michael Müller : include: Add lowlevelmonitorconfigurationapi.h.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: d499c4b7f0ade6396f40f64fc41830639ecf7b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d499c4b7f0ade6396f40f64fc… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:24:03 2014 +0100 include: Add lowlevelmonitorconfigurationapi.h. --- include/Makefile.in | 1 + include/lowlevelmonitorconfigurationapi.h | 43 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3aa45cf..eee809e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \ lmuseflg.h \ lmwksta.h \ loadperf.h \ + lowlevelmonitorconfigurationapi.h \ lzexpand.h \ mapi.h \ mapicode.h \ diff --git a/include/lowlevelmonitorconfigurationapi.h b/include/lowlevelmonitorconfigurationapi.h new file mode 100644 index 0000000..aeedf4b --- /dev/null +++ b/include/lowlevelmonitorconfigurationapi.h @@ -0,0 +1,43 @@ +/* + * Copyright 2014 Michael Müller for Pipelight + * + * 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 + */ + +#ifndef __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H +#define __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _MC_TIMING_REPORT +{ + BYTE bTimingStatusByte; + DWORD dwHorizontalFrequencyInHZ; + DWORD dwVerticalFrequencyInHZ; +} MC_TIMING_REPORT, *LPMC_TIMING_REPORT; + +typedef enum _MC_VCP_CODE_TYPE +{ + MC_MOMENTARY, + MC_SET_PARAMETER +} MC_VCP_CODE_TYPE, *LPMC_VCP_CODE_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_LOWLEVELMONITORCONFIGURATIONAPI_H */

1 0

Henri Verbeet : d3d9/tests: Use a separate device for np2_stretch_rect_test().
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 12743d5709704ac3ba6a1e2906b6f9f3a91e6b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12743d5709704ac3ba6a1e290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:12 2014 +0200 d3d9/tests: Use a separate device for np2_stretch_rect_test(). --- dlls/d3d9/tests/visual.c | 53 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4506b2..7377348 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10696,22 +10696,39 @@ done: DestroyWindow(window); } -static void np2_stretch_rect_test(IDirect3DDevice9 *device) { +static void np2_stretch_rect_test(void) +{ IDirect3DSurface9 *src = NULL, *dst = NULL, *backbuffer = NULL; IDirect3DTexture9 *dsttex = NULL; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - DWORD color; - D3DRECT r1 = {0, 0, 50, 50 }; - D3DRECT r2 = {50, 0, 100, 50 }; - D3DRECT r3 = {50, 50, 100, 100}; - D3DRECT r4 = {0, 50, 50, 100}; - const float quad[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + + static const D3DRECT r1 = {0, 0, 50, 50 }; + static const D3DRECT r2 = {50, 0, 100, 50 }; + static const D3DRECT r3 = {50, 50, 100, 100}; + static const D3DRECT r4 = {0, 50, 50, 100}; + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed with %08x\n", hr); @@ -10728,7 +10745,7 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DTexture9_GetSurfaceLevel(dsttex, 0, &dst); ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); /* Clear the StretchRect destination for debugging */ @@ -10788,15 +10805,15 @@ static void np2_stretch_rect_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); - cleanup: if(src) IDirect3DSurface9_Release(src); if(backbuffer) IDirect3DSurface9_Release(backbuffer); if(dsttex) IDirect3DTexture9_Release(dsttex); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void texop_test(void) @@ -16495,11 +16512,11 @@ START_TEST(visual) fixed_function_bumpmap_test(device_ptr); pointsize_test(device_ptr); tssargtemp_test(device_ptr); - np2_stretch_rect_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + np2_stretch_rect_test(); yuv_color_test(); yuv_layout_test(); zwriteenable_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for tssargtemp_test().
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 7980b8d8334d92baf3dcdc1d7a6a6c88cf862027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7980b8d8334d92baf3dcdc1d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:13 2014 +0200 d3d9/tests: Use a separate device for tssargtemp_test(). --- dlls/d3d9/tests/visual.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7377348..af93c80 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10318,27 +10318,44 @@ out: } } -static void tssargtemp_test(IDirect3DDevice9 *device) +static void tssargtemp_test(void) { + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; HRESULT hr; - DWORD color; - static const struct vertex quad[] = { - {-1.0, -1.0, 0.1, 0x00ff0000}, - { 1.0, -1.0, 0.1, 0x00ff0000}, - {-1.0, 1.0, 0.1, 0x00ff0000}, - { 1.0, 1.0, 0.1, 0x00ff0000} + + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0x00ff0000}, + {-1.0f, 1.0f, 0.1f, 0x00ff0000}, + { 1.0f, -1.0f, 0.1f, 0x00ff0000}, + { 1.0f, 1.0f, 0.1f, 0x00ff0000}, }; - D3DCAPS9 caps; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed with %08x\n", hr); if(!(caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP)) { skip("D3DPMISCCAPS_TSSARGTEMP not supported\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); @@ -10365,6 +10382,8 @@ static void tssargtemp_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x0000ff00); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr = %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr = %08x\n", hr); @@ -10380,17 +10399,11 @@ static void tssargtemp_test(IDirect3DDevice9 *device) ok(color == 0x00ffff00, "TSSARGTEMP test returned color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - /* Set stage 1 back to default */ - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_CURRENT); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "SetTextureStageState failed, hr = %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* Drawing Indexed Geometry with instances*/ @@ -16511,11 +16524,11 @@ START_TEST(visual) conditional_np2_repeat_test(device_ptr); fixed_function_bumpmap_test(device_ptr); pointsize_test(device_ptr); - tssargtemp_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + tssargtemp_test(); np2_stretch_rect_test(); yuv_color_test(); yuv_layout_test();

1 0

Michael Müller : include: Add dxva2api.idl.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: d459dfaa2de25625bde4e25571b328551494caa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d459dfaa2de25625bde4e2557… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 21:09:24 2014 +0100 include: Add dxva2api.idl. --- include/Makefile.in | 1 + include/dxva2api.idl | 527 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 528 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d459dfaa2de25625bde4e…

1 0

Michael Müller : include: Add highlevelmonitorconfigurationapi.h.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 52e7c41895cbe84e518b6b68f9cdbafad1a3f557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e7c41895cbe84e518b6b68f… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 26 05:26:25 2014 +0100 include: Add highlevelmonitorconfigurationapi.h. --- include/Makefile.in | 1 + include/highlevelmonitorconfigurationapi.h | 82 ++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index eee809e..5c6a1c6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -330,6 +330,7 @@ SRCDIR_INCLUDES = \ gdipluspixelformats.h \ gdiplustypes.h \ guiddef.h \ + highlevelmonitorconfigurationapi.h \ hlguids.h \ htmlhelp.h \ http.h \ diff --git a/include/highlevelmonitorconfigurationapi.h b/include/highlevelmonitorconfigurationapi.h new file mode 100644 index 0000000..429b75d --- /dev/null +++ b/include/highlevelmonitorconfigurationapi.h @@ -0,0 +1,82 @@ +/* + * Copyright 2014 Michael Müller for Pipelight + * + * 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 + */ + +#ifndef __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H +#define __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _MC_COLOR_TEMPERATURE +{ + MC_COLOR_TEMPERATURE_UNKNOWN, + MC_COLOR_TEMPERATURE_4000K, + MC_COLOR_TEMPERATURE_5000K, + MC_COLOR_TEMPERATURE_6500K, + MC_COLOR_TEMPERATURE_7500K, + MC_COLOR_TEMPERATURE_8200K, + MC_COLOR_TEMPERATURE_9300K, + MC_COLOR_TEMPERATURE_10000K, + MC_COLOR_TEMPERATURE_11500K +} MC_COLOR_TEMPERATURE, *LPMC_COLOR_TEMPERATURE; + +typedef enum _MC_POSITION_TYPE +{ + MC_HORIZONTAL_POSITION, + MC_VERTICAL_POSITION +} MC_POSITION_TYPE; + +typedef enum _MC_SIZE_TYPE +{ + MC_WIDTH, + MC_HEIGHT +} MC_SIZE_TYPE; + +typedef enum _MC_DRIVE_TYPE +{ + MC_RED_DRIVE, + MC_GREEN_DRIVE, + MC_BLUE_DRIVE +} MC_DRIVE_TYPE; + +typedef enum _MC_GAIN_TYPE +{ + MC_RED_GAIN, + MC_GREEN_GAIN, + MC_BLUE_GAIN +} MC_GAIN_TYPE; + +typedef enum _MC_DISPLAY_TECHNOLOGY_TYPE +{ + MC_SHADOW_MASK_CATHODE_RAY_TUBE, + MC_APERTURE_GRILL_CATHODE_RAY_TUBE, + MC_THIN_FILM_TRANSISTOR, + MC_LIQUID_CRYSTAL_ON_SILICON, + MC_PLASMA, + MC_ORGANIC_LIGHT_EMITTING_DIODE, + MC_ELECTROLUMINESCENT, + MC_MICROELECTROMECHANICAL, + MC_FIELD_EMISSION_DEVICE +} MC_DISPLAY_TECHNOLOGY_TYPE, *LPMC_DISPLAY_TECHNOLOGY_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_HIGHLEVELMONITORCONFIGURATIONAPI_H */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: bfb39bee7c1ea0e4f216f0f67e35265b2d55f354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb39bee7c1ea0e4f216f0f67… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Apr 3 21:17:34 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0b0f6e1..ca5d533 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-03-26 22:34+0300\n" +"PO-Revision-Date: 2014-04-03 21:16+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11674,37 +11674,18 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regsvr32.rc:32 -#, fuzzy -#| msgid "" -#| "Wine DLL Registration Server\n" -#| "\n" -#| "Provides DLL registration services.\n" -#| "\n" msgid "" "Wine DLL Registration Utility\n" "\n" "Provides DLL registration services.\n" "\n" msgstr "" -"Wine DLL bibliotekų registravimo serveris\n" +"Wine DLL bibliotekų registravimo programa\n" "\n" "Teikia DLL bibliotekų registravimo paslaugą.\n" "\n" #: regsvr32.rc:40 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" -#| "\n" -#| "Options:\n" -#| " [/u] Unregister a module from the server.\n" -#| " [/s] Silent mode (no messages will be displayed).\n" -#| " [/i] Call DllInstall, passing an optional [cmdline].\n" -#| "\tWhen used with [/u], regsvr32 also calls DLL Uninstall.\n" -#| " [/n] Do not call DllRegisterServer. This option must be used with [/" -#| "i].\n" -#| "\n" msgid "" "Usage:\n" " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" @@ -11721,10 +11702,10 @@ msgstr "" " regsvr32 [/u] [/s] [/n] [/i[:cmdeilutė]] DllVardas\n" "\n" "Parametrai:\n" -" [/u] Išregistruoti modulį serveryje.\n" +" [/u] Išregistruoti serverį.\n" " [/s] Tyli veiksena (nebus rodomi pranešimai).\n" " [/i] Kviesti „DllInstall“, perduodant nebūtiną [cmdeilutę].\n" -"\tKai naudojama su [/u], regsvr32 taip pat kviečia „DLL Uninstall“.\n" +"\tKai naudojama su [/u], „DllInstall“ kviečiamas pašalinimo veiksenoje.\n" " [/n] Nekviesti „DllRegisterServer“. Privalo būti naudojamas su [/i].\n" "\n"

1 0

Austin English : apphelp: Add a stub for SdbInitDatabase.
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: 064968fb87b53191aa9ef7535f54c4b640b88c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064968fb87b53191aa9ef7535… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 3 21:57:10 2014 -0700 apphelp: Add a stub for SdbInitDatabase. For https://bugs.winehq.org/show_bug.cgi?id=35891 Try 3: remove extra FIXME for non-null path Try 2: fix function prototype improve the fixme (print flags as hex) -- -Austin <div dir="ltr"><pre>For <a href="https://bugs.winehq.org/show_bug.cgi?id=35891" target="_blank">https://bugs.winehq.org/show_bug.cgi?id=35891</a> </pre>Try 3:<br>remove extra FIXME for non-null path<br><br>Try 2: <br>fix function prototype<br clear="all">improve the fixme (print flags as hex)<br clear="all"><br>-- <br>-Austin </div> --- dlls/apphelp/apphelp.c | 9 +++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index e8fce78..a7884b1 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -33,6 +33,7 @@ typedef enum _PATH_TYPE { /* FIXME: don't know where to place that typedef */ typedef HANDLE PDB; +typedef HANDLE HSDB; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -81,3 +82,11 @@ BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int c SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TRUE; } + + +HSDB WINAPI SdbInitDatabase(DWORD flags, LPCWSTR path) +{ + FIXME("stub: %08x %s\n", flags, debugstr_w(path)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 60d931c..06cabc5 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -83,7 +83,7 @@ @ stub SdbGrabMatchingInfoEx @ stub SdbGUIDFromString @ stub SdbGUIDToString -@ stub SdbInitDatabase +@ stdcall SdbInitDatabase(long wstr) @ stub SdbInitDatabaseEx @ stub SdbIsNullGUID @ stub SdbIsStandardDatabase

1 0

Henri Verbeet : d3d9/tests: Use a separate device for zwriteenable_test().
by Alexandre Julliard April 4, 2014

April 4, 2014

Module: wine Branch: master Commit: e13a78572330708bca7d579dc7ea5af17c3b6f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13a78572330708bca7d579dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 4 10:28:09 2014 +0200 d3d9/tests: Use a separate device for zwriteenable_test(). --- dlls/d3d9/tests/visual.c | 53 +++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 76e3a3a..0aad231 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11549,22 +11549,40 @@ done: DestroyWindow(window); } -static void zwriteenable_test(IDirect3DDevice9 *device) { +static void zwriteenable_test(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - DWORD color; - struct vertex quad1[] = { - { -1.0, -1.0, 0.1, 0x00ff0000}, - { -1.0, 1.0, 0.1, 0x00ff0000}, - { 1.0, -1.0, 0.1, 0x00ff0000}, - { 1.0, 1.0, 0.1, 0x00ff0000}, + + static const struct vertex quad1[] = + { + {-1.0f, -1.0f, 0.1f, 0x00ff0000}, + {-1.0f, 1.0f, 0.1f, 0x00ff0000}, + { 1.0f, -1.0f, 0.1f, 0x00ff0000}, + { 1.0f, 1.0f, 0.1f, 0x00ff0000}, }; - struct vertex quad2[] = { - { -1.0, -1.0, 0.9, 0x0000ff00}, - { -1.0, 1.0, 0.9, 0x0000ff00}, - { 1.0, -1.0, 0.9, 0x0000ff00}, - { 1.0, 1.0, 0.9, 0x0000ff00}, + static const struct vertex quad2[] = + { + {-1.0f, -1.0f, 0.9f, 0x0000ff00}, + {-1.0f, 1.0f, 0.9f, 0x0000ff00}, + { 1.0f, -1.0f, 0.9f, 0x0000ff00}, + { 1.0f, 1.0f, 0.9f, 0x0000ff00}, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); @@ -11576,6 +11594,8 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); @@ -11604,8 +11624,11 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void alphatest_test(void) @@ -16444,11 +16467,11 @@ START_TEST(visual) np2_stretch_rect_test(device_ptr); yuv_color_test(device_ptr); yuv_layout_test(device_ptr); - zwriteenable_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + zwriteenable_test(); alphatest_test(); viewport_test(); test_constant_clamp_vs();

1 0