July 2015 - Wine-Commits - list.winehq.org

Jacek Caban : ieframe: Added support for OnFocus notifications.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: ca8114ff9ceaa11aaba484480fc00a6a7f87cc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8114ff9ceaa11aaba484480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 15:18:30 2015 +0200 ieframe: Added support for OnFocus notifications. --- dlls/ieframe/oleobject.c | 28 ++++++++++++++++++++++++++-- dlls/ieframe/tests/webbrowser.c | 20 ++++++++++++-------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 462cf74..d02562d 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -49,6 +49,22 @@ static LRESULT resize_window(WebBrowser *This, LONG width, LONG height) return 0; } +static void notify_on_focus(WebBrowser *This, BOOL got_focus) +{ + IOleControlSite *control_site; + HRESULT hres; + + if(!This->client) + return; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleControlSite, (void**)&control_site); + if(FAILED(hres)) + return; + + IOleControlSite_OnFocus(control_site, got_focus); + IOleControlSite_Release(control_site); +} + static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { WebBrowser *This; @@ -67,6 +83,12 @@ static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, L return resize_window(This, LOWORD(lParam), HIWORD(lParam)); case WM_DOCHOSTTASK: return process_dochost_tasks(&This->doc_host); + case WM_SETFOCUS: + notify_on_focus(This, TRUE); + break; + case WM_KILLFOCUS: + notify_on_focus(This, FALSE); + break; } return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -203,6 +225,7 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) IOleInPlaceFrame_SetMenu(This->doc_host.frame, NULL, NULL, This->shell_embedding_hwnd); SetFocus(This->shell_embedding_hwnd); + notify_on_focus(This, TRUE); return S_OK; } @@ -534,10 +557,11 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) if(This->uiwindow) IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, NULL, NULL); - if(This->inplace) { + if(This->inplace) IOleInPlaceSiteEx_OnUIDeactivate(This->inplace, FALSE); + notify_on_focus(This, FALSE); + if(This->inplace) IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); - } return IOleObject_SetClientSite(iface, NULL); } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9ceed46..aa90755 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -143,7 +143,8 @@ DEFINE_EXPECT(OnUIDeactivate); DEFINE_EXPECT(OnInPlaceDeactivate); DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(ControlSite_TranslateAccelerator); -DEFINE_EXPECT(OnFocus); +DEFINE_EXPECT(OnFocus_TRUE); +DEFINE_EXPECT(OnFocus_FALSE); DEFINE_EXPECT(GetExternal); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -1135,7 +1136,10 @@ static HRESULT WINAPI IOleControlSite_fnTranslateAccelerator(IOleControlSite* Th static HRESULT WINAPI IOleControlSite_fnOnFocus(IOleControlSite* This, BOOL fGotFocus) { - CHECK_EXPECT2(OnFocus); + if(fGotFocus) + CHECK_EXPECT2(OnFocus_TRUE); + else + CHECK_EXPECT2(OnFocus_FALSE); return E_NOTIMPL; } @@ -1813,7 +1817,7 @@ static void test_DoVerb(IWebBrowser2 *unk) SET_EXPECT(Frame_SetActiveObject); SET_EXPECT(UIWindow_SetActiveObject); SET_EXPECT(SetMenu); - SET_EXPECT(OnFocus); + SET_EXPECT(OnFocus_TRUE); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -1830,7 +1834,7 @@ static void test_DoVerb(IWebBrowser2 *unk) CHECK_CALLED(Frame_SetActiveObject); CHECK_CALLED(UIWindow_SetActiveObject); CHECK_CALLED(SetMenu); - todo_wine CHECK_CALLED(OnFocus); + CHECK_CALLED(OnFocus_TRUE); hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, 0, (HWND)0xdeadbeef, &rect); @@ -3213,7 +3217,7 @@ static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) SET_EXPECT(RequestUIActivate); SET_EXPECT(ShowUI); SET_EXPECT(HideUI); - SET_EXPECT(OnFocus); + SET_EXPECT(OnFocus_FALSE); } hres = IOleDocumentView_UIActivate(docview, activate); @@ -3227,7 +3231,7 @@ static void test_UIActivate(IWebBrowser2 *unk, BOOL activate) CHECK_CALLED(RequestUIActivate); CHECK_CALLED(ShowUI); CHECK_CALLED(HideUI); - CHECK_CALLED(OnFocus); + CHECK_CALLED(OnFocus_FALSE); } } @@ -3490,7 +3494,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(Frame_SetActiveObject); SET_EXPECT(UIWindow_SetActiveObject); SET_EXPECT(OnUIDeactivate); - SET_EXPECT(OnFocus); + SET_EXPECT(OnFocus_FALSE); SET_EXPECT(OnInPlaceDeactivate); SET_EXPECT(Invoke_STATUSTEXTCHANGE); if(!do_download) { @@ -3513,7 +3517,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) CHECK_CALLED(Frame_SetActiveObject); CHECK_CALLED(UIWindow_SetActiveObject); CHECK_CALLED(OnUIDeactivate); - todo_wine CHECK_CALLED(OnFocus); + CHECK_CALLED(OnFocus_FALSE); CHECK_CALLED(OnInPlaceDeactivate); CLEAR_CALLED(Invoke_STATUSTEXTCHANGE); /* Called by IE9 */ if(!do_download) {

1 0

Sebastian Lackner : vcomp/tests: Add tests for atomic double functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: dfe32d6c523f4e126be1a1c30806165af2bdea8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe32d6c523f4e126be1a1c30… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:39:34 2015 +0200 vcomp/tests: Add tests for atomic double functions. --- dlls/vcomp/tests/vcomp.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 5be6965..f021a72 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -33,18 +33,22 @@ static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_add_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_div_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_mul_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_for_static_end)(void); @@ -192,18 +196,22 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_atomic_add_i4); VCOMP_GET_PROC(_vcomp_atomic_add_r4); + VCOMP_GET_PROC(_vcomp_atomic_add_r8); VCOMP_GET_PROC(_vcomp_atomic_and_i4); VCOMP_GET_PROC(_vcomp_atomic_div_i4); VCOMP_GET_PROC(_vcomp_atomic_div_r4); + VCOMP_GET_PROC(_vcomp_atomic_div_r8); VCOMP_GET_PROC(_vcomp_atomic_div_ui4); VCOMP_GET_PROC(_vcomp_atomic_mul_i4); VCOMP_GET_PROC(_vcomp_atomic_mul_r4); + VCOMP_GET_PROC(_vcomp_atomic_mul_r8); VCOMP_GET_PROC(_vcomp_atomic_or_i4); VCOMP_GET_PROC(_vcomp_atomic_shl_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); VCOMP_GET_PROC(_vcomp_atomic_sub_i4); VCOMP_GET_PROC(_vcomp_atomic_sub_r4); + VCOMP_GET_PROC(_vcomp_atomic_sub_r8); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_for_static_end); @@ -958,6 +966,31 @@ static void test_atomic_float(void) } } +static void test_atomic_double(void) +{ + struct + { + void (CDECL *func)(double *, double); + double v1, v2, expected; + } + tests[] = + { + { p_vcomp_atomic_add_r8, 42.0, 17.0, 42.0 + 17.0 }, + { p_vcomp_atomic_div_r8, 42.0, 17.0, 42.0 / 17.0 }, + { p_vcomp_atomic_mul_r8, 42.0, 17.0, 42.0 * 17.0 }, + { p_vcomp_atomic_sub_r8, 42.0, 17.0, 42.0 - 17.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + double val = tests[i].v1; + tests[i].func(&val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -971,6 +1004,7 @@ START_TEST(vcomp) test_vcomp_for_static_init(); test_atomic_integer32(); test_atomic_float(); + test_atomic_double(); release_vcomp(); }

1 0

Sebastian Lackner : vcomp: Implement atomic float functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 2a0890fe55945d49ddaebe255a1694388b1bd099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0890fe55945d49ddaebe255… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:03 2015 +0200 vcomp: Implement atomic float functions. --- dlls/vcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 8 ++++---- dlls/vcomp100/vcomp100.spec | 8 ++++---- dlls/vcomp90/vcomp90.spec | 8 ++++---- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 6f0caf6..92c8eaf 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -286,6 +286,50 @@ void CDECL _vcomp_atomic_xor_i4(int *dest, int val) do old = *dest; while (interlocked_cmpxchg(dest, old ^ val, old) != old); } +void CDECL _vcomp_atomic_add_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old + val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_div_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old / val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_mul_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old * val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_sub_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old - val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 768daef..bc963cb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 7f77ce1..2f4401e 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 7f77ce1..2f4401e 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2

1 0

Sebastian Lackner : vcomp: Implement 32-bit atomic integer functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 7bf779f3775549f49c01f91a3967dbc193bb24f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf779f3775549f49c01f91a3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:37:11 2015 +0200 vcomp: Implement 32-bit atomic integer functions. --- dlls/vcomp/main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 22 +++++++-------- dlls/vcomp100/vcomp100.spec | 22 +++++++-------- dlls/vcomp90/vcomp90.spec | 22 +++++++-------- 4 files changed, 98 insertions(+), 33 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ae5623b..6f0caf6 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <assert.h> @@ -221,6 +222,70 @@ static void vcomp_free_thread_data(void) vcomp_set_thread_data(NULL); } +void CDECL _vcomp_atomic_add_i4(int *dest, int val) +{ + interlocked_xchg_add(dest, val); +} + +void CDECL _vcomp_atomic_and_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old & val, old) != old); +} + +void CDECL _vcomp_atomic_div_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old / val, old) != old); +} + +void CDECL _vcomp_atomic_div_ui4(unsigned int *dest, unsigned int val) +{ + unsigned int old; + do old = *dest; while (interlocked_cmpxchg((int *)dest, old / val, old) != old); +} + +void CDECL _vcomp_atomic_mul_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old * val, old) != old); +} + +void CDECL _vcomp_atomic_or_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old | val, old) != old); +} + +void CDECL _vcomp_atomic_shl_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old << val, old) != old); +} + +void CDECL _vcomp_atomic_shr_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old >> val, old) != old); +} + +void CDECL _vcomp_atomic_shr_ui4(unsigned int *dest, unsigned int val) +{ + unsigned int old; + do old = *dest; while (interlocked_cmpxchg((int *)dest, old >> val, old) != old); +} + +void CDECL _vcomp_atomic_sub_i4(int *dest, int val) +{ + interlocked_xchg_add(dest, -val); +} + +void CDECL _vcomp_atomic_xor_i4(int *dest, int val) +{ + int old; + do old = *dest; while (interlocked_cmpxchg(dest, old ^ val, old) != old); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 7083ce4..768daef 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -1,54 +1,54 @@ @ stub _vcomp_atomic_add_i1 @ stub _vcomp_atomic_add_i2 -@ stub _vcomp_atomic_add_i4 +@ cdecl _vcomp_atomic_add_i4(ptr long) @ stub _vcomp_atomic_add_i8 @ stub _vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 -@ stub _vcomp_atomic_and_i4 +@ cdecl _vcomp_atomic_and_i4(ptr long) @ stub _vcomp_atomic_and_i8 @ stub _vcomp_atomic_div_i1 @ stub _vcomp_atomic_div_i2 -@ stub _vcomp_atomic_div_i4 +@ cdecl _vcomp_atomic_div_i4(ptr long) @ stub _vcomp_atomic_div_i8 @ stub _vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 -@ stub _vcomp_atomic_div_ui4 +@ cdecl _vcomp_atomic_div_ui4(ptr long) @ stub _vcomp_atomic_div_ui8 @ stub _vcomp_atomic_mul_i1 @ stub _vcomp_atomic_mul_i2 -@ stub _vcomp_atomic_mul_i4 +@ cdecl _vcomp_atomic_mul_i4(ptr long) @ stub _vcomp_atomic_mul_i8 @ stub _vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 -@ stub _vcomp_atomic_or_i4 +@ cdecl _vcomp_atomic_or_i4(ptr long) @ stub _vcomp_atomic_or_i8 @ stub _vcomp_atomic_shl_i1 @ stub _vcomp_atomic_shl_i2 -@ stub _vcomp_atomic_shl_i4 +@ cdecl _vcomp_atomic_shl_i4(ptr long) @ stub _vcomp_atomic_shl_i8 @ stub _vcomp_atomic_shr_i1 @ stub _vcomp_atomic_shr_i2 -@ stub _vcomp_atomic_shr_i4 +@ cdecl _vcomp_atomic_shr_i4(ptr long) @ stub _vcomp_atomic_shr_i8 @ stub _vcomp_atomic_shr_ui1 @ stub _vcomp_atomic_shr_ui2 -@ stub _vcomp_atomic_shr_ui4 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) @ stub _vcomp_atomic_shr_ui8 @ stub _vcomp_atomic_sub_i1 @ stub _vcomp_atomic_sub_i2 -@ stub _vcomp_atomic_sub_i4 +@ cdecl _vcomp_atomic_sub_i4(ptr long) @ stub _vcomp_atomic_sub_i8 @ stub _vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 -@ stub _vcomp_atomic_xor_i4 +@ cdecl _vcomp_atomic_xor_i4(ptr long) @ stub _vcomp_atomic_xor_i8 @ cdecl _vcomp_barrier() @ stub _vcomp_copyprivate_broadcast diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 56c7ae3..7f77ce1 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -1,54 +1,54 @@ @ stub _vcomp_atomic_add_i1 @ stub _vcomp_atomic_add_i2 -@ stub _vcomp_atomic_add_i4 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ stub _vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 -@ stub _vcomp_atomic_and_i4 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @ stub _vcomp_atomic_and_i8 @ stub _vcomp_atomic_div_i1 @ stub _vcomp_atomic_div_i2 -@ stub _vcomp_atomic_div_i4 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ stub _vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 -@ stub _vcomp_atomic_div_ui4 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @ stub _vcomp_atomic_div_ui8 @ stub _vcomp_atomic_mul_i1 @ stub _vcomp_atomic_mul_i2 -@ stub _vcomp_atomic_mul_i4 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ stub _vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 -@ stub _vcomp_atomic_or_i4 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @ stub _vcomp_atomic_or_i8 @ stub _vcomp_atomic_shl_i1 @ stub _vcomp_atomic_shl_i2 -@ stub _vcomp_atomic_shl_i4 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 @ stub _vcomp_atomic_shl_i8 @ stub _vcomp_atomic_shr_i1 @ stub _vcomp_atomic_shr_i2 -@ stub _vcomp_atomic_shr_i4 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 @ stub _vcomp_atomic_shr_i8 @ stub _vcomp_atomic_shr_ui1 @ stub _vcomp_atomic_shr_ui2 -@ stub _vcomp_atomic_shr_ui4 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 @ stub _vcomp_atomic_shr_ui8 @ stub _vcomp_atomic_sub_i1 @ stub _vcomp_atomic_sub_i2 -@ stub _vcomp_atomic_sub_i4 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ stub _vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 -@ stub _vcomp_atomic_xor_i4 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 @ stub _vcomp_atomic_xor_i8 @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 56c7ae3..7f77ce1 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -1,54 +1,54 @@ @ stub _vcomp_atomic_add_i1 @ stub _vcomp_atomic_add_i2 -@ stub _vcomp_atomic_add_i4 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ stub _vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 -@ stub _vcomp_atomic_and_i4 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @ stub _vcomp_atomic_and_i8 @ stub _vcomp_atomic_div_i1 @ stub _vcomp_atomic_div_i2 -@ stub _vcomp_atomic_div_i4 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ stub _vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 -@ stub _vcomp_atomic_div_ui4 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @ stub _vcomp_atomic_div_ui8 @ stub _vcomp_atomic_mul_i1 @ stub _vcomp_atomic_mul_i2 -@ stub _vcomp_atomic_mul_i4 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ stub _vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 -@ stub _vcomp_atomic_or_i4 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @ stub _vcomp_atomic_or_i8 @ stub _vcomp_atomic_shl_i1 @ stub _vcomp_atomic_shl_i2 -@ stub _vcomp_atomic_shl_i4 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 @ stub _vcomp_atomic_shl_i8 @ stub _vcomp_atomic_shr_i1 @ stub _vcomp_atomic_shr_i2 -@ stub _vcomp_atomic_shr_i4 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 @ stub _vcomp_atomic_shr_i8 @ stub _vcomp_atomic_shr_ui1 @ stub _vcomp_atomic_shr_ui2 -@ stub _vcomp_atomic_shr_ui4 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 @ stub _vcomp_atomic_shr_ui8 @ stub _vcomp_atomic_sub_i1 @ stub _vcomp_atomic_sub_i2 -@ stub _vcomp_atomic_sub_i4 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ stub _vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 -@ stub _vcomp_atomic_xor_i4 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 @ stub _vcomp_atomic_xor_i8 @ cdecl _vcomp_barrier() vcomp._vcomp_barrier @ stub _vcomp_copyprivate_broadcast

1 0

Michael Stefaniuc : wined3d: Merge two adjacent ifs with identical condition (PVS-Studio).
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: d700dbbae7f67c674ffa90dad0d577ac45a0059a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d700dbbae7f67c674ffa90dad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 28 11:04:46 2015 +0200 wined3d: Merge two adjacent ifs with identical condition (PVS-Studio). --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bff610d..c746d18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1272,10 +1272,9 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI { stream->stride = stride; stream->offset = offset; + wined3d_buffer_incref(buffer); } - if (buffer) - wined3d_buffer_incref(buffer); if (!device->recording) wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); if (prev_buffer)

1 0

Matteo Bruni : wined3d: Only install emulation wrappers when required.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: f2989a25221ba47621e31c44496a3890799c9ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2989a25221ba47621e31c444… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:57 2015 +0200 wined3d: Only install emulation wrappers when required. --- dlls/wined3d/arb_program_shader.c | 6 ++++++ dlls/wined3d/ati_fragment_shader.c | 6 ++++++ dlls/wined3d/directx.c | 10 +++++++--- dlls/wined3d/glsl_shader.c | 16 ++++++++++++++++ dlls/wined3d/nvidia_texture_shader.c | 7 +++++++ dlls/wined3d/state.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 7 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0bd7c22..73b2218 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5871,6 +5871,11 @@ static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); } +static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; +} + static void state_texfactor_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -6871,6 +6876,7 @@ static void arbfp_free_context_data(struct wined3d_context *context) const struct fragment_pipeline arbfp_fragment_pipeline = { arbfp_enable, arbfp_get_caps, + arbfp_get_emul_mask, arbfp_alloc, arbfp_free, arbfp_alloc_context_data, diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index b41f5d9..6558f27 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1310,6 +1310,11 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxSimultaneousTextures = 6; } +static DWORD atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; +} + static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { struct atifs_private_data *priv; @@ -1386,6 +1391,7 @@ static void atifs_free_context_data(struct wined3d_context *context) const struct fragment_pipeline atifs_fragment_pipeline = { atifs_enable, atifs_get_caps, + atifs_get_emul_mask, atifs_alloc, atifs_free, atifs_alloc_context_data, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0ed97c7..ce23c47 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3434,7 +3434,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) const char *WGL_Extensions = NULL; enum wined3d_gl_vendor gl_vendor; enum wined3d_pci_device device; - DWORD gl_version; + DWORD gl_version, gl_ext_emul_mask; HDC hdc; unsigned int i, j; GLint context_profile = 0; @@ -3805,8 +3805,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device); init_driver_info(driver_info, card_vendor, device); - install_gl_compat_wrapper(gl_info, ARB_MULTITEXTURE); - install_gl_compat_wrapper(gl_info, EXT_FOG_COORD); + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) + | adapter->fragment_pipe->get_emul_mask(gl_info); + if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) + install_gl_compat_wrapper(gl_info, ARB_MULTITEXTURE); + if (gl_ext_emul_mask & GL_EXT_EMUL_EXT_FOG_COORD) + install_gl_compat_wrapper(gl_info, EXT_FOG_COORD); return TRUE; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 301dc6f..9880df1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7742,6 +7742,13 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, caps->raster_caps = WINED3DPRASTERCAPS_FOGRANGE; } +static DWORD glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return GL_EXT_EMUL_ARB_MULTITEXTURE; + return 0; +} + static void *glsl_vertex_pipe_vp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { struct shader_glsl_priv *priv; @@ -8121,6 +8128,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = { glsl_vertex_pipe_vp_enable, glsl_vertex_pipe_vp_get_caps, + glsl_vertex_pipe_vp_get_emul_mask, glsl_vertex_pipe_vp_alloc, glsl_vertex_pipe_vp_free, glsl_vertex_pipe_vp_states, @@ -8167,6 +8175,13 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, s caps->MaxSimultaneousTextures = min(gl_info->limits.fragment_samplers, 8); } +static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + return GL_EXT_EMUL_ARB_MULTITEXTURE; + return 0; +} + static void *glsl_fragment_pipe_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { struct shader_glsl_priv *priv; @@ -8446,6 +8461,7 @@ const struct fragment_pipeline glsl_fragment_pipe = { glsl_fragment_pipe_enable, glsl_fragment_pipe_get_caps, + glsl_fragment_pipe_get_emul_mask, glsl_fragment_pipe_alloc, glsl_fragment_pipe_free, glsl_fragment_pipe_alloc_context_data, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 0dda7f5..30d15ad 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -738,6 +738,11 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } +static DWORD nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; +} + static void *nvrc_fragment_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { return shader_priv; @@ -924,6 +929,7 @@ static void nvrc_context_free(struct wined3d_context *context) const struct fragment_pipeline nvts_fragment_pipeline = { nvts_enable, nvrc_fragment_get_caps, + nvrc_fragment_get_emul_mask, nvrc_fragment_alloc, nvrc_fragment_free, nvrc_context_alloc, @@ -935,6 +941,7 @@ const struct fragment_pipeline nvts_fragment_pipeline = { const struct fragment_pipeline nvrc_fragment_pipeline = { nvrc_enable, nvrc_fragment_get_caps, + nvrc_fragment_get_emul_mask, nvrc_fragment_alloc, nvrc_fragment_free, nvrc_context_alloc, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4751b37..e39b7b4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5582,10 +5582,16 @@ static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3 caps->raster_caps |= WINED3DPRASTERCAPS_FOGRANGE; } +static DWORD vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; +} + const struct wined3d_vertex_pipe_ops ffp_vertex_pipe = { ffp_enable, vp_ffp_get_caps, + vp_ffp_get_emul_mask, ffp_alloc, ffp_free, vp_ffp_states, @@ -5632,6 +5638,11 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } +static DWORD ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; +} + static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d)) @@ -5663,6 +5674,7 @@ static void ffp_none_context_free(struct wined3d_context *context) const struct fragment_pipeline ffp_fragment_pipeline = { ffp_enable, ffp_fragment_get_caps, + ffp_fragment_get_emul_mask, ffp_alloc, ffp_free, ffp_none_context_alloc, @@ -5685,10 +5697,16 @@ static void vp_none_get_caps(const struct wined3d_gl_info *gl_info, struct wined memset(caps, 0, sizeof(*caps)); } +static DWORD vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return 0; +} + const struct wined3d_vertex_pipe_ops none_vertex_pipe = { none_enable, vp_none_get_caps, + vp_none_get_emul_mask, none_alloc, none_free, NULL, @@ -5699,6 +5717,11 @@ static void fp_none_get_caps(const struct wined3d_gl_info *gl_info, struct fragm memset(caps, 0, sizeof(*caps)); } +static DWORD fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +{ + return 0; +} + static BOOL fp_none_color_fixup_supported(struct color_fixup_desc fixup) { return is_identity_fixup(fixup); @@ -5708,6 +5731,7 @@ const struct fragment_pipeline none_fragment_pipe = { none_enable, fp_none_get_caps, + fp_none_get_emul_mask, none_alloc, none_free, ffp_none_context_alloc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d239ac1..a1331d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1287,10 +1287,14 @@ struct fragment_caps DWORD MaxSimultaneousTextures; }; +#define GL_EXT_EMUL_ARB_MULTITEXTURE 0x00000001 +#define GL_EXT_EMUL_EXT_FOG_COORD 0x00000002 + struct fragment_pipeline { void (*enable_extension)(const struct wined3d_gl_info *gl_info, BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); + DWORD (*get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device); BOOL (*allocate_context_data)(struct wined3d_context *context); @@ -1316,6 +1320,7 @@ struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_gl_info *gl_info, BOOL enable); void (*vp_get_caps)(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps); + DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device); const struct StateEntryTemplate *vp_states;

1 0

Nikolay Sivov : dwrite/tests: Some tests for GetRecommendedRenderingMode() .
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: aac3a069e4ccf2a5077331927116935e90016231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac3a069e4ccf2a5077331927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 27 11:10:04 2015 +0300 dwrite/tests: Some tests for GetRecommendedRenderingMode(). --- dlls/dwrite/tests/font.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac3a069e4ccf2a507733…

1 0

Nikolay Sivov : user32: Don't send WM_GETTEXT from GetWindowText() with invalid buffer length.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 516b21f4eec17beaf59412756a6436c242b90441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516b21f4eec17beaf59412756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 23 22:31:07 2015 +0300 user32: Don't send WM_GETTEXT from GetWindowText() with invalid buffer length. --- dlls/user32/tests/win.c | 13 ++----------- dlls/user32/win.c | 12 ++++-------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 309b699..9f6c224 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -722,7 +722,6 @@ static struct wm_gettext_override_data BOOL enabled; /* when 1 bypasses default procedure */ char *buff; /* expected text buffer pointer */ WCHAR *buffW; /* same, for W test */ - int len; } g_wm_gettext_override; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -810,8 +809,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { char *text = (char*)lparam; ok(g_wm_gettext_override.buff == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buff, text); - if (g_wm_gettext_override.len) - ok(*text == 0, "expected empty string buffer %x\n", *text); + ok(*text == 0, "expected empty string buffer %x\n", *text); return 0; } break; @@ -833,8 +831,7 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR { WCHAR *text = (WCHAR*)lparam; ok(g_wm_gettext_override.buffW == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buffW, text); - if (g_wm_gettext_override.len) - ok(*text == 0, "expected empty string buffer %x\n", *text); + ok(*text == 0, "expected empty string buffer %x\n", *text); return 0; } break; @@ -5819,7 +5816,6 @@ static void test_gettext(void) num_gettext_msgs = 0; memset( buf, 0xcc, sizeof(buf) ); g_wm_gettext_override.buff = buf; - g_wm_gettext_override.len = sizeof(buf); buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *buf == 0, "got %x\n", *buf ); @@ -5828,11 +5824,9 @@ static void test_gettext(void) num_gettext_msgs = 0; strcpy( buf, "blah" ); g_wm_gettext_override.buff = buf; - g_wm_gettext_override.len = 0; buf_len = GetWindowTextA( hwnd, buf, 0 ); ok( buf_len == 0, "got %d\n", buf_len ); ok( !strcmp(buf, "blah"), "got %s\n", buf ); -todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); g_wm_gettext_override.enabled = FALSE; @@ -5846,7 +5840,6 @@ todo_wine num_gettext_msgs = 0; memset( bufW, 0xcc, sizeof(bufW) ); g_wm_gettext_override.buffW = bufW; - g_wm_gettext_override.len = sizeof(bufW)/sizeof(WCHAR); buf_len = GetWindowTextW( hwnd2, bufW, sizeof(bufW)/sizeof(WCHAR) ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *bufW == 0, "got %x\n", *bufW ); @@ -5855,11 +5848,9 @@ todo_wine num_gettext_msgs = 0; memset( bufW, 0xcc, sizeof(bufW) ); g_wm_gettext_override.buffW = bufW; - g_wm_gettext_override.len = 0; buf_len = GetWindowTextW( hwnd2, bufW, 0 ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *bufW == 0xcccc, "got %x\n", *bufW ); -todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); g_wm_gettext_override.enabled = FALSE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 91f1871..e3650f5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2676,17 +2676,15 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; - if (!lpString) return 0; + if (!lpString || nMaxCount <= 0) return 0; if (WIN_IsCurrentProcess( hwnd )) { - if (nMaxCount > 0) - lpString[0] = 0; + lpString[0] = 0; return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } /* when window belongs to other process, don't send a message */ - if (nMaxCount <= 0) return 0; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; get_server_window_text( hwnd, buffer, nMaxCount ); if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) @@ -2725,17 +2723,15 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { - if (!lpString) return 0; + if (!lpString || nMaxCount <= 0) return 0; if (WIN_IsCurrentProcess( hwnd )) { - if (nMaxCount > 0) - lpString[0] = 0; + lpString[0] = 0; return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } /* when window belongs to other process, don't send a message */ - if (nMaxCount <= 0) return 0; get_server_window_text( hwnd, lpString, nMaxCount ); return strlenW(lpString); }

1 0

Hans Leidekker : netprofm: Improve the stub for INetworkCostManager:: GetDataPlanStatus.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: be7373f76420f93e19a265cd268911a3628af704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7373f76420f93e19a265cd2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 24 10:34:36 2015 +0200 netprofm: Improve the stub for INetworkCostManager::GetDataPlanStatus. --- dlls/netprofm/Makefile.in | 1 + dlls/netprofm/list.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- dlls/netprofm/tests/list.c | 7 ++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index 4dadfb0..def2614 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,4 +1,5 @@ MODULE = netprofm.dll +IMPORTS = iphlpapi C_SRCS = \ list.c \ diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 842f335..1808178 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -23,6 +23,12 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "ifdef.h" +#include "netioapi.h" #include "initguid.h" #include "objbase.h" #include "ocidl.h" @@ -240,12 +246,67 @@ static HRESULT WINAPI cost_manager_GetCost( return S_OK; } +static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) +{ + ULONG i; + + if (addr6->sin6_family != WS_AF_INET6) return FALSE; + + for (i = 0; i < 5; i++) + if (addr6->sin6_addr.u.Word[i]) return FALSE; + + if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; + + addr4->sin_family = WS_AF_INET; + addr4->sin_port = addr6->sin6_port; + addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; + memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); + + return TRUE; +} + static HRESULT WINAPI cost_manager_GetDataPlanStatus( INetworkCostManager *iface, NLM_DATAPLAN_STATUS *pDataPlanStatus, NLM_SOCKADDR *pDestIPAddr) { + DWORD ret, index; + NET_LUID luid; + SOCKADDR *dst = (SOCKADDR *)pDestIPAddr; + SOCKADDR_IN addr4, *dst4; + FIXME( "%p, %p, %p\n", iface, pDataPlanStatus, pDestIPAddr ); - return E_NOTIMPL; + + if (!pDataPlanStatus) return E_POINTER; + + if (dst && ((dst->sa_family == WS_AF_INET && (dst4 = (SOCKADDR_IN *)dst)) || + ((dst->sa_family == WS_AF_INET6 && map_address_6to4( (const SOCKADDR_IN6 *)dst, &addr4 ) + && (dst4 = &addr4))))) + { + if ((ret = GetBestInterface( dst4->sin_addr.S_un.S_addr, &index ))) + return HRESULT_FROM_WIN32( ret ); + + if ((ret = ConvertInterfaceIndexToLuid( index, &luid ))) + return HRESULT_FROM_WIN32( ret ); + + if ((ret = ConvertInterfaceLuidToGuid( &luid, &pDataPlanStatus->InterfaceGuid ))) + return HRESULT_FROM_WIN32( ret ); + } + else + { + FIXME( "interface guid not found\n" ); + memset( &pDataPlanStatus->InterfaceGuid, 0, sizeof(pDataPlanStatus->InterfaceGuid) ); + } + + pDataPlanStatus->UsageData.UsageInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->UsageData.LastSyncTime, 0, sizeof(pDataPlanStatus->UsageData.LastSyncTime) ); + pDataPlanStatus->DataLimitInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->InboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->OutboundBandwidthInKbps = NLM_UNKNOWN_DATAPLAN_STATUS; + memset( &pDataPlanStatus->NextBillingCycle, 0, sizeof(pDataPlanStatus->NextBillingCycle) ); + pDataPlanStatus->MaxTransferSizeInMegabytes = NLM_UNKNOWN_DATAPLAN_STATUS; + pDataPlanStatus->Reserved = 0; + + return S_OK; } static HRESULT WINAPI cost_manager_SetDestinationAddresses( diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 7776f5c..7e885c3 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -67,6 +67,7 @@ static void test_INetworkListManager( void ) if (hr == S_OK) { DWORD cost; + NLM_DATAPLAN_STATUS status; hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); ok( hr == E_POINTER, "got %08x\n", hr ); @@ -76,6 +77,12 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); + hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, NULL, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, &status, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + INetworkCostManager_Release( cost_mgr ); }

1 0

Henri Verbeet : include: Add WIC error codes to winerror.h.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: e9e21ab4f9b40c983e317acff75103d005434ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e21ab4f9b40c983e317acff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 19:32:04 2015 +0200 include: Add WIC error codes to winerror.h. --- include/wincodec.idl | 17 ----------------- include/winerror.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 7216d07..639d925 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -220,23 +220,6 @@ typedef struct WICBitmapPattern { typedef UINT32 WICColor; -cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") -cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05") -cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") -cpp_quote("#define WINCODEC_ERR_ALREADYLOCKED 0x88982f0d") -cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") -cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") -cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") -cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") -cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") -cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") -cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") -cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") -cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e") -cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") - interface IWICPalette; [ diff --git a/include/winerror.h b/include/winerror.h index f1c2f3b..1c9df07 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2995,6 +2995,47 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) +#define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) +#define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) +#define WINCODEC_ERR_UNSUPPORTEDVERSION _HRESULT_TYPEDEF_(0x88982f0b) +#define WINCODEC_ERR_NOTINITIALIZED _HRESULT_TYPEDEF_(0x88982f0c) +#define WINCODEC_ERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88982f0d) +#define WINCODEC_ERR_PROPERTYNOTFOUND _HRESULT_TYPEDEF_(0x88982f40) +#define WINCODEC_ERR_PROPERTYNOTSUPPORTED _HRESULT_TYPEDEF_(0x88982f41) +#define WINCODEC_ERR_PROPERTYSIZE _HRESULT_TYPEDEF_(0x88982f42) +#define WINCODEC_ERR_CODECPRESENT _HRESULT_TYPEDEF_(0x88982f43) +#define WINCODEC_ERR_CODECNOTHUMBNAIL _HRESULT_TYPEDEF_(0x88982f44) +#define WINCODEC_ERR_PALETTEUNAVAILABLE _HRESULT_TYPEDEF_(0x88982f45) +#define WINCODEC_ERR_CODECTOOMANYSCANLINES _HRESULT_TYPEDEF_(0x88982f46) +#define WINCODEC_ERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88982f48) +#define WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS _HRESULT_TYPEDEF_(0x88982f49) +#define WINCODEC_ERR_COMPONENTNOTFOUND _HRESULT_TYPEDEF_(0x88982f50) +#define WINCODEC_ERR_IMAGESIZEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f51) +#define WINCODEC_ERR_TOOMUCHMETADATA _HRESULT_TYPEDEF_(0x88982f52) +#define WINCODEC_ERR_BADIMAGE _HRESULT_TYPEDEF_(0x88982f60) +#define WINCODEC_ERR_BADHEADER _HRESULT_TYPEDEF_(0x88982f61) +#define WINCODEC_ERR_FRAMEMISSING _HRESULT_TYPEDEF_(0x88982f62) +#define WINCODEC_ERR_BADMETADATAHEADER _HRESULT_TYPEDEF_(0x88982f63) +#define WINCODEC_ERR_BADSTREAMDATA _HRESULT_TYPEDEF_(0x88982f70) +#define WINCODEC_ERR_STREAMWRITE _HRESULT_TYPEDEF_(0x88982f71) +#define WINCODEC_ERR_STREAMREAD _HRESULT_TYPEDEF_(0x88982f72) +#define WINCODEC_ERR_STREAMNOTAVAILABLE _HRESULT_TYPEDEF_(0x88982f73) +#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT _HRESULT_TYPEDEF_(0x88982f80) +#define WINCODEC_ERR_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88982f81) +#define WINCODEC_ERR_INVALIDREGISTRATION _HRESULT_TYPEDEF_(0x88982f8a) +#define WINCODEC_ERR_COMPONENTINITIALIZEFAILURE _HRESULT_TYPEDEF_(0x88982f8b) +#define WINCODEC_ERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88982f8c) +#define WINCODEC_ERR_DUPLICATEMETADATAPRESENT _HRESULT_TYPEDEF_(0x88982f8d) +#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE _HRESULT_TYPEDEF_(0x88982f8e) +#define WINCODEC_ERR_UNEXPECTEDSIZE _HRESULT_TYPEDEF_(0x88982f8f) +#define WINCODEC_ERR_INVALIDQUERYREQUEST _HRESULT_TYPEDEF_(0x88982f90) +#define WINCODEC_ERR_UNEXPECTEDMETADATATYPE _HRESULT_TYPEDEF_(0x88982f91) +#define WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT _HRESULT_TYPEDEF_(0x88982f92) +#define WINCODEC_ERR_INVALIDQUERYCHARACTER _HRESULT_TYPEDEF_(0x88982f93) +#define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) +#define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) + #define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000) #define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001) #define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)

1 0