December 2007 - Wine-commits

Kirill K. Smirnov : winhelp: Correctly deal with various TopicBlockSize/ Compression combinations. Simplify HLPFILE_Uncompress_Topic function.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 1fdd01966c28301c9f76db3f66e8644baf67b4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdd01966c28301c9f76db3f6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 18:57:24 2007 +0300 winhelp: Correctly deal with various TopicBlockSize/Compression combinations. Simplify HLPFILE_Uncompress_Topic function. --- programs/winhelp/hlpfile.c | 84 ++++++++++++++++++++++++++------------------ programs/winhelp/hlpfile.h | 3 ++ 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 3c34a06..e94dbfd 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -3,6 +3,7 @@ * * Copyright 1996 Ulrich Schmid * 2002 Eric Pouech + * 2007 Kirill K. Smirnov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -337,9 +338,8 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) { BYTE* end; - /* FIXME this depends on the blocksize, can be 2k in some cases */ - index = (ref - 0x0C) >> 14; - offset = (ref - 0x0C) & 0x3fff; + index = (ref - 0x0C) / hlpfile->dsize; + offset = (ref - 0x0C) % hlpfile->dsize; WINE_TRACE("ref=%08x => [%u/%u]\n", ref, index, offset); @@ -1387,8 +1387,31 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) magic, major, minor, flags); if (magic != 0x036C || major != 1) {WINE_WARN("Wrong system header\n"); return FALSE;} - if (minor <= 16) {WINE_WARN("too old file format (NIY)\n"); return FALSE;} - if (flags & 8) {WINE_WARN("Unsupported yet page size\n"); return FALSE;} + if (minor <= 16) + { + hlpfile->tbsize = 0x800; + hlpfile->compressed = 0; + } + else if (flags == 0) + { + hlpfile->tbsize = 0x1000; + hlpfile->compressed = 0; + } + else if (flags == 4) + { + hlpfile->tbsize = 0x1000; + hlpfile->compressed = 1; + } + else + { + hlpfile->tbsize = 0x800; + hlpfile->compressed = 1; + } + + if (hlpfile->compressed) + hlpfile->dsize = 0x4000; + else + hlpfile->dsize = hlpfile->tbsize - 0x0C; hlpfile->version = minor; hlpfile->flags = flags; @@ -1654,29 +1677,27 @@ static BOOL HLPFILE_Uncompress_Topic(HLPFILE* hlpfile) { BYTE *buf, *ptr, *end, *newptr; unsigned int i, newsize = 0; + unsigned int topic_size; if (!HLPFILE_FindSubFile("|TOPIC", &buf, &end)) {WINE_WARN("topic0\n"); return FALSE;} - switch (hlpfile->flags & (8|4)) + buf += 9; /* Skip file header */ + topic_size = end - buf; + if (hlpfile->compressed) { - case 8: - WINE_FIXME("Unsupported format\n"); - return FALSE; - case 4: - buf += 9; - topic.wMapLen = (end - buf - 1) / 0x1000 + 1; - + topic.wMapLen = (topic_size - 1) / hlpfile->tbsize + 1; + for (i = 0; i < topic.wMapLen; i++) { - ptr = buf + i * 0x1000; - + ptr = buf + i * hlpfile->tbsize; + /* I don't know why, it's necessary for printman.hlp */ if (ptr + 0x44 > end) ptr = end - 0x44; - newsize += HLPFILE_UncompressedLZ77_Size(ptr + 0xc, min(end, ptr + 0x1000)); + newsize += HLPFILE_UncompressedLZ77_Size(ptr + 0xc, min(end, ptr + hlpfile->tbsize)); } - + topic.map = HeapAlloc(GetProcessHeap(), 0, topic.wMapLen * sizeof(topic.map[0]) + newsize); if (!topic.map) return FALSE; @@ -1685,35 +1706,30 @@ static BOOL HLPFILE_Uncompress_Topic(HLPFILE* hlpfile) for (i = 0; i < topic.wMapLen; i++) { - ptr = buf + i * 0x1000; + ptr = buf + i * hlpfile->tbsize; if (ptr + 0x44 > end) ptr = end - 0x44; topic.map[i] = newptr; - newptr = HLPFILE_UncompressLZ77(ptr + 0xc, min(end, ptr + 0x1000), newptr); + newptr = HLPFILE_UncompressLZ77(ptr + 0xc, min(end, ptr + hlpfile->tbsize), newptr); } - break; - case 0: - /* basically, we need to copy the 0x1000 byte pages (removing the first 0x0C) in - * one single are in memory + } + else + { + /* basically, we need to copy the TopicBlockSize byte pages + * (removing the first 0x0C) in one single area in memory */ -#define DST_LEN (0x1000 - 0x0C) - buf += 9; - newsize = end - buf; - /* number of destination pages */ - topic.wMapLen = (newsize - 1) / DST_LEN + 1; + topic.wMapLen = (topic_size - 1) / hlpfile->tbsize + 1; topic.map = HeapAlloc(GetProcessHeap(), 0, - topic.wMapLen * (sizeof(topic.map[0]) + DST_LEN)); + topic.wMapLen * (sizeof(topic.map[0]) + hlpfile->dsize)); if (!topic.map) return FALSE; newptr = (BYTE*)(topic.map + topic.wMapLen); - topic.end = newptr + newsize; + topic.end = newptr + topic_size; for (i = 0; i < topic.wMapLen; i++) { - topic.map[i] = newptr + i * DST_LEN; - memcpy(topic.map[i], buf + i * 0x1000 + 0x0C, DST_LEN); + topic.map[i] = newptr + i * hlpfile->dsize; + memcpy(topic.map[i], buf + i * hlpfile->tbsize + 0x0C, hlpfile->dsize); } -#undef DST_LEN - break; } return TRUE; } diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 4d62cdd..3c6b6b9 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -141,6 +141,9 @@ typedef struct tagHlpFileFile unsigned short version; unsigned short flags; + unsigned short tbsize; /* topic block size */ + unsigned short dsize; /* decompress size */ + unsigned short compressed; unsigned hasPhrases; /* Phrases or PhrIndex/PhrImage */ unsigned numBmps;

1 0

Kirill K. Smirnov : winhelp: Add support for winhelp 3.0 phrases.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 73e9173e7cb68bec8dfb4b9de70ff253e1fdcd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e9173e7cb68bec8dfb4b9de… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Dec 1 18:59:12 2007 +0300 winhelp: Add support for winhelp 3.0 phrases. --- programs/winhelp/hlpfile.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e94dbfd..e678a4a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1575,24 +1575,35 @@ static BYTE *HLPFILE_UncompressLZ77(BYTE *ptr, BYTE *end, BYTE *newptr) */ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE* hlpfile) { - UINT i, num, dec_size; + UINT i, num, dec_size, head_size; BYTE *buf, *end; if (!HLPFILE_FindSubFile("|Phrases", &buf, &end)) return FALSE; + if (hlpfile->version <= 16) + head_size = 13; + else + head_size = 17; + num = phrases.num = GET_USHORT(buf, 9); if (buf + 2 * num + 0x13 >= end) {WINE_WARN("1a\n"); return FALSE;}; - dec_size = HLPFILE_UncompressedLZ77_Size(buf + 0x13 + 2 * num, end); + if (hlpfile->version <= 16) + dec_size = end - buf - 15 - 2 * num; + else + dec_size = HLPFILE_UncompressedLZ77_Size(buf + 0x13 + 2 * num, end); phrases.offsets = HeapAlloc(GetProcessHeap(), 0, sizeof(unsigned) * (num + 1)); phrases.buffer = HeapAlloc(GetProcessHeap(), 0, dec_size); if (!phrases.offsets || !phrases.buffer) return FALSE; for (i = 0; i <= num; i++) - phrases.offsets[i] = GET_USHORT(buf, 0x11 + 2 * i) - 2 * num - 2; + phrases.offsets[i] = GET_USHORT(buf, head_size + 2 * i) - 2 * num - 2; - HLPFILE_UncompressLZ77(buf + 0x13 + 2 * num, end, (BYTE*)phrases.buffer); + if (hlpfile->version <= 16) + memcpy(phrases.buffer, buf + 15 + 2*num, dec_size); + else + HLPFILE_UncompressLZ77(buf + 0x13 + 2 * num, end, (BYTE*)phrases.buffer); hlpfile->hasPhrases = TRUE; return TRUE;

1 0

James Hawkins : msi: Test the CCPSearch action.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 6a30e1b0b462f269066ccadcec3cee53f9cdf9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a30e1b0b462f269066ccadce… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Nov 30 20:09:22 2007 -0600 msi: Test the CCPSearch action. --- dlls/msi/tests/package.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6574a80..85dc646 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -210,6 +210,25 @@ static UINT create_media_table( MSIHANDLE hdb ) "PRIMARY KEY `DiskId`)" ); } +static UINT create_ccpsearch_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `CCPSearch` (" + "`Signature_` CHAR(72) NOT NULL " + "PRIMARY KEY `Signature_`)" ); +} + +static UINT create_drlocator_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `DrLocator` (" + "`Signature_` CHAR(72) NOT NULL, " + "`Parent` CHAR(72), " + "`Path` CHAR(255), " + "`Depth` SHORT " + "PRIMARY KEY `Signature_`, `Parent`, `Path`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -386,6 +405,36 @@ static UINT add_media_entry( MSIHANDLE hdb, const char *values ) return r; } +static UINT add_ccpsearch_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `CCPSearch` (`Signature_`) VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + +static UINT add_drlocator_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `DrLocator` " + "(`Signature_`, `Parent`, `Path`, `Depth`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT set_summary_info(MSIHANDLE hdb) { UINT res; @@ -4773,6 +4822,58 @@ static void test_launchconditions(void) DeleteFile( msifile ); } +static void test_ccpsearch(void) +{ + MSIHANDLE hdb, hpkg; + CHAR prop[MAX_PATH]; + DWORD size = MAX_PATH; + UINT r; + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create package database\n"); + + r = create_ccpsearch_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_ccpsearch_entry(hdb, "'CCP_random'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_ccpsearch_entry(hdb, "'RMCCP_random'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_reglocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_reglocator_entry(hdb, "'CCP_random', 0, 'htmlfile\\shell\\open\\nonexistent', '', 1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_drlocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_drlocator_entry(hdb, "'RMCCP_random', '', 'C:\\', '0'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_signature_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hpkg = package_from_db(hdb); + ok(hpkg, "failed to create package\n"); + + MsiCloseHandle(hdb); + + r = MsiDoAction(hpkg, "CCPSearch"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiGetPropertyA(hpkg, "CCP_Success", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, "1"), "Expected 1, got %s\n", prop); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { test_createpackage(); @@ -4795,4 +4896,5 @@ START_TEST(package) test_sourcedirprop(); test_prop_path(); test_launchconditions(); + test_ccpsearch(); }

1 0

James Hawkins : msi: Implement the Version property of the Installer object .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: b57a2f93a976397b38e72eaabd888e7a6823a5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57a2f93a976397b38e72eaab… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 2 01:35:33 2007 -0600 msi: Implement the Version property of the Installer object. --- dlls/msi/automation.c | 21 +++++++++++++++++++++ dlls/msi/msiserver.idl | 2 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 10 ++++------ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0b631ac..dc94cbc 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -30,6 +30,7 @@ #include "msipriv.h" #include "activscp.h" #include "oleauto.h" +#include "shlwapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1648,6 +1649,26 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_VERSION: + if (wFlags & DISPATCH_PROPERTYGET) { + DLLVERSIONINFO verinfo; + WCHAR version[MAX_PATH]; + + static const WCHAR format[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; + + verinfo.cbSize = sizeof(DLLVERSIONINFO); + hr = DllGetVersion(&verinfo); + if (FAILED(hr)) return hr; + + sprintfW(version, format, verinfo.dwMajorVersion, verinfo.dwMinorVersion, + verinfo.dwBuildNumber, verinfo.dwPlatformID); + + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = SysAllocString(version); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_REGISTRYVALUE: if (wFlags & DISPATCH_METHOD) { HKEY hkey; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 1c462ec..317a3ac 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -145,6 +145,8 @@ library WindowsInstaller void InstallProduct( [in] BSTR PackagePath, [in, optional, defaultvalue("0")] BSTR PropertyValues); + [id(DISPID_INSTALLER_VERSION)] + BSTR Version(); [id(DISPID_INSTALLER_REGISTRYVALUE), propget] BSTR RegistryValue( [in] VARIANT Root, diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 8d673dd..afbadbb 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -20,6 +20,7 @@ #define DISPID_INSTALLER_OPENPACKAGE 2 #define DISPID_INSTALLER_OPENDATABASE 4 #define DISPID_INSTALLER_INSTALLPRODUCT 8 +#define DISPID_INSTALLER_VERSION 9 #define DISPID_INSTALLER_REGISTRYVALUE 11 #define DISPID_INSTALLER_PRODUCTSTATE 17 #define DISPID_INSTALLER_PRODUCTINFO 18 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 269d17c..90e4b1f 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -475,8 +475,8 @@ static void test_dispid(void) ok( get_dispid( pInstaller, "EnableLog" ) == 7, "dispid wrong\n"); } ok( get_dispid( pInstaller, "InstallProduct" ) == 8, "dispid wrong\n"); - todo_wine { ok( get_dispid( pInstaller, "Version" ) == 9, "dispid wrong\n"); + todo_wine { ok( get_dispid( pInstaller, "LastErrorRecord" ) == 10, "dispid wrong\n"); } ok( get_dispid( pInstaller, "RegistryValue" ) == 11, "dispid wrong\n"); @@ -2379,11 +2379,9 @@ static void test_Installer(void) } /* Installer::Version */ - todo_wine { - memset(szPath, 0, sizeof(szPath)); - hr = Installer_VersionGet(szPath); - ok(hr == S_OK, "Installer_VersionGet failed, hresult 0x%08x\n", hr); - } + memset(szPath, 0, sizeof(szPath)); + hr = Installer_VersionGet(szPath); + ok(hr == S_OK, "Installer_VersionGet failed, hresult 0x%08x\n", hr); /* Installer::InstallProduct and other tests that depend on our product being installed */ test_Installer_InstallProduct();

1 0

James Hawkins : msi: Add a stub implementation of MsiEnumComponentCostsW.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: c77d200f27cfc47b9f4f6df7d7231c8f147c43c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77d200f27cfc47b9f4f6df7d… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 2 02:05:29 2007 -0600 msi: Add a stub implementation of MsiEnumComponentCostsW. --- dlls/msi/msi.c | 12 ++++++++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 72e52af..8e140d3 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -732,6 +732,18 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) return ERROR_SUCCESS; } +UINT WINAPI MsiEnumComponentCostsW(MSIHANDLE hInstall, LPCWSTR szComponent, + DWORD dwIndex, INSTALLSTATE iState, + LPWSTR lpDriveBuf, DWORD *pcchDriveBuf, + int *piCost, int *pTempCost) +{ + FIXME("(%ld, %s, %d, %d, %p, %p, %p %p): stub!\n", hInstall, + debugstr_w(szComponent), dwIndex, iState, lpDriveBuf, + pcchDriveBuf, piCost, pTempCost); + + return ERROR_NO_MORE_ITEMS; +} + UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szComponent, INSTALLSTATE *pdwState) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 25ffb0b..2294eff 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -214,7 +214,7 @@ 218 stdcall MsiGetFileHashA(str long ptr) 219 stdcall MsiGetFileHashW(wstr long ptr) 220 stub MsiEnumComponentCostsA -221 stub MsiEnumComponentCostsW +221 stdcall MsiEnumComponentCostsW(long str long long ptr ptr ptr ptr) 222 stdcall MsiCreateAndVerifyInstallerDirectory(long) 223 stdcall MsiGetFileSignatureInformationA(str long ptr ptr ptr) 224 stdcall MsiGetFileSignatureInformationW(wstr long ptr ptr ptr)

1 0

Stefan Dösinger : wined3d: Add parentheses to a flag check.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 79e13d17be2e376fef92e9bd86ae7053ab5cf799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e13d17be2e376fef92e9bd8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 2 14:14:30 2007 +0100 wined3d: Add parentheses to a flag check. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9ae5bf0..ea3d130 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6402,7 +6402,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, FIXME("Trying to set render target 0 to NULL\n"); return WINED3DERR_INVALIDCALL; } - if (pRenderTarget && !((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET) { + if (pRenderTarget && !(((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET)) { FIXME("(%p)Trying to set the render target to a surface(%p) that wasn't created with a usage of WINED3DUSAGE_RENDERTARGET\n",This ,pRenderTarget); return WINED3DERR_INVALIDCALL; }

1 0

James Hawkins : msi: Use a hash table for reordering rows in a WHERE query to conserve space.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 80bbf583780cb5f275b6bb111e5dfd2c71b9ca88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bbf583780cb5f275b6bb111… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 2 20:42:25 2007 -0600 msi: Use a hash table for reordering rows in a WHERE query to conserve space. --- dlls/msi/where.c | 117 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 19 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 26e4c8f..4029a7f 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -35,6 +35,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); +#define MSI_HASH_TABLE_SIZE 37 + +typedef struct tagMSIHASHENTRY +{ + struct tagMSIHASHENTRY *next; + UINT value; + UINT row; +} MSIHASHENTRY; /* below is the query interface to a table */ @@ -44,14 +52,78 @@ typedef struct tagMSIWHEREVIEW MSIDATABASE *db; MSIVIEW *table; UINT row_count; - UINT *reorder; + MSIHASHENTRY **reorder; struct expr *cond; UINT rec_index; } MSIWHEREVIEW; +static void free_hash_table(MSIHASHENTRY **table) +{ + MSIHASHENTRY *new, *old; + int i; + + if (!table) + return; + + for (i = 0; i < MSI_HASH_TABLE_SIZE; i++) + { + new = table[i]; + + while (new) + { + old = new; + new = old->next; + msi_free(old); + } + + table[i] = NULL; + } + + msi_free(table); +} + +static UINT find_entry_in_hash(MSIHASHENTRY **table, UINT row, UINT *val) +{ + MSIHASHENTRY *entry; + + if (!(entry = table[row % MSI_HASH_TABLE_SIZE])) + { + ERR("Row not found in hash table!\n"); + return ERROR_FUNCTION_FAILED; + } + + while (entry && entry->row != row) + entry = entry->next; + + if (entry) *val = entry->value; + return ERROR_SUCCESS; +} + +static UINT add_entry_to_hash(MSIHASHENTRY **table, UINT row, UINT val) +{ + MSIHASHENTRY *new = msi_alloc(sizeof(MSIHASHENTRY)); + MSIHASHENTRY *prev; + + if (!new) + return ERROR_OUTOFMEMORY; + + new->next = NULL; + new->value = val; + new->row = row; + + prev = table[row % MSI_HASH_TABLE_SIZE]; + if (prev) + new->next = prev; + + table[row % MSI_HASH_TABLE_SIZE] = new; + + return ERROR_SUCCESS; +} + static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; + UINT r; TRACE("%p %d %d %p\n", wv, row, col, val ); @@ -61,7 +133,9 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * if( row > wv->row_count ) return ERROR_NO_MORE_ITEMS; - row = wv->reorder[ row ]; + r = find_entry_in_hash(wv->reorder, row, &row); + if (r != ERROR_SUCCESS) + return r; return wv->table->ops->fetch_int( wv->table, row, col, val ); } @@ -69,6 +143,7 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; + UINT r; TRACE("%p %d %d %p\n", wv, row, col, stm ); @@ -78,7 +153,9 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt if( row > wv->row_count ) return ERROR_NO_MORE_ITEMS; - row = wv->reorder[ row ]; + r = find_entry_in_hash(wv->reorder, row, &row); + if (r != ERROR_SUCCESS) + return r; return wv->table->ops->fetch_stream( wv->table, row, col, stm ); } @@ -86,6 +163,7 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; + UINT r; TRACE("%p %d %p\n", wv, row, rec ); @@ -95,7 +173,9 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) if (row > wv->row_count) return ERROR_NO_MORE_ITEMS; - row = wv->reorder[row]; + r = find_entry_in_hash(wv->reorder, row, &row); + if (r != ERROR_SUCCESS) + return r; return wv->table->ops->get_row(view, row, rec); } @@ -103,6 +183,7 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; + UINT r; TRACE("%p %d %p %08x\n", wv, row, rec, mask ); @@ -112,7 +193,9 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if( row > wv->row_count ) return ERROR_NO_MORE_ITEMS; - row = wv->reorder[ row ]; + r = find_entry_in_hash(wv->reorder, row, &row); + if (r != ERROR_SUCCESS) + return r; return wv->table->ops->set_row( wv->table, row, rec, mask ); } @@ -264,7 +347,6 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, UINT row, } return ERROR_SUCCESS; - } static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) @@ -287,10 +369,10 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( r != ERROR_SUCCESS ) return r; - msi_free( wv->reorder ); - wv->reorder = msi_alloc( count*sizeof(UINT) ); + free_hash_table(wv->reorder); + wv->reorder = msi_alloc_zero(MSI_HASH_TABLE_SIZE * sizeof(MSIHASHENTRY *)); if( !wv->reorder ) - return ERROR_FUNCTION_FAILED; + return ERROR_OUTOFMEMORY; wv->row_count = 0; if (wv->cond->type == EXPR_STRCMP) @@ -327,7 +409,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { r = table->ops->find_matching_rows(table, col, value, &row, &handle); if (r == ERROR_SUCCESS) - wv->reorder[ wv->row_count ++ ] = row; + add_entry_to_hash(wv->reorder, wv->row_count++, row); } while (r == ERROR_SUCCESS); if (r == ERROR_NO_MORE_ITEMS) @@ -346,7 +428,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( r != ERROR_SUCCESS ) return r; if( val ) - wv->reorder[ wv->row_count ++ ] = i; + add_entry_to_hash( wv->reorder, wv->row_count++, i ); } return ERROR_SUCCESS; @@ -359,10 +441,7 @@ static UINT WHERE_close( struct tagMSIVIEW *view ) TRACE("%p\n", wv ); if( !wv->table ) - return ERROR_FUNCTION_FAILED; - - msi_free( wv->reorder ); - wv->reorder = NULL; + return ERROR_FUNCTION_FAILED; return wv->table->ops->close( wv->table ); } @@ -422,7 +501,7 @@ static UINT WHERE_delete( struct tagMSIVIEW *view ) wv->table->ops->delete( wv->table ); wv->table = 0; - msi_free( wv->reorder ); + free_hash_table(wv->reorder); wv->reorder = NULL; wv->row_count = 0; @@ -444,13 +523,13 @@ static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col, return ERROR_FUNCTION_FAILED; r = wv->table->ops->find_matching_rows( wv->table, col, val, row, handle ); + if (r != ERROR_SUCCESS) + return r; if( *row > wv->row_count ) return ERROR_NO_MORE_ITEMS; - *row = wv->reorder[ *row ]; - - return r; + return find_entry_in_hash(wv->reorder, *row, row); }

1 0

Alexandre Julliard : ntdll: Added a sleep in NtGet/SetContextThread, a yield is not enough on some kernels.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 3ae370dc71481dd7e50d439dd82b29ded2908c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae370dc71481dd7e50d439dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 13:55:25 2007 +0100 ntdll: Added a sleep in NtGet/SetContextThread, a yield is not enough on some kernels. --- dlls/ntdll/thread.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 37a845f..15768c2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -820,8 +820,13 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) ret = wine_server_call( req ); } SERVER_END_REQ; - if (ret != STATUS_PENDING) break; - NtYieldExecution(); + if (ret == STATUS_PENDING) + { + LARGE_INTEGER timeout; + timeout.QuadPart = -10000; + NtDelayExecution( FALSE, &timeout ); + } + else break; } NtResumeThread( handle, &dummy ); } @@ -1110,8 +1115,13 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) ret = wine_server_call( req ); } SERVER_END_REQ; - if (ret != STATUS_PENDING) break; - NtYieldExecution(); + if (ret == STATUS_PENDING) + { + LARGE_INTEGER timeout; + timeout.QuadPart = -10000; + NtDelayExecution( FALSE, &timeout ); + } + else break; } NtResumeThread( handle, &dummy ); }

1 0

Stefan Dösinger : wined3d: Enabling too many lights is silently ignored.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 3cc253c557fb68e620ee4f5130a781e56f17d6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc253c557fb68e620ee4f513… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 29 13:22:47 2007 +0100 wined3d: Enabling too many lights is silently ignored. I'm resending this patch because my reply to Henri's concern came too late. Henri noted that I am enabling lights that do not exist. Existing tests show that if no light is assigned to the index, LightEnable creates a light with a set of default parameters, so the tests should be fine. >From 9ee4c61805b50886f79e87d744b52f27b7b00b4e Mon Sep 17 00:00:00 2001 From: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu, 29 Nov 2007 13:22:47 +0100 Subject: [PATCH] WineD3D: Enabling too many lights is silently ignored This patch adds tests for all d3d versions that show that Windows pretends that enabling more lights than supported succeeds. D3D_OK is returned, and the light is reported as enabled. What is not tested in this patch is the rendering output of this situation, thus the FIXME is still written. --- dlls/d3d8/tests/device.c | 69 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 63 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/d3d.c | 29 +++++++++++++++++ dlls/wined3d/device.c | 15 +++++++-- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 174 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cc253c557fb68e620ee4…

1 0

Stefan Dösinger : wined3d: Unify bpp to format conversion.
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 8804a972d9acd918a7e384ebcac41776aab0564c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8804a972d9acd918a7e384ebc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 30 16:29:49 2007 +0100 wined3d: Unify bpp to format conversion. --- dlls/wined3d/directx.c | 28 +++------------------------- dlls/wined3d/utils.c | 4 ++-- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b4ab8f..efe69eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1410,23 +1410,8 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) pMode->RefreshRate = DevModeW.dmDisplayFrequency; - if (Format == WINED3DFMT_UNKNOWN) - { - switch (DevModeW.dmBitsPerPel) - { - case 8: - pMode->Format = WINED3DFMT_P8; - break; - case 16: - pMode->Format = WINED3DFMT_R5G6B5; - break; - case 32: - pMode->Format = WINED3DFMT_X8R8G8B8; - break; - default: - pMode->Format = WINED3DFMT_UNKNOWN; - ERR("Unhandled bit depth (%u) in mode list!\n", DevModeW.dmBitsPerPel); - } + if (Format == WINED3DFMT_UNKNOWN) { + pMode->Format = pixelformat_for_depth(DevModeW.dmBitsPerPel); } else { pMode->Format = Format; } @@ -1479,14 +1464,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A pMode->RefreshRate = DevModeW.dmDisplayFrequency; } - switch (bpp) { - case 8: pMode->Format = WINED3DFMT_R3G3B2; break; - case 16: pMode->Format = WINED3DFMT_R5G6B5; break; - case 24: pMode->Format = WINED3DFMT_X8R8G8B8; break; /* Robots needs 24bit to be X8R8G8B8 */ - case 32: pMode->Format = WINED3DFMT_X8R8G8B8; break; /* EVE online and the Fur demo need 32bit AdapterDisplatMode to return X8R8G8B8 */ - default: pMode->Format = WINED3DFMT_UNKNOWN; - } - + pMode->Format = pixelformat_for_depth(bpp); } else { FIXME_(d3d_caps)("Adapter not primary display\n"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 15b37ea..2b7aa40 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2697,8 +2697,8 @@ WINED3DFORMAT pixelformat_for_depth(DWORD depth) { case 8: return WINED3DFMT_P8; case 15: return WINED3DFMT_X1R5G5B5; case 16: return WINED3DFMT_R5G6B5; - case 24: return WINED3DFMT_R8G8B8; - case 32: return WINED3DFMT_X8R8G8B8; + case 24: return WINED3DFMT_X8R8G8B8; /* Robots needs 24bit to be X8R8G8B8 */ + case 32: return WINED3DFMT_X8R8G8B8; /* EVE online and the Fur demo need 32bit AdapterDisplatMode to return X8R8G8B8 */ default: return WINED3DFMT_UNKNOWN; } }

1 0