October 2013 - Wine-Commits

Michael Stefaniuc : iphlpapi/tests: Use the W form of CreateEvent().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: c6946ff653f54b54ddd05f70cc2dbfe3dc090aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6946ff653f54b54ddd05f70c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:17:55 2013 +0200 iphlpapi/tests: Use the W form of CreateEvent(). --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 032ac06..0d99e3c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1062,7 +1062,7 @@ static void testNotifyAddrChange(void) handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); @@ -1077,7 +1077,7 @@ static void testNotifyAddrChange(void) { handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); trace("Testing asynchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); ret = pNotifyAddrChange(&handle, &overlapped);

1 0

Ken Thomases : winemac: Remove a too-early attempt to set the process' s Dock icon.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 7c55e912da3a488c8681678241d68d7033d85f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c55e912da3a488c868167824… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 30 22:18:30 2013 -0500 winemac: Remove a too-early attempt to set the process's Dock icon. --- dlls/winemac.drv/cocoa_app.m | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e6e5c2e..4b5d1ff 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -878,7 +878,6 @@ int macdrv_err_on; } self.applicationIcon = nsimage; - [NSApp setApplicationIconImage:nsimage]; } - (void) handleCommandTab

1 0

Frédéric Delanoy : oleaut32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: dba4e004edfcdc783c943593474cb4144f7c3f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba4e004edfcdc783c9435934… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 2 07:28:35 2013 +0200 oleaut32/tests: Use BOOL type where appropriate. --- dlls/oleaut32/tests/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7f92051..4068f4a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1258,7 +1258,7 @@ static void test_inheritance(void) CHAR pathA[MAX_PATH]; static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; - BOOL use_midl_tlb = 0; + BOOL use_midl_tlb = FALSE; GetModuleFileNameA(NULL, pathA, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH);

1 0

Frédéric Delanoy : taskkill: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 39a9604e25dadff87d3e1df1d7581e1028aea13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a9604e25dadff87d3e1df1d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:54 2013 +0200 taskkill: Use BOOL type where appropriate. --- programs/taskkill/taskkill.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 53b56ff..18edec3 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskkill); -static int force_termination; +static BOOL force_termination = FALSE; static WCHAR **task_list; static unsigned int task_count; @@ -456,7 +456,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc > 1) { int i; - BOOL has_im = 0, has_pid = 0; + BOOL has_im = FALSE, has_pid = FALSE; /* Only the lone help option is recognized. */ if (argc == 2 && !strcmpW(slashHelp, argv[1])) @@ -472,7 +472,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (!strcmpiW(slashTerminateChildren, argv[i])) WINE_FIXME("/T not supported\n"); if (!strcmpiW(slashForceTerminate, argv[i])) - force_termination = 1; + force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ else if ((got_im = !strcmpiW(slashImage, argv[i])) || @@ -485,8 +485,8 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) return FALSE; } - if (got_im) has_im = 1; - if (got_pid) has_pid = 1; + if (got_im) has_im = TRUE; + if (got_pid) has_pid = TRUE; if (has_im && has_pid) {

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 48a6375dfc545aa5cb5c418441e5113a12369eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a6375dfc545aa5cb5c41844… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:28 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5767e8b..0d40664 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -494,12 +494,13 @@ enum bwritervs_rastout_offsets #define BWRITERSP_WRITEMASK_3 0x8 /* .w a */ #define BWRITERSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { +enum bwritershader_param_dstmod_type +{ BWRITERSPDM_NONE = 0, BWRITERSPDM_SATURATE = 1, BWRITERSPDM_PARTIALPRECISION = 2, BWRITERSPDM_MSAMPCENTROID = 4, -} BWRITERSHADER_PARAM_DSTMOD_TYPE; +}; typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { BWRITERSTT_UNKNOWN = 0,

1 0

Michael Stefaniuc : msvcr90/tests: Use the W form of CreateEvent().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: d37c7ecacfbe45e98ff9c33a8af0dbf76746777b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37c7ecacfbe45e98ff9c33a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:20:56 2013 +0200 msvcr90/tests: Use the W form of CreateEvent(). --- dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2a3124d..a1b0f5f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1175,10 +1175,10 @@ static void test_nonblocking_file_access(void) arg.read = filer; arg.write = filew; - arg.init = CreateEvent(NULL, FALSE, FALSE, NULL); - arg.finish = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(arg.init != NULL, "CreateEvent failed\n"); - ok(arg.finish != NULL, "CreateEvent failed\n"); + arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(arg.init != NULL, "CreateEventW failed\n"); + ok(arg.finish != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(arg.init, INFINITE);

1 0

Michael Stefaniuc : tests: Use the explicit LoadLibraryA function.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 9463dba8307f7a9937bcd4f11c05164a58945300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463dba8307f7a9937bcd4f11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:09:53 2013 +0200 tests: Use the explicit LoadLibraryA function. --- dlls/advpack/tests/files.c | 2 +- dlls/apphelp/tests/apphelp.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/ddrawex/tests/ddrawex.c | 2 +- dlls/ddrawex/tests/surface.c | 2 +- dlls/dsound/tests/capture.c | 2 +- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 2 +- dlls/dsound/tests/duplex.c | 2 +- dlls/dsound/tests/propset.c | 2 +- dlls/kernel32/tests/loader.c | 14 +++++++------- dlls/msvcrt/tests/time.c | 2 +- dlls/netapi32/tests/ds.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 2 +- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched32/tests/editor.c | 2 +- dlls/shlwapi/tests/istream.c | 2 +- dlls/sti/tests/sti.c | 2 +- dlls/user32/tests/input.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/winspool.drv/tests/info.c | 4 ++-- 24 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9463dba8307f7a9937bcd…

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: ff7fc1fd45e2a05f9ac3203c246f240888da3706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7fc1fd45e2a05f9ac3203c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:53 2013 +0200 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/mouse.c | 6 ++++-- dlls/winex11.drv/window.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 168914f..b33827b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -623,7 +623,8 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA { XcursorImage *image, *ret = NULL; DWORD delay_jiffies, num_steps; - int x, y, i, has_alpha = FALSE; + int x, y, i; + BOOL has_alpha = FALSE; XcursorPixel *ptr; image = pXcursorImageCreate( width, height ); @@ -1137,7 +1138,8 @@ static Cursor create_xlib_color_cursor( HDC hdc, const ICONINFOEXW *icon, int wi struct gdi_image_bits bits; unsigned int *color_bits = NULL, *ptr; unsigned char *mask_bits = NULL, *xor_bits = NULL; - int i, x, y, has_alpha = 0; + int i, x, y; + BOOL has_alpha = FALSE; int rfg, gfg, bfg, rbg, gbg, bbg, fgBits, bgBits; unsigned int width_bytes = (width + 31) / 32 * 4; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 741a303..d9265e3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -472,7 +472,8 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns BITMAP bm; unsigned int *ptr, *bits = NULL; unsigned char *mask_bits = NULL; - int i, j, has_alpha = 0; + int i, j; + BOOL has_alpha = FALSE; if (!GetObjectW( color, sizeof(bm), &bm )) return NULL; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

Henri Verbeet : wined3d: Send vertex buffer binding updates through the command stream.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 57ec706ddea980faff67944d922b9622ca76948c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ec706ddea980faff67944d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:26 2013 +0200 wined3d: Send vertex buffer binding updates through the command stream. --- dlls/wined3d/cs.c | 46 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 21 +---------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e427f4..cdb49ce 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -33,6 +33,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_RENDER_TARGET, WINED3D_CS_OP_SET_DEPTH_STENCIL, WINED3D_CS_OP_SET_VERTEX_DECLARATION, + WINED3D_CS_OP_SET_STREAM_SOURCE, }; struct wined3d_cs_present @@ -98,6 +99,15 @@ struct wined3d_cs_set_vertex_declaration struct wined3d_vertex_declaration *declaration; }; +struct wined3d_cs_set_stream_source +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + struct wined3d_buffer *buffer; + UINT offset; + UINT stride; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -310,6 +320,41 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 cs->ops->submit(cs); } +static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_source *op = data; + struct wined3d_stream_state *stream; + struct wined3d_buffer *prev; + + stream = &cs->state.streams[op->stream_idx]; + prev = stream->buffer; + stream->buffer = op->buffer; + stream->offset = op->offset; + stream->stride = op->stride; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_STREAMSRC); +} + +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) +{ + struct wined3d_cs_set_stream_source *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; + op->stream_idx = stream_idx; + op->buffer = buffer; + op->offset = offset; + op->stride = stride; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -320,6 +365,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, + /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d581479..6b6234b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1239,29 +1239,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; } - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return WINED3D_OK; - } - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); - } + if (!device->recording) + wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); - } - - device_invalidate_state(device, STATE_STREAMSRC); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 648780f..719aa87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2490,6 +2490,8 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d9: Don' t mask out internal wined3d usage flags in surface_init().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: f31d2485beadc49f5e83770c69d9619bec05fd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31d2485beadc49f5e83770c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:25 2013 +0200 d3d9: Don't mask out internal wined3d usage flags in surface_init(). --- dlls/d3d9/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a031c6e..99f0b0f 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -424,7 +424,7 @@ HRESULT surface_init(struct d3d9_surface *surface, struct d3d9_device *device, U wined3d_mutex_lock(); hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, + usage, (enum wined3d_pool)pool, multisample_type, multisample_quality, flags, surface, &d3d9_surface_wined3d_parent_ops, &surface->wined3d_surface); wined3d_mutex_unlock(); if (FAILED(hr))

1 0