October 2013 - Wine-Commits

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

Oct. 7, 2013

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 : mlang: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 2042a6598c264e6994f3c4824d5db665814a8a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2042a6598c264e6994f3c4824… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 23:32:14 2013 +0200 mlang: Use BOOL type where appropriate. --- dlls/mlang/mlang.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d28f811..96ccbf7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -574,8 +574,8 @@ static inline void sjis2jis(unsigned char *p1, unsigned char *p2) static int han2zen(unsigned char *p1, unsigned char *p2) { - int maru = FALSE; - int nigori = FALSE; + BOOL maru = FALSE; + BOOL nigori = FALSE; static const unsigned char char1[] = {129,129,129,129,129,131,131,131,131, 131,131,131,131,131,131,129,131,131,131,131,131,131,131,131,131,131, 131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131,131, @@ -622,7 +622,7 @@ static UINT ConvertJIS2SJIS(LPCSTR input, DWORD count, LPSTR output) DWORD i = 0; int j = 0; unsigned char p2,p; - int shifted = FALSE; + BOOL shifted = FALSE; while (i < count) { @@ -690,7 +690,7 @@ static UINT ConvertSJIS2JIS(LPCSTR input, DWORD count, LPSTR output) DWORD i = 0; int j = 0; unsigned char p2,p; - int shifted = FALSE; + BOOL shifted = FALSE; while (i < count) {

1 0

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

Oct. 7, 2013

Module: wine Branch: master Commit: da2a97fc0678029ed4a045703fbc787db2542d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2a97fc0678029ed4a045703… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 23:32:12 2013 +0200 inetcomm: Use BOOL type where appropriate. --- dlls/inetcomm/mimeole.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 38acd49..6a6cbd8 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -137,7 +137,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) char *buf = NULL; DWORD size = PARSER_BUF_SIZE, offset = 0, last_end = 0; HRESULT hr; - int done = 0; + BOOL done = FALSE; *ptr = NULL; @@ -165,7 +165,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) offset += read; buf[offset] = '\0'; - if(read == 0) done = 1; + if(read == 0) done = TRUE; while(!done && (end = strstr(buf + last_end, "\r\n"))) { @@ -176,7 +176,7 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) off.QuadPart = new_end; IStream_Seek(stm, off, STREAM_SEEK_SET, NULL); buf[new_end] = '\0'; - done = 1; + done = TRUE; } else last_end = new_end; @@ -271,14 +271,14 @@ static void unfold_header(char *header, int len) static char *unquote_string(const char *str) { - int quoted = 0; + BOOL quoted = FALSE; char *ret, *cp; while(*str == ' ' || *str == '\t') str++; if(*str == '"') { - quoted = 1; + quoted = TRUE; str++; } ret = strdupA(str); @@ -334,20 +334,19 @@ static void add_param(header_t *header, const char *p) static void split_params(header_t *header, char *value) { char *cp = value, *start = value; - int in_quote = 0; - int done_value = 0; + BOOL in_quotes = FALSE, done_value = FALSE; while(*cp) { - if(!in_quote && *cp == ';') + if(!in_quotes && *cp == ';') { *cp = '\0'; if(done_value) add_param(header, start); - done_value = 1; + done_value = TRUE; start = cp + 1; } else if(*cp == '"') - in_quote = !in_quote; + in_quotes = !in_quotes; cp++; } if(done_value) add_param(header, start);

1 0

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

Oct. 7, 2013

Module: wine Branch: master Commit: 2bbe7a330ca0a74af8393002557addb90fabdc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbe7a330ca0a74af83930025… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 23:32:11 2013 +0200 comdlg32/tests: Use BOOL type where appropriate. --- dlls/comdlg32/tests/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 9ae4e66..8e7dd27 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -28,7 +28,7 @@ /* ##### */ -static int resizesupported = TRUE; +static BOOL resizesupported = TRUE; static void toolbarcheck( HWND hDlg) {

1 0

Dmitry Timoshkov : ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: ae3c49d841abf25b1eb618484974477e95a2a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3c49d841abf25b1eb618484… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 14:39:27 2013 +0900 ntdll/tests: Add a test for file position after NtWriteFile in FILE_APPEND_DATA mode. --- dlls/ntdll/tests/file.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 73b4559..4740d42 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -857,6 +857,7 @@ static void append_file_test(void) IO_STATUS_BLOCK iosb; LARGE_INTEGER offset; char path[MAX_PATH], buffer[MAX_PATH], buf[16]; + DWORD ret; GetTempPathA( MAX_PATH, path ); GetTempFileNameA( path, "foo", 0, buffer ); @@ -866,10 +867,10 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 3, NULL, NULL); + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 2, NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); CloseHandle(handle); @@ -880,14 +881,33 @@ static void append_file_test(void) U(iosb).Status = -1; iosb.Information = -1; - offset.QuadPart = 0; - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); + offset.QuadPart = 1; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); todo_wine - ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 4, "expected 4, got %u\n", ret); + + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 3; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); +todo_wine + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); + + ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); +todo_wine + ok(ret == 6, "expected 6, got %u\n", ret); CloseHandle(handle);

1 0

Henri Verbeet : wined3d: Don' t update lowest_disabled_stage in wined3d_stateblock_apply().
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 242a79a9d7377e8534b7db6b9dbf373b8f5a5961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242a79a9d7377e8534b7db6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:05 2013 +0200 wined3d: Don't update lowest_disabled_stage in wined3d_stateblock_apply(). --- dlls/wined3d/stateblock.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24c4362..2a1cb12 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1133,16 +1133,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_clip_plane(device, i, &stateblock->state.clip_planes[i]); } - stateblock->device->state.lowest_disabled_stage = MAX_TEXTURES - 1; - for (i = 0; i < MAX_TEXTURES - 1; ++i) - { - if (stateblock->device->state.texture_states[i][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_DISABLE) - { - stateblock->device->state.lowest_disabled_stage = i; - break; - } - } - TRACE("Applied stateblock %p.\n", stateblock); }

1 0

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

Oct. 7, 2013

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

Marcus Meissner : msi: Fixed a memory leak in an error case (Coverity).
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

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

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

Oct. 7, 2013

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

Vincent Povirk : gdiplus: Properly set the gdi+ format to match the wic encoder's format.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: b14a4ca0064a675b7f0c86a22e7fc39238080fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14a4ca0064a675b7f0c86a22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 4 14:30:48 2013 -0500 gdiplus: Properly set the gdi+ format to match the wic encoder's format. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0f97fd7..2e9191e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4078,7 +4078,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { if (IsEqualGUID(&wicformat, pixel_formats[i].wic_format)) { - gdipformat = bitmap->format; + gdipformat = pixel_formats[i].gdip_format; break; } }

1 0