August 2016 - Wine-commits - list.winehq.org

André Hentschel : ndis.sys: Implement NdisSystemProcessorCount.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: abffa4ed2f8296398255608373d5e1889665cd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abffa4ed2f829639825560837… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:28 2016 +0100 ndis.sys: Implement NdisSystemProcessorCount. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 113f43250a2de4e4ff73226cb0006a7833d2fb7a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ndis.sys/main.c | 10 ++++++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 499f167..6e1bb9b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -48,3 +48,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) { FIXME("(%p): stub\n", lock); } + +CCHAR WINAPI NdisSystemProcessorCount(void) +{ + SYSTEM_INFO si; + + TRACE("()\n"); + GetSystemInfo(&si); + + return si.dwNumberOfProcessors; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 31b421a..8957d8f 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -257,7 +257,7 @@ @ stub NdisSetTimer @ stub NdisSetTimerEx @ stub NdisSetupDmaTransfer -@ stub NdisSystemProcessorCount +@ stdcall NdisSystemProcessorCount() @ stub NdisTerminateWrapper @ stub NdisTransferData @ stub NdisUnchainBufferAtBack diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index aa77d9a..ffa1396 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -33,5 +33,6 @@ typedef struct _NDIS_SPIN_LOCK NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0

Andrew Eikum : xaudio2: Always set current OpenAL context before making AL calls.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 8389f893b9961a839c3cfc287924441eccab11e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8389f893b9961a839c3cfc287… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 6 14:48:18 2016 -0500 xaudio2: Always set current OpenAL context before making AL calls. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49078e00a51876df38d0c572193195be6700bad0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 70ed8d6..05decdd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -38,6 +38,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static ALCdevice *(ALC_APIENTRY *palcLoopbackOpenDeviceSOFT)(const ALCchar*); static void (ALC_APIENTRY *palcRenderSamplesSOFT)(ALCdevice*, ALCvoid*, ALCsizei); +static ALCboolean (ALC_APIENTRY *palcSetThreadContext)(ALCcontext*); static HINSTANCE instance; @@ -103,6 +104,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) return FALSE; } + if(!alcIsExtensionPresent(NULL, "ALC_EXT_thread_local_context") || + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ + ERR("XAudio2 requires the ALC_EXT_thread_local_context extension (OpenAL-Soft >= 1.12)\n"); + return FALSE; + } + break; } return TRUE; @@ -309,6 +316,8 @@ static HRESULT WINAPI XA2SRC_SetVolume(IXAudio2SourceVoice *iface, float Volume, al_gain = Volume; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); return S_OK; @@ -362,6 +371,8 @@ static void WINAPI XA2SRC_DestroyVoice(IXAudio2SourceVoice *iface) TRACE("%p\n", This); + palcSetThreadContext(This->xa2->al_ctx); + EnterCriticalSection(&This->lock); if(!This->in_use){ @@ -722,6 +733,8 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, else r = Ratio; + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_PITCH, r); return S_OK; @@ -734,6 +747,8 @@ static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *p TRACE("%p, %p\n", This, pRatio); + palcSetThreadContext(This->xa2->al_ctx); + alGetSourcef(This->al_src, AL_PITCH, &ratio); *pRatio = ratio; @@ -1364,6 +1379,8 @@ static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, dump_fmt(pSourceFormat); + palcSetThreadContext(This->al_ctx); + EnterCriticalSection(&This->lock); LIST_FOR_EACH_ENTRY(src, &This->source_voices, XA2SourceImpl, entry){ @@ -1721,12 +1738,6 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, goto exit; } - if(alcMakeContextCurrent(This->al_ctx) == ALC_FALSE){ - WARN("alcMakeContextCurrent failed\n"); - hr = COMPAT_E_DEVICE_INVALIDATED; - goto exit; - } - hr = IAudioClient_Start(This->aclient); if (FAILED(hr)) { @@ -2412,6 +2423,8 @@ static DWORD WINAPI engine_threadproc(void *arg) continue; } + palcSetThreadContext(This->al_ctx); + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Piotr Caban : msvcrt: Return error when previously parsed type is accessed while demangling simple data type.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 31b09cda4a4ca7b960ff8157c289ce13754824f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b09cda4a4ca7b960ff8157c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2016 +0200 msvcrt: Return error when previously parsed type is accessed while demangling simple data type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42c2799589ae7f805e5f67a2b04f24e4aa3e0b34) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index beaec4f..ec2c2dd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -904,6 +904,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done;

1 0

Justas Lavišius : include: Force stack alignment on x86_64.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 13940871b7c820ad19a405194f1d91d4cdae2cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=13940871b7c820ad19a405194… Author: Justas Lavišius <bucaneer(a)gmail.com> Date: Wed Jan 27 17:35:29 2016 +0200 include: Force stack alignment on x86_64. Signed-off-by: Justas Lavišius <bucaneer(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dccb57dfd9c668eff5e672def93405be8a3303bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/windef.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index e914726..1e54fcb 100644 --- a/include/windef.h +++ b/include/windef.h @@ -64,7 +64,11 @@ extern "C" { # error You need to define __stdcall for your compiler # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((ms_abi)) +# endif # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -78,7 +82,11 @@ extern "C" { # define __cdecl __attribute__((__cdecl__)) # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __cdecl __attribute__((ms_abi)) +# endif # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Michael Stefaniuc : tools: Get the bug list for ANNOUNCE from the stable-notes git notes.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: e83b4681b7c4a3894d29bb32bce7528b14c9f018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83b4681b7c4a3894d29bb32b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 29 01:32:21 2016 +0200 tools: Get the bug list for ANNOUNCE from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index fedbc37..9ebeb10 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; binmode STDOUT, ':utf8'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . "..stable" or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Jean-Christophe Cardot : winhlp32: Replace magic numbers by symbols.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 51e25fb82d0e246a3f5a016b3588698b2f084420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e25fb82d0e246a3f5a016b3… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:07 2016 +0200 winhlp32: Replace magic numbers by symbols. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 58f16273c307a240d7c149adbd2f9f7ced0e5d70) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 24 ++++++++++++------------ programs/winhlp32/hlpfile.h | 5 +++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3669d11..bc422d3 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1270,13 +1270,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); *parlen = fetch_ushort(&format); } - if (buf[0x14] == 0x23) + if (buf[0x14] == HLP_TABLE) { char type; @@ -1338,7 +1338,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } else nc++; - if (buf[0x14] == 0x01) + if (buf[0x14] == HLP_DISPLAY30) format += 6; else format += 4; @@ -1811,12 +1811,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: if (count++) goto done; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; if (relative > index * 0x8000 + offs) rd->char_pos_rel = rd->char_pos; @@ -2617,7 +2617,7 @@ static BOOL HLPFILE_SkipParagraph(HLPFILE *hlpfile, const BYTE *buf, const BYTE if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; tmp = buf + 0x15; - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&tmp); *len = fetch_ushort(&tmp); @@ -2692,7 +2692,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: /* Topic Header */ if (hlpfile->version <= 16) topicoffset = ref + index * 12; else @@ -2700,9 +2700,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE; offs += len; break; diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index c3fa4b0..6c40c3a 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -199,3 +199,8 @@ struct RtfData { BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, unsigned font_scale, unsigned relative); + +#define HLP_DISPLAY30 0x01 /* version 3.0 displayable information */ +#define HLP_TOPICHDR 0x02 /* topic header information */ +#define HLP_DISPLAY 0x20 /* version 3.1 displayable information */ +#define HLP_TABLE 0x23 /* version 3.1 table */

1 0

Jean-Christophe Cardot : winhlp32: Add some trace calls.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: dfcc043e0cc8c448087574bb2fa5bc908b7ca4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcc043e0cc8c448087574bb2… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:08 2016 +0200 winhlp32: Add some trace calls. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae56f3d093c84b47248be6a66cebd58c0bb59668) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index bc422d3..6a00235 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -705,6 +705,7 @@ static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t static BOOL HLPFILE_RtfAddControl(struct RtfData* rd, const char* str) { + WINE_TRACE("%s\n", debugstr_a(str)); if (*str == '\\' || *str == '{') rd->in_text = FALSE; else if (*str == '}') rd->in_text = TRUE; return HLPFILE_RtfAddRawString(rd, str, strlen(str)); @@ -1270,6 +1271,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); + WINE_TRACE("Record type (buf[0x14]) = 0x%x\n", buf[0x14]); + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); @@ -1452,13 +1455,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; + WINE_TRACE("format=%02x\n", *format); if (*format == 0xff) { format++; break; } - WINE_TRACE("format=%02x\n", *format); switch (*format) { case 0x20:

1 0

Jean-Christophe Cardot : winhlp32: Add a warning trace.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 5803a62f195036960f393eddb41bbe545bad78b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5803a62f195036960f393eddb… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:09 2016 +0200 winhlp32: Add a warning trace. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d55cb801bcbef7b61b25906e12d056f0b40a52ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 6a00235..b2e69e3 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1632,6 +1632,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE3: case 0xE6: case 0xE7: + WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, page->file->lpszPath, -1, GET_UINT(format, 1), !(*format & 4), FALSE, -1);

1 0

Jean-Christophe Cardot : winhlp32: Prepare winhlp32 for more font types.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: d93592cdc8d205a40f04659901f784435a8f34e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93592cdc8d205a40f0465990… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:10 2016 +0200 winhlp32: Prepare winhlp32 for more font types. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5200dc9b05c5919c9d03b34f75f63c544ba0d372) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 20 ++++++++++++++++++++ programs/winhlp32/hlpfile.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index b2e69e3..3acd8a3 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1877,6 +1877,26 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) hlpfile->fonts = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_FONT) * dscr_num); len = (dscr_offset - face_offset) / face_num; + + /* mvb font */ + if (face_offset >= 16) + { + hlpfile->scale = 1; + hlpfile->rounderr = 0; + WINE_FIXME("mvb font: not implemented\n"); + return FALSE; + } + /* new font */ + if (face_offset >= 12) + { + hlpfile->scale = 1; + hlpfile->rounderr = 0; + WINE_FIXME("new font: not implemented\n"); + return FALSE; + } + /* old font */ + hlpfile->scale = 10; + hlpfile->rounderr = 5; /* EPP for (i = face_offset; i < dscr_offset; i += len) */ /* EPP WINE_FIXME("[%d]: %*s\n", i / len, len, ref + i); */ for (i = 0; i < dscr_num; i++) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index 6c40c3a..55ef681 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -149,6 +149,9 @@ typedef struct tagHlpFileFile COLORREF popup_color; LPSTR help_on_file; + + int scale; + int rounderr; } HLPFILE; /*

1 0

Jean-Christophe Cardot : winhlp32: Rework and rename HLPFILE_HalfPointsToTwips.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: bab2800931a3835411a5c79094748fa10b097e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab2800931a3835411a5c7909… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:11 2016 +0200 winhlp32: Rework and rename HLPFILE_HalfPointsToTwips. HLPFILE_HalfPointsToTwips was performing a useless transformation of the RTF measures, using a hardcoded 72 DPI. As winhlp32 makes use of the richedit component, it is counter productive to transform the measures, as this is taken care of by richedit himself. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a01c003007f6b2a7e53f6d726384d584710f1966) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3acd8a3..8ea5577 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1211,16 +1211,9 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } -static unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +static unsigned HLPFILE_HalfPointsScale(HLPFILE_PAGE* page, unsigned pts) { - static unsigned logPxY; - if (!logPxY) - { - HDC hdc = GetDC(NULL); - logPxY = GetDeviceCaps(hdc, LOGPIXELSY); - ReleaseDC(NULL, hdc); - } - return MulDiv(pts, 72 * 10, logPxY); + return pts * page->file->scale - page->file->rounderr; } /*********************************************************************** @@ -1301,10 +1294,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1312,7 +1305,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1321,8 +1314,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } @@ -1349,32 +1342,32 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) { - sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0004) { - sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0008) { - sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0010) { - sprintf(tmp, "\\li%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\li%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0020) { - sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0040) { - sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0100) @@ -1395,7 +1388,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, w = GET_SHORT(format, 0); format += 2; if (w) { - sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsToTwips(w)); + sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsScale(page, w)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1419,7 +1412,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } /* FIXME: do kind */ sprintf(tmp, "%s\\tx%d", - kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + kind, HLPFILE_HalfPointsScale(page, tab & 0x3FFF)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } }

1 0