October 2013 - Wine-commits

Alexandre Julliard : ntdll: Add defines for the file position magic constants.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: ac519d0eeab3eeec3f95db8aaf62b82811ee2670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac519d0eeab3eeec3f95db8aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 9 16:13:41 2013 +0200 ntdll: Add defines for the file position magic constants. --- dlls/ntdll/file.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 94845fa..e747e8f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -95,6 +95,9 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + static const WCHAR ntfsW[] = {'N','T','F','S'}; /************************************************************************** @@ -614,7 +617,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { /* async I/O doesn't make sense on regular files */ while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1) @@ -816,7 +819,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else @@ -981,7 +984,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -989,15 +992,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (append_write) { - offset_eof.QuadPart = (LONGLONG)-1; /* FILE_WRITE_TO_END_OF_FILE */ + offset_eof.QuadPart = FILE_WRITE_TO_END_OF_FILE; offset = &offset_eof; } - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) { off_t off = offset->QuadPart; - if (offset->QuadPart == (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */) + if (offset->QuadPart == FILE_WRITE_TO_END_OF_FILE) { struct stat st; @@ -1037,7 +1040,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, else if (type == FD_TYPE_SERIAL) { if (async_write && - (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) + (!offset || (offset->QuadPart < 0 && offset->QuadPart != FILE_WRITE_TO_END_OF_FILE))) { status = STATUS_INVALID_PARAMETER; goto done; @@ -1200,7 +1203,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap while (length) { - if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pwrite( unix_handle, (char *)segments->Buffer + pos, page_size - pos, offset->QuadPart + total ); else

1 0

Nikolay Sivov : xmllite: Use buffer offset instead of pointers.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: ae341b9bd7bf0ff77a37ed894537d6316f949007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae341b9bd7bf0ff77a37ed894… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:37:08 2013 +0400 xmllite: Use buffer offset instead of pointers. --- dlls/xmllite/reader.c | 451 ++++++++++++++++++++++++------------------- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 249 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae341b9bd7bf0ff77a37e…

1 0

Nikolay Sivov : xmllite: Fix overwriting of dest buffer when pushing more data to it.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: feda40bbaab360edd09b1a36d75a52894b91bde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda40bbaab360edd09b1a36d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 9 15:38:02 2013 +0400 xmllite: Fix overwriting of dest buffer when pushing more data to it. --- dlls/xmllite/reader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ad6544b..ebea0b4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -703,7 +703,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -903,14 +903,14 @@ static HRESULT reader_more(xmlreader *reader) if (cp == ~0) { readerinput_grow(readerinput, len); - memcpy(dest->data, src->data + src->cur, len); + memcpy(dest->data + dest->written, src->data + src->cur, len); dest->written += len*sizeof(WCHAR); return hr; } dest_len = MultiByteToWideChar(cp, 0, src->data + src->cur, len, NULL, 0); readerinput_grow(readerinput, dest_len); - ptr = (WCHAR*)dest->data; + ptr = (WCHAR*)(dest->data + dest->written); MultiByteToWideChar(cp, 0, src->data + src->cur, len, ptr, dest_len); ptr[dest_len] = 0; dest->written += dest_len*sizeof(WCHAR); @@ -930,7 +930,7 @@ static inline WCHAR *reader_get_ptr(xmlreader *reader) encoded_buffer *buffer = &reader->input->buffer->utf16; WCHAR *ptr = (WCHAR*)buffer->data + buffer->cur; if (!*ptr) reader_more(reader); - return ptr; + return (WCHAR*)buffer->data + buffer->cur; } static int reader_cmp(xmlreader *reader, const WCHAR *str)

1 0

Akihiro Sagawa : gdi32/tests: Skip linked font like SimSun-ExtB in fixed-pitch font selection.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 0b58ab7ac9f1e6d94a198bdb9cf055ee9472bb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b58ab7ac9f1e6d94a198bdb9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 9 00:12:17 2013 +0900 gdi32/tests: Skip linked font like SimSun-ExtB in fixed-pitch font selection. --- dlls/gdi32/tests/font.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 2343db6..574ebaf 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4009,6 +4009,7 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, CHARSETINFO csi; LOGFONT lf = *lpelfe; HFONT hfont; + DWORD found_subset; /* skip bitmap, proportional or vertical font */ if ((FontType & TRUETYPE_FONTTYPE) == 0 || @@ -4021,6 +4022,25 @@ static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) return 1; + /* skip linked font, like SimSun-ExtB */ + switch (lpelfe->lfCharSet) { + case SHIFTJIS_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 17); /* Hiragana */ + break; + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 16); /* CJK Symbols And Punctuation */ + break; + case HANGEUL_CHARSET: + found_subset = lpntmex->ntmFontSig.fsUsb[1] & (1 << 24); /* Hangul Syllables */ + break; + default: + found_subset = lpntmex->ntmFontSig.fsUsb[0] & (1 << 0); /* Basic Latin */ + break; + } + if (!found_subset) + return 1; + /* test with an odd height */ lf.lfHeight = -19; lf.lfWidth = 0;

1 0

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

09 Oct '13

Module: wine Branch: master Commit: 5274f855e308b45d65b96f571d480746637245ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5274f855e308b45d65b96f571… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:12 2013 +0200 ws2_32/tests: Use BOOL type where appropriate. --- dlls/ws2_32/tests/sock.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 898ecef..9d209e1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1382,7 +1382,8 @@ static void test_ip_pktinfo(void) struct sockaddr_in s1addr, s2addr, s3addr; GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; LPFN_WSARECVMSG pWSARecvMsg = NULL; - unsigned int rc, foundhdr, yes = 1; + unsigned int rc, yes = 1; + BOOL foundhdr; DWORD dwBytes, dwSize, dwFlags; socklen_t addrlen; WSACMSGHDR *cmsg; @@ -3836,7 +3837,7 @@ static void test_ioctlsocket(void) closesocket(sock); } -static int drain_pause=0; +static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; @@ -4664,12 +4665,12 @@ static void test_events(int useMessages) * take some of it, and we will get a short write. This will trigger * another FD_WRITE event as soon as data is sent and more space becomes * available, but not any earlier. */ - drain_pause=1; + drain_pause = TRUE; do { ret = send(src, buffer, bufferSize, 0); } while (ret == bufferSize); - drain_pause=0; + drain_pause = FALSE; if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { Sleep(400); /* win9x */

1 0

Frédéric Delanoy : winemac.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 510e30bd63e05c5e36a00d8d397afaa6b64c90a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510e30bd63e05c5e36a00d8d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:13 2013 +0200 winemac.drv: Use BOOL type where appropriate. --- dlls/winemac.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 4749b44..1ae2744 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -3048,12 +3048,12 @@ static void load_extensions(void) static BOOL init_opengl(void) { - static int init_done; + static BOOL init_done = FALSE; unsigned int i; char buffer[200]; if (init_done) return (opengl_handle != NULL); - init_done = 1; + init_done = TRUE; TRACE("()\n");

1 0

Frédéric Delanoy : wineoss.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 10f7f09d4388423e28c01d47635fcdec6b541af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f7f09d4388423e28c01d476… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:14 2013 +0200 wineoss.drv: Use BOOL type where appropriate. --- dlls/wineoss.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 5ab5b0d..c359fe0 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -542,7 +542,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) if (MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; - WORD sbfb = FALSE; + BOOL sbfb = FALSE; EnterCriticalSection(&crit_sect); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) {

1 0

Frédéric Delanoy : winex11.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 387fafd39e2a66dfab0f55c3e44beccf8a916321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387fafd39e2a66dfab0f55c3e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:15 2013 +0200 winex11.drv: Use BOOL type where appropriate. --- dlls/winex11.drv/ime.c | 4 ++-- dlls/winex11.drv/opengl.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 2822f3e..aa6c7dd 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -124,11 +124,11 @@ static BOOL UnlockRealIMC(HIMC hIMC) static void IME_RegisterClasses(void) { - static int done; + static BOOL done = FALSE; WNDCLASSW wndClass; if (done) return; - done = 1; + done = TRUE; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e9a0433..4801bff 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -278,7 +278,7 @@ static struct list context_list = LIST_INIT( context_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; -static int use_render_texture_emulation = 1; +static BOOL use_render_texture_emulation = TRUE; /* Selects the preferred GLX swap control method for use by wglSwapIntervalEXT */ static enum glx_swap_control_method swap_control_method = GLX_SWAP_CONTROL_NONE; @@ -566,7 +566,7 @@ done: static BOOL has_opengl(void) { - static int init_done; + static BOOL init_done = FALSE; static void *opengl_handle; char buffer[200]; @@ -574,7 +574,7 @@ static BOOL has_opengl(void) unsigned int i; if (init_done) return (opengl_handle != NULL); - init_done = 1; + init_done = TRUE; /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and include all dependencies */ @@ -2420,7 +2420,7 @@ static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (1 == use_render_texture_emulation) { + if (use_render_texture_emulation) { return GL_TRUE; } return ret; @@ -2829,8 +2829,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) return GL_FALSE; } - if (1 == use_render_texture_emulation) { - static int init = 0; + if (use_render_texture_emulation) { + static BOOL initialized = FALSE; int prev_binded_texture = 0; GLXContext prev_context; Drawable prev_drawable; @@ -2843,8 +2843,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) This is mostly due to lack of demos/games using them. Further the use of glReadPixels isn't ideal performance wise but I wasn't able to get other ways working. */ - if(!init) { - init = 1; /* Only show the FIXME once for performance reasons */ + if(!initialized) { + initialized = TRUE; /* Only show the FIXME once for performance reasons */ FIXME("partial stub!\n"); } @@ -2885,7 +2885,7 @@ static BOOL X11DRV_wglReleaseTexImageARB( struct wgl_pbuffer *object, int iBuffe SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (1 == use_render_texture_emulation) { + if (use_render_texture_emulation) { return GL_TRUE; } return ret;

1 0

Frédéric Delanoy : winspool.drv: Use BOOL type where appropriate.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: wine Branch: master Commit: 8afd655a6248c8fe2cbd405ecc1634e4e6fe02d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afd655a6248c8fe2cbd405ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 9 00:06:16 2013 +0200 winspool.drv: Use BOOL type where appropriate. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed4b314..aebdef9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6877,7 +6877,7 @@ BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DW LPWSTR nameW = NULL; DWORD lenA; DWORD len; - DWORD res = FALSE; + BOOL res = FALSE; TRACE("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags);

1 0

Francois Gouget : testbot: Add the VM 'off' state to the database creation SQL script.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: tools Branch: master Commit: ec2175d73b0c704b99be4adfff350449bf431ed7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec2175d73b0c704b99be4adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 9 17:39:28 2013 +0200 testbot: Add the VM 'off' state to the database creation SQL script. --- testbot/ddl/winetestbot.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index e46d5e0..5e79bd3 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,7 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, ChildPid INT(5) NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL,

1 0