Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/krnl386.exe16/dosvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index a33b37a..c19b3f3 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -62,12 +62,12 @@ WORD DOSVM_retval = 0; /* * Wine DOS memory layout above 640k: * - * a0000 - affff : VGA graphics (vga.c) + * a0000 - affff : VGA graphics (unused) * b0000 - bffff : Monochrome text (unused) - * b8000 - bffff : VGA text (vga.c) + * b8000 - bffff : VGA text (unused) * c0000 - cffff : EMS frame (int67.c) - * d0000 - effff : Free memory for UMBs (himem.c) - * f0000 - fffff : BIOS stuff (msdos/dosmem.c) + * d0000 - effff : Free memory for UMBs (dosvm.c) + * f0000 - fffff : BIOS stuff (dosmem.c) * 100000 -10ffff : High memory area (unused) */
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/krnl386.exe16/int21.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index f5b257b..578c8a2 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -5044,13 +5044,13 @@ void WINAPI DOSVM_Int21Handler( CONTEXT *context ) bSetDOSExtendedError = TRUE; break;
- case 0x70: /* MSDOS 7 - GET/SET INTERNATIONALIZATION INFORMATION */ + case 0x70: /* MS-DOS 7 - GET/SET INTERNATIONALIZATION INFORMATION */ FIXME( "MS-DOS 7 - GET/SET INTERNATIONALIZATION INFORMATION\n" ); SET_CFLAG( context ); SET_AL( context, 0 ); break;
- case 0x71: /* MSDOS 7 - LONG FILENAME FUNCTIONS */ + case 0x71: /* MS-DOS 7 - LONG FILENAME FUNCTIONS */ INT21_LongFilename( context ); break;
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/ws2_32/tests/sock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc..39f855c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4672,7 +4672,7 @@ static void test_dns(void) void *mem; } addr; char **ptr; - int acount; + int account;
h = gethostbyname(""); ok(h != NULL, "gethostbyname("") failed with %d\n", h_errno); @@ -4700,14 +4700,14 @@ static void test_dns(void) ok(h->h_aliases == addr.mem, "hostent->h_aliases should be in %p, it is in %p\n", addr.mem, h->h_aliases);
- for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; - addr.chr += sizeof(*ptr) * acount; + for(ptr = h->h_aliases, account = 1; *ptr; ptr++) account++; + addr.chr += sizeof(*ptr) * account; ok(h->h_addr_list == addr.mem, "hostent->h_addr_list should be in %p, it is in %p\n", addr.mem, h->h_addr_list);
- for(ptr = h->h_addr_list, acount = 1; *ptr; ptr++) acount++; + for(ptr = h->h_addr_list, account = 1; *ptr; ptr++) account++;
- addr.chr += sizeof(*ptr) * acount; + addr.chr += sizeof(*ptr) * account; ok(h->h_addr_list[0] == addr.mem, "hostent->h_addr_list[0] should be in %p, it is in %p\n", addr.mem, h->h_addr_list[0]); } @@ -9315,7 +9315,7 @@ static void test_sioAddressListChange(void) WSAEVENT event2, event3; HANDLE io_port; ULONG_PTR key; - int acount; + int account; BOOL bret; int ret;
@@ -9327,8 +9327,8 @@ static void test_sioAddressListChange(void) WSAGetLastError()); return; } - for (acount = 0; h->h_addr_list[acount]; acount++); - if (acount == 0) + for (account = 0; h->h_addr_list[account]; account++); + if (account == 0) { skip("Cannot test SIO_ADDRESS_LIST_CHANGE, test requires a network card.\n"); return;
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=63834
Your paranoid android.
=== debian10 (32 bit report) ===
ws2_32: sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0
=== debian10 (32 bit Japanese:Japan report) ===
ws2_32: sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0
=== debian10 (32 bit WoW report) ===
ws2_32: sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0 sock.c:3057: Test succeeded inside todo block: Test[2]: expected 0, got 0
On 26-01-2020 10:19, Mathew Hodson wrote:
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com
dlls/ws2_32/tests/sock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc..39f855c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4672,7 +4672,7 @@ static void test_dns(void) void *mem; } addr; char **ptr;
- int acount;
- int account;
Hi Mathew,
I think this should be read as "a count", not "account", where the "a" probably stands for address.
Sven
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3872666..7ab7d8a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2472,7 +2472,7 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) ok(data.was_called == TRUE, "APC wasn't called\n"); ok(data2.was_called == TRUE, "APC wasn't called\n");
- /* test cancelation: create notify on svc that will block until service + /* test cancellation: create notify on svc that will block until service * start; close svc; start service on svc2; verify that notification does * not happen */
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=63835
Your paranoid android.
=== w1064v1809_ja (32 bit report) ===
advapi32: service.c:1721: Test failed: Expected a process id for this running service (sppsvc)
On 26-01-2020 10:19, Mathew Hodson wrote:
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com
dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3872666..7ab7d8a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2472,7 +2472,7 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) ok(data.was_called == TRUE, "APC wasn't called\n"); ok(data2.was_called == TRUE, "APC wasn't called\n");
- /* test cancelation: create notify on svc that will block until service
- /* test cancellation: create notify on svc that will block until service
- start; close svc; start service on svc2; verify that notification does
- not happen */
Both of these are correct actually in US spelling (cancelation being more recent), so this is not really an improvement.
On Sun, 26 Jan 2020 at 15:23, Sven Baars sven.wine@gmail.com wrote:
On 26-01-2020 10:19, Mathew Hodson wrote:
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com
dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 3872666..7ab7d8a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2472,7 +2472,7 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) ok(data.was_called == TRUE, "APC wasn't called\n"); ok(data2.was_called == TRUE, "APC wasn't called\n");
- /* test cancelation: create notify on svc that will block until service
- /* test cancellation: create notify on svc that will block until service
- start; close svc; start service on svc2; verify that notification does
- not happen */
Both of these are correct actually in US spelling (cancelation being more recent), so this is not really an improvement.
It may not be enough of an improvement to change existing code, but as a general principle I'd argue that Wine is an international project, and it would be best to avoid US-specific spelling variants. I.e., if this were new code, I'd prefer "cancellation" as well.
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/cabinet/deflate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/cabinet/deflate.c b/dlls/cabinet/deflate.c index 681f187..43c2509 100644 --- a/dlls/cabinet/deflate.c +++ b/dlls/cabinet/deflate.c @@ -257,7 +257,7 @@ typedef struct internal_state { * bytes. With this organization, matches are limited to a distance of * wSize-MAX_MATCH bytes, but this ensures that IO is always * performed with a length multiple of the block size. Also, it limits - * the window size to 64K, which is quite useful on MSDOS. + * the window size to 64K, which is quite useful on MS-DOS. * To do: use the user input buffer as sliding window. */
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/ntdll/rtlbitmap.c | 12 ++++++------ dlls/ntdll/sec.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index d0a4e5c..5bd2cd8 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -138,7 +138,7 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) return;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
@@ -199,7 +199,7 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) return;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
@@ -262,7 +262,7 @@ BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) return FALSE;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
@@ -335,7 +335,7 @@ BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount return FALSE;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
@@ -680,7 +680,7 @@ static ULONG NTDLL_FindSetRun(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpSize) ULONG ulFoundAt = 0, ulCount = 0;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
@@ -777,7 +777,7 @@ static ULONG NTDLL_FindClearRun(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpSiz ULONG ulFoundAt = 0, ulCount = 0;
/* FIXME: It might be more efficient/cleaner to manipulate four bytes - * at a time. But beware of the pointer arithmetics... + * at a time. But beware of the pointer arithmetic... */ lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u);
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 464104d..00f523c 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1140,7 +1140,7 @@ NTSTATUS WINAPI RtlCreateAcl(PACL acl,DWORD size,DWORD rev)
/************************************************************************** * RtlFirstFreeAce [NTDLL.@] - * looks for the AceCount+1 ACE, and if it is still within the alloced + * looks for the AceCount+1 ACE, and if it is still within the allocated * ACL, return a pointer to it */ BOOLEAN WINAPI RtlFirstFreeAce(
Signed-off-by: Mathew Hodson mathew.hodson@gmail.com --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 7a49401..42d2459 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2012,7 +2012,7 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c notification = CLOCK_NOTIFY_SET_RATE; break; default: - ; + return S_OK; }
if (FAILED(hr = clock_call_state_change(system_time, param, notification, clock->time_source_sink)))
Out-of-range 'command' will cause more problems earlier than this part. This should be fixed differently. Which compiler gives this warning?
gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12)
On Sun, Jan 26, 2020 at 4:39 AM Nikolay Sivov bunglehead@gmail.com wrote:
Out-of-range 'command' will cause more problems earlier than this part. This should be fixed differently. Which compiler gives this warning?
Does this work?
On Sun, Jan 26, 2020 at 1:02 PM Mathew Hodson mathew.hodson@gmail.com wrote:
gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12)
On Sun, Jan 26, 2020 at 4:39 AM Nikolay Sivov bunglehead@gmail.com wrote:
Out-of-range 'command' will cause more problems earlier than this part.
This should be fixed differently. Which compiler gives this warning?
-- Sincerely,
Mathew Hodson
On Sun, Jan 26, 2020 at 5:51 AM Nikolay Sivov bunglehead@gmail.com wrote:
Does this work?
Yes, that removes the warning.
-
Henri Verbeet -
Marvin -
Mathew Hodson -
Nikolay Sivov -
Sven Baars