February 2009 - Wine-commits

Francois Gouget : uxtheme: UXINI_ResetINI() is unused so remove it.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 55dccf28595f84767a4731c1e6aacf3a43521f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55dccf28595f84767a4731c1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:04:49 2009 +0100 uxtheme: UXINI_ResetINI() is unused so remove it. --- dlls/uxtheme/msstyles.h | 1 - dlls/uxtheme/uxini.c | 14 -------------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 1d02725..6cd73ac 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -110,7 +110,6 @@ HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMar PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); void UXINI_CloseINI(PUXINI_FILE uf); -void UXINI_ResetINI(PUXINI_FILE uf); LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 02c5443..a2dfabf 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -96,19 +96,6 @@ void UXINI_CloseINI(PUXINI_FILE uf) } /********************************************************************** - * UXINI_ResetINI - * - * Reset the current pointer into INI file to the beginning of the file - * - * PARAMS - * uf Theme INI file to reset - */ -void UXINI_ResetINI(PUXINI_FILE uf) -{ - uf->lpCurLoc = uf->lpIni; -} - -/********************************************************************** * UXINI_eof * * Determines if we are at the end of the INI file @@ -212,7 +199,6 @@ LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) * * Locate a section with the specified name, search starts * at current location in ini file - * to start search from start, call UXINI_ResetINI * * PARAMS * uf INI file to search, search starts at current location

1 0

Francois Gouget : taskmgr: Make some functions static.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: c6643c61086a9466f73f2bdcc8f192f3cff8d441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6643c61086a9466f73f2bdcc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:09:34 2009 +0100 taskmgr: Make some functions static. --- programs/taskmgr/applpage.c | 2 +- programs/taskmgr/graphctl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index c7450ac..8fb923d 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -507,7 +507,7 @@ void RefreshApplicationPage(void) SetEvent(hApplicationPageEvent); } -void UpdateApplicationListControlViewSetting(void) +static void UpdateApplicationListControlViewSetting(void) { DWORD dwStyle = GetWindowLong(hApplicationPageListCtrl, GWL_STYLE); diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 305b56c..657ac6c 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -124,7 +124,7 @@ TGraphCtrl::~TGraphCtrl(void) } #endif -void GraphCtrl_Resize(TGraphCtrl* this) +static void GraphCtrl_Resize(TGraphCtrl* this) { /* NOTE: Resize automatically gets called during the setup of the control */ GetClientRect(this->m_hWnd, &this->m_rectClient); @@ -165,7 +165,7 @@ BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) return 0; } -void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) +static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) { /* There is a lot of drawing going on here - particularly in terms of */ /* drawing the grid. Don't panic, this is all being drawn (only once) */ @@ -374,7 +374,7 @@ void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF color) GraphCtrl_InvalidateCtrl(this); } -void GraphCtrl_DrawPoint(TGraphCtrl* this) +static void GraphCtrl_DrawPoint(TGraphCtrl* this) { /* this does the work of "scrolling" the plot to the left * and appending a new data point all of the plotting is @@ -477,7 +477,7 @@ double GraphCtrl_AppendPoint(TGraphCtrl* this, return dPrevious; } -void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) +static void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) { HDC memDC; HBITMAP memBitmap;

1 0

Francois Gouget : winealsa.drv: ALSA_PeekRingMessage() is not used anymore so remove it.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: a8187db2fbf48d12c78748bca0a009bdcd1a0aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8187db2fbf48d12c78748bca… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:07:37 2009 +0100 winealsa.drv: ALSA_PeekRingMessage() is not used anymore so remove it. --- dlls/winealsa.drv/alsa.c | 25 ------------------------- dlls/winealsa.drv/alsa.h | 1 - 2 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index dea7722..f16d013 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -213,31 +213,6 @@ int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, return 1; } -/****************************************************************** - * ALSA_PeekRingMessage - * - * Peek at a message from the ring but do not remove it. - * Should be called by the playback/record thread. - */ -int ALSA_PeekRingMessage(ALSA_MSG_RING* omr, - enum win_wm_message *msg, - DWORD_PTR *param, HANDLE *hEvent) -{ - EnterCriticalSection(&omr->msg_crst); - - if (omr->msg_toget == omr->msg_tosave) /* buffer empty ? */ - { - LeaveCriticalSection(&omr->msg_crst); - return 0; - } - - *msg = omr->messages[omr->msg_toget].msg; - *param = omr->messages[omr->msg_toget].param; - *hEvent = omr->messages[omr->msg_toget].hEvent; - LeaveCriticalSection(&omr->msg_crst); - return 1; -} - /*======================================================================* * Utility functions * *======================================================================*/ diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index c88925d..88529fb 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -179,7 +179,6 @@ void ALSA_ResetRingMessage(ALSA_MSG_RING* omr); void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep); int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait); int ALSA_RetrieveRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent); -int ALSA_PeekRingMessage(ALSA_MSG_RING* omr, enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent); int ALSA_CheckSetVolume(snd_hctl_t *hctl, int *out_left, int *out_right, int *out_min, int *out_max, int *out_step, int *new_left, int *new_right); const char * ALSA_getCmdString(enum win_wm_message msg);

1 0

Francois Gouget : shell32: Remove some unused functions in clipboard.c.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 59c00d55685c526aec65e87bcf3e0ced2a9369d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c00d55685c526aec65e87bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:08:22 2009 +0100 shell32: Remove some unused functions in clipboard.c. --- dlls/shell32/clipboard.c | 33 --------------------------------- dlls/shell32/shell32_main.h | 4 ---- 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index b19d0ed..82df534 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -151,24 +151,6 @@ HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cid return hGlobal; } -HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) -{ - FIXME("\n"); - return 0; -} - -HGLOBAL RenderFILECONTENTS (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) -{ - FIXME("\n"); - return 0; -} - -HGLOBAL RenderFILEDESCRIPTOR (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) -{ - FIXME("\n"); - return 0; -} - HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) { int size = 0; @@ -232,18 +214,3 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return hGlobal; } - -HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags) -{ - DWORD * pdwFlag; - HGLOBAL hGlobal; - - TRACE("(0x%08x)\n", dwFlags); - - hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); - if(!hGlobal) return hGlobal; - pdwFlag = GlobalLock(hGlobal); - *pdwFlag = dwFlags; - GlobalUnlock(hGlobal); - return hGlobal; -} diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 920625f..a508916 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -131,12 +131,8 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderSHELLIDLISTOFFSET (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderFILECONTENTS (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderFILEDESCRIPTOR (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); -HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags); /* Change Notification */ void InitChangeNotifications(void);

1 0

Francois Gouget : shell32: Get rid of TRASH_ELEMENT and TRASH_DisposeElement().
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: fc93ff351eb3e03c30f4082337b0a10e82fc3886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc93ff351eb3e03c30f408233… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:09:05 2009 +0100 shell32: Get rid of TRASH_ELEMENT and TRASH_DisposeElement(). The latter was unused while the former did not seem very useful. --- dlls/shell32/recyclebin.c | 4 +- dlls/shell32/trash.c | 59 ++++++++++++++------------------------------ dlls/shell32/xdg.h | 6 +---- 3 files changed, 22 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index fef478d..a538b3c 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -311,7 +311,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID WIN32_FIND_DATAW data; TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); - TRASH_UnpackItemID(&pidl->mkid, NULL, &data); + TRASH_UnpackItemID(&pidl->mkid, &data); pName->uType = STRRET_WSTR; pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); if (pName->u.pOleStr == NULL) @@ -414,7 +414,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS if (iColumn == COLUMN_NAME) return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); - TRASH_UnpackItemID(&pidl->mkid, NULL, &data); + TRASH_UnpackItemID(&pidl->mkid, &data); switch (iColumn) { case COLUMN_DATEDEL: diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index d692046..6f9cae4 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -320,24 +320,18 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) * bucket name - currently only an empty string meaning the home bucket is supported * trash file name - a NUL-terminated string */ -struct tagTRASH_ELEMENT +static HRESULT TRASH_CreateSimplePIDL(LPCSTR filename, const WIN32_FIND_DATAW *data, LPITEMIDLIST *pidlOut) { - TRASH_BUCKET *bucket; - LPSTR filename; -}; - -static HRESULT TRASH_CreateSimplePIDL(const TRASH_ELEMENT *element, const WIN32_FIND_DATAW *data, LPITEMIDLIST *pidlOut) -{ - LPITEMIDLIST pidl = SHAlloc(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1+2); + LPITEMIDLIST pidl = SHAlloc(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(filename)+1+2); *pidlOut = NULL; if (pidl == NULL) return E_OUTOFMEMORY; - pidl->mkid.cb = (USHORT)(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1); + pidl->mkid.cb = (USHORT)(2+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(filename)+1); pidl->mkid.abID[0] = 0; memcpy(pidl->mkid.abID+1, data, sizeof(WIN32_FIND_DATAW)); pidl->mkid.abID[1+sizeof(WIN32_FIND_DATAW)] = 0; - lstrcpyA((LPSTR)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1), element->filename); - *(USHORT *)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(element->filename)+1) = 0; + lstrcpyA((LPSTR)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1), filename); + *(USHORT *)(pidl->mkid.abID+1+sizeof(WIN32_FIND_DATAW)+1+lstrlenA(filename)+1) = 0; *pidlOut = pidl; return S_OK; } @@ -346,17 +340,15 @@ static HRESULT TRASH_CreateSimplePIDL(const TRASH_ELEMENT *element, const WIN32_ * TRASH_UnpackItemID [Internal] * * DESCRIPTION: - * Extract the information stored in an Item ID. The TRASH_ELEMENT - * identifies the element in the Trash. The WIN32_FIND_DATA contains the - * information about the original file. The data->ftLastAccessTime contains + * Extract the information stored in an Item ID. The WIN32_FIND_DATA contains + * the information about the original file. The data->ftLastAccessTime contains * the deletion time * * PARAMETER(S): * [I] id : the ID of the item - * [O] element : the trash element this item id contains. Can be NULL if not needed * [O] data : the WIN32_FIND_DATA of the original file. Can be NULL is not needed */ -HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) { if (id->cb < 2+1+sizeof(WIN32_FIND_DATAW)+2) return E_INVALIDARG; @@ -367,22 +359,10 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DA if (data != NULL) *data = *(WIN32_FIND_DATAW *)(id->abID+1); - if (element != NULL) - { - element->bucket = home_trash; - element->filename = StrDupA((LPCSTR)(id->abID+1+sizeof(WIN32_FIND_DATAW)+1)); - if (element->filename == NULL) - return E_OUTOFMEMORY; - } return S_OK; } -void TRASH_DisposeElement(TRASH_ELEMENT *element) -{ - SHFree(element->filename); -} - -static HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data) +static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN32_FIND_DATAW *data) { LPSTR path = NULL; XDG_PARSED_FILE *parsed = NULL; @@ -393,21 +373,21 @@ static HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW * HRESULT ret = S_FALSE; LPWSTR original_dos_name; int suffix_length = lstrlenA(trashinfo_suffix); - int filename_length = lstrlenA(element->filename); - int files_length = lstrlenA(element->bucket->files_dir); - int path_length = max(lstrlenA(element->bucket->info_dir), files_length); + int filename_length = lstrlenA(filename); + int files_length = lstrlenA(bucket->files_dir); + int path_length = max(lstrlenA(bucket->info_dir), files_length); path = SHAlloc(path_length + filename_length + 1); if (path == NULL) return E_OUTOFMEMORY; - wsprintfA(path, "%s%s", element->bucket->files_dir, element->filename); + wsprintfA(path, "%s%s", bucket->files_dir, filename); path[path_length + filename_length - suffix_length] = 0; /* remove the '.trashinfo' */ if (lstat(path, &stats) == -1) { - ERR("Error accessing data file for trashinfo %s (errno=%d)\n", element->filename, errno); + ERR("Error accessing data file for trashinfo %s (errno=%d)\n", filename, errno); goto failed; } - wsprintfA(path, "%s%s", element->bucket->info_dir, element->filename); + wsprintfA(path, "%s%s", bucket->info_dir, filename); fd = open(path, O_RDONLY); if (fd == -1) { @@ -536,15 +516,14 @@ HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) for (i=0; i<ti_count; i++) { WIN32_FIND_DATAW data; - TRASH_ELEMENT elem; + LPCSTR filename; - elem.bucket = home_trash; - elem.filename = DPA_GetPtr(tinfs, i); - if (FAILED(err = TRASH_GetDetails(&elem, &data))) + filename = DPA_GetPtr(tinfs, i); + if (FAILED(err = TRASH_GetDetails(home_trash, filename, &data))) goto failed; if (err == S_FALSE) continue; - if (FAILED(err = TRASH_CreateSimplePIDL(&elem, &data, &(*pidls)[pos]))) + if (FAILED(err = TRASH_CreateSimplePIDL(filename, &data, &(*pidls)[pos]))) goto failed; pos++; } diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index daa864f..f010632 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -37,14 +37,10 @@ XDG_PARSED_FILE *XDG_ParseDesktopFile(int fd); char *XDG_GetStringValue(XDG_PARSED_FILE *file, const char *group_name, const char *value_name, DWORD dwFlags); void XDG_FreeParsedFile(XDG_PARSED_FILE *file); -/* implemented in trash.c */ -typedef struct tagTRASH_ELEMENT TRASH_ELEMENT; - BOOL TRASH_CanTrashFile(LPCWSTR wszPath); BOOL TRASH_TrashFile(LPCWSTR wszPath); -HRESULT TRASH_UnpackItemID(LPCSHITEMID id, TRASH_ELEMENT *element, WIN32_FIND_DATAW *data); +HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data); HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count); -void TRASH_DisposeElement(TRASH_ELEMENT *element); HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_dirs, char *** out_ptr);

1 0

Francois Gouget : shell32: HCR_GetDefaultIconFromGUIDW() is unused so remove it.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 0ecc22be616144c90ee4313e15e7bcff1dcb843a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecc22be616144c90ee4313e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:09:28 2009 +0100 shell32: HCR_GetDefaultIconFromGUIDW() is unused so remove it. --- dlls/shell32/classes.c | 14 -------------- dlls/shell32/shell32_main.h | 1 - 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 73c8822..f4aa870 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -313,20 +313,6 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx return ret; } -BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, int* picon_idx) -{ - HKEY hkey; - BOOL ret = FALSE; - - if (HCR_RegOpenClassIDKey(riid, &hkey)) - { - ret = HCR_RegGetDefaultIconW(hkey, szDest, len, picon_idx); - RegCloseKey(hkey); - } - TRACE("-- %s %i\n", debugstr_w(szDest), *picon_idx); - return ret; -} - /*************************************************************************************** * HCR_GetClassName [internal] * diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index a508916..88ffb0c 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -60,7 +60,6 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, int* picon_idx); -BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, int* picon_idx); BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len); /* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */

1 0

Francois Gouget : user32: Reorder some functions to avoid forward declarations in edit.c.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 9e7b55675d0039cddcd76145b6d17e61ba8610c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7b55675d0039cddcd76145b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:05:33 2009 +0100 user32: Reorder some functions to avoid forward declarations in edit.c. --- dlls/user32/edit.c | 4078 +++++++++++++++++++++++++--------------------------- 1 files changed, 1998 insertions(+), 2080 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e7b55675d0039cddcd76…

1 0

Francois Gouget : user32: Make EditWndProcW() static, fix its documentation .
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 07b7da77d4b8f68e5c1dc7f053096e76ff80139c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b7da77d4b8f68e5c1dc7f05… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:06:02 2009 +0100 user32: Make EditWndProcW() static, fix its documentation. --- dlls/user32/edit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 636b957..ee9fb3f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5408,9 +5408,9 @@ LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /********************************************************************* * - * EditWndProcW (USER32.@) + * EditWndProcW */ -LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); }

1 0

Francois Gouget : urlmon: Make create_http_protocol() static.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 4617d7753d768a854e1fb59f305e60b98b29134d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4617d7753d768a854e1fb59f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:06:11 2009 +0100 urlmon: Make create_http_protocol() static. --- dlls/urlmon/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2e73653..9bb4ffa 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -933,7 +933,7 @@ static const IInternetProtocolVtbl HttpProtocolVtbl = { HttpProtocol_UnlockRequest }; -HRESULT create_http_protocol(BOOL https, void **ppobj) +static HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret;

1 0

Francois Gouget : user32: Remove unneeded forward declarations in edit.c.
by Alexandre Julliard 09 Feb '09

09 Feb '09

Module: wine Branch: master Commit: 0e9695d9c865e3cc3cfbbefdae791924a2be1b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9695d9c865e3cc3cfbbefda… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:05:22 2009 +0100 user32: Remove unneeded forward declarations in edit.c. --- dlls/user32/edit.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 6914906..d37cec8 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -180,46 +180,15 @@ typedef struct */ /* - * These functions have trivial implementations - * We still like to call them internally - * "static inline" makes them more like macro's - */ -static inline BOOL EDIT_EM_CanUndo(const EDITSTATE *es); -static inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); -static inline void EDIT_WM_Clear(EDITSTATE *es); -static inline void EDIT_WM_Cut(EDITSTATE *es); - -/* * Helper functions only valid for one type of control */ -static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT iStart, INT iEnd, INT delta, HRGN hrgn); -static void EDIT_CalcLineWidth_SL(EDITSTATE *es); static LPWSTR EDIT_GetPasswordPointer_SL(EDITSTATE *es); -static void EDIT_MoveDown_ML(EDITSTATE *es, BOOL extend); -static void EDIT_MovePageDown_ML(EDITSTATE *es, BOOL extend); -static void EDIT_MovePageUp_ML(EDITSTATE *es, BOOL extend); -static void EDIT_MoveUp_ML(EDITSTATE *es, BOOL extend); /* * Helper functions valid for both single line _and_ multi line controls */ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count, INT action); -static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap); -static void EDIT_ConfinePoint(const EDITSTATE *es, LPINT x, LPINT y); -static void EDIT_GetLineRect(EDITSTATE *es, INT line, INT scol, INT ecol, LPRECT rc); -static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end); static void EDIT_LockBuffer(EDITSTATE *es); -static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size); -static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); -static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl); -static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); -static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveWordForward(EDITSTATE *es, BOOL extend); -static void EDIT_PaintLine(EDITSTATE *es, HDC hdc, INT line, BOOL rev); static INT EDIT_PaintText(EDITSTATE *es, HDC hdc, INT x, INT y, INT line, INT col, INT count, BOOL rev); -static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap); -static void EDIT_AdjustFormatRect(EDITSTATE *es); static void EDIT_SetRectNP(EDITSTATE *es, const RECT *lprc); static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force); static void EDIT_UpdateScrollInfo(EDITSTATE *es);

1 0