wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : user32: Pre-allocate the window procedure for the combobox class.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 05cf0ff29f7c178a34c41790a26bd0e48dc12633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cf0ff29f7c178a34c41790a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:57:22 2009 +0100 user32: Pre-allocate the window procedure for the combobox class. --- dlls/user32/combo.c | 30 ++++-------------------------- dlls/user32/controls.h | 1 + dlls/user32/winproc.c | 13 +++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index c405c1a..948c6a7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -86,9 +86,6 @@ static UINT CBitHeight, CBitWidth; #define COMBO_EDITBUTTONSPACE() 0 #define EDIT_CONTROL_PADDING() 1 -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); - /********************************************************************* * combo class descriptor */ @@ -97,8 +94,8 @@ const struct builtin_class_descr COMBO_builtin_class = { comboboxW, /* name */ CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, /* style */ - ComboWndProcA, /* procA */ - ComboWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_COMBO), /* procW */ sizeof(HEADCOMBO *), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -1839,6 +1836,8 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + if (!IsWindow(hwnd)) return 0; + if( lphc || message == WM_NCCREATE ) switch(message) { @@ -2219,27 +2218,6 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar DefWindowProcA(hwnd, message, wParam, lParam); } -/*********************************************************************** - * ComboWndProcA - * - * This is just a wrapper for the real ComboWndProc which locks/unlocks - * window structs. - */ -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.combo_proc( hwnd, message, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * ComboWndProcW - */ -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow(hwnd)) return 0; - return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); -} - /************************************************************************* * GetComboBoxInfo (USER32.@) */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 501520f..76c714c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -34,6 +34,7 @@ enum builtin_winprocs { WINPROC_BUTTON = 0, + WINPROC_COMBO, NB_BUILTIN_WINPROCS }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index dd3e234..32b94b4 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -53,10 +53,13 @@ WNDPROC EDIT_winproc_handle = 0; static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static WINDOWPROC winproc_array[MAX_WINPROCS] = { { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ + { ComboWndProcA, ComboWndProcW }, /* WINPROC_COMBO */ }; static UINT builtin_used = NB_BUILTIN_WINPROCS; @@ -1052,6 +1055,16 @@ static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM return wow_handlers.button_proc( hwnd, msg, wParam, lParam, TRUE ); } +static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.combo_proc( hwnd, message, wParam, lParam, TRUE ); +} + /********************************************************************** * UserRegisterWowHandlers (USER32.@)

1 0

Alexandre Julliard : user32: Pre-allocate the window procedure for the button class.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 87f83f8618105eaa5fcd9d03399118c106707a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f83f8618105eaa5fcd9d033… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 17 12:56:50 2009 +0100 user32: Pre-allocate the window procedure for the button class. --- dlls/user32/button.c | 28 ++++------------------------ dlls/user32/controls.h | 9 +++++++++ dlls/user32/winproc.c | 27 ++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 42163eb..6e68785 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -113,8 +113,6 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ); static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); static void OB_Paint( HWND hwnd, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); -static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); #define MAX_BTN_TYPE 12 @@ -164,8 +162,8 @@ const struct builtin_class_descr BUTTON_builtin_class = { buttonW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ - ButtonWndProcA, /* procA */ - ButtonWndProcW, /* procW */ + NULL, /* procA */ + BUILTIN_WINPROC(WINPROC_BUTTON), /* procW */ NB_EXTRA_BYTES, /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ @@ -238,6 +236,8 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LONG state; HANDLE oldHbitmap; + if (!IsWindow( hWnd )) return 0; + pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); @@ -545,26 +545,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return 0; } -/*********************************************************************** - * ButtonWndProcW - */ -static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return wow_handlers.button_proc( hWnd, uMsg, wParam, lParam, TRUE ); -} - - -/*********************************************************************** - * ButtonWndProcA - */ -static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) -{ - if (!IsWindow( hWnd )) return 0; - return wow_handlers.button_proc( hWnd, uMsg, wParam, lParam, FALSE ); -} - - /********************************************************************** * Convert button styles to flags used by DrawText. */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 45dd2d0..501520f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -31,6 +31,15 @@ #define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771) /* WinSwitch */ #define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772) /* IconTitle */ +enum builtin_winprocs +{ + WINPROC_BUTTON = 0, + NB_BUILTIN_WINPROCS +}; + +#define WINPROC_HANDLE (~0u >> 16) +#define BUILTIN_WINPROC(index) ((WNDPROC)(ULONG_PTR)((index) | (WINPROC_HANDLE << 16))) + /* Built-in class descriptor */ struct builtin_class_descr { diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 0bde530..dd3e234 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -44,7 +44,6 @@ typedef struct tagWINDOWPROC WNDPROC procW; /* Unicode window proc */ } WINDOWPROC; -#define WINPROC_HANDLE (~0u >> 16) #define MAX_WINPROCS 4096 #define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ #define MAX_WINPROC_RECURSION 64 @@ -52,8 +51,15 @@ typedef struct tagWINDOWPROC WNDPROC EDIT_winproc_handle = 0; -static WINDOWPROC winproc_array[MAX_WINPROCS]; -static UINT builtin_used; +static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); + +static WINDOWPROC winproc_array[MAX_WINPROCS] = +{ + { ButtonWndProcA, ButtonWndProcW }, /* WINPROC_BUTTON */ +}; + +static UINT builtin_used = NB_BUILTIN_WINPROCS; static UINT winproc_used = BUILTIN_WINPROCS; static CRITICAL_SECTION winproc_cs; @@ -1032,6 +1038,21 @@ INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, } +/*********************************************************************** + * Window procedures for builtin classes + */ + +static LRESULT WINAPI ButtonWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.button_proc( hwnd, msg, wParam, lParam, FALSE ); +} + +static LRESULT WINAPI ButtonWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return wow_handlers.button_proc( hwnd, msg, wParam, lParam, TRUE ); +} + + /********************************************************************** * UserRegisterWowHandlers (USER32.@) *

1 0

Huw Davies : shell32: Fix a memory leak.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: b71173f7ac0493fac4abe3f237b6cfb22b25fcd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71173f7ac0493fac4abe3f23… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 17 10:12:04 2009 +0000 shell32: Fix a memory leak. Found by Valgrind. --- dlls/shell32/shelllink.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3b16170..6dd62a7 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2213,7 +2213,10 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile /* any other quote marks are invalid */ if (strchrW(pszFile, '"')) + { + HeapFree(GetProcessHeap(), 0, unquoted); return S_FALSE; + } HeapFree(GetProcessHeap(), 0, This->sPath); This->sPath = NULL; @@ -2241,7 +2244,10 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile This->sPath = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( buffer )+1) * sizeof (WCHAR) ); if (!This->sPath) + { + HeapFree(GetProcessHeap(), 0, unquoted); return E_OUTOFMEMORY; + } lstrcpyW(This->sPath, buffer); }

1 0

Lei Zhang : secur32: Fix memory leak in SECUR32_addPackages.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: c89211336b9e4309d18819f241e0f77ff882a56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89211336b9e4309d18819f24… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 17 01:53:38 2009 -0800 secur32: Fix memory leak in SECUR32_addPackages. --- dlls/secur32/secur32.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 4171778..f626617 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -666,9 +666,6 @@ SecurePackage *SECUR32_findPackageA(PCSTR packageName) static void SECUR32_freeProviders(void) { - SecurePackage *package; - SecureProvider *provider; - TRACE("\n"); EnterCriticalSection(&cs); @@ -676,10 +673,13 @@ static void SECUR32_freeProviders(void) if (packageTable) { - LIST_FOR_EACH_ENTRY(package, &packageTable->table, SecurePackage, entry) + SecurePackage *package, *package_next; + LIST_FOR_EACH_ENTRY_SAFE(package, package_next, &packageTable->table, + SecurePackage, entry) { HeapFree(GetProcessHeap(), 0, package->infoW.Name); HeapFree(GetProcessHeap(), 0, package->infoW.Comment); + HeapFree(GetProcessHeap(), 0, package); } HeapFree(GetProcessHeap(), 0, packageTable); @@ -688,11 +688,14 @@ static void SECUR32_freeProviders(void) if (providerTable) { - LIST_FOR_EACH_ENTRY(provider, &providerTable->table, SecureProvider, entry) + SecureProvider *provider, *provider_next; + LIST_FOR_EACH_ENTRY_SAFE(provider, provider_next, &providerTable->table, + SecureProvider, entry) { HeapFree(GetProcessHeap(), 0, provider->moduleName); if (provider->lib) FreeLibrary(provider->lib); + HeapFree(GetProcessHeap(), 0, provider); } HeapFree(GetProcessHeap(), 0, providerTable);

1 0

James Hawkins : msi: Initialize type. If the value did not exist, type was uninitialized and passed to RegSetValueExW.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 26d541b2a9790a85095bfa6aab287cf25b8e7455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d541b2a9790a85095bfa6aa… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 16 19:05:27 2009 -0800 msi: Initialize type. If the value did not exist, type was uninitialized and passed to RegSetValueExW. --- dlls/msi/action.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a5c916e..7904770 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5008,6 +5008,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) FIXME("Not removing environment variable on uninstall!\n"); size = 0; + type = REG_SZ; res = RegQueryValueExW(env, name, NULL, &type, NULL, &size); if ((res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND) || (res == ERROR_SUCCESS && type != REG_SZ && type != REG_EXPAND_SZ))

1 0

James Hawkins : kernel32: Free the resource data if a matching resource exists and we choose not to overwrite the existing resource .
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 9b2af10f020fb17a5707646a62185e75b8bf82d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2af10f020fb17a5707646a6… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 16 19:05:18 2009 -0800 kernel32: Free the resource data if a matching resource exists and we choose not to overwrite the existing resource. --- dlls/kernel32/resource.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index d405b95..76d2741 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -810,7 +810,7 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N if (existing) { if (!overwrite_existing) - return TRUE; + return FALSE; list_remove( &existing->entry ); HeapFree( GetProcessHeap(), 0, existing ); } @@ -1076,7 +1076,10 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE ); if (resdata) - update_add_resource( updates, Type, Name, resdata, FALSE ); + { + if (!update_add_resource( updates, Type, Name, resdata, FALSE )) + HeapFree( GetProcessHeap(), 0, resdata ); + } } res_free_str( Name ); }

1 0

James Hawkins : msi: Move MSITRANSFORM and MSISTREAM and associated methods to the dabatase implementation file as they are database objects /methods.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 6b403d1a31e1719fc2d0cd991aaefcdb1dc5f2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b403d1a31e1719fc2d0cd991… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 16 19:05:12 2009 -0800 msi: Move MSITRANSFORM and MSISTREAM and associated methods to the dabatase implementation file as they are database objects/methods. --- dlls/msi/database.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 5 +- dlls/msi/table.c | 208 +-------------------------------------------------- 3 files changed, 211 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b403d1a31e1719fc2d0c…

1 0

James Hawkins : msi: Free the cached streams when closing the database.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: a2f5d0e270223f1e2cc2fd4ecceb1cfb94256f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f5d0e270223f1e2cc2fd4ec… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 16 19:05:05 2009 -0800 msi: Free the cached streams when closing the database. --- dlls/msi/database.c | 1 + dlls/msi/msipriv.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b485b21..32c0e8b 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -57,6 +57,7 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) msi_free(db->path); free_cached_tables( db ); + msi_free_streams( db ); msi_free_transforms( db ); msi_destroy_stringtable( db->strings ); IStorage_Release( db->storage ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2f8a38c..3b2733b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -650,6 +650,7 @@ extern void msiobj_unlock(MSIOBJECTHDR *); extern void msi_free_handle_table(void); extern void free_cached_tables( MSIDATABASE *db ); +extern void msi_free_streams( MSIDATABASE *db ); extern void msi_free_transforms( MSIDATABASE *db ); extern UINT MSI_CommitTables( MSIDATABASE *db );

1 0

Jacek Caban : wininet: Make sure to not read over chunk end in read_gzip_data.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 78b2cedaa616a92ef8ac542ffd646280ac2bcf77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b2cedaa616a92ef8ac542ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 17 00:02:47 2009 +0100 wininet: Make sure to not read over chunk end in read_gzip_data. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5dfbe6a..6786380 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1952,6 +1952,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, #ifdef HAVE_ZLIB z_stream *zstream = &req->gzip_stream->zstream; + DWORD buf_avail; int zres; while(read < size && !req->gzip_stream->end_of_data) { @@ -1960,14 +1961,16 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, break; } + buf_avail = req->dwContentLength == ~0 ? req->read_size : min(req->read_size, req->dwContentLength-req->dwContentRead); + zstream->next_in = req->read_buf+req->read_pos; - zstream->avail_in = req->read_size; + zstream->avail_in = buf_avail; zstream->next_out = buf+read; zstream->avail_out = size-read; zres = inflate(zstream, Z_FULL_FLUSH); read = size - zstream->avail_out; - req->dwContentRead += req->read_size-zstream->avail_in; - remove_data(req, req->read_size-zstream->avail_in); + req->dwContentRead += buf_avail-zstream->avail_in; + remove_data(req, buf_avail-zstream->avail_in); if(zres == Z_STREAM_END) { TRACE("end of data\n"); req->gzip_stream->end_of_data = TRUE;

1 0

Roderick Colenbrander : wined3d: Fix a bug in BtlFast which was uncovered by the 32-bit dibsection support.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 6d8c4572efae3b7e8e64100504c10270b2168079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8c4572efae3b7e8e6410050… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Nov 14 16:30:25 2009 +0100 wined3d: Fix a bug in BtlFast which was uncovered by the 32-bit dibsection support. --- dlls/ddraw/tests/dsurface.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_base.c | 10 +++++++++- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ab0408b..d53d6a0 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -304,6 +304,40 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Unlock(lpDst, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc); + /* Below we repeat the same test as above but now using BltFast instead of Blt. Before + * we can carry out the test we need to restore the color of the destination surface. + */ + rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); + ok(rc==DD_OK,"Lock returned: %x\n",rc); + lpData = ddsd2.lpSurface; + lpData[0] = 0xCCCCCCCC; + lpData[1] = 0xCCCCCCCC; + lpData[2] = 0xCCCCCCCC; + lpData[3] = 0xCCCCCCCC; + rc = IDirectDrawSurface_Unlock(lpDst, NULL); + ok(rc==DD_OK,"Unlock returned: %x\n",rc); + + IDirectDrawSurface_BltFast(lpDst, 0, 0, lpSrc, NULL, DDBLTFAST_SRCCOLORKEY); + + rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); + ok(rc==DD_OK,"Lock returned: %x\n",rc); + ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); + lpData = ddsd2.lpSurface; + /* Different behavior on some drivers / windows versions. Some versions ignore the X channel when + * color keying, but copy it to the destination surface. Others apply it for color keying, but + * do not copy it into the destination surface. + */ + if(lpData[0]==0x00010203) { + trace("X channel was not copied into the destination surface\n"); + ok((lpData[0]==0x00010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0x00FF00FF)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } else { + ok((lpData[0]==0x77010203)&&(lpData[1]==0x00010203)&&(lpData[2]==0xCCCCCCCC)&&(lpData[3]==0xCCCCCCCC), + "Destination data after blitting is not correct\n"); + } + rc = IDirectDrawSurface_Unlock(lpDst, NULL); + ok(rc==DD_OK,"Unlock returned: %x\n",rc); + /* Also test SetColorKey */ IDirectDrawSurface_GetColorKey(lpSrc, DDCKEY_SRCBLT, &DDColorKey); ok(DDColorKey.dwColorSpaceLowValue == 0xFF00FF && DDColorKey.dwColorSpaceHighValue == 0xFF00FF, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index c737f99..dc29ad2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1695,6 +1695,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst if (trans & (WINEDDBLTFAST_SRCCOLORKEY | WINEDDBLTFAST_DESTCOLORKEY)) { DWORD keylow, keyhigh; + DWORD mask = Src->resource.format_desc->red_mask | + Src->resource.format_desc->green_mask | + Src->resource.format_desc->blue_mask; + + /* For some 8-bit formats like L8 and P8 color masks don't make sense */ + if(!mask && bpp==1) + mask = 0xff; + TRACE("Color keyed copy\n"); if (trans & WINEDDBLTFAST_SRCCOLORKEY) { @@ -1716,7 +1724,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst for (y = 0; y < h; y++) { \ for (x = 0; x < w; x++) { \ tmp = s[x]; \ - if (tmp < keylow || tmp > keyhigh) d[x] = tmp; \ + if ((tmp & mask) < keylow || (tmp & mask) > keyhigh) d[x] = tmp; \ } \ s = (const type *)((const BYTE *)s + slock.Pitch); \ d = (type *)((BYTE *)d + dlock.Pitch); \

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 December 2009