August 2006 - Wine-commits - list.winehq.org

Michael Stefaniuc : janitorial: Removed the rest of the redundant NULL checks before HeapFree.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 757ee19ca119b3434a6249a00b1c39c0d36fb449 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=757ee19ca119b3434a6249a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 9 22:34:56 2006 +0200 janitorial: Removed the rest of the redundant NULL checks before HeapFree. --- dlls/ddraw/main.c | 2 +- dlls/gdi/font.c | 2 +- dlls/setupapi/misc.c | 3 +-- dlls/setupapi/stringtable.c | 16 +++++----------- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e654dd7..1868ef2 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -313,7 +313,7 @@ err_out: /* Let's hope we never need this ;) */ if(wineD3DDevice) IWineD3DDevice_Release(wineD3DDevice); if(wineD3D) IWineD3D_Release(wineD3D); - if(This) HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, This); return hr; } diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 16e7f7b..ec9074d 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1243,7 +1243,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC h if (lpnFit) *lpnFit = nFit; - if (dxs && ! alpDx) + if (! alpDx) HeapFree(GetProcessHeap(), 0, dxs); GDI_ReleaseObj( hdc ); diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f9b1d86..c29da52 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -767,8 +767,7 @@ DWORD WINAPI TakeOwnershipOfFile(LPCWSTR fail:; dwError = GetLastError(); - if (pOwner != NULL) - MyFree(pOwner); + MyFree(pOwner); if (hToken != NULL) CloseHandle(hToken); diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 35d6f40..8fb1964 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -172,18 +172,12 @@ StringTableDestroy(HSTRING_TABLE hString { for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i].pString != NULL) - { - MyFree(pStringTable->pSlots[i].pString); - pStringTable->pSlots[i].pString = NULL; - } + MyFree(pStringTable->pSlots[i].pString); + pStringTable->pSlots[i].pString = NULL; - if (pStringTable->pSlots[i].pData != NULL) - { - MyFree(pStringTable->pSlots[i].pData); - pStringTable->pSlots[i].pData = NULL; - pStringTable->pSlots[i].dwSize = 0; - } + MyFree(pStringTable->pSlots[i].pData); + pStringTable->pSlots[i].pData = NULL; + pStringTable->pSlots[i].dwSize = 0; } MyFree(pStringTable->pSlots);

1 0

Alexander Nicolaysen Sørnes : shell32: Updated Norwegian Bokmål resources.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 5d72acf70be76c47c36c6f6ee3a98796dd331e74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d72acf70be76c47c36c6f6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 10 02:09:34 2006 +0200 shell32: Updated Norwegian Bokmål resources. --- dlls/shell32/shell32_No.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index a08c106..a7ad4f4 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -145,10 +145,13 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN9 "Kommentarer" IDS_SHV_COLUMN10 "Eier" IDS_SHV_COLUMN11 "Gruppe" + IDS_SHV_COLUMN_DELFROM "Opprinnelig plassering" + IDS_SHV_COLUMN_DELDATE "Dato slettet" /* special folders */ IDS_DESKTOP "Skrivebord" IDS_MYCOMPUTER "Min datamaskin" + IDS_RECYCLEBIN_FOLDER_NAME "Papirkurv" /* context menus */ IDS_VIEW_LARGE "&Store ikoner" @@ -164,6 +167,11 @@ STRINGTABLE DISCARDABLE IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" IDS_DELETEITEM_TEXT "Virkelig slette �%1�?" IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" + IDS_DELETESELECTED_TEXT "Virkelig slette valgte element(er)??" + IDS_TRASHITEM_TEXT "Virkelig legge �%1� i papirkurven?" + IDS_TRASHFOLDER_TEXT "Virkelig legge �%1� og alt innholdet i papirkurven?" + IDS_TRASHMULTIPLE_TEXT "Virkelig legge disse %1 valgte elementene i papirkurven?" + IDS_CANTTRASH_TEXT "Elementet �%1� kan ikke legges i papirkurven. Vil du slette det i stedet?" IDS_OVERWRITEFILE_TEXT "Overskrive filen �%1�?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil"

1 0

Mike McCormack : user32: Remember to draw the icon when SS_CENTERIMAGE is set.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 7aeefa305fcc80ce9a0c15d43680c82d69f09b1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7aeefa305fcc80ce9a0c15d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 10 09:41:48 2006 +0900 user32: Remember to draw the icon when SS_CENTERIMAGE is set. --- dlls/user/static.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/user/static.c b/dlls/user/static.c index f85415e..4eef677 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -121,7 +121,7 @@ static HICON STATIC_SetIcon( HWND hwnd, { HICON prevIcon; CURSORICONINFO * info; - + if ((style & SS_TYPEMASK) != SS_ICON) return 0; info = hicon?(CURSORICONINFO *) GlobalLock16(HICON_16(hicon)):NULL; if (hicon && !info) { @@ -759,14 +759,10 @@ static void STATIC_PaintIconfn( HWND hwn iconRect.top = (rc.bottom - rc.top) / 2 - info->nHeight / 2; iconRect.right = iconRect.left + info->nWidth; iconRect.bottom = iconRect.top + info->nHeight; - FillRect( hdc, &rc, hbrush ); - } - else - { - FillRect( hdc, &rc, hbrush ); - DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left, - rc.bottom - rc.top, 0, NULL, DI_NORMAL ); } + FillRect( hdc, &rc, hbrush ); + DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left, + rc.bottom - rc.top, 0, NULL, DI_NORMAL ); } if (info) GlobalUnlock16(HICON_16(hIcon)); }

1 0

James Hawkins : msi: Download install cabinet files if the msi package is remote.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 1ff96c63a82d8192454d3513a4e0110c1bc02026 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ff96c63a82d8192454d351… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 9 15:02:49 2006 -0700 msi: Download install cabinet files if the msi package is remote. --- dlls/msi/files.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/package.c | 4 ++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 914b699..443e6c3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -42,6 +42,8 @@ #include "msidefs.h" #include "msvcrt/fcntl.h" #include "msipriv.h" #include "winuser.h" +#include "winreg.h" +#include "shlwapi.h" #include "wine/unicode.h" #include "action.h" @@ -56,6 +58,7 @@ extern const WCHAR szRemoveFiles[]; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; +extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); /* * This is a helper function for handling embedded cabinet media @@ -378,6 +381,52 @@ static void free_media_info( struct medi msi_free( mi ); } +/* downloads a remote cabinet and extracts it if it exists */ +static UINT msi_extract_remote_cabinet( MSIPACKAGE *package, struct media_info *mi ) +{ + FDICABINETINFO cabinfo; + WCHAR temppath[MAX_PATH]; + WCHAR src[MAX_PATH]; + LPSTR cabpath; + LPCWSTR file; + LPWSTR ptr; + HFDI hfdi; + ERF erf; + int hf; + + /* the URL is the path prefix of the package URL and the filename + * of the file to download + */ + ptr = strrchrW(package->PackagePath, '/'); + lstrcpynW(src, package->PackagePath, ptr - package->PackagePath + 2); + ptr = strrchrW(mi->source, '\\'); + lstrcatW(src, ptr + 1); + + file = msi_download_file( src, temppath ); + lstrcpyW(mi->source, file); + + /* check if the remote cabinet still exists, ignore if it doesn't */ + hfdi = FDICreate(cabinet_alloc, cabinet_free, cabinet_open, cabinet_read, + cabinet_write, cabinet_close, cabinet_seek, 0, &erf); + if (!hfdi) + { + ERR("FDICreate failed\n"); + return ERROR_FUNCTION_FAILED; + } + + cabpath = strdupWtoA(mi->source); + hf = cabinet_open(cabpath, _O_RDONLY, 0); + if (!FDIIsCabinet(hfdi, hf, &cabinfo)) + { + WARN("Remote cabinet %s does not exist.\n", debugstr_w(mi->source)); + msi_free(cabpath); + return ERROR_SUCCESS; + } + + msi_free(cabpath); + return !extract_cabinet_file(package, mi->source, mi->last_path); +} + static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, MSIFILE *file ) { @@ -488,7 +537,17 @@ static UINT ready_media_for_file( MSIPAC GetTempPathW(MAX_PATH,mi->last_path); } } - rc = !extract_cabinet_file(package, mi->source, mi->last_path); + + /* only download the remote cabinet file if a local copy does not exist */ + if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && + UrlIsW(package->PackagePath, URLIS_URL)) + { + rc = msi_extract_remote_cabinet(package, mi); + } + else + { + rc = !extract_cabinet_file(package, mi->source, mi->last_path); + } } else { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4065ffb..d172c50 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -485,7 +485,7 @@ static LPCWSTR copy_package_to_temp( LPC return filename; } -static LPCWSTR msi_download_package( LPCWSTR szUrl, LPWSTR filename ) +LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ) { LPINTERNET_CACHE_ENTRY_INFOW cache_entry; DWORD size = 0; @@ -539,7 +539,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, LPCWSTR file; if ( UrlIsW( szPackage, URLIS_URL ) ) - file = msi_download_package( szPackage, temppath ); + file = msi_download_file( szPackage, temppath ); else file = copy_package_to_temp( szPackage, temppath );

1 0

Alexander Nicolaysen Sørnes : mshtml: Updated Norwegian Bokmål resources.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: cd9a5155ee73d991258e874647768a9fb5eaf047 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd9a5155ee73d991258e874… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 10 00:32:26 2006 +0200 mshtml: Updated Norwegian Bokmål resources. --- dlls/mshtml/No.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 51f7513..c65c919 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -23,6 +23,21 @@ STRINGTABLE DISCARDABLE { IDS_HTMLDISABLED "HTML-tegning er for �yeblikket deaktivert." IDS_HTMLDOCUMENT "HTML-dokument" + IDS_DOWNLOADING "Laster ned . . ." + IDS_INSTALLING "Installerer . . ." + } + + ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 + STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU + CAPTION "Installere Wine Gecko" + FONT 8, "MS Shell Dlg" + { + LTEXT "Dette programmer pr�ver � vise en HTML-side. Wine trenger Gecko " \ + "(Mozillas HTML-motor) for � vise denne siden. Velg �Installer� hvis " \ + "du vil at Wine skal laste ned og installere Gecko automatisk.", ID_DWL_STATUS, 10, 10, 240, 30, SS_CENTER + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + PUSHBUTTON "Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } /* FIXME: This should be in shdoclc.dll */

1 0

Juan Lang : crypt32: Add a couple stubs, and implement the undocumented I_CryptReadTrustedPublisherDWORDValueFromRegistry .
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 759850feff98feac574e18cde8d42054f33fb5a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=759850feff98feac574e18c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Aug 9 14:45:34 2006 -0700 crypt32: Add a couple stubs, and implement the undocumented I_CryptReadTrustedPublisherDWORDValueFromRegistry. --- dlls/crypt32/crypt32.spec | 4 +++- dlls/crypt32/main.c | 41 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/main.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 56db08c..64f10e7 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -186,15 +186,17 @@ @ stdcall I_CryptFlushLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) -@ stub I_CryptGetDefaultCryptProv +@ stdcall I_CryptGetDefaultCryptProv(long long long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) @ stub I_CryptInsertLruEntry @ stdcall I_CryptInstallAsn1Module(long long long) @ stdcall I_CryptInstallOssGlobal(long long long) +@ stdcall I_CryptReadTrustedPublisherDWORDValueFromRegistry(wstr ptr) @ stub I_CryptReleaseLruEntry @ stdcall I_CryptSetTls(long ptr) +@ stdcall I_CryptUninstallAsn1Module(ptr) @ stub I_CryptUninstallOssGlobal @ stub PFXExportCertStore @ stub PFXImportCertStore diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index f3e8a38..47bb8fc 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -27,6 +27,8 @@ #include "wincrypt.h" #include "winreg.h" #include "winnls.h" #include "mssip.h" +#include "winuser.h" +#include "advpub.h" #include "crypt32_private.h" #include "wine/debug.h" @@ -269,6 +271,39 @@ BOOL WINAPI I_CryptGetOssGlobal(DWORD x) return FALSE; } +BOOL WINAPI I_CryptGetDefaultCryptProv(DWORD x, DWORD y, DWORD z) +{ + FIXME("%08lx %08lx %08lx\n", x, y, z); + return FALSE; +} + +BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name, + DWORD *value) +{ + static const WCHAR safer[] = { + 'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\', + 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', + 'C','e','r','t','i','f','i','c','a','t','e','s','\\', + 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r','\\', + 'S','a','f','e','r',0 }; + HKEY key; + LONG rc; + BOOL ret = FALSE; + + TRACE("(%s, %p)\n", debugstr_w(name), value); + + rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, safer, &key); + if (rc == ERROR_SUCCESS) + { + DWORD size = sizeof(DWORD); + + if (!RegQueryValueExW(key, name, NULL, NULL, (LPBYTE)value, &size)) + ret = TRUE; + RegCloseKey(key); + } + return ret; +} + BOOL WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) { FIXME("%08lx %08lx %08lx\n", x, y, z); @@ -281,6 +316,12 @@ BOOL WINAPI I_CryptInstallAsn1Module(voi return TRUE; } +BOOL WINAPI I_CryptUninstallAsn1Module(void *x) +{ + FIXME("%p\n", x); + return TRUE; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType, diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index ec3d6e6..0ce8e41 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <winreg.h> #include "wine/test.h" @@ -272,6 +273,54 @@ static void test_cryptTls(void) } } +typedef BOOL (WINAPI *I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc) + (LPCWSTR, DWORD *); + +static void test_readTrustedPublisherDWORD(void) +{ + HMODULE lib = LoadLibraryA("crypt32.dll"); + + if (lib) + { + I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc pReadDWORD = + (I_CryptReadTrustedPublisherDWORDValueFromRegistryFunc)GetProcAddress( + lib, "I_CryptReadTrustedPublisherDWORDValueFromRegistry"); + + if (pReadDWORD) + { + static const WCHAR safer[] = { + 'S','o','f','t','w','a','r','e','\\', + 'P','o','l','i','c','i','e','s','\\', + 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m', + 'C','e','r','t','i','f','i','c','a','t','e','s','\\', + 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r', + '\\','S','a','f','e','r',0 }; + static const WCHAR authenticodeFlags[] = { 'A','u','t','h','e','n', + 't','i','c','o','d','e','F','l','a','g','s',0 }; + BOOL ret, exists = FALSE; + DWORD size, readFlags, returnedFlags; + HKEY key; + LONG rc; + + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, safer, &key); + if (rc == ERROR_SUCCESS) + { + size = sizeof(readFlags); + rc = RegQueryValueExW(key, authenticodeFlags, NULL, NULL, + (LPBYTE)&readFlags, &size); + if (rc == ERROR_SUCCESS) + exists = TRUE; + } + ret = pReadDWORD(authenticodeFlags, &returnedFlags); + ok(ret == exists, "Unexpected return value\n"); + if (exists) + ok(readFlags == returnedFlags, + "Expected flags %08lx, got %08lx\n", readFlags, returnedFlags); + } + FreeLibrary(lib); + } +} + START_TEST(main) { test_findAttribute(); @@ -280,4 +329,5 @@ START_TEST(main) test_verifyTimeValidity(); test_cryptAllocate(); test_cryptTls(); + test_readTrustedPublisherDWORD(); }

1 0

Roderick Colenbrander : wined3d: Surface pitch fix.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 2628627e79d13d9f63187444b04ad90fe58fe76b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2628627e79d13d9f6318744… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 9 22:45:59 2006 +0200 wined3d: Surface pitch fix. --- dlls/wined3d/surface.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ababe56..f7b73b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1858,6 +1858,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp GLenum format, internal, type; CONVERT_TYPES convert; int bpp; + int pitch; BYTE *mem; if(This->CKeyFlags & DDSD_CKSRCBLT) { @@ -1867,45 +1868,39 @@ static HRESULT WINAPI IWineD3DSurfaceImp else This->Flags &= ~SFLAG_GLCKEY; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); + /* The pitch is in 'length' not in bytes */ + if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) + pitch = This->currentDesc.Width; + else + pitch = This->pow2Width; + if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int height = This->glRect.bottom - This->glRect.top; - int pitch; - - /* Set the pitch in 'length' not in bytes */ - if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) - pitch = This->currentDesc.Width; - else - pitch = This->pow2Width; mem = HeapAlloc(GetProcessHeap(), 0, pitch * height * bpp); if(!mem) { ERR("Out of memory %d, %d!\n", pitch, height); return WINED3DERR_OUTOFVIDEOMEMORY; } - d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch*height, convert, This); - /* Make sure the correct pitch is used */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); This->Flags |= SFLAG_CONVERTED; } else if(This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) { - int pitch = IWineD3DSurface_GetPitch(iface); - d3dfmt_p8_upload_palette(iface, convert); - - /* Make sure the correct pitch is used */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); - - This->Flags &= ~SFLAG_CONVERTED; - mem = This->resource.allocatedMemory; + d3dfmt_p8_upload_palette(iface, convert); + This->Flags &= ~SFLAG_CONVERTED; + mem = This->resource.allocatedMemory; } else { This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; } + /* Make sure the correct pitch is used */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); + /* TODO: possibly use texture rectangle (though we are probably more compatible without it) */ if (NP2_REPACK == wined3d_settings.nonpower2_mode && (This->Flags & SFLAG_NONPOW2) && !(This->Flags & SFLAG_OVERSIZE) ) {

1 0

Stefan Dösinger : wined3d: Minor cursor fixes.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 30ef7f0b08385d6263eb1cb59d9582ed1c0b7bfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30ef7f0b08385d6263eb1cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 9 22:23:31 2006 +0200 wined3d: Minor cursor fixes. --- dlls/d3d9/device.c | 4 ++ dlls/d3d9/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 6 ++- 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ad415a8..6eeaceb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -147,6 +147,10 @@ static HRESULT WINAPI IDirect3DDevice9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pCursorBitmap; TRACE("(%p) Relay\n", This); + if(!pCursorBitmap) { + WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } return IWineD3DDevice_SetCursorProperties(This->WineD3DDevice,XHotSpot,YHotSpot,(IWineD3DSurface*)pSurface->wineD3DSurface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9175d27..d126860 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -392,6 +392,88 @@ cleanup: DestroyWindow( hwnd ); } +static void test_cursor(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D9 *pD3d = NULL; + IDirect3DDevice9 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + CURSORINFO info; + IDirect3DSurface9 *cursor = NULL; + HCURSOR cur; + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + cur = info.hCursor; + + pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + if (FAILED(hr)) goto cleanup; + + IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &cursor, 0); + ok(cursor != NULL, "IDirect3DDevice9_CreateOffscreenPlainSurface failed with %08lx\n", hr); + + /* Initially hidden */ + hr = IDirect3DDevice9_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08lx\n", hr); + + /* Not enabled without a surface*/ + hr = IDirect3DDevice9_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08lx\n", hr); + + /* Fails */ + hr = IDirect3DDevice9_SetCursorProperties(pDevice, 0, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_SetCursorProperties returned %08lx\n", hr); + + hr = IDirect3DDevice9_SetCursorProperties(pDevice, 0, 0, cursor); + ok(hr == D3D_OK, "IDirect3DDevice9_SetCursorProperties returned %08lx\n", hr); + + IDirect3DSurface9_Release(cursor); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + ok(hr != 0, "GetCursorInfo returned %08lx\n", hr); + ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08lx)\n", info.flags); + ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + + /* Still hidden */ + hr = IDirect3DDevice9_ShowCursor(pDevice, TRUE); + ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08lx\n", hr); + + /* Enabled now*/ + hr = IDirect3DDevice9_ShowCursor(pDevice, TRUE); + ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08lx\n", hr); + + /* GDI cursor unchanged */ + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + hr = GetCursorInfo(&info); + ok(hr != 0, "GetCursorInfo returned %08lx\n", hr); + ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08lx)\n", info.flags); + ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + +cleanup: + if(pD3d) IDirect3D9_Release(pD3d); + if(pDevice) IDirect3D9_Release(pDevice); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -402,5 +484,6 @@ START_TEST(device) test_swapchain(); test_refcount(); test_mipmap_levels(); + test_cursor(); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9ac8cf9..eb84173 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7659,11 +7659,13 @@ static void WINAPI IWineD3DDeviceIm static BOOL WINAPI IWineD3DDeviceImpl_ShowCursor(IWineD3DDevice* iface, BOOL bShow) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + BOOL oldVisible = This->bCursorVisible; TRACE("(%p) : visible(%d)\n", This, bShow); - This->bCursorVisible = bShow; + if(This->cursorTexture) + This->bCursorVisible = bShow; - return WINED3D_OK; + return oldVisible; } static HRESULT WINAPI IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice* iface) {

1 0

Roderick Colenbrander : wined3d: Draw buffers support.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 31abc2febdf89ede11bc40be3dabb2e514b6881a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31abc2febdf89ede11bc40b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 9 22:54:14 2006 +0200 wined3d: Draw buffers support. --- dlls/wined3d/glsl_shader.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 62f27e3..e5b8113 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -562,6 +562,7 @@ static void shader_glsl_get_register_nam /* oPos, oFog and oPts in D3D */ const char* hwrastout_reg_names[] = { "gl_Position", "gl_FogFragCoord", "gl_PointSize" }; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl*)((IWineD3DPixelShaderImpl*)arg->shader)->wineD3DDevice->wineD3D)->gl_info; DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) arg->shader; @@ -641,10 +642,17 @@ static void shader_glsl_get_register_nam sprintf(tmpStr, "Vsampler%lu", reg); break; case D3DSPR_COLOROUT: - sprintf(tmpStr, "gl_FragData[%lu]", reg); - if (reg > 0) { - /* TODO: See GL_ARB_draw_buffers */ - FIXME("Unsupported write to render target %lu\n", reg); + if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { + sprintf(tmpStr, "gl_FragData[%lu]", reg); + if (reg > 0) { + /* TODO: See GL_ARB_draw_buffers */ + FIXME("Unsupported write to render target %lu\n", reg); + } + } else { /* On older cards with GLSL support like the GeforceFX there's only one buffer. */ + if (reg > 0) + WARN("This OpenGL implementation doesn't support writing to multiple render targets!\n"); + else + sprintf(tmpStr, "gl_FragColor"); } break; case D3DSPR_RASTOUT:

1 0

Paul Chitescu : wininet: MSG_WAITALL support in NETCON_recv with SSL.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: 8b1b3818726c967b27cf938aa312cd317578f282 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b1b3818726c967b27cf938… Author: Paul Chitescu <pchitescu(a)voip.null.ro> Date: Tue Aug 8 23:37:41 2006 +0300 wininet: MSG_WAITALL support in NETCON_recv with SSL. --- dlls/wininet/netconnection.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 42fc9fe..d491724 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -511,7 +511,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION * else { #if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H - if (flags & (~MSG_PEEK)) + if (flags & ~(MSG_PEEK|MSG_WAITALL)) FIXME("SSL_read does not support the following flag: %08x\n", flags); /* this ugly hack is all for MSG_PEEK. eww gross */ @@ -538,6 +538,15 @@ #if defined HAVE_OPENSSL_SSL_H && define HeapFree(GetProcessHeap(), 0, connection->peek_msg_mem); connection->peek_msg_mem = NULL; connection->peek_msg = NULL; + /* check if the peek buffer held too few data */ + if ((flags & MSG_WAITALL) && (*recvd < len)) + { + int recv2 = 0; + /* recursive call - but now the peek buffer is empty */ + if (!NETCON_recv(connection, (char*)buf + *recvd, len - *recvd, flags, &recv2)) + return FALSE; + *recvd += recv2; + } } return TRUE; }

1 0