August 2011 - Wine-Commits - list.winehq.org

Thomas Mullaly : msxml3/tests: Added more IMXWriter tests.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: e4b7e9626747dd443deea222ca9fffae73b2d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b7e9626747dd443deea222c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:54 2011 -0400 msxml3/tests: Added more IMXWriter tests. --- dlls/msxml3/tests/saxreader.c | 117 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad350db..2713581 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -713,6 +713,7 @@ typedef struct mxwriter_write_test_t { const BYTE *data; DWORD cb; BOOL null_written; + BOOL fail_write; } mxwriter_write_test; typedef struct mxwriter_stream_test_t { @@ -754,6 +755,8 @@ static HRESULT WINAPI istream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pc static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) { + BOOL fail = FALSE; + ok(pv != NULL, "pv == NULL\n"); if(current_write_test->last) { @@ -761,6 +764,8 @@ static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, UL return E_FAIL; } + fail = current_write_test->fail_write; + ok(current_write_test->cb == cb, "Expected %d, but got %d on test %d\n", current_write_test->cb, cb, current_stream_test_index); @@ -774,7 +779,7 @@ static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, UL if(pcbWritten) *pcbWritten = cb; - return S_OK; + return fail ? E_FAIL : S_OK; } static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, @@ -1541,19 +1546,30 @@ static const mxwriter_stream_test mxwriter_stream_tests[] = { {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, {TRUE} } + }, + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE,TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } } }; static void test_mxwriter_stream(void) { + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + IStream *stream; + LARGE_INTEGER pos; + ULARGE_INTEGER pos2; DWORD test_count = sizeof(mxwriter_stream_tests)/sizeof(mxwriter_stream_tests[0]); for(current_stream_test_index = 0; current_stream_test_index < test_count; ++current_stream_test_index) { const mxwriter_stream_test *test = mxwriter_stream_tests+current_stream_test_index; - IMXWriter *writer; - ISAXContentHandler *content; - HRESULT hr; - VARIANT dest; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -1589,6 +1605,96 @@ static void test_mxwriter_stream(void) current_write_test-test->expected_writes, current_stream_test_index); } + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); + ok(hr == S_OK, "put_encoding failed: %08x\n", hr); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed: %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + /* Setting output of the mxwriter causes the current output to be flushed, + * and the writer to start over. + */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed: %08x\n", hr); + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + ok(hr == S_OK, "Seek failed: %08x\n", hr); + todo_wine ok(pos2.QuadPart != 0, "expected stream position moved\n"); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed: %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "get_output failed: %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "Got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + +static void test_mxwriter_encoding(void) +{ + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); + ok(hr == S_OK, "put_encoding failed: %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed: %08x\n", hr); + + /* The content is always re-encoded to UTF-16 when the output is + * retrieved as a BSTR. + */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "get_output failed: %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + free_bstrs(); } @@ -1628,6 +1734,7 @@ START_TEST(saxreader) test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream(); + test_mxwriter_encoding(); } else win_skip("MXXMLWriter not supported\n");

1 0

Francois Gouget : advapi32/tests: Test what happens when a service fails to or cannot start.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 87035e5274f400e5d7170c9fd93ff89e5a7963d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87035e5274f400e5d7170c9fd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 12 17:50:07 2011 +0200 advapi32/tests: Test what happens when a service fails to or cannot start. --- dlls/advapi32/tests/service.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index e243db0..ee39109 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -33,6 +33,7 @@ #include "wine/test.h" static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ +static const CHAR* selfname; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, @@ -2053,6 +2054,123 @@ cleanup: CloseServiceHandle(scm_handle); } +static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo) +{ + BOOL ret; + DWORD needed, le1, le2; + SERVICE_STATUS status; + SERVICE_STATUS_PROCESS statusproc; + + ret = StartServiceA(svc_handle, 0, NULL); + le1 = GetLastError(); + ok(!ret, "%s: StartServiceA() should have failed\n", name); + + ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); + ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); + todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); + todo_wine ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); + + ret = StartServiceA(svc_handle, 0, NULL); + le2 = GetLastError(); + ok(!ret, "%s: StartServiceA() should have failed\n", name); + if (todo) + todo_wine ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); + else + ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); + + ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); + le2 = GetLastError(); + ok(!ret, "%s: ControlService() should have failed\n", name); + todo_wine ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); + todo_wine ok(status.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, status.dwCurrentState); + + return le1; +} + +static void test_start_stop(void) +{ + BOOL ret; + SC_HANDLE scm_handle, svc_handle; + DWORD le; + static const char servicename[] = "Winetest"; + char cmd[MAX_PATH+20]; + const char* displayname; + + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + if (!scm_handle) + { + if(GetLastError() == ERROR_ACCESS_DENIED) + skip("Not enough rights to get a handle to the manager\n"); + else + ok(FALSE, "Could not get a handle to the manager: %d\n", GetLastError()); + return; + } + + /* Do some cleanup in case a previous run crashed */ + svc_handle = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + if (svc_handle) + { + DeleteService(svc_handle); + CloseServiceHandle(svc_handle); + } + + /* Create a dummy disabled service */ + sprintf(cmd, "\"%s\" service exit", selfname); + displayname = "Winetest Disabled Service"; + svc_handle = CreateServiceA(scm_handle, servicename, displayname, + GENERIC_ALL, SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS, + SERVICE_DISABLED, SERVICE_ERROR_IGNORE, cmd, NULL, + NULL, NULL, NULL, NULL); + if (!svc_handle) + { + if(GetLastError() == ERROR_ACCESS_DENIED) + skip("Not enough rights to create the service\n"); + else + ok(FALSE, "Could not create the service: %d\n", GetLastError()); + goto cleanup; + } + le = try_start_stop(svc_handle, displayname, 1); + todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); + + /* Then with a process that exits right away */ + displayname = "Winetest Exit Service"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_DEMAND_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, displayname); + ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); + le = try_start_stop(svc_handle, displayname, 0); + todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + + /* Again with a bad path */ + displayname = "Winetest Bad Path"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, "no_such_file.exe", NULL, NULL, NULL, NULL, NULL, displayname); + ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); + try_start_stop(svc_handle, displayname, 0); + + /* And finally with a service that plays dead, forcing a timeout. + * This time we will put no quotes. That should work too, even if there are + * spaces in the path. + */ + sprintf(cmd, "%s service sleep", selfname); + displayname = "Winetest Sleep Service"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); + ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); + + le = try_start_stop(svc_handle, displayname, 0); + todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + +cleanup: + if (svc_handle) + { + DeleteService(svc_handle); + CloseServiceHandle(svc_handle); + } + + /* Wait a while. The following test does a CreateService again */ + Sleep(1000); + + CloseServiceHandle(scm_handle); +} + static void test_refcount(void) { SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; @@ -2156,6 +2274,19 @@ static void test_refcount(void) START_TEST(service) { SC_HANDLE scm_handle; + int myARGC; + char** myARGV; + + myARGC = winetest_get_mainargs(&myARGV); + selfname = myARGV[0]; + if (myARGC >= 3) + { + if (strcmp(myARGV[2], "sleep") == 0) + /* Cause a service startup timeout */ + Sleep(90000); + /* then, or if myARGV[2] == "exit", just exit */ + return; + } /* Bail out if we are on win98 */ SetLastError(0xdeadbeef); @@ -2182,6 +2313,7 @@ START_TEST(service) /* Test the creation, querying and deletion of a service */ test_sequence(); test_queryconfig2(); + test_start_stop(); /* The main reason for this test is to check if any refcounting is used * and what the rules are */

1 0

André Hentschel : ieframe: Only print the FIXMEs once for progress bar handling.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 72c121e797fb697efe6827411a94e1ffe383a15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c121e797fb697efe6827411… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 10 23:00:52 2011 +0200 ieframe: Only print the FIXMEs once for progress bar handling. --- dlls/ieframe/taskbarlist.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/taskbarlist.c b/dlls/ieframe/taskbarlist.c index 5055d80..72ae4df 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/ieframe/taskbarlist.c @@ -139,8 +139,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetProgressValue(ITaskbarList4 *if ULONGLONG ullCompleted, ULONGLONG ullTotal) { - FIXME("iface %p, hwnd %p, ullCompleted %s, ullTotal %s stub!\n", iface, hwnd, - wine_dbgstr_longlong(ullCompleted), wine_dbgstr_longlong(ullTotal)); + static BOOL fixme_once; + if(!fixme_once++) FIXME("iface %p, hwnd %p, ullCompleted %s, ullTotal %s stub!\n", iface, hwnd, + wine_dbgstr_longlong(ullCompleted), wine_dbgstr_longlong(ullTotal)); return S_OK; } @@ -149,7 +150,8 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetProgressState(ITaskbarList4 *if HWND hwnd, TBPFLAG tbpFlags) { - FIXME("iface %p, hwnd %p, flags %x stub!\n", iface, hwnd, tbpFlags); + static BOOL fixme_once; + if(!fixme_once++) FIXME("iface %p, hwnd %p, flags %x stub!\n", iface, hwnd, tbpFlags); return S_OK; }

1 0

Mariusz Pluciński : shell32: Replace call of RegDeleteKeyW by SHDeleteKeyW.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 4505b4b07c98768b273ccc0d614c549357af4dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4505b4b07c98768b273ccc0d6… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Aug 5 18:26:08 2011 +0200 shell32: Replace call of RegDeleteKeyW by SHDeleteKeyW. --- dlls/shell32/shellpath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9898bc2..1c723a2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3875,7 +3875,7 @@ static HRESULT WINAPI foldermanager_UnregisterFolder( hr = get_known_folder_registry_path(rfid, NULL, &registryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath)); + hr = HRESULT_FROM_WIN32(SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath)); HeapFree(GetProcessHeap(), 0, registryPath); return hr;

1 0

Francois Gouget : user32/tests: Test what happens to a WM_QUIT posted to a window that gets destroyed.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 30f2c6610df25af50f50f4866a5f9ea127dfc393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f2c6610df25af50f50f4866… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 20:27:42 2011 +0200 user32/tests: Test what happens to a WM_QUIT posted to a window that gets destroyed. --- dlls/user32/tests/msg.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ef35665..c7361dc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7608,6 +7608,21 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return ret; } +static INT_PTR CALLBACK StopQuitMsgCheckProcA(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + if (message == WM_CREATE) + PostMessage(hwnd, WM_CLOSE, 0, 0); + else if (message == WM_CLOSE) + { + /* Only the first WM_QUIT will survive the window destruction */ + PostMessage(hwnd, WM_USER, 0x1234, 0x5678); + PostMessage(hwnd, WM_QUIT, 0x1234, 0x5678); + PostMessage(hwnd, WM_QUIT, 0x4321, 0x8765); + } + + return DefWindowProcA(hwnd, message, wp, lp); +} + static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -7790,6 +7805,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "TestParentClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = StopQuitMsgCheckProcA; + cls.lpszClassName = "StopQuitClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = DefWindowProcA; cls.lpszClassName = "SimpleWindowClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -10131,6 +10150,13 @@ static const struct message WmQuitDialogSeq[] = { { 0 } }; +static const struct message WmStopQuitSeq[] = { + { WM_DWMNCRENDERINGCHANGED, posted|optional }, + { WM_CLOSE, posted }, + { WM_QUIT, posted|wparam|lparam, 0x1234, 0 }, + { 0 } +}; + static void test_quit_message(void) { MSG msg; @@ -10193,6 +10219,29 @@ static void test_quit_message(void) ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message); ok(msg.wParam == 0x1234, "wParam was 0x%lx instead of 0x1234\n", msg.wParam); ok(msg.lParam == 0, "lParam was 0x%lx instead of 0\n", msg.lParam); + + /* Check what happens to a WM_QUIT message posted to a window that gets + * destroyed. + */ + CreateWindowExA(0, "StopQuitClass", "Stop Quit Test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, NULL, NULL, NULL, NULL); + flush_sequence(); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + struct recvd_message rmsg; + rmsg.hwnd = msg.hwnd; + rmsg.message = msg.message; + rmsg.flags = posted|wparam|lparam; + rmsg.wParam = msg.wParam; + rmsg.lParam = msg.lParam; + rmsg.descr = "stop/quit"; + if (msg.message == WM_QUIT) + /* The hwnd can only be checked here */ + ok(!msg.hwnd, "The WM_QUIT hwnd was %p instead of NULL\n", msg.hwnd); + add_message(&rmsg); + DispatchMessage(&msg); + } + ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", TRUE); } static const struct message WmMouseHoverSeq[] = {

1 0

André Hentschel : winex11: Validate the ramps also when not converting them to single values.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 4b538567e8e16b1c10a07176d750bafcacc3b543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b538567e8e16b1c10a07176d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 11 20:35:11 2011 +0200 winex11: Validate the ramps also when not converting them to single values. --- dlls/winex11.drv/xvidmode.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index c09fe39..732a2d7 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -386,35 +386,25 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) { + Bool ret = FALSE; #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; if (xf86vm_major < 2 || !usexvidmode) return FALSE; /* no gamma control */ + if (!ComputeGammaFromRamp(ramp->red, &gamma.red) || /* ramp validation */ + !ComputeGammaFromRamp(ramp->green, &gamma.green) || + !ComputeGammaFromRamp(ramp->blue, &gamma.blue)) return FALSE; + wine_tsx11_lock(); #ifdef X_XF86VidModeSetGammaRamp - else if (xf86vm_use_gammaramp) - { - Bool ret; - wine_tsx11_lock(); + if (xf86vm_use_gammaramp) ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), 256, ramp->red, ramp->green, ramp->blue); - wine_tsx11_unlock(); - return ret; - } -#endif else - { - if (ComputeGammaFromRamp(ramp->red, &gamma.red) && - ComputeGammaFromRamp(ramp->green, &gamma.green) && - ComputeGammaFromRamp(ramp->blue, &gamma.blue)) { - Bool ret; - wine_tsx11_lock(); - ret = pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma); - wine_tsx11_unlock(); - return ret; - } - } +#endif + ret = pXF86VidModeSetGamma(gdi_display, DefaultScreen(gdi_display), &gamma); + wine_tsx11_unlock(); #endif /* X_XF86VidModeSetGamma */ - return FALSE; + return ret; } #endif /* SONAME_LIBXXF86VM */

1 0

André Hentschel : gdi32: Initial gamma setting tests.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: c36b392a72737ca74cd9931728cd93f789ccac74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36b392a72737ca74cd993172… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 11 20:37:26 2011 +0200 gdi32: Initial gamma setting tests. --- dlls/gdi32/tests/dc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c173cef..0bc218c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -605,6 +605,53 @@ static void test_desktop_colorres(void) ReleaseDC(NULL, hdc); } +static void test_gamma(void) +{ + BOOL ret; + HDC hdc = GetDC(NULL); + WORD oldramp[3][256], ramp[3][256]; + INT i; + + ret = GetDeviceGammaRamp(hdc, &oldramp); + if (!ret) + { + win_skip("GetDeviceGammaRamp failed, skipping tests\n"); + goto done; + } + + /* try to set back old ramp */ + ret = SetDeviceGammaRamp(hdc, &oldramp); + if (!ret) + { + win_skip("SetDeviceGammaRamp failed, skipping tests\n"); + goto done; + } + + memcpy(ramp, oldramp, sizeof(ramp)); + + /* set one color ramp to zeros */ + memset(ramp[0], 0, sizeof(ramp[0])); + ret = SetDeviceGammaRamp(hdc, &ramp); + ok(!ret, "SetDeviceGammaRamp succeeded\n"); + + /* set one color ramp to a flat straight rising line */ + for (i = 0; i < 256; i++) ramp[0][i] = i; + ret = SetDeviceGammaRamp(hdc, &ramp); + todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); + + /* set one color ramp to a steep straight rising line */ + for (i = 0; i < 256; i++) ramp[0][i] = i * 256; + ret = SetDeviceGammaRamp(hdc, &ramp); + ok(ret, "SetDeviceGammaRamp failed\n"); + + /* cleanup: set old ramp again */ + ret = SetDeviceGammaRamp(hdc, &oldramp); + ok(ret, "SetDeviceGammaRamp failed\n"); + +done: + ReleaseDC(NULL, hdc); +} + START_TEST(dc) { test_savedc(); @@ -615,4 +662,5 @@ START_TEST(dc) test_DeleteDC(); test_boundsrect_invalid(); test_desktop_colorres(); + test_gamma(); }

1 0

Francois Gouget : user32: When destroying a window, preserve the first WM_QUIT message that was posted to it.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: ff8f6e8662a5f603b1fe1b087989f238bca0c4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8f6e8662a5f603b1fe1b087… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 20:29:52 2011 +0200 user32: When destroying a window, preserve the first WM_QUIT message that was posted to it. --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c7361dc..9aaf149 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10241,7 +10241,7 @@ static void test_quit_message(void) add_message(&rmsg); DispatchMessage(&msg); } - ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", TRUE); + ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } static const struct message WmMouseHoverSeq[] = { diff --git a/server/queue.c b/server/queue.c index 03b0e92..3fa546e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1918,7 +1918,15 @@ void queue_cleanup_window( struct thread *thread, user_handle_t win ) LIST_FOR_EACH_SAFE( ptr, next, &queue->msg_list[i] ) { struct message *msg = LIST_ENTRY( ptr, struct message, entry ); - if (msg->win == win) remove_queue_message( queue, msg, i ); + if (msg->win == win) + { + if (msg->msg == WM_QUIT && !queue->quit_message) + { + queue->quit_message = 1; + queue->exit_code = msg->wparam; + } + remove_queue_message( queue, msg, i ); + } } }

1 0

Jacek Caban : winegecko: Added 1.3 release.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: tools Branch: master Commit: 76fa8dd928e4e9dc53b82faaffcdacdf024c97b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=76fa8dd928e4e9dc53b82faa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 23 14:06:41 2011 +0200 winegecko: Added 1.3 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 8709a72..5be7585 100644 --- a/winegecko.php +++ b/winegecko.php @@ -58,7 +58,9 @@ $aFileSizes = array( '1.1.0-x86'=>8868851, '1.1.0-x86_64'=>8940997, '1.2.0-x86'=>12604928, - '1.2.0-x86_64'=>12841472 + '1.2.0-x86_64'=>12841472, + '1.3-x86'=>13609984, + '1.3-x86_64'=>13835776 ); // Exact size of the file:

1 0

Aurimas Fišeras : po: Fix some errors in Lithuanian translation.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 84da6aeeed354a9ee9d8c6c4c881f715fb191da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84da6aeeed354a9ee9d8c6c4c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 22 17:22:47 2011 +0300 po: Fix some errors in Lithuanian translation. Detected by Francois Gouget --- po/lt.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index ce7d13d..44436b5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1426,7 +1426,7 @@ msgstr "Liudijimo politika" #: cryptdlg.rc:28 msgid "Policy Identifier: " -msgstr "Politiko identifikatorius:" +msgstr "Politikos identifikatorius: " #: cryptdlg.rc:29 msgid "Policy Qualifier Info" @@ -2281,7 +2281,7 @@ msgstr "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" #: inetcpl.rc:30 msgid "Security settings for zone: " -msgstr "Saugumo nuostatos zonai:" +msgstr "Saugumo nuostatos zonai: " #: inetcpl.rc:31 msgid "Custom" @@ -11110,7 +11110,7 @@ msgstr "&Visada viršuje" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Informacija..." +msgstr "&Apie Wine žinyną..." #: winhlp32.rc:64 msgid "Annotation..." @@ -11262,7 +11262,7 @@ msgstr "&Apie Wine Wordpad" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatic" +msgstr "Automatinė" #: wordpad.rc:136 msgid "All documents (*.*)"

1 0