- Wine-Devel - list.winehq.org

[PATCH v2] oleaut32: Do not skip the first decimal digit in VarParseNumFromStr().
by Francois Gouget March 7, 2022

March 7, 2022

Add more tests to probe what happens if the integral part is omitted. From: David Kahurani <k.kahurani(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fix the subject to not imply this is a test patch. Without the fix the new tests would fail in EXPECT() which performs multiple ok() calls, making adding a todo_wine() impractical. So I opted for submitting the fix and the new tests together. --- dlls/oleaut32/tests/vartest.c | 47 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0a8b56bb2ee..dc1fb476307 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1775,6 +1775,45 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,0); EXPECT2(1,FAILDIG); + /* Skipping the integer part is not an error */ + CONVERT(".2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + /* Even zero gets an exponent (it sort of indicates 'precision') */ + CONVERT(".0", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(0,FAILDIG); + + CONVERT(".000", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECTRGB(0,0); + EXPECTRGB(3,FAILDIG); + + CONVERT("$.02", NUMPRS_CURRENCY|NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_DECIMAL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,4,0,-2); + EXPECT2(2,FAILDIG); + + CONVERT(".001", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,FAILDIG); + + CONVERT(".101", NUMPRS_DECIMAL); + EXPECT(3,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,0); + EXPECTRGB(2,1); + EXPECTRGB(3,FAILDIG); + + CONVERT(".30", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); + /* See the NUMPRS_THOUSANDS comment about trailing zeroes */ + EXPECTRGB(0,3); + EXPECTRGB(2,FAILDIG); + + /* But skipping both the integer and decimal part is not allowed */ + CONVERT(".", NUMPRS_DECIMAL); + EXPECTFAIL; + /* Consumes only one decimal point */ CONVERT("1.1.", NUMPRS_DECIMAL); EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); @@ -2131,6 +2170,14 @@ static void test_VarParseNumFromStrFr(void) CONVERT("1.2", NUMPRS_DECIMAL); EXPECT(1,NUMPRS_DECIMAL,0,1,0,0); EXPECT2(1,FAILDIG); + + /* The integer part can still be omitted */ + CONVERT(",2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + CONVERT(".2", NUMPRS_DECIMAL); + EXPECTFAIL; } static void test_VarParseNumFromStrMisc(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041b9c6..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (*lpszStr == '0') { dwState |= B_LEADING_ZERO; cchUsed++; -- 2.30.2

1 0

[PATCH 1/2] wined3d: Print an ERR message if unable to allocate a GL buffer object.
by Zebediah Figura March 7, 2022

March 7, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f356bdc7ec..9e3ed874c9a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1129,7 +1129,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if (!id) { - WARN("Failed to allocate buffer.\n"); + ERR("Failed to allocate buffer.\n"); return false; } } -- 2.35.1

2 4

[PATCH 8/8] win32u: Move GetClassLong implementation from user32.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 207 +---------------------------------- dlls/user32/spy.c | 35 ------ dlls/user32/user_private.h | 1 - dlls/win32u/class.c | 169 ++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 + dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 12 +- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 7 +- 9 files changed, 196 insertions(+), 242 deletions(-)

3 2

[PATCH 7/8] win32u: Move NtUserSetClassLong from user32.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 237 +++-------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/class.c | 210 +++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 3 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 +++ include/ntuser.h | 3 + 8 files changed, 259 insertions(+), 223 deletions(-)

2 1

[PATCH 6/8] win32u: Move class management implementation from user32.
by Jacek Caban March 7, 2022

March 7, 2022

2 1

[PATCH 5/8] user32: Store menu name as a struct.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 103 ++++++++++++++++++++--------------- dlls/win32u/ntuser_private.h | 2 +- include/ntuser.h | 7 +++ 3 files changed, 67 insertions(+), 45 deletions(-)

2 1

[PATCH 4/8] user32: Use UNICODE_STRING for passing window classes internally.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 162 +++++++++++++++++++++++------------------ dlls/user32/controls.h | 2 +- dlls/user32/win.c | 24 ++++-- 3 files changed, 109 insertions(+), 79 deletions(-)

3 2

[PATCH 3/8] user32: Move module class registration to get_class_info.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-)

3 2

[PATCH 2/8] user32: Use get_class_info for GetClasInfoEx implementation.
by Jacek Caban March 7, 2022

March 7, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 125 +++++++++++++------------------------ dlls/user32/user_private.h | 3 +- dlls/user32/win.c | 2 +- 3 files changed, 45 insertions(+), 85 deletions(-)

2 1

[PATCH 1/8] user32: Introduce get_class_info.
by Jacek Caban March 7, 2022

March 7, 2022

Ans use it in WIN_CreateWindowEx to trigger class registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 42 ++++++++++++++++++++++++++++++-------- dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 29 ++++++++++---------------- 3 files changed, 46 insertions(+), 28 deletions(-)

3 2