wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Chip Davis : d3d11: Implement d3d10_device_Flush().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: a6a0f7ba8ef6f3f383880b7a060e7ac20e354da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a0f7ba8ef6f3f383880b7a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:43 2020 +0430 d3d11: Implement d3d10_device_Flush(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2092901bd4..aaeb98a205 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5252,7 +5252,13 @@ static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface,

1 0

Chip Davis : d3d11: Implement d3d11_immediate_context_Flush().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 701e570328d3425076d829a5e855155e6d1aab75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=701e570328d3425076d829a5… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:42 2020 +0430 d3d11: Implement d3d11_immediate_context_Flush(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index afdd03f4d5..2092901bd4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2396,7 +2396,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + wined3d_device_flush(device->wined3d_device); + wined3d_mutex_unlock(); } static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetType(ID3D11DeviceContext1 *iface)

1 0

Chip Davis : wined3d: Introduce wined3d_device_flush().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 5d437b5ccd6ec4014e58f3fef6d5a2b639a18af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d437b5ccd6ec4014e58f3fe… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:41 2020 +0430 wined3d: Introduce wined3d_device_flush(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6f7ab23e60..450980719e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5106,6 +5106,13 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } +void CDECL wined3d_device_flush(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + wined3d_cs_emit_flush(device->cs); +} + static void update_swapchain_flags(struct wined3d_texture *texture) { unsigned int flags = texture->swapchain->state.desc.flags; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e7d08914cd..f4a648cac8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -53,6 +53,7 @@ @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) +@ cdecl wined3d_device_flush(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b52098527..5450b4d211 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2334,6 +2334,7 @@ void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_dev struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); +void __cdecl wined3d_device_flush(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct wined3d_device *device, struct wined3d_color *blend_factor);

1 0

Chip Davis : d3d11: Implement d3d11_immediate_context_GetContextFlags().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 87435db8a149419333078c34b22dfda4903fdbf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87435db8a149419333078c34… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:40 2020 +0430 d3d11: Implement d3d11_immediate_context_GetContextFlags(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d113ec8cd3..afdd03f4d5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2408,7 +2408,7 @@ static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_immediate_context_GetTy static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11DeviceContext1 *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); return 0; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 030781c88a..20acc0223e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2155,6 +2155,7 @@ static void test_immediate_context(void) ID3D11Multithread *multithread; ID3D11Buffer *buffer[2]; ID3D11Device *device; + unsigned int flags; BOOL enabled; HRESULT hr; @@ -2215,6 +2216,9 @@ static void test_immediate_context(void) ID3D11Device_GetImmediateContext(device, &immediate_context); + flags = ID3D11DeviceContext_GetContextFlags(immediate_context); + ok(!flags, "Got unexpected flags %#x.\n", flags); + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr);

1 0

Chip Davis : d3d11: Implement d3d11_immediate_context_FinishCommandList().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 5c446e92d7364395115e6c6eb59b65cfc425adf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c446e92d7364395115e6c6e… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu May 21 00:12:39 2020 +0430 d3d11: Implement d3d11_immediate_context_FinishCommandList(). This always returns DXGI_ERROR_INVALID_CALL. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7544bc86f4..d113ec8cd3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2416,9 +2416,9 @@ static UINT STDMETHODCALLTYPE d3d11_immediate_context_GetContextFlags(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D11DeviceContext1 *iface, BOOL restore, ID3D11CommandList **command_list) { - FIXME("iface %p, restore %#x, command_list %p stub!\n", iface, restore, command_list); + TRACE("iface %p, restore %#x, command_list %p.\n", iface, restore, command_list); - return E_NOTIMPL; + return DXGI_ERROR_INVALID_CALL; } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3ae05537a1..030781c88a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2147,15 +2147,23 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_get_immediate_context(void) +static void test_immediate_context(void) { ID3D11DeviceContext *immediate_context, *previous_immediate_context; ULONG expected_refcount, refcount; + ID3D11CommandList *command_list; ID3D11Multithread *multithread; + ID3D11Buffer *buffer[2]; ID3D11Device *device; BOOL enabled; HRESULT hr; + static const unsigned int buffer_contents[] = + { + 0x11111111, 0x22222222, 0x33333333, 0x44444444, + 0x55555555, 0x66666666, 0x77777777, 0x88888888, + }; + if (!(device = create_device(NULL))) { skip("Failed to create device.\n"); @@ -2205,6 +2213,23 @@ static void test_get_immediate_context(void) ID3D11Multithread_Release(multithread); + ID3D11Device_GetImmediateContext(device, &immediate_context); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + buffer[0] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[0]); + buffer[1] = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 16, &buffer_contents[4]); + + ID3D11DeviceContext_CopyResource(immediate_context, (ID3D11Resource *)buffer[1], (ID3D11Resource *)buffer[0]); + + hr = ID3D11DeviceContext_FinishCommandList(immediate_context, FALSE, &command_list); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11Buffer_Release(buffer[1]); + ID3D11Buffer_Release(buffer[0]); + ID3D11DeviceContext_Release(immediate_context); + done: refcount = ID3D11DeviceContext_Release(immediate_context); ok(!refcount, "Got unexpected refcount %u.\n", refcount); @@ -30086,7 +30111,7 @@ START_TEST(d3d11) queue_test(test_create_device); queue_for_each_feature_level(test_device_interfaces); - queue_test(test_get_immediate_context); + queue_test(test_immediate_context); queue_test(test_create_deferred_context); queue_test(test_create_texture1d); queue_test(test_texture1d_interfaces);

1 0

Gabriel Ivăncescu : winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: fff364274774fe51bdc8a0aee22369aac161dcb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff364274774fe51bdc8a0ae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 19 15:18:48 2020 +0300 winex11.drv: Fix X11DRV_X_to_window_rect to handle windows smaller than the decoration. A window can be resized to a smaller size than the decoration (title + borders), such as when it is minimized. In such cases it is necessary to recompute the minimum bounds, as it is done in the opposite function X11DRV_window_to_X_rect, since the real information was lost. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48490 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 595c54a7c0..a16b835424 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1209,12 +1209,16 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, */ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) { - x += data->window_rect.left - data->whole_rect.left; - y += data->window_rect.top - data->whole_rect.top; - cx += (data->window_rect.right - data->window_rect.left) - - (data->whole_rect.right - data->whole_rect.left); - cy += (data->window_rect.bottom - data->window_rect.top) - - (data->whole_rect.bottom - data->whole_rect.top); + RECT rc; + + get_decoration_rect( data, &rc, &data->window_rect, &data->client_rect ); + + x += min( data->window_rect.left - data->whole_rect.left, rc.left ); + y += min( data->window_rect.top - data->whole_rect.top, rc.top ); + cx += max( (data->window_rect.right - data->window_rect.left) - + (data->whole_rect.right - data->whole_rect.left), rc.right - rc.left ); + cy += max( (data->window_rect.bottom - data->window_rect.top) - + (data->whole_rect.bottom - data->whole_rect.top), rc.bottom - rc.top ); SetRect( rect, x, y, x + cx, y + cy ); }

1 0

Gabriel Ivăncescu : winex11.drv: Use a helper to retrieve the decoration rect for managed windows.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: df0d8ac5be7c8e22175674d6554b53156bfe9a91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0d8ac5be7c8e22175674d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 19 15:18:47 2020 +0300 winex11.drv: Use a helper to retrieve the decoration rect for managed windows. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d6873ce429..595c54a7c0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1154,19 +1154,16 @@ void make_window_embedded( struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_window_to_X_rect - * - * Convert a rect from client to X window coordinates + * get_decoration_rect */ -static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, - const RECT *window_rect, const RECT *client_rect ) +static void get_decoration_rect( struct x11drv_win_data *data, RECT *rect, + const RECT *window_rect, const RECT *client_rect ) { DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; unsigned long decor; - RECT rc; + SetRectEmpty( rect ); if (!data->managed) return; - if (IsRectEmpty( rect )) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); @@ -1179,9 +1176,23 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, ex_style_mask |= WS_EX_DLGMODALFRAME; } - SetRectEmpty( &rc ); - AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** + * X11DRV_window_to_X_rect + * + * Convert a rect from client to X window coordinates + */ +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect, + const RECT *window_rect, const RECT *client_rect ) +{ + RECT rc; + + if (IsRectEmpty( rect )) return; + get_decoration_rect( data, &rc, window_rect, client_rect ); rect->left -= rc.left; rect->right -= rc.right; rect->top -= rc.top;

1 0

Damjan Jovanovic : libwine: Add support for mmap at fixed start addresses on FreeBSD.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 55ba3648379d90642f174e74809b84130d6d1ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=55ba3648379d90642f174e74… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 18 21:04:58 2020 +0200 libwine: Add support for mmap at fixed start addresses on FreeBSD. The way to implement MAP_TRYFIXED on FreeBSD is call mmap() with MAP_FIXED | MAP_EXCL, which will allocate the mapping from the exact starting address if possible, and if that fails, call mmap() again without them. This gets PE DLLs loading at their correct base addresses, and fixes a FreeBSD-specific problem with Cygwin's fork() caused by cygwin1.dll loading at different base addresses in the parent and child. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index f2b5adc1d2..0fbe2efea7 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -211,18 +211,21 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) if (!(flags & MAP_FIXED)) { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - /* Even FreeBSD 5.3 does not properly support NULL here. */ - if( start == NULL ) start = (void *)0x110000; -#endif - #ifdef MAP_TRYFIXED /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) + return start; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) ) return start; #endif + +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + /* Even FreeBSD 5.3 does not properly support NULL here. */ + if( start == NULL ) start = (void *)0x110000; +#endif } return mmap( start, size, prot, flags, get_fdzero(), 0 ); }

1 0

Akihiro Sagawa : strmbase: Allow NULL pin_get_media_type() callback in source_Connect().
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: b9dc3324d7aa3397aa71e108e3e1fb5491eee525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9dc3324d7aa3397aa71e108… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 20 23:36:01 2020 +0900 strmbase: Allow NULL pin_get_media_type() callback in source_Connect(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index b5f8092e9e..eab7c0cb2e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -516,17 +516,20 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP return hr; } - for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) + if (pin->pFuncsTable->base.pin_get_media_type) { - strmbase_dump_media_type(&candidate); - if (compare_media_types(mt, &candidate) - && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) + for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) { - LeaveCriticalSection(&pin->pin.filter->csFilter); + strmbase_dump_media_type(&candidate); + if (compare_media_types(mt, &candidate) + && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + FreeMediaType(&candidate); + return S_OK; + } FreeMediaType(&candidate); - return S_OK; } - FreeMediaType(&candidate); } if (SUCCEEDED(IPin_EnumMediaTypes(peer, &enummt)))

1 0

Jacek Caban : include: Add winapifamily.h file.
by Alexandre Julliard 20 May '20

20 May '20

Module: wine Branch: master Commit: 5ab64243dafa23cd36ad02ec737fcad9a58a78e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab64243dafa23cd36ad02ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 17:54:21 2020 +0200 include: Add winapifamily.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/winapifamily.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 1 + 3 files changed, 64 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6aff236a7c..2f2d94d574 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -715,6 +715,7 @@ SOURCES = \ wia_xp.idl \ wiadef.h \ wimgapi.h \ + winapifamily.h \ winbase.h \ wincodec.idl \ wincodecsdk.idl \ diff --git a/include/winapifamily.h b/include/winapifamily.h new file mode 100644 index 0000000000..c1df2e1627 --- /dev/null +++ b/include/winapifamily.h @@ -0,0 +1,62 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _INC_WINAPIFAMILY +#define _INC_WINAPIFAMILY + +#define WINAPI_FAMILY_PC_APP 2 +#define WINAPI_FAMILY_PHONE_APP 3 +#define WINAPI_FAMILY_SYSTEM 4 +#define WINAPI_FAMILY_SERVER 5 +#define WINAPI_FAMILY_DESKTOP_APP 100 + +#define WINAPI_FAMILY_APP WINAPI_FAMILY_PC_APP + +#ifndef WINAPI_FAMILY +#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP +#endif + +#ifndef WINAPI_PARTITION_DESKTOP +#define WINAPI_PARTITION_DESKTOP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) +#endif + +#ifndef WINAPI_PARTITION_APP +#define WINAPI_PARTITION_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_PC_APP +#define WINAPI_PARTITION_PC_APP (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP || \ + WINAPI_FAMILY == WINAPI_FAMILY_PC_APP) +#endif + +#ifndef WINAPI_PARTITION_PHONE_APP +#define WINAPI_PARTITION_PHONE_APP (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) +#endif + +#ifndef WINAPI_PARTITION_SYSTEM +#define WINAPI_PARTITION_SYSTEM (WINAPI_FAMILY == WINAPI_FAMILY_SYSTEM || \ + WINAPI_FAMILY == WINAPI_FAMILY_SERVER) +#endif + +#define WINAPI_PARTITION_PHONE WINAPI_PARTITION_PHONE_APP + +#define WINAPI_FAMILY_PARTITION(x) x + +#endif /* _INC_WINAPIFAMILY */ diff --git a/include/winnt.h b/include/winnt.h index 46e17c546a..99c3793346 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -23,6 +23,7 @@ #include <basetsd.h> #include <guiddef.h> +#include <winapifamily.h> #ifndef RC_INVOKED #include <ctype.h>

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2020