January 2009 - Wine-commits

Alexandre Julliard : cabinet: Don' t try to copy data from the file if we don't even have a data buffer.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 51c7fe5fc7695bda47a85da9d4ec119167790940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c7fe5fc7695bda47a85da9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 15 12:03:08 2009 +0100 cabinet: Don't try to copy data from the file if we don't even have a data buffer. --- dlls/cabinet/fci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 81175dc..4166598 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -1949,7 +1949,7 @@ static BOOL fci_flush_cabinet( /* TODO error handling of err */ /* while not all CFFILE structures have been copied to the cabinet do */ - while(!FALSE) { + if (p_fci_internal->data_out) while(!FALSE) { /* REUSE the variable read_result */ /* REUSE the buffer p_fci_internal->data_out AGAIN */ /* read a block from p_fci_internal->handleCFFILE2 */ @@ -2005,7 +2005,7 @@ static BOOL fci_flush_cabinet( p_fci_internal->cFiles=0; /* while not all CFDATA structures have been copied to the cabinet do */ - while(!FALSE) { + if (p_fci_internal->data_out) while(!FALSE) { /* REUSE the variable read_result AGAIN */ /* REUSE the buffer p_fci_internal->data_out AGAIN */ /* read a block from p_fci_internal->handleCFDATA2 */

1 0

Alexandre Julliard : ntdll: Check buffer for access in NtWriteFile before performing I/O.
by Alexandre Julliard 15 Jan '09

15 Jan '09

Module: wine Branch: master Commit: 39d4f9e272c0cc5a06d7750834ca86f7ce14ee08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d4f9e272c0cc5a06d775083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 14 20:17:52 2009 +0100 ntdll: Check buffer for access in NtWriteFile before performing I/O. This also triggers page faults needed for DIB section access. --- dlls/ntdll/file.c | 20 +++++++++++--------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bea4e0f..60aec8a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -904,6 +904,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, &needs_close, &type, &options ); if (status) return status; + if (!virtual_check_buffer_for_read( buffer, length )) + { + status = STATUS_INVALID_USER_BUFFER; + goto done; + } + if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) { /* async I/O doesn't make sense on regular files */ @@ -944,19 +950,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } if (type == FD_TYPE_FILE) continue; /* no async I/O on regular files */ } - else + else if (errno != EAGAIN) { if (errno == EINTR) continue; - if (errno != EAGAIN) + if (!total) { - if (errno == EFAULT) - { - status = STATUS_INVALID_USER_BUFFER; - goto err; - } - status = FILE_GetNtStatus(); - goto done; + if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; + else status = FILE_GetNtStatus(); } + goto done; } if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index dc121f5..2fcdb1a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -141,6 +141,7 @@ extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ); +extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ); extern void VIRTUAL_SetForceExec( BOOL enable ); extern void VIRTUAL_UseLargeAddressSpace(void); extern struct _KUSER_SHARED_DATA *user_shared_data; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 59fc491..33c946f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -53,6 +53,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/list.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -1516,6 +1517,40 @@ BOOL virtual_handle_stack_fault( void *addr ) /*********************************************************************** + * virtual_check_buffer_for_read + * + * Check if a memory buffer can be read, triggering page faults if needed for DIB section access. + */ +BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) +{ + if (!size) return TRUE; + if (!ptr) return FALSE; + + __TRY + { + volatile const char *p = ptr; + char dummy; + SIZE_T count = size; + + while (count > page_size) + { + dummy = *p; + p += page_size; + count -= page_size; + } + dummy = p[0]; + dummy = p[count - 1]; + } + __EXCEPT_PAGE_FAULT + { + return FALSE; + } + __ENDTRY + return TRUE; +} + + +/*********************************************************************** * VIRTUAL_SetForceExec * * Whether to force exec prot on all views.

1 0

Jeremy Newman : Fix "mismatched tag" XML errors
by Jeremy Newman 14 Jan '09

14 Jan '09

Module: website Branch: master Commit: c42e5d01673c204a5ffd16a1bd12631d838d5c83 URL: http://source.winehq.org/git/website.git/?a=commit;h=c42e5d01673c204a5ffd16… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jan 14 09:28:45 2009 -0600 Fix "mismatched tag" XML errors --- wwn/en/interviews/interview_10.xml | 11 +++++++---- wwn/en/interviews/interview_11.xml | 5 +++-- wwn/en/interviews/interview_12.xml | 5 +++-- wwn/en/interviews/interview_14.xml | 10 ++++++---- wwn/en/interviews/interview_15.xml | 5 +++-- wwn/en/interviews/interview_6.xml | 13 ++++++++----- wwn/en/interviews/interview_9.xml | 8 +++++--- 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/wwn/en/interviews/interview_10.xml b/wwn/en/interviews/interview_10.xml index a85de38..8df0674 100644 --- a/wwn/en/interviews/interview_10.xml +++ b/wwn/en/interviews/interview_10.xml @@ -3,10 +3,12 @@ <author email="vinn(a)theshell.com">Brian Vincent</author> <issue num="10" who="Jon Griffiths" date="22 July 2003" /> <intro> - This is our 10th interview with Wine developers. Check out the + + This is our 10th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + page for previous ones. + + Jon Griffiths gets my vote for having the most interesting life of any Wine developer. He was born in England but has lived most of his life in Auckland, New Zealand. He considers himself a @@ -15,7 +17,8 @@ this is an extended vacation many folks from Australia or New Zealand take. It often lasts somewhere between several months and their entire lives.) - + + Jon attended Waikato University in Hamilton, New Zealand and earned a degree in psychology and computer science. For the most part he's been traveling for the past few years. He does admit to doing some diff --git a/wwn/en/interviews/interview_11.xml b/wwn/en/interviews/interview_11.xml index f1f96cd..5930c3d 100644 --- a/wwn/en/interviews/interview_11.xml +++ b/wwn/en/interviews/interview_11.xml @@ -7,8 +7,9 @@ involvement with Wine. This is our 11th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + page for previous ones. + + Francois grew up in France. He's spent the last five years living in California but he recently moved back home. He attended college at diff --git a/wwn/en/interviews/interview_12.xml b/wwn/en/interviews/interview_12.xml index 6173d38..26d3f7d 100644 --- a/wwn/en/interviews/interview_12.xml +++ b/wwn/en/interviews/interview_12.xml @@ -8,8 +8,9 @@ Wine - the gaming scene. This is our 12th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - Normally I write a little intro about the person being + page for previous ones. + + Normally I write a little intro about the person being interviewed. Peter's response was pretty amusing, so we'll just jump in with that as the first question. diff --git a/wwn/en/interviews/interview_14.xml b/wwn/en/interviews/interview_14.xml index efae864..adf1115 100644 --- a/wwn/en/interviews/interview_14.xml +++ b/wwn/en/interviews/interview_14.xml @@ -3,10 +3,12 @@ <author email="vinn(a)theshell.com">Brian Vincent</author> <issue num="14" who="Steven Edwards" date="25 May 2004" /> <intro> - This is our 14th interview with Wine developers. Check out the + + This is our 14th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + page for previous ones. + + Steven Edwards is the first developer we've interviewed that's associated with the <a href="http://www.reactos.org">ReactOS</a> project. For several years he's served as a valuable liaison @@ -16,7 +18,7 @@ South Carolina. Steven keeps reminding everyone that he'll likely not be working on Wine much in the coming months since he has a baby due any day now. - + </intro> <interview> diff --git a/wwn/en/interviews/interview_15.xml b/wwn/en/interviews/interview_15.xml index d9fcd81..6dac209 100644 --- a/wwn/en/interviews/interview_15.xml +++ b/wwn/en/interviews/interview_15.xml @@ -5,8 +5,9 @@ <intro> This is our 15th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + page for previous ones. + + Lionel Ulmer's work was actually the impetus for the original interview series. Last year a significant amount of DirectX work prompted an email to get more information about it. Now diff --git a/wwn/en/interviews/interview_6.xml b/wwn/en/interviews/interview_6.xml index f7f50c0..89fdbeb 100644 --- a/wwn/en/interviews/interview_6.xml +++ b/wwn/en/interviews/interview_6.xml @@ -9,10 +9,12 @@ <issue num="6" who="Andreas Mohr" date="20 May 2003" /> <intro> -This is our 6th interview with Wine developers. -Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + + This is our 6th interview with Wine developers. + Check out the <a href="http://www.winehq.org/interview">Interviews</a> + page for previous ones. + + This week Andreas Mohr finds himself in the hotseat. Andi was born in Karlsruhe, Germany in 1977 and grew up in Renningen, near Stuttgart. He did the usual @@ -22,7 +24,8 @@ Check out the <a href="http://www.winehq.org/interview">Interviews</a> Esslingen studying computer science. Besides the normal CS classes Andi is focusing on embedded systems, automation, and networking. -</intro> + +</intro> <interview> <question>BV: How did you get involved with Wine?</question> diff --git a/wwn/en/interviews/interview_9.xml b/wwn/en/interviews/interview_9.xml index 370d270..3b6f2aa 100644 --- a/wwn/en/interviews/interview_9.xml +++ b/wwn/en/interviews/interview_9.xml @@ -4,10 +4,12 @@ <author email="vinn(a)theshell.com">Brian Vincent</author> <issue num="9" who="Jukka Heinonen" date="10 July 2003" /> <intro> - This is our 9th interview with Wine developers. Check out the + + This is our 9th interview with Wine developers. Check out the <a href="http://www.winehq.org/interview">Interviews</a> - page for previous ones. - + page for previous ones. + + Jukka Heinonen lives in Helsinki, Finland and works as a software engineer for a medium sized Finnish company. He's also working on a Masters degree in physics at the University of

1 0

Huw Davies : comdlg32: Keep the DEVMODE's orientation member up to date.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 34c771bd9aaf8e6259ce6bd83c8831c3d26f85be URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c771bd9aaf8e6259ce6bd83… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 14 14:42:53 2009 +0000 comdlg32: Keep the DEVMODE's orientation member up to date. --- dlls/comdlg32/printdlg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 4a07f04..1dfb8ae 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2932,10 +2932,14 @@ PRINTDLG_PS_WMCommandA( char TmpText[25]; char TmpText2[25]; DWORD tmp = pda->dlga->ptPaperSize.x; + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; pda->dlga->ptPaperSize.y = tmp; + dm->u1.s1.dmOrientation = (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + GlobalUnlock(pda->dlga->hDevMode); + GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); SetDlgItemTextA(hDlg, edt5, TmpText);

1 0

Huw Davies : comdlg32: Keep the DEVMODE's papersize member up to date.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 90651c049aadc719f8d8fd39dfe06ca0cbb93620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90651c049aadc719f8d8fd39d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 14 14:43:00 2009 +0000 comdlg32: Keep the DEVMODE's papersize member up to date. --- dlls/comdlg32/printdlg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 1dfb8ae..7e805ad 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2965,7 +2965,11 @@ PRINTDLG_PS_WMCommandA( if(msg == CBN_SELCHANGE){ DWORD paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA, SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); - if (paperword != CB_ERR) { + if (paperword != CB_ERR) + { + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + dm->u1.s1.dmPaperSize = paperword; + GlobalUnlock(pda->dlga->hDevMode); pagesetup_papersizeA(pda->dlga, paperword, &(pda->dlga->ptPaperSize)); if (IsDlgButtonChecked(hDlg, rad2)) { DWORD tmp = pda->dlga->ptPaperSize.x;

1 0

Huw Davies : comdlg32: Use a unicode dialog.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 3e43528a99ef5f59aa04b54606b1ca4e569941f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e43528a99ef5f59aa04b5460… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 14 14:43:08 2009 +0000 comdlg32: Use a unicode dialog. --- dlls/comdlg32/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 7e805ad..9669394 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3617,7 +3617,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda)); pda->dlga = setupdlg; - bRet = (0<DialogBoxIndirectParamA( + bRet = (0<DialogBoxIndirectParamW( setupdlg->hInstance, ptr, setupdlg->hwndOwner,

1 0

Huw Davies : comdlg32: We no longer need to update the dialog struct on exit as all of the information is up to date .
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 8b10dd2a8daed738527f92aa89104c8647e4535c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b10dd2a8daed738527f92aa8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 14 14:42:38 2009 +0000 comdlg32: We no longer need to update the dialog struct on exit as all of the information is up to date. --- dlls/comdlg32/printdlg.c | 49 ---------------------------------------------- 1 files changed, 0 insertions(+), 49 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 9669394..c7e7d60 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2568,53 +2568,6 @@ end: return retval; } -/**************************************************************************** - * PRINTDLG_PS_UpdateDlgStructA - * - * Updates pda->dlga structure - * Function calls when user presses OK button - * - * PARAMS - * hDlg [in] main window dialog HANDLE - * pda [in/out] ptr to PageSetupDataA structure - * - * RETURNS - * TRUE - */ -static BOOL -PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { - DEVMODEA *dm; - DWORD paperword; - - dm = GlobalLock(pda->dlga->hDevMode); - - /* Save paper orientation into device context */ - if(pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) - dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; - else - dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; - - /* Save paper size into the device context */ - paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); - if (paperword != CB_ERR) - dm->u1.s1.dmPaperSize = paperword; - else - FIXME("could not get dialog text for papersize cmbbox?\n"); - - /* Save paper source into the device context */ - paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0); - if (paperword != CB_ERR) - dm->u1.s1.dmDefaultSource = paperword; - else - FIXME("could not get dialog text for papersize cmbbox?\n"); - - GlobalUnlock(pda->dlga->hDevMode); - - return TRUE; -} - static BOOL PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pdw) { DEVNAMES *dn; @@ -2898,8 +2851,6 @@ PRINTDLG_PS_WMCommandA( LOWORD(lParam),wParam,lParam); switch (id) { case IDOK: - if (!PRINTDLG_PS_UpdateDlgStructA(hDlg, pda)) - return(FALSE); EndDialog(hDlg, TRUE); return TRUE ;

1 0

Nikolay Sivov : kernel32/tests: Some todo tests for CompareStringA and lstrcmpi.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 4e12b8efc829cdac306c59fb8cff352106d80122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e12b8efc829cdac306c59fb8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 14 16:28:58 2009 +0300 kernel32/tests: Some todo tests for CompareStringA and lstrcmpi. --- dlls/kernel32/tests/locale.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4dce733..dfbbe04 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1110,6 +1110,12 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, 0, "\2", 2, "\1", 2); todo_wine ok(ret != 2, "\\2 vs \\1 expected unequal\n"); + + ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1); + todo_wine ok(ret == CSTR_LESS_THAN, "\"#\" vs \".\" expected CSTR_LESS_THAN, got %d\n", ret); + + ret = lstrcmpi("#", "."); + todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret); } static void test_LCMapStringA(void)

1 0

Francois Gouget : winhlp32: Reorder some functions to avoid forward declarations in hlpfile.c.
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: ffdf89c4a5a8c3afd62b78eb4b405500a0e21339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdf89c4a5a8c3afd62b78eb4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 14 14:52:32 2009 +0100 winhlp32: Reorder some functions to avoid forward declarations in hlpfile.c. --- programs/winhlp32/hlpfile.c | 1456 +++++++++++++++++++++---------------------- 1 files changed, 719 insertions(+), 737 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffdf89c4a5a8c3afd62b7…

1 0

Francois Gouget : winhlp32: Make some functions static in hlpfile. c and remove HLPFILE_PointsToTwips().
by Alexandre Julliard 14 Jan '09

14 Jan '09

Module: wine Branch: master Commit: 41e9dd3d80d8179c7ccd6ba4714ae25e4888486f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e9dd3d80d8179c7ccd6ba47… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 14 14:52:50 2009 +0100 winhlp32: Make some functions static in hlpfile.c and remove HLPFILE_PointsToTwips(). --- programs/winhlp32/hlpfile.c | 6 +++--- programs/winhlp32/hlpfile.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index b67871e..d9bdc7e 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -66,7 +66,7 @@ static HLPFILE *first_hlpfile = 0; * Pointer to block identified by key, or NULL if failure. * */ -void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, +static void* HLPFILE_BPTreeSearch(BYTE* buf, const void* key, HLPFILE_BPTreeCompare comp) { unsigned magic; @@ -396,7 +396,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ * * HLPFILE_Contents */ -HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative) +static HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative) { HLPFILE_PAGE* page = NULL; @@ -1093,7 +1093,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } -unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +static unsigned HLPFILE_HalfPointsToTwips(unsigned pts) { static unsigned logPxY; if (!logPxY) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index b0d1f23..0e3f35e 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -164,20 +164,12 @@ typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie); HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath); -HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative); HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative); LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeHlpFile(HLPFILE*); -unsigned HLPFILE_HalfPointsToTwips(unsigned pts); -static inline unsigned HLPFILE_PointsToTwips(unsigned pts) -{ - return HLPFILE_HalfPointsToTwips(2 * pts); -} - -void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie); struct RtfData {

1 0