wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Alexander Nicolaysen Sørnes : Fix typo on comment posting page
by Chris Morgan 31 Mar '08

31 Mar '08

Module: appdb Branch: master Commit: f7a1e181cd4364d21d981acda557c584a65cf25b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f7a1e181cd4364d21d981acd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Mar 27 14:40:08 2008 +0100 Fix typo on comment posting page --- include/comment.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/comment.php b/include/comment.php index 13b1390..2550889 100644 --- a/include/comment.php +++ b/include/comment.php @@ -247,7 +247,7 @@ class Comment { echo htmlify_urls($this->sBody), "<br><br>\n"; $oVersion = new version($this->iVersionId); - $oM = new objectManager("comment", "Post new ocmment"); + $oM = new objectManager("comment", "Post new comment"); $oM->setReturnTo($oVersion->objectMakeUrl()); // reply post buttons echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n";

1 0

Dan Kegel : gdi32: Test retrieving BI_BITFIELDS info for 16bpp modes.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 338539c7090075918c5135df83366bb7058da537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338539c7090075918c5135df8… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Mar 29 21:24:43 2008 -0700 gdi32: Test retrieving BI_BITFIELDS info for 16bpp modes. --- dlls/gdi32/tests/bitmap.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c31d367..09b6287 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1595,6 +1595,62 @@ todo_wine ReleaseDC(0, hdc); } +static void test_GetDIBits_BI_BITFIELDS(void) +{ + /* Try a screen resolution detection technique + * from the September 1999 issue of Windows Developer's Journal + * which seems to be in widespread use. + * http://www.lesher.ws/highcolor.html + * http://www.lesher.ws/vidfmt.c + * It hinges on being able to retrieve the bitmaps + * for the three primary colors in nonpaletted 16 bit mode. + */ + char dibinfo_buf[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + LPBITMAPINFO dibinfo = (LPBITMAPINFO) dibinfo_buf; + HDC hdc; + HBITMAP hbm; + int ret; + + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + + hdc = GetDC(NULL); + ok(hdc != NULL, "GetDC failed?\n"); + hbm = CreateCompatibleBitmap(hdc, 1, 1); + ok(hbm != NULL, "CreateCompatibleBitmap failed?\n"); + + /* Call GetDIBits to fill in bmiHeader. */ + ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + if (dibinfo->bmiHeader.biBitCount == 16 + && dibinfo->bmiHeader.biCompression == BI_BITFIELDS) { + /* In the BITMAPINFOHEADER doc, this little struct is implicit. + * Making explicit for clarity. + */ + struct bi_bitfields_s { + DWORD red; + DWORD blue; + DWORD green; + } *bitmasks; + + /* Retrieve the BI_BITFIELDS info (requires second call, honest). */ + ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + + bitmasks = (struct bi_bitfields_s *) dibinfo->bmiColors; + todo_wine { + ok(bitmasks->red != 0, "expected space for red pixels\n"); + ok(bitmasks->blue != 0, "expected space for blue pixels\n"); + ok(bitmasks->green != 0, "expected space for green pixels\n"); + } + } else { + skip("not in 16 bpp BI_BITFIELDS mode, skipping that test\n"); + } + + DeleteObject(hbm); + ReleaseDC(NULL, hdc); +} + static void test_select_object(void) { HDC hdc; @@ -2036,6 +2092,7 @@ START_TEST(bitmap) test_GetDIBits_selected_DDB(TRUE); test_GetDIBits_selected_DDB(FALSE); test_GetDIBits(); + test_GetDIBits_BI_BITFIELDS(); test_select_object(); test_CreateBitmap(); test_GdiAlphaBlend();

1 0

Vitaliy Margolen : user32: Properly translate keyboard left/right-shift, alt, ctrl keys hardware messages.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: a28b86a78e0ac7db4a20f1e4cba20c4cf987c0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28b86a78e0ac7db4a20f1e4c… Author: Vitaliy Margolen <vitaliy(a)kievinfo.com> Date: Sat Mar 29 10:11:24 2008 -0600 user32: Properly translate keyboard left/right-shift, alt, ctrl keys hardware messages. --- dlls/user32/message.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ed5a2a8..cc2603f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1683,6 +1683,21 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { EVENTMSG event; + if (msg->message == WM_KEYDOWN || msg->message == WM_SYSKEYDOWN || + msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) + switch (msg->wParam) + { + case VK_LSHIFT: case VK_RSHIFT: + msg->wParam = VK_SHIFT; + break; + case VK_LCONTROL: case VK_RCONTROL: + msg->wParam = VK_CONTROL; + break; + case VK_LMENU: case VK_RMENU: + msg->wParam = VK_MENU; + break; + } + /* FIXME: is this really the right place for this hook? */ event.message = msg->message; event.hwnd = msg->hwnd;

1 0

Alexander Morozov : setupapi: Add a check of "#" for interface subkey names .
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: bae4ebb7d72aeeeea4dd69a24cb4551814bbc6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae4ebb7d72aeeeea4dd69a24… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Mar 28 18:49:34 2008 +0300 setupapi: Add a check of "#" for interface subkey names. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 936f6a7..60da5e8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1986,21 +1986,24 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, HKEY subKey; SP_DEVICE_INTERFACE_DATA *iface = NULL; - /* The subkey name is the reference string, with a '#' prepended */ - SETUPDI_AddInterfaceInstance(dev, interface, subKeyName + 1, - &iface); - l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); - if (!l) + if (*subKeyName == '#') { - WCHAR symbolicLink[MAX_PATH]; - DWORD dataType; - - len = sizeof(symbolicLink); - l = RegQueryValueExW(subKey, SymbolicLink, NULL, &dataType, - (BYTE *)symbolicLink, &len); - if (!l && dataType == REG_SZ) - SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); + /* The subkey name is the reference string, with a '#' prepended */ + SETUPDI_AddInterfaceInstance(dev, interface, subKeyName + 1, + &iface); + l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); + if (!l) + { + WCHAR symbolicLink[MAX_PATH]; + DWORD dataType; + + len = sizeof(symbolicLink); + l = RegQueryValueExW(subKey, SymbolicLink, NULL, &dataType, + (BYTE *)symbolicLink, &len); + if (!l && dataType == REG_SZ) + SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); + RegCloseKey(subKey); + } } /* Allow enumeration to continue */ l = ERROR_SUCCESS;

1 0

Aric Stewart : imm32: Have both ImmInternalPostIMEMessage and ImmInternalSendIMENotify receive an InputContextData parameter instead of relaying on root_context .
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 2ea559b8b2dfa6f16a8e2544ed2e92c0a44c65b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea559b8b2dfa6f16a8e2544e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 27 11:04:30 2008 -0500 imm32: Have both ImmInternalPostIMEMessage and ImmInternalSendIMENotify receive an InputContextData parameter instead of relaying on root_context. --- dlls/imm32/imm.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 89f7c47..2785922 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -82,7 +82,7 @@ static UINT WM_MSIME_DOCUMENTFEED; static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable); -static void ImmInternalPostIMEMessage(UINT, WPARAM, LPARAM); +static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); @@ -100,7 +100,7 @@ static VOID IMM_PostResult(InputContextData *data) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); for (i = 0; i < compstr->dwResultStrLen; i++) - ImmInternalPostIMEMessage (WM_IME_CHAR, ResultStr[i], 1); + ImmInternalPostIMEMessage (root_context, WM_IME_CHAR, ResultStr[i], 1); ImmUnlockIMCC(root_context->IMC.hCompStr); @@ -173,20 +173,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) } /* for posting messages as the IME */ -static void ImmInternalPostIMEMessage(UINT msg, WPARAM wParam, LPARAM lParam) +static void ImmInternalPostIMEMessage(InputContextData *data, UINT msg, WPARAM wParam, LPARAM lParam) { HWND target = GetFocus(); if (!target) - PostMessageW(root_context->IMC.hWnd,msg,wParam,lParam); + PostMessageW(data->IMC.hWnd,msg,wParam,lParam); else PostMessageW(target, msg, wParam, lParam); } -static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) +static LRESULT ImmInternalSendIMENotify(InputContextData *data, WPARAM notify, LPARAM lParam) { HWND target; - target = root_context->IMC.hWnd; + target = data->IMC.hWnd; if (!target) target = GetFocus(); if (target) @@ -221,7 +221,7 @@ static void ImmInternalSetOpenStatus(BOOL fOpen) root_context->IMC.fOpen = fOpen; root_context->bInternalState = fOpen; - ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(root_context, IMN_SETOPENSTATUS, 0); } static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, @@ -1501,7 +1501,7 @@ BOOL WINAPI ImmNotifyIME( root_context->IMC.hCompStr = ImmCreateBlankCompStr(); if (send) - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, GCS_COMPSTR); rc = TRUE; } @@ -1542,15 +1542,15 @@ BOOL WINAPI ImmNotifyIME( root_context->bRead = FALSE; - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, GCS_COMPSTR); - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, param, GCS_RESULTSTR|GCS_RESULTCLAUSE); } - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION, 0, 0); + ImmInternalPostIMEMessage(root_context, WM_IME_ENDCOMPOSITION, 0, 0); root_context->bInComposition = FALSE; } break; @@ -1653,7 +1653,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1677,7 +1677,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) return FALSE; data->IMC.lfFont.W = *lplf; - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1766,7 +1766,7 @@ BOOL WINAPI ImmSetCompositionStringW( HIMCC newCompStr; if (!root_context->bInComposition) { - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION, 0, 0); + ImmInternalPostIMEMessage(root_context, WM_IME_STARTCOMPOSITION, 0, 0); root_context->bInComposition = TRUE; } @@ -1791,7 +1791,7 @@ BOOL WINAPI ImmSetCompositionStringW( UpdateDataInDefaultIMEWindow(hwndDefault,FALSE); - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, wParam, flags); + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, wParam, flags); return TRUE; } @@ -1826,7 +1826,7 @@ BOOL WINAPI ImmSetCompositionWindow( if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONWINDOW, 0); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; } @@ -1860,7 +1860,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) if (hIMC == (HIMC)FROM_IME) { ImmInternalSetOpenStatus(fOpen); - ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); return TRUE; } @@ -1873,17 +1873,17 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) pX11DRV_ForceXIMReset(data->IMC.hWnd); if (fOpen == FALSE) - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); else - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); ImmInternalSetOpenStatus(fOpen); ImmInternalSetOpenStatus(!fOpen); if (data->IMC.fOpen == FALSE) - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); else - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); return FALSE; } @@ -2094,7 +2094,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) lpTransMsg = (LPTRANSMSG)ImmLockIMCC(data->IMC.hMsgBuf); for (i = 0; i < data->IMC.dwNumMsgBuf; i++) - ImmInternalPostIMEMessage(lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); + ImmInternalPostIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); ImmUnlockIMCC(data->IMC.hMsgBuf);

1 0

James Hawkins : fusion: Add initial tests for IAssemblyCache.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 9e021cff3d6af045b4d2e302f0a76054afdd0aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e021cff3d6af045b4d2e302f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 31 01:03:24 2008 -0500 fusion: Add initial tests for IAssemblyCache. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/fusion/tests/Makefile.in | 13 + dlls/fusion/tests/asmcache.c | 961 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 989 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e021cff3d6af045b4d2e…

1 0

James Hawkins : include: Add corerror.h.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: c8b6558d21b7e1f3d1c8f996d9bb1c58fb0804d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b6558d21b7e1f3d1c8f996d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 31 00:53:52 2008 -0500 include: Add corerror.h. --- include/Makefile.in | 1 + include/corerror.h | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index ad85850..50af56b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -100,6 +100,7 @@ SRCDIR_INCLUDES = \ commdlg.h \ compobj.h \ cor.h \ + corerror.h \ cpl.h \ custcntl.h \ cvconst.h \ diff --git a/include/corerror.h b/include/corerror.h new file mode 100644 index 0000000..9845cda --- /dev/null +++ b/include/corerror.h @@ -0,0 +1,123 @@ +/* + * Copyright 2008 James Hawkins + * + * 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 + */ + +#ifndef __WINE_CORERROR_H +#define __WINE_CORERROR_H + +#include <winerror.h> + +#ifndef FACILITY_URT + #define FACILITY_URT 0x13 +#endif + +#ifndef EMAKEHR + #define SMAKEHR(val) MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_URT, val) + #define EMAKEHR(val) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_URT, val) +#endif + +#define COR_E_ARGUMENT E_INVALIDARG +#define COR_E_INVALIDCAST E_NOINTERFACE +#define COR_E_NULLREFERENCE E_POINTER +#define COR_E_OUTOFMEMORY E_OUTOFMEMORY +#define COR_E_UNAUTHORIZEDACCESS E_ACCESSDENIED + +#define COR_E_ARITHMETIC HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW) +#define COR_E_STACKOVERFLOW HRESULT_FROM_WIN32(ERROR_STACK_OVERFLOW) +#define COR_E_ENDOFSTREAM HRESULT_FROM_WIN32(ERROR_HANDLE_EOF) +#define COR_E_FILENOTFOUND HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) +#define COR_E_BAD_PATHNAME HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) +#define COR_E_DIRECTORYNOTFOUND HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) +#define COR_E_PATHTOOLONG HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) + +#define COR_E_AMBIGUOUSMATCH _HRESULT_TYPEDEF_(0x8000211DL) +#define COR_E_TARGETPARAMCOUNT _HRESULT_TYPEDEF_(0x8002000EL) +#define COR_E_DIVIDEBYZERO _HRESULT_TYPEDEF_(0x80020012L) +#define COR_E_BADIMAGEFORMAT _HRESULT_TYPEDEF_(0x8007000BL) + +#define COR_E_ASSEMBLYEXPECTED EMAKEHR(0x1018L) +#define COR_E_TYPEUNLOADED EMAKEHR(0x1013L) +#define COR_E_EXCEPTION EMAKEHR(0x1500L) +#define COR_E_SYSTEM EMAKEHR(0x1501L) +#define COR_E_ARGUMENTOUTOFRANGE EMAKEHR(0x1502L) +#define COR_E_ARRAYTYPEMISMATCH EMAKEHR(0x1503L) +#define COR_E_CONTEXTMARSHAL EMAKEHR(0x1504L) +#define COR_E_TIMEOUT EMAKEHR(0x1505L) +#define COR_E_EXECUTIONENGINE EMAKEHR(0x1506L) +#define COR_E_FIELDACCESS EMAKEHR(0x1507L) +#define COR_E_INDEXOUTOFRANGE EMAKEHR(0x1508L) +#define COR_E_INVALIDOPERATION EMAKEHR(0x1509L) +#define COR_E_SECURITY EMAKEHR(0x150AL) +#define COR_E_REMOTING EMAKEHR(0x150BL) +#define COR_E_SERIALIZATION EMAKEHR(0x150CL) +#define COR_E_VERIFICATION EMAKEHR(0x150DL) +#define COR_E_SERVER EMAKEHR(0x150EL) +#define COR_E_SERVICEDCOMPONENT EMAKEHR(0x150FL) +#define COR_E_METHODACCESS EMAKEHR(0x1510L) +#define COR_E_MISSINGFIELD EMAKEHR(0x1511L) +#define COR_E_MISSINGMEMBER EMAKEHR(0x1512L) +#define COR_E_MISSINGMETHOD EMAKEHR(0x1513L) +#define COR_E_MULTICASTNOTSUPPORTED EMAKEHR(0x1514L) +#define COR_E_NOTSUPPORTED EMAKEHR(0x1515L) +#define COR_E_OVERFLOW EMAKEHR(0x1516L) +#define COR_E_RANK EMAKEHR(0x1517L) +#define COR_E_SYNCHRONIZATIONLOCK EMAKEHR(0x1518L) +#define COR_E_THREADINTERRUPTED EMAKEHR(0x1519L) +#define COR_E_MEMBERACCESS EMAKEHR(0x151AL) +#define COR_E_THREADSTATE EMAKEHR(0x1520L) +#define COR_E_THREADSTOP EMAKEHR(0x1521L) +#define COR_E_TYPELOAD EMAKEHR(0x1522L) +#define COR_E_ENTRYPOINTNOTFOUND EMAKEHR(0x1523L) +#define COR_E_DLLNOTFOUND EMAKEHR(0x1524L) +#define COR_E_THREADSTART EMAKEHR(0x1525L) +#define COR_E_INVALIDCOMOBJECT EMAKEHR(0x1527L) +#define COR_E_NOTFINITENUMBER EMAKEHR(0x1528L) +#define COR_E_DUPLICATEWAITOBJECT EMAKEHR(0x1529L) +#define COR_E_SEMAPHOREFULL EMAKEHR(0x152BL) +#define COR_E_WAITHANDLECANNOTBEOPENED EMAKEHR(0x152CL) +#define COR_E_ABANDONEDMUTEX EMAKEHR(0x152DL) +#define COR_E_INVALIDOLEVARIANTTYPE EMAKEHR(0x1531L) +#define COR_E_MISSINGMANIFESTRESOURCE EMAKEHR(0x1532L) +#define COR_E_SAFEARRAYTYPEMISMATCH EMAKEHR(0x1533L) +#define COR_E_TYPEINITIALIZATION EMAKEHR(0x1534L) +#define COR_E_MARSHALDIRECTIVE EMAKEHR(0x1535L) +#define COR_E_MISSINGSATELLITEASSEMBLY EMAKEHR(0x1536L) +#define COR_E_FORMAT EMAKEHR(0x1537L) +#define COR_E_SAFEARRAYRANKMISMATCH EMAKEHR(0x1538L) +#define COR_E_PLATFORMNOTSUPPORTED EMAKEHR(0x1539L) +#define COR_E_INVALIDPROGRAM EMAKEHR(0x153AL) +#define COR_E_OPERATIONCANCELED EMAKEHR(0x153BL) +#define COR_E_INSUFFICIENTMEMORY EMAKEHR(0x153DL) +#define COR_E_RUNTIMEWRAPPED EMAKEHR(0x153EL) +#define COR_E_DEVICESNOTSUPPORTED EMAKEHR(0x1540L) +#define COR_E_DATAMISALIGNED EMAKEHR(0x1541L) +#define COR_E_KEYNOTFOUND EMAKEHR(0x1577L) +#define COR_E_APPLICATION EMAKEHR(0x1600L) +#define COR_E_INVALIDFILTERCRITERIA EMAKEHR(0x1601L) +#define COR_E_REFLECTIONTYPELOAD EMAKEHR(0x1602L) +#define COR_E_TARGET EMAKEHR(0x1603L) +#define COR_E_TARGETINVOCATION EMAKEHR(0x1604L) +#define COR_E_CUSTOMATTRIBUTEFORMAT EMAKEHR(0x1605L) +#define COR_E_IO EMAKEHR(0x1620L) +#define COR_E_FILELOAD EMAKEHR(0x1621L) +#define COR_E_OBJECTDISPOSED EMAKEHR(0x1622L) +#define COR_E_FAILFAST EMAKEHR(0x1623L) +#define COR_E_HOSTPROTECTION EMAKEHR(0x1640L) +#define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641L) + + +#endif /* __WINE_CORERROR_H */

1 0

Roderick Colenbrander : wgl: Move all winex11.drv opengl traces to wgl.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: b3ffac5a8dd337f75ad09221233f3f3d36b6f5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ffac5a8dd337f75ad092212… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 30 22:21:03 2008 +0000 wgl: Move all winex11.drv opengl traces to wgl. --- dlls/winex11.drv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a61a116..b6b3fc7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1045,7 +1045,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, return 0; } - if (TRACE_ON(opengl)) { + if (TRACE_ON(wgl)) { TRACE("(%p,%p)\n", physDev, ppfd); dump_PIXELFORMATDESCRIPTOR(ppfd); @@ -1388,7 +1388,7 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->iLayerType = PFD_MAIN_PLANE; - if (TRACE_ON(opengl)) { + if (TRACE_ON(wgl)) { dump_PIXELFORMATDESCRIPTOR(ppfd); } @@ -1492,7 +1492,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, physDev->current_pf = iPixelFormat; - if (TRACE_ON(opengl)) { + if (TRACE_ON(wgl)) { int gl_test = 0; gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); @@ -1904,7 +1904,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD gl_bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } if (GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, NULL) == GDI_ERROR) goto error; - if (TRACE_ON(opengl)) { + if (TRACE_ON(wgl)) { unsigned int height, width, bitmask; unsigned char *bitmap_ = (unsigned char *) bitmap;

1 0

Roderick Colenbrander : wined3d: Request a pixel format with alpha support in case of P8 render targets.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 4120188f99caaaade5921e396cc39af9e1c3ca24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4120188f99caaaade5921e396… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 30 21:36:03 2008 +0000 wined3d: Request a pixel format with alpha support in case of P8 render targets. --- dlls/wined3d/context.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 90828d6..a3a7222 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -237,6 +237,13 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar PUSH2(WGL_AUX_BUFFERS_ARB, 2); } + /* DirectDraw supports 8bit paletted render targets and these are used by old games like Starcraft and C&C. + * Most modern hardware doesn't support 8bit natively so we perform some form of 8bit -> 32bit conversion. + * The conversion (ab)uses the alpha component for storing the palette index. For this reason we require + * a format with 8bit alpha, so request A8R8G8B8. */ + if(fmt == WINED3DFMT_P8) + fmt = WINED3DFMT_A8R8G8B8; + if(!getColorBits(fmt, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) { ERR("Unable to get color bits for format %#x!\n", target->resource.format); return FALSE;

1 0

Hans Leidekker : wininet: Use a direct connection for tests that connect to localhost.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: bbf5dae444fff9da7e76102ff2833eb7dc41370f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf5dae444fff9da7e76102ff… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Mar 30 19:19:46 2008 +0100 wininet: Use a direct connection for tests that connect to localhost. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d42077..d87fb5e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1470,7 +1470,7 @@ static void test_basic_request(int port, const char *verb, const char *url) DWORD r, count; char buffer[0x100]; - hi = InternetOpen(NULL, 0, NULL, NULL, 0); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);

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