wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Rob Shearman : ole32: Fix copied description and copyright statement for tests/errorinfo.c.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: d35a81c7aaedcec5d2f56f93cf49eb94a48f038c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35a81c7aaedcec5d2f56f93c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jan 11 15:25:11 2007 -0600 ole32: Fix copied description and copyright statement for tests/errorinfo.c. --- dlls/ole32/tests/errorinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/errorinfo.c b/dlls/ole32/tests/errorinfo.c index c3fe19d..f55d480 100644 --- a/dlls/ole32/tests/errorinfo.c +++ b/dlls/ole32/tests/errorinfo.c @@ -1,7 +1,7 @@ /* - * Component Object Tests + * Error Info Tests * - * Copyright 2005 Robert Shearman + * Copyright 2007 Robert Shearman * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Frank Richter : dbghelp: Split gnu_debuglink handling into own function.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: afc2df870504fae3a52612d522c213523724b2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc2df870504fae3a52612d52… Author: Frank Richter <frank.richter(a)gmail.com> Date: Thu Jan 11 16:29:27 2007 +0100 dbghelp: Split gnu_debuglink handling into own function. --- dlls/dbghelp/elf_module.c | 77 +++++++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 61d7edb..a06e926 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -778,6 +778,51 @@ static DWORD calc_crc32(struct elf_file_ #undef UPDC32 } +static BOOL elf_load_debug_info_from_map(struct module* module, + struct elf_file_map* fmap, + struct pool* pool, + struct hash_table* ht_symtab); + +/****************************************************************** + * elf_debuglink_parse + * + * Parses a .gnu_debuglink section and loads the debug info from + * the external file specified there. + */ +static BOOL elf_debuglink_parse (struct module* module, + struct pool* pool, + struct hash_table* ht_symtab, + const BYTE* debuglink) +{ + /* The content of a debug link section is: + * 1/ a NULL terminated string, containing the file name for the + * debug info + * 2/ padding on 4 byte boundary + * 3/ CRC of the linked ELF file + */ + BOOL ret = FALSE, lret; + const char* dbg_link = (char*)debuglink; + struct elf_file_map fmap_link; + + if (elf_map_file(dbg_link, &fmap_link)) + { + fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); + fmap_link.with_crc = 1; + lret = elf_load_debug_info_from_map(module, &fmap_link, pool, + ht_symtab); + if (lret) + strcpy(module->module.LoadedPdbName, dbg_link); + else + WARN("Couldn't load debug information from %s\n", dbg_link); + ret = ret || lret; + elf_unmap_file(&fmap_link); + } + else + WARN("Couldn't map %s\n", dbg_link); + + return ret; +} + /****************************************************************** * elf_load_debug_info_from_map * @@ -943,32 +988,18 @@ static BOOL elf_load_debug_info_from_map } if (debuglink_sect != -1) { - const char* dbg_link; - struct elf_file_map fmap_link; - - dbg_link = elf_map_section(fmap, debuglink_sect); - /* The content of a debug link section is: - * 1/ a NULL terminated string, containing the file name for the - * debug info - * 2/ padding on 4 byte boundary - * 3/ CRC of the linked ELF file - */ - if (dbg_link != ELF_NO_MAP && elf_map_file(dbg_link, &fmap_link)) + const BYTE* dbg_link; + + dbg_link = (const BYTE*) elf_map_section(fmap, debuglink_sect); + if (dbg_link != ELF_NO_MAP) { - fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - fmap_link.with_crc = 1; - lret = elf_load_debug_info_from_map(module, &fmap_link, pool, - ht_symtab); - if (lret) - strcpy(module->module.LoadedPdbName, dbg_link); - else - WARN("Couldn't load debug information from %s\n", dbg_link); + lret = elf_debuglink_parse (module, pool, ht_symtab, dbg_link); + if (!lret) + WARN("Couldn't load linked debug file for %s\n", + module->module.ModuleName); ret = ret || lret; - elf_unmap_file(&fmap_link); } - else - WARN("Couldn't load linked debug file for %s\n", - module->module.ModuleName); + elf_unmap_section(fmap, debuglink_sect); } } if (strstr(module->module.ModuleName, "<elf>") ||

1 0

Andrew Talbot : msacm32: Declare some variables static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 6d49fb12c94486e504454d71a627c8e875371cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49fb12c94486e504454d71a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 15:13:34 2007 +0000 msacm32: Declare some variables static. --- dlls/msacm32/internal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aa36053..204a7e2 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -824,8 +824,8 @@ MMRESULT MSACM_Message(HACMDRIVER had, U return MMSYSERR_INVALHANDLE; } -PWINE_ACMLOCALDRIVER MSACM_pFirstACMLocalDriver = NULL; -PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver = NULL; +static PWINE_ACMLOCALDRIVER MSACM_pFirstACMLocalDriver; +static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) {

1 0

Andrew Talbot : mshtml: Declare a variable static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: c48a7faa7ab95fbcb75c76e61f18b4f6284f2eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48a7faa7ab95fbcb75c76e61… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 15:13:49 2007 +0000 mshtml: Declare a variable static. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 08917d1..b7b32e7 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1393,7 +1393,7 @@ static nsresult NSAPI nsSupportsWeakRefe #undef NSWEAKREF_THIS -const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { +static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { nsSupportsWeakReference_QueryInterface, nsSupportsWeakReference_AddRef, nsSupportsWeakReference_Release,

1 0

Andrew Talbot : mpr: Declare a variable static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 0b2ec37f64498c1474b74e6d7e4461eb1be5d075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2ec37f64498c1474b74e6d7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 15:13:26 2007 +0000 mpr: Declare a variable static. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index fb3d3b4..c894c55 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -99,7 +99,7 @@ typedef struct _WNetEnumerator */ static DWORD _findProviderIndexW(LPCWSTR lpProvider); -PWNetProviderTable providerTable; +static PWNetProviderTable providerTable; /* * Global provider table functions

1 0

Andrew Talbot : msdmo: Declare a function static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 72cdeaffd930c1178a1eed45492c29fc98344ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cdeaffd930c1178a1eed454… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 15:13:43 2007 +0000 msdmo: Declare a function static. --- dlls/msdmo/dmoreg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 9e60738..bba159a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -302,7 +302,7 @@ static BOOL IEnumDMO_Destructor(IEnumDMO /************************************************************************** * IEnumDMO_Constructor */ -IEnumDMO * IEnumDMO_Constructor( +static IEnumDMO * IEnumDMO_Constructor( REFGUID guidCategory, DWORD dwFlags, DWORD cInTypes,

1 0

Andrew Talbot : itss: Remove unused variable and associated dead code.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 27862755594f78a1aa00dbfee1ca0820542a09ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=27862755594f78a1aa00dbfee… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 12:35:45 2007 +0000 itss: Remove unused variable and associated dead code. --- dlls/itss/chm_lib.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 438bbe4..074ca3d 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -220,12 +220,6 @@ static const WCHAR _CHMU_CONTENT[] = { 'M','S','C','o','m','p','r','e','s','s','e','d','/', 'C','o','n','t','e','n','t',0 }; -static const WCHAR _CHMU_SPANINFO[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'S','p','a','n','I','n','f','o', -}; /* * structures local to this module @@ -756,33 +750,6 @@ struct chmFile *chm_openW(const WCHAR *f /* By default, compression is enabled. */ newHandle->compression_enabled = 1; -/* Jed, Sun Jun 27: 'span' doesn't seem to be used anywhere?! */ -#if 0 - /* fetch span */ - if (CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_SPANINFO, - &uiSpan) || - uiSpan.space == CHM_COMPRESSED) - { - chm_close(newHandle); - return NULL; - } - - /* N.B.: we've already checked that uiSpan is in the uncompressed section, - * so this should not require attempting to decompress, which may - * rely on having a valid "span" - */ - sremain = 8; - sbufpos = sbuffer; - if (chm_retrieve_object(newHandle, &uiSpan, sbuffer, - 0, sremain) != sremain || - !_unmarshal_uint64(&sbufpos, &sremain, &newHandle->span)) - { - chm_close(newHandle); - return NULL; - } -#endif - /* prefetch most commonly needed unit infos */ if (CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, _CHMU_RESET_TABLE,

1 0

Andrew Talbot : msadp32.acm: Remove unused function.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 934c4899565c209ef7ca6076f3615dfc7949cafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=934c4899565c209ef7ca6076f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 12:25:54 2007 +0000 msadp32.acm: Remove unused function. --- dlls/msadp32.acm/msadp32.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 6840364..3849c04 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -613,17 +613,6 @@ static LRESULT ADPCM_StreamClose(PACMDRV } /*********************************************************************** - * ADPCM_round - * - */ -static inline DWORD ADPCM_round(DWORD a, DWORD b, DWORD c) -{ - assert(a && b && c); - /* to be sure, always return an entire number of c... */ - return ((double)a * (double)b + (double)c - 1) / (double)c; -} - -/*********************************************************************** * ADPCM_StreamSize * */

1 0

Andrew Talbot : msg711.acm: Remove unused function.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 0780575d51db9a25f1d2927febde5aa49978667d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0780575d51db9a25f1d2927fe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jan 11 12:26:48 2007 +0000 msg711.acm: Remove unused function. --- dlls/msg711.acm/msg711.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 6446de2..ed54f75 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -982,17 +982,6 @@ static LRESULT G711_StreamClose(PACMDRVS } /*********************************************************************** - * G711_round - * - */ -static inline DWORD G711_round(DWORD a, DWORD b, DWORD c) -{ - assert(a && b && c); - /* to be sure, always return an entire number of c... */ - return ((double)a * (double)b + (double)c - 1) / (double)c; -} - -/*********************************************************************** * G711_StreamSize * */

1 0

Detlef Riekenberg : comdlg32: Move GetFileTitle(A/W/16) to filedlg.c, filedlg16.c.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 0678c87b3b9fdaad9480f03e8bc1bdf860f6847b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0678c87b3b9fdaad9480f03e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 12 00:05:58 2007 +0100 comdlg32: Move GetFileTitle(A/W/16) to filedlg.c, filedlg16.c. --- dlls/comdlg32/Makefile.in | 1 - dlls/comdlg32/filedlg.c | 79 ++++++++++++++++++++++++++++ dlls/comdlg32/filedlg16.c | 9 +++ dlls/comdlg32/filetitle.c | 126 --------------------------------------------- 4 files changed, 88 insertions(+), 127 deletions(-) diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index 35e180e..dded9a3 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ filedlg.c \ filedlg31.c \ filedlgbrowser.c \ - filetitle.c \ finddlg32.c \ fontdlg.c \ printdlg.c diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5fcdfd0..0c080c2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3914,3 +3914,82 @@ BOOL WINAPI GetSaveFileNameW( else return GetFileDialog95W(ofn, SAVE_DIALOG); } + +/*********************************************************************** + * GetFileTitleA (COMDLG32.@) + * + * See GetFileTitleW. + */ +short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) +{ + int ret; + UNICODE_STRING strWFile; + LPWSTR lpWTitle; + + RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); + lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); + ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); + if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); + RtlFreeUnicodeString( &strWFile ); + RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); + return ret; +} + + +/*********************************************************************** + * GetFileTitleW (COMDLG32.@) + * + * Get the name of a file. + * + * PARAMS + * lpFile [I] name and location of file + * lpTitle [O] returned file name + * cbBuf [I] buffer size of lpTitle + * + * RETURNS + * Success: zero + * Failure: negative number. + */ +short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) +{ + int i, len; + static const WCHAR brkpoint[] = {'*','[',']',0}; + TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); + + if(lpFile == NULL || lpTitle == NULL) + return -1; + + len = strlenW(lpFile); + + if (len == 0) + return -1; + + if(strpbrkW(lpFile, brkpoint)) + return -1; + + len--; + + if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':') + return -1; + + for(i = len; i >= 0; i--) + { + if (lpFile[i] == '/' || lpFile[i] == '\\' || lpFile[i] == ':') + { + i++; + break; + } + } + + if(i == -1) + i++; + + TRACE("---> '%s'\n", debugstr_w(&lpFile[i])); + + len = strlenW(lpFile+i)+1; + if(cbBuf < len) + return len; + + strcpyW(lpTitle, &lpFile[i]); + return 0; +} diff --git a/dlls/comdlg32/filedlg16.c b/dlls/comdlg32/filedlg16.c index 8014609..4159f1d 100644 --- a/dlls/comdlg32/filedlg16.c +++ b/dlls/comdlg32/filedlg16.c @@ -513,3 +513,12 @@ BOOL16 WINAPI GetSaveFileName16( TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile)); return bRet; } + + +/*********************************************************************** + * GetFileTitle (COMMDLG.27) + */ +short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf) +{ + return GetFileTitleA(lpFile, lpTitle, cbBuf); +} diff --git a/dlls/comdlg32/filetitle.c b/dlls/comdlg32/filetitle.c deleted file mode 100644 index 753285b..0000000 --- a/dlls/comdlg32/filetitle.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * COMMDLG - File Dialogs - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cdlg.h" -#include "cdlg16.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -/*********************************************************************** - * GetFileTitleA (COMDLG32.@) - * - * See GetFileTitleW. - */ -short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) -{ - int ret; - UNICODE_STRING strWFile; - LPWSTR lpWTitle; - - RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); - lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); - ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); - if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); - RtlFreeUnicodeString( &strWFile ); - RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); - return ret; -} - - -/*********************************************************************** - * GetFileTitleW (COMDLG32.@) - * - * Get the name of a file. - * - * PARAMS - * lpFile [I] name and location of file - * lpTitle [O] returned file name - * cbBuf [I] buffer size of lpTitle - * - * RETURNS - * Success: zero - * Failure: negative number. - */ -short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) -{ - int i, len; - static const WCHAR brkpoint[] = {'*','[',']',0}; - TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); - - if(lpFile == NULL || lpTitle == NULL) - return -1; - - len = strlenW(lpFile); - - if (len == 0) - return -1; - - if(strpbrkW(lpFile, brkpoint)) - return -1; - - len--; - - if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':') - return -1; - - for(i = len; i >= 0; i--) - { - if (lpFile[i] == '/' || lpFile[i] == '\\' || lpFile[i] == ':') - { - i++; - break; - } - } - - if(i == -1) - i++; - - TRACE("---> '%s'\n", debugstr_w(&lpFile[i])); - - len = strlenW(lpFile+i)+1; - if(cbBuf < len) - return len; - - strcpyW(lpTitle, &lpFile[i]); - return 0; -} - - -/*********************************************************************** - * GetFileTitle (COMMDLG.27) - */ -short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf) -{ - return GetFileTitleA(lpFile, lpTitle, cbBuf); -}

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007