March 2007 - Wine-Commits - list.winehq.org

appdb/include distribution.php
by WineHQ March 17, 2007

March 17, 2007

ChangeSet ID: 30981 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/17 16:00:41 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Distributions don't have descriptions, so don't try to retrieve this entry from the database row object. Call out to objectMakeUrl() instead of using its address. Fixes two errors exposed by the unit tests. Patch: http://cvs.winehq.org/patch.py?id=30981 Old revision New revision Changes Path 1.16 1.17 +1 -3 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.16 appdb/include/distribution.php:1.17 --- appdb/include/distribution.php:1.16 17 Mar 2007 21: 0:41 -0000 +++ appdb/include/distribution.php 17 Mar 2007 21: 0:41 -0000 @@ -10,7 +10,6 @@ require_once(BASE."include/util.php"); class distribution { var $iDistributionId; var $sName; - var $sDescription; var $sUrl; var $sSubmitTime; var $iSubmitterId; @@ -37,7 +36,6 @@ class distribution { { $this->iDistributionId = $iDistributionId; $this->sName = $oRow->name; - $this->sDescription = $oRow->description; $this->sUrl = $oRow->url; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; @@ -288,7 +286,7 @@ class distribution { { $sSubject = "Distribution ".$this->sName." added by ". $_SESSION['current']->sRealname; - $sMsg = $this->objectMakeUrl."\n"; + $sMsg = $this->objectMakeUrl()."\n"; if($this->iSubmitterId) { $oSubmitter = new User($this->iSubmitterId);

1 0

appdb/include maintainer.php version.php
by WineHQ March 17, 2007

March 17, 2007

ChangeSet ID: 30980 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/17 14:39:29 Modified files: include : maintainer.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Show links in maintainer processing form Patch: http://cvs.winehq.org/patch.py?id=30980 Old revision New revision Changes Path 1.31 1.32 +31 -48 appdb/include/maintainer.php 1.106 1.107 +9 -0 appdb/include/version.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.31 appdb/include/maintainer.php:1.32 --- appdb/include/maintainer.php:1.31 17 Mar 2007 19:39:29 -0000 +++ appdb/include/maintainer.php 17 Mar 2007 19:39:29 -0000 @@ -479,58 +479,49 @@ class maintainer */ echo '<tr valign=top><td class=color0 style=\'text-align:right\'>Other maintainers of this app:</td>',"\n"; - $bFoundMaintainers = false; + /* Fetch maintainers and super maintainers */ + $oVersion = new Version($this->iVersionId); + $aOtherMaintainers = $oVersion->getMaintainersUserIds(); + $aOtherSuperMaintainers = + Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId); - $bFirstDisplay = true; /* if false we need to fix up table rows appropriately */ + if($aOtherMaintainers || $aOtherSuperMaintainers) + $bFoundMaintainers = true; + else + $bFoundMaintainers = false; + echo "<td>\n"; /* display maintainers for the version */ - $oVersion = new Version($this->iVersionId); - $aOtherUsers = $oVersion->getMaintainersUserIds(); - if($aOtherUsers) + if($aOtherMaintainers) { - $bFoundMaintainers = true; - while(list($index, $iUserId) = each($aOtherUsers)) + while(list($index, $iUserId) = each($aOtherMaintainers)) { $oUser = new User($iUserId); - if($bFirstDisplay) - { - echo "<td>".$oUser->sRealname."</td></tr>\n"; - $bFirstDisplay = false; - } else - { - echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."</td></tr>\n"; - } + echo "$oUser->sRealname \n"; } } /* display super maintainers for the given app */ - $aOtherUsers = Maintainer::getSuperMaintainersUserIdsFromAppId($this->iAppId); - if($aOtherUsers) + + if($aOtherSuperMaintainers) { - $bFoundMaintainers = true; - while(list($index, $iUserId) = each($aOtherUsers)) + while(list($index, $iUserId) = each($aOtherSuperMaintainers)) { $oUser = new User($iUserId); - if($bFirstDisplay) - { - echo "<td>".$oUser->sRealname."*</td></tr>\n"; - $bFirstDisplay = false; - } else - { - echo "<tr><td class=\"color0\"></td><td>".$oUser->sRealname."*</td></tr>\n"; - } + echo "$oUser->sRealname* \n"; } } if(!$bFoundMaintainers) { - echo "<td>No other maintainers</td></tr>\n"; + echo "No other maintainers"; } + echo "</td></tr>\n"; + // Show which other apps the user maintains - echo '<tr valign="top"><td class="color0" style=\'text-align:right\'>This user also maintains these apps:</td>',"\n"; + echo '<tr valign="top"><td class="color0" style=\'text-align:right\'>This user also maintains these apps:</td><td>',"\n"; - $bFirstDisplay = true; $oUser = new User($this->iUserId); $aOtherApps = Maintainer::getAppsMaintained($oUser); if($aOtherApps) @@ -538,37 +529,29 @@ class maintainer while(list($index, list($iAppIdOther, $iVersionIdOther, $bSuperMaintainerOther)) = each($aOtherApps)) { $oApp = new Application($iAppIdOther); - $oVersion = new Version($iVersionIdOther); - if($bFirstDisplay) - { - $bFirstDisplay = false; - if($bSuperMaintainerOther) - echo "<td>".$oApp->sName."*</td></tr>\n"; - else - echo "<td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n"; - } else - { - if($bSuperMaintainerOther) - echo "<td class=color0></td><td>".$oApp->sName."*</td></tr>\n"; - else - echo "<td class=color0></td><td>".$oApp->sName." ".$oVersion->sName."</td></tr>\n"; - } + + if($bSuperMaintainerOther) + echo $oApp->objectMakeLink()."* \n"; + else + echo $oVersion->fullNameLink($iVersionIdOther)." \n"; } } else { - echo "<td>User maintains no other applications</td></tr>\n"; + echo "User maintains no other applications"; } + echo "</td></tr>\n"; + $oApp = new Application($this->iAppId); $oVersion = new Version($this->iVersionId); //app name echo '<tr valign=top><td class=color0 style=\'text-align:right\'>App Name:</td>',"\n"; - echo "<td>".$oApp->sName."</td></tr>\n"; + echo "<td>".$oApp->objectMakeLink()."</td></tr>\n"; //version echo '<tr valign=top><td class=color0 style=\'text-align:right\'>App Version:</td>',"\n"; - echo "<td>".$oVersion->sName."</td></tr>\n"; + echo "<td>".$oVersion->objectMakeLink()."</td></tr>\n"; //maintainReason echo '<tr valign=top><td class=color0 style=\'text-align:right\'>Maintainer request reason:</td>',"\n"; Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.106 appdb/include/version.php:1.107 --- appdb/include/version.php:1.106 17 Mar 2007 19:39:29 -0000 +++ appdb/include/version.php 17 Mar 2007 19:39:29 -0000 @@ -956,6 +956,15 @@ class Version { return "$oRow->appName $oRow->versionName"; } + /* Creates a link to the version labelled with the full application name */ + function fullNameLink($iVersionId) + { + $oVersion = new version($iVersionId); + $sLink = "<a href=\"".$oVersion->objectMakeUrl()."\">". + $oVersion->fullName($iVersionId)."</a>"; + return $sLink; + } + function showList($hResult) { //show applist

1 0

Alexandre Julliard : ntdll: Remove unnecessary pointers in fstab parsing on Solaris.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: b2c985697fa1fcff7b7a160291bdf18e25d66955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c985697fa1fcff7b7a16029… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 17 20:07:10 2007 +0100 ntdll: Remove unnecessary pointers in fstab parsing on Solaris. --- dlls/ntdll/directory.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c0933bc..66547b5 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -236,24 +236,22 @@ static char *get_default_lpt_device( int num ) #include <sys/vfstab.h> static char *parse_vfstab_entries( FILE *f, dev_t dev, ino_t ino) { - - struct vfstab vfs_entry; - struct vfstab *entry=&vfs_entry; + struct vfstab entry; struct stat st; char *device; - while (! getvfsent( f, entry )) + while (! getvfsent( f, &entry )) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ - if (!strcmp( entry->vfs_fstype, "nfs" ) || - !strcmp( entry->vfs_fstype, "smbfs" ) || - !strcmp( entry->vfs_fstype, "ncpfs" )) continue; + if (!strcmp( entry.vfs_fstype, "nfs" ) || + !strcmp( entry.vfs_fstype, "smbfs" ) || + !strcmp( entry.vfs_fstype, "ncpfs" )) continue; - if (stat( entry->vfs_mountp, &st ) == -1) continue; + if (stat( entry.vfs_mountp, &st ) == -1) continue; if (st.st_dev != dev || st.st_ino != ino) continue; - if (!strcmp( entry->vfs_fstype, "fd" )) + if (!strcmp( entry.vfs_fstype, "fd" )) { - if ((device = strstr( entry->vfs_mntopts, "dev=" ))) + if ((device = strstr( entry.vfs_mntopts, "dev=" ))) { char *p = strchr( device + 4, ',' ); if (p) *p = 0; @@ -261,7 +259,7 @@ static char *parse_vfstab_entries( FILE *f, dev_t dev, ino_t ino) } } else - return entry->vfs_special; + return entry.vfs_special; } return NULL; } @@ -335,25 +333,23 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) #include <sys/mnttab.h> static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { - - volatile struct mnttab mntentry; - struct mnttab *entry=&mntentry; + struct mnttab entry; struct stat st; char *device; - while (( ! getmntent( f , entry) )) + while (( ! getmntent( f, &entry) )) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ - if (!strcmp( entry->mnt_fstype, "nfs" ) || - !strcmp( entry->mnt_fstype, "smbfs" ) || - !strcmp( entry->mnt_fstype, "ncpfs" )) continue; + if (!strcmp( entry.mnt_fstype, "nfs" ) || + !strcmp( entry.mnt_fstype, "smbfs" ) || + !strcmp( entry.mnt_fstype, "ncpfs" )) continue; - if (stat( entry->mnt_mountp, &st ) == -1) continue; + if (stat( entry.mnt_mountp, &st ) == -1) continue; if (st.st_dev != dev || st.st_ino != ino) continue; - if (!strcmp( entry->mnt_fstype, "fd" )) + if (!strcmp( entry.mnt_fstype, "fd" )) { - if ((device = strstr( entry->mnt_mntopts, "dev=" ))) + if ((device = strstr( entry.mnt_mntopts, "dev=" ))) { char *p = strchr( device + 4, ',' ); if (p) *p = 0; @@ -361,7 +357,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) } } else - return entry->mnt_special; + return entry.mnt_special; } return NULL; }

1 0

Alexandre Julliard : dbghelp: Avoid some warnings on Solaris.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: b677e81d8ff4bf7d4c003583553068eff46355f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b677e81d8ff4bf7d4c0035835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 17 20:05:34 2007 +0100 dbghelp: Avoid some warnings on Solaris. --- dlls/dbghelp/elf_module.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b8ed892..b844e59 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -23,7 +23,7 @@ #include "wine/port.h" #if defined(__svr4__) || defined(__sun) -#define __ELF__ +#define __ELF__ 1 /* large files are not supported by libelf */ #undef _FILE_OFFSET_BITS #define _FILE_OFFSET_BITS 32 @@ -516,10 +516,10 @@ static const Elf32_Sym* elf_lookup_symtab(const struct module* module, } if (result) { - FIXME("Already found symbol %s (%s) in symtab %s @%08x and %s @%08x\n", + FIXME("Already found symbol %s (%s) in symtab %s @%08x and %s @%08x\n", name, compiland_name, - source_get(module, result->compiland->source), result->symp->st_value, - source_get(module, ste->compiland->source), ste->symp->st_value); + source_get(module, result->compiland->source), (unsigned int)result->symp->st_value, + source_get(module, ste->compiland->source), (unsigned int)ste->symp->st_value); } else { @@ -573,7 +573,7 @@ static void elf_finish_stabs_info(struct module* module, struct hash_table* symt if (((struct symt_function*)sym)->size && ((struct symt_function*)sym)->size != symp->st_size) FIXME("Changing size for %p/%s!%s from %08lx to %08x\n", sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->size, symp->st_size); + ((struct symt_function*)sym)->size, (unsigned int)symp->st_size); ((struct symt_function*)sym)->address = module->elf_info->elf_addr + symp->st_value; @@ -700,7 +700,7 @@ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symt (kind == (ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal)) FIXME("Duplicate in %s: %s<%08x-%08x> %s<%s-%s>\n", debugstr_w(module->module.ModuleName), - ste->ht_elt.name, addr, ste->symp->st_size, + ste->ht_elt.name, addr, (unsigned int)ste->symp->st_size, symt->hash_elt.name, wine_dbgstr_longlong(xaddr), wine_dbgstr_longlong(xsize)); }

1 0

Alexandre Julliard : wldap32: Prefix option defines with WLDAP32 to avoid conflicts with system headers.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 7e5770d0a7a28f196bacb4e174ab9276c4d43b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5770d0a7a28f196bacb4e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 17 20:06:00 2007 +0100 wldap32: Prefix option defines with WLDAP32 to avoid conflicts with system headers. --- dlls/wldap32/option.c | 376 ++++++++++++++++++++-------------------- dlls/wldap32/winldap_private.h | 87 ++++++---- 2 files changed, 238 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e5770d0a7a28f196bacb…

1 0

Andrew Talbot : wineps.drv: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 41c0cc8f9c14ea71e20aee93ee0c0ac1ab69f5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c0cc8f9c14ea71e20aee93e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:43:46 2007 +0000 wineps.drv: Replace inline static with static inline. --- dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/afm2c.c | 2 +- dlls/wineps.drv/bitmap.c | 2 +- dlls/wineps.drv/builtin.c | 4 ++-- dlls/wineps.drv/glyphlist.c | 2 +- dlls/wineps.drv/mkagl.c | 10 +++++----- dlls/wineps.drv/truetype.c | 2 +- dlls/wineps.drv/type1afm.c | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c index f283956..5c9278a 100644 --- a/dlls/wineps.drv/afm.c +++ b/dlls/wineps.drv/afm.c @@ -197,7 +197,7 @@ static void PSDRV_DumpFontList(void) * Tries to use formula in TrueType specification; falls back to simple mean * if any lowercase latin letter (or space) is not present. */ -inline static SHORT MeanCharWidth(const AFM *afm) +static inline SHORT MeanCharWidth(const AFM *afm) { float w = 0.0; int i; diff --git a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c index 5d81b95..3f8b0ce 100644 --- a/dlls/wineps.drv/afm2c.c +++ b/dlls/wineps.drv/afm2c.c @@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -inline static void cursorto(FILE *of, int np, int cp) +static inline void cursorto(FILE *of, int np, int cp) { int ntp = np & 0xfffffff8; int ctp = cp & 0xfffffff8; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 8307891..fd02383 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ -inline static int get_dib_width_bytes( int width, int depth ) +static inline int get_dib_width_bytes( int width, int depth ) { int words; diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index cc36f84..e156433 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * is_stock_font */ -inline static BOOL is_stock_font( HFONT font ) +static inline BOOL is_stock_font( HFONT font ) { int i; for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++) @@ -55,7 +55,7 @@ inline static BOOL is_stock_font( HFONT font ) * Scale builtin font to requested lfHeight * */ -inline static float Round(float f) +static inline float Round(float f) { return (f > 0) ? (f + 0.5) : (f - 0.5); } diff --git a/dlls/wineps.drv/glyphlist.c b/dlls/wineps.drv/glyphlist.c index eeb1716..f8d1c83 100644 --- a/dlls/wineps.drv/glyphlist.c +++ b/dlls/wineps.drv/glyphlist.c @@ -73,7 +73,7 @@ INT PSDRV_GlyphListInit(void) * list if necessary; returns index on success (-1 on failure) * */ -inline static INT GlyphListInsert(LPCSTR szName, INT index) +static inline INT GlyphListInsert(LPCSTR szName, INT index) { GLYPHNAME *g; diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 6c6e508..9701621 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -55,17 +55,17 @@ static int cmp_by_name(const void *a, const void *b) return strcmp(((const GLYPHINFO *)a)->name, ((const GLYPHINFO *)b)->name); } -inline static void sort_by_UV() +static inline void sort_by_UV() { qsort(glyphs, num_glyphs, sizeof(GLYPHINFO), cmp_by_UV); } -inline static void sort_by_name() +static inline void sort_by_name() { qsort(glyphs, num_glyphs, sizeof(GLYPHINFO), cmp_by_name); } -inline static GLYPHINFO *search_by_name(const char *name) +static inline GLYPHINFO *search_by_name(const char *name) { GLYPHINFO gi; @@ -80,7 +80,7 @@ inline static GLYPHINFO *search_by_name(const char *name) * Use the 'optimal' combination of tabs and spaces to position the cursor */ -inline static void fcpto(FILE *f, int newpos, int curpos) +static inline void fcpto(FILE *f, int newpos, int curpos) { int newtpos = newpos & ~7; int curtpos = curpos & ~7; @@ -103,7 +103,7 @@ inline static void fcpto(FILE *f, int newpos, int curpos) * Make main() look "purty" */ -inline static void triple_space(FILE *f) +static inline void triple_space(FILE *f) { fputc('\n', f); fputc('\n', f); } diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 1f91d1d..913bf21 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -279,7 +279,7 @@ static BOOL FindMSTTString(FT_Face face, FT_CharMap charmap, FT_UShort name_id, * units. * */ -inline static float PSUnits(LONG x, USHORT em_size) +static inline float PSUnits(LONG x, USHORT em_size) { return 1000.0 * (float)x / (float)em_size; } diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 40892ea..ad8c16a 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -190,7 +190,7 @@ static BOOL FindLine(FILE *file, CHAR buffer[], INT bufsize, LPCSTR key) * Linux x86/gcc). * */ -inline static BOOL DoubleToFloat(float *p_f, double d) +static inline BOOL DoubleToFloat(float *p_f, double d) { if (d > (double)FLT_MAX || d < -(double)FLT_MAX) return FALSE; @@ -205,7 +205,7 @@ inline static BOOL DoubleToFloat(float *p_f, double d) * Utility function to add or subtract 0.5 before converting to integer type. * */ -inline static float Round(float f) +static inline float Round(float f) { return (f >= 0.0) ? (f + 0.5) : (f - 0.5); } @@ -819,7 +819,7 @@ static int cmpUV(const void *a, const void *b) return (int)(*((const LONG *)a) - *((const LONG *)b)); } -inline static BOOL IsWinANSI(LONG uv) +static inline BOOL IsWinANSI(LONG uv) { if ((0x0020 <= uv && uv <= 0x007e) || (0x00a0 <= uv && uv <= 0x00ff) || (0x2018 <= uv && uv <= 0x201a) || (0x201c <= uv && uv <= 0x201e) ||

1 0

Andrew Talbot : winebuild: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 5df3ff13e7a44d2822c9c8962c163929fed74269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df3ff13e7a44d2822c9c8962… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:54:52 2007 +0000 winebuild: Replace inline static with static inline. --- tools/winebuild/import.c | 12 ++++++------ tools/winebuild/parser.c | 4 ++-- tools/winebuild/res16.c | 2 +- tools/winebuild/res32.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 80c6c12..c6a1e1b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -97,7 +97,7 @@ static int func_cmp( const void *func1, const void *func2 ) } /* add a name to a name table */ -inline static void add_name( struct name_table *table, const char *name ) +static inline void add_name( struct name_table *table, const char *name ) { if (table->count == table->size) { @@ -109,7 +109,7 @@ inline static void add_name( struct name_table *table, const char *name ) } /* remove a name from a name table */ -inline static void remove_name( struct name_table *table, unsigned int idx ) +static inline void remove_name( struct name_table *table, unsigned int idx ) { assert( idx < table->count ); free( table->names[idx] ); @@ -119,7 +119,7 @@ inline static void remove_name( struct name_table *table, unsigned int idx ) } /* make a name table empty */ -inline static void empty_name_table( struct name_table *table ) +static inline void empty_name_table( struct name_table *table ) { unsigned int i; @@ -128,7 +128,7 @@ inline static void empty_name_table( struct name_table *table ) } /* locate a name in a (sorted) list */ -inline static const char *find_name( const char *name, const struct name_table *table ) +static inline const char *find_name( const char *name, const struct name_table *table ) { char **res = NULL; @@ -137,13 +137,13 @@ inline static const char *find_name( const char *name, const struct name_table * } /* sort a name table */ -inline static void sort_names( struct name_table *table ) +static inline void sort_names( struct name_table *table ) { if (table->count) qsort( table->names, table->count, sizeof(*table->names), name_cmp ); } /* locate an export in a (sorted) export list */ -inline static ORDDEF *find_export( const char *name, ORDDEF **table, int size ) +static inline ORDDEF *find_export( const char *name, ORDDEF **table, int size ) { ORDDEF func, *odp, **res = NULL; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 3e0c400..9246fd2 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -79,12 +79,12 @@ static int IsNumberString(const char *s) return 1; } -inline static int is_token_separator( char ch ) +static inline int is_token_separator( char ch ) { return strchr( separator_chars, ch ) != NULL; } -inline static int is_token_comment( char ch ) +static inline int is_token_comment( char ch ) { return strchr( comment_chars, ch ) != NULL; } diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index 99e5cd3..35ac597 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -79,7 +79,7 @@ static const unsigned char *file_end; /* end of resource file */ static const char *file_name; /* current resource file name */ -inline static struct resource *add_resource( DLLSPEC *spec ) +static inline struct resource *add_resource( DLLSPEC *spec ) { spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(*spec->resources) ); return &spec->resources[spec->nb_resources++]; diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c01542..5d480ad 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -93,7 +93,7 @@ static const char *file_name; /* current resource file name */ #define RESDIR_SIZE(n) (sizeof(IMAGE_RESOURCE_DIRECTORY) + (n) * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY)) -inline static struct resource *add_resource( DLLSPEC *spec ) +static inline struct resource *add_resource( DLLSPEC *spec ) { spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(spec->resources[0]) ); return &spec->resources[spec->nb_resources++];

1 0

Andrew Talbot : wined3d: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: 2f5f3825c62737d97f337c68b507ae724ea8d4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5f3825c62737d97f337c68b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:39:40 2007 +0000 wined3d: Replace inline static with static inline. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 12 ++++++------ 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e636ad..f5fcbd7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -483,7 +483,7 @@ static void pshader_gen_input_modifier_line ( sprintf(outregstr, "T%c%s", 'A' + tmpreg, swzstr); } -inline static void pshader_gen_output_modifier_line( +static inline void pshader_gen_output_modifier_line( SHADER_BUFFER* buffer, int saturate, char *write_mask, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3bbdb45..3508835 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLNAME_REQUIRE_GLSL ((const char *)1) -inline static BOOL shader_is_version_token(DWORD token) { +static inline BOOL shader_is_version_token(DWORD token) { return shader_is_pshader_version(token) || shader_is_vshader_version(token); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9223b55..0d4cdd0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -60,7 +60,7 @@ enum x11drv_escape_codes }; /* retrieve the X display to use on a given DC */ -inline static Display *get_display( HDC hdc ) +static inline Display *get_display( HDC hdc ) { Display *display; enum x11drv_escape_codes escape = X11DRV_GET_DISPLAY; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7f890f5..90d3932 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -51,7 +51,7 @@ enum x11drv_escape_codes }; /* retrieve the X display to use on a given DC */ -inline static Display *get_display( HDC hdc ) +static inline Display *get_display( HDC hdc ) { Display *display; enum x11drv_escape_codes escape = X11DRV_GET_DISPLAY; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index dba2f34..e9a2bc5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -330,7 +330,7 @@ static void pshader_set_limits( /** Generate a pixel shader string using either GL_FRAGMENT_PROGRAM_ARB or GLSL and send it to the card */ -inline static VOID IWineD3DPixelShaderImpl_GenerateShader( +static inline VOID IWineD3DPixelShaderImpl_GenerateShader( IWineD3DPixelShader *iface, shader_reg_maps* reg_maps, CONST DWORD *pFunction) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5fe5c41..3f827ff 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -35,7 +35,7 @@ enum x11drv_escape_codes }; /* retrieve the X display to use on a given DC */ -inline static Display *get_display( HDC hdc ) +static inline Display *get_display( HDC hdc ) { Display *display; enum x11drv_escape_codes escape = X11DRV_GET_DISPLAY; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 07fe464..965d95d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -85,7 +85,7 @@ IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *p return (IWineD3D *)object; } -inline static DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) +static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) { if (0 != appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; if (0 != defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe2b8ad..b0fa6b6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1806,22 +1806,22 @@ extern void print_glsl_info_log( WineD3D_GL_Info *gl_info, GLhandleARB obj); -inline static int shader_get_regtype(const DWORD param) { +static inline int shader_get_regtype(const DWORD param) { return (((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2)); } extern unsigned int shader_get_float_offset(const DWORD reg); -inline static BOOL shader_is_pshader_version(DWORD token) { +static inline BOOL shader_is_pshader_version(DWORD token) { return 0xFFFF0000 == (token & 0xFFFF0000); } -inline static BOOL shader_is_vshader_version(DWORD token) { +static inline BOOL shader_is_vshader_version(DWORD token) { return 0xFFFE0000 == (token & 0xFFFF0000); } -inline static BOOL shader_is_comment(DWORD token) { +static inline BOOL shader_is_comment(DWORD token) { return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); } @@ -1936,14 +1936,14 @@ typedef struct { const PixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt); -inline static BOOL use_vs(IWineD3DDeviceImpl *device) { +static inline BOOL use_vs(IWineD3DDeviceImpl *device) { return (device->vs_selected_mode != SHADER_NONE && device->stateBlock->vertexShader && ((IWineD3DVertexShaderImpl *)device->stateBlock->vertexShader)->baseShader.function && !device->strided_streams.u.s.position_transformed); } -inline static BOOL use_ps(IWineD3DDeviceImpl *device) { +static inline BOOL use_ps(IWineD3DDeviceImpl *device) { return (device->ps_selected_mode != SHADER_NONE && device->stateBlock->pixelShader && ((IWineD3DPixelShaderImpl *)device->stateBlock->pixelShader)->baseShader.function);

1 0

Andrew Talbot : server: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: b1788c8462a9e44b565c448d288b869eb65b75cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1788c8462a9e44b565c448d2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:52:14 2007 +0000 server: Replace inline static with static inline. --- server/fd.c | 2 +- server/file.h | 2 +- server/handle.c | 10 +++++----- server/hook.c | 8 ++++---- server/mapping.c | 2 +- server/process.h | 6 +++--- server/ptrace.c | 2 +- server/queue.c | 20 ++++++++++---------- server/registry.c | 2 +- server/request.h | 12 ++++++------ server/sock.c | 2 +- server/thread.c | 2 +- server/trace.c | 2 +- server/user.c | 6 +++--- server/window.c | 4 ++-- server/winstation.c | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1788c8462a9e44b565c4…

1 0

Andrew Talbot : winex11.drv: Replace inline static with static inline.
by Alexandre Julliard March 17, 2007

March 17, 2007

Module: wine Branch: master Commit: a33f71a32d1448ca16466da3640b29ce7bd1863f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33f71a32d1448ca16466da36… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 17 10:47:28 2007 +0000 winex11.drv: Replace inline static with static inline. --- dlls/winex11.drv/dib.c | 2 +- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/wintab.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/xfont.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 82cacab..c921034 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -111,7 +111,7 @@ static void X11DRV_DIB_Unlock(X_PHYSBITMAP *,BOOL); * * Return the width of an X image in bytes */ -inline static int X11DRV_DIB_GetXImageWidthBytes( int width, int depth ) +static inline int X11DRV_DIB_GetXImageWidthBytes( int width, int depth ) { if (!depth || depth > 32) goto error; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index fd84fb9..0ea1f9c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -351,7 +351,7 @@ DWORD EVENT_x11_time_to_win32_time(Time time) * * Check if we can activate the specified window. */ -inline static BOOL can_activate_window( HWND hwnd ) +static inline BOOL can_activate_window( HWND hwnd ) { LONG style = GetWindowLongW( hwnd, GWL_STYLE ); if (!(style & WS_VISIBLE)) return FALSE; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 218919f..96a0dc1 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1293,7 +1293,7 @@ static void KEYBOARD_GenerateMsg( WORD vkey, WORD scan, int Evtype, DWORD event_ * Updates internal state for <vkey>, depending on key <state> under X * */ -inline static void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) +static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) { /* Do something if internal table state != X state for keycode */ if (((key_state_table[vkey] & 0x80)!=0) != state) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 40752fc..0e2f9ee 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -541,7 +541,7 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx) * * For use by wglGetCurrentReadDCARB. */ -inline static HDC get_hdc_from_Drawable(GLXDrawable d) +static inline HDC get_hdc_from_Drawable(GLXDrawable d) { Wine_GLContext *ret; for (ret = context_list; ret; ret = ret->next) { @@ -552,7 +552,7 @@ inline static HDC get_hdc_from_Drawable(GLXDrawable d) return NULL; } -inline static BOOL is_valid_context( Wine_GLContext *ctx ) +static inline BOOL is_valid_context( Wine_GLContext *ctx ) { Wine_GLContext *ptr; for (ptr = context_list; ptr; ptr = ptr->next) if (ptr == ctx) break; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 38da952..a31227f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -67,7 +67,7 @@ static const char visual_id_prop[] = "__wine_x11_visual_id"; * * Check if a given window should be managed */ -inline static BOOL is_window_managed( HWND hwnd ) +static inline BOOL is_window_managed( HWND hwnd ) { DWORD style, ex_style; diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c6b65a1..d96ee05 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -758,7 +758,7 @@ int X11DRV_GetCurrentPacket(LPWTPACKET *packet) } -inline static int CopyTabletData(LPVOID target, LPVOID src, INT size) +static inline int CopyTabletData(LPVOID target, LPVOID src, INT size) { /* * It is valid to call CopyTabletData with NULL. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8012d3b..723a41a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -510,14 +510,14 @@ struct x11drv_thread_data extern struct x11drv_thread_data *x11drv_init_thread_data(void); extern DWORD thread_data_tls_index; -inline static struct x11drv_thread_data *x11drv_thread_data(void) +static inline struct x11drv_thread_data *x11drv_thread_data(void) { struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); if (!data) data = x11drv_init_thread_data(); return data; } -inline static Display *thread_display(void) { return x11drv_thread_data()->display; } +static inline Display *thread_display(void) { return x11drv_thread_data()->display; } extern Visual *visual; extern Window root_window; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 229ca77..078a514 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -274,7 +274,7 @@ void wine_tsx11_unlock(void) * * Get a config key from either the app-specific or the default config */ -inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, +static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size ) { if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 34ed2f1..60bd70d 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -365,7 +365,7 @@ static int fontLF = -1, fontMRU = -1; /* last free, most recently used */ /*********************************************************************** * is_stock_font */ -inline static BOOL is_stock_font( HFONT font ) +static inline BOOL is_stock_font( HFONT font ) { int i; for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++)

1 0