August 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Store char_extra in DC_ATTR.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: ca07de0ed5f6da42db9eda8df90721aaa4d51edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca07de0ed5f6da42db9eda8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:13 2021 +0200 gdi32: Store char_extra in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 5 ++--- dlls/gdi32/font.c | 28 ++++++++-------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index be3c2e741c4..5f2f129532c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -95,7 +95,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->brush_org.y = 0; dc->mapperFlags = 0; dc->attr->text_align = TA_LEFT | TA_TOP | TA_NOUPDATECP; - dc->charExtra = 0; + dc->attr->char_extra = 0; dc->breakExtra = 0; dc->breakRem = 0; dc->attr->map_mode = MM_TEXT; @@ -413,7 +413,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->brush_org = dcs->attr->brush_org; dc->mapperFlags = dcs->mapperFlags; dc->attr->text_align = dcs->attr->text_align; - dc->charExtra = dcs->charExtra; + dc->attr->char_extra = dcs->attr->char_extra; dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; dc->attr->map_mode = dcs->attr->map_mode; @@ -545,7 +545,6 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; newdc->mapperFlags = dc->mapperFlags; - newdc->charExtra = dc->charExtra; newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 039976dbc16..2590a30c10b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,20 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * GetTextCharacterExtra (GDI32.@) - */ -INT WINAPI GetTextCharacterExtra( HDC hdc ) -{ - INT ret; - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0x80000000; - ret = dc->charExtra; - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * SetTextCharacterExtra (GDI32.@) */ @@ -4763,8 +4749,8 @@ INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); if (extra != 0x80000000) { - ret = dc->charExtra; - dc->charExtra = extra; + ret = dc->attr->char_extra; + dc->attr->char_extra = extra; } release_dc_ptr( dc ); } @@ -4943,14 +4929,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } @@ -5080,14 +5067,15 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, { for (i = 0; i < count; i++) { - unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; + unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + + (i + 1) * dc->attr->char_extra; if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; } - size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->charExtra; + size->cx = abs( INTERNAL_XDSTOWS( dc, size->cx )) + count * dc->attr->char_extra; size->cy = abs( INTERNAL_YDSTOWS( dc, size->cy )); } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index adef8f45aeb..0c2d794a576 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -305,6 +305,15 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) return NtGdiGetAndSetDCDword( hdc, NtGdiSetMapMode, mode, &ret ) ? ret : 0; } +/*********************************************************************** + * GetTextCharacterExtra (GDI32.@) + */ +INT WINAPI GetTextCharacterExtra( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->char_extra : 0x80000000; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 7270a158942..bf100ea4248 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -111,7 +111,6 @@ typedef struct tagDC UINT font_code_page; DWORD mapperFlags; /* Font mapper flags */ - INT charExtra; /* Spacing from SetTextCharacterExtra() */ INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ ABORTPROC pAbortProc; /* AbortProc for Printing */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 8eb5562db80..7c183caf99f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -125,6 +125,7 @@ typedef struct DC_ATTR WORD rel_abs_mode; WORD stretch_blt_mode; INT map_mode; + INT char_extra; RECT vis_rect; /* visible rectangle in screen coords */ FLOAT miter_limit; POINT brush_org; /* brush origin */

1 0

Jacek Caban : gdi32: Use DC_ATTR for SetTextCharacterExtra implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: f37e4ff931e96d8380d24e0afb55eeb4a8e08eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37e4ff931e96d8380d24e0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:28 2021 +0200 gdi32: Use DC_ATTR for SetTextCharacterExtra implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 23 ----------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2590a30c10b..3cc965627b4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4735,29 +4735,6 @@ INT WINAPI EnumFontsW( HDC hDC, LPCWSTR lpName, FONTENUMPROCW efproc, } -/*********************************************************************** - * SetTextCharacterExtra (GDI32.@) - */ -INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) -{ - INT ret = 0x80000000; - DC * dc = get_dc_ptr( hdc ); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextCharacterExtra ); - extra = physdev->funcs->pSetTextCharacterExtra( physdev, extra ); - if (extra != 0x80000000) - { - ret = dc->attr->char_extra; - dc->attr->char_extra = extra; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiSetTextJustification (win32u.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0ef6cc121d8..ef4541e2543 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -76,6 +76,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SaveDC( HDC hdc ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) DECLSPEC_HIDDEN; extern BOOL METADC_SetMapMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0c2d794a576..6372ac7d75d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -314,6 +314,21 @@ INT WINAPI GetTextCharacterExtra( HDC hdc ) return dc_attr ? dc_attr->char_extra : 0x80000000; } +/*********************************************************************** + * SetTextCharacterExtra (GDI32.@) + */ +INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (is_meta_dc( hdc )) return METADC_SetTextCharacterExtra( hdc, extra ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0x8000000; + ret = dc_attr->char_extra; + dc_attr->char_extra = extra; + return ret; +} + /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 791d812a147..659c41396d1 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -140,9 +140,9 @@ BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); } -INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) +BOOL METADC_SetTextCharacterExtra( HDC hdc, INT extra ) { - return MFDRV_MetaParam1( dev, META_SETTEXTCHAREXTRA, extra ) ? extra : 0x80000000; + return metadc_param1( hdc, META_SETTEXTCHAREXTRA, extra ); } DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 6e847379563..30c16324c3b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -198,7 +198,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ + NULL, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ NULL, /* pSetTextJustification */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 264cece30ee..ed41b9fb67d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -105,7 +105,6 @@ extern COLORREF CDECL MFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLS extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Store mapper flags in DC_ATTR.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 6cb07a716cbf7581a2829940d514e4889ef2c551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb07a716cbf7581a2829940… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:43 2021 +0200 gdi32: Store mapper flags in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 7 +++---- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 12 files changed, 28 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cb07a716cbf7581a282…

1 0

Jacek Caban : gdi32: Use ntgdi interface for SetLayout implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 22df510eff3ee66bf02230b46eefef64a5bd8f74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22df510eff3ee66bf02230b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:26:55 2021 +0200 gdi32: Use ntgdi interface for SetLayout implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 24 ++++++++++++++---------- dlls/gdi32/driver.c | 13 +------------ dlls/gdi32/enhmfdrv/dc.c | 11 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - include/ntgdi.h | 2 +- 11 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22df510eff3ee66bf022…

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 3f2850aeaa159270384764843cdb1dc3cbe902c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2850aeaa15927038476484… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:27:14 2021 +0200 gdi32: Remove no longer used driver entry points. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 10 ---------- dlls/gdi32/driver.c | 25 ------------------------- dlls/gdi32/enhmfdrv/init.c | 5 ----- dlls/gdi32/font.c | 5 ----- dlls/gdi32/mapping.c | 5 ----- dlls/gdi32/mfdrv/init.c | 5 ----- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 5 ----- dlls/wineandroid.drv/init.c | 5 ----- dlls/winemac.drv/gdi.c | 5 ----- dlls/wineps.drv/init.c | 5 ----- dlls/winex11.drv/init.c | 5 ----- dlls/winex11.drv/xrender.c | 5 ----- include/wine/gdi_driver.h | 7 +------ 14 files changed, 1 insertion(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f2850aeaa1592703847…

1 0

Francois Gouget : oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars().
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d8656b47676a3448a19d9ee2da0c337e3cb64e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8656b47676a3448a19d9ee2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 5 15:20:45 2021 +0200 oleaut32: Remove caching from VARIANT_GetLocalisedNumberChars(). GetLocaleInfoW() already caches the registry information and is fast enough. This also avoids using out-of-date information after a SetLocaleInfoW() call. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 12 +++--------- dlls/oleaut32/variant.c | 28 ---------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bed4de469df..89859988f1f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2198,7 +2198,7 @@ static void test_VarParseNumFromStrMisc(void) /* But SMONDECIMALSEP has no default! */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L""); hres = wconvert_str(L"3.9", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); @@ -2206,9 +2206,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" "); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2225,9 +2223,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" "); hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2235,9 +2231,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTFAIL; hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS,5,0,3); - todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2298,14 +2292,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"\xa0"); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Regular thousands separators also have precedence over the currency ones */ hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e4993de75a5..14ba63b9b2e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(variant); -static CRITICAL_SECTION cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cache_cs") } -}; -static CRITICAL_SECTION cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, @@ -1519,24 +1511,9 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; - static VARIANT_NUMBER_CHARS lastChars; - static LCID lastLcid = -1; - static DWORD lastFlags = 0; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; - /* To make caching thread-safe, a critical section is needed */ - EnterCriticalSection(&cache_cs); - - /* Asking for default locale entries is very expensive: It is a registry - server call. So cache one locally, as Microsoft does it too */ - if(lcid == lastLcid && dwFlags == lastFlags) - { - memcpy(lpChars, &lastChars, sizeof(defaultChars)); - LeaveCriticalSection(&cache_cs); - return; - } - memcpy(lpChars, &defaultChars, sizeof(defaultChars)); GET_NUMBER_TEXT(LOCALE_SNEGATIVESIGN, cNegativeSymbol); GET_NUMBER_TEXT(LOCALE_SPOSITIVESIGN, cPositiveSymbol); @@ -1556,11 +1533,6 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID } TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); - - memcpy(&lastChars, lpChars, sizeof(defaultChars)); - lastLcid = lcid; - lastFlags = dwFlags; - LeaveCriticalSection(&cache_cs); } /* Number Parsing States */

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryProperty stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 2c4601b6eed90ec69082adc556b0cfff70d868dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c4601b6eed90ec69082adc5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:48 2021 -0600 wlanapi: Add WlanHostedNetworkQueryProperty stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51469 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 11 +++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index d54cc1463ba..bbe560bcd8d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -172,6 +172,17 @@ DWORD WINAPI WlanQueryInterface(HANDLE handle, const GUID *guid, WLAN_INTF_OPCOD return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_OPCODE opcode, + DWORD *data_size, void **data, + WLAN_OPCODE_VALUE_TYPE *opcode_type, void *reserved) +{ + FIXME("(%p, 0x%x, %p, %p, %p, %p) stub\n", + handle, opcode, data_size, data, opcode_type, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 1c21ab5a2ea..8931112fcf8 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -14,6 +14,7 @@ @ stub WlanGetProfileCustomUserData @ stub WlanGetProfileList @ stub WlanGetSecuritySettings +@ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index a3288d7778b..10f7cae0f61 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -187,6 +187,14 @@ typedef struct _WLAN_AVAILABLE_NETWORK_LIST WLAN_AVAILABLE_NETWORK Network[1]; } WLAN_AVAILABLE_NETWORK_LIST, *PWLAN_AVAILABLE_NETWORK_LIST; +typedef enum _WLAN_HOSTED_NETWORK_OPCODE +{ + wlan_hosted_network_opcode_connection_settings, + wlan_hosted_network_opcode_security_settings, + wlan_hosted_network_opcode_station_profile, + wlan_hosted_network_opcode_enable +} WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: acb88df0113e1a637ee0b5bd6e645c00ebf92b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb88df0113e1a637ee0b5bd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:49 2021 -0600 wlanapi: Add WlanHostedNetworkQuerySecondaryKey stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 10 ++++++++++ dlls/wlanapi/wlanapi.spec | 1 + include/wlanapi.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index bbe560bcd8d..a865d39f40d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -183,6 +183,16 @@ DWORD WINAPI WlanHostedNetworkQueryProperty(HANDLE handle, WLAN_HOSTED_NETWORK_O return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, unsigned char *key, + BOOL *passphrase, BOOL *persistent, + WLAN_HOSTED_NETWORK_REASON *error, void *reserved) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p) stub\n", + handle, key_size, key, passphrase, persistent, error, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 8931112fcf8..c0ea019ba58 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -15,6 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/wlanapi.h b/include/wlanapi.h index 10f7cae0f61..80de128a60f 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -195,6 +195,39 @@ typedef enum _WLAN_HOSTED_NETWORK_OPCODE wlan_hosted_network_opcode_enable } WLAN_HOSTED_NETWORK_OPCODE, *PWLAN_HOSTED_NETWORK_OPCODE; +typedef enum _WLAN_HOSTED_NETWORK_REASON +{ + wlan_hosted_network_reason_success = 0, + wlan_hosted_network_reason_unspecified, + wlan_hosted_network_reason_bad_parameters, + wlan_hosted_network_reason_service_shutting_down, + wlan_hosted_network_reason_insufficient_resources, + wlan_hosted_network_reason_elevation_required, + wlan_hosted_network_reason_read_only, + wlan_hosted_network_reason_persistence_failed, + wlan_hosted_network_reason_crypt_error, + wlan_hosted_network_reason_impersonation, + wlan_hosted_network_reason_stop_before_start, + wlan_hosted_network_reason_interface_available, + wlan_hosted_network_reason_interface_unavailable, + wlan_hosted_network_reason_miniport_stopped, + wlan_hosted_network_reason_miniport_started, + wlan_hosted_network_reason_incompatible_connection_started, + wlan_hosted_network_reason_incompatible_connection_stopped, + wlan_hosted_network_reason_user_action, + wlan_hosted_network_reason_client_abort, + wlan_hosted_network_reason_ap_start_failed, + wlan_hosted_network_reason_peer_arrived, + wlan_hosted_network_reason_peer_departed, + wlan_hosted_network_reason_peer_timeout, + wlan_hosted_network_reason_gp_denied, + wlan_hosted_network_reason_service_unavailable, + wlan_hosted_network_reason_device_change, + wlan_hosted_network_reason_properties_change, + wlan_hosted_network_reason_virtual_station_blocking_use, + wlan_hosted_network_reason_service_available_on_virtual_station +} WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Alex Henrie : include: Move DOT11_PHY_TYPE to windot11.h.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 946c128bc2ab035d2d61f7683b7361e6ac864218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946c128bc2ab035d2d61f768… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:50 2021 -0600 include: Move DOT11_PHY_TYPE to windot11.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windot11.h | 38 ++++++++++++++++++++++++++++++++++++++ include/wlanapi.h | 18 ++---------------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9b397ffa183..3dbfe6561f2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -759,6 +759,7 @@ SOURCES = \ wincrypt.h \ windef.h \ windns.h \ + windot11.h \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.forcefeedback.idl \ diff --git a/include/windot11.h b/include/windot11.h new file mode 100644 index 00000000000..e14ed738213 --- /dev/null +++ b/include/windot11.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINDOT11_H +#define _WINDOT11_H + +typedef enum _DOT11_PHY_TYPE +{ + dot11_phy_type_unknown = 0x00, + dot11_phy_type_any = 0x00, + dot11_phy_type_fhss = 0x01, + dot11_phy_type_dsss = 0x02, + dot11_phy_type_irbaseband = 0x03, + dot11_phy_type_ofdm = 0x04, + dot11_phy_type_hrdsss = 0x05, + dot11_phy_type_erp = 0x06, + dot11_phy_type_ht = 0x07, + dot11_phy_type_vht = 0x08, + dot11_phy_type_IHV_start = 0x80000000, + dot11_phy_type_IHV_end = 0xFFFFFFFF +} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; + +#endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 80de128a60f..02b787e09a1 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -19,6 +19,8 @@ #ifndef _WLAN_WLANAPI_H #define _WLAN_WLANAPI_H +#include <windot11.h> + typedef enum _WLAN_INTERFACE_STATE { wlan_interface_state_not_ready, @@ -105,22 +107,6 @@ typedef enum _DOT11_CIPHER_ALGORITHM DOT11_CIPHER_ALGO_IHV_END = 0xFFFFFFFF } DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM; -typedef enum _DOT11_PHY_TYPE -{ - dot11_phy_type_unknown = 0x00, - dot11_phy_type_any = 0x00, - dot11_phy_type_fhss = 0x01, - dot11_phy_type_dsss = 0x02, - dot11_phy_type_irbaseband = 0x03, - dot11_phy_type_ofdm = 0x04, - dot11_phy_type_hrdsss = 0x05, - dot11_phy_type_erp = 0x06, - dot11_phy_type_ht = 0x07, - dot11_phy_type_vht = 0x08, - dot11_phy_type_IHV_start = 0x80000000, - dot11_phy_type_IHV_end = 0xFFFFFFFF -} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; - #define WLAN_MAX_PHY_TYPE_NUMBER 8 typedef struct _WLAN_AVAILABLE_NETWORK

1 0

Alex Henrie : wlanapi: Add WlanHostedNetworkQueryStatus stub.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d1b2097390c13fe241b978f82944084a1e9b4ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2097390c13fe241b978f8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 4 23:56:51 2021 -0600 wlanapi: Add WlanHostedNetworkQueryStatus stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 7 +++++++ dlls/wlanapi/wlanapi.spec | 1 + include/windot11.h | 3 +++ include/wlanapi.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index a865d39f40d..07264c9e136 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -193,6 +193,13 @@ DWORD WINAPI WlanHostedNetworkQuerySecondaryKey(HANDLE handle, DWORD *key_size, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanHostedNetworkQueryStatus(HANDLE handle, WLAN_HOSTED_NETWORK_STATUS *status, void *reserved) +{ + FIXME("(%p, %p, %p) stub\n", handle, status, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index c0ea019ba58..45d83c80b0f 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -16,6 +16,7 @@ @ stub WlanGetSecuritySettings @ stdcall WlanHostedNetworkQueryProperty(ptr long ptr ptr ptr ptr) @ stdcall WlanHostedNetworkQuerySecondaryKey(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WlanHostedNetworkQueryStatus(ptr ptr ptr) @ stub WlanIhvControl @ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter diff --git a/include/windot11.h b/include/windot11.h index e14ed738213..39effeb93ec 100644 --- a/include/windot11.h +++ b/include/windot11.h @@ -35,4 +35,7 @@ typedef enum _DOT11_PHY_TYPE dot11_phy_type_IHV_end = 0xFFFFFFFF } DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; +typedef UCHAR DOT11_MAC_ADDRESS[6]; +typedef DOT11_MAC_ADDRESS *PDOT11_MAC_ADDRESS; + #endif /* _WINDOT11_H */ diff --git a/include/wlanapi.h b/include/wlanapi.h index 02b787e09a1..13118cbf303 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -214,6 +214,36 @@ typedef enum _WLAN_HOSTED_NETWORK_REASON wlan_hosted_network_reason_service_available_on_virtual_station } WLAN_HOSTED_NETWORK_REASON, *PWLAN_HOSTED_NETWORK_REASON; +typedef enum _WLAN_HOSTED_NETWORK_STATE +{ + wlan_hosted_network_unavailable, + wlan_hosted_network_idle, + wlan_hosted_network_active +} WLAN_HOSTED_NETWORK_STATE, *PWLAN_HOSTED_NETWORK_STATE; + +typedef enum _WLAN_HOSTED_NETWORK_PEER_AUTH_STATE +{ + wlan_hosted_network_peer_state_invalid, + wlan_hosted_network_peer_state_authenticated +} WLAN_HOSTED_NETWORK_PEER_AUTH_STATE, *PWLAN_HOSTED_NETWORK_PEER_AUTH_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_PEER_STATE +{ + DOT11_MAC_ADDRESS PeerMacAddress; + WLAN_HOSTED_NETWORK_PEER_AUTH_STATE PeerAuthState; +} WLAN_HOSTED_NETWORK_PEER_STATE, *PWLAN_HOSTED_NETWORK_PEER_STATE; + +typedef struct _WLAN_HOSTED_NETWORK_STATUS +{ + WLAN_HOSTED_NETWORK_STATE HostedNetworkState; + GUID IPDeviceID; + DOT11_MAC_ADDRESS wlanHostedNetworkBSSID; + DOT11_PHY_TYPE dot11PhyType; + ULONG ulChannelFrequency; + DWORD dwNumberOfPeers; + WLAN_HOSTED_NETWORK_PEER_STATE PeerList[1]; +} WLAN_HOSTED_NETWORK_STATUS, *PWLAN_HOSTED_NETWORK_STATUS; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0