December 2015 - Wine-Commits

Austin English : pdh: Add PdhGetLogFileTypeA/W stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: a0e2a3f20a472a642ad85111ad06eb5436a28146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e2a3f20a472a642ad85111a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:31:20 2015 -0600 pdh: Add PdhGetLogFileTypeA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index fc1aa4f..529b92d 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -62,8 +62,8 @@ @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize -@ stub PdhGetLogFileTypeA -@ stub PdhGetLogFileTypeW +@ stdcall PdhGetLogFileTypeA(ptr ptr) +@ stdcall PdhGetLogFileTypeW(ptr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 2631fe1..036d28b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1269,3 +1269,21 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) FIXME("%u\n", source); return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhGetLogFileTypeA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeA(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhGetLogFileTypeW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +}

1 0

André Hentschel : version: Remove dead assignments ( Clang).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: ded403c4f315e08c61a0cd7e6f41650af452da39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded403c4f315e08c61a0cd7e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:13 2015 +0100 version: Remove dead assignments (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index b2b0b08..43f5c18 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1199,7 +1199,6 @@ DWORD WINAPI VerFindFileA( GetSystemDirectoryA(systemDir, sizeof(systemDir)); curDir = ""; - destDir = ""; if(flags & VFFF_ISSHAREDFILE) { @@ -1296,7 +1295,6 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); curDir = &emptyW; - destDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) {

1 0

Jeremy White : kernel32/tests: Test GetLongPathNameA when the file name case differs from the input.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: ee1260e0d2c50a7eec7d9e7444b8ff4d622bbad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1260e0d2c50a7eec7d9e744… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:12 2015 -0600 kernel32/tests: Test GetLongPathNameA when the file name case differs from the input. This shows that the original buffer is unmodified if the filename is long, but the actual file name is returned when the filename is short. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 37d14cc..9475aa0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -861,14 +861,25 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* Don't Starve relies on GetLongPathName returning the passed in filename, even if the actual file on disk has a different case or separator */ if (pGetLongPathNameA) { + int len = lstrlenA(LONGDIR) + 1; sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + tmpstr[len] = tolower(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + len = lstrlenA(SHORTDIR) + 1; + tmpstr[len] = toupper(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0 && lstrcmpA(tmpstr,tmpstr1) != 0, + "GetLongPathNameA returned '%s' instead of '%s/%s'\n",tmpstr1,SHORTDIR,SHORTFILE); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n");

1 0

Jeremy White : kernel32: Advance over the input buffer when stripping ./.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 440030b93848d1c41f532cac21320f75a8c67231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440030b93848d1c41f532cac2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:08 2015 -0600 kernel32: Advance over the input buffer when stripping ./. This is the same fix for GetLongPathName that was contained in a fix for GetShortPathName in commit 9178d037d71e823f5d5eaa5008a3cdd574377bac. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + dlls/kernel32/tests/path.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ff94227..ec14b35 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -349,6 +349,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen { tmplongpath[lp++] = *p++; tmplongpath[lp++] = *p++; + sp += 2; } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e90a260..4504603 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2138,9 +2138,7 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); - todo_wine ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH);

1 0

Sebastian Lackner : kernel32/tests: Add test for process object destruction.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: a0b6bf86f74438c574f7165ab220060681bb66cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b6bf86f74438c574f7165ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 13:06:37 2015 +0100 kernel32/tests: Add test for process object destruction. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f186c94..b88db45 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -33,11 +33,14 @@ #include "wincon.h" #include "winnls.h" #include "winternl.h" +#include "tlhelp32.h" #include "wine/test.h" /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +/* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) #define expect_eq_d(expected, actual) \ do { \ @@ -79,6 +82,12 @@ static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); +static BOOL (WINAPI *pProcess32First)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); +static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); + /* ############################### */ static char base[MAX_PATH]; @@ -237,6 +246,12 @@ static BOOL init(void) pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); + pCreateToolhelp32Snapshot = (void *)GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); + pProcess32First = (void *)GetProcAddress(hkernel32, "Process32First"); + pProcess32Next = (void *)GetProcAddress(hkernel32, "Process32Next"); + pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); + pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); + return TRUE; } @@ -287,6 +302,8 @@ static void doChild(const char* file, const char* option) char bufA[MAX_PATH]; WCHAR bufW[MAX_PATH]; HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + HANDLE snapshot; + PROCESSENTRY32 pe; BOOL ret; if (hFile == INVALID_HANDLE_VALUE) return; @@ -341,6 +358,26 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "CommandLineA=%s\n", encodeA(GetCommandLineA())); childPrintf(hFile, "CommandLineW=%s\n\n", encodeW(GetCommandLineW())); + /* output toolhelp information */ + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ProcessID != GetCurrentProcessId()) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ProcessID == GetCurrentProcessId(), "failed to find current process in snapshot\n"); + childPrintf(hFile, + "[Toolhelp]\ncntUsage=%u\nth32DefaultHeapID=%lu\n" + "th32ModuleID=%u\ncntThreads=%u\nth32ParentProcessID=%u\n" + "pcPriClassBase=%u\ndwFlags=%u\nszExeFile=%s\n\n", + pe.cntUsage, pe.th32DefaultHeapID, pe.th32ModuleID, + pe.cntThreads, pe.th32ParentProcessID, pe.pcPriClassBase, + pe.dwFlags, encodeA(pe.szExeFile)); + /* output of environment (Ansi) */ ptrA_save = ptrA = GetEnvironmentStringsA(); if (ptrA) @@ -1065,6 +1102,112 @@ static void test_Directory(void) ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n"); } +static void test_Toolhelp(void) +{ + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + HANDLE process, thread, snapshot; + PROCESSENTRY32 pe; + THREADENTRY32 te; + DWORD ret; + int i; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c nested \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + CloseHandle(process); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + for (i = 0; i < 20; i++) + { + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process || GetLastError() == ERROR_INVALID_PARAMETER, "OpenProcess failed %u\n", GetLastError()); + if (!process) break; + CloseHandle(process); + Sleep(100); + } + /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ + todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ParentProcessID != info.dwProcessId) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&te, 0, sizeof(te)); + te.dwSize = sizeof(te); + if (pThread32First(snapshot, &te)) + { + while (te.th32OwnerProcessID != pe.th32ProcessID) + if (!pThread32Next(snapshot, &te)) break; + } + CloseHandle(snapshot); + ok(te.th32OwnerProcessID == pe.th32ProcessID, "failed to find suspended thread\n"); + + thread = OpenThread(THREAD_ALL_ACCESS_NT4, FALSE, te.th32ThreadID); + ok(thread != NULL, "OpenThread failed %u\n", GetLastError()); + ret = ResumeThread(thread); + ok(ret == 1, "expected 1, got %u\n", ret); + CloseHandle(thread); + + ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(process); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); +} + static BOOL is_str_env_drive_dir(const char* str) { return str[0] == '=' && str[1] >= 'A' && str[1] <= 'Z' && str[2] == ':' && @@ -2989,6 +3132,23 @@ START_TEST(process) Sleep(100); return; } + else if (!strcmp(myARGV[2], "nested") && myARGC >= 4) + { + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, myARGV[3]); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -2998,6 +3158,7 @@ START_TEST(process) test_Startup(); test_CommandLine(); test_Directory(); + test_Toolhelp(); test_Environment(); test_SuspendFlag(); test_DebuggingFlag();

1 0

Jeremy White : kernel32/tests: Add tests for GetLongPathName using a slash delimiter.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 60836b41fa7cfc6505763a357d2296598edd5fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60836b41fa7cfc6505763a357… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:09 2015 -0600 kernel32/tests: Add tests for GetLongPathName using a slash delimiter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4504603..0e9415c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -858,6 +858,21 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(SHORTFILE,strptr)==0, "GetFullPathNameA returned part '%s' instead of '%s'\n",strptr,SHORTFILE); } + /* Don't Starve relies on GetLongPathName returning the passed in filename, + even if the actual file on disk has a different case or separator */ + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE); ok(GetFullPathNameA(tmpstr,MAX_PATH,tmpstr1,&strptr),"GetFullPathNameA failed\n");

1 0

Nikolay Sivov : ole32: Use OleRun() in OleCreate() instead of unrolling what it does.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: b19ad3af80684b92e5555284d57e78d0bcdec226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19ad3af80684b92e5555284d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:57 2015 +0300 ole32: Use OleRun() in OleCreate() instead of unrolling what it does. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5bfd8a3..cec8c00 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2574,21 +2574,12 @@ HRESULT WINAPI OleCreate( if (((renderopt == OLERENDER_DRAW) || (renderopt == OLERENDER_FORMAT)) && SUCCEEDED(hres)) { - IRunnableObject *pRunnable; - IOleCache *pOleCache; - HRESULT hres2; - - hres2 = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); - if (SUCCEEDED(hres2)) - { - hres = IRunnableObject_Run(pRunnable, NULL); - IRunnableObject_Release(pRunnable); - } - + hres = OleRun(pUnk); if (SUCCEEDED(hres)) { - hres2 = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); - if (SUCCEEDED(hres2)) + IOleCache *pOleCache; + + if (SUCCEEDED(IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache))) { DWORD dwConnection; if (renderopt == OLERENDER_DRAW && !pFormatEtc) {

1 0

Austin English : setupapi: Add SetupDiSelectBestCompatDrv stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9ad0bc63725bc32176b5bb75b58c7341c7bdebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad0bc63725bc32176b5bb75b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:39:14 2015 -0600 setupapi: Add SetupDiSelectBestCompatDrv stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c1dbed5..4486994 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,6 +381,7 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a57f5fe..ffc766b 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -594,6 +594,17 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M } /*********************************************************************** + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiSetSelectedDevice (SETUPAPI.@) */ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData)

1 0

Jeremy White : kernel32/tests: Add a test for GetShortPathName using a slash delimieter.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 17ddd0474f1a310ad6fe169fcee44c40fde92b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ddd0474f1a310ad6fe169fc… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:10 2015 -0600 kernel32/tests: Add a test for GetShortPathName using a slash delimieter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0e9415c..63666c6 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -872,6 +872,11 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE);

1 0

Nikolay Sivov : ole32/tests: Simple test for aggregation in CreateDataCache().
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: d66af9c185985bae3fc804c2adff7ceb7ec91f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66af9c185985bae3fc804c2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:59 2015 +0300 ole32/tests: Simple test for aggregation in CreateDataCache(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 73 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 058e5ec..3845ec2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1496,6 +1496,39 @@ static IDataObjectVtbl DataObjectVtbl = static IDataObject DataObject = { &DataObjectVtbl }; +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + ok(0, "unexpected AddRef\n"); + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + ok(0, "unexpected Release\n"); + return 1; +} + +static const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + +static IUnknown unknown = { &UnknownVtbl }; + static void test_data_cache(void) { HRESULT hr; @@ -1566,6 +1599,17 @@ static void test_data_cache(void) hr = StgCreateDocfile(NULL, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &pStorage); ok_ole_success(hr, "StgCreateDocfile"); + /* aggregation */ + + /* requested is not IUnknown */ + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + IOleCache2_Release(pOleCache); + /* Test with new data */ hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); @@ -2214,34 +2258,6 @@ static void test_runnable(void) g_showRunnable = TRUE; } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; - if (*ppv) - { - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - return 2; -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - return 1; -} - -static const IUnknownVtbl UnknownVtbl = -{ - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { @@ -2314,7 +2330,6 @@ static const IRunnableObjectVtbl oleruntestvtbl = OleRun_SetContainedObject }; -static IUnknown unknown = { &UnknownVtbl }; static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void)

1 0