wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Hans Leidekker : msi: Use wide character string literals in classes.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: e7dd9b3f3694b276d50ccfb5515e7e0f70b1c555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dd9b3f3694b276d50ccfb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:50 2020 +0100 msi: Use wide character string literals in classes.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 266 ++++++++++++++++++++--------------------------------- 1 file changed, 100 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7dd9b3f3694b276d50c…

1 0

Hans Leidekker : msi: Use wide character string literals in registry.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 2672646eaeb1877e0d746e8554529396ec8d9eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2672646eaeb1877e0d746e85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:49 2020 +0100 msi: Use wide character string literals in registry.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 349 ++++++++++++++++------------------------------------ 1 file changed, 104 insertions(+), 245 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2672646eaeb1877e0d74…

1 0

Hans Leidekker : msi: Use wide character string literals in package.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 731bb72c3d00b089ee23297efdfe0496733e96a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bb72c3d00b089ee23297e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:48 2020 +0100 msi: Use wide character string literals in package.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 526 ++++++++++++++++++----------------------------------- 1 file changed, 179 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731bb72c3d00b089ee23…

1 0

Hans Leidekker : msi: Use wide character string literals in msi.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 8255da2249816b77b709d1e6c888760c5e59a8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8255da2249816b77b709d1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:47 2020 +0100 msi: Use wide character string literals in msi.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 182 ++++++++++++++++++++------------------------------------- 1 file changed, 64 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8255da2249816b77b709…

1 0

Hans Leidekker : msi: Use wide character string literals in dialog.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: d9fbe788af65c2b2696c446d765a34ae40e3226b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fbe788af65c2b2696c446d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:46 2020 +0100 msi: Use wide character string literals in dialog.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 500 +++++++++++++++++++----------------------------------- 1 file changed, 174 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fbe788af65c2b2696c…

1 0

Alexandre Julliard : gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 72272d0088d15e53ebafea53cdec9f908ac61c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72272d0088d15e53ebafea53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:14:01 2020 +0100 gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 8 +++++++- dlls/gdi32/freetype.c | 22 ++++++++-------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b74632c882b..bb1c07c6f9e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1053,13 +1053,19 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *bu static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); + struct char_width_info *info = ptr; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidthInfo ); return dev->funcs->pGetCharWidthInfo( dev, ptr ); } - return font_funcs->pGetCharWidthInfo( physdev->font, ptr ); + + info->unk = 0; + if (!physdev->font->scalable || !font_funcs->get_char_width_info( physdev->font, info )) + info->lsb = info->rsb = 0; + + return TRUE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1d076e77cf8..82a7e6f01b7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6654,29 +6654,23 @@ done: } /************************************************************* - * freetype_GetCharWidthInfo + * freetype_get_char_width_info */ -static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct char_width_info *info ) +static BOOL CDECL freetype_get_char_width_info( struct gdi_font *font, struct char_width_info *info ) { - GdiFont *font = get_font_ptr(gdi_font); + FT_Face face = get_font_ptr(font)->ft_face; TT_HoriHeader *pHori; TRACE("%p, %p\n", font, info); - if (gdi_font->scalable && - (pHori = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_hhea))) + if ((pHori = pFT_Get_Sfnt_Table(face, ft_sfnt_hhea))) { - FT_Fixed em_scale; - em_scale = MulDiv(gdi_font->ppem, 1 << 16, font->ft_face->units_per_EM); + FT_Fixed em_scale = MulDiv(font->ppem, 1 << 16, face->units_per_EM); info->lsb = (SHORT)pFT_MulFix(pHori->min_Left_Side_Bearing, em_scale); info->rsb = (SHORT)pFT_MulFix(pHori->min_Right_Side_Bearing, em_scale); + return TRUE; } - else - info->lsb = info->rsb = 0; - - info->unk = 0; - - return TRUE; + return FALSE; } @@ -6973,7 +6967,6 @@ static const struct font_backend_funcs font_funcs = { freetype_EnumFonts, freetype_FontIsLinked, - freetype_GetCharWidthInfo, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6984,6 +6977,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_default_glyph, freetype_get_glyph_outline, freetype_get_unicode_ranges, + freetype_get_char_width_info, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e180121ae40..7d2f5e0240e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -366,7 +366,6 @@ struct font_backend_funcs { BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); - BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); + BOOL (CDECL *get_char_width_info)( struct gdi_font *font, struct char_width_info *info ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Alexandre Julliard : gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 374944994360590cea79ebd5da42bdaf9f092d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374944994360590cea79ebd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:13:53 2020 +0100 gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++++++- dlls/gdi32/freetype.c | 28 +++++++--------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a587715d6c3..b74632c882b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1118,13 +1118,23 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) { struct font_physdev *physdev = get_font_dev( dev ); + DWORD size, num_ranges; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetFontUnicodeRanges ); return dev->funcs->pGetFontUnicodeRanges( dev, glyphset ); } - return font_funcs->pGetFontUnicodeRanges( physdev->font, glyphset ); + + num_ranges = font_funcs->get_unicode_ranges( physdev->font, glyphset ); + size = offsetof( GLYPHSET, ranges[num_ranges] ); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; + } + return size; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3959261e609..1d076e77cf8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6680,12 +6680,16 @@ static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct c } -/* Retrieve a list of supported Unicode ranges for a given font. +/************************************************************* + * freetype_get_unicode_ranges + * + * Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. */ -static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) +static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) { + FT_Face face = get_font_ptr(font)->ft_face; DWORD num_ranges = 0; if (face->charmap->encoding == FT_ENCODING_UNICODE) @@ -6744,24 +6748,6 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) return num_ranges; } -/************************************************************* - * freetype_GetFontUnicodeRanges - */ -static DWORD CDECL freetype_GetFontUnicodeRanges( struct gdi_font *font, GLYPHSET *glyphset ) -{ - DWORD size, num_ranges; - - num_ranges = get_font_unicode_ranges(get_font_ptr(font)->ft_face, glyphset); - size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); - if (glyphset) - { - glyphset->cbThis = size; - glyphset->cRanges = num_ranges; - glyphset->flAccel = 0; - } - return size; -} - /************************************************************* * freetype_FontIsLinked */ @@ -6988,7 +6974,6 @@ static const struct font_backend_funcs font_funcs = freetype_EnumFonts, freetype_FontIsLinked, freetype_GetCharWidthInfo, - freetype_GetFontUnicodeRanges, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6998,6 +6983,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_index, freetype_get_default_glyph, freetype_get_glyph_outline, + freetype_get_unicode_ranges, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b37cf598e9..e180121ae40 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -367,7 +367,6 @@ struct font_backend_funcs BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); - DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); + DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Michael Stefaniuc : sapi/tests: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 85458d804a5def9df5f854e518998dd189bb974e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85458d804a5def9df5f854e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:08 2020 +0100 sapi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 1ca49398ad1..47196d42dc7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -54,7 +54,6 @@ static void test_token_category(void) ISpObjectTokenCategory *cat; IEnumSpObjectTokens *enum_tokens; HRESULT hr; - WCHAR bogus[] = {'b','o','g','u','s',0}; ULONG count; hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, @@ -64,7 +63,7 @@ static void test_token_category(void) hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); - hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + hr = ISpObjectTokenCategory_SetId( cat, L"bogus", FALSE ); ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE );

1 0

Michael Stefaniuc : powrprof: Use wide-char string literals.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: 6594079920602a8b1f97817a6ad27364265b2a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6594079920602a8b1f97817a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:10 2020 +0100 powrprof: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 5f00c7b6317..fc6f5706f87 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -45,20 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof); * implementing these functions is going to have to wait until somebody can * cobble together some sane test input. */ -static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', - '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', - 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', - 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; static HANDLE PPRegSemaphore = NULL; NTSTATUS WINAPI CallNtPowerInformation( @@ -172,7 +159,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) return TRUE; } - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); @@ -183,7 +170,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); @@ -360,14 +347,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } else { BYTE lpValue[40]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"LastID", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } RegCloseKey(hKey); } - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE;

1 0

Michael Stefaniuc : sapi: Zero terminate some WCHAR strings.
by Alexandre Julliard 28 Oct '20

28 Oct '20

Module: wine Branch: master Commit: cc32682130b88decf506df6dceef426c51bd3c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc32682130b88decf506df6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:09 2020 +0100 sapi: Zero terminate some WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020