September 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Move selection logic to LButton release handler, fix notifications order.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 916017d42099121f7f4e364ced2b1d88f505e7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916017d42099121f7f4e364ce… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 30 00:22:51 2009 +0400 comctl32/monthcal: Move selection logic to LButton release handler, fix notifications order. --- dlls/comctl32/monthcal.c | 70 +++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index bbf6cb7..d68076d 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1498,34 +1498,9 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_CALENDARDATE: { - RECT rcDay; /* used in determining area to invalidate */ - SYSTEMTIME selArray[2]; - NMSELCHANGE nmsc; - - selArray[0] = ht.st; - selArray[1] = ht.st; - MONTHCAL_SetSelRange(infoPtr, selArray); - MONTHCAL_SetCurSel(infoPtr, &selArray[0]); TRACE("MCHT_CALENDARDATE\n"); - nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmsc.nmhdr.code = MCN_SELCHANGE; - nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; - - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); - - /* redraw both old and new days if the selected day changed */ - if(infoPtr->curSel.wDay != ht.st.wDay) { - MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &rcDay); - InvalidateRect(infoPtr->hwndSelf, &rcDay, TRUE); - - MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->curSel.wDay, infoPtr->curSel.wMonth, &rcDay); - InvalidateRect(infoPtr->hwndSelf, &rcDay, TRUE); - } infoPtr->firstSelDay = ht.st.wDay; - infoPtr->curSel.wDay = ht.st.wDay; infoPtr->status = MC_SEL_LBUTDOWN; return 0; } @@ -1557,6 +1532,14 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) redraw = TRUE; } + /* always send NM_RELEASEDCAPTURE notification */ + nmhdr.hwndFrom = infoPtr->hwndSelf; + nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmhdr.code = NM_RELEASEDCAPTURE; + TRACE("Sent notification from %p to %p\n", infoPtr->hwndSelf, infoPtr->hwndNotify); + + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); @@ -1564,28 +1547,29 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; - if((hit == MCHT_CALENDARDATENEXT) || (hit == MCHT_CALENDARDATEPREV)) { - SYSTEMTIME st[2]; + if((hit == MCHT_CALENDARDATENEXT) || + (hit == MCHT_CALENDARDATEPREV) || + (hit == MCHT_CALENDARDATE)) + { + SYSTEMTIME st[2], sel = infoPtr->curSel; st[0] = st[1] = ht.st; MONTHCAL_SetSelRange(infoPtr, st); + /* will be invalidated here */ MONTHCAL_SetCurSel(infoPtr, &st[0]); - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return TRUE; - } + /* send MCN_SELCHANGE only if new date selected */ + if (!MONTHCAL_IsDateEqual(&sel, &ht.st)) + { + nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmsc.nmhdr.code = MCN_SELCHANGE; + nmsc.stSelStart = infoPtr->minSel; + nmsc.stSelEnd = infoPtr->maxSel; - nmhdr.hwndFrom = infoPtr->hwndSelf; - nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmhdr.code = NM_RELEASEDCAPTURE; - TRACE("Sent notification from %p to %p\n", infoPtr->hwndSelf, infoPtr->hwndNotify); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + } - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); - /* redraw if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - /* only send MCN_SELECT if currently displayed month's day was selected */ - if(hit == MCHT_CALENDARDATE) { nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmsc.nmhdr.code = MCN_SELECT; @@ -1594,7 +1578,13 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + return 0; } + + /* redraw if necessary */ + if(redraw) + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + return 0; }

1 0

Nikolay Sivov : comctl32/datetime: If we already have a 4 digit year reset it on first char typed.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: ad40c15cccf52dc08e90f3c92cfea4e6f0afa778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad40c15cccf52dc08e90f3c92… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 30 01:56:49 2009 +0400 comctl32/datetime: If we already have a 4 digit year reset it on first char typed. --- dlls/comctl32/datetime.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 559509a..224519a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -970,7 +970,8 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) break; case INVALIDFULLYEAR: case FULLYEAR: - date->wYear = (date->wYear%1000)*10 + num; + /* reset current year initialy */ + date->wYear = ((date->wYear/1000) ? 0 : 1)*(date->wYear%1000)*10 + num; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr);

1 0

Nikolay Sivov : comctl32/monthcal: Respect locale abbreviated day names when calculating control dimensions.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 52570539d8af2e900e184307713f1095119f91f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52570539d8af2e900e1843077… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 30 02:15:40 2009 +0400 comctl32/monthcal: Respect locale abbreviated day names when calculating control dimensions. --- dlls/comctl32/monthcal.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d68076d..fcfc7eb 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1739,7 +1739,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) /* sets the size information */ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { - static const WCHAR SunW[] = { 'S','u','n',0 }; static const WCHAR O0W[] = { '0','0',0 }; HDC hdc = GetDC(infoPtr->hwndSelf); RECT *title=&infoPtr->title; @@ -1751,11 +1750,12 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) RECT *weeknumrect=&infoPtr->weeknums; RECT *days=&infoPtr->days; RECT *todayrect=&infoPtr->todayrect; - SIZE size; + SIZE size, sz; TEXTMETRICW tm; HFONT currentFont; - INT xdiv, dx, dy; + INT xdiv, dx, dy, i; RECT rcClient; + WCHAR buff[80]; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -1764,7 +1764,26 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* get the height and width of each day's text */ GetTextMetricsW(hdc, &tm); infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading; - GetTextExtentPoint32W(hdc, SunW, 3, &size); + + /* find largest abbreviated day name for current locale */ + size.cx = sz.cx = 0; + for (i = 0; i < 7; i++) + { + if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1, + buff, countof(buff))) + { + GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); + if (sz.cx > size.cx) size.cx = sz.cx; + } + else /* locale independent fallback on failure */ + { + static const WCHAR SunW[] = { 'S','u','n',0 }; + + GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size); + break; + } + } + infoPtr->textWidth = size.cx + 2; /* recalculate the height and width increments and offsets */

1 0

Detlef Riekenberg : localspl: Implement fpAddPortEx.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: cb6f9bbdb2a820f771720d29bc2dedb2a808b55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6f9bbdb2a820f771720d29b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 30 09:55:39 2009 +0200 localspl: Implement fpAddPortEx. --- dlls/localspl/provider.c | 66 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0f1c293..790a1ef 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1524,6 +1524,70 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } /****************************************************************************** + * fpAddPortEx [exported through PRINTPROVIDOR] + * + * Add a Port for a specific Monitor, without presenting a user interface + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * level [I] Structure-Level (1 or 2) for pBuffer + * pBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonitorName) +{ + PORT_INFO_2W * pi2; + monitor_t * pm; + DWORD lres; + DWORD res; + + pi2 = (PORT_INFO_2W *) pBuffer; + + TRACE("(%s, %d, %p, %s): %s %s %s\n", debugstr_w(pName), level, pBuffer, + debugstr_w(pMonitorName), debugstr_w(pi2 ? pi2->pPortName : NULL), + debugstr_w(((level > 1) && pi2) ? pi2->pMonitorName : NULL), + debugstr_w(((level > 1) && pi2) ? pi2->pDescription : NULL)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ((level < 1) || (level > 2)) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if ((!pi2) || (!pMonitorName) || (!pMonitorName[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* load the Monitor */ + pm = monitor_load(pMonitorName, NULL); + if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { + res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); + } + else + { + FIXME("not implemented for %s (monitor %p: %s)\n", + debugstr_w(pMonitorName), pm, pm ? debugstr_w(pm->dllname) : NULL); + SetLastError(ERROR_INVALID_PARAMETER); + res = FALSE; + } + monitor_unload(pm); + return res; +} + +/****************************************************************************** * fpAddPrinterDriverEx [exported through PRINTPROVIDOR] * * Install a Printer Driver with the Option to upgrade / downgrade the Files @@ -2098,7 +2162,7 @@ void setup_provider(void) NULL, /* fpGetPrinterDriverEx */ NULL, /* fpFindFirstPrinterChangeNotification */ NULL, /* fpFindClosePrinterChangeNotification */ - NULL, /* fpAddPortEx */ + fpAddPortEx, NULL, /* fpShutDown */ NULL, /* fpRefreshPrinterChangeNotification */ NULL, /* fpOpenPrinterEx */

1 0

Detlef Riekenberg : winspool: Use the backend for AddPortExW.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: a916f744769e2292adc21c3f7e5429fe904427de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a916f744769e2292adc21c3f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 30 09:57:11 2009 +0200 winspool: Use the backend for AddPortExW. --- dlls/winspool.drv/info.c | 240 +--------------------------------------------- 1 files changed, 2 insertions(+), 238 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a916f744769e2292adc21…

1 0

Alexandre Julliard : comdlg32: Fix icon drawing in the 3.1 file dialog.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: a6414c260c0f090ee8a67bc956d1def508bb7d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6414c260c0f090ee8a67bc95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:59:55 2009 +0200 comdlg32: Fix icon drawing in the 3.1 file dialog. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 3e43178..4fab38f 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -251,7 +251,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder); + DrawIconEx( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hFolder, 16, 16, 0, 0, DI_NORMAL ); HeapFree(GetProcessHeap(), 0, str); return TRUE; } @@ -285,7 +285,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, SetBkColor( lpdis->hDC, oldBk ); SetTextColor( lpdis->hDC, oldText ); } - DrawIcon(lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon); + DrawIconEx( lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, hIcon, 16, 16, 0, 0, DI_NORMAL ); HeapFree(GetProcessHeap(), 0, str); return TRUE; }

1 0

Alexandre Julliard : ntdll/tests: Retrieve the number of processors through GetSystemInfo.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 2e8de49ee154412b792956ceabb1d0300deae7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8de49ee154412b792956cea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 21:09:47 2009 +0200 ntdll/tests: Retrieve the number of processors through GetSystemInfo. --- dlls/ntdll/tests/info.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6495acc..69126fa 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -896,12 +896,14 @@ static void test_affinity(void) PROCESS_BASIC_INFORMATION pbi; DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; + SYSTEM_INFO si; + GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = (DWORD_PTR)pbi.Reserved2[0]; - ok( proc_affinity == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected process affinity\n" ); - proc_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + ok( proc_affinity == (1 << si.dwNumberOfProcessors) - 1, "Unexpected process affinity\n" ); + proc_affinity = 1 << si.dwNumberOfProcessors; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -913,8 +915,8 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected thread affinity\n" ); - thread_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + thread_affinity = 1 << si.dwNumberOfProcessors; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -929,7 +931,7 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); - if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) + if (si.dwNumberOfProcessors <= 1) { skip("only one processor, skipping affinity testing\n"); return; @@ -947,14 +949,14 @@ static void test_affinity(void) todo_wine ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); - proc_affinity = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + proc_affinity = (1 << si.dwNumberOfProcessors) - 1; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); todo_wine - ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, + ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity" ); }

1 0

Jörg Höhle : ole32/tests: Guard ReleaseStgMedium with SUCCEEDED.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 08df19b40510f37d89bb7740abcacfa6ad246f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df19b40510f37d89bb7740a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 29 17:49:20 2009 +0200 ole32/tests: Guard ReleaseStgMedium with SUCCEEDED. --- dlls/ole32/tests/clipboard.c | 56 ++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e58ac02..626d244 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -477,8 +477,6 @@ static void test_get_clipboard(void) hr = IDataObject_QueryGetData(data_obj, &fmtetc); ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); - if (hr == S_OK) - ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; @@ -499,19 +497,19 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.dwAspect = 0xdeadbeef; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.dwAspect = DVASPECT_THUMBNAIL; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; @@ -528,11 +526,13 @@ static void test_get_clipboard(void) fmtetc.cfFormat = CF_RIFF; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.tymed = TYMED_FILE; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); ok(DataObjectImpl_GetData_calls == 6, "DataObjectImpl_GetData should have been called 6 times instead of %d times\n", DataObjectImpl_GetData_calls); @@ -967,7 +967,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 0, "GetData called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); @@ -1004,7 +1004,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == old_refs + 1, "%d %d\n", refs, old_refs); @@ -1014,7 +1014,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == 2, "%d\n", refs); @@ -1047,7 +1047,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == 1, "%d\n", refs); @@ -1096,23 +1096,24 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, TYMED_ISTORAGE); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == E_FAIL, "got %08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* stream format -> global & stream */ @@ -1120,23 +1121,24 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, TYMED_ISTORAGE); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == E_FAIL, "got %08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, TYMED_HGLOBAL); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* storage format -> global, stream & storage */ @@ -1144,34 +1146,36 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); - ok(hr == S_OK, "got %08x\n", hr); - ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) { + hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); + ok(hr == S_OK, "got %08x\n", hr); + ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); + ReleaseStgMedium(&med); + } InitFormatEtc(fmt, cf_storage, TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL | TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* complex format with target device */ @@ -1180,7 +1184,7 @@ static void test_flushed_getdata(void) ok(hr == DV_E_FORMATETC || broken(hr == S_OK), /* win9x, winme & nt4 */ "got %08x\n", hr); - if(hr == S_OK) ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_another, 0xffff); memset(&dm, 0, sizeof(dm)); @@ -1199,7 +1203,7 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); HeapFree(GetProcessHeap(), 0, fmt.ptd); @@ -1356,7 +1360,7 @@ static void test_nonole_clipboard(void) ok(hr == S_OK, "got %08x\n", hr); obj_type = GetObjectType(U(med).hEnhMetaFile); ok(obj_type == OBJ_ENHMETAFILE, "got %d\n", obj_type); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); IDataObject_Release(get);

1 0

Andrey Turkin : ntdll: Accept ProcessDebugObjectHandle in QueryInformationProcess.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 2e86453f0a0519dc01189e265be8009a0c5b04b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e86453f0a0519dc01189e265… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Sep 29 20:48:42 2009 +0400 ntdll: Accept ProcessDebugObjectHandle in QueryInformationProcess. --- dlls/ntdll/process.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index d2e8db0..cae3f79 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -141,7 +141,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); - UNIMPLEMENTED_INFO_CLASS(ProcessDebugObjectHandle); UNIMPLEMENTED_INFO_CLASS(ProcessDebugFlags); UNIMPLEMENTED_INFO_CLASS(ProcessHandleTracing); @@ -300,6 +299,15 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessDebugObjectHandle: + /* "These are not the debuggers you are looking for." * + * set it to 0 aka "no debugger" to satisfy copy protections */ + len = sizeof(HANDLE); + if (ProcessInformationLength == len) + memset(ProcessInformation, 0, ProcessInformationLength); + else + ret = STATUS_INFO_LENGTH_MISMATCH; + break; case ProcessHandleCount: if (ProcessInformationLength >= 4) {

1 0

Erik Inge Bolsø : wininet: Add test for response without headers, avoid crash.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 5af1a497384dcaa42d9b9cd67c2c35ab97d73c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af1a497384dcaa42d9b9cd67… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Tue Sep 29 21:50:12 2009 +0200 wininet: Add test for response without headers, avoid crash. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e94e5cc..f874920 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4319,7 +4319,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) else if (!codeHundred) { FIXME("Non status line at head of response (%s)\n",debugstr_w(buffer)); - continue; + goto lend; } } while (codeHundred); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index dda4a41..281b4e7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1735,6 +1735,10 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } + if (strstr(buffer, "GET /testG")) + { + send(c, page1, sizeof page1-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2218,6 +2222,69 @@ static void test_invalid_response_headers(int port) InternetCloseHandle(session); } +static void test_response_without_headers(int port) +{ + HINTERNET hi, hc, hr; + DWORD r, count, size, status; + char buffer[1024]; + + SetLastError(0xdeadbeef); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hi != NULL, "open failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + hr = HttpOpenRequest(hc, NULL, "/testG", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + todo_wine ok(r, "HttpSendRequest failed %u\n", GetLastError()); + + count = 0; + memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed %u\n", GetLastError()); + todo_wine ok(count == sizeof page1 - 1, "count was wrong\n"); + todo_wine ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + + status = 0; + size = sizeof(status); + SetLastError(0xdeadbeef); + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + todo_wine ok(status == 200, "expected status 200 got %u\n", status); + + buffer[0] = 0; + size = sizeof(buffer); + SetLastError(0xdeadbeef); + r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &size, NULL ); + todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "OK"), "expected OK got: \"%s\"\n", buffer); + + buffer[0] = 0; + size = sizeof(buffer); + SetLastError(0xdeadbeef); + r = HttpQueryInfo(hr, HTTP_QUERY_VERSION, buffer, &size, NULL); + ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "HTTP/1.0"), "expected HTTP/1.0 got: \"%s\"\n", buffer); + + buffer[0] = 0; + size = sizeof(buffer); + SetLastError(0xdeadbeef); + r = HttpQueryInfo(hr, HTTP_QUERY_RAW_HEADERS, buffer, &size, NULL); + ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "HTTP/1.0 200 OK"), "raw headers wrong: \"%s\"\n", buffer); + + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + static void test_HttpQueryInfo(int port) { HINTERNET hi, hc, hr; @@ -2353,6 +2420,7 @@ static void test_http_connection(void) test_cookie_header(si.port); test_basic_authentication(si.port); test_invalid_response_headers(si.port); + test_response_without_headers(si.port); test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port);

1 0