October 2013 - Wine-commits

Frédéric Delanoy : d3dxof: Use BOOL type where appropriate.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: eea901782c45b792206e371093743cf80f63a640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea901782c45b792206e37109… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 23:32:16 2013 +0200 d3dxof: Use BOOL type where appropriate. --- dlls/d3dxof/parsing.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index fa992ce..f7f67c5 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -510,11 +510,11 @@ static BOOL is_name(parse_buffer* buf) char tmp[512]; DWORD pos = 0; char c; - BOOL error = 0; + BOOL error = FALSE; while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos))) { if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-'))) - error = 1; + error = TRUE; if (pos < sizeof(tmp)) tmp[pos] = c; pos++; @@ -602,7 +602,7 @@ static BOOL is_string(parse_buffer* buf) char tmp[512]; DWORD pos = 0; char c; - BOOL ok = 0; + BOOL ok = FALSE; if (*buf->buffer != '"') return FALSE; @@ -612,7 +612,7 @@ static BOOL is_string(parse_buffer* buf) c = *(buf->buffer+pos+1); if (c == '"') { - ok = 1; + ok = TRUE; break; } if (pos < sizeof(tmp))

1 0

Frédéric Delanoy : iphlpapi: Use BOOL type where appropriate.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 1ca0c4a6177c46cbbbc85be7ff27a8be538c0eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca0c4a6177c46cbbbc85be7f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 23:32:15 2013 +0200 iphlpapi: Use BOOL type where appropriate. --- dlls/iphlpapi/ifenum.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 03c1b1a..2dec193 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -109,9 +109,9 @@ /* Functions */ -static int isLoopbackInterface(int fd, const char *name) +static BOOL isLoopbackInterface(int fd, const char *name) { - int ret = 0; + BOOL ret = FALSE; if (name) { struct ifreq ifr; @@ -120,7 +120,7 @@ static int isLoopbackInterface(int fd, const char *name) if (ioctl(fd, SIOCGIFFLAGS, &ifr) == 0) ret = ifr.ifr_flags & IFF_LOOPBACK; } - return ret; + return !!ret; } /* The comments say MAX_ADAPTER_NAME is required, but really only IF_NAMESIZE @@ -275,7 +275,8 @@ static void free_netlink_reply( struct netlink_reply *data ) static int recv_netlink_reply( int fd, int pid, int seq, struct netlink_reply **data ) { int bufsize = getpagesize(); - int left, read, done = 0; + int left, read; + BOOL done = FALSE; socklen_t sa_len; struct sockaddr_nl addr; struct netlink_reply *cur, *last = NULL; @@ -297,7 +298,7 @@ static int recv_netlink_reply( int fd, int pid, int seq, struct netlink_reply ** if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; if (hdr->nlmsg_type == NLMSG_DONE) { - done = 1; + done = TRUE; break; } }

1 0

Frédéric Delanoy : windowscodecs: Use BOOL type where appropriate.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: cdf809a6c09709f579d886ac27b8c77a5791a17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf809a6c09709f579d886ac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 5 08:53:53 2013 +0200 windowscodecs: Use BOOL type where appropriate. --- dlls/windowscodecs/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 7c87c5d..5f42994 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1771,7 +1771,7 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) WCHAR guidstring[39]; LONG res; const struct category *category; - int found=0; + BOOL found = FALSE; HRESULT hr; res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, KEY_READ, &clsidkey); @@ -1792,7 +1792,7 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) if (res == ERROR_SUCCESS) { RegCloseKey(classkey); - found = 1; + found = TRUE; } RegCloseKey(instancekey); }

1 0

Frédéric Delanoy : windowscodecs/tests: Use BOOL type where appropriate.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 919e8236ee0fd7ff04c6d98bb39554f8b4681d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919e8236ee0fd7ff04c6d98bb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 5 08:53:54 2013 +0200 windowscodecs/tests: Use BOOL type where appropriate. --- dlls/windowscodecs/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index d9159b1..da8d6b8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -63,7 +63,7 @@ static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) return hr; } -static int is_pixelformat(GUID *format) +static BOOL is_pixelformat(GUID *format) { IWICComponentInfo *info; HRESULT hr;

1 0

Francois Gouget : server: Include either sys/user.h or asm/user.h.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: d3cc10724e4c9b3483f1aa2cddae208b720d4875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cc10724e4c9b3483f1aa2cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:24 2013 +0200 server: Include either sys/user.h or asm/user.h. This avoids redefinitions with old Linux kernel headers. --- server/ptrace.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 9897a08..aea821d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -533,8 +533,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, #ifdef HAVE_SYS_USER_H #include <sys/user.h> -#endif -#ifdef HAVE_ASM_USER_H +#elif defined(HAVE_ASM_USER_H) #include <asm/user.h> #endif

1 0

Marcus Meissner : msi: Fixed a memory leak in an error case (Coverity).
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 52c9b9f2b3b67613d2627cae1f2e2d13a21b6daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c9b9f2b3b67613d2627cae1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 5 12:59:14 2013 +0200 msi: Fixed a memory leak in an error case (Coverity). --- dlls/msi/package.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1c1dd94..73f342c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1077,6 +1077,7 @@ static UINT msi_load_summary_properties( MSIPACKAGE *package ) if (rc != ERROR_SUCCESS) { WARN("Unable to query rev number: %d\n", rc); + msi_free( package_code ); goto done; }

1 0

Francois Gouget : user32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 39f8c2201ca64ca7756c2d55e14bd220e640451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f8c2201ca64ca7756c2d55e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:29 2013 +0200 user32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/user32/tests/winstation.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7155b33..1804345 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -483,9 +483,9 @@ static void test_inputdesktop(void) INPUT inputs[1]; inputs[0].type = INPUT_KEYBOARD; - inputs[0].ki.wVk = 0; - inputs[0].ki.wScan = 0x3c0; - inputs[0].ki.dwFlags = KEYEVENTF_UNICODE; + U(inputs[0]).ki.wVk = 0; + U(inputs[0]).ki.wScan = 0x3c0; + U(inputs[0]).ki.dwFlags = KEYEVENTF_UNICODE; /* OpenInputDesktop creates new handles for each calls */ old_input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);

1 0

Francois Gouget : kernel32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: dd71bc567bcb76c3dbe5997a34d1ff71edea97fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd71bc567bcb76c3dbe5997a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:33 2013 +0200 kernel32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/kernel32/tests/comm.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 7ec5fc5..c444e90 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2058,34 +2058,34 @@ static void test_read_write(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, 0, NULL, NULL); ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); for (i = -20; i < 20; i++) { - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, 0, &offset, NULL); if (i >= 0 || i == -1) { ok(status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, status); - ok(iob.Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, iob.Status); + ok(U(iob).Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, U(iob).Status); ok(iob.Information == 0, "%d: expected 0, got %lu\n", i, iob.Information); } else { ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status); + ok(U(iob).Status == -1, "%d: expected -1, got %#x\n", i, U(iob).Status); ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information); } } - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, sizeof(atz), &offset, NULL); @@ -2103,7 +2103,7 @@ todo_wine return; } ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); - ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == sizeof(atz), "expected sizeof(atz), got %lu\n", iob.Information); ret = SetCommMask(hcom, EV_RXCHAR); @@ -2144,16 +2144,16 @@ todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(U(iob).Status == -1, "expected -1, got %#x\n", U(iob).Status); ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); for (i = -20; i < 20; i++) { - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = (LONGLONG)i; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); @@ -2164,23 +2164,23 @@ todo_wine todo_wine ok(status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, status); todo_wine - ok(iob.Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, iob.Status); + ok(U(iob).Status == STATUS_SUCCESS, "%d: expected STATUS_SUCCESS, got %#x\n", i, U(iob).Status); ok(iob.Information == 0, "%d: expected 0, got %lu\n", i, iob.Information); } else { ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); - ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status); + ok(U(iob).Status == -1, "%d: expected -1, got %#x\n", i, U(iob).Status); ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information); } } - iob.Status = -1; + U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 1, &offset, NULL); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status); - ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == 1, "expected 1, got %lu\n", iob.Information); goto done; }

1 0

Francois Gouget : mshtml/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 89ee4dc6e6a69ddd3a032b9b091b00ccdf1d171c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ee4dc6e6a69ddd3a032b9b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:39 2013 +0200 mshtml/tests: Fix compilation on systems that don't support nameless unions. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f19f04d..70da9ae 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -616,7 +616,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed); - ok(!memcmp(bindinfo.stgmedData.hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); + ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); ok(bindinfo.dwOptions == 0x80000 ||

1 0

Henri Verbeet : wined3d: Send render state updates through the command stream.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 3f6d45bf14f46002061d20722a53b6f49e1b1076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6d45bf14f46002061d20722… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:04 2013 +0200 wined3d: Send render state updates through the command stream. --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7f54ac9..f295aa7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -41,6 +41,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_SHADER, WINED3D_CS_OP_SET_GEOMETRY_SHADER, WINED3D_CS_OP_SET_PIXEL_SHADER, + WINED3D_CS_OP_SET_RENDER_STATE, }; struct wined3d_cs_present @@ -143,6 +144,13 @@ struct wined3d_cs_set_shader struct wined3d_shader *shader; }; +struct wined3d_cs_set_render_state +{ + enum wined3d_cs_op opcode; + enum wined3d_render_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -571,6 +579,26 @@ void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shad cs->ops->submit(cs); } +static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_render_state *op = data; + + cs->state.render_states[op->state] = op->value; + device_invalidate_state(cs->device, STATE_RENDER(op->state)); +} + +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) +{ + struct wined3d_cs_set_render_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; + op->state = state; + op->value = value; + + 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, @@ -588,6 +616,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, + /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, }; 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 49f39d7..705ffb3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1940,7 +1940,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (value == old_value) TRACE("Application is setting the old value over, nothing to do.\n"); else - device_invalidate_state(device, STATE_RENDER(state)); + wined3d_cs_emit_set_render_state(device->cs, state, value); if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1112ef..328d864 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,6 +2491,8 @@ void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_s void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, + enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; 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;

1 0