Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr --- dlls/d3dxof/parsing.c | 2 +- dlls/winmm/tests/mmio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7d31627..94afd42 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1427,7 +1427,7 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE;
- /* For seeking to a possibly eof to avoid parsing another object next time */ + /* For seeking a possibly eof to avoid parsing another object next time */ check_TOKEN(buf);
return TRUE; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c31..f21deab 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -889,7 +889,7 @@ static void test_mmio_buffer_pointer(void) ok(res == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", res); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to the same buffer chunk, the buffer is kept */ + /* seeking the same buffer chunk, the buffer is kept */ size = sizeof(buffer)/2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, expected %d, got %d\n", size, pos); @@ -899,7 +899,7 @@ static void test_mmio_buffer_pointer(void) ok(mmio.pchNext-mmio.pchBuffer == size, "expected %d, got %d\n", size, (int)(mmio.pchNext-mmio.pchBuffer)); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to another buffer chunk, the buffer is empty */ + /* seeking another buffer chunk, the buffer is empty */ size = sizeof(buffer) * 3 + sizeof(buffer) / 2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, got %d\n", pos);
On 8/8/19 9:11 AM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr
dlls/d3dxof/parsing.c | 2 +- dlls/winmm/tests/mmio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7d31627..94afd42 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1427,7 +1427,7 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE;
- /* For seeking to a possibly eof to avoid parsing another object next time */
/* For seeking a possibly eof to avoid parsing another object next time */ check_TOKEN(buf);
return TRUE;
diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c31..f21deab 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -889,7 +889,7 @@ static void test_mmio_buffer_pointer(void) ok(res == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", res); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to the same buffer chunk, the buffer is kept */
- /* seeking the same buffer chunk, the buffer is kept */ size = sizeof(buffer)/2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, expected %d, got %d\n", size, pos);
@@ -899,7 +899,7 @@ static void test_mmio_buffer_pointer(void) ok(mmio.pchNext-mmio.pchBuffer == size, "expected %d, got %d\n", size, (int)(mmio.pchNext-mmio.pchBuffer)); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to another buffer chunk, the buffer is empty */
- /* seeking another buffer chunk, the buffer is empty */ size = sizeof(buffer) * 3 + sizeof(buffer) / 2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, got %d\n", pos);
This doesn't seem like a typo, and I'd be surprised to learn it's ungrammatical.
On Aug 8, 2019, at 9:59 AM, Zebediah Figura z.figura12@gmail.com wrote:
On 8/8/19 9:11 AM, Serge Gautherie wrote:
Signed-off-by: Serge Gautherie winehq-git_serge_180711@gautherie.fr
dlls/d3dxof/parsing.c | 2 +- dlls/winmm/tests/mmio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 7d31627..94afd42 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1427,7 +1427,7 @@ BOOL parse_object(parse_buffer * buf) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE;
- /* For seeking to a possibly eof to avoid parsing another object next time */
- /* For seeking a possibly eof to avoid parsing another object next time */ check_TOKEN(buf); return TRUE;
diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5501c31..f21deab 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -889,7 +889,7 @@ static void test_mmio_buffer_pointer(void) ok(res == MMSYSERR_NOERROR, "mmioAdvance failed %x\n", res); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to the same buffer chunk, the buffer is kept */
- /* seeking the same buffer chunk, the buffer is kept */ size = sizeof(buffer)/2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, expected %d, got %d\n", size, pos);
@@ -899,7 +899,7 @@ static void test_mmio_buffer_pointer(void) ok(mmio.pchNext-mmio.pchBuffer == size, "expected %d, got %d\n", size, (int)(mmio.pchNext-mmio.pchBuffer)); ok(mmio.pchEndRead-mmio.pchBuffer == sizeof(buffer), "got %d\n", (int)(mmio.pchEndRead-mmio.pchBuffer));
- /* seeking to another buffer chunk, the buffer is empty */
- /* seeking another buffer chunk, the buffer is empty */ size = sizeof(buffer) * 3 + sizeof(buffer) / 2; pos = mmioSeek(hmmio, size, SEEK_SET); ok(pos == size, "failed to seek, got %d\n", pos);
This doesn't seem like a typo, and I'd be surprised to learn it's ungrammatical.
I agree that it's correct as-is, but only because of the programming-specific meaning of "seeking" in terms of repositioning a file/buffer position. "Seeking to <noun>" would be very odd with any normal sense of "seeking".
-Ken
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55308
Your paranoid android.
=== wvistau64 (task log) ===
Task errors: The task timed out
=== w2008s64 (64 bit report) ===
winmm: mmio: Timeout
=== w7pro64 (64 bit report) ===
winmm: mmio: Timeout
=== w864 (64 bit report) ===
winmm: mmio: Timeout
=== w1064v1507 (64 bit report) ===
winmm: mmio: Timeout
=== w1064v1809 (64 bit report) ===
winmm: mmio: Timeout
-
Ken Thomases -
Marvin -
Serge Gautherie -
Zebediah Figura