September 2019 - Wine-commits

Fabian Maurer : shell32: Prevent text truncation inside the old "browse folder" dialog.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: b7bca1be24df0f5f59b1f3bc86d0f599b216a13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7bca1be24df0f5f59b1f3bc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 20 23:34:43 2019 +0200 shell32: Prevent text truncation inside the old "browse folder" dialog. We use the same height for the title as in the new "browse folder" dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46404 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 46f0b6f12d..f19b09f8c2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -274,7 +274,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 134, 176, 50, 14, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 5, 4, 180, 12 + LTEXT "", IDD_TITLE, 5, 4, 180, 24 LTEXT "", IDD_STATUS, 5, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |

1 0

Alex Henrie : include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 7c5ea436af8a6b5a3d2b095bd4697f10b6f78acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5ea436af8a6b5a3d2b095b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 22 15:12:09 2019 -0600 include: Rename Reserved1 to SystemStatusFlag in SYSTEM_POWER_STATUS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 2 +- dlls/kernel32/tests/generated.c | 12 ++++++------ include/winbase.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 190dc016c3..7efd84d410 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -52,7 +52,7 @@ BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) ps->ACLineStatus = 255; ps->BatteryFlag = 255; ps->BatteryLifePercent = 255; - ps->Reserved1 = 0; + ps->SystemStatusFlag = 0; ps->BatteryLifeTime = ~0u; ps->BatteryFullLifeTime = ~0u; return TRUE; diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 36053b8491..ae1f96613a 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -1755,9 +1755,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) @@ -3612,9 +3612,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) diff --git a/include/winbase.h b/include/winbase.h index 3a213df4e4..33a2f3e45a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -961,7 +961,7 @@ typedef struct _SYSTEM_POWER_STATUS BYTE ACLineStatus; BYTE BatteryFlag; BYTE BatteryLifePercent; - BYTE Reserved1; + BYTE SystemStatusFlag; DWORD BatteryLifeTime; DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;

1 0

Alex Henrie : include: Add constants needed for SYSTEM_POWER_STATUS.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 9142be320ed3e90017a3e20604d0b8fee95ab452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9142be320ed3e90017a3e206… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 22 15:12:10 2019 -0600 include: Add constants needed for SYSTEM_POWER_STATUS. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 33a2f3e45a..31d45aa0cb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -966,6 +966,24 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; +#define AC_LINE_OFFLINE 0x00 +#define AC_LINE_ONLINE 0x01 +#define AC_LINE_BACKUP_POWER 0x02 +#define AC_LINE_UNKNOWN 0xFF + +#define BATTERY_FLAG_HIGH 0x01 +#define BATTERY_FLAG_LOW 0x02 +#define BATTERY_FLAG_CRITICAL 0x04 +#define BATTERY_FLAG_CHARGING 0x08 +#define BATTERY_FLAG_NO_BATTERY 0x80 +#define BATTERY_FLAG_UNKNOWN 0xFF + +#define BATTERY_PERCENTAGE_UNKNOWN 0xFF + +#define SYSTEM_STATUS_FLAG_POWER_SAVING_ON 0x01 + +#define BATTERY_LIFE_UNKNOWN 0xFFFFFFFF + typedef struct _SYSTEM_INFO { union {

1 0

Piotr Caban : ntdll: Ignore ExceptionFlags changes done by exception handlers.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: a69762541a18107fbd8e9fb8362c3af8ddf1d90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a69762541a18107fbd8e9fb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 21 11:33:26 2019 +0200 ntdll: Ignore ExceptionFlags changes done by exception handlers. Fixes exceptions rethrowing in 64-bit .Net. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index fbb2daff90..d8fcc54743 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2390,6 +2390,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); + rec->ExceptionFlags &= EH_NONCONTINUABLE; __wine_pop_frame( &frame ); return res; }

1 0

Sebastian Lackner : ntdll: Execute queued APCs before starting a process.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: b45d6125493e19e7e2befe071b7052bad4d2859f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b45d6125493e19e7e2befe07… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 19 18:36:04 2019 -0500 ntdll: Execute queued APCs before starting a process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35561 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 376a8345f4..0ab25dcc51 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3540,6 +3540,7 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) */ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { + static const LARGE_INTEGER zero; NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; @@ -3602,6 +3603,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } RtlLeaveCriticalSection( &loader_section ); + + NtDelayExecution( TRUE, &zero ); }

1 0

Francois Gouget : kernel32/tests: Fix the spelling of the exerciseServer() function name.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 17fbd837e280603211ac3f1dad746c778294bb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17fbd837e280603211ac3f1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:21:01 2019 +0200 kernel32/tests: Fix the spelling of the exerciseServer() function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cab069d68b..11605c2ece 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1343,11 +1343,11 @@ static DWORD CALLBACK serverThreadMain5(LPVOID arg) return 0; } -static void exercizeServer(const char *pipename, HANDLE serverThread) +static void exerciseServer(const char *pipename, HANDLE serverThread) { int i; - if (winetest_debug > 1) trace("exercizeServer starting\n"); + if (winetest_debug > 1) trace("exerciseServer starting\n"); for (i = 0; i < NB_SERVER_LOOPS; i++) { HANDLE hFile=INVALID_HANDLE_VALUE; static const char obuf[] = "Bit Bucket"; @@ -1390,7 +1390,7 @@ static void exercizeServer(const char *pipename, HANDLE serverThread) ok(WaitForSingleObject(serverThread,INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject\n"); CloseHandle(hnp); - if (winetest_debug > 1) trace("exercizeServer returning\n"); + if (winetest_debug > 1) trace("exerciseServer returning\n"); } static void test_NamedPipe_2(void) @@ -1416,31 +1416,31 @@ static void test_NamedPipe_2(void) SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain1, (void *)8, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain1", serverThread); + exerciseServer(PIPENAME "serverThreadMain1", serverThread); /* Try server #2 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain2, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain2", serverThread); + exerciseServer(PIPENAME "serverThreadMain2", serverThread); /* Try server #3 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain3, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain3", serverThread); + exerciseServer(PIPENAME "serverThreadMain3", serverThread); /* Try server #4 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain4, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain4", serverThread); + exerciseServer(PIPENAME "serverThreadMain4", serverThread); /* Try server #5 */ SetLastError(0xdeadbeef); serverThread = CreateThread(NULL, 0, serverThreadMain5, 0, 0, &serverThreadId); ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); - exercizeServer(PIPENAME "serverThreadMain5", serverThread); + exerciseServer(PIPENAME "serverThreadMain5", serverThread); ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event );

1 0

Francois Gouget : jscript/tests: Fix the spelling and slightly reword an ok() message.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: a4a1ba5a2263858ed0dbb5a713b371a80a978726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a1ba5a2263858ed0dbb5a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:21:19 2019 +0200 jscript/tests: Fix the spelling and slightly reword an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 0fb63f4682..4812a066d1 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1526,7 +1526,7 @@ deleteTest = 1; delete deleteTest; try { tmp = deleteTest; - ok(false, "deleteTest not throwed exception?"); + ok(false, "deleteTest did not throw an exception?"); }catch(ex) {} (function() {

1 0

Francois Gouget : kernel32/tests: Fix the spelling of three ok() messages and comments.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 98093939d63eca5de5ccc8267a4bb1c25d868915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98093939d63eca5de5ccc826… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:22:25 2019 +0200 kernel32/tests: Fix the spelling of three ok() messages and comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 2 +- dlls/kernel32/tests/debugger.c | 2 +- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/path.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97a71358fe..97da932d6c 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -725,7 +725,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) ok(ret, "Unexpected error %u on open\n", GetLastError()); ok(comstat.cbInQue == 0, "Unexpected %d chars in InQueue\n",comstat.cbInQue); - ok(comstat.cbOutQue == 0, "Still pending %d charcters in OutQueue\n", comstat.cbOutQue); + ok(comstat.cbOutQue == 0, "Still pending %d characters in OutQueue\n", comstat.cbOutQue); ok(errors == 0, "Unexpected errors 0x%08x\n", errors); } return hcom; diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 93d12a56eb..8148c396d0 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -170,7 +170,7 @@ static void run_background_thread(void) { DWORD tid; HANDLE thread = CreateThread(NULL, 0, thread_proc, NULL, 0, &tid); - ok(thread != NULL, "CreateThrad failed\n"); + ok(thread != NULL, "CreateThread failed\n"); CloseHandle(thread); } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9be4ecd136..5bd168276f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5229,7 +5229,7 @@ static void test_overlapped_read(void) DWORD ret; ret = GetTempPathA(MAX_PATH, temp_path); - ok(ret, "Unexpect error %u.\n", GetLastError()); + ok(ret, "Unexpected error %u.\n", GetLastError()); ret = GetTempFileNameA(temp_path, prefix, 0, file_name); ok(ret, "Unexpected error %u.\n", GetLastError()); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 60cd26dd60..028853f605 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -309,7 +309,7 @@ static void test_setdir(CHAR *olddir,CHAR *newdir, ok(SetCurrentDirectoryA(olddir), "%s: Couldn't set directory to its original value\n",errstr); } else { -/* else thest that it fails correctly */ +/* else test that it fails correctly */ chklen=lstrlenA(olddir); ok(val==0, "%s: SetCurrentDirectoryA passed when it should have failed\n",errstr); @@ -517,7 +517,7 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) /* Check that SetCurrentDirectory fails when a nonexistent dir is specified */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_SHORT); test_setdir(newdir,tmpstr,NULL,0,"check 3"); -/* Check that SetCurrentDirectory fails for a nonexistent lond directory */ +/* Check that SetCurrentDirectory fails for a nonexistent long directory */ sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_LONG); test_setdir(newdir,tmpstr,NULL,0,"check 4"); /* Check that SetCurrentDirectory passes with a long directory */ diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 11605c2ece..f61d441303 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3071,7 +3071,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(writer, &write_overlapped2, 1, FALSE); test_peek_pipe(reader, 0, 0, 0); - /* same as above, but parially read written data before canceling */ + /* same as above, but partially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1),

1 0

Francois Gouget : dxerr9: Fix the spelling of some error messages.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: d5996ec1bee1a631c1cb8bfebf1a3fd7359ea445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5996ec1bee1a631c1cb8bfe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:24:31 2019 +0200 dxerr9: Fix the spelling of some error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/errors.dat | 4 ++-- dlls/dxerr9/errors.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dxerr9/errors.dat b/dlls/dxerr9/errors.dat index f8c6a95ce8..fcea0da47a 100644 --- a/dlls/dxerr9/errors.dat +++ b/dlls/dxerr9/errors.dat @@ -281,7 +281,7 @@ DDERR_INVALIDPIXELFORMAT pixel format was invalid as specified DDERR_INVALIDRECT Rectangle provided was invalid. DDERR_LOCKEDSURFACES Operation could not be carried out because one or more surfaces are locked DDERR_NO3D There is no 3D present. -DDERR_NOALPHAHW Operation could not be carried out because there is no alpha accleration hardware present or available. +DDERR_NOALPHAHW Operation could not be carried out because there is no alpha acceleration hardware present or available. DDERR_NOSTEREOHARDWARE Operation could not be carried out because there is no stereo hardware present or available. DDERR_NOSURFACELEFT Operation could not be carried out because there is no hardware present which supports stereo surfaces DDERR_NOCLIPLIST no clip list available @@ -348,7 +348,7 @@ DDERR_NOBLTHW No blter. DDERR_NODDROPSHW No DirectDraw ROP hardware. DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination. -DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation. +DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destination. DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive. DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable. diff --git a/dlls/dxerr9/errors.h b/dlls/dxerr9/errors.h index 1c52be9219..84e1d8611a 100644 --- a/dlls/dxerr9/errors.h +++ b/dlls/dxerr9/errors.h @@ -850,8 +850,8 @@ static const WCHAR name283W[] = { 'D','D','E','R','R','_','N','O','3','D',0 }; static const CHAR description283A[] = "There is no 3D present."; static const WCHAR description283W[] = { 'T','h','e','r','e',' ','i','s',' ','n','o',' ','3','D',' ','p','r','e','s','e','n','t','.',0 }; static const WCHAR name284W[] = { 'D','D','E','R','R','_','N','O','A','L','P','H','A','H','W',0 }; -static const CHAR description284A[] = "Operation could not be carried out because there is no alpha accleration hardware present or available."; -static const WCHAR description284W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; +static const CHAR description284A[] = "Operation could not be carried out because there is no alpha acceleration hardware present or available."; +static const WCHAR description284W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','a','l','p','h','a',' ','a','c','c','e','l','e','r','a','t','i','o','n',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; static const WCHAR name285W[] = { 'D','D','E','R','R','_','N','O','S','T','E','R','E','O','H','A','R','D','W','A','R','E',0 }; static const CHAR description285A[] = "Operation could not be carried out because there is no stereo hardware present or available."; static const WCHAR description285W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','s','t','e','r','e','o',' ','h','a','r','d','w','a','r','e',' ','p','r','e','s','e','n','t',' ','o','r',' ','a','v','a','i','l','a','b','l','e','.',0 }; @@ -1049,10 +1049,10 @@ static const CHAR description349A[] = "returned when GetOverlayPosition is calle static const WCHAR description349W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 }; static const WCHAR name350W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 }; static const CHAR description350A[] = "returned when GetOverlayPosition is called on an overlay that UpdateOverlay has never been called on to establish a destination."; -static const WCHAR description350W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 }; +static const WCHAR description350W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name351W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 }; static const CHAR description351A[] = "returned when the position of the overlay on the destination is no longer legal for that destination."; -static const WCHAR description351W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; +static const WCHAR description351W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 }; static const WCHAR name352W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 }; static const CHAR description352A[] = "returned when an overlay member is called for a non-overlay surface"; static const WCHAR description352W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 };

1 0

Francois Gouget : jscript/tests: Fix the spelling of a couple of jscript ok() messages.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: a22153005dd7c2a8c4b38097a80f144a2fd4959d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22153005dd7c2a8c4b38097… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 22 23:24:51 2019 +0200 jscript/tests: Fix the spelling of a couple of jscript ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 58a0cd332f..d62a643471 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1917,11 +1917,11 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); s = JSON.stringify(testObj); ok(s === undefined || s === "undefined" /* broken on some old versions */, - "stringify(testObj) returned " + s + " expected undfined"); + "stringify(testObj) returned " + s + " expected undefined"); s = JSON.stringify(undefined); ok(s === undefined || s === "undefined" /* broken on some old versions */, - "stringify(undefined) returned " + s + " expected undfined"); + "stringify(undefined) returned " + s + " expected undefined"); var parse_tests = [ ["true", true],

1 0