wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Francois Gouget : winebus.sys: Avoid calling strdup().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: a53591ad3cd5a7e549451587fd2b6a696da2c109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53591ad3cd5a7e549451587… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:28 2018 +0200 winebus.sys: Avoid calling strdup(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c..788b564 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -65,6 +65,7 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #ifdef HAS_PROPER_INPUT_HEADER @@ -1046,7 +1047,7 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, DWORD *product_id, WCHAR **serial_number) { DWORD bus_type; - char *tmp = strdup(uevent); + char *tmp; char *saveptr = NULL; char *line; char *key; @@ -1055,6 +1056,8 @@ static int parse_uevent_info(const char *uevent, DWORD *vendor_id, int found_id = 0; int found_serial = 0; + tmp = heap_alloc(strlen(uevent) + 1); + strcpy(tmp, uevent); line = strtok_r(tmp, "\n", &saveptr); while (line != NULL) { @@ -1092,7 +1095,7 @@ next_line: line = strtok_r(NULL, "\n", &saveptr); } - free(tmp); + heap_free(tmp); return (found_id && found_serial); }

1 0

Francois Gouget : dbghelp/tests: Make stack_walk_thread() static.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 44598d335e415267b247ba911b481830ea81f6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=44598d335e415267b247ba91… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:43:10 2018 +0200 dbghelp/tests: Make stack_walk_thread() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 1292b66..214adb7 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -23,7 +23,7 @@ #if defined(__i386__) || defined(__x86_64__) -DWORD CALLBACK stack_walk_thread(void *arg) +static DWORD CALLBACK stack_walk_thread(void *arg) { DWORD count = SuspendThread(GetCurrentThread()); ok(!count, "got %d\n", count);

1 0

Francois Gouget : msvfw32/tests: Make gdf_driver_proc() static.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 6480387cc6ee699c1bf9ca44e193127e9507e128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6480387cc6ee699c1bf9ca44… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:42:35 2018 +0200 msvfw32/tests: Make gdf_driver_proc() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 406a35b..7555015 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -331,7 +331,7 @@ static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; static BITMAPINFOHEADER gdf_in, *gdf_out; -LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, +static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { LRESULT ret = 0;

1 0

Gabriel Ivăncescu : user32/edit: Move common calls outside the blocks.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 3b9e22fafd051d1ab5e39beaa7800838422322b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9e22fafd051d1ab5e39bea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 13:55:04 2018 +0300 user32/edit: Move common calls outside the blocks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 96ecbec..48c65ea 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3474,22 +3474,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0u, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break;

1 0

Gabriel Ivăncescu : comctl32/edit: Move common calls outside the blocks.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 69ae3898c94b394ffb977fbc0468da382b453d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ae3898c94b394ffb977fbc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 13:55:03 2018 +0300 comctl32/edit: Move common calls outside the blocks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..f0180ad 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,22 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0u, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break;

1 0

Zhiyi Zhang : crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: a1e2c7fd2f7c4fb5377a0528bfcb03b3813747aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e2c7fd2f7c4fb5377a0528… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:54:00 2018 +0800 crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN. Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d7..41c87b7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81..e2a7633 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,

1 0

Zhiyi Zhang : crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 01262515b433669ab621b9cf9b3ae01c7c02b2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01262515b433669ab621b9cf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:52:55 2018 +0800 crypt32/tests: Add revocation flags tests for CertGetCertificateChain(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b2..a995c81 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError());

1 0

Dmitry Timoshkov : user32: Create a mask from alpha channel when loading a 32 bpp icon.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 1f75f426428b5896b837113dd149f90b7a05de46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f75f426428b5896b837113d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 14:00:13 2018 +0800 user32: Create a mask from alpha channel when loading a 32 bpp icon. This patch fixes applications that draw the 32 bpp icons manually. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73b..99337ab 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1144,6 +1144,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE DWORD size, color_size, mask_size; HBITMAP color = 0, mask = 0, alpha = 0; const void *color_bits, *mask_bits; + void *alpha_mask_bits = NULL; BITMAPINFO *bmi_copy; BOOL ret = FALSE; BOOL do_stretch; @@ -1266,7 +1267,27 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) + { alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); + if (!mask_size) /* generate mask from alpha */ + { + LONG x, y, dst_stride = ((bmi_width + 31) / 8) & ~3; + + if ((alpha_mask_bits = heap_calloc( bmi_height, dst_stride ))) + { + static const unsigned char masks[] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 }; + const DWORD *src = color_bits; + unsigned char *dst = alpha_mask_bits; + + for (y = 0; y < bmi_height; y++, src += bmi_width, dst += dst_stride) + for (x = 0; x < bmi_width; x++) + if (src[x] >> 24 != 0xff) dst[x >> 3] |= masks[x & 7]; + + mask_bits = alpha_mask_bits; + mask_size = bmi_height * dst_stride; + } + } + } /* convert info to monochrome to copy the mask */ if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) @@ -1301,6 +1322,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE done: DeleteDC( hdc ); HeapFree( GetProcessHeap(), 0, bmi_copy ); + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); if (ret) hObj = alloc_icon_handle( FALSE, 0 );

1 0

Alexandre Julliard : shell32: Fix some resources ids.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 86825b92c2c8f9535d2aedfe9afb6bd766ddfa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=86825b92c2c8f9535d2aedfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:41:55 2018 +0200 shell32: Fix some resources ids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 86ae802..28d18ec 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -518,7 +518,7 @@ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_MODEM_FOLDER ICON resources/folder.ico +IDI_SHELL_MODEM_FOLDER ICON resources/folder.ico /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico @@ -528,15 +528,15 @@ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_APP_FOLDER ICON resources/folder.ico +IDI_SHELL_APP_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_PRINTERS_FOLDER ICON resources/folder.ico +IDI_SHELL_PRINTERS_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_FONTS_FOLDER ICON resources/folder.ico +IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

Dmitry Timoshkov : shell32: Use Public instead of AllUsersProfile in the registry.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 27edd4e35c1eb3827dfb20578733242d9ed3d460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27edd4e35c1eb3827dfb2057… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 12:45:23 2018 +0800 shell32: Use Public instead of AllUsersProfile in the registry. This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 16 ++++++++-------- dlls/userenv/userenv_main.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d..fd375a3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -943,7 +943,7 @@ static const WCHAR UsersLibrariesFolderW[] = {'U','s','e','r','s','L','i','b','r static const WCHAR UserProfilesW[] = {'U','s','e','r','P','r','o','f','i','l','e','s',0}; static const WCHAR UserProgramFilesW[] = {'U','s','e','r','P','r','o','g','r','a','m','F','i','l','e','s',0}; static const WCHAR UserProgramFilesCommonW[] = {'U','s','e','r','P','r','o','g','r','a','m','F','i','l','e','s','C','o','m','m','o','n',0}; -static const WCHAR UsersPublicW[] = {'U','s','e','r','s','\\','P','u','b','l','i','c','\0'}; +static const WCHAR UsersPublicW[] = {'u','s','e','r','s','\\','P','u','b','l','i','c','\0'}; static const WCHAR VideosW[] = {'V','i','d','e','o','s','\0'}; static const WCHAR VideosLibraryW[] = {'V','i','d','e','o','s','L','i','b','r','a','r','y',0}; static const WCHAR Videos_librarymsW[] = {'V','i','d','e','o','s','.','l','i','b','r','a','r','y','-','m','s',0}; @@ -951,19 +951,17 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'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','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'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','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; static const WCHAR szKnownFolderDescriptions[] = {'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','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; static const WCHAR szKnownFolderRedirections[] = {'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','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s',0}; -static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; #define CHANGEREMOVEPROGRAMS_PARSING_GUID '{','7','b','8','1','b','e','6','a','-','c','e','2','b','-','4','6','7','6','-','a','2','9','e','-','e','b','9','0','7','a','5','1','2','6','c','5','}' #define SYNCMANAGER_PARSING_GUID '{','9','C','7','3','F','5','E','5','-','7','A','E','7','-','4','E','3','2','-','A','8','E','8','-','8','D','2','3','B','8','5','2','5','5','B','F','}' @@ -3806,11 +3804,13 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) { - WCHAR szAllUsers[MAX_PATH]; + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); + else FIXME("non-drive system paths unsupported\n"); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912..06c7653 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0};

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
62
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 August 2018