wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

Mikołaj Zalewski : resources: Change Dutch sublanguage code to SUBLANG_NEUTRAL.
by Alexandre Julliard 24 Oct '06

24 Oct '06

1 0

Alexandre Julliard : notepad: Fallback to default position if saved position if off-screen.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: cd5a04fd95f08282f93cfcbe4a4ceacc27f92d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5a04fd95f08282f93cfcbe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 24 12:27:28 2006 +0200 notepad: Fallback to default position if saved position if off-screen. --- programs/notepad/main.c | 60 ++++++++++++++++++++++++++++------------------ programs/notepad/main.h | 5 ---- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 3ffa14b..4012c84 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -34,6 +34,7 @@ #include "notepad_res.h" NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; +static RECT main_rect; static const WCHAR notepad_reg_key[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','N','o','t','e','p','a','d','\0'}; @@ -111,20 +112,15 @@ static VOID NOTEPAD_SaveSettingToRegistr REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disp) == ERROR_SUCCESS) { DWORD data; - RECT rect; - - GetWindowRect(Globals.hMainWnd, &rect); - Globals.iWindowPosX = rect.left; - Globals.iWindowPosY = rect.top; - Globals.iWindowPosDX = rect.right - rect.left; - Globals.iWindowPosDY = rect.bottom - rect.top; -#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)value_data; RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) + GetWindowRect(Globals.hMainWnd, &main_rect); + +#define SET_NOTEPAD_REG(hkey, value_name, value_data) do { DWORD data = (DWORD)(value_data); RegSetValueEx(hkey, value_name, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); }while(0) SET_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); - SET_NOTEPAD_REG(hkey, value_iWindowPosX, Globals.iWindowPosX); - SET_NOTEPAD_REG(hkey, value_iWindowPosY, Globals.iWindowPosY); - SET_NOTEPAD_REG(hkey, value_iWindowPosDX, Globals.iWindowPosDX); - SET_NOTEPAD_REG(hkey, value_iWindowPosDY, Globals.iWindowPosDY); + SET_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); + SET_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); + SET_NOTEPAD_REG(hkey, value_iWindowPosDX, main_rect.right - main_rect.left); + SET_NOTEPAD_REG(hkey, value_iWindowPosDY, main_rect.bottom - main_rect.top); SET_NOTEPAD_REG(hkey, value_lfCharSet, Globals.lfFont.lfCharSet); SET_NOTEPAD_REG(hkey, value_lfClipPrecision, Globals.lfFont.lfClipPrecision); SET_NOTEPAD_REG(hkey, value_lfEscapement, Globals.lfFont.lfEscapement); @@ -158,15 +154,14 @@ static VOID NOTEPAD_LoadSettingFromRegis { static const WCHAR systemW[] = { 'S','y','s','t','e','m','\0' }; HKEY hkey; - INT base_length; + INT base_length, dx, dy; base_length = (GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN))? GetSystemMetrics(SM_CYSCREEN) : GetSystemMetrics(SM_CXSCREEN); - Globals.iWindowPosX = 0; - Globals.iWindowPosY = 0; - Globals.iWindowPosDX = base_length * .95; - Globals.iWindowPosDY = Globals.iWindowPosDX * 3 / 4; + dx = base_length * .95; + dy = dx * 3 / 4; + SetRect( &main_rect, 0, 0, dx, dy ); Globals.bWrapLongLines = TRUE; @@ -192,10 +187,10 @@ static VOID NOTEPAD_LoadSettingFromRegis #define QUERY_NOTEPAD_REG(hkey, value_name, ret) do { DWORD type, data; DWORD size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_name, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) ret = (typeof(ret))data; } while(0) QUERY_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosX, Globals.iWindowPosX); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosY, Globals.iWindowPosY); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosDX, Globals.iWindowPosDX); - QUERY_NOTEPAD_REG(hkey, value_iWindowPosDY, Globals.iWindowPosDY); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosX, main_rect.left); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosY, main_rect.top); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosDX, dx); + QUERY_NOTEPAD_REG(hkey, value_iWindowPosDY, dy); QUERY_NOTEPAD_REG(hkey, value_lfCharSet, Globals.lfFont.lfCharSet); QUERY_NOTEPAD_REG(hkey, value_lfClipPrecision, Globals.lfFont.lfClipPrecision); QUERY_NOTEPAD_REG(hkey, value_lfEscapement, Globals.lfFont.lfEscapement); @@ -209,6 +204,9 @@ #define QUERY_NOTEPAD_REG(hkey, value_na QUERY_NOTEPAD_REG(hkey, value_lfWeight, Globals.lfFont.lfWeight); #undef QUERY_NOTEPAD_REG + main_rect.right = main_rect.left + dx; + main_rect.bottom = main_rect.top + dy; + size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) @@ -593,6 +591,9 @@ int PASCAL WinMain(HINSTANCE hInstance, MSG msg; HACCEL hAccel; WNDCLASSEX class; + HMONITOR monitor; + MONITORINFO info; + INT x, y; static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; @@ -616,10 +617,21 @@ int PASCAL WinMain(HINSTANCE hInstance, /* Setup windows */ + monitor = MonitorFromRect( &main_rect, MONITOR_DEFAULTTOPRIMARY ); + info.cbSize = sizeof(info); + GetMonitorInfoW( monitor, &info ); + + x = main_rect.left; + y = main_rect.top; + if (main_rect.left >= info.rcWork.right || + main_rect.top >= info.rcWork.bottom || + main_rect.right < info.rcWork.left || + main_rect.bottom < info.rcWork.top) + x = y = CW_USEDEFAULT; + Globals.hMainWnd = - CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, - Globals.iWindowPosX, Globals.iWindowPosY, - Globals.iWindowPosDX, Globals.iWindowPosDY, + CreateWindow(className, winName, WS_OVERLAPPEDWINDOW, x, y, + main_rect.right - main_rect.left, main_rect.bottom - main_rect.top, NULL, NULL, Globals.hInstance, NULL); if (!Globals.hMainWnd) { diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 075a248..a0c5e5e 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -45,11 +45,6 @@ typedef struct WCHAR szHeader[MAX_PATH]; WCHAR szFooter[MAX_PATH]; - INT iWindowPosX; - INT iWindowPosY; - INT iWindowPosDX; - INT iWindowPosDY; - FINDREPLACE find; FINDREPLACE lastFind; HGLOBAL hDevMode; /* printer mode */

1 0

Alexandre Julliard : user: Make sure the desktop window exists before calling monitor functions.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 1dc38cf26b2ee0c1c2c37e9ac53dfd20a726dc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc38cf26b2ee0c1c2c37e9ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 24 12:22:43 2006 +0200 user: Make sure the desktop window exists before calling monitor functions. --- dlls/user/misc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user/misc.c b/dlls/user/misc.c index 4cc1105..842819b 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -396,6 +396,9 @@ HMONITOR WINAPI MonitorFromRect( LPRECT { struct monitor_enum_info info; + /* make sure the desktop window exists */ + GetDesktopWindow(); + info.rect = *rect; info.max_area = 0; info.min_distance = ~0u;

1 0

lostwages/templates/en git.template
by Jeremy Newman 24 Oct '06

24 Oct '06

ChangeSet ID: 29227 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/10/24 10:47:48 Modified files: templates/en : git.template Log message: fix broken horizonal line images, need to use the {$root} template var Patch: http://cvs.winehq.org/patch.py?id=29227 Old revision New revision Changes Path 1.1 1.2 +2 -2 lostwages/templates/en/git.template Index: lostwages/templates/en/git.template diff -u -p lostwages/templates/en/git.template:1.1 lostwages/templates/en/git.template:1.2 --- lostwages/templates/en/git.template:1.1 24 Oct 2006 15:47:48 -0000 +++ lostwages/templates/en/git.template 24 Oct 2006 15:47:48 -0000 @@ -22,7 +22,7 @@ such as the Linux Kernel source. <li><a href="#sourcetree">Source Tree Browsing via the Web</a> </ol> -<img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> +<img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> <a name="clone" class="hidden"></a> @@ -37,7 +37,7 @@ such as the Linux Kernel source. </td></tr> </table> -<img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> +<img src="{$root}/images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"> <a name="uptodate" class="hidden"></a>

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : oledlg: Updated Korean resource.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 41951dc1246a49d21a48ec60cb74eb80b88ecb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41951dc1246a49d21a48ec60c… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Oct 24 16:14:52 2006 +0900 oledlg: Updated Korean resource. --- dlls/oledlg/oledlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc index 762e85f..fe5eaf9 100644 --- a/dlls/oledlg/oledlg_Ko.rc +++ b/dlls/oledlg/oledlg_Ko.rc @@ -91,5 +91,5 @@ STRINGTABLE DISCARDABLE IDS_PS_NON_OLE "�� Ŭ�� ϱ�." IDS_PS_UNKNOWN_TYPE "�˼� �� " IDS_PS_UNKNOWN_SRC "�˼� �� " - IDS_PS_UNKNOWN_APP "�� α׷�� ̰�� ϴ�" + IDS_PS_UNKNOWN_APP "�� α׷�� α׷�� ϴ�" }

1 0

Mikołaj Zalewski : resources: Change German sublanguage code to SUBLANG_NEUTRAL.
by Alexandre Julliard 24 Oct '06

24 Oct '06

1 0

Mike McCormack : msi: Split code to get a file' s verion into a separate comment.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: d1723de5661a502c847d6d05ef9512ec622ee113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1723de5661a502c847d6d05e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 17:37:26 2006 +0900 msi: Split code to get a file's verion into a separate comment. --- dlls/msi/action.c | 77 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 66504e8..84275f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1957,7 +1957,40 @@ static UINT ITERATE_CostFinalizeConditio return ERROR_SUCCESS; } -/* +LPWSTR msi_get_disk_file_version( LPCWSTR filename ) +{ + static const WCHAR name_fmt[] = + {'%','u','.','%','u','.','%','u','.','%','u',0}; + static WCHAR name[] = {'\\',0}; + VS_FIXEDFILEINFO *lpVer; + WCHAR filever[0x100]; + LPVOID version; + DWORD versize; + DWORD handle; + UINT sz; + + TRACE("%s\n", debugstr_w(filename)); + + versize = GetFileVersionInfoSizeW( filename, &handle ); + if (!versize) + return NULL; + + version = msi_alloc( versize ); + GetFileVersionInfoW( filename, 0, versize, version ); + + VerQueryValueW( version, name, (LPVOID*)&lpVer, &sz ); + msi_free( version ); + + sprintfW( filever, name_fmt, + HIWORD(lpVer->dwFileVersionMS), + LOWORD(lpVer->dwFileVersionMS), + HIWORD(lpVer->dwFileVersionLS), + LOWORD(lpVer->dwFileVersionLS)); + + return strdupW( filever ); +} + +/* * A lot is done in this function aside from just the costing. * The costing needs to be implemented at some point but for now I am going * to focus on the directory building @@ -1980,11 +2013,11 @@ static UINT ACTION_CostFinalize(MSIPACKA MSIFILE *file; UINT rc; MSIQUERY * view; - LPWSTR level; + LPWSTR level, file_version; if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) return ERROR_SUCCESS; - + TRACE("Building Directory properties\n"); rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); @@ -2014,14 +2047,14 @@ static UINT ACTION_CostFinalize(MSIPACKA msi_free(file->TargetPath); TRACE("file %s is named %s\n", - debugstr_w(file->File),debugstr_w(file->FileName)); + debugstr_w(file->File), debugstr_w(file->FileName)); file->TargetPath = build_directory_name(2, p, file->FileName); msi_free(p); TRACE("file %s resolves to %s\n", - debugstr_w(file->File),debugstr_w(file->TargetPath)); + debugstr_w(file->File), debugstr_w(file->TargetPath)); if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { @@ -2030,42 +2063,20 @@ static UINT ACTION_CostFinalize(MSIPACKA continue; } - if (file->Version) + if (file->Version && + (file_version = msi_get_disk_file_version( file->TargetPath ))) { - DWORD handle; - DWORD versize; - UINT sz; - LPVOID version; - static WCHAR name[] = {'\\',0}; - static const WCHAR name_fmt[] = - {'%','u','.','%','u','.','%','u','.','%','u',0}; - WCHAR filever[0x100]; - VS_FIXEDFILEINFO *lpVer; - - TRACE("Version comparison..\n"); - versize = GetFileVersionInfoSizeW(file->TargetPath,&handle); - version = msi_alloc(versize); - GetFileVersionInfoW(file->TargetPath, 0, versize, version); - - VerQueryValueW(version, name, (LPVOID*)&lpVer, &sz); - - sprintfW(filever,name_fmt, - HIWORD(lpVer->dwFileVersionMS), - LOWORD(lpVer->dwFileVersionMS), - HIWORD(lpVer->dwFileVersionLS), - LOWORD(lpVer->dwFileVersionLS)); - TRACE("new %s old %s\n", debugstr_w(file->Version), - debugstr_w(filever)); - if (strcmpiW(filever,file->Version)<0) + debugstr_w(file_version)); + /* FIXME: seems like a bad way to compare version numbers */ + if (lstrcmpiW(file_version, file->Version)<0) { file->state = msifs_overwrite; - /* FIXME: cost should be diff in size */ comp->Cost += file->FileSize; } else file->state = msifs_present; - msi_free(version); + msi_free( file_version ); } else file->state = msifs_present;

1 0

Mike McCormack : riched20: Create macro functions for allocating and freeing memory.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 8939587b19027f6582340ef42099b594459dfdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8939587b19027f6582340ef42… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 14:26:28 2006 +0900 riched20: Create macro functions for allocating and freeing memory. --- dlls/riched20/clipboard.c | 8 ++++---- dlls/riched20/editor.c | 4 ++-- dlls/riched20/editor.h | 24 ++++++++++++++++++++---- dlls/riched20/reader.c | 20 +++----------------- dlls/riched20/richole.c | 4 ++-- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 3bb8b7b..99d9503 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -77,7 +77,7 @@ static ULONG WINAPI EnumFormatImpl_Relea if(!ref) { GlobalFree(This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); + richedit_free(This); } return ref; @@ -152,7 +152,7 @@ static HRESULT EnumFormatImpl_Create(FOR EnumFormatImpl *ret; TRACE("\n"); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); + ret = richedit_alloc(sizeof(EnumFormatImpl)); ret->lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; @@ -195,7 +195,7 @@ static ULONG WINAPI DataObjectImpl_Relea if(This->unicode) GlobalFree(This->unicode); if(This->rtf) GlobalFree(This->rtf); if(This->fmtetc) GlobalFree(This->fmtetc); - HeapFree(GetProcessHeap(), 0, This); + richedit_free(This); } return ref; @@ -388,7 +388,7 @@ HRESULT ME_GetDataObject(ME_TextEditor * DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); - obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); + obj = richedit_alloc(sizeof(DataObjectImpl)); if(cfRTF == 0) cfRTF = RegisterClipboardFormatA("Rich Text Format"); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0969787..93aed91 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1998,7 +1998,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND /* potentially each char may be a CR, why calculate the exact value with O(N) when we can just take a bigger buffer? :) */ int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; - LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (crlfmul*nCount + 1) * sizeof(WCHAR)); + LPWSTR buffer = richedit_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); DWORD buflen = ex->cb; LRESULT rc; DWORD flags = 0; @@ -2006,7 +2006,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); - HeapFree(GetProcessHeap(),0,buffer); + richedit_free(buffer); return rc; } } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index bb3be88..87742c5 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -21,9 +21,26 @@ #include "editstr.h" #include "wine/unicode.h" -#define ALLOC_OBJ(type) HeapAlloc(me_heap, 0, sizeof(type)) -#define ALLOC_N_OBJ(type, count) HeapAlloc(me_heap, 0, (count)*sizeof(type)) -#define FREE_OBJ(ptr) HeapFree(me_heap, 0, ptr) +extern HANDLE me_heap; + +static inline void *richedit_alloc( size_t len ) +{ + return HeapAlloc( me_heap, 0, len ); +} + +static inline BOOL richedit_free( void *ptr ) +{ + return HeapFree( me_heap, 0, ptr ); +} + +static inline void *richedit_realloc( void *ptr, size_t len ) +{ + return HeapReAlloc( me_heap, 0, ptr, len ); +} + +#define ALLOC_OBJ(type) richedit_alloc(sizeof(type)) +#define ALLOC_N_OBJ(type, count) richedit_alloc((count)*sizeof(type)) +#define FREE_OBJ(ptr) richedit_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) @@ -264,7 +281,6 @@ ME_DisplayItem *ME_FindItemAtOffset(ME_T void ME_StreamInFill(ME_InStream *stream); int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; -extern HANDLE me_heap; extern void DoWrap(ME_TextEditor *editor); /* writer.c */ diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index f3a917c..b2fb444 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -86,17 +86,9 @@ static void RTFPutCodePageChar(RTF_Info * Return pointer to block of size bytes, or NULL if there's * not enough memory available. */ -static inline void *RTFAlloc(int size) -{ - return HeapAlloc(me_heap, 0, size); -} - - -static inline void * RTFReAlloc(void *ptr, int size) -{ - return HeapReAlloc(me_heap, 0, ptr, size); -} - +#define RTFAlloc(size) richedit_alloc(size) +#define RTFReAlloc(ptr, size) richedit_realloc(ptr, size) +#define RTFFree(ptr) richedit_free(ptr) /* * Saves a string on the heap and returns a pointer to it. @@ -112,12 +104,6 @@ static inline char *RTFStrSave(char *s) } -static inline void RTFFree(void *p) -{ - HeapFree(me_heap, 0, p); -} - - /* ---------------------------------------------------------------------- */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4601a1a..0585e43 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -112,7 +112,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) if (!ref) { TRACE ("Destroying %p\n", This); - HeapFree(GetProcessHeap(),0,This); + richedit_free(This); } return ref; } @@ -529,7 +529,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor { IRichEditOleImpl *reo; - reo = HeapAlloc(GetProcessHeap(), 0, sizeof(IRichEditOleImpl)); + reo = richedit_alloc(sizeof(IRichEditOleImpl)); if (!reo) return 0;

1 0

Mike McCormack : riched20: Make sure to use GlobalAlloc with GlobalFree.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: e971e0fb89e4c0db6149eaedb706a5ab6d4de7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e971e0fb89e4c0db6149eaedb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 24 14:24:48 2006 +0900 riched20: Make sure to use GlobalAlloc with GlobalFree. --- dlls/riched20/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 72529a0..3bb8b7b 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -76,7 +76,7 @@ static ULONG WINAPI EnumFormatImpl_Relea TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - HeapFree(GetProcessHeap(), 0, This->fmtetc); + GlobalFree(This->fmtetc); HeapFree(GetProcessHeap(), 0, This); } @@ -157,7 +157,7 @@ static HRESULT EnumFormatImpl_Create(FOR ret->ref = 1; ret->cur = 0; ret->fmtetc_cnt = fmtetc_cnt; - ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); + ret->fmtetc = GlobalAlloc(GMEM_ZEROINIT, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); *lplpformatetc = (LPENUMFORMATETC)ret; return S_OK; @@ -400,7 +400,7 @@ HRESULT ME_GetDataObject(ME_TextEditor * obj->fmtetc_cnt = 1; if(editor->mode & TM_RICHTEXT) obj->fmtetc_cnt++; - obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); + obj->fmtetc = GlobalAlloc(GMEM_ZEROINIT, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_UNICODETEXT, TYMED_HGLOBAL); if(editor->mode & TM_RICHTEXT) { obj->rtf = get_rtf_text(editor, lpchrg);

1 0

James Hawkins : advpack: Fix the full path check.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 615d09f285015e392c66c5873e97c871323f9144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615d09f285015e392c66c5873… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 23 18:44:59 2006 -0700 advpack: Fix the full path check. --- dlls/advpack/install.c | 2 +- dlls/advpack/tests/install.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d63a959..b86c70a 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -221,7 +221,7 @@ static BOOL is_full_path(LPWSTR path) if (!path || lstrlenW(path) < MIN_PATH_LEN) return FALSE; - if (path[1] == ':' || (path[0] == '\\' && path[1] == '\\')) + if ((path[1] == ':' && path[2] == '\\') || (path[0] == '\\' && path[1] == '\\')) return TRUE; return FALSE; diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 00ed378..b594a1e 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -226,6 +226,23 @@ static void test_LaunchINFSection() DeleteFileA("test.inf"); } +static void test_LaunchINFSectionEx() +{ + HRESULT hr; + char cmdline[MAX_PATH]; + + create_inf_file("test.inf"); + + /* try an invalid CAB filename */ + lstrcpy(cmdline, CURR_DIR); + lstrcpy(cmdline, "\\"); + lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + ok(hr == 0, "Expected 0, got %d\n", hr); + + DeleteFileA("test.inf"); +} + START_TEST(install) { if (!init_function_pointers()) @@ -235,4 +252,5 @@ START_TEST(install) test_RunSetupCommand(); test_LaunchINFSection(); + test_LaunchINFSectionEx(); }

1 0

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 October 2006