March 2008 - Wine-commits - list.winehq.org

Austin English : winecfg: Raise max screen resolution to 160 DPI.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: d817d7c2205044b54dc6f05eb86c5d389a3babb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d817d7c2205044b54dc6f05eb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 3 22:09:53 2008 -0600 winecfg: Raise max screen resolution to 160 DPI. --- programs/winecfg/x11drvdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 51098e4..d6e9912 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ #define MINDPI 96 -#define MAXDPI 120 +#define MAXDPI 160 #define DEFDPI 96 static const char logpixels_reg[] = "System\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts";

1 0

James Hawkins : msi: Implement MsiGetProductInfoEx.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: ad70693539a634a28a2c2e4816bb7f085c91fd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad70693539a634a28a2c2e481… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 4 03:08:19 2008 -0600 msi: Implement MsiGetProductInfoEx. --- dlls/msi/msi.c | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msi.spec | 4 +- include/msi.h | 4 + 3 files changed, 292 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad70693539a634a28a2c2…

1 0

James Hawkins : msi: Add tests for MsiGetProductInfoEx.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 4609eccd720af4dc38b22e82df8d2de665ba629a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4609eccd720af4dc38b22e82d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 4 03:09:40 2008 -0600 msi: Add tests for MsiGetProductInfoEx. --- dlls/msi/tests/msi.c | 2733 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 2733 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4609eccd720af4dc38b22…

1 0

Roy Shea : qmgr: Implement IEnumBackgroundCopyJobs_GetCount.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 8dfba77c8cfcf235ee2c6b8927059c8b97f9ac0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfba77c8cfcf235ee2c6b892… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Mar 3 16:46:08 2008 -0800 qmgr: Implement IEnumBackgroundCopyJobs_GetCount. --- dlls/qmgr/enum_jobs.c | 39 +++++++++++- dlls/qmgr/qmgr.h | 3 + dlls/qmgr/tests/Makefile.in | 1 + dlls/qmgr/tests/enum_jobs.c | 152 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 193 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 54ecaab..6d14791 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -25,6 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) { + ULONG i; + + for(i = 0; i < This->numJobs; i++) + IBackgroundCopyJob_Release(This->jobs[i]); + + HeapFree(GetProcessHeap(), 0, This->jobs); HeapFree(GetProcessHeap(), 0, This); } @@ -105,8 +111,9 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount( IEnumBackgroundCopyJobs* iface, ULONG *puCount) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + *puCount = This->numJobs; + return S_OK; } static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = @@ -124,7 +131,10 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyManager* copyManager) { + BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager; EnumBackgroundCopyJobsImpl *This; + BackgroundCopyJobImpl *job; + ULONG i; TRACE("%p, %p)\n", ppObj, copyManager); @@ -134,6 +144,31 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, This->lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; This->ref = 1; + /* Create array of jobs */ + This->indexJobs = 0; + This->numJobs = list_count(&qmgr->jobs); + + if (0 < This->numJobs) + { + This->jobs = HeapAlloc(GetProcessHeap(), 0, + This->numJobs * sizeof *This->jobs); + if (!This->jobs) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } + } + else + This->jobs = NULL; + + i = 0; + LIST_FOR_EACH_ENTRY(job, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + IBackgroundCopyJob *iJob = (IBackgroundCopyJob *) job; + IBackgroundCopyJob_AddRef(iJob); + This->jobs[i++] = iJob; + } + *ppObj = &This->lpVtbl; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index f5629c6..2ab3f57 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -48,6 +48,9 @@ typedef struct { const IEnumBackgroundCopyJobsVtbl *lpVtbl; LONG ref; + IBackgroundCopyJob **jobs; + ULONG numJobs; + ULONG indexJobs; } EnumBackgroundCopyJobsImpl; /* Enum background copy files vtbl and related data */ diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 840676d..9a3c596 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = ole32 shlwapi user32 kernel32 CTESTS = \ enum_files.c \ + enum_jobs.c \ file.c \ job.c \ qmgr.c diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c new file mode 100644 index 0000000..20344d3 --- /dev/null +++ b/dlls/qmgr/tests/enum_jobs.c @@ -0,0 +1,152 @@ +/* + * Unit test suite for Enum Background Copy Jobs Interface + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "bits.h" + +/* Globals used by many tests */ +static const WCHAR test_displayNameA[] = {'T','e','s','t','A', 0}; +static const WCHAR test_displayNameB[] = {'T','e','s','t','B', 0}; +static IBackgroundCopyManager *test_manager; +static IBackgroundCopyJob *test_jobA; +static IBackgroundCopyJob *test_jobB; +static IEnumBackgroundCopyJobs *test_enumJobsA; +static IEnumBackgroundCopyJobs *test_enumJobsB; +static GUID test_jobIdA; +static GUID test_jobIdB; + +/* Generic test setup */ +static BOOL setup(void) +{ + HRESULT hres; + + test_manager = NULL; + test_jobA = NULL; + test_jobB = NULL; + memset(&test_jobIdA, 0, sizeof test_jobIdA); + memset(&test_jobIdB, 0, sizeof test_jobIdB); + + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &test_manager); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameA, + BG_JOB_TYPE_DOWNLOAD, &test_jobIdA, + &test_jobA); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_EnumJobs(test_manager, 0, &test_enumJobsA); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameB, + BG_JOB_TYPE_DOWNLOAD, &test_jobIdB, + &test_jobB); + if(hres != S_OK) + return FALSE; + + hres = IBackgroundCopyManager_EnumJobs(test_manager, 0, &test_enumJobsB); + if(hres != S_OK) + return FALSE; + + return TRUE; +} + +/* Generic test cleanup */ +static void teardown(void) +{ + if (test_enumJobsB) + IEnumBackgroundCopyJobs_Release(test_enumJobsB); + test_enumJobsB = NULL; + if (test_jobB) + IBackgroundCopyJob_Release(test_jobB); + test_jobB = NULL; + if (test_enumJobsA) + IEnumBackgroundCopyJobs_Release(test_enumJobsA); + test_enumJobsA = NULL; + if (test_jobA) + IBackgroundCopyJob_Release(test_jobA); + test_jobA = NULL; + if (test_manager) + IBackgroundCopyManager_Release(test_manager); + test_manager = NULL; +} + +/* We can't assume the job count will start at any fixed number since esp + when testing on Windows there may be other jobs created by other + processes. Even this approach of creating two jobs and checking the + difference in counts could fail if a job was created in between, but + it's probably not worth worrying about in sane test environments. */ +static void test_GetCount(void) +{ + HRESULT hres; + ULONG jobCountA, jobCountB; + + hres = IEnumBackgroundCopyJobs_GetCount(test_enumJobsA, &jobCountA); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Couldn't get job count\n"); + return; + } + + hres = IEnumBackgroundCopyJobs_GetCount(test_enumJobsB, &jobCountB); + ok(hres == S_OK, "GetCount failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Couldn't get job count\n"); + return; + } + + ok(jobCountB == jobCountA + 1, "Got incorrect count\n"); +} + +typedef void (*test_t)(void); + +START_TEST(enum_jobs) +{ + static const test_t tests[] = { + test_GetCount, + 0 + }; + const test_t *test; + + CoInitialize(NULL); + for (test = tests; *test; ++test) + { + /* Keep state seperate between tests. */ + if (!setup()) + { + teardown(); + skip("Unable to setup test\n"); + break; + } + (*test)(); + teardown(); + } + CoUninitialize(); +}

1 0

Dan Hipschman : qmgr: Implement IEnumBackgroundCopyJobs_Next.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 1317e3115adc0e580a333602ae1f27f89730c6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1317e3115adc0e580a333602a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Mar 3 16:46:44 2008 -0800 qmgr: Implement IEnumBackgroundCopyJobs_Next. --- dlls/qmgr/enum_jobs.c | 32 +++++++++++- dlls/qmgr/tests/enum_jobs.c | 113 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 6d14791..98b9cb2 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -73,15 +73,41 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release( return ref; } -/*** IEnumBackgroundCopyJobs methods ***/ static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next( IEnumBackgroundCopyJobs* iface, ULONG celt, IBackgroundCopyJob **rgelt, ULONG *pceltFetched) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + ULONG fetched; + ULONG i; + IBackgroundCopyJob *job; + + fetched = min(celt, This->numJobs - This->indexJobs); + if (pceltFetched) + *pceltFetched = fetched; + else + { + /* We need to initialize this array if the caller doesn't request + the length because length_is will default to celt. */ + for (i = 0; i < celt; ++i) + rgelt[i] = NULL; + + /* pceltFetched can only be NULL if celt is 1 */ + if (celt != 1) + return E_INVALIDARG; + } + + /* Fill in the array of objects */ + for (i = 0; i < fetched; ++i) + { + job = This->jobs[This->indexJobs++]; + IBackgroundCopyJob_AddRef(job); + rgelt[i] = job; + } + + return fetched == celt ? S_OK : S_FALSE; } static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 20344d3..93aaf15 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -1,7 +1,7 @@ /* * Unit test suite for Enum Background Copy Jobs Interface * - * Copyright 2007 Google (Roy Shea) + * Copyright 2007 Google (Roy Shea, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,6 +31,7 @@ static const WCHAR test_displayNameB[] = {'T','e','s','t','B', 0}; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_jobA; static IBackgroundCopyJob *test_jobB; +static ULONG test_jobCountB; static IEnumBackgroundCopyJobs *test_enumJobsA; static IEnumBackgroundCopyJobs *test_enumJobsB; static GUID test_jobIdA; @@ -73,6 +74,10 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; + hres = IEnumBackgroundCopyJobs_GetCount(test_enumJobsB, &test_jobCountB); + if (hres != S_OK) + return FALSE; + return TRUE; } @@ -125,12 +130,118 @@ static void test_GetCount(void) ok(jobCountB == jobCountA + 1, "Got incorrect count\n"); } +/* Test Next with a NULL pceltFetched*/ +static void test_Next_walkListNull(void) +{ + HRESULT hres; + IBackgroundCopyJob *job; + ULONG i; + + /* Fetch the available jobs */ + for (i = 0; i < test_jobCountB; i++) + { + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, 1, &job, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get job from Next\n"); + return; + } + IBackgroundCopyJob_Release(job); + } + + /* Attempt to fetch one more than the number of available jobs */ + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, 1, &job, NULL); + ok(hres == S_FALSE, "Next off end of available jobs failed: %08x\n", hres); +} + +/* Test Next */ +static void test_Next_walkList_1(void) +{ + HRESULT hres; + IBackgroundCopyJob *job; + ULONG fetched; + ULONG i; + + /* Fetch the available jobs */ + for (i = 0; i < test_jobCountB; i++) + { + fetched = 0; + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, 1, &job, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get job from Next\n"); + return; + } + ok(fetched == 1, "Next returned the incorrect number of jobs: %08x\n", hres); + IBackgroundCopyJob_Release(job); + } + + /* Attempt to fetch one more than the number of available jobs */ + fetched = 0; + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, 1, &job, &fetched); + ok(hres == S_FALSE, "Next off end of available jobs failed: %08x\n", hres); + ok(fetched == 0, "Next returned the incorrect number of jobs: %08x\n", hres); +} + +/* Test Next by requesting multiple files at a time */ +static void test_Next_walkList_2(void) +{ + HRESULT hres; + IBackgroundCopyJob **jobs; + ULONG fetched; + ULONG i; + + jobs = HeapAlloc(GetProcessHeap(), 0, test_jobCountB * sizeof *jobs); + if (!jobs) + { + skip("Couldn't allocate memory\n"); + return; + } + + for (i = 0; i < test_jobCountB; i++) + jobs[i] = NULL; + + fetched = 0; + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, test_jobCountB, jobs, &fetched); + ok(hres == S_OK, "Next failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get file from test_enumJobs\n"); + return; + } + ok(fetched == test_jobCountB, "Next returned the incorrect number of jobs: %08x\n", hres); + + for (i = 0; i < test_jobCountB; i++) + { + ok(jobs[i] != NULL, "Next returned NULL\n"); + if (jobs[i]) + IBackgroundCopyFile_Release(jobs[i]); + } +} + +/* Test Next Error conditions */ +static void test_Next_errors(void) +{ + HRESULT hres; + IBackgroundCopyJob *jobs[2]; + + /* E_INVALIDARG: pceltFetched can ONLY be NULL if celt is 1 */ + hres = IEnumBackgroundCopyJobs_Next(test_enumJobsB, 2, jobs, NULL); + ok(hres != S_OK, "Invalid call to Next succeeded: %08x\n", hres); +} + typedef void (*test_t)(void); START_TEST(enum_jobs) { static const test_t tests[] = { test_GetCount, + test_Next_walkListNull, + test_Next_walkList_1, + test_Next_walkList_2, + test_Next_errors, 0 }; const test_t *test;

1 0

Roy Shea : qmgr: Implement Skip and Reset for IEnumBackgroundCopyJobs.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: a0fd05f09ec7f7aef41be809285ae6aba30047e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0fd05f09ec7f7aef41be8092… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Mar 3 16:47:21 2008 -0800 qmgr: Implement Skip and Reset for IEnumBackgroundCopyJobs. --- dlls/qmgr/enum_jobs.c | 17 +++++++++--- dlls/qmgr/tests/enum_jobs.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 98b9cb2..e35730a 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -114,15 +114,24 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( IEnumBackgroundCopyJobs* iface, ULONG celt) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + + if (This->numJobs - This->indexJobs < celt) + { + This->indexJobs = This->numJobs; + return S_FALSE; + } + + This->indexJobs += celt; + return S_OK; } static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset( IEnumBackgroundCopyJobs* iface) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + This->indexJobs = 0; + return S_OK; } static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone( diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 93aaf15..343d97a 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -232,6 +232,61 @@ static void test_Next_errors(void) ok(hres != S_OK, "Invalid call to Next succeeded: %08x\n", hres); } +/* Test skipping through the jobs in a list */ +static void test_Skip_walkList(void) +{ + HRESULT hres; + ULONG i; + + for (i = 0; i < test_jobCountB; i++) + { + hres = IEnumBackgroundCopyJobs_Skip(test_enumJobsB, 1); + ok(hres == S_OK, "Skip failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to propely Skip jobs\n"); + return; + } + } + + hres = IEnumBackgroundCopyJobs_Skip(test_enumJobsB, 1); + ok(hres == S_FALSE, "Skip expected end of list: %08x\n", hres); +} + +/* Test skipping off the end of the list */ +static void test_Skip_offEnd(void) +{ + HRESULT hres; + + hres = IEnumBackgroundCopyJobs_Skip(test_enumJobsB, test_jobCountB + 1); + ok(hres == S_FALSE, "Skip expected end of list: %08x\n", hres); +} + +/* Test reset */ +static void test_Reset(void) +{ + HRESULT hres; + + hres = IEnumBackgroundCopyJobs_Skip(test_enumJobsB, test_jobCountB); + ok(hres == S_OK, "Skip failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Skip failed\n"); + return; + } + + hres = IEnumBackgroundCopyJobs_Reset(test_enumJobsB); + ok(hres == S_OK, "Reset failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to Reset enumerator\n"); + return; + } + + hres = IEnumBackgroundCopyJobs_Skip(test_enumJobsB, test_jobCountB); + ok(hres == S_OK, "Reset failed: %08x\n", hres); +} + typedef void (*test_t)(void); START_TEST(enum_jobs) @@ -242,6 +297,9 @@ START_TEST(enum_jobs) test_Next_walkList_1, test_Next_walkList_2, test_Next_errors, + test_Skip_walkList, + test_Skip_offEnd, + test_Reset, 0 }; const test_t *test;

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_GetProgress.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: dc484a9b934d3abbd1e360f4b0af1990c791c464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc484a9b934d3abbd1e360f4b… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Mar 3 16:48:08 2008 -0800 qmgr: Implement IBackgroundCopyJob_GetProgress. --- dlls/qmgr/job.c | 15 ++++++++++++--- dlls/qmgr/tests/job.c | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 20d72dd..8e3bce4 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -163,8 +163,17 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetProgress( IBackgroundCopyJob* iface, BG_JOB_PROGRESS *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + + if (!pVal) + return E_INVALIDARG; + + pVal->BytesTotal = This->jobProgress.BytesTotal; + pVal->BytesTransferred = This->jobProgress.BytesTransferred; + pVal->FilesTotal = This->jobProgress.FilesTotal; + pVal->FilesTransferred = This->jobProgress.FilesTransferred; + + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetTimes( @@ -432,7 +441,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, memcpy(pJobId, &This->jobId, sizeof(GUID)); list_init(&This->files); - This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; + This->jobProgress.BytesTotal = 0; This->jobProgress.BytesTransferred = 0; This->jobProgress.FilesTotal = 0; This->jobProgress.FilesTransferred = 0; diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 6fcf681..26cbfe9 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -218,6 +218,27 @@ static void test_EnumFiles(void) ok(res == 0, "Bad ref count on release: %u\n", res); } +/* Test getting job progress */ +static void test_GetProgress_preTransfer(void) +{ + HRESULT hres; + BG_JOB_PROGRESS progress; + + hres = IBackgroundCopyJob_GetProgress(test_job, &progress); + ok(hres == S_OK, "GetProgress failed: 0x%08x\n", hres); + if (hres != S_OK) + { + skip("Unable to get job progress\n"); + teardown(); + return; + } + + ok(progress.BytesTotal == 0, "Incorrect BytesTotal: %llu\n", progress.BytesTotal); + ok(progress.BytesTransferred == 0, "Incorrect BytesTransferred: %llu\n", progress.BytesTransferred); + ok(progress.FilesTotal == 0, "Incorrect FilesTotal: %u\n", progress.FilesTotal); + ok(progress.FilesTransferred == 0, "Incorrect FilesTransferred %u\n", progress.FilesTransferred); +} + typedef void (*test_t)(void); START_TEST(job) @@ -228,6 +249,7 @@ START_TEST(job) test_GetName, test_AddFile, test_EnumFiles, + test_GetProgress_preTransfer, 0 }; const test_t *test;

1 0

Rob Shearman : wininet: Fix compile with MinGW.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 0aec3fcf86641f4d45b402d6a01902473022063c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aec3fcf86641f4d45b402d6a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 3 21:46:52 2008 +0000 wininet: Fix compile with MinGW. --- dlls/wininet/internet.h | 3 ++- dlls/wininet/netconnection.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b0e757f..7f13fef 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -55,12 +55,13 @@ #endif #if defined(__MINGW32__) || defined (_MSC_VER) -#include "winsock2.h" +#include "ws2tcpip.h" #ifndef MSG_WAITALL #define MSG_WAITALL 0 #endif #else #define closesocket close +#define ioctlsocket ioctl #endif /* __MINGW32__ */ /* used for netconnection.c stuff */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8bf3c2a..07fb3de 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -49,14 +49,14 @@ #include "winerror.h" #include "wincrypt.h" +#include "wine/debug.h" +#include "internet.h" + /* To avoid conflicts with the Unix socket headers. we only need it for * the error codes anyway. */ #define USE_WS_PREFIX #include "winsock2.h" -#include "wine/debug.h" -#include "internet.h" - #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ @@ -203,6 +203,7 @@ BOOL NETCON_connected(WININET_NETCONNECTION *connection) /* translate a unix error code into a winsock one */ static int sock_get_error( int err ) { +#if !defined(__MINGW32__) && !defined (_MSC_VER) switch (err) { case EINTR: return WSAEINTR; @@ -262,6 +263,8 @@ static int sock_get_error( int err ) #endif default: errno=err; perror("sock_set_error"); return WSAEFAULT; } +#endif + return err; } /****************************************************************************** @@ -584,7 +587,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail if (!connection->useSSL) { int unread; - int retval = ioctl(connection->socketFD, FIONREAD, &unread); + int retval = ioctlsocket(connection->socketFD, FIONREAD, &unread); if (!retval) { TRACE("%d bytes of queued, but unread data\n", unread);

1 0

Stefan Leichter : shell32: Added tests for SHGetFolderPathAndSubDirA.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: b5cc68f629345d936e71d9e450ee45f888139cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cc68f629345d936e71d9e45… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Mar 3 23:44:52 2008 +0100 shell32: Added tests for SHGetFolderPathAndSubDirA. --- dlls/shell32/tests/shlfolder.c | 104 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 59e032e..033447d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -43,6 +43,8 @@ static IMalloc *ppM; static HRESULT (WINAPI *pSHBindToParent)(LPCITEMIDLIST, REFIID, LPVOID*, LPCITEMIDLIST*); +static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); +static HRESULT (WINAPI *pSHGetFolderPathAndSubDirA)(HWND, int, HANDLE, DWORD, LPCSTR, LPSTR); static BOOL (WINAPI *pSHGetPathFromIDListW)(LPCITEMIDLIST,LPWSTR); static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); @@ -57,6 +59,8 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHBindToParent = (void*)GetProcAddress(hmod, "SHBindToParent"); + pSHGetFolderPathA = (void*)GetProcAddress(hmod, "SHGetFolderPathA"); + pSHGetFolderPathAndSubDirA = (void*)GetProcAddress(hmod, "SHGetFolderPathAndSubDirA"); pSHGetPathFromIDListW = (void*)GetProcAddress(hmod, "SHGetPathFromIDListW"); pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); @@ -1365,6 +1369,102 @@ static void test_ITEMIDLIST_format(void) { } } +static void testSHGetFolderPathAndSubDirA(void) +{ + HRESULT ret; + BOOL delret; + DWORD dwret; + int i; + static char wine[] = "wine"; + static char winetemp[] = "wine\\temp"; + static char appdata[MAX_PATH]; + static char testpath[MAX_PATH]; + static char toolongpath[MAX_PATH+1]; + + if(!pSHGetFolderPathA) { + skip("SHGetFolderPathA not present!\n"); + return; + } + if(!SUCCEEDED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) + { + skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); + return; + } + + sprintf(testpath, "%s\\%s", appdata, winetemp); + delret = RemoveDirectoryA(testpath); + if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) { + skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + return; + } + + sprintf(testpath, "%s\\%s", appdata, wine); + delret = RemoveDirectoryA(testpath); + if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) { + skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + return; + } + for(i=0; i< MAX_PATH; i++) + toolongpath[i] = '0' + i % 10; + toolongpath[MAX_PATH] = '\0'; + + /* test invalid second parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); + ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); + + /* test invalid forth parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, wine, testpath); + ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); + + /* test fifth parameter */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, NULL, testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "", testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, "\\", testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); + ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, + "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret); + + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + + /* test a not existing path */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ok(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == ret, + "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), ret); + + /* create a directory inside a not existing directory */ + testpath[0] = '\0'; + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_CREATE | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, winetemp, testpath); + ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok(!strncmp(appdata, testpath, strlen(appdata)), + "expected %s to start with %s\n", testpath, appdata); + ok(!lstrcmpA(&testpath[1 + strlen(appdata)], winetemp), + "expected %s to end with %s\n", testpath, winetemp); + dwret = GetFileAttributes(testpath); + ok(FILE_ATTRIBUTE_DIRECTORY | dwret, "expected %x to contain FILE_ATTRIBUTE_DIRECTORY\n", dwret); + + /* cleanup */ + sprintf(testpath, "%s\\%s", appdata, winetemp); + RemoveDirectoryA(testpath); + sprintf(testpath, "%s\\%s", appdata, wine); + RemoveDirectoryA(testpath); +} + + START_TEST(shlfolder) { init_function_pointers(); @@ -1381,6 +1481,10 @@ START_TEST(shlfolder) test_CallForAttributes(); test_FolderShortcut(); test_ITEMIDLIST_format(); + if(pSHGetFolderPathAndSubDirA) + testSHGetFolderPathAndSubDirA(); + else + skip("SHGetFolderPathAndSubDirA not present\n"); OleUninitialize(); }

1 0

Jason Edmeades : cmd.exe: Fix running programs from root of drive.
by Alexandre Julliard 04 Mar '08

04 Mar '08

Module: wine Branch: master Commit: 52e8f6f69b3a6766c278d4c085ba728e6199547f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e8f6f69b3a6766c278d4c08… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Mar 3 23:14:28 2008 +0000 cmd.exe: Fix running programs from root of drive. --- programs/cmd/wcmdmain.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2966bcc..36faa8b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -962,8 +962,11 @@ void WCMD_run_program (WCHAR *command, int called) { GetFullPathName(param1, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); lastSlash = strrchrW(pathtosearch, '\\'); if (lastSlash && strchrW(lastSlash, '.') != NULL) extensionsupplied = TRUE; - if (lastSlash) *lastSlash = 0x00; strcpyW(stemofsearch, lastSlash+1); + + /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and + c:\windows\a.bat syntax */ + if (lastSlash) *(lastSlash + 1) = 0x00; } /* Now extract PATHEXT */

1 0