• R/O
  • HTTP
  • SSH
  • HTTPS

timidity41: Commit


Commit MetaInfo

Révision93c9f3744a635672bfbe105df676978c2beccc8a (tree)
l'heure2021-09-01 19:55:18
AuteurStarg <starg@user...>
CommiterStarg

Message de Log

Merge branch 'dev41' into unicode

Change Summary

Modification

--- a/interface/w32g_new_console.cpp
+++ b/interface/w32g_new_console.cpp
@@ -77,21 +77,29 @@ bool CopyTextToClipboard(TStringView text)
7777 if (hGlobal)
7878 {
7979 auto p = reinterpret_cast<LPTSTR>(::GlobalLock(hGlobal));
80- text.copy(p, text.size());
81- p[text.size()] = _T('\0');
82- ::GlobalUnlock(hGlobal);
8380
84- ::EmptyClipboard();
81+ if (p)
82+ {
83+ text.copy(p, text.size());
84+ p[text.size()] = _T('\0');
85+ ::GlobalUnlock(hGlobal);
86+
87+ ::EmptyClipboard();
8588
8689 #ifdef UNICODE
87- UINT format = CF_UNICODETEXT;
90+ UINT format = CF_UNICODETEXT;
8891 #else
89- UINT format = CF_TEXT;
92+ UINT format = CF_TEXT;
9093 #endif
9194
92- if (::SetClipboardData(format, hGlobal))
93- {
94- ret = true;
95+ if (::SetClipboardData(format, hGlobal))
96+ {
97+ ret = true;
98+ }
99+ else
100+ {
101+ ::GlobalFree(hGlobal);
102+ }
95103 }
96104 else
97105 {
--- a/interface/w32g_subwin3.c
+++ b/interface/w32g_subwin3.c
@@ -2514,6 +2514,8 @@ TracerCanvasWndProc(HWND hwnd, UINT uMess, WPARAM wParam, LPARAM lParam)
25142514 NULL
25152515 );
25162516
2517+ SetWindowPos(w32g_tracer_wnd.hTool, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
2518+
25172519 TTTOOLINFO ti = {0};
25182520 ti.cbSize = sizeof(ti);
25192521 ti.uFlags = TTF_SUBCLASS;
--- a/ogg/include/ogg/os_types.h
+++ b/ogg/include/ogg/os_types.h
@@ -72,11 +72,11 @@
7272
7373 # include <sys/types.h>
7474 typedef int16_t ogg_int16_t;
75- typedef uint16_t ogg_uint16_t;
75+ typedef u_int16_t ogg_uint16_t;
7676 typedef int32_t ogg_int32_t;
77- typedef uint32_t ogg_uint32_t;
77+ typedef u_int32_t ogg_uint32_t;
7878 typedef int64_t ogg_int64_t;
79- typedef uint64_t ogg_uint64_t;
79+ typedef u_int64_t ogg_uint64_t;
8080
8181 #elif defined(__HAIKU__)
8282
--- a/ogg/src/framing.c
+++ b/ogg/src/framing.c
@@ -597,9 +597,14 @@ char *ogg_sync_buffer(ogg_sync_state *oy, long size){
597597
598598 if(size>oy->storage-oy->fill){
599599 /* We need to extend the internal buffer */
600- long newsize=size+oy->fill+4096; /* an extra page to be nice */
600+ long newsize;
601601 void *ret;
602602
603+ if(size>INT_MAX-4096-oy->fill){
604+ ogg_sync_clear(oy);
605+ return NULL;
606+ }
607+ newsize=size+oy->fill+4096; /* an extra page to be nice */
603608 if(oy->data)
604609 ret=_ogg_realloc(oy->data,newsize);
605610 else
@@ -1564,7 +1569,7 @@ void test_pack(const int *pl, const int **headers, int byteskip,
15641569 byteskipcount=byteskip;
15651570 }
15661571
1567- ogg_sync_wrote(&oy,next-buf);
1572+ ogg_sync_wrote(&oy,(long)(next-buf));
15681573
15691574 while(1){
15701575 int ret=ogg_sync_pageout(&oy,&og_de);
--- a/timidity/filter.c
+++ b/timidity/filter.c
@@ -4099,7 +4099,7 @@ static void sample_filter_LPF24_batch(int batch_size, FILTER_T **dcs, FILTER_T *
40994099 _mm_castsi128_pd(_mm_unpackhi_epi32(vmask32, vmask32)),
41004100 1
41014101 );
4102- vdas[0] = _mm256_sub_pd(vsps[k], _mm256_mul_pd(vdc2, vdb4));
4102+ vdas[0] = _mm256_sub_pd(vsps[k], _mm256_mul_pd(vdc[2], vdb[4]));
41034103 #endif
41044104
41054105 vdas[1] = vdb[1];
Afficher sur ancien navigateur de dépôt.