wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Alexandre Julliard : explorer: Use the window caption font for the Start button.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 19a7037d502e765d448032383f5770d7b2621eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a7037d502e765d448032383… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:15:12 2016 +0900 explorer: Use the window caption font for the Start button. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 4f94ba6..40e03e9 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -549,14 +549,21 @@ static void do_hide_systray(void) static void do_show_systray(void) { SIZE start_button_size; + NONCLIENTMETRICSW ncm; + HFONT font; HDC hdc = GetDC( 0 ); + ncm.cbSize = sizeof(NONCLIENTMETRICSW); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSW), &ncm, 0 ); + font = CreateFontIndirectW( &ncm.lfCaptionFont ); /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ + SelectObject( hdc, font ); GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); /* add some margins (FIXME) */ start_button_size.cx += 8; start_button_size.cy += 4; ReleaseDC( 0, hdc ); + SendMessageW( start_button, WM_SETFONT, (WPARAM)font, 0 ); tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, start_button_size.cy );

1 0

Alexandre Julliard : explorer: Add a helper function to resize and display the tray window.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 45b2b1f09b30b01726685983dd8e3edb42c1fd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b2b1f09b30b01726685983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:08:44 2016 +0900 explorer: Add a helper function to resize and display the tray window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 57 +++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index beb0a88..4f94ba6 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -87,7 +87,8 @@ static unsigned int nb_displayed; static struct icon **displayed; /* array of currently displayed icons */ static BOOL hide_systray, enable_shell; -static int icon_cx, icon_cy, tray_width; +static int icon_cx, icon_cy, tray_width, tray_height; +static WCHAR start_label[50]; static struct icon *balloon_icon; static HWND balloon_window; @@ -104,6 +105,8 @@ static HWND start_button; #define BALLOON_SHOW_MIN_TIMEOUT 10000 #define BALLOON_SHOW_MAX_TIMEOUT 30000 +static void do_show_systray(void); + /* Retrieves icon record by owner window and ID */ static struct icon *get_icon(HWND owner, UINT id) { @@ -323,7 +326,7 @@ static BOOL show_icon(struct icon *icon) update_tooltip_position( icon ); invalidate_icons( nb_displayed-1, nb_displayed-1 ); - if (nb_displayed == 1 && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); + if (nb_displayed == 1 && !hide_systray) do_show_systray(); create_tooltip(icon); update_balloon( icon ); @@ -543,6 +546,26 @@ static void do_hide_systray(void) 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); } +static void do_show_systray(void) +{ + SIZE start_button_size; + HDC hdc = GetDC( 0 ); + + /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ + GetTextExtentPointW( hdc, start_label, lstrlenW(start_label), &start_button_size ); + /* add some margins (FIXME) */ + start_button_size.cx += 8; + start_button_size.cy += 4; + ReleaseDC( 0, hdc ); + + tray_width = GetSystemMetrics( SM_CXSCREEN ); + tray_height = max( icon_cy, start_button_size.cy ); + SetWindowPos( start_button, 0, 0, 0, start_button_size.cx, tray_height, + SWP_NOACTIVATE | SWP_NOZORDER ); + SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, + tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); +} + static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -552,12 +575,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray) do_hide_systray(); - else - { - tray_width = GetSystemMetrics( SM_CXSCREEN ); - SetWindowPos( tray_window, 0, 0, GetSystemMetrics( SM_CYSCREEN ) - icon_cy, - tray_width, icon_cy, SWP_NOZORDER | SWP_NOACTIVATE ); - } + else do_show_systray(); break; case WM_TIMER: @@ -641,24 +659,12 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } -static void get_system_text_size( const WCHAR *text, SIZE *size ) -{ - /* FIXME: Implement BCM_GETIDEALSIZE and use that instead. */ - HDC hdc = GetDC( 0 ); - - GetTextExtentPointW(hdc, text, lstrlenW(text), size); - - ReleaseDC( 0, hdc ); -} - /* this function creates the listener window */ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enable_shell ) { WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; static const WCHAR button_class[] = {'B','u','t','t','o','n',0}; - WCHAR start_label[50]; - SIZE start_text_size; wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); @@ -684,10 +690,8 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab return; } - tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_window = CreateWindowExW( WS_EX_NOACTIVATE, classname, NULL, WS_POPUP, - 0, GetSystemMetrics( SM_CYSCREEN ) - icon_cy, - tray_width, icon_cy, 0, 0, 0, 0 ); + 0, GetSystemMetrics( SM_CYSCREEN ), 0, 0, 0, 0, 0, 0 ); if (!tray_window) { WINE_ERR("Could not create tray window\n"); @@ -696,12 +700,9 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab LoadStringW( NULL, IDS_START_LABEL, start_label, sizeof(start_label)/sizeof(WCHAR) ); - get_system_text_size( start_label, &start_text_size ); - start_button = CreateWindowW( button_class, start_label, WS_CHILD|WS_VISIBLE|BS_PUSHBUTTON, - 0, 0, start_text_size.cx + 8, icon_cy, tray_window, 0, 0, 0 ); - - if (enable_shell && !hide_systray) ShowWindow( tray_window, SW_SHOWNA ); + 0, 0, 0, 0, tray_window, 0, 0, 0 ); if (hide_systray) do_hide_systray(); + else if (enable_shell) do_show_systray(); }

1 0

Józef Kucia : wined3d: Replace WINED3D_BUFFER_CREATEBO with WINED3D_BUFFER_USE_BO.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: aa0cdc51461fcf3fc35f66502091e4e5812f6d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa0cdc51461fcf3fc35f66502… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:55 2016 +0200 wined3d: Replace WINED3D_BUFFER_CREATEBO with WINED3D_BUFFER_USE_BO. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 62a1921..6f66b97 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ -#define WINED3D_BUFFER_CREATEBO 0x02 /* Create a buffer object for this buffer. */ +#define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ @@ -199,8 +199,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine return; fail: - /* Clean up all vbo init, but continue because we can work without a vbo :-) */ + /* Clean up all VBO init, but continue because we can work without a VBO :-) */ ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); + This->flags &= ~WINED3D_BUFFER_USE_BO; delete_gl_buffer(This, gl_info); buffer_clear_dirty_areas(This); } @@ -457,10 +458,9 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co data->buffer_object = buffer->buffer_object; if (!buffer->buffer_object) { - if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) { buffer_create_buffer_object(buffer, context); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { data->buffer_object = buffer->buffer_object; @@ -526,7 +526,6 @@ static void buffer_unload(struct wined3d_resource *resource) } delete_gl_buffer(buffer, context->gl_info); - buffer->flags |= WINED3D_BUFFER_CREATEBO; /* Recreate the buffer object next load */ buffer_clear_dirty_areas(buffer); context_release(context); @@ -739,10 +738,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (!buffer->buffer_object) { /* TODO: Make converting independent from VBOs */ - if (buffer->flags & WINED3D_BUFFER_CREATEBO) + if (buffer->flags & WINED3D_BUFFER_USE_BO) { buffer_create_buffer_object(buffer, context); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else { @@ -793,8 +791,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; /* The stream source state handler might have read the memory of * the vertex buffer already and got the memory in the vbo which @@ -826,8 +824,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS) { FIXME("Too many full buffer conversions, stopping converting.\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); return; @@ -1008,8 +1006,8 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN * that returns unaligned pointers */ TRACE("Dynamic buffer, dropping VBO\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->resource.bind_count) device_invalidate_state(device, STATE_STREAMSRC); } @@ -1278,7 +1276,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!size) { - WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); + WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } @@ -1292,7 +1290,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device WINED3D_MULTISAMPLE_NONE, 0, usage, pool, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops); if (FAILED(hr)) { - WARN("Failed to initialize resource, hr %#x\n", hr); + WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } buffer->buffer_type_hint = bind_hint; @@ -1305,7 +1303,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. * Keep a system memory copy of the buffer to provide the same behavior to the application. * Still use a VBO to support OpenGL 3 core contexts. */ - TRACE("Using doublebuffer mode because of software vertex processing\n"); + TRACE("Using doublebuffer mode because of software vertex processing.\n"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; } @@ -1316,19 +1314,19 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if(buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) { - TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + TRACE("Not creating a BO because the buffer is in system memory.\n"); } - else if(!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { - TRACE("Not creating a vbo because the buffer has dynamic usage and no GL support\n"); + TRACE("Not creating a BO because the buffer has dynamic usage and no GL support.\n"); } else { - buffer->flags |= WINED3D_BUFFER_CREATEBO; + buffer->flags |= WINED3D_BUFFER_USE_BO; } if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps))))

1 0

Józef Kucia : wined3d: Do not call wined3d_buffer_map () before "buffer->maps" is initialized.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 0dcf255b51ef096d649a5b4daee7204409550376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcf255b51ef096d649a5b4da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:54 2016 +0200 wined3d: Do not call wined3d_buffer_map() before "buffer->maps" is initialized. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c82bfdb..62a1921 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1331,17 +1331,6 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer->flags |= WINED3D_BUFFER_CREATEBO; } - if (data) - { - if (FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) - { - ERR("Failed to upload data, hr %#x.\n", hr); - buffer_unload(&buffer->resource); - resource_cleanup(&buffer->resource); - return hr; - } - } - if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)))) { ERR("Out of memory.\n"); @@ -1351,6 +1340,15 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } buffer->maps_size = 1; + if (data && FAILED(hr = wined3d_buffer_upload_data(buffer, NULL, data->data))) + { + ERR("Failed to upload data, hr %#x.\n", hr); + buffer_unload(&buffer->resource); + resource_cleanup(&buffer->resource); + HeapFree(GetProcessHeap(), 0, buffer->maps); + return hr; + } + return WINED3D_OK; }

1 0

Józef Kucia : wined3d: Simplify buffer_is_fully_dirty ().
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: d39560f33f5074f2baec355f0b19b036d0da1412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39560f33f5074f2baec355f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:53 2016 +0200 wined3d: Simplify buffer_is_fully_dirty(). The buffer_invalidate_bo_range() ensures that if the whole buffer was invalidated the dirty areas array contains exactly one element. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5ddf67d..c82bfdb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -89,14 +89,8 @@ static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { - unsigned int i; - - for (i = 0; i < buffer->modified_areas; ++i) - { - if (!buffer->maps[i].offset && buffer->maps[i].size == buffer->resource.size) - return TRUE; - } - return FALSE; + return buffer->modified_areas == 1 + && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } /* Context activation is done by the caller. */ @@ -1348,10 +1342,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } } - buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); - if (!buffer->maps) + if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)))) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); return E_OUTOFMEMORY;

1 0

Józef Kucia : wined3d: Add more integer formats to " typed_formats" table.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: eb75b09b56d318fb0f8e2af27fc6b065fb122f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb75b09b56d318fb0f8e2af27… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:52 2016 +0200 wined3d: Add more integer formats to "typed_formats" table. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d4b09f4..abe52dd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -207,12 +207,15 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32G32B32A32_SINT, WINED3DFMT_R32G32B32A32_TYPELESS, "IIII"}, {WINED3DFMT_R32G32B32A32_FLOAT, WINED3DFMT_R32G32B32A32_TYPELESS, "FFFF"}, {WINED3DFMT_R32G32B32_UINT, WINED3DFMT_R32G32B32_TYPELESS, "UUU"}, + {WINED3DFMT_R32G32B32_SINT, WINED3DFMT_R32G32B32_TYPELESS, "III"}, {WINED3DFMT_R32G32B32_FLOAT, WINED3DFMT_R32G32B32_TYPELESS, "FFF"}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16B16A16_SNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "iiii"}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3DFMT_R16G16B16A16_TYPELESS, "UUUU"}, {WINED3DFMT_R16G16B16A16_SINT, WINED3DFMT_R16G16B16A16_TYPELESS, "IIII"}, {WINED3DFMT_R16G16B16A16_FLOAT, WINED3DFMT_R16G16B16A16_TYPELESS, "FFFF"}, {WINED3DFMT_R32G32_UINT, WINED3DFMT_R32G32_TYPELESS, "UU"}, + {WINED3DFMT_R32G32_SINT, WINED3DFMT_R32G32_TYPELESS, "II"}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_R32G32_TYPELESS, "FF"}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, @@ -223,15 +226,18 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16_UNORM, WINED3DFMT_R16G16_TYPELESS, "uu"}, {WINED3DFMT_R16G16_SNORM, WINED3DFMT_R16G16_TYPELESS, "ii"}, + {WINED3DFMT_R16G16_UINT, WINED3DFMT_R16G16_TYPELESS, "UU"}, {WINED3DFMT_R16G16_SINT, WINED3DFMT_R16G16_TYPELESS, "II"}, {WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16_TYPELESS, "FF"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, + {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, + {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""},

1 0

Józef Kucia : wined3d: Remove redundant entries from "formats" table.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 808221ac2505889c7f57bfa6a7a4a62dae72a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808221ac2505889c7f57bfa6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:51 2016 +0200 wined3d: Remove redundant entries from "formats" table. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4145bf5..d4b09f4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -98,8 +98,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, /* Hmm? */ {WINED3DFMT_R8G8_SNORM_Cx, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, - {WINED3DFMT_R16G16_SINT, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, - {WINED3DFMT_R16G16B16A16_SINT, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R11G11B10_FLOAT, 11, 11, 10, 0, 0, 11, 22, 0, 4, 0, 0}, /* Palettized formats */ {WINED3DFMT_P8_UINT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0},

1 0

Jacek Caban : mshtml: Fixed OnStopBinding if it' s called called after we aborted document binding.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: b0c759a3b91e2c7b5934b18f0faaecdcc6254bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c759a3b91e2c7b5934b18f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 13:43:32 2016 +0200 mshtml: Fixed OnStopBinding if it's called called after we aborted document binding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4b86c40..aa652dd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1397,10 +1397,10 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(result != E_ABORT) { + if(result != E_ABORT && This->is_doc_channel && This->bsc.window) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel && This->nschannel) { + else if(This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK;

1 0

Austin English : bthprops.cpl: Add BluetoothFindFirstDevice stub.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: 08809557331106b15a8b25097a611b8afaa68add URL: http://source.winehq.org/git/wine.git/?a=commit;h=08809557331106b15a8b25097… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 19 23:07:52 2016 -0500 bthprops.cpl: Add BluetoothFindFirstDevice stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 11 +++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 3842a36..ed80b0e 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -14,7 +14,7 @@ @ stub BluetoothFindDeviceClose @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index b261328..02ee371 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -32,6 +32,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(bthpropscpl); /********************************************************************* + * BluetoothFindFirstDevice + */ +HBLUETOOTH_DEVICE_FIND WINAPI BluetoothFindFirstDevice(BLUETOOTH_DEVICE_SEARCH_PARAMS *params, + BLUETOOTH_DEVICE_INFO *info) +{ + FIXME("(%p %p): stub!\n", params, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/********************************************************************* * BluetoothFindFirstRadio */ HBLUETOOTH_RADIO_FIND WINAPI BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS *params, HANDLE *radio) diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index 083ccf4..d628315 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -11,7 +11,7 @@ @ stub BluetoothFindDeviceClose @ stub BluetoothFindFirstBrowseGroup @ stub BluetoothFindFirstClassId -@ stub BluetoothFindFirstDevice +@ stdcall BluetoothFindFirstDevice(ptr ptr) bthprops.cpl.BluetoothFindFirstDevice @ stub BluetoothFindFirstProfileDescriptor @ stub BluetoothFindFirstProtocolDescriptorStack @ stub BluetoothFindFirstProtocolEntry

1 0

Alistair Leslie-Hughes : inetcomm: Ignore OID_TRANSMIT_BODY_ENCODING value in IMimeBody SetOption.
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: cec1281cd7351a9af4ae8147dd03f37f35d6c124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec1281cd7351a9af4ae8147d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:13:56 2016 +0000 inetcomm: Ignore OID_TRANSMIT_BODY_ENCODING value in IMimeBody SetOption. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0288b59..71dc712 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -924,6 +924,10 @@ static HRESULT WINAPI MimeBody_SetOption( FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->u.ulVal); hr = S_OK; break; + case OID_TRANSMIT_BODY_ENCODING: + FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->u.ulVal); + hr = S_OK; + break; default: FIXME("Unhandled oid %08x\n", oid); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
55
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 2016