September 2019 - Wine-commits

Francois Gouget : ntoskrnl/tests: Declare the driver subtest.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: c9f222e775a4b9a2c032a3977b31932db2c5b3ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f222e775a4b9a2c032a397… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 27 04:14:40 2019 +0200 ntoskrnl/tests: Declare the driver subtest. It may print test failures and as such should be declared by its parent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 86dce75..eb58878 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -493,6 +493,7 @@ START_TEST(ntoskrnl) pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); + subtest("driver"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; if (!start_driver(service))

1 0

Alex Henrie : ntdll: Implement RtlIpv4StringToAddress(Ex)W.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: e9ee0df5d285e71d2d5564ef0846e4f456053b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ee0df5d285e71d2d5564ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 25 18:36:49 2019 -0600 ntdll: Implement RtlIpv4StringToAddress(Ex)W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46149 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e0d8551..72ecfd9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -884,13 +884,150 @@ void WINAPI RtlCopyLuidAndAttributesArray( for (i = 0; i < Count; i++) Dest[i] = Src[i]; } +static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) +{ + static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ + }; + int base = 10, d; + WCHAR c; + ULONG cur_value, prev_value = 0; + BOOL success = FALSE; + + if (**str == '.') + { + *str += 1; + return FALSE; + } + + if ((*str)[0] == '0') + { + if ((*str)[1] == 'x' || (*str)[1] == 'X') + { + *str += 2; + if (strict) return FALSE; + base = 16; + } + else if ((*str)[1] >= '0' && (*str)[1] <= '9') + { + *str += 1; + if (strict) return FALSE; + base = 8; + } + } + + for (cur_value = 0; **str; *str += 1) + { + c = **str; + if (c >= ARRAY_SIZE(hex_table)) break; + d = hex_table[c]; + if (d == -1 || d >= base) break; + cur_value = cur_value * base + d; + success = TRUE; + if (cur_value < prev_value) return FALSE; /* overflow */ + prev_value = cur_value; + } + + if (success) *value = cur_value; + return success; +} + +static NTSTATUS ipv4_string_to_address(const WCHAR *str, BOOL strict, + const WCHAR **terminator, IN_ADDR *address, USHORT *port) +{ + ULONG fields[4]; + int n = 0; + + for (;;) + { + if (!parse_ipv4_component(&str, strict, &fields[n])) + goto error; + n++; + if (*str != '.') + break; + if (n == 4) + goto error; + str++; + } + + if (strict && n < 4) + goto error; + + switch (n) + { + case 4: + if (fields[0] > 0xFF || fields[1] > 0xFF || fields[2] > 0xFF || fields[3] > 0xFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = fields[1]; + address->S_un.S_un_b.s_b3 = fields[2]; + address->S_un.S_un_b.s_b4 = fields[3]; + break; + case 3: + if (fields[0] > 0xFF || fields[1] > 0xFF || fields[2] > 0xFFFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = fields[1]; + address->S_un.S_un_b.s_b3 = (fields[2] & 0xFF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[2] & 0x00FF); + break; + case 2: + if (fields[0] > 0xFF || fields[1] > 0xFFFFFF) + goto error; + address->S_un.S_un_b.s_b1 = fields[0]; + address->S_un.S_un_b.s_b2 = (fields[1] & 0xFF0000) >> 16; + address->S_un.S_un_b.s_b3 = (fields[1] & 0x00FF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[1] & 0x0000FF); + break; + case 1: + address->S_un.S_un_b.s_b1 = (fields[0] & 0xFF000000) >> 24; + address->S_un.S_un_b.s_b2 = (fields[0] & 0x00FF0000) >> 16; + address->S_un.S_un_b.s_b3 = (fields[0] & 0x0000FF00) >> 8; + address->S_un.S_un_b.s_b4 = (fields[0] & 0x000000FF); + break; + default: + goto error; + } + + if (terminator) *terminator = str; + + if (*str == ':') + { + str++; + if (!parse_ipv4_component(&str, FALSE, &fields[0])) + goto error; + if (!fields[0] || fields[0] > 0xFFFF || *str) + goto error; + if (port) + { + *port = htons(fields[0]); + if (terminator) *terminator = str; + } + } + + if (!terminator && *str) + return STATUS_INVALID_PARAMETER; + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + /*********************************************************************** * RtlIpv4StringToAddressExW [NTDLL.@] */ NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port) { - FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, address, port); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %u, %p, %p)\n", debugstr_w(str), strict, address, port); + if (!str || !address || !port) return STATUS_INVALID_PARAMETER; + return ipv4_string_to_address(str, strict, NULL, address, port); } /*********************************************************************** @@ -898,8 +1035,8 @@ NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_A */ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address) { - FIXME("(%s, %u, %p, %p): stub\n", debugstr_w(str), strict, terminator, address); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %u, %p, %p)\n", debugstr_w(str), strict, terminator, address); + return ipv4_string_to_address(str, strict, terminator, address, NULL); } /***********************************************************************

1 0

Alex Henrie : ntdll: Implement RtlIpv4StringToAddress(Ex)A.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: wine Branch: master Commit: 363b8809f37b3ea5915ea4240b3d397fd2355e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=363b8809f37b3ea5915ea424… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 25 18:36:50 2019 -0600 ntdll: Implement RtlIpv4StringToAddress(Ex)A. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46149 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b8f5415..94e70e5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -760,8 +760,8 @@ @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringW(ptr ptr) -# @ stub RtlIpv4StringToAddressA -# @ stub RtlIpv4StringToAddressExA +@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) +@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) # @ stub RtlIpv6AddressToStringA diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 72ecfd9..15ff037 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1040,6 +1040,41 @@ NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const } /*********************************************************************** + * RtlIpv4StringToAddressExA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port) +{ + WCHAR wstr[32]; + + TRACE("(%s, %u, %p, %p)\n", debugstr_a(str), strict, address, port); + + if (!str || !address || !port) + return STATUS_INVALID_PARAMETER; + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + return ipv4_string_to_address(wstr, strict, NULL, address, port); +} + +/*********************************************************************** + * RtlIpv4StringToAddressA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address) +{ + WCHAR wstr[32]; + const WCHAR *wterminator; + NTSTATUS ret; + + TRACE("(%s, %u, %p, %p)\n", debugstr_a(str), strict, terminator, address); + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + ret = ipv4_string_to_address(wstr, strict, &wterminator, address, NULL); + if (terminator) *terminator = str + (wterminator - wstr); + return ret; +} + +/*********************************************************************** * RtlIpv6StringToAddressExW [NTDLL.@] */ NTSTATUS NTAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 955bd00..fca0688 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1102,8 +1102,8 @@ @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringW(ptr ptr) -@ stub RtlIpv4StringToAddressA -@ stub RtlIpv4StringToAddressExA +@ stdcall RtlIpv4StringToAddressA(str long ptr ptr) ntdll.RtlIpv4StringToAddressA +@ stdcall RtlIpv4StringToAddressExA(str long ptr ptr) ntdll.RtlIpv4StringToAddressExA @ stdcall RtlIpv4StringToAddressExW(wstr long ptr ptr) @ stdcall RtlIpv4StringToAddressW(wstr long ptr ptr) @ stub RtlIpv6AddressToStringA

1 0

Francois Gouget : testbot/SetWinLocale: Don' t delete the Windows commands in debug mode.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: tools Branch: master Commit: 4bf153802e7395fb92b6bd8735b20d7c4ec798d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4bf153802e7395fb92b6bd8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:53:03 2019 +0200 testbot/SetWinLocale: Don't delete the Windows commands in debug mode. This makes it possible to analyze or re-run them manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 824d8f5..7477c5d 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -805,8 +805,15 @@ if (!$DryRun) FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); } - $TA->Rm("script.bat"); - $TA->Rm("locales.xml"); + if ($Debug) + { + print STDERR "Not deleting script.bat and locales.xml\n"; + } + else + { + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); + } } if ($OptReboot)

1 0

Francois Gouget : testbot/TestLauncher: Fix a couple of GNU make dependencies.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: tools Branch: master Commit: 5e9a7f7b9fe5ab840055e017bb9ce6881b61c6d1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5e9a7f7b9fe5ab840055e01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:52:33 2019 +0200 testbot/TestLauncher: Fix a couple of GNU make dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 6b41e01..b040353 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -9,7 +9,7 @@ CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c - $(CROSSCC32) -Wall -o $@ $< + $(CROSSCC32) -Wall -o $@ TestLauncher.c $(CROSSSTRIP32) $@ if which $(CROSSZIPEXE); \ then \ @@ -17,7 +17,7 @@ TestLauncher32.exe: TestLauncher.c fi TestLauncher64.exe: TestLauncher.c - $(CROSSCC64) -Wall -o $@ $< + $(CROSSCC64) -Wall -o $@ TestLauncher.c $(CROSSSTRIP64) $@ if which $(CROSSZIPEXE); \ then \

1 0

Francois Gouget : testbot/testagentd: Fix a couple of GNU make dependencies.
by Alexandre Julliard 03 Sep '19

03 Sep '19

Module: tools Branch: master Commit: dc79153f8309252a82c0eb6b81a66d29d7727aa4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dc79153f8309252a82c0eb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 3 03:52:22 2019 +0200 testbot/testagentd: Fix a couple of GNU make dependencies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 4f16f9c..b2f9e82 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,7 +9,7 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ $^ + $(CC) -o $@ testagentd.o platform_unix.o strip $@ .c.o: @@ -17,7 +17,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ $^ -lws2_32 + $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj

1 0

Francois Gouget : comctl32: Typo and spelling fixes in comments.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: e0e119e41f2437826f8b9f5f1857742887ab4244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e119e41f2437826f8b9f5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:30:40 2019 +0200 comctl32: Typo and spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/syslink.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/comctl32/toolbar.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 82ed38e..ac53a2c 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -671,7 +671,7 @@ CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy, * * NOTES * This function is just a dummy - all the controls are registered at - * the DLL initialization time. See InitCommonContolsEx for details. + * the DLL initialization time. See InitCommonControlsEx for details. */ VOID WINAPI diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9e91a2f..05ae3a6 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -237,7 +237,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy * *'dddddd' is handled as 'dddd' plus 'dd'. * *unrecognized formats are strings (here given the type DT_STRING; * start of the string is encoded in lower bits of DT_STRING. - * Therefore, 'string' ends finally up as '<show seconds>tring'. + * Therefore, 'string' ends up as '<show seconds>tring'. * */ static void diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index f113bb2..8c667a1 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2135,7 +2135,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) } else { - /* Place the band in the prexisting row the mouse is hovering over */ + /* Place the band in the preexisting row the mouse is hovering over */ iRowBegin = first_visible(infoPtr); while(iRowBegin < infoPtr->uNumBands) { diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7b9cccf..b2d3682 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -951,7 +951,7 @@ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) /*********************************************************************** * SYSLINK_SetFocusLink - * Updates the focus status bits and focusses the specified link. + * Updates the focus status bits and focuses the specified link. * If no document item is specified, the focus bit will be removed from all links. * Returns the previous focused item. */ diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0e62ab9..daa1715 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2164,7 +2164,7 @@ static void test_color_table(UINT ilc) rgb[2].rgbBlue = 0xff; check_color_table("remove all, add 8", hdc, himl, ilc, rgb, default_table); - /* remove all, add 4. Color table remains the same since it's inplicitly + /* remove all, add 4. Color table remains the same since it's implicitly been set by the previous _Add */ ret = pImageList_Remove(himl, -1); ok(ret, "got %d\n", ret); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4e4fd75..ceab532 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5691,7 +5691,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (nButton == infoPtr->nButtonDrag) { - /* if the button is moved sightly left and we have a + /* if the button is moved slightly left and we have a * separator there then remove it */ if (pt.x < (btnPtr->rect.left + (btnPtr->rect.right - btnPtr->rect.left)/2)) {

1 0

Francois Gouget : advapi32/tests: Spelling fixes in a couple of comments.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 432cb69178b729d02f13275b2075508c149aa637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=432cb69178b729d02f13275b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:30:55 2019 +0200 advapi32/tests: Spelling fixes in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 6b199bc..675426d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3933,7 +3933,7 @@ static void test_RegLoadMUIString(void) ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); ok(ret > 0, "GetSystemDirectoryA failed\n"); - /* change the current direcoty to system32 */ + /* change the current directory to system32 */ GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); SetCurrentDirectoryW(sysdirW); @@ -3982,7 +3982,7 @@ static void test_RegLoadMUIString(void) ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); - /* change the current direcoty to other than system32 directory */ + /* change the current directory to other than system32 directory */ SetCurrentDirectoryA("\\"); size = 0xdeadbeef;

1 0

Francois Gouget : advapi32/tests: Spelling tweaks in ok() messages.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 171f24eba2ea19176dc58965b2575ecfd29e7b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=171f24eba2ea19176dc58965… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:31:13 2019 +0200 advapi32/tests: Spelling tweaks in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt_lmhash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index a6e812e..4c96e5b 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -287,18 +287,18 @@ static void test_SystemFunction004(void) r = pSystemFunction002(out.Buffer, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); - ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); + ok(((unsigned int*)output)[0] == in.Length, "encrypted length wrong\n"); + ok(((unsigned int*)output)[1] == 1, "encrypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); ok(r == STATUS_SUCCESS, "function failed\n"); - ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); + ok(!memcmp(output, inbuf, sizeof output), "encrypted data wrong\n"); } static void test_SystemFunction005(void)

1 0

Francois Gouget : widl: Fix a variable name in a comment.
by Alexandre Julliard 02 Sep '19

02 Sep '19

Module: wine Branch: master Commit: 2814409990f2e16becfe46476d4ff7818f955ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=2814409990f2e16becfe4647… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 2 04:31:20 2019 +0200 widl: Fix a variable name in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 0d9f8eb..58dd95e 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -327,7 +327,7 @@ typedef struct { } SLTG_BlkEntry; /* The order of the blocks in the file is given by starting at Block - entry firt_blk and stepping through using the next pointer */ + entry first_blk and stepping through using the next pointer */ /* These then get followed by this magic */ typedef struct {

1 0