February 2014 - Wine-Commits

Ken Thomases : d3d8/tests: Test that Direct3D8 doesn' t modify the pixel format of the window it targets.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 7366709d60f42ae09a37548e41c030c5e82fef6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7366709d60f42ae09a37548e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:15:20 2014 -0600 d3d8/tests: Test that Direct3D8 doesn't modify the pixel format of the window it targets. --- dlls/d3d8/tests/Makefile.in | 2 +- dlls/d3d8/tests/device.c | 144 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 552f0e7..9b288b9 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d8.dll -IMPORTS = d3d8 user32 +IMPORTS = d3d8 user32 gdi32 C_SRCS = \ device.c \ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c7493c7..29214c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5873,6 +5873,149 @@ static void test_lockbox_invalid(void) DestroyWindow(window); } +static void test_pixel_format(void) +{ + HWND hwnd, hwnd2 = NULL; + HDC hdc, hdc2 = NULL; + HMODULE gl = NULL; + int format, test_format; + PIXELFORMATDESCRIPTOR pfd; + IDirect3D8 *d3d8 = NULL; + IDirect3DDevice8 *device = NULL; + HRESULT hr; + static const float point[3] = {0.0, 0.0, 0.0}; + + hwnd = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + if (!hwnd) + { + skip("Failed to create window\n"); + return; + } + + hwnd2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + + hdc = GetDC(hwnd); + if (!hdc) + { + skip("Failed to get DC\n"); + goto cleanup; + } + + if (hwnd2) + hdc2 = GetDC(hwnd2); + + gl = LoadLibraryA("opengl32.dll"); + ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); + + format = GetPixelFormat(hdc); + ok(format == 0, "new window has pixel format %d\n", format); + + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.iLayerType = PFD_MAIN_PLANE; + format = ChoosePixelFormat(hdc, &pfd); + if (format <= 0) + { + skip("no pixel format available\n"); + goto cleanup; + } + + if (!SetPixelFormat(hdc, format, &pfd) || GetPixelFormat(hdc) != format) + { + skip("failed to set pixel format\n"); + goto cleanup; + } + + if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + { + skip("failed to set pixel format on second window\n"); + if (hdc2) + { + ReleaseDC(hwnd2, hdc2); + hdc2 = NULL; + } + } + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + if (!d3d8) + { + skip("Failed to create IDirect3D8 object\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (!(device = create_device(d3d8, hwnd, hwnd, TRUE))) + { + skip("Failed to create device\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (hdc2) + { + hr = IDirect3DDevice8_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); + } + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d8) IDirect3D8_Release(d3d8); + if (gl) FreeLibrary(gl); + if (hdc) ReleaseDC(hwnd, hdc); + if (hdc2) ReleaseDC(hwnd2, hdc2); + if (hwnd) DestroyWindow(hwnd); + if (hwnd2) DestroyWindow(hwnd2); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5952,6 +6095,7 @@ START_TEST(device) test_create_rt_ds_fail(); test_volume_blocks(); test_lockbox_invalid(); + test_pixel_format(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Dmitry Timoshkov : taskschd: Add initial version of the task definition XML writer.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 890bff26228ce1ce77519c6f29b9f1bde2307ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=890bff26228ce1ce77519c6f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:26 2014 +0900 taskschd: Add initial version of the task definition XML writer. --- dlls/taskschd/task.c | 254 +++++++++++++++++++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 2 - 2 files changed, 246 insertions(+), 10 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f23a7ad..e1fc713 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -529,7 +529,7 @@ static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) static HRESULT WINAPI TaskSettings_put_XmlText(ITaskSettings *iface, BSTR xml) { - TRACE("%p,%s\n", iface, debugstr_w(xml)); + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); return E_NOTIMPL; } @@ -832,9 +832,12 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) typedef struct { ITaskDefinition ITaskDefinition_iface; + LONG ref; IRegistrationInfo *reginfo; ITaskSettings *taskset; - LONG ref; + ITriggerCollection *triggers; + IPrincipal *principal; + IActionCollection *actions; } TaskDefinition; static inline TaskDefinition *impl_from_ITaskDefinition(ITaskDefinition *iface) @@ -856,10 +859,18 @@ static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (taskdef->reginfo) IRegistrationInfo_Release(taskdef->reginfo); if (taskdef->taskset) ITaskSettings_Release(taskdef->taskset); + if (taskdef->triggers) + ITriggerCollection_Release(taskdef->triggers); + if (taskdef->principal) + IPrincipal_Release(taskdef->principal); + if (taskdef->actions) + IActionCollection_Release(taskdef->actions); + heap_free(taskdef); } @@ -1037,12 +1048,6 @@ static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IAction return E_NOTIMPL; } -static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) -{ - FIXME("%p,%p: stub\n", iface, xml); - return E_NOTIMPL; -} - static const WCHAR Task[] = {'T','a','s','k',0}; static const WCHAR version[] = {'v','e','r','s','i','o','n',0}; static const WCHAR v1_0[] = {'1','.','0',0}; @@ -1065,6 +1070,7 @@ static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v' static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; +static const WCHAR Exec[] = {'E','x','e','c',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; static const WCHAR DisallowStartIfOnBatteries[] = {'D','i','s','a','l','l','o','w','S','t','a','r','t','I','f','O','n','B','a','t','t','e','r','i','e','s',0}; @@ -1081,6 +1087,238 @@ static const WCHAR ExecutionTimeLimit[] = {'E','x','e','c','u','t','i','o','n',' static const WCHAR Priority[] = {'P','r','i','o','r','i','t','y',0}; static const WCHAR IdleSettings[] = {'I','d','l','e','S','e','t','t','i','n','g','s',0}; +static int xml_indent; + +static inline void push_indent(void) +{ + xml_indent += 2; +} + +static inline void pop_indent(void) +{ + xml_indent -= 2; +} + +static inline HRESULT write_stringW(IStream *stream, const WCHAR *str) +{ + return IStream_Write(stream, str, lstrlenW(str) * sizeof(WCHAR), NULL); +} + +static void write_indent(IStream *stream) +{ + static const WCHAR spacesW[] = {' ',' ',0}; + int i; + for (i = 0; i < xml_indent; i += 2) + write_stringW(stream, spacesW); +} + +static const WCHAR start_element[] = {'<',0}; +static const WCHAR start_end_element[] = {'<','/',0}; +static const WCHAR close_element[] = {'>',0}; +static const WCHAR end_empty_element[] = {'/','>',0}; +static const WCHAR eol[] = {'\n',0}; + +static inline HRESULT write_empty_element(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, end_empty_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_element(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_element_end(IStream *stream, const WCHAR *name) +{ + write_indent(stream); + write_stringW(stream, start_end_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static inline HRESULT write_text_value(IStream *stream, const WCHAR *name, const WCHAR *value) +{ + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + write_stringW(stream, value); + write_stringW(stream, start_end_element); + write_stringW(stream, name); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) +{ + static const WCHAR spaceW[] = {' ',0}; + static const WCHAR equalW[] = {'=',0}; + static const WCHAR quoteW[] = {'"',0}; + HRESULT hr; + ITaskSettings *taskset; + TASK_COMPATIBILITY level; + const WCHAR *compatibility; + + hr = ITaskDefinition_get_Settings(taskdef, &taskset); + if (hr != S_OK) return hr; + + hr = ITaskSettings_get_Compatibility(taskset, &level); + if (hr != S_OK) level = TASK_COMPATIBILITY_V2_1; + + ITaskSettings_Release(taskset); + + switch (level) + { + case TASK_COMPATIBILITY_AT: + compatibility = v1_0; + break; + case TASK_COMPATIBILITY_V1: + compatibility = v1_1; + break; + case TASK_COMPATIBILITY_V2: + compatibility = v1_2; + break; + default: + compatibility = v1_3; + break; + } + + write_stringW(stream, start_element); + write_stringW(stream, Task); + write_stringW(stream, spaceW); + write_stringW(stream, version); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, compatibility); + write_stringW(stream, quoteW); + write_stringW(stream, spaceW); + write_stringW(stream, xmlns); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, task_ns); + write_stringW(stream, quoteW); + write_stringW(stream, close_element); + return write_stringW(stream, eol); +} + +static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *reginfo) +{ + if (!reginfo) + return write_empty_element(stream, RegistrationInfo); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_principal(IStream *stream, IPrincipal *principal) +{ + if (!principal) + return write_empty_element(stream, Principals); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_settings(IStream *stream, ITaskSettings *settings) +{ + if (!settings) + return write_empty_element(stream, Settings); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_triggers(IStream *stream, ITriggerCollection *triggers) +{ + if (!triggers) + return write_empty_element(stream, Triggers); + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT write_actions(IStream *stream, IActionCollection *actions) +{ + if (!actions) + { + write_element(stream, Actions); + push_indent(); + write_empty_element(stream, Exec); + pop_indent(); + return write_element_end(stream, Actions); + } + + FIXME("stub\n"); + return S_OK; +} + +static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + HRESULT hr; + IStream *stream; + HGLOBAL hmem; + void *p; + + TRACE("%p,%p\n", iface, xml); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16); + if (!hmem) return E_OUTOFMEMORY; + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + if (hr != S_OK) + { + GlobalFree(hmem); + return hr; + } + + hr = write_task_attributes(stream, &taskdef->ITaskDefinition_iface); + if (hr != S_OK) goto failed; + + push_indent(); + + hr = write_registration_info(stream, taskdef->reginfo); + if (hr != S_OK) goto failed; + + hr = write_triggers(stream, taskdef->triggers); + if (hr != S_OK) goto failed; + + hr = write_principal(stream, taskdef->principal); + if (hr != S_OK) goto failed; + + hr = write_settings(stream, taskdef->taskset); + if (hr != S_OK) goto failed; + + hr = write_actions(stream, taskdef->actions); + if (hr != S_OK) goto failed; + + pop_indent(); + + write_element_end(stream, Task); + IStream_Write(stream, "\0\0", 2, NULL); + + p = GlobalLock(hmem); + *xml = SysAllocString(p); + GlobalUnlock(hmem); + + IStream_Release(stream); + + return *xml ? S_OK : E_OUTOFMEMORY; + +failed: + IStream_Release(stream); + return hr; +} + static HRESULT read_text_value(IXmlReader *reader, WCHAR **value) { HRESULT hr; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 83f5367..34e4625 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1112,7 +1112,6 @@ static void test_TaskDefinition(void) create_action(taskdef); hr = ITaskDefinition_get_XmlText(taskdef, &xml); -todo_wine ok(hr == S_OK, "get_XmlText error %#x\n", hr); ITaskDefinition_Release(taskdef); @@ -1121,7 +1120,6 @@ todo_wine ok(hr == S_OK, "NewTask error %#x\n", hr); hr = ITaskDefinition_put_XmlText(taskdef, xml); -todo_wine ok(hr == S_OK, "put_XmlText error %#x\n", hr); SysFreeString(xml);

1 0

Dmitry Timoshkov : taskschd: Add support for reading more TaskSettings fields to XML parser.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 606ee6cce38af6ac2d3863e233fcdb77340cfd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=606ee6cce38af6ac2d3863e23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:15 2014 +0900 taskschd: Add support for reading more TaskSettings fields to XML parser. --- dlls/taskschd/task.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index fbf4ae1..4650b0e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1061,6 +1061,9 @@ static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; static const WCHAR DisallowStartIfOnBatteries[] = {'D','i','s','a','l','l','o','w','S','t','a','r','t','I','f','O','n','B','a','t','t','e','r','i','e','s',0}; static const WCHAR AllowStartOnDemand[] = {'A','l','l','o','w','S','t','a','r','t','O','n','D','e','m','a','n','d',0}; static const WCHAR StopIfGoingOnBatteries[] = {'S','t','o','p','I','f','G','o','i','n','g','O','n','B','a','t','t','e','r','i','e','s',0}; +static const WCHAR AllowHardTerminate[] = {'A','l','l','o','w','H','a','r','d','T','e','r','m','i','n','a','t','e',0}; +static const WCHAR StartWhenAvailable[] = {'S','t','a','r','t','W','h','e','n','A','v','a','i','l','a','b','l','e',0}; +static const WCHAR RunOnlyIfNetworkAvailable[] = {'R','u','n','O','n','l','y','I','f','N','e','t','w','o','r','k','A','v','a','i','l','a','b','l','e',0}; static const WCHAR Enabled[] = {'E','n','a','b','l','e','d',0}; static const WCHAR Hidden[] = {'H','i','d','d','e','n',0}; static const WCHAR RunOnlyIfIdle[] = {'R','u','n','O','n','l','y','I','f','I','d','l','e',0}; @@ -1226,6 +1229,24 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) if (hr == S_OK) ITaskSettings_put_StopIfGoingOnBatteries(taskset, bool_val); } + else if (!lstrcmpW(name, AllowHardTerminate)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_AllowHardTerminate(taskset, bool_val); + } + else if (!lstrcmpW(name, StartWhenAvailable)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_StartWhenAvailable(taskset, bool_val); + } + else if (!lstrcmpW(name, RunOnlyIfNetworkAvailable)) + { + hr = read_variantbool_value(reader, &bool_val); + if (hr == S_OK) + ITaskSettings_put_RunOnlyIfNetworkAvailable(taskset, bool_val); + } else if (!lstrcmpW(name, Enabled)) { hr = read_variantbool_value(reader, &bool_val);

1 0

Ken Thomases : d3d9/tests: Test that Direct3D9 doesn' t modify the pixel format of the window it targets. (try 4, resend).
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 995be892fa1fe5374f95054d277d591215f5b670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995be892fa1fe5374f95054d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:15:11 2014 -0600 d3d9/tests: Test that Direct3D9 doesn't modify the pixel format of the window it targets. (try 4, resend). --- dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b046099..07b1c39 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7429,6 +7429,149 @@ static void test_shared_handle(void) DestroyWindow(window); } +static void test_pixel_format(void) +{ + HWND hwnd, hwnd2 = NULL; + HDC hdc, hdc2 = NULL; + HMODULE gl = NULL; + int format, test_format; + PIXELFORMATDESCRIPTOR pfd; + IDirect3D9 *d3d9 = NULL; + IDirect3DDevice9 *device = NULL; + HRESULT hr; + static const float point[3] = {0.0, 0.0, 0.0}; + + hwnd = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + if (!hwnd) + { + skip("Failed to create window\n"); + return; + } + + hwnd2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + + hdc = GetDC(hwnd); + if (!hdc) + { + skip("Failed to get DC\n"); + goto cleanup; + } + + if (hwnd2) + hdc2 = GetDC(hwnd2); + + gl = LoadLibraryA("opengl32.dll"); + ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); + + format = GetPixelFormat(hdc); + ok(format == 0, "new window has pixel format %d\n", format); + + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.iLayerType = PFD_MAIN_PLANE; + format = ChoosePixelFormat(hdc, &pfd); + if (format <= 0) + { + skip("no pixel format available\n"); + goto cleanup; + } + + if (!SetPixelFormat(hdc, format, &pfd) || GetPixelFormat(hdc) != format) + { + skip("failed to set pixel format\n"); + goto cleanup; + } + + if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + { + skip("failed to set pixel format on second window\n"); + if (hdc2) + { + ReleaseDC(hwnd2, hdc2); + hdc2 = NULL; + } + } + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d9) + { + skip("Failed to create IDirect3D9 object\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (!(device = create_device(d3d9, hwnd, hwnd, TRUE))) + { + skip("Failed to create device\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (hdc2) + { + hr = IDirect3DDevice9_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); + } + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d9) IDirect3D9_Release(d3d9); + if (gl) FreeLibrary(gl); + if (hdc) ReleaseDC(hwnd, hdc); + if (hdc2) ReleaseDC(hwnd2, hdc2); + if (hwnd) DestroyWindow(hwnd); + if (hwnd2) DestroyWindow(hwnd2); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -7513,6 +7656,7 @@ START_TEST(device) test_volume_blocks(); test_lockbox_invalid(); test_shared_handle(); + test_pixel_format(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Dmitry Timoshkov : xmllite: Also clear the attr pointer in reader_clear_attrs.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 529d9ea9222cff9edfd9e1c7a89befd70f0359f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529d9ea9222cff9edfd9e1c7a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:05 2014 +0900 xmllite: Also clear the attr pointer in reader_clear_attrs. --- dlls/xmllite/reader.c | 1 + dlls/xmllite/tests/reader.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index fb06200..f74b815 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -368,6 +368,7 @@ static void reader_clear_attrs(xmlreader *reader) } list_init(&reader->attrs); reader->attr_count = 0; + reader->attr = NULL; } /* attribute data holds pointers to buffer data, so buffer shrink is not possible diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 992d15c..0108027 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -838,7 +838,6 @@ todo_wine ok(count == 0, "expected 0, got %d\n", count); ret = IXmlReader_IsEmptyElement(reader); -todo_wine ok(ret, "element should be empty\n"); hr = IXmlReader_GetValue(reader, &val, NULL);

1 0

Dmitry Timoshkov : taskschd: Add support for reading RegistrationInfo to XML parser.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: a7c70a4904d8d987fb5bbc5b57358ac3f24916f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c70a4904d8d987fb5bbc5b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:18 2014 +0900 taskschd: Add support for reading RegistrationInfo to XML parser. --- dlls/taskschd/task.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 4650b0e..b0af394 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1052,6 +1052,8 @@ static const WCHAR v1_3[] = {'1','.','3',0}; static const WCHAR xmlns[] = {'x','m','l','n','s',0}; static const WCHAR task_ns[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','w','i','n','d','o','w','s','/','2','0','0','4','/','0','2','/','m','i','t','/','t','a','s','k',0}; static const WCHAR RegistrationInfo[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; +static const WCHAR Author[] = {'A','u','t','h','o','r',0}; +static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; @@ -1307,10 +1309,69 @@ static HRESULT read_settings(IXmlReader *reader, ITaskSettings *taskset) return E_FAIL; } -static HRESULT read_registration_info(IXmlReader *reader, ITaskDefinition *taskdef) +static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *info) { - FIXME("stub\n"); - return S_OK; + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + WCHAR *value; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("RegistrationInfo is empty\n"); + return S_OK; + } + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, RegistrationInfo)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Author)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Author(info, value); + } + else if (!lstrcmpW(name, Description)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_Description(info, value); + } + else + FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled RegistrationInfo node type %d\n", type); + break; + } + } + + WARN("RegistrationInfo was not terminated\n"); + return E_FAIL; } static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef) @@ -1403,7 +1464,14 @@ static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) TRACE("Element: %s\n", debugstr_w(name)); if (!lstrcmpW(name, RegistrationInfo)) - hr = read_registration_info(reader, taskdef); + { + IRegistrationInfo *info; + + hr = ITaskDefinition_get_RegistrationInfo(taskdef, &info); + if (hr != S_OK) return hr; + hr = read_registration_info(reader, info); + IRegistrationInfo_Release(info); + } else if (!lstrcmpW(name, Settings)) { ITaskSettings *taskset;

1 0

Dmitry Timoshkov : taskschd: Add support for reading Principals to XML parser.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 3cb5015c4aa9a5b0a1ede9d8e2e55d2d560e27ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb5015c4aa9a5b0a1ede9d8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:22 2014 +0900 taskschd: Add support for reading Principals to XML parser. --- dlls/taskschd/task.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b0af394..f23a7ad 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1057,6 +1057,13 @@ static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n', static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; +static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; +static const WCHAR id[] = {'i','d',0}; +static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; +static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; +static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; +static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; +static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; static const WCHAR Actions[] = {'A','c','t','i','o','n','s',0}; static const WCHAR MultipleInstancesPolicy[] = {'M','u','l','t','i','p','l','e','I','n','s','t','a','n','c','e','s','P','o','l','i','c','y',0}; static const WCHAR IgnoreNew[] = {'I','g','n','o','r','e','N','e','w',0}; @@ -1144,12 +1151,187 @@ static HRESULT read_triggers(IXmlReader *reader, ITaskDefinition *taskdef) return S_OK; } -static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) +static HRESULT read_principal_attributes(IXmlReader *reader, IPrincipal *principal) { - FIXME("stub\n"); + HRESULT hr; + const WCHAR *name; + const WCHAR *value; + + hr = IXmlReader_MoveToFirstAttribute(reader); + + while (hr == S_OK) + { + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) break; + + hr = IXmlReader_GetValue(reader, &value, NULL); + if (hr != S_OK) break; + + TRACE("%s=%s\n", debugstr_w(name), debugstr_w(value)); + + if (!lstrcmpW(name, id)) + IPrincipal_put_Id(principal, (BSTR)value); + else + FIXME("unhandled Principal attribute %s\n", debugstr_w(name)); + + hr = IXmlReader_MoveToNextAttribute(reader); + } + return S_OK; } +static HRESULT read_principal(IXmlReader *reader, IPrincipal *principal) +{ + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + WCHAR *value; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Principal is empty\n"); + return S_OK; + } + + read_principal_attributes(reader, principal); + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principal)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, UserId)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IPrincipal_put_UserId(principal, value); + } + else if (!lstrcmpW(name, LogonType)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + { + TASK_LOGON_TYPE logon = TASK_LOGON_NONE; + + if (!lstrcmpW(value, InteractiveToken)) + logon = TASK_LOGON_INTERACTIVE_TOKEN; + else + FIXME("unhandled LogonType %s\n", debugstr_w(value)); + + IPrincipal_put_LogonType(principal, logon); + } + } + else if (!lstrcmpW(name, RunLevel)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + { + TASK_RUNLEVEL_TYPE level = TASK_RUNLEVEL_LUA; + + if (!lstrcmpW(value, LeastPrivilege)) + level = TASK_RUNLEVEL_LUA; + else + FIXME("unhandled RunLevel %s\n", debugstr_w(value)); + + IPrincipal_put_RunLevel(principal, level); + } + } + else + FIXME("unhandled Principal element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled Principal node type %d\n", type); + break; + } + } + + WARN("Principal was not terminated\n"); + return E_FAIL; +} + +static HRESULT read_principals(IXmlReader *reader, ITaskDefinition *taskdef) +{ + HRESULT hr; + XmlNodeType type; + const WCHAR *name; + + if (IXmlReader_IsEmptyElement(reader)) + { + TRACE("Principals is empty\n"); + return S_OK; + } + + while (IXmlReader_Read(reader, &type) == S_OK) + { + switch (type) + { + case XmlNodeType_EndElement: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("/%s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principals)) + return S_OK; + + break; + + case XmlNodeType_Element: + hr = IXmlReader_GetLocalName(reader, &name, NULL); + if (hr != S_OK) return hr; + + TRACE("Element: %s\n", debugstr_w(name)); + + if (!lstrcmpW(name, Principal)) + { + IPrincipal *principal; + + hr = ITaskDefinition_get_Principal(taskdef, &principal); + if (hr != S_OK) return hr; + hr = read_principal(reader, principal); + IPrincipal_Release(principal); + } + else + FIXME("unhandled Principals element %s\n", debugstr_w(name)); + + break; + + case XmlNodeType_Whitespace: + case XmlNodeType_Comment: + break; + + default: + FIXME("unhandled Principals node type %d\n", type); + break; + } + } + + WARN("Principals was not terminated\n"); + return E_FAIL; +} + static HRESULT read_actions(IXmlReader *reader, ITaskDefinition *taskdef) { FIXME("stub\n");

1 0

Hans Leidekker : msi: Don't install services without an image path.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 1ae3bcc94d5ceb084a1ad99a8b8f2b4de6ce07dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae3bcc94d5ceb084a1ad99a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 21 16:52:12 2014 +0100 msi: Don't install services without an image path. Spotted by Aric Stewart. --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 07322fe..faf462e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5793,7 +5793,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) ERR("Query failed\n"); goto done; } - key = MSI_RecordGetString(row, 6); + if (!(key = MSI_RecordGetString(row, 6))) goto done; file = msi_get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ee750b0..4d1af05 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -78,7 +78,8 @@ static const char component_dat[] = "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata\n" "component\t\tMSITESTDIR\t0\t1\tfile\n" "service_comp\t{935A0A91-22A3-4F87-BCA8-928FFDFE2353}\tMSITESTDIR\t0\t\tservice_file\n" - "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2"; + "service_comp2\t{3F7B04A4-9521-4649-BDC9-0C8722740A49}\tMSITESTDIR\t0\t\tservice_file2\n" + "service_comp3\t{DBCD1502-20E3-423F-B53E-F37E263CDC7E}\tMSITESTDIR\t0\t\t\n"; static const char directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -115,7 +116,8 @@ static const char feature_comp_dat[] = "Two\tTwo\n" "feature\tcomponent\n" "service_feature\tservice_comp\n" - "service_feature\tservice_comp2"; + "service_feature\tservice_comp2\n" + "service_feature\tservice_comp3"; static const char file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -223,6 +225,14 @@ static const char service_install_dat[] = "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; +static const char service_install2_dat[] = + "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" + "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" + "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" + "ServiceInstall\tServiceInstall\n" + "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\n" + "TestService4\tTestService4\tTestService4\t2\t3\t0\t\t\tTestService4\t\t\tservice_comp3\t\n"; + static const char service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" @@ -1681,6 +1691,19 @@ static const msi_table sds_tables[] = ADD_TABLE(property) }; +static const msi_table sis_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(sds_install_exec_seq), + ADD_TABLE(service_install2), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table sr_tables[] = { ADD_TABLE(component), @@ -5263,6 +5286,78 @@ error: DeleteFileA(msifile); } +static void test_install_services(void) +{ + UINT r; + SC_HANDLE manager, service; + BOOL ret; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database(msifile, sis_tables, sizeof(sis_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService not installed\n"); + CloseServiceHandle(service); + + service = OpenServiceA(manager, "TestService4", GENERIC_ALL); + ok(service == NULL, "TestService4 installed\n"); + CloseServiceHandle(manager); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + ok(manager != NULL, "can't open service manager\n"); + if (!manager) goto error; + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService doesn't exist\n"); + + ret = DeleteService( service ); + ok( ret, "failed to delete service %u\n", GetLastError() ); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + static void test_self_registration(void) { UINT r; @@ -6476,6 +6571,7 @@ START_TEST(action) test_create_remove_folder(); test_start_services(); test_delete_services(); + test_install_services(); test_self_registration(); test_register_font(); test_validate_product_id();

1 0

Frédéric Delanoy : msvidc32: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: aa2f454f37bdfae7a512b53ad6376017a3343a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2f454f37bdfae7a512b53ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 22 12:22:32 2014 +0100 msvidc32: Use BOOL type where appropriate. --- dlls/msvidc32/msvideo1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 831e6f7..49f9700 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -67,7 +67,7 @@ typedef BYTE uint8_t; typedef struct Msvideo1Context { DWORD dwMagic; - int mode_8bit; /* if it's not 8-bit, it's 16-bit */ + BOOL mode_8bit; /* if it's not 8-bit, it's 16-bit */ } Msvideo1Context; static void @@ -370,12 +370,12 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB TRACE("bitmap is %d bpp\n", in->bmiHeader.biBitCount); if( in->bmiHeader.biBitCount == 8 ) - info->mode_8bit = 1; + info->mode_8bit = TRUE; else if( in->bmiHeader.biBitCount == 16 ) - info->mode_8bit = 0; + info->mode_8bit = FALSE; else { - info->mode_8bit = 0; + info->mode_8bit = FALSE; FIXME("Unsupported output format %i\n", in->bmiHeader.biBitCount); }

1 0

Frédéric Delanoy : taskkill: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 17fecb55a1955f44e0ae5f4a811a8cbf5efd0101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fecb55a1955f44e0ae5f4a8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 22 12:22:34 2014 +0100 taskkill: Use BOOL type where appropriate. --- programs/taskkill/taskkill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 7f0e7ad..b9dd1a5 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -472,7 +472,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) for (i = 1; i < argc; i++) { - int got_im = 0, got_pid = 0; + BOOL got_im = FALSE, got_pid = FALSE; argdata = argv[i]; if (*argdata != '/' && *argdata != '-')

1 0