April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add support for depth blits to the blitter.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: a96f749ce03380838f56b3650b1ef79a90f8a947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96f749ce03380838f56b3650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:49 2011 +0200 wined3d: Add support for depth blits to the blitter. --- dlls/wined3d/surface.c | 189 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 177 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a96f749ce03380838f56b…

1 0

Henri Verbeet : d3d9/tests: Add a depth blit test.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 86d090ee8e7456522a8244136bdfedd4f15c835e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d090ee8e7456522a8244136… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:50 2011 +0200 d3d9/tests: Add a depth blit test. --- dlls/d3d9/tests/visual.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2a31c5c..baf8243 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10927,6 +10927,133 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +static void depth_blit_test(IDirect3DDevice9 *device) +{ + static const struct vertex quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const struct vertex quad2[] = + { + { -1.0, 1.0, 0.66f, 0xff0000ff}, + { 1.0, 1.0, 0.66f, 0xff0000ff}, + { -1.0, -1.0, 0.66f, 0xff0000ff}, + { 1.0, -1.0, 0.66f, 0xff0000ff}, + }; + static const DWORD expected_colors[4][4] = + { + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x000000ff, 0x000000ff, 0x0000ff00, 0x00ff0000}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x00ff0000}, + {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + }; + + IDirect3DSurface9 *backbuffer, *ds1, *ds2; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds1); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, 0, 0, FALSE, &ds2, NULL); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds2); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 480, 360); + hr = IDirect3DDevice9_Clear(device, 1, (D3DRECT *)&dst_rect, D3DCLEAR_ZBUFFER, 0, 0.5f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirect3DDevice9_Clear(device, 1, (D3DRECT *)&dst_rect, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Flipped. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirect3DDevice9_StretchRect(device, ds2, &src_rect, ds1, &dst_rect, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + /* Filtered blit. */ + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_LINEAR); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + /* Depth -> color blit.*/ + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, backbuffer, NULL, D3DTEXF_POINT); + ok(hr == D3DERR_INVALIDCALL, "StretchRect returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + IDirect3DSurface9_Release(backbuffer); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds1); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds2); + IDirect3DSurface9_Release(ds1); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(*quad1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected_colors[i][j], 0), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void intz_test(IDirect3DDevice9 *device) { static const DWORD ps_code[] = @@ -12027,6 +12154,7 @@ START_TEST(visual) dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); + depth_blit_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr);

1 0

Alexandre Julliard : server: Don' t queue a hardware WM_MOUSEMOVE if the position hasn't changed.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 3909f51122ffc0f6150fa9758ba47c70dcf6b00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3909f51122ffc0f6150fa9758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 21:07:04 2011 +0200 server: Don't queue a hardware WM_MOUSEMOVE if the position hasn't changed. --- server/queue.c | 36 ++++++++++++++++++++++-------------- server/user.h | 1 + 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/server/queue.c b/server/queue.c index c4657e6..b9b42e4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -203,7 +203,7 @@ static const struct object_ops thread_input_ops = /* pointer to input structure of foreground thread */ static unsigned int last_input_time; -static void queue_hardware_message( struct desktop *desktop, struct message *msg ); +static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ); static void free_message( struct message *msg ); /* set the caret window in a given thread input */ @@ -343,7 +343,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) msg->data_size = sizeof(*msg_data); msg_data->x = x; msg_data->y = y; - queue_hardware_message( desktop, msg ); + queue_hardware_message( desktop, msg, 1 ); } /* set the cursor clip rectangle */ @@ -464,9 +464,10 @@ static inline unsigned int get_unique_id(void) static int merge_message( struct thread_input *input, const struct message *msg ) { struct message *prev; - struct list *ptr = list_tail( &input->msg_list ); + struct list *ptr; - if (!ptr) return 0; + if (msg->msg != WM_MOUSEMOVE) return 0; + if (!(ptr = list_tail( &input->msg_list ))) return 0; prev = LIST_ENTRY( ptr, struct message, entry ); if (prev->result) return 0; if (prev->win && msg->win && prev->win != msg->win) return 0; @@ -525,7 +526,7 @@ static void store_message_result( struct message_result *res, lparam_t result, u if (!error && result) /* rejected by the hook */ free_message( res->hardware_msg ); else - queue_hardware_message( res->desktop, res->hardware_msg ); + queue_hardware_message( res->desktop, res->hardware_msg, 0 ); res->hardware_msg = NULL; } @@ -1274,7 +1275,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (owner->queue->input != input) { list_remove( &msg->entry ); - if (msg->msg == WM_MOUSEMOVE && merge_message( owner->queue->input, msg )) + if (merge_message( owner->queue->input, msg )) { free_message( msg ); release_object( owner ); @@ -1323,7 +1324,7 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru } /* queue a hardware message into a given thread input */ -static void queue_hardware_message( struct desktop *desktop, struct message *msg ) +static void queue_hardware_message( struct desktop *desktop, struct message *msg, int always_queue ) { user_handle_t win; struct thread *thread; @@ -1333,6 +1334,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg update_input_key_state( desktop, desktop->keystate, msg ); last_input_time = get_tick_count(); + if (msg->msg != WM_MOUSEMOVE) always_queue = 1; if (is_keyboard_msg( msg )) { @@ -1344,8 +1346,11 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { if (msg->msg == WM_MOUSEMOVE) { - desktop->cursor.x = min(max(data->x, desktop->cursor.clip.left), desktop->cursor.clip.right-1); - desktop->cursor.y = min(max(data->y, desktop->cursor.clip.top), desktop->cursor.clip.bottom-1); + int x = min( max( data->x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); + int y = min( max( data->y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + if (desktop->cursor.x != x || desktop->cursor.y != y) always_queue = 1; + desktop->cursor.x = x; + desktop->cursor.y = y; desktop->cursor.last_change = get_tick_count(); } if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; @@ -1375,7 +1380,10 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } input = thread->queue->input; - if (msg->msg == WM_MOUSEMOVE && merge_message( input, msg )) free_message( msg ); + if (win != desktop->cursor.win) always_queue = 1; + desktop->cursor.win = win; + + if (!always_queue || merge_message( input, msg )) free_message( msg ); else { msg->unique_id = 0; /* will be set once we return it to the app */ @@ -1514,10 +1522,10 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (!(flags & ((1 << sizeof(messages)/sizeof(messages[0])) - 1))) { if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) - queue_hardware_message( desktop, msg ); + queue_hardware_message( desktop, msg, 0 ); } else if (!send_hook_ll_message( desktop, msg, input, NULL )) - queue_hardware_message( desktop, msg ); + queue_hardware_message( desktop, msg, 0 ); } return wait; } @@ -1628,7 +1636,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) - queue_hardware_message( desktop, msg ); + queue_hardware_message( desktop, msg, 1 ); return wait; } @@ -1658,7 +1666,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg->data = msg_data; msg->data_size = sizeof(*msg_data); - queue_hardware_message( desktop, msg ); + queue_hardware_message( desktop, msg, 1 ); } /* check message filter for a hardware message */ diff --git a/server/user.h b/server/user.h index 9b86031..9df2453 100644 --- a/server/user.h +++ b/server/user.h @@ -58,6 +58,7 @@ struct global_cursor rectangle_t clip; /* cursor clip rectangle */ unsigned int clip_msg; /* message to post for cursor clip changes */ unsigned int last_change; /* time of last position change */ + user_handle_t win; /* window that contains the cursor */ }; struct desktop

1 0

Jacek Caban : wininet: Check NETCON_connected in netconn_end_of_data.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 9e30a2f5eefd22a8157ae4c107f030c2de61cb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e30a2f5eefd22a8157ae4c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 18:37:55 2011 +0200 wininet: Check NETCON_connected in netconn_end_of_data. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e775bc0..b2b7bd9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2138,7 +2138,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - return netconn_stream->content_read == netconn_stream->content_length; + return netconn_stream->content_read == netconn_stream->content_length || !NETCON_connected(&req->netConnection); } static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size,

1 0

Alexandre Julliard : server: Warp the mouse inside the clipping rectangle when it's set.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 34b8c639ceed76c894599a5b28cc457f88469c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b8c639ceed76c894599a5b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 20:36:36 2011 +0200 server: Warp the mouse inside the clipping rectangle when it's set. --- server/queue.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/server/queue.c b/server/queue.c index 0be102d..c4657e6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -350,12 +350,18 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) { rectangle_t top_rect, new_rect; + int x, y; get_top_window_rectangle( desktop, &top_rect ); if (!rect || !intersect_rect( &new_rect, &top_rect, rect )) new_rect = top_rect; if (!memcmp( &desktop->cursor.clip, &new_rect, sizeof(new_rect) )) return; desktop->cursor.clip = new_rect; if (desktop->cursor.clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, 0, 0 ); + + /* warp the mouse to be inside the clip rect */ + x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); + y = min( max( desktop->cursor.y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); } /* change the foreground input and reset the cursor clip rect */

1 0

Alexandre Julliard : server: Queue a WM_MOUSEMOVE message when the cursor position is explicitly changed .
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 39bac0518875e2fca784abaca5baeda3b89899c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bac0518875e2fca784abaca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 20:29:38 2011 +0200 server: Queue a WM_MOUSEMOVE message when the cursor position is explicitly changed. --- server/queue.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index bda45bb..0be102d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -318,6 +318,34 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } +/* set the cursor position and queue the corresponding mouse message */ +static void set_cursor_pos( struct desktop *desktop, int x, int y ) +{ + struct hardware_msg_data *msg_data; + struct message *msg; + + if (!(msg = mem_alloc( sizeof(*msg) ))) return; + if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) + { + free( msg ); + return; + } + memset( msg_data, 0, sizeof(*msg_data) ); + + msg->type = MSG_HARDWARE; + msg->win = 0; + msg->msg = WM_MOUSEMOVE; + msg->wparam = 0; + msg->lparam = 0; + msg->time = get_tick_count(); + msg->result = NULL; + msg->data = msg_data; + msg->data_size = sizeof(*msg_data); + msg_data->x = x; + msg_data->y = y; + queue_hardware_message( desktop, msg ); +} + /* set the cursor clip rectangle */ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) { @@ -1288,14 +1316,6 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -/* set the cursor position, clipping to the cursor clip rect */ -static void set_cursor_pos( struct desktop *desktop, int x, int y ) -{ - desktop->cursor.x = min( max( x, desktop->cursor.clip.left ), desktop->cursor.clip.right - 1 ); - desktop->cursor.y = min( max( y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom - 1 ); - desktop->cursor.last_change = get_tick_count(); -} - /* queue a hardware message into a given thread input */ static void queue_hardware_message( struct desktop *desktop, struct message *msg ) { @@ -1316,7 +1336,12 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } else { - if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y ); + if (msg->msg == WM_MOUSEMOVE) + { + desktop->cursor.x = min(max(data->x, desktop->cursor.clip.left), desktop->cursor.clip.right-1); + desktop->cursor.y = min(max(data->y, desktop->cursor.clip.top), desktop->cursor.clip.bottom-1); + desktop->cursor.last_change = get_tick_count(); + } if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON;

1 0

Huw Davies : include: Add some more internet options.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 5bcb266ee7310b6ca6da207b136564e0b9fe7009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcb266ee7310b6ca6da207b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 20 13:23:52 2011 +0000 include: Add some more internet options. (cherry picked from commit 55f6f9ada43acef87b4ee10096997ac73e4e8e23) --- include/wininet.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index a0ec408..be7c6e0 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -591,9 +591,13 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); #define INTERNET_OPTION_CODEPAGE_PATH 100 #define INTERNET_OPTION_CODEPAGE_EXTRA 101 #define INTERNET_OPTION_IDN 102 +#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103 +#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104 +#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105 + #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK -#define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT +#define INTERNET_LAST_OPTION INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT #define INTERNET_PRIORITY_FOREGROUND 1000 #define INTERNET_HANDLE_TYPE_INTERNET 1

1 0

Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 12a6603136230223e2386aae033fe1e54c9f33e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a6603136230223e2386aae0… Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. (cherry picked from commit ddada6753836faac170b9613b1d237d937b41ed6) --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fec5cd9..73d3b69 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -343,8 +343,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);

1 0

Wolfram Sang : comdlg32: Filedlg should not add extension if it contains a glob.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 3b53dce920f16816ec6408a8c048ca629fedfa1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b53dce920f16816ec6408a8c… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Jan 29 09:15:34 2011 +0100 comdlg32: Filedlg should not add extension if it contains a glob. (cherry picked from commit 5cb4c55335c5e1192a6ac3b6f97db87f6344c7cd) --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6778f17..30dba64 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2273,8 +2273,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else if ( fodInfos->defext ) /* attach the default file extension*/ filterExt = fodInfos->defext; - /* If extension is .*, ignore it */ - if (filterExt[0] != '*') + /* If extension contains a glob, ignore it */ + if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot);

1 0

Andrew Eikum : include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: stable Commit: 92258b69a657b719db2df8c6d85a1e99b6b6a253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92258b69a657b719db2df8c6d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 15 15:06:47 2011 -0500 include: Add defines for KSDATAFORMAT_SUBTYPE_ALAW and _MULAW. (cherry picked from commit b14e4e584102df82e52af19bb2fc16f43db3fe1c) --- include/ksmedia.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index da69b31..4027596 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -25,6 +25,8 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); #define KSAUDIO_SPEAKER_DIRECTOUT 0 #define KSAUDIO_SPEAKER_MONO SPEAKER_FRONT_CENTER

1 0