wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Rob Shearman : ntdll: Don' t read beyond the end of the array on the last ace iteration in RtlValidAcl .
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: f2f50f18dc1a6fab7a0ec68d8e8764e0f3399481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f50f18dc1a6fab7a0ec68d8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:28:32 2009 +0000 ntdll: Don't read beyond the end of the array on the last ace iteration in RtlValidAcl. --- dlls/ntdll/sec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 950b9dd..64efdb5 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1328,7 +1328,8 @@ BOOLEAN WINAPI RtlValidAcl(PACL pAcl) ret = FALSE; break; } - ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); + if (i != pAcl->AceCount) + ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } } }

1 0

Rob Shearman : oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: a94265e5a990bbffa7dbfc42bc0cd2d2392995b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94265e5a990bbffa7dbfc42b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:21:35 2009 +0000 oleaut32: Fix accessing beyond end of buffer and memory leak in test_DispCallFunc. The parameter isn't automatically converted by DispCallFunc, so make sure we pass in the correct size of memory for the function to store its BSTR in. --- dlls/oleaut32/tests/tmarshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 46f1cdc..ae4f2aa 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1388,7 +1388,7 @@ static void test_DispCallFunc(void) V_VT(&vararg[0]) = VT_R8; V_R8(&vararg[0]) = 3.141; V_VT(&vararg[1]) = VT_BSTR; - V_BSTR(&vararg[1]) = SysAllocString(szEmpty); + V_BSTRREF(&vararg[1]) = CoTaskMemAlloc(sizeof(BSTR)); V_VT(&vararg[2]) = VT_BSTR; V_BSTR(&vararg[2]) = SysAllocString(szEmpty); V_VT(&vararg[3]) = VT_VARIANT|VT_BYREF; @@ -1399,7 +1399,8 @@ static void test_DispCallFunc(void) hr = DispCallFunc(pWidget, 9*sizeof(void*), CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); ok_ole_success(hr, DispCallFunc); VariantClear(&varresult); - VariantClear(&vararg[1]); + SysFreeString(*V_BSTRREF(&vararg[1])); + CoTaskMemFree(V_BSTRREF(&vararg[1])); VariantClear(&vararg[2]); IWidget_Release(pWidget); }

1 0

Rob Shearman : ole32: Fix off-by-one error in FileMonikerImpl_DecomposePath .
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: db33e8fdd9b2a24b1b35b86a0e3814fd98356810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db33e8fdd9b2a24b1b35b86a0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 29 10:18:01 2009 +0000 ole32: Fix off-by-one error in FileMonikerImpl_DecomposePath. strgtable needs to be an array of the same size as str, including the nul-terminator. --- dlls/ole32/filemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index ff543aa..72f5913 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1048,7 +1048,7 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) TRACE("%s, %p\n", debugstr_w(str), *stringTable); - strgtable = CoTaskMemAlloc(len*sizeof(*strgtable)); + strgtable = CoTaskMemAlloc((len + 1)*sizeof(*strgtable)); if (strgtable==NULL) return E_OUTOFMEMORY;

1 0

Eric Pouech : dbghelp: In dwarf parsing, allow 64 bit wide values.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: db077e11adbb66f26d2ce7de8b79990a58d0ad2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db077e11adbb66f26d2ce7de8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Nov 28 13:24:01 2009 +0100 dbghelp: In dwarf parsing, allow 64 bit wide values. --- dlls/dbghelp/dwarf.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e5617c3..6006202 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -490,7 +490,9 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_data8: - FIXME("Unhandled 64bits support\n"); + attr->u.block.size = 8; + attr->u.block.ptr = data; + data += 8; break; case DW_FORM_ref1: @@ -1411,6 +1413,11 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, break; case DW_FORM_data8: + v.n1.n2.vt = VT_I1 | VT_BYREF; + v.n1.n2.n3.byref = pool_alloc(&subpgm->ctx->module->pool, value.u.block.size); + memcpy(v.n1.n2.n3.byref, value.u.block.ptr, value.u.block.size); + break; + default: FIXME("Unsupported form for const value %s (%lx)\n", name.u.string, value.form);

1 0

Paul Vriens : shell32/tests: Change a trace into a skip for skipped tests.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 404dcbcd65aa07b8a6ddbb9672f598b99a80a9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=404dcbcd65aa07b8a6ddbb967… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 27 13:27:59 2009 +0100 shell32/tests: Change a trace into a skip for skipped tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5e97f61..c673f0a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1095,7 +1095,7 @@ static void test_find_executable(void) * like '.mpeg', etc. * Also it means we cannot do any other test. */ - trace("FindExecutable() is broken -> skipping 4+ character extension tests\n"); + win_skip("FindExecutable() is broken -> not running 4+ character extension tests\n"); return; }

1 0

Paul Vriens : shell32/tests: Remove an unneeded HeapAlloc.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: e5d83ac6257193123b4c386d490fe625f8ff4e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d83ac6257193123b4c386d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 27 16:28:57 2009 +0100 shell32/tests: Remove an unneeded HeapAlloc. --- dlls/shell32/tests/progman_dde.c | 67 ++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index f1d7d31..7bc53d4 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -320,56 +320,47 @@ static void CheckWindowCreated(const char *winName, int closeWindow, int testPar static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldExist, int isGroup, const char *groupName, int testParams) { - char *path; + char path[MAX_PATH]; DWORD attributes; int len; - path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - if (path != NULL) - { - if (testParams & DDE_TEST_COMMON) - lstrcpyA(path, CommonPrograms); - else - lstrcpyA(path, Programs); + if (testParams & DDE_TEST_COMMON) + lstrcpyA(path, CommonPrograms); + else + lstrcpyA(path, Programs); - len = strlen(path) + strlen(nameToCheck)+1; + len = strlen(path) + strlen(nameToCheck)+1; + if (groupName != NULL) + { + len += strlen(groupName)+1; + } + ok (len <= MAX_PATH, "Path Too Long.%s\n", GetStringFromTestParams(testParams)); + if (len <= MAX_PATH) + { if (groupName != NULL) { - len += strlen(groupName)+1; + strcat(path, "\\"); + strcat(path, groupName); } - ok (len <= MAX_PATH, "Path Too Long.%s\n", GetStringFromTestParams(testParams)); - if (len <= MAX_PATH) + strcat(path, "\\"); + strcat(path, nameToCheck); + attributes = GetFileAttributes(path); + if (!shouldExist) { - if (groupName != NULL) + ok (attributes == INVALID_FILE_ATTRIBUTES , "File exists and shouldn't %s.%s\n", + path, GetStringFromTestParams(testParams)); + } else { + if (attributes == INVALID_FILE_ATTRIBUTES) { - strcat(path, "\\"); - strcat(path, groupName); - } - strcat(path, "\\"); - strcat(path, nameToCheck); - attributes = GetFileAttributes(path); - if (!shouldExist) - { - ok (attributes == INVALID_FILE_ATTRIBUTES , "File exists and shouldn't %s.%s\n", - path, GetStringFromTestParams(testParams)); + ok (FALSE, "Created File %s doesn't exist.%s\n", path, GetStringFromTestParams(testParams)); + } else if (isGroup) { + ok (attributes & FILE_ATTRIBUTE_DIRECTORY, "%s is not a folder (attr=%x).%s\n", + path, attributes, GetStringFromTestParams(testParams)); } else { - if (attributes == INVALID_FILE_ATTRIBUTES) - { - ok (FALSE, "Created File %s doesn't exist.%s\n", path, GetStringFromTestParams(testParams)); - } else if (isGroup) { - ok (attributes & FILE_ATTRIBUTE_DIRECTORY, "%s is not a folder (attr=%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } else { - ok (attributes & FILE_ATTRIBUTE_ARCHIVE, "Created File %s has wrong attributes (%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } + ok (attributes & FILE_ATTRIBUTE_ARCHIVE, "Created File %s has wrong attributes (%x).%s\n", + path, attributes, GetStringFromTestParams(testParams)); } } - HeapFree(GetProcessHeap(), 0, path); - } - else - { - ok (FALSE, "Could not Allocate Path Buffer\n"); } }

1 0

Paul Vriens : shell32/tests: Fix test failures on Vista and higher.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 1c6f813bc7bb53c83997e39b085e3d0c78ff5434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6f813bc7bb53c83997e39b0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 27 16:27:10 2009 +0100 shell32/tests: Fix test failures on Vista and higher. --- dlls/shell32/tests/progman_dde.c | 53 ++++++++++++++++++++++++++++++++++--- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index fd10298..f1d7d31 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -96,13 +96,20 @@ static void init_strings(void) if (pSHGetSpecialFolderPathA) { - /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) { /* Win9x */ lstrcpyA(CommonPrograms, Programs); } + if (GetProcAddress(GetModuleHandleA("shell32.dll"), "SHGetKnownFolderPath")) + { + /* Vista and higher use CSIDL_PROGRAMS for these tests. + * Wine doesn't have SHGetKnownFolderPath yet but should most likely follow + * this new ProgMan DDE behavior once implemented. + */ + lstrcpyA(CommonPrograms, Programs); + } pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); } @@ -542,12 +549,25 @@ static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command } } +static void CreateAddItemText(char *itemtext, const char *cmdline, const char *name) +{ + lstrcpyA(itemtext, "[AddItem("); + lstrcatA(itemtext, cmdline); + lstrcatA(itemtext, ","); + lstrcatA(itemtext, name); + lstrcatA(itemtext, ")]"); +} + /* 1st set of tests */ static int DdeTestProgman(DWORD instance, HCONV hConv) { HDDEDATA hData; UINT error; int testnum; + char temppath[MAX_PATH]; + char f1g1[MAX_PATH], f2g1[MAX_PATH], f3g1[MAX_PATH], f1g3[MAX_PATH], f2g3[MAX_PATH]; + char itemtext[MAX_PATH + 20]; + char comptext[2 * (MAX_PATH + 20) + 21]; testnum = 1; /* Invalid Command */ @@ -555,12 +575,23 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) ok (error == DMLERR_NOTPROCESSED, "InvalidCommand(), expected error %s, received %s.\n", GetStringFromError(DMLERR_NOTPROCESSED), GetStringFromError(error)); + /* On Vista+ the files have to exist when adding a link */ + GetTempPathA(MAX_PATH, temppath); + GetTempFileNameA(temppath, "dde", 0, f1g1); + GetTempFileNameA(temppath, "dde", 0, f2g1); + GetTempFileNameA(temppath, "dde", 0, f3g1); + GetTempFileNameA(temppath, "dde", 0, f1g3); + GetTempFileNameA(temppath, "dde", 0, f2g3); + /* CreateGroup Tests (including AddItem, DeleteItem) */ CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); - AddItemTest(instance, hConv, "[AddItem(c:\\f1g1,f1g1Name)]", DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); - AddItemTest(instance, hConv, "[AddItem(c:\\f2g1,f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); + CreateAddItemText(itemtext, f1g1, "f1g1Name"); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); + CreateAddItemText(itemtext, f2g1, "f2g1Name"); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_DELETEITEM|testnum++); - AddItemTest(instance, hConv, "[AddItem(c:\\f3g1,f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); + CreateAddItemText(itemtext, f3g1, "f3g1Name"); + AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); /* Create Group that already exists - same instance */ CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); @@ -575,12 +606,24 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); /* Compound Execute String Command */ - CompoundCommandTest(instance, hConv, "[CreateGroup(Group3)][AddItem(c:\\f1g3,f1g3Name)][AddItem(c:\\f2g3,f2g3Name)]", DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMMON|DDE_TEST_COMPOUND|testnum++); + lstrcpyA(comptext, "[CreateGroup(Group3)]"); + CreateAddItemText(itemtext, f1g3, "f1g3Name"); + lstrcatA(comptext, itemtext); + CreateAddItemText(itemtext, f2g3, "f2g3Name"); + lstrcatA(comptext, itemtext); + CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMMON|DDE_TEST_COMPOUND|testnum++); + DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); /* Full Parameters of Add Item */ /* AddItem(CmdLine[,Name[,IconPath[,IconIndex[,xPos,yPos[,DefDir[,HotKey[,fMinimize[fSeparateSpace]]]]]]]) */ + DeleteFileA(f1g1); + DeleteFileA(f2g1); + DeleteFileA(f3g1); + DeleteFileA(f1g3); + DeleteFileA(f2g3); + return testnum; }

1 0

Paul Vriens : shell32/tests: Use ReadCabinetState to check title logic.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 98fef79f2d976658fdf7fde234a5e7d948d98072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fef79f2d976658fdf7fde23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 27 16:26:22 2009 +0100 shell32/tests: Use ReadCabinetState to check title logic. --- dlls/shell32/tests/progman_dde.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 8902d90..fd10298 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -67,6 +67,7 @@ #define DDE_TEST_NUMMASK 0x0000ffff static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); +static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); static void init_function_pointers(void) { @@ -74,6 +75,9 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); + pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); + if (!pReadCabinetState) + pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651); } static char CommonPrograms[MAX_PATH]; @@ -87,10 +91,8 @@ static char StartupTitle[MAX_PATH] = "Startup"; static void init_strings(void) { - HKEY key; - DWORD fullpath = 0; - DWORD size; char startup[MAX_PATH]; + CABINETSTATE cs; if (pSHGetSpecialFolderPathA) { @@ -106,6 +108,8 @@ static void init_strings(void) } else { + HKEY key; + DWORD size; LONG res; /* Older Win9x and NT4 */ @@ -128,11 +132,9 @@ static void init_strings(void) RegCloseKey(key); } - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); - size = sizeof(DWORD); - RegQueryValueExA(key, "FullPath", NULL, NULL, (LPBYTE)&fullpath, &size); - RegCloseKey(key); - if (fullpath == 1) + memset(&cs, 0, sizeof(cs)); + pReadCabinetState(&cs, sizeof(cs)); + if (cs.fFullPathTitle == -1) { lstrcpyA(Group1Title, CommonPrograms); lstrcatA(Group1Title, "\\Group1");

1 0

Paul Vriens : shell32/tests: Cope with systems lacking SHGetSpecialFolderPath.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: f8134cee102f33b585f30011f02674cc4280e660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8134cee102f33b585f30011f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 26 20:20:08 2009 +0100 shell32/tests: Cope with systems lacking SHGetSpecialFolderPath. --- dlls/shell32/tests/progman_dde.c | 53 +++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 6ba22ed..8902d90 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -89,23 +89,47 @@ static void init_strings(void) { HKEY key; DWORD fullpath = 0; - DWORD size = sizeof(DWORD); + DWORD size; char startup[MAX_PATH]; - if (!pSHGetSpecialFolderPathA) - return; - - /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ - pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); - if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) + if (pSHGetSpecialFolderPathA) { - /* Win9x */ - lstrcpyA(CommonPrograms, Programs); + /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ + pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); + if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) + { + /* Win9x */ + lstrcpyA(CommonPrograms, Programs); + } + pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + } + else + { + LONG res; + + /* Older Win9x and NT4 */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); + size = sizeof(CommonPrograms); + res = RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&CommonPrograms, &size); + RegCloseKey(key); + if (res != ERROR_SUCCESS) + { + /* Win9x */ + lstrcpyA(CommonPrograms, Programs); + } + + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); + size = sizeof(Programs); + RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&Programs, &size); + size = sizeof(startup); + RegQueryValueExA(key, "Startup", NULL, NULL, (LPBYTE)&startup, &size); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + RegCloseKey(key); } - pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); - lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); + size = sizeof(DWORD); RegQueryValueExA(key, "FullPath", NULL, NULL, (LPBYTE)&fullpath, &size); RegCloseKey(key); if (fullpath == 1) @@ -291,9 +315,6 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx DWORD attributes; int len; - if (!pSHGetSpecialFolderPathA) - return; - path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (path != NULL) { @@ -580,10 +601,6 @@ START_TEST(progman_dde) init_function_pointers(); init_strings(); - /* Only report this once */ - if (!pSHGetSpecialFolderPathA) - win_skip("SHGetSpecialFolderPathA is not available\n"); - /* Initialize DDE Instance */ err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));

1 0

Paul Vriens : shell32/tests: Only fetch some special folders once.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: d5dac6c43d672b761c30c82dd1fa2274989cf22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5dac6c43d672b761c30c82dd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 26 19:17:25 2009 +0100 shell32/tests: Only fetch some special folders once. --- dlls/shell32/tests/progman_dde.c | 47 +++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0ea7571..6ba22ed 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -76,6 +76,9 @@ static void init_function_pointers(void) pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); } +static char CommonPrograms[MAX_PATH]; +static char Programs[MAX_PATH]; + static char Group1Title[MAX_PATH] = "Group1"; static char Group2Title[MAX_PATH] = "Group2"; static char Group3Title[MAX_PATH] = "Group3"; @@ -87,31 +90,34 @@ static void init_strings(void) HKEY key; DWORD fullpath = 0; DWORD size = sizeof(DWORD); + char startup[MAX_PATH]; if (!pSHGetSpecialFolderPathA) return; + /* FIXME: On Vista+ we should only use CSIDL_PROGRAMS */ + pSHGetSpecialFolderPathA(NULL, Programs, CSIDL_PROGRAMS, FALSE); + if (!pSHGetSpecialFolderPathA(NULL, CommonPrograms, CSIDL_COMMON_PROGRAMS, FALSE)) + { + /* Win9x */ + lstrcpyA(CommonPrograms, Programs); + } + pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); + lstrcpyA(Startup, (strrchr(startup, '\\') + 1)); + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); RegQueryValueExA(key, "FullPath", NULL, NULL, (LPBYTE)&fullpath, &size); RegCloseKey(key); if (fullpath == 1) { - BOOL ret; - char commonprog[MAX_PATH], startup[MAX_PATH]; - - ret = pSHGetSpecialFolderPathA(NULL, commonprog, CSIDL_COMMON_PROGRAMS, FALSE); - if (!ret) /* Win9x */ - pSHGetSpecialFolderPathA(NULL, commonprog, CSIDL_PROGRAMS, FALSE); - lstrcpyA(Group1Title, commonprog); + lstrcpyA(Group1Title, CommonPrograms); lstrcatA(Group1Title, "\\Group1"); - lstrcpyA(Group2Title, commonprog); + lstrcpyA(Group2Title, CommonPrograms); lstrcatA(Group2Title, "\\Group2"); - lstrcpyA(Group3Title, commonprog); + lstrcpyA(Group3Title, CommonPrograms); lstrcatA(Group3Title, "\\Group3"); - pSHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); lstrcpyA(StartupTitle, startup); - lstrcpyA(Startup, (strrchr(StartupTitle, '\\') + 1)); } } @@ -282,7 +288,6 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx const char *groupName, int testParams) { char *path; - int err; DWORD attributes; int len; @@ -292,21 +297,11 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx path = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); if (path != NULL) { - int specialFolder; - - err = FALSE; - /* Win 9x doesn't support common */ if (testParams & DDE_TEST_COMMON) - { - specialFolder = CSIDL_COMMON_PROGRAMS; - err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); - /* Win 9x fails, use CSIDL_PROGRAMS (err == FALSE) */ - } - if (err == FALSE) - { - specialFolder = CSIDL_PROGRAMS; - err = pSHGetSpecialFolderPathA(NULL, path, specialFolder, FALSE); - } + lstrcpyA(path, CommonPrograms); + else + lstrcpyA(path, Programs); + len = strlen(path) + strlen(nameToCheck)+1; if (groupName != NULL) {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
91
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 November 2009