November 2006 - Wine-commits

Andrew Talbot : winex11.drv: Cast-qual warnings fix.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: c8e64830f90c6502d17d47612f15dcc9d8198c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e64830f90c6502d17d47612… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Nov 25 18:25:15 2006 +0000 winex11.drv: Cast-qual warnings fix. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 149b11d..146a668 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -342,7 +342,7 @@ static BOOL has_opengl(void) return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = (void*)pglXGetProcAddressARB((unsigned char*)#f)) == NULL) goto sym_not_found; +#define LOAD_FUNCPTR(f) if((p##f = (void*)pglXGetProcAddressARB((const unsigned char*)#f)) == NULL) goto sym_not_found; /* GLX 1.0 */ LOAD_FUNCPTR(glXChooseVisual) LOAD_FUNCPTR(glXCreateContext) @@ -1404,7 +1404,7 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps /* Check the table of WGL extensions to see if we need to return a WGL extension * or a function pointer to a native OpenGL function. */ if(strncmp(lpszProc, "wgl", 3) != 0) { - return pglXGetProcAddressARB((GLubyte*)lpszProc); + return pglXGetProcAddressARB((const GLubyte*)lpszProc); } else { TRACE("('%s'):%*s", lpszProc, padding, " "); for (i = 0; i < WineGLExtensionListSize; ++i) {

1 0

Alexandre Julliard : gphoto2.ds: Don' t warn about libjpeg if gphoto support is not enabled.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 86ba62a5637c2cfac38f223697fecdd09cc2bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ba62a5637c2cfac38f22369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 13:47:17 2006 +0100 gphoto2.ds: Don't warn about libjpeg if gphoto support is not enabled. --- dlls/gphoto2.ds/gphoto2_i.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 3e91d6c..bb2b6e3 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -24,7 +24,7 @@ # error You must include config.h first #endif -#if !defined(HAVE_JPEGLIB_H) +#if defined(HAVE_GPHOTO2) && !defined(HAVE_JPEGLIB_H) # warning "gphoto2 support in twain needs jpeg development headers" # undef HAVE_GPHOTO2 #endif

1 0

Roderick Colenbrander : wgl: Unify pixel format code.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 57ff710cde876b58c302b9463109e1bbe76ea1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ff710cde876b58c302b9463… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Nov 18 23:29:48 2006 +0100 wgl: Unify pixel format code. --- dlls/winex11.drv/opengl.c | 221 ++++++++++++++++++++++----------------------- 1 files changed, 108 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57ff710cde876b58c302b…

1 0

Mike McCormack : msi: Use MSI_QueryGetRecord in ACTION_AppSearchReg.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 54ab47ef596f2f82974b2ca15c9131a090fdd4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ab47ef596f2f82974b2ca15… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 27 18:16:34 2006 +0900 msi: Use MSI_QueryGetRecord in ACTION_AppSearchReg. --- dlls/msi/appsearch.c | 209 ++++++++++++++++++++++---------------------------- 1 files changed, 91 insertions(+), 118 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 34196a7..8f1e388 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -235,139 +235,112 @@ static void ACTION_ConvertRegValue(DWORD static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, LPCWSTR path, int depth, LPWSTR *appValue); -static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, - MSISIGNATURE *sig) +static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { - MSIQUERY *view; + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'R','e','g','L','o','c','a','t','o','r',' ', + 'w','h','e','r','e',' ', + 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; + LPWSTR keyPath = NULL, valueName = NULL; + int root, type; + HKEY rootKey, key = NULL; + DWORD sz = 0, regType; + LPBYTE value = NULL; + MSIRECORD *row; UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'R','e','g','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', - '\'','%','s','\'',0}; - TRACE("(package %p, appValue %p, sig %p)\n", package, appValue, sig); + TRACE("%s\n", debugstr_w(sig->Name)); + *appValue = NULL; - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, sig->Name); - if (rc == ERROR_SUCCESS) + + row = MSI_QueryGetRecord( package->db, query, sig->Name ); + if (!row) { - MSIRECORD *row = 0; - LPWSTR keyPath = NULL, valueName = NULL; - int root, type; - HKEY rootKey, key = NULL; - DWORD sz = 0, regType; - LPBYTE value = NULL; + TRACE("failed to query RegLocator for %s\n", debugstr_w(sig->Name)); + return ERROR_SUCCESS; + } - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewExecute returned %d\n", rc); - goto end; - } - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewFetch returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } + root = MSI_RecordGetInteger(row,2); + keyPath = msi_dup_record_field(row,3); + /* FIXME: keyPath needs to be expanded for properties */ + valueName = msi_dup_record_field(row,4); + /* FIXME: valueName probably does too */ + type = MSI_RecordGetInteger(row,5); - root = MSI_RecordGetInteger(row,2); - keyPath = msi_dup_record_field(row,3); - /* FIXME: keyPath needs to be expanded for properties */ - valueName = msi_dup_record_field(row,4); - /* FIXME: valueName probably does too */ - type = MSI_RecordGetInteger(row,5); + switch (root) + { + case msidbRegistryRootClassesRoot: + rootKey = HKEY_CLASSES_ROOT; + break; + case msidbRegistryRootCurrentUser: + rootKey = HKEY_CURRENT_USER; + break; + case msidbRegistryRootLocalMachine: + rootKey = HKEY_LOCAL_MACHINE; + break; + case msidbRegistryRootUsers: + rootKey = HKEY_USERS; + break; + default: + WARN("Unknown root key %d\n", root); + goto end; + } - switch (root) - { - case msidbRegistryRootClassesRoot: - rootKey = HKEY_CLASSES_ROOT; - break; - case msidbRegistryRootCurrentUser: - rootKey = HKEY_CURRENT_USER; - break; - case msidbRegistryRootLocalMachine: - rootKey = HKEY_LOCAL_MACHINE; - break; - case msidbRegistryRootUsers: - rootKey = HKEY_USERS; - break; - default: - WARN("Unknown root key %d\n", root); - goto end; - } + rc = RegOpenKeyW(rootKey, keyPath, &key); + if (rc) + { + TRACE("RegOpenKeyW returned %d\n", rc); + goto end; + } - rc = RegOpenKeyW(rootKey, keyPath, &key); - if (rc) - { - TRACE("RegOpenKeyW returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } - rc = RegQueryValueExW(key, valueName, NULL, NULL, NULL, &sz); - if (rc) - { - TRACE("RegQueryValueExW returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } - /* FIXME: sanity-check sz before allocating (is there an upper-limit - * on the value of a property?) - */ - value = msi_alloc( sz); - rc = RegQueryValueExW(key, valueName, NULL, &regType, value, &sz); - if (rc) - { - TRACE("RegQueryValueExW returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } + rc = RegQueryValueExW(key, valueName, NULL, NULL, NULL, &sz); + if (rc) + { + TRACE("RegQueryValueExW returned %d\n", rc); + goto end; + } + /* FIXME: sanity-check sz before allocating (is there an upper-limit + * on the value of a property?) + */ + value = msi_alloc( sz ); + rc = RegQueryValueExW(key, valueName, NULL, &regType, value, &sz); + if (rc) + { + TRACE("RegQueryValueExW returned %d\n", rc); + goto end; + } - /* bail out if the registry key is empty */ - if (sz == 0) - { - rc = ERROR_SUCCESS; - goto end; - } + /* bail out if the registry key is empty */ + if (sz == 0) + goto end; - switch (type & 0x0f) - { - case msidbLocatorTypeDirectory: - rc = ACTION_SearchDirectory(package, sig, (LPCWSTR)value, 0, - appValue); - break; - case msidbLocatorTypeFileName: - *appValue = strdupW((LPCWSTR)value); - break; - case msidbLocatorTypeRawValue: - ACTION_ConvertRegValue(regType, value, sz, appValue); - break; - default: - FIXME("AppSearch unimplemented for type %d (key path %s, value %s)\n", - type, debugstr_w(keyPath), debugstr_w(valueName)); - } + switch (type & 0x0f) + { + case msidbLocatorTypeDirectory: + rc = ACTION_SearchDirectory(package, sig, (LPWSTR)value, 0, appValue); + break; + case msidbLocatorTypeFileName: + *appValue = strdupW((LPWSTR)value); + break; + case msidbLocatorTypeRawValue: + ACTION_ConvertRegValue(regType, value, sz, appValue); + break; + default: + FIXME("AppSearch unimplemented for type %d (key path %s, value %s)\n", + type, debugstr_w(keyPath), debugstr_w(valueName)); + } end: - msi_free( value); - RegCloseKey(key); + msi_free( value ); + RegCloseKey( key ); - msi_free( keyPath); - msi_free( valueName); + msi_free( keyPath ); + msi_free( valueName ); - if (row) - msiobj_release(&row->hdr); - MSI_ViewClose(view); - msiobj_release(&view->hdr); - } - else - { - TRACE("MSI_OpenQuery returned %d\n", rc); - rc = ERROR_SUCCESS; - } + msiobj_release(&row->hdr); - TRACE("returning %d\n", rc); - return rc; + return ERROR_SUCCESS; } static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue,

1 0

Mike McCormack : msi: Use MSI_QueryGetRecord in ACTION_AppSearchComponents.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: fa6bc9e50b57b3c9fe18aeb6d1cc689df2826ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6bc9e50b57b3c9fe18aeb6d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 27 18:03:55 2006 +0900 msi: Use MSI_QueryGetRecord in ACTION_AppSearchComponents. --- dlls/msi/appsearch.c | 75 ++++++++++++++------------------------------------ 1 files changed, 21 insertions(+), 54 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 7ae47f5..34196a7 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -154,67 +154,34 @@ static void ACTION_FreeSignature(MSISIGN msi_free(sig->Languages); } -static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, - MSISIGNATURE *sig) +static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { - MSIQUERY *view; - UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'C','o','m','p','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', - '\'','%','s','\'',0}; + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'C','o','m','p','L','o','c','a','t','o','r',' ', + 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', + '\'','%','s','\'',0}; + MSIRECORD *row; + LPWSTR guid; - TRACE("(package %p, appValue %p, sig %p)\n", package, appValue, sig); - *appValue = NULL; - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, sig->Name); - if (rc == ERROR_SUCCESS) - { - MSIRECORD *row = 0; - WCHAR guid[50]; - DWORD sz; + TRACE("%s\n", debugstr_w(sig->Name)); - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewExecute returned %d\n", rc); - goto end; - } - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewFetch returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } - - /* get GUID */ - guid[0] = 0; - sz=sizeof(guid)/sizeof(guid[0]); - rc = MSI_RecordGetStringW(row,2,guid,&sz); - if (rc != ERROR_SUCCESS) - { - ERR("Error is %x\n",rc); - goto end; - } - FIXME("AppSearch unimplemented for CompLocator table (GUID %s)\n", - debugstr_w(guid)); + *appValue = NULL; -end: - if (row) - msiobj_release(&row->hdr); - MSI_ViewClose(view); - msiobj_release(&view->hdr); - } - else + row = MSI_QueryGetRecord( package->db, query, sig->Name ); + if (!row) { - TRACE("MSI_OpenQuery returned %d\n", rc); - rc = ERROR_SUCCESS; + TRACE("failed to query CompLocator for %s\n", debugstr_w(sig->Name)); + return ERROR_SUCCESS; } - TRACE("returning %d\n", rc); - return rc; + guid = msi_dup_record_field( row, 2 ); + FIXME("AppSearch CompLocator (%s) unimplemented\n", debugstr_w(guid)); + msi_free( guid ); + msiobj_release( &row->hdr ); + + return ERROR_SUCCESS; } static void ACTION_ConvertRegValue(DWORD regType, const BYTE *value, DWORD sz,

1 0

Mike McCormack : msi: Use MSI_QueryGetRecord in ACTION_AppSearchGetSignature.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: a1c969ee23894334efbda4ecb3bb001f7e7ed472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c969ee23894334efbda4ecb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 27 17:48:37 2006 +0900 msi: Use MSI_QueryGetRecord in ACTION_AppSearchGetSignature. --- dlls/msi/appsearch.c | 137 ++++++++++++++++++++----------------------------- 1 files changed, 56 insertions(+), 81 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 57bffe7..7ae47f5 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -80,96 +80,71 @@ static void ACTION_VerStrToInteger(LPCWS * Returns ERROR_SUCCESS upon success (where not finding the record counts as * success), something else on error. */ -static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, - LPCWSTR name) +static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, LPCWSTR name) { - MSIQUERY *view; - UINT rc; - static const WCHAR ExecSeqQuery[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'S','i','g','n','a','t','u','r','e',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e',' ','=',' ', - '\'','%','s','\'',0}; + static const WCHAR query[] = { + 's','e','l','e','c','t',' ','*',' ', + 'f','r','o','m',' ', + 'S','i','g','n','a','t','u','r','e',' ', + 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e',' ','=',' ', + '\'','%','s','\'',0}; + LPWSTR minVersion, maxVersion; + MSIRECORD *row; + DWORD time; + + TRACE("package %p, sig %p\n", package, sig); - TRACE("(package %p, sig %p)\n", package, sig); memset(sig, 0, sizeof(*sig)); sig->Name = name; - rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, name); - if (rc == ERROR_SUCCESS) + row = MSI_QueryGetRecord( package->db, query, name ); + if (!row) { - MSIRECORD *row = 0; - DWORD time; - WCHAR *minVersion, *maxVersion; - - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewExecute returned %d\n", rc); - goto end; - } - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - { - TRACE("MSI_ViewFetch returned %d\n", rc); - rc = ERROR_SUCCESS; - goto end; - } - - /* get properties */ - sig->File = msi_dup_record_field(row,2); - minVersion = msi_dup_record_field(row,3); - if (minVersion) - { - ACTION_VerStrToInteger(minVersion, &sig->MinVersionMS, - &sig->MinVersionLS); - msi_free( minVersion); - } - maxVersion = msi_dup_record_field(row,4); - if (maxVersion) - { - ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS, - &sig->MaxVersionLS); - msi_free( maxVersion); - } - sig->MinSize = MSI_RecordGetInteger(row,5); - if (sig->MinSize == MSI_NULL_INTEGER) - sig->MinSize = 0; - sig->MaxSize = MSI_RecordGetInteger(row,6); - if (sig->MaxSize == MSI_NULL_INTEGER) - sig->MaxSize = 0; - sig->Languages = msi_dup_record_field(row,9); - time = MSI_RecordGetInteger(row,7); - if (time != MSI_NULL_INTEGER) - DosDateTimeToFileTime(HIWORD(time), LOWORD(time), &sig->MinTime); - time = MSI_RecordGetInteger(row,8); - if (time != MSI_NULL_INTEGER) - DosDateTimeToFileTime(HIWORD(time), LOWORD(time), &sig->MaxTime); - TRACE("Found file name %s for Signature_ %s;\n", - debugstr_w(sig->File), debugstr_w(name)); - TRACE("MinVersion is %d.%d.%d.%d\n", HIWORD(sig->MinVersionMS), - LOWORD(sig->MinVersionMS), HIWORD(sig->MinVersionLS), - LOWORD(sig->MinVersionLS)); - TRACE("MaxVersion is %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS), - LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS), - LOWORD(sig->MaxVersionLS)); - TRACE("MinSize is %d, MaxSize is %d;\n", sig->MinSize, sig->MaxSize); - TRACE("Languages is %s\n", debugstr_w(sig->Languages)); + TRACE("failed to query signature for %s\n", debugstr_w(name)); + return ERROR_SUCCESS; + } -end: - if (row) - msiobj_release(&row->hdr); - MSI_ViewClose(view); - msiobj_release(&view->hdr); + /* get properties */ + sig->File = msi_dup_record_field(row,2); + minVersion = msi_dup_record_field(row,3); + if (minVersion) + { + ACTION_VerStrToInteger(minVersion, &sig->MinVersionMS, &sig->MinVersionLS); + msi_free( minVersion ); } - else + maxVersion = msi_dup_record_field(row,4); + if (maxVersion) { - TRACE("MSI_OpenQuery returned %d\n", rc); - rc = ERROR_SUCCESS; + ACTION_VerStrToInteger(maxVersion, &sig->MaxVersionMS, &sig->MaxVersionLS); + msi_free( maxVersion ); } - - TRACE("returning %d\n", rc); - return rc; + sig->MinSize = MSI_RecordGetInteger(row,5); + if (sig->MinSize == MSI_NULL_INTEGER) + sig->MinSize = 0; + sig->MaxSize = MSI_RecordGetInteger(row,6); + if (sig->MaxSize == MSI_NULL_INTEGER) + sig->MaxSize = 0; + sig->Languages = msi_dup_record_field(row,9); + time = MSI_RecordGetInteger(row,7); + if (time != MSI_NULL_INTEGER) + DosDateTimeToFileTime(HIWORD(time), LOWORD(time), &sig->MinTime); + time = MSI_RecordGetInteger(row,8); + if (time != MSI_NULL_INTEGER) + DosDateTimeToFileTime(HIWORD(time), LOWORD(time), &sig->MaxTime); + + TRACE("Found file name %s for Signature_ %s;\n", + debugstr_w(sig->File), debugstr_w(name)); + TRACE("MinVersion is %d.%d.%d.%d\n", HIWORD(sig->MinVersionMS), + LOWORD(sig->MinVersionMS), HIWORD(sig->MinVersionLS), + LOWORD(sig->MinVersionLS)); + TRACE("MaxVersion is %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS), + LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS), + LOWORD(sig->MaxVersionLS)); + TRACE("MinSize is %d, MaxSize is %d;\n", sig->MinSize, sig->MaxSize); + TRACE("Languages is %s\n", debugstr_w(sig->Languages)); + + msiobj_release( &row->hdr ); + + return ERROR_SUCCESS; } /* Frees any memory allocated in sig */

1 0

Mike McCormack : msi: Use MSI_IterateRecords when cloning properties.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 0670ebc67b10eafba194cab418ce8637715faba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0670ebc67b10eafba194cab41… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 27 17:48:10 2006 +0900 msi: Use MSI_IterateRecords when cloning properties. --- dlls/msi/package.c | 52 ++++++++++++++++++++-------------------------------- 1 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 164c7f2..57bf0f6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -60,45 +60,33 @@ static void MSI_FreePackage( MSIOBJECTHD msi_free_properties( package ); } +static UINT iterate_clone_props(MSIRECORD *row, LPVOID param) +{ + MSIPACKAGE *package = param; + LPCWSTR name, value; + + name = MSI_RecordGetString( row, 1 ); + value = MSI_RecordGetString( row, 2 ); + MSI_SetPropertyW( package, name, value ); + + return ERROR_SUCCESS; +} + static UINT clone_properties( MSIPACKAGE *package ) { - MSIQUERY * view = NULL; - UINT rc; static const WCHAR Query[] = { - 'S','E','L','E','C','T',' ','*',' ', - 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',0}; - - /* clone the existing properties */ - rc = MSI_DatabaseOpenViewW( package->db, Query, &view ); - if (rc != ERROR_SUCCESS) - return rc; + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','P','r','o','p','e','r','t','y','`',0}; + MSIQUERY *view = NULL; + UINT r; - rc = MSI_ViewExecute(view, 0); - if (rc != ERROR_SUCCESS) + r = MSI_OpenQuery( package->db, &view, Query ); + if (r == ERROR_SUCCESS) { - MSI_ViewClose(view); + r = MSI_IterateRecords( view, NULL, iterate_clone_props, package ); msiobj_release(&view->hdr); - return rc; - } - while (1) - { - MSIRECORD * row; - LPCWSTR name, value; - - rc = MSI_ViewFetch(view,&row); - if (rc != ERROR_SUCCESS) - break; - - name = MSI_RecordGetString( row, 1 ); - value = MSI_RecordGetString( row, 2 ); - MSI_SetPropertyW( package, name, value ); - - msiobj_release( &row->hdr ); } - MSI_ViewClose(view); - msiobj_release(&view->hdr); - - return rc; + return r; } /*

1 0

Dmitry Timoshkov : winedump: Constify some data.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 7669035472609e2339b2670152834ff0ab752eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7669035472609e2339b267015… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Nov 26 16:04:56 2006 +0800 winedump: Constify some data. --- tools/winedump/symbol.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index c79442f..f584c5d 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -27,7 +27,7 @@ /* Items that are swapped in arguments after the symbol structure * has been populated */ -static const char *swap_after[] = +static const char * const swap_after[] = { "\r", " ", /* Remove whitespace, normalise pointers and brackets */ "\t", " ", @@ -49,7 +49,7 @@ static const char *swap_after[] = * strings, unless they contain more that one '*'. A preceding 'LP' * counts as a '*', so 'LPWCSTR *' is a pointer, not a string */ -static const char *wide_strings[] = +static const char * const wide_strings[] = { "WSTR", "WCSTR", NULL }; @@ -58,7 +58,7 @@ static const char *wide_strings[] = * unless they contain one '*'. A preceding 'LP' counts as a '*', * so 'WCHAR *' is string, while 'LPWCHAR *' is a pointer */ -static const char *wide_chars[] = +static const char * const wide_chars[] = { "WCHAR", NULL }; @@ -66,7 +66,7 @@ static const char *wide_chars[] = /* Items containing these substrings are assumed to be ASCII character * strings, as above */ -static const char *ascii_strings[] = +static const char * const ascii_strings[] = { "STR", "CSTR", NULL }; @@ -75,7 +75,7 @@ static const char *ascii_strings[] = /* Items containing these substrings are assumed to be ASCII characters, * as above */ -static const char *ascii_chars[] = +static const char * const ascii_chars[] = { "CHAR", "char", NULL }; @@ -83,7 +83,7 @@ static const char *ascii_chars[] = /* Any type other than the following will produce a FIXME warning with -v * when mapped to a long, to allow fixups */ -static const char *known_longs[] = +static const char * const known_longs[] = { "char", "CHAR", "float", "int", "INT", "short", "SHORT", "long", "LONG", "WCHAR", "BOOL", "bool", "INT16", "WORD", "DWORD", NULL @@ -194,7 +194,7 @@ const char *symbol_get_spec_type (const int symbol_get_type (const char *string) { const char *iter = string; - const char **tab; + const char * const *tab; int ptrs = 0; while (*iter && isspace(*iter)) @@ -289,7 +289,7 @@ int symbol_get_type (const char *strin */ void symbol_clean_string (const char *string) { - const char **tab = swap_after; + const char * const *tab = swap_after; char *str = (char *)string; #define SWAP(i, p, x, y) do { i = p; while ((i = str_replace (i, x, y))); } while(0)

1 0

Clinton Stimpson : riched20: Only send EN_CHANGE when it is supposed to be sent.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 78584b6ee1da4473aecca4bc8736dddb4cfe21af URL: http://source.winehq.org/git/wine.git/?a=commit;h=78584b6ee1da4473aecca4bc8… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Sat Nov 25 22:04:20 2006 -0700 riched20: Only send EN_CHANGE when it is supposed to be sent. --- dlls/riched20/paint.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 71ae918..e924f80 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -117,7 +117,11 @@ void ME_UpdateRepaint(ME_TextEditor *edi pCursor = &editor->pCursors[0]; ME_EnsureVisible(editor, pCursor->pRun); - ME_SendOldNotify(editor, EN_CHANGE); + /* send EN_CHANGE if the event mask asks for it */ + if(editor->nEventMask & ENM_CHANGE) + { + ME_SendOldNotify(editor, EN_CHANGE); + } ME_Repaint(editor); ME_SendSelChange(editor); }

1 0

Dmitry Timoshkov : winedump: Remove a not needed include.
by Alexandre Julliard 27 Nov '06

27 Nov '06

Module: wine Branch: master Commit: 5b0eb0998afd7452568cfebe563b67e4b82bb40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0eb0998afd7452568cfebe5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Nov 26 16:04:11 2006 +0800 winedump: Remove a not needed include. --- tools/winedump/le.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winedump/le.c b/tools/winedump/le.c index 6fd2646..84e219d 100644 --- a/tools/winedump/le.c +++ b/tools/winedump/le.c @@ -30,7 +30,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" #include "winedump.h" struct o32_obj

1 0