December 2007 - Wine-commits

Alexander Nicolaysen Sørnes : vendor: Fix application list
by Chris Morgan 20 Dec '07

20 Dec '07

Module: appdb Branch: master Commit: 52cd2fc55dd39821578dfb1dd33a9b432c140f3d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=52cd2fc55dd39821578dfb1d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 19 14:36:52 2007 +0100 vendor: Fix application list --- include/vendor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 6e7b061..224e885 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -378,7 +378,7 @@ class Vendor { { $oApp = new Application($iAppId); - if($oApp->sQueued == "false") + if($oApp->objectGetState() == 'accepted') echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; } echo '</ol>',"\n";

1 0

Alexander Nicolaysen Sørnes : Use sState as parameter to objectGetItemsPerPage()
by Chris Morgan 20 Dec '07

20 Dec '07

Module: appdb Branch: master Commit: da97299eeb09464411ab72d3024ad983912eaced URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da97299eeb09464411ab72d3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 19 15:06:35 2007 +0100 Use sState as parameter to objectGetItemsPerPage() --- include/application.php | 2 +- include/application_queue.php | 4 ++-- include/bugs.php | 2 +- include/distribution.php | 2 +- include/maintainer.php | 2 +- include/objectManager.php | 16 ++++++++++++++-- include/screenshot.php | 4 ++-- include/testData.php | 2 +- include/testData_queue.php | 4 ++-- include/vendor.php | 2 +- include/version.php | 2 +- include/version_queue.php | 4 ++-- 12 files changed, 29 insertions(+), 17 deletions(-) diff --git a/include/application.php b/include/application.php index bcefc76..47bbdd5 100644 --- a/include/application.php +++ b/include/application.php @@ -349,7 +349,7 @@ class Application { } } - public static function objectGetItemsPerPage($bQueued = false) + public static function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/application_queue.php b/include/application_queue.php index 4a67fec..d9100bd 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -373,9 +373,9 @@ class application_queue return TRUE; } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { - return $this->oApp->objectGetItemsPerPage($bQueued); + return $this->oApp->objectGetItemsPerPage($sState); } function objectGetEntriesCount($bQueued, $bRejected) diff --git a/include/bugs.php b/include/bugs.php index ed1a330..e49a7a6 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -464,7 +464,7 @@ class Bug return false; } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/distribution.php b/include/distribution.php index 1169bf5..9a43a0a 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -742,7 +742,7 @@ class distribution { return $iCount; } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/maintainer.php b/include/maintainer.php index ca0e99e..64e1037 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -873,7 +873,7 @@ class maintainer return TRUE; } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/objectManager.php b/include/objectManager.php index 55d1c75..cf00be6 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -12,6 +12,7 @@ class ObjectManager private $sTitle; private $iId; private $bIsRejected; + private $sState; private $sReturnTo; private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */ private $oMultiPage; @@ -62,6 +63,11 @@ class ObjectManager public function setIsQueue($bIsQueue) { $this->bIsQueue = $bIsQueue; + + if($this->sState != 'rejected' && $bIsQueue) + $this->sState = 'queued'; + else if ($this->sState == 'queued' && !$bIsQueue) + $this->sState = 'accepted'; } public function getIsQueue() @@ -82,6 +88,11 @@ class ObjectManager public function setIsRejected($bIsRejected) { $this->bIsRejected = $bIsRejected; + + if($bIsRejected) + $this->sState = 'rejected'; + else if ($this->sState == 'rejected') + $this->sState = 'queued'; } public function setSortInfo($aClean = null) @@ -114,6 +125,7 @@ class ObjectManager $this->iId = $iId; $this->oMultiPage = new MultiPage(FALSE); $this->oTableRow = new OMTableRow(null); + $this->sState = 'accepted'; // initialize the common responses array $this->aCommonResponses = array(); @@ -1314,14 +1326,14 @@ class ObjectManager $oObject = new $this->sClass(); if(!method_exists($oObject, "objectGetItemsPerPage") || - $oObject->objectGetItemsPerPage($this->bIsQueue) === FALSE) + $oObject->objectGetItemsPerPage($this->sState) === FALSE) { /* Do not enable the MultiPage controls */ $this->oMultiPage->MultiPage(FALSE); return; } - $aReturn = $oObject->objectGetItemsPerPage($this->bIsQueue); + $aReturn = $oObject->objectGetItemsPerPage($this->sState); $aItemsPerPage = $aReturn[0]; $iDefaultPerPage = $aReturn[1]; diff --git a/include/screenshot.php b/include/screenshot.php index 66bb34b..7063f60 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -595,9 +595,9 @@ class screenshot return $shImg; } - public static function objectGetItemsPerPage($bQueued = false) + public static function objectGetItemsPerPage($sState = 'accepted') { - if($bQueued) + if($sState != 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/testData.php b/include/testData.php index 8dbf0a0..78a9f3f 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1253,7 +1253,7 @@ class testData{ return mysqltimestamp_to_unixtimestamp($this->sSubmitTime); } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/testData_queue.php b/include/testData_queue.php index 50b3caf..b7f8ed5 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -198,9 +198,9 @@ class testData_queue return $this->oTestData->objectGetSubmitTime(); } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { - return testData::objectGetItemsPerPage($bQueued); + return testData::objectGetItemsPerPage($sState); } function objectGetId() diff --git a/include/vendor.php b/include/vendor.php index 224e885..78a18bc 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -447,7 +447,7 @@ class Vendor { return $this->iVendorId; } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/version.php b/include/version.php index 9061262..64cd852 100644 --- a/include/version.php +++ b/include/version.php @@ -1518,7 +1518,7 @@ class version { return $oTableRow; } - public static function objectGetItemsPerPage($bQueued = false) + public static function objectGetItemsPerPage($sState = 'accepted') { $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; diff --git a/include/version_queue.php b/include/version_queue.php index de3483e..77ddac7 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -214,9 +214,9 @@ class version_queue /* $this->oVersion->displayAddItemHelp(); */ } - function objectGetItemsPerPage($bQueued = false) + function objectGetItemsPerPage($sState = 'accepted') { - return $this->oVersion->objectGetItemsPerPage($bQueued); + return $this->oVersion->objectGetItemsPerPage($sState); } function objectGetEntriesCount($bQueued, $bRejected)

1 0

Alexander Nicolaysen Sørnes : tesetData_queue: Remove useless check
by Chris Morgan 20 Dec '07

20 Dec '07

Module: appdb Branch: master Commit: f1dc4f22b1d299977dfc4302d032c0664e9a12cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f1dc4f22b1d299977dfc4302… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 19:07:38 2007 +0100 tesetData_queue: Remove useless check --- include/testData_queue.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 9447ab3..50b3caf 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -55,8 +55,8 @@ class testData_queue function reQueue() { $this->oTestData->reQueue(); - if($this->oDistribution->sQueued == "rejected") - $this->oDistribution->reQueue(); + + $this->oDistribution->reQueue(); } function unQueue()

1 0

Dmitry Timoshkov : user32: Set the edit text in a combobox only if combobox has strings.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 0e799c6d7bfefcce10323680ecd249286046cce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e799c6d7bfefcce10323680e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 17:36:36 2007 +0800 user32: Set the edit text in a combobox only if combobox has strings. --- dlls/user32/combo.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b846618..6f0fd84 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1030,9 +1030,12 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) } } - lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); - lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + if( CB_HASSTRINGS(lphc) ) + { + lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); + lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + } if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));

1 0

Dmitry Timoshkov : include: Add CONTEXT86_EXTENDED_REGISTERS and CONTEXT86_ALL definitions.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 06ce44e9ce1cc8a352d801b3df56c3e192d0fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ce44e9ce1cc8a352d801b3d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:43:38 2007 +0800 include: Add CONTEXT86_EXTENDED_REGISTERS and CONTEXT86_ALL definitions. --- include/winnt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f103c0d..7ac4703 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -789,7 +789,10 @@ typedef struct _CONTEXT86 #define CONTEXT86_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ #define CONTEXT86_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ #define CONTEXT86_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ +#define CONTEXT86_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) +#define CONTEXT86_ALL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS | \ + CONTEXT86_FLOATING_POINT | CONTEXT86_DEBUG_REGISTERS | CONTEXT86_EXTENDED_REGISTERS) /* i386 context definitions */ #ifdef __i386__ @@ -799,7 +802,9 @@ typedef struct _CONTEXT86 #define CONTEXT_SEGMENTS CONTEXT86_SEGMENTS #define CONTEXT_FLOATING_POINT CONTEXT86_FLOATING_POINT #define CONTEXT_DEBUG_REGISTERS CONTEXT86_DEBUG_REGISTERS +#define CONTEXT_EXTENDED_REGISTERS CONTEXT86_EXTENDED_REGISTERS #define CONTEXT_FULL CONTEXT86_FULL +#define CONTEXT_ALL CONTEXT86_ALL typedef CONTEXT86 CONTEXT;

1 0

Roy Shea : qmgr: Generate C file with local GUID definitions from bits.idl.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 6ceb8e1f31fe3d6067c5ac201449e29409f5cc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ceb8e1f31fe3d6067c5ac201… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Dec 17 14:38:33 2007 -0800 qmgr: Generate C file with local GUID definitions from bits.idl. --- .gitignore | 2 ++ dlls/qmgr/Makefile.in | 2 ++ dlls/qmgr/qmgr_local.idl | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 21e0dbe..eee1787 100644 --- a/.gitignore +++ b/.gitignore @@ -381,6 +381,8 @@ dlls/psapi/tests/*.ok dlls/psapi/tests/psapi_crosstest.exe dlls/psapi/tests/testlist.c dlls/qcap/version.res +dlls/qmgr/qmgr_local.h +dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 5ac07d3..d01f2b8 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -9,6 +9,8 @@ EXTRALIBS = C_SRCS = \ qmgr_main.c +IDL_I_SRCS = qmgr_local.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qmgr/qmgr_local.idl b/dlls/qmgr/qmgr_local.idl new file mode 100644 index 0000000..f72325f --- /dev/null +++ b/dlls/qmgr/qmgr_local.idl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 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 "bits.idl"

1 0

Dmitry Timoshkov : user32: Make sure to setup clipping before any painting is done.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 9e3ab87a9c2cf5219e721c122a176d5fa9cae817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ab87a9c2cf5219e721c122… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 12:56:03 2007 +0800 user32: Make sure to setup clipping before any painting is done. --- dlls/user32/button.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index d6ee30c..74720a0 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -903,6 +903,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (!hBrush) /* did the app forget to call defwindowproc ? */ hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd ); + setup_clipping( hwnd, hDC ); if (style & BS_LEFTTEXT) { @@ -916,7 +917,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) rtext.left += checkBoxWidth + 4; rbox.right = checkBoxWidth; } - + /* Since WM_ERASEBKGND does nothing, first prepare background */ if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush ); if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush ); @@ -982,8 +983,6 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - setup_clipping( hwnd, hDC ); - if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); @@ -1044,6 +1043,7 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ) if (!hbr) /* did the app forget to call defwindowproc ? */ hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd); + setup_clipping( hwnd, hDC ); GetClientRect( hwnd, &rc); rcFrame = rc; @@ -1058,8 +1058,6 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) return; - setup_clipping( hwnd, hDC ); - /* Because buttons have CS_PARENTDC class style, there is a chance * that label will be drawn out of client rect. * But Windows doesn't clip label's rect, so do I.

1 0

Dmitry Timoshkov : gdi32: When compiling with PSDK headers request latest DEVMODE definition.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 49f1600b3f89af1f438cd1bdca6db5c4f6e8bc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1600b3f89af1f438cd1bdc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:41:07 2007 +0800 gdi32: When compiling with PSDK headers request latest DEVMODE definition. --- dlls/gdi32/tests/dc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index f292c37..60b6ad7 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0501 /* request latest DEVMODE */ + #include <assert.h> #include <stdio.h>

1 0

Dmitry Timoshkov : gdi32: In the calculations use a fixed dmSize, not a passed in (possibly too large) one.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: c316c1a29fbfd77ecebc5b580acbfaaa4d198706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c316c1a29fbfd77ecebc5b580… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:43:05 2007 +0800 gdi32: In the calculations use a fixed dmSize, not a passed in (possibly too large) one. --- dlls/gdi32/driver.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4d1aaad..a2aa033 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -411,14 +411,14 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) { DEVMODEW *dmW; - WORD dmW_size; + WORD dmW_size, dmA_size; - dmW_size = dmA->dmSize; - if (dmW_size > sizeof(DEVMODEA)) - dmW_size = sizeof(DEVMODEA); + dmA_size = dmA->dmSize; + if (dmA_size > sizeof(DEVMODEA)) + dmA_size = sizeof(DEVMODEA); - dmW_size += CCHDEVICENAME; - if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + dmW_size = dmA_size + CCHDEVICENAME; + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) dmW_size += CCHFORMNAME; dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); @@ -427,18 +427,18 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, CCHDEVICENAME, dmW->dmDeviceName, CCHDEVICENAME); /* copy slightly more, to avoid long computations */ - memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA->dmSize - CCHDEVICENAME); + memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME); - if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) { MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME, dmW->dmFormName, CCHFORMNAME); - if (dmA->dmSize > FIELD_OFFSET(DEVMODEA, dmLogPixels)) - memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA->dmSize - FIELD_OFFSET(DEVMODEA, dmLogPixels)); + if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) + memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels)); } if (dmA->dmDriverExtra) - memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA->dmSize, dmA->dmDriverExtra); + memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra); dmW->dmSize = dmW_size;

1 0

Stefan Dösinger : wined3d: Some improvements for SFLAG_CONVERTED checking.
by Alexandre Julliard 19 Dec '07

19 Dec '07

Module: wine Branch: master Commit: 37e872e9013cf875803cc04bd3dbad7da4c49bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e872e9013cf875803cc04bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 16 23:00:39 2007 +0100 wined3d: Some improvements for SFLAG_CONVERTED checking. We can check this flag before setting up the gl lock, and add the surface format to the FIXME. --- dlls/wined3d/surface.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 76b8a1d..e45dd4c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,6 +47,10 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { if(myDevice->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); } + if(This->Flags & SFLAG_CONVERTED) { + FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); + return; + } ENTER_GL(); /* Make sure that a proper texture unit is selected, bind the texture @@ -86,12 +90,6 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { int src_pitch = 0; int dst_pitch = 0; - if(This->Flags & SFLAG_CONVERTED) { - FIXME("Read back converted textures unsupported\n"); - LEAVE_GL(); - return; - } - if (This->Flags & SFLAG_NONPOW2) { unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; src_pitch = This->bytesPerPixel * This->pow2Width;

1 0