January 2007 - Wine-commits

Ken Thomases : wined3d: Do not block waiting for occlusion query result in GetData.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 94be42eb2dc384c7c1fd33c13e448ea4b06b821b URL: http://source.winehq.org/git/wine.git/?a=commit;h=94be42eb2dc384c7c1fd33c13… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 11 16:48:15 2007 -0600 wined3d: Do not block waiting for occlusion query result in GetData. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 32cacd6..9dafb12 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -170,7 +170,7 @@ static HRESULT WINAPI IWineD3DQueryImpl checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); TRACE("(%p) : available %d.\n", This, available); - if (available || dwGetDataFlags & WINED3DGETDATA_FLUSH) { + if (available) { GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); TRACE("(%p) : Returning %d samples.\n", This, samples);

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

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 : 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 : 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 : 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

Detlef Riekenberg : winspool: Support monitors without a name.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 9bdd900e71936e9734c86ac2460ddff079203eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdd900e71936e9734c86ac24… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 11 13:05:16 2007 +0100 winspool: Support monitors without a name. --- dlls/winspool.drv/info.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 41b706c..9e165db 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -985,11 +985,13 @@ static monitor_t * monitor_load(LPCWSTR /* Is the Monitor already loaded? */ EnterCriticalSection(&monitor_handles_cs); - LIST_FOR_EACH_ENTRY(cursor, &monitor_handles, monitor_t, entry) - { - if (lstrcmpW(name, cursor->name) == 0) { - pm = cursor; - break; + if (name) { + LIST_FOR_EACH_ENTRY(cursor, &monitor_handles, monitor_t, entry) + { + if (cursor->name && (lstrcmpW(name, cursor->name) == 0)) { + pm = cursor; + break; + } } } @@ -1005,8 +1007,10 @@ static monitor_t * monitor_load(LPCWSTR LPMONITOREX pmonitorEx; DWORD len; - len = lstrlenW(MonitorsW) + lstrlenW(name) + 2; - regroot = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (name) { + len = lstrlenW(MonitorsW) + lstrlenW(name) + 2; + regroot = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + } if (regroot) { lstrcpyW(regroot, MonitorsW); @@ -1029,7 +1033,7 @@ static monitor_t * monitor_load(LPCWSTR pm->name = strdupW(name); pm->dllname = strdupW(driver); - if (!regroot || !pm->name || !pm->dllname) { + if ((name && (!regroot || !pm->name)) || !pm->dllname) { monitor_unload(pm); SetLastError(ERROR_NOT_ENOUGH_MEMORY); pm = NULL; @@ -1069,10 +1073,10 @@ static monitor_t * monitor_load(LPCWSTR } } - if (pInitializePrintMonitor != NULL) { + if (pInitializePrintMonitor && regroot) { pmonitorEx = pInitializePrintMonitor(regroot); - TRACE( "%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", - pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); + TRACE( "%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", + pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); if (pmonitorEx) { pm->dwMonitorSize = pmonitorEx->dwMonitorSize; @@ -1085,7 +1089,7 @@ static monitor_t * monitor_load(LPCWSTR } - if (!pm->monitor) { + if (!pm->monitor && regroot) { if (pInitializePrintMonitor2 != NULL) { FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); }

1 0

Detlef Riekenberg : winspool: Support Xcv for ConfigurePortW.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: e576b09a85f7d33212a7b784dfaacb644be4d1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e576b09a85f7d33212a7b784d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 11 13:10:37 2007 +0100 winspool: Support Xcv for ConfigurePortW. --- dlls/winspool.drv/info.c | 85 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 71 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9e165db..40a7dd5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -218,6 +218,7 @@ static const WCHAR DriverW[] = {'D','r', static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR LocationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR MonitorW[] = {'M','o','n','i','t','o','r',0}; +static const WCHAR MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static const WCHAR NameW[] = {'N','a','m','e',0}; static const WCHAR ParametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; static const WCHAR PortW[] = {'P','o','r','t',0}; @@ -1155,6 +1156,49 @@ static DWORD monitor_loadall(void) } /****************************************************************** + * monitor_loadui [internal] + * + * load the userinterface-dll for a given portmonitor + * + * On failure, NULL is returned + */ + +static monitor_t * monitor_loadui(monitor_t * pm) +{ + monitor_t * pui = NULL; + LPWSTR buffer[MAX_PATH]; + HANDLE hXcv; + DWORD len; + DWORD res; + + if (pm == NULL) return NULL; + TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); + + /* Try the Portmonitor first; works for many monitors */ + if (pm->monitorUI) { + EnterCriticalSection(&monitor_handles_cs); + pm->refcount++; + LeaveCriticalSection(&monitor_handles_cs); + return pm; + } + + /* query the userinterface-dllname from the Portmonitor */ + if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { + /* building (",XcvMonitor %s",pm->name) not needed yet */ + res = pm->monitor->pfnXcvOpenPort(emptyStringW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor->pfnXcvDataPort(hXcv, MonitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); + pm->monitor->pfnXcvClosePort(hXcv); + } + } + return pui; +} + + +/****************************************************************** * monitor_load_by_port [internal] * * load a printmonitor for a given port @@ -6116,7 +6160,8 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) { monitor_t * pm; - DWORD res = ROUTER_UNKNOWN; + monitor_t * pui; + DWORD res; TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); @@ -6131,28 +6176,40 @@ BOOL WINAPI ConfigurePortW(LPWSTR pName, } /* an empty Portname is Invalid, but can popup a Dialog */ - if (!pPortName[0]) goto cleanup; - + if (!pPortName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor) { - if (pm->monitor->pfnConfigurePort != NULL) { - TRACE("Using %s for %s:\n", debugstr_w(pm->name), debugstr_w(pPortName)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); - TRACE("got %d with %d\n", res, GetLastError()); + if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + TRACE("Using %s for %s (%p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); + res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnConfigurePortUI) { + TRACE("Use %s for %s (%p: %s)\n", debugstr_w(pui->name), debugstr_w(pPortName), pui, debugstr_w(pui->dllname)); + res = pui->monitorUI->pfnConfigurePortUI(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); } else { - FIXME("XcvOpenPort not implemented (dwMonitorSize: %d)\n", pm->dwMonitorSize); + FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pPortName), + pm, pm ? debugstr_w(pm->dllname) : NULL, pui, pui ? debugstr_w(pui->dllname) : NULL); + + /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; } + monitor_unload(pui); } monitor_unload(pm); -cleanup: - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - if (res == ROUTER_UNKNOWN) SetLastError(ERROR_NOT_SUPPORTED); - TRACE("returning %d with %d\n", (res == ROUTER_SUCCESS), GetLastError()); - return (res == ROUTER_SUCCESS); + TRACE("returning %d with %u\n", res, GetLastError()); + return res; } /******************************************************************************

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

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