September 2011 - Wine-commits

Henri Verbeet : ddraw: Implement ddraw7_Initialize().
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ec04f80cf606f07a630bfc515f004be9cc4679ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec04f80cf606f07a630bfc515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:28 2011 +0200 ddraw: Implement ddraw7_Initialize(). --- dlls/ddraw/ddraw.c | 19 +++++++++++++++---- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/main.c | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4708b8e..65afa90 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1537,11 +1537,22 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, * DDERR_ALREADYINITIALIZED on repeated calls * *****************************************************************************/ -static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid) +static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) { - FIXME("iface %p, guid %s stub!\n", iface, debugstr_guid(Guid)); + IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); - return DDERR_ALREADYINITIALIZED; + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); + + if (This->initialized) + return DDERR_ALREADYINITIALIZED; + + /* FIXME: To properly take the GUID into account we should call + * ddraw_init() here instead of in DDRAW_Create(). */ + if (guid) + FIXME("Ignoring guid %s.\n", debugstr_guid(guid)); + + This->initialized = TRUE; + return DD_OK; } static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid) @@ -1575,7 +1586,7 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid) { TRACE("iface %p, riid %s.\n", iface, debugstr_guid(riid)); - return D3D_OK; + return DDERR_ALREADYINITIALIZED; } /***************************************************************************** diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 601797e..bc48ad1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -81,6 +81,7 @@ struct IDirectDrawImpl /* See comment in IDirectDraw::AddRef */ LONG ref7, ref4, ref2, ref3, ref1, numIfaces; + BOOL initialized; /* WineD3D linkage */ struct wined3d *wineD3D; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e475914..2ab9eac 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -275,6 +275,14 @@ DirectDrawCreate(GUID *GUID, EnterCriticalSection(&ddraw_cs); hr = DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw); LeaveCriticalSection(&ddraw_cs); + + if (SUCCEEDED(hr)) + { + hr = IDirectDraw_Initialize(*DD, GUID); + if (FAILED(hr)) + IDirectDraw_Release(*DD); + } + return hr; } @@ -304,6 +312,15 @@ DirectDrawCreateEx(GUID *GUID, EnterCriticalSection(&ddraw_cs); hr = DDRAW_Create(GUID, DD, UnkOuter, iid); LeaveCriticalSection(&ddraw_cs); + + if (SUCCEEDED(hr)) + { + IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)DD; + hr = IDirectDraw7_Initialize(ddraw7, GUID); + if (FAILED(hr)) + IDirectDraw7_Release(ddraw7); + } + return hr; }

1 0

Henri Verbeet : ddraw/tests: Add some tests for Initialize().
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 18840ff9d952bc3bba32918a7ad928a4c25a6b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18840ff9d952bc3bba32918a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:29 2011 +0200 ddraw/tests: Add some tests for Initialize(). --- dlls/ddraw/tests/Makefile.in | 2 +- dlls/ddraw/tests/d3d.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/Makefile.in b/dlls/ddraw/tests/Makefile.in index 6bb325e..c32ae42 100644 --- a/dlls/ddraw/tests/Makefile.in +++ b/dlls/ddraw/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ddraw.dll -IMPORTS = ddraw user32 gdi32 +IMPORTS = ddraw user32 gdi32 ole32 C_SRCS = \ d3d.c \ diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 3f0e8e5..54974d9 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4483,6 +4483,135 @@ static void z_format_test(void) ok(count, "Expected at least one supported Z Buffer format\n"); } +static void test_initialize(void) +{ + IDirectDraw7 *ddraw7; + IDirectDraw4 *ddraw4; + IDirectDraw2 *ddraw2; + IDirectDraw *ddraw1; + IDirect3D *d3d1; + HRESULT hr; + + /* IDirectDraw */ + if (FAILED(hr = DirectDrawCreate(NULL, &ddraw1, NULL))) + { + skip("Failed to create IDirectDraw object (%#x), skipping tests.\n", hr); + return; + } + + hr = IDirectDraw_Initialize(ddraw1, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x.\n", hr); + IDirectDraw_Release(ddraw1); + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectDraw, (void **)&ddraw1); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw instance, hr %#x.\n", hr); + hr = IDirectDraw_Initialize(ddraw1, NULL); + ok(hr == DD_OK, "Initialize returned hr %#x, expected DD_OK.\n", hr); + hr = IDirectDraw_Initialize(ddraw1, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + IDirectDraw_Release(ddraw1); + CoUninitialize(); + + hr = DirectDrawCreate(NULL, &ddraw1, NULL); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw object, hr %#x.\n", hr); + + /* IDirectDraw2 */ + if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2))) + { + hr = IDirectDraw2_Initialize(ddraw2, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x.\n", hr); + IDirectDraw2_Release(ddraw2); + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectDraw2, (void **)&ddraw2); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw2 instance, hr %#x.\n", hr); + hr = IDirectDraw2_Initialize(ddraw2, NULL); + ok(hr == DD_OK, "Initialize returned hr %#x, expected DD_OK.\n", hr); + hr = IDirectDraw2_Initialize(ddraw2, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + IDirectDraw2_Release(ddraw2); + CoUninitialize(); + } + else skip("Failed to query IDirectDraw2 interface, skipping tests.\n"); + + /* IDirectDraw4 */ + if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw4, (void **)&ddraw4))) + { + hr = IDirectDraw4_Initialize(ddraw4, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x.\n", hr); + IDirectDraw4_Release(ddraw4); + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectDraw4, (void **)&ddraw4); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw4 instance, hr %#x.\n", hr); + hr = IDirectDraw4_Initialize(ddraw4, NULL); + ok(hr == DD_OK, "Initialize returned hr %#x, expected DD_OK.\n", hr); + hr = IDirectDraw4_Initialize(ddraw4, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + IDirectDraw4_Release(ddraw4); + CoUninitialize(); + } + else skip("Failed to query IDirectDraw4 interface, skipping tests.\n"); + + /* IDirect3D */ + if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirect3D, (void **)&d3d1))) + { + IDirectDraw *ddraw; + + hr = IDirect3D_Initialize(d3d1, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x.\n", hr); + IDirect3D_Release(d3d1); + + if (0) /* This crashes on the W2KPROSP4 testbot. */ + { + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirect3D, (void **)&d3d1); + ok(hr == E_NOINTERFACE, "CoCreateInstance returned hr %#x, expected E_NOINTERFACE.\n", hr); + CoUninitialize(); + } + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectDraw, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw instance, hr %#x.\n", hr); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D, (void **)&d3d1); + ok(SUCCEEDED(hr), "Failed to query IDirect3D interface, hr %#x.\n", hr); + IDirectDraw_Release(ddraw); + /* IDirect3D_Initialize() just returns DDERR_ALREADYINITIALIZED. */ + hr = IDirect3D_Initialize(d3d1, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + hr = IDirectDraw_Initialize(ddraw, NULL); + ok(hr == DD_OK, "Initialize returned hr %#x, expected DD_OK.\n", hr); + hr = IDirectDraw_Initialize(ddraw, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + IDirect3D_Release(d3d1); + CoUninitialize(); + } + else skip("Failed to query IDirect3D interface, skipping tests.\n"); + + IDirectDraw_Release(ddraw1); + + /* IDirectDraw7 */ + if (FAILED(hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL))) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + hr = IDirectDraw7_Initialize(ddraw7, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x.\n", hr); + IDirectDraw7_Release(ddraw7); + + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectDraw, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectDraw7, (void **)&ddraw7); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 instance, hr %#x.\n", hr); + hr = IDirectDraw7_Initialize(ddraw7, NULL); + ok(hr == DD_OK, "Initialize returned hr %#x, expected DD_OK.\n", hr); + hr = IDirectDraw7_Initialize(ddraw7, NULL); + ok(hr == DDERR_ALREADYINITIALIZED, "Initialize returned hr %#x, expected DDERR_ALREADYINITIALIZED.\n", hr); + IDirectDraw7_Release(ddraw7); + CoUninitialize(); +} + START_TEST(d3d) { init_function_pointers(); @@ -4529,4 +4658,5 @@ START_TEST(d3d) test_window_style(); test_redundant_mode_set(); test_coop_level_mode_set(); + test_initialize(); }

1 0

Henri Verbeet : wined3d: Make the declaration parameter to wined3d_device_process_vertices() const.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: fda48415acade5d20e813580db40152a56ed6648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda48415acade5d20e813580d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:30 2011 +0200 wined3d: Make the declaration parameter to wined3d_device_process_vertices() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7fd6eee..a585d25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3574,7 +3574,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) + const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf) { struct wined3d_state *state = &device->stateBlock->state; BOOL vbo = FALSE, streamWasUP = state->user_stream; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 85f47b4..fbd5103 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2282,7 +2282,7 @@ HRESULT __cdecl wined3d_device_present(struct wined3d_device *device, const RECT const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, - struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); + const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_texture_stage_state() const.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ba69e7802a9fcf728f5c4e3be9f1763b06b1a3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba69e7802a9fcf728f5c4e3be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:31 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_texture_stage_state() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a585d25..fe1b8a4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3738,7 +3738,7 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_texture_stage_state(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, UINT stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value) { TRACE("device %p, stage %u, state %s, value %p.\n", diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fbd5103..ed62b08 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2258,7 +2258,7 @@ HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); -HRESULT __cdecl wined3d_device_get_texture_stage_state(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, UINT stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device, WINED3DTRANSFORMSTATETYPE state, WINED3DMATRIX *matrix);

1 0

Nikolay Sivov : comctl32/monthcal: Fix hittesting in blank areas of multiple calendars case.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: b83d9b3261bc04021f2b6c46a33bf9275a081366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83d9b3261bc04021f2b6c46a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 18 22:32:16 2011 +0400 comctl32/monthcal: Fix hittesting in blank areas of multiple calendars case. --- dlls/comctl32/monthcal.c | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5a6f326..cb007d7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1679,7 +1679,7 @@ static LRESULT MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { MCHITTESTINFO htinfo; - SYSTEMTIME ht_month; + SYSTEMTIME *ht_month; INT day, calIdx; if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; @@ -1718,8 +1718,6 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) return fill_hittest_info(&htinfo, lpht); } - ht_month = infoPtr->calendars[calIdx].month; - /* are we in the header? */ if (PtInRect(&infoPtr->calendars[calIdx].title, lpht->pt)) { /* FIXME: buttons hittesting could be optimized cause maximum @@ -1756,57 +1754,66 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) return fill_hittest_info(&htinfo, lpht); } - /* days area (including week days and week numbers */ + ht_month = &infoPtr->calendars[calIdx].month; + /* days area (including week days and week numbers) */ day = MONTHCAL_GetDayFromPos(infoPtr, lpht->pt, calIdx); if (PtInRect(&infoPtr->calendars[calIdx].wdays, lpht->pt)) { htinfo.uHit = MCHT_CALENDARDAY; htinfo.iOffset = calIdx; - htinfo.st.wYear = ht_month.wYear; - htinfo.st.wMonth = (day < 1) ? ht_month.wMonth -1 : ht_month.wMonth; + htinfo.st.wYear = ht_month->wYear; + htinfo.st.wMonth = (day < 1) ? ht_month->wMonth -1 : ht_month->wMonth; htinfo.st.wDay = (day < 1) ? - MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day : day; + MONTHCAL_MonthLength(ht_month->wMonth-1, ht_month->wYear) - day : day; MONTHCAL_GetDayPos(infoPtr, &htinfo.st, &htinfo.iCol, &htinfo.iRow, calIdx); } else if(PtInRect(&infoPtr->calendars[calIdx].weeknums, lpht->pt)) { htinfo.uHit = MCHT_CALENDARWEEKNUM; - htinfo.st.wYear = ht_month.wYear; + htinfo.st.wYear = ht_month->wYear; htinfo.iOffset = calIdx; if (day < 1) { - htinfo.st.wMonth = ht_month.wMonth - 1; - htinfo.st.wDay = MONTHCAL_MonthLength(ht_month.wMonth-1, ht_month.wYear) - day; + htinfo.st.wMonth = ht_month->wMonth - 1; + htinfo.st.wDay = MONTHCAL_MonthLength(ht_month->wMonth-1, ht_month->wYear) - day; } - else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) + else if (day > MONTHCAL_MonthLength(ht_month->wMonth, ht_month->wYear)) { - htinfo.st.wMonth = ht_month.wMonth + 1; - htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); + htinfo.st.wMonth = ht_month->wMonth + 1; + htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month->wMonth, ht_month->wYear); } else { - htinfo.st.wMonth = ht_month.wMonth; + htinfo.st.wMonth = ht_month->wMonth; htinfo.st.wDay = day; } } else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { htinfo.iOffset = calIdx; - htinfo.st.wYear = ht_month.wYear; - htinfo.st.wMonth = ht_month.wMonth; - if (day < 1) + htinfo.st.wYear = ht_month->wYear; + htinfo.st.wMonth = ht_month->wMonth; + /* previous month only valid for first calendar */ + if (day < 1 && calIdx == 0) { htinfo.uHit = MCHT_CALENDARDATEPREV; MONTHCAL_GetPrevMonth(&htinfo.st); htinfo.st.wDay = MONTHCAL_MonthLength(htinfo.st.wMonth, htinfo.st.wYear) + day; } - else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) + /* next month only valid for last calendar */ + else if (day > MONTHCAL_MonthLength(ht_month->wMonth, ht_month->wYear) && + calIdx == MONTHCAL_GetCalCount(infoPtr)-1) { htinfo.uHit = MCHT_CALENDARDATENEXT; MONTHCAL_GetNextMonth(&htinfo.st); - htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear); + htinfo.st.wDay = day - MONTHCAL_MonthLength(ht_month->wMonth, ht_month->wYear); + } + /* multiple calendars case - blank areas for previous/next month */ + else if (day < 1 || day > MONTHCAL_MonthLength(ht_month->wMonth, ht_month->wYear)) + { + htinfo.uHit = MCHT_CALENDARBK; } else {

1 0

Nikolay Sivov : comctl32/monthcal: Fix MCM_SETCURSEL for multiple calendars case.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 2c6443ae57ec50494894751f77f3f6103e8bc77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6443ae57ec50494894751f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 10:44:22 2011 +0400 comctl32/monthcal: Fix MCM_SETCURSEL for multiple calendars case. --- dlls/comctl32/monthcal.c | 96 ++++++++++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cb007d7..d757c31 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -202,6 +202,11 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); } +static inline int MONTHCAL_MonthDiff(const SYSTEMTIME *left, const SYSTEMTIME *right) +{ + return (right->wYear - left->wYear)*12 + right->wMonth - left->wMonth; +} + /* returns the number of days in any given month, checking for leap days */ /* January is 1, December is 12 */ int MONTHCAL_MonthLength(int month, int year) @@ -1462,6 +1467,7 @@ static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { SYSTEMTIME prev = infoPtr->minSel; + INT diff; WORD day; TRACE("%p\n", curSel); @@ -1474,7 +1480,22 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel, FALSE)) return FALSE; - infoPtr->calendars[0].month = *curSel; + /* scroll calendars only if we have to */ + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month, curSel); + if (diff <= 0) + { + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[0].month, curSel); + if (diff > 0) diff = 0; + } + + if (diff != 0) + { + INT i; + + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); + } + infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; @@ -1542,56 +1563,49 @@ MONTHCAL_GetSelRange(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) static LRESULT MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { - TRACE("%p\n", range); - - if(!range) return FALSE; + SYSTEMTIME old_range[2]; - if(infoPtr->dwStyle & MCS_MULTISELECT) - { - SYSTEMTIME old_range[2]; + TRACE("%p\n", range); - /* adjust timestamps */ - if(!MONTHCAL_ValidateTime(&range[0])) - MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[0]); - if(!MONTHCAL_ValidateTime(&range[1])) - MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); + if(!range || !(infoPtr->dwStyle & MCS_MULTISELECT)) return FALSE; - /* maximum range exceeded */ - if(!MONTHCAL_IsSelRangeValid(infoPtr, &range[0], &range[1], NULL)) return FALSE; + /* adjust timestamps */ + if(!MONTHCAL_ValidateTime(&range[0])) MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[0]); + if(!MONTHCAL_ValidateTime(&range[1])) MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); - old_range[0] = infoPtr->minSel; - old_range[1] = infoPtr->maxSel; + /* maximum range exceeded */ + if(!MONTHCAL_IsSelRangeValid(infoPtr, &range[0], &range[1], NULL)) return FALSE; - /* swap if min > max */ - if(MONTHCAL_CompareSystemTime(&range[0], &range[1]) <= 0) - { - infoPtr->minSel = range[0]; - infoPtr->maxSel = range[1]; - } - else - { - infoPtr->minSel = range[1]; - infoPtr->maxSel = range[0]; - } - infoPtr->calendars[0].month = infoPtr->minSel; + old_range[0] = infoPtr->minSel; + old_range[1] = infoPtr->maxSel; - /* update day of week */ - MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE); - MONTHCAL_CalculateDayOfWeek(&infoPtr->maxSel, TRUE); + /* swap if min > max */ + if(MONTHCAL_CompareSystemTime(&range[0], &range[1]) <= 0) + { + infoPtr->minSel = range[0]; + infoPtr->maxSel = range[1]; + } + else + { + infoPtr->minSel = range[1]; + infoPtr->maxSel = range[0]; + } + infoPtr->calendars[0].month = infoPtr->minSel; - /* redraw if bounds changed */ - /* FIXME: no actual need to redraw everything */ - if(!MONTHCAL_IsDateEqual(&old_range[0], &range[0]) || - !MONTHCAL_IsDateEqual(&old_range[1], &range[1])) - { - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - } + /* update day of week */ + MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE); + MONTHCAL_CalculateDayOfWeek(&infoPtr->maxSel, TRUE); - TRACE("[min,max]=[%d %d]\n", infoPtr->minSel.wDay, infoPtr->maxSel.wDay); - return TRUE; + /* redraw if bounds changed */ + /* FIXME: no actual need to redraw everything */ + if(!MONTHCAL_IsDateEqual(&old_range[0], &range[0]) || + !MONTHCAL_IsDateEqual(&old_range[1], &range[1])) + { + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } - return FALSE; + TRACE("[min,max]=[%d %d]\n", infoPtr->minSel.wDay, infoPtr->maxSel.wDay); + return TRUE; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix MCM_SETSELRANGE for multiple calendars case.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ca533fca8c6a513814445b44cbd9b4bdcbc319e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca533fca8c6a513814445b44c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 11:16:43 2011 +0400 comctl32/monthcal: Fix MCM_SETSELRANGE for multiple calendars case. --- dlls/comctl32/monthcal.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d757c31..8fcdf28 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1564,6 +1564,7 @@ static LRESULT MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { SYSTEMTIME old_range[2]; + INT diff; TRACE("%p\n", range); @@ -1590,7 +1591,21 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) infoPtr->minSel = range[1]; infoPtr->maxSel = range[0]; } - infoPtr->calendars[0].month = infoPtr->minSel; + + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month, &infoPtr->maxSel); + if (diff < 0) + { + diff = MONTHCAL_MonthDiff(&infoPtr->calendars[0].month, &infoPtr->maxSel); + if (diff > 0) diff = 0; + } + + if (diff != 0) + { + INT i; + + for (i = 0; i < MONTHCAL_GetCalCount(infoPtr); i++) + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); + } /* update day of week */ MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE);

1 0

Piotr Caban : urlmon.idl: Added URLACTION_FEATURE* defines.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 8621fbfd846fd26322e7fb951a0a2e05199f76fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8621fbfd846fd26322e7fb951… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:55:06 2011 +0200 urlmon.idl: Added URLACTION_FEATURE* defines. --- include/urlmon.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index bbe85f0..a9d0791 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1262,6 +1262,18 @@ cpp_quote("#define URLPOLICY_CHANNEL_SOFTDIST_PRECACHE 0x00020000") cpp_quote("#define URLPOLICY_CHANNEL_SOFTDIST_AUTOINSTALL 0x00030000") cpp_quote("#define URLACTION_CHANNEL_SOFTDIST_MAX 0x00001eff") +cpp_quote("#define URLACTION_BEHAVIOR_MIN 0x00002000") +cpp_quote("#define URLACTION_BEHAVIOR_RUN 0x00002000") +cpp_quote("#define URLPOLICY_BEHAVIOR_CHECK_LIST 0x00010000") + +cpp_quote("#define URLACTION_FEATURE_MIN 0x00002100") +cpp_quote("#define URLACTION_FEATURE_MIME_SNIFFING 0x00002100") +cpp_quote("#define URLACTION_FEATURE_ZONE_ELEVATION 0x00002101") +cpp_quote("#define URLACTION_FEATURE_WINDOW_RESTRICTIONS 0x00002102") +cpp_quote("#define URLACTION_FEATURE_SCRIPT_STATUS_BAR 0x00002103") +cpp_quote("#define URLACTION_FEATURE_FORCE_ADDR_AND_STATUS 0x00002104") +cpp_quote("#define URLACTION_FEATURE_BLOCK_INPUT_PROMPTS 0x00002105") + cpp_quote("#define URLPOLICY_ALLOW 0x00") cpp_quote("#define URLPOLICY_QUERY 0x01") cpp_quote("#define URLPOLICY_DISALLOW 0x03")

1 0

Piotr Caban : urlmon: Added partial CoInternetIsFeatureEnabledForUrl implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: da55a13c0e7c3116f5ea47f95af81660bde20e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da55a13c0e7c3116f5ea47f95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:55:15 2011 +0200 urlmon: Added partial CoInternetIsFeatureEnabledForUrl implementation. --- dlls/urlmon/internet.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 06a423a..72830f5 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -700,6 +700,45 @@ HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWOR HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags, LPCWSTR szURL, IInternetSecurityManager *pSecMgr) { - FIXME("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); - return E_NOTIMPL; + DWORD urlaction = 0; + HRESULT hres; + + TRACE("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); + + if(FeatureEntry == FEATURE_MIME_SNIFFING) + urlaction = URLACTION_FEATURE_MIME_SNIFFING; + else if(FeatureEntry == FEATURE_WINDOW_RESTRICTIONS) + urlaction = URLACTION_FEATURE_WINDOW_RESTRICTIONS; + else if(FeatureEntry == FEATURE_ZONE_ELEVATION) + urlaction = URLACTION_FEATURE_ZONE_ELEVATION; + + if(!szURL || !urlaction || !pSecMgr) + return CoInternetIsFeatureEnabled(FeatureEntry, dwFlags); + + switch(dwFlags) { + case GET_FEATURE_FROM_THREAD: + case GET_FEATURE_FROM_THREAD_LOCALMACHINE: + case GET_FEATURE_FROM_THREAD_INTRANET: + case GET_FEATURE_FROM_THREAD_TRUSTED: + case GET_FEATURE_FROM_THREAD_INTERNET: + case GET_FEATURE_FROM_THREAD_RESTRICTED: + FIXME("unsupported flags %x\n", dwFlags); + return E_NOTIMPL; + + case GET_FEATURE_FROM_PROCESS: + hres = CoInternetIsFeatureEnabled(FeatureEntry, dwFlags); + if(hres != S_OK) + return hres; + /* fall through */ + + default: { + DWORD policy = URLPOLICY_DISALLOW; + + hres = IInternetSecurityManager_ProcessUrlAction(pSecMgr, szURL, urlaction, + (BYTE*)&policy, sizeof(DWORD), NULL, 0, PUAF_NOUI, 0); + if(hres!=S_OK || policy!=URLPOLICY_ALLOW) + return S_OK; + return S_FALSE; + } + } }

1 0

Piotr Caban : urlmon: Added CoInternetIsFeatureZoneElevationEnabled implementation.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 4155136edbb93286021bf0745c5fc73e0cab8274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4155136edbb93286021bf0745… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 19 10:55:37 2011 +0200 urlmon: Added CoInternetIsFeatureZoneElevationEnabled implementation. --- dlls/urlmon/internet.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 72830f5..d4a49b5 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -742,3 +742,53 @@ HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry } } } + +/*********************************************************************** + * CoInternetIsFeatureZoneElevationEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetIsFeatureZoneElevationEnabled(LPCWSTR szFromURL, LPCWSTR szToURL, + IInternetSecurityManager *pSecMgr, DWORD dwFlags) +{ + HRESULT hres; + + TRACE("(%s %s %p %x)\n", debugstr_w(szFromURL), debugstr_w(szToURL), pSecMgr, dwFlags); + + if(!pSecMgr || !szToURL) + return CoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, dwFlags); + + switch(dwFlags) { + case GET_FEATURE_FROM_THREAD: + case GET_FEATURE_FROM_THREAD_LOCALMACHINE: + case GET_FEATURE_FROM_THREAD_INTRANET: + case GET_FEATURE_FROM_THREAD_TRUSTED: + case GET_FEATURE_FROM_THREAD_INTERNET: + case GET_FEATURE_FROM_THREAD_RESTRICTED: + FIXME("unsupported flags %x\n", dwFlags); + return E_NOTIMPL; + + case GET_FEATURE_FROM_PROCESS: + hres = CoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, dwFlags); + if(hres != S_OK) + return hres; + /* fall through */ + + default: { + DWORD policy = URLPOLICY_DISALLOW; + + hres = IInternetSecurityManager_ProcessUrlAction(pSecMgr, szToURL, + URLACTION_FEATURE_ZONE_ELEVATION, (BYTE*)&policy, sizeof(DWORD), + NULL, 0, PUAF_NOUI, 0); + if(FAILED(hres)) + return S_OK; + + switch(policy) { + case URLPOLICY_ALLOW: + return S_FALSE; + case URLPOLICY_QUERY: + FIXME("Ask user dialog not implemented\n"); + default: + return S_OK; + } + } + } +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 28af3c5..76bf718 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -22,6 +22,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetIsFeatureEnabledForUrl(long long wstr ptr) +@ stdcall CoInternetIsFeatureZoneElevationEnabled(wstr wstr ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)

1 0