wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Jeff Zaroyko : position text below screenshot preview, not beside.
by Chris Morgan 27 Feb '08

27 Feb '08

Module: appdb Branch: master Commit: e201c9a8928e273065c25c6d87261402e7fc7119 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e201c9a8928e273065c25c6d… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Feb 27 10:15:19 2008 +1100 position text below screenshot preview, not beside. --- include/screenshot.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index a83dd52..8a8d0e9 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -516,7 +516,7 @@ class screenshot if($hResult && query_num_rows($hResult)) { if($iVersionId) - $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."View/Submit Screenshot</a></div>"; + $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View/Submit Screenshot</a></div>"; else $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."View Screenshot</a></div>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */

1 0

Austin English : AppDB: fix sidebar link order and add wine forums
by Chris Morgan 27 Feb '08

27 Feb '08

Module: appdb Branch: master Commit: 650f5d7c4949c61564e6ac1ab16bd0dcb1e708fc URL: http://source.winehq.org/git/appdb.git/?a=commit;h=650f5d7c4949c61564e6ac1a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 26 16:57:45 2008 -0600 AppDB: fix sidebar link order and add wine forums --- include/sidebar.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/sidebar.php b/include/sidebar.php index 81ec950..a754a44 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -11,10 +11,11 @@ function global_sidebar_menu() global $aClean; $g = new htmlmenu(APPDB_OWNER." Menu"); - $g->add("AppDB", BASE); $g->add(APPDB_OWNER, APPDB_OWNER_URL); + $g->add("AppDB", BASE); $g->add("Bugzilla", BUGZILLA_ROOT); $g->add("Wine Wiki", "http://wiki.winehq.org"); + $g->add("Wine Forum", "http://forum.winehq.org"); $g->done(); $g = new htmlmenu("AppDB");

1 0

Alexander Nicolaysen Sørnes : commdlg: PrintDlg16: Handle print quality combobox.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 8487a5dc5995d4b9151709f2a01cba3252f14f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8487a5dc5995d4b9151709f2a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 29 22:40:23 2008 +0100 commdlg: PrintDlg16: Handle print quality combobox. --- dlls/comdlg32/printdlg.c | 73 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 93b99e9..b74c9fa 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -362,6 +362,21 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, lppd->Flags &= ~PD_COLLATE; lppd->nCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE); } + + /* Print quality, PrintDlg16 */ + if(GetDlgItem(hDlg, cmb1)) + { + HWND hQuality = GetDlgItem(hDlg, cmb1); + int Sel = SendMessageA(hQuality, CB_GETCURSEL, 0, 0); + + if(Sel != CB_ERR) + { + LONG dpi = SendMessageA(hQuality, CB_GETITEMDATA, Sel, 0); + lpdm->dmFields |= DM_PRINTQUALITY | DM_YRESOLUTION; + lpdm->u1.s1.dmPrintQuality = LOWORD(dpi); + lpdm->dmYResolution = HIWORD(dpi); + } + } } return TRUE; } @@ -997,6 +1012,61 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, if (lppd->Flags & PD_HIDEPRINTTOFILE) ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE); + /* Fill print quality combo, PrintDlg16 */ + if(GetDlgItem(hDlg, cmb1)) + { + DWORD numResolutions = DeviceCapabilitiesA(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, NULL, lpdm); + + if(numResolutions != -1) + { + HWND hQuality = GetDlgItem(hDlg, cmb1); + LONG* Resolutions; + char buf[255]; + int i; + int dpiX, dpiY; + HDC hPrinterDC = CreateDCA(PrintStructures->lpPrinterInfo->pDriverName, + PrintStructures->lpPrinterInfo->pPrinterName, + 0, lpdm); + + Resolutions = HeapAlloc(GetProcessHeap(), 0, numResolutions*sizeof(LONG)*2); + DeviceCapabilitiesA(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, (LPSTR)Resolutions, lpdm); + + dpiX = GetDeviceCaps(hPrinterDC, LOGPIXELSX); + dpiY = GetDeviceCaps(hPrinterDC, LOGPIXELSY); + DeleteDC(hPrinterDC); + + SendMessageA(hQuality, CB_RESETCONTENT, 0, 0); + for(i = 0; i < (numResolutions * 2); i += 2) + { + BOOL IsDefault = FALSE; + LRESULT Index; + + if(Resolutions[i] == Resolutions[i+1]) + { + if(dpiX == Resolutions[i]) + IsDefault = TRUE; + sprintf(buf, "%d dpi", Resolutions[i]); + } else + { + if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1]) + IsDefault = TRUE; + sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]); + } + + Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf); + + if(IsDefault) + SendMessageA(hQuality, CB_SETCURSEL, Index, 0); + + SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(dpiX,dpiY)); + } + HeapFree(GetProcessHeap(), 0, Resolutions); + } + } } else { /* PD_PRINTSETUP */ BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT); @@ -1536,9 +1606,8 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } break; - case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT */ + case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT16 */ if (PrinterComboID != LOWORD(wParam)) { - FIXME("No handling for print quality combo box yet.\n"); break; } /* FALLTHROUGH */

1 0

Roy Shea : qmgr: Implement IBackgroundCopyManager_EnumJobs with test.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 9f63253d001055d6e95c18f1e4ebed136e545c10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f63253d001055d6e95c18f1e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 25 17:44:03 2008 -0800 qmgr: Implement IBackgroundCopyManager_EnumJobs with test. --- dlls/qmgr/enum_jobs.c | 17 +++++++++++++++++ dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/tests/qmgr.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 7aa9346..54ecaab 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -120,3 +120,20 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = BITS_IEnumBackgroundCopyJobs_Clone, BITS_IEnumBackgroundCopyJobs_GetCount }; + +HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, + IBackgroundCopyManager* copyManager) +{ + EnumBackgroundCopyJobsImpl *This; + + TRACE("%p, %p)\n", ppObj, copyManager); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + if (!This) + return E_OUTOFMEMORY; + This->lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; + This->ref = 1; + + *ppObj = &This->lpVtbl; + return S_OK; +} diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index e274159..c6f3db1 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -110,8 +110,8 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + TRACE("\n"); + return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index e36ff36..07af527 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -84,10 +84,57 @@ static void test_CreateJob(void) IBackgroundCopyManager_Release(manager); } +static void test_EnumJobs(void) +{ + /* Job Enumerator */ + IEnumBackgroundCopyJobs* enumJobs; + + static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; + IBackgroundCopyManager *manager = NULL; + IBackgroundCopyJob *job = NULL; + HRESULT hres; + GUID tmpId; + ULONG res; + + /* Setup */ + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, + BG_JOB_TYPE_DOWNLOAD, &tmpId, + &job); + if(hres != S_OK) + { + skip("Unable to create bits job.\n"); + IBackgroundCopyManager_Release(manager); + return; + } + + hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); + ok(hres == S_OK, "EnumJobs failed: %08x\n", hres); + if(hres != S_OK) + skip("Unable to create job enumerator.\n"); + else + { + res = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(res == 0, "Bad ref count on release: %u\n", res); + } + + /* Tear down */ + IBackgroundCopyJob_Release(job); + IBackgroundCopyManager_Release(manager); +} + START_TEST(qmgr) { CoInitialize(NULL); test_CreateInstance(); test_CreateJob(); + test_EnumJobs(); CoUninitialize(); }

1 0

Roy Shea : qmgr: Implement the IUnknown interface for IEnumBackgroundCopyJobs.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 00a3dceb75ccccc9589af81ac92be25ac21e6bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a3dceb75ccccc9589af81ac… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 25 17:42:46 2008 -0800 qmgr: Implement the IUnknown interface for IEnumBackgroundCopyJobs. --- dlls/qmgr/Makefile.in | 1 + dlls/qmgr/enum_jobs.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 9 ++++ 3 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 4da1e65..ccd5ef6 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = advpack ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ + enum_jobs.c \ factory.c \ job.c \ qmgr.c \ diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c new file mode 100644 index 0000000..7aa9346 --- /dev/null +++ b/dlls/qmgr/enum_jobs.c @@ -0,0 +1,122 @@ +/* + * Queue Manager (BITS) Job Enumerator + * + * 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 "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) +{ + HeapFree(GetProcessHeap(), 0, This); +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_AddRef( + IEnumBackgroundCopyJobs* iface) +{ + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + return InterlockedIncrement(&This->ref); +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface( + IEnumBackgroundCopyJobs* iface, + REFIID riid, + void **ppvObject) +{ + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + TRACE("IID: %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IEnumBackgroundCopyJobs)) + { + *ppvObject = &This->lpVtbl; + BITS_IEnumBackgroundCopyJobs_AddRef(iface); + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release( + IEnumBackgroundCopyJobs* iface) +{ + EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + EnumBackgroundCopyJobsDestructor(This); + + 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; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( + IEnumBackgroundCopyJobs* iface, + ULONG celt) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset( + IEnumBackgroundCopyJobs* iface) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone( + IEnumBackgroundCopyJobs* iface, + IEnumBackgroundCopyJobs **ppenum) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount( + IEnumBackgroundCopyJobs* iface, + ULONG *puCount) +{ + FIXME("Not implemented\n"); + return E_NOTIMPL; +} + +static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = +{ + BITS_IEnumBackgroundCopyJobs_QueryInterface, + BITS_IEnumBackgroundCopyJobs_AddRef, + BITS_IEnumBackgroundCopyJobs_Release, + BITS_IEnumBackgroundCopyJobs_Next, + BITS_IEnumBackgroundCopyJobs_Skip, + BITS_IEnumBackgroundCopyJobs_Reset, + BITS_IEnumBackgroundCopyJobs_Clone, + BITS_IEnumBackgroundCopyJobs_GetCount +}; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 178fda1..1719492 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -39,6 +39,13 @@ typedef struct GUID jobId; } BackgroundCopyJobImpl; +/* Enum background copy jobs vtbl and related data */ +typedef struct +{ + const IEnumBackgroundCopyJobsVtbl *lpVtbl; + LONG ref; +} EnumBackgroundCopyJobsImpl; + /* Background copy manager vtbl and related data */ typedef struct { @@ -56,6 +63,8 @@ extern ClassFactoryImpl BITS_ClassFactory; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj); +HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, + IBackgroundCopyManager* copyManager); /* Little helper functions */ static inline char *

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_GetDisplayName with test.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 28e7c3b9a93afc0010b5c498e098a49ced458156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e7c3b9a93afc0010b5c498e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 25 17:41:35 2008 -0800 qmgr: Implement IBackgroundCopyJob_GetDisplayName with test. --- dlls/qmgr/job.c | 14 ++++++++++++-- dlls/qmgr/tests/job.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index b15f39b..b14783c 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -194,8 +194,18 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDisplayName( IBackgroundCopyJob* iface, LPWSTR *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + int n; + + if (!pVal) + return E_INVALIDARG; + + n = (lstrlenW(This->displayName) + 1) * sizeof **pVal; + *pVal = CoTaskMemAlloc(n); + if (*pVal == NULL) + return E_OUTOFMEMORY; + memcpy(*pVal, This->displayName, n); + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_SetDescription( diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 9f216da..65ac06c 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -99,6 +99,23 @@ static void test_GetType(void) ok(type == test_type, "Got incorrect type\n"); } +/* Test that the display name is properly set */ +static void test_GetName(void) +{ + HRESULT hres; + LPWSTR displayName; + + hres = IBackgroundCopyJob_GetDisplayName(test_job, &displayName); + ok(hres == S_OK, "GetName failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get display name of test_job.\n"); + return; + } + ok(lstrcmpW(displayName, test_displayName) == 0, "Got incorrect type\n"); + CoTaskMemFree(displayName); +} + typedef void (*test_t)(void); START_TEST(job) @@ -106,6 +123,7 @@ START_TEST(job) static const test_t tests[] = { test_GetId, test_GetType, + test_GetName, 0 }; const test_t *test;

1 0

Roy Shea : qmgr: Implement IBackgroundCopyJob_GetType with test.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 3f126b4a60ab7dde5d772147e23c7302df70f434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f126b4a60ab7dde5d772147e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 25 17:40:57 2008 -0800 qmgr: Implement IBackgroundCopyJob_GetType with test. --- dlls/qmgr/job.c | 9 +++++++-- dlls/qmgr/tests/job.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 8357b87..b15f39b 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -133,8 +133,13 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetType( IBackgroundCopyJob* iface, BG_JOB_TYPE *pVal) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; + + if (!pVal) + return E_INVALIDARG; + + *pVal = This->type; + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetProgress( diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 71c0759..9f216da 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -83,12 +83,29 @@ static void test_GetId(void) ok(memcmp(&tmpId, &test_jobId, sizeof tmpId) == 0, "Got incorrect GUID\n"); } +/* Test that the type is properly set */ +static void test_GetType(void) +{ + HRESULT hres; + BG_JOB_TYPE type; + + hres = IBackgroundCopyJob_GetType(test_job, &type); + ok(hres == S_OK, "GetType failed: %08x\n", hres); + if(hres != S_OK) + { + skip("Unable to get type of test_job.\n"); + return; + } + ok(type == test_type, "Got incorrect type\n"); +} + typedef void (*test_t)(void); START_TEST(job) { static const test_t tests[] = { test_GetId, + test_GetType, 0 }; const test_t *test;

1 0

Stefan Dösinger : wined3d: Mark a vertex buffer dirty after VBO creation.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 7b297890a7b8d1183869895a49526ff8e369ab92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b297890a7b8d1183869895a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 15 20:00:06 2008 +0100 wined3d: Mark a vertex buffer dirty after VBO creation. --- dlls/wined3d/vertexbuffer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 985ac35..93d3c55 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -474,6 +474,9 @@ static void CreateVBO(IWineD3DVertexBufferImpl *This) { } This->vbo_size = This->resource.size; This->vbo_usage = glUsage; + This->dirtystart = 0; + This->dirtyend = This->resource.size; + This->Flags |= VBFLAG_DIRTY; LEAVE_GL();

1 0

Stefan Dösinger : wined3d: Move the dummy texture creation to the device.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 220d9eb44ca42eb289ef9de7cc49cf78e2b0140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=220d9eb44ca42eb289ef9de7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 15 15:54:37 2008 +0100 wined3d: Move the dummy texture creation to the device. --- dlls/wined3d/device.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/stateblock.c | 46 +-------------------------------------- 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index efe8d9e..d1ab9a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1923,6 +1923,54 @@ static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *fi return; } +static void create_dummy_textures(IWineD3DDeviceImpl *This) { + unsigned int i; + /* Under DirectX you can have texture stage operations even if no texture is + bound, whereas opengl will only do texture operations when a valid texture is + bound. We emulate this by creating dummy textures and binding them to each + texture stage, but disable all stages by default. Hence if a stage is enabled + then the default texture will kick in until replaced by a SetTexture call */ + ENTER_GL(); + + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* The dummy texture does not have client storage backing */ + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } + for (i = 0; i < GL_LIMITS(textures); i++) { + GLubyte white = 255; + + /* Make appropriate texture active */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i > 0) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + } + + /* Generate an opengl texture name */ + glGenTextures(1, &This->dummyTextureName[i]); + checkGLcall("glGenTextures"); + TRACE("Dummy Texture %d given name %d\n", i, This->dummyTextureName[i]); + + /* Generate a dummy 2d texture (not using 1d because they cause many + * DRI drivers fall back to sw) */ + This->stateBlock->textureDimensions[i] = GL_TEXTURE_2D; + glBindTexture(GL_TEXTURE_2D, This->dummyTextureName[i]); + checkGLcall("glBindTexture"); + + glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); + checkGLcall("glTexImage2D"); + } + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* Reenable because if supported it is enabled by default */ + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + } + + LEAVE_GL(); +} + static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain = NULL; @@ -2009,6 +2057,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Setup all the devices defaults */ IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); + create_dummy_textures(This); #if 0 IWineD3DImpl_CheckGraphicsMemory(); #endif @@ -6883,7 +6932,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->shader_backend->shader_destroy_depth_blt(iface); for (i = 0; i < GL_LIMITS(textures); i++) { - /* The stateblock initialization below will recreate them */ + /* Textures are recreated below */ glDeleteTextures(1, &This->dummyTextureName[i]); checkGLcall("glDeleteTextures(1, &This->dummyTextureName[i])"); This->dummyTextureName[i] = 0; @@ -6989,6 +7038,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE if(FAILED(hr)) { ERR("Resetting the stateblock failed with error 0x%08x\n", hr); } + create_dummy_textures(This); /* All done. There is no need to reload resources or shaders, this will happen automatically on the * first use diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e0a40af..0c7edad 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1234,56 +1234,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->samplerState[i][WINED3DSAMP_DMAPOFFSET ] = 0; /* TODO: Vertex offset in the presampled displacement map */ } - /* Under DirectX you can have texture stage operations even if no texture is - bound, whereas opengl will only do texture operations when a valid texture is - bound. We emulate this by creating dummy textures and binding them to each - texture stage, but disable all stages by default. Hence if a stage is enabled - then the default texture will kick in until replaced by a SetTexture call */ - ENTER_GL(); - - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* The dummy texture does not have client storage backing */ - glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - } - for (i = 0; i < GL_LIMITS(textures); i++) { - GLubyte white = 255; - + for(i = 0; i < GL_LIMITS(textures); i++) { /* Note this avoids calling settexture, so pretend it has been called */ This->changed.textures[i] = TRUE; This->textures[i] = NULL; - - /* Make appropriate texture active */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } else if (i > 0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - } - - /* Generate an opengl texture name */ - glGenTextures(1, &ThisDevice->dummyTextureName[i]); - checkGLcall("glGenTextures"); - TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); - - /* Generate a dummy 2d texture (not using 1d because they cause many - * DRI drivers fall back to sw) */ - This->textureDimensions[i] = GL_TEXTURE_2D; - glBindTexture(GL_TEXTURE_2D, ThisDevice->dummyTextureName[i]); - checkGLcall("glBindTexture"); - - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); - checkGLcall("glTexImage2D"); - } - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* Reenable because if supported it is enabled by default */ - glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); } - LEAVE_GL(); - - /* Defaulting palettes - Note these are device wide but reinitialized here for convenience*/ for (i = 0; i < MAX_PALETTES; ++i) { int j;

1 0

Stefan Dösinger : wined3d: Move shader model private data into its own structure.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: f912f18b133a5b1e0801b9639de8c3762baddb5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f912f18b133a5b1e0801b9639… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 24 11:23:53 2008 +0100 wined3d: Move shader model private data into its own structure. --- dlls/wined3d/arb_program_shader.c | 38 ++++++++++++++++++++++++++---------- dlls/wined3d/baseshader.c | 6 ++++- dlls/wined3d/device.c | 2 + dlls/wined3d/directx.c | 6 +++++ dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 17 +++++++++++++-- 6 files changed, 82 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f912f18b133a5b1e0801b…

1 0

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 February 2008