Version 9.7.10

Author: papyrussolution

Src/Doc/VERSION.TXT

@@ -14873,7 +14873,7 @@ Ver 1.2 Date 13/09/96
 	-FIX: {��������� ���������} ��������� ������ � ���������.
 	-FIX: {�������� ������} ��������� ������� ��������� ���������� �������� �������� ������ �� �� ��� �����.
 	  �������� ��������� ������������� ����� �����.
-08/08/2017 v9.7.10
+10/08/2017 v9.7.10
 	!- {�����-���������} ��������� ����������� �������� �����-���������� � ������������� ���������.
 	  ��� ���� ����������� ����� �����-��������� ���������� ����������� ������ ��������� ��������,
 	  � ���� ������ ���� ��������� �����-��������� ���������� � �������� ��������, �������, � ���� �������,
@@ -14882,6 +14882,7 @@ Ver 1.2 Date 13/09/96
 	  ������������ �� ���� ������� ����������� ���������� ������������������� ����������. ������ ��� �������
 	  ��������� ��� ������ ��������� ������������������� ������������ ���������� �� ������� �������� ��������.
 	  ������������ ���������� ���� �������� �� ������� ����������� ����� ��� ����� �������.
+	- {��� ��������� ���������} ��������� ������� ��������� ���� �������� (Ctrl-Q).
 	-FIX: {�������� �����-����������} [9.6.7] � ������� ����������� �������� ������������ ��������� ������ � ������� ��������.
 	-FIX: {�������� ������} ����� ���������������� ����� ������������ ��, ������� ���� ��������.
 	-FIX: {�����} ��� �������� ���������� � �������������� ���������� ��������� ����������� �� ����� ����������.

Src/Include/PPDBS.H

@@ -1,5 +1,5 @@
 // PPDBS.H
-// This file was generated by DL600C.EXE from 'd:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
+// This file was generated by DL600C.EXE from 'D:\Papyrus\Src\Rsrc\dl600\ppdbs.dl6'
 //
 #ifndef __PPDBS_H
 #define __PPDBS_H 

Src/Include/PPDEFS.H

@@ -8257,6 +8257,8 @@
 	#define CTL_EXTDEV_EGAISMODE        (21 + WINDOWS_ID_BIAS)
 	#define CTL_EXTDEV_MANUFSERIAL      (22 + WINDOWS_ID_BIAS)
 	#define CTL_EXTDEV_EXTNODEASALT     (23 + WINDOWS_ID_BIAS)
+	#define CTL_EXTDEV_ALTREG           (24 + WINDOWS_ID_BIAS)
+	#define CTLSEL_EXTDEV_ALTREG        (25 + WINDOWS_ID_BIAS)
 
 #define DLG_STAFFCALFLT           991 // F_STCAL Фильтр штатных календарей
 	#define cmStaffCalFiltObjList       101

Src/Include/Pp.h

@@ -17405,7 +17405,9 @@ class PPSyncCashNode : public PPGenCashNode {
 	PPID   CurSessID;        // ->Bill.ID Текущая кассовая сессия //
 	PPID   TouchScreenID;    //
 	PPID   ExtCashNodeID;    //
-	PPID   PapyrusNodeID_unused; // ИД кассового узла Папирус @v9.6.8 unused
+	//PPID   PapyrusNodeID_unused; // ИД кассового узла Папирус @v9.6.8 unused
+	PPID   AlternateRegID;   // @v9.7.10 Явно обозначенный альтернативный регистратор 
+		// (if ExtFlags & CASHFX_EXTNODEASALT && !AlternateRegID) то альтернативным регистратором является ExtCashNodeID
 	PPID   ScaleID;          //
 	PPID   CustDispType;     // Тип дисплея покупателя //
 	char   CustDispPort[8];  // Имя порта дисплея покупателя (COM)
@@ -19080,7 +19082,7 @@ class PPObjStyloPalm : public PPObjReference {
 	int    SLAPI GetPacket(PPID id, PPStyloPalmPacket * pPack);
 	int    SLAPI PutPacket(PPID * pID, PPStyloPalmPacket * pPack, int use_ta);
 	int    SLAPI CheckSignalForInput(const char * pPath);
-	int    SLAPI ClearInputSemaphore(const char * pPath);
+	void   SLAPI ClearInputSemaphore(const char * pPath);
 	int    SLAPI ReadInput(PPID id, PalmInputParam * pParam, long flags, PPLogger * pLogger, long * pOrdCount);
 		// @<<PPObjStyloPalm::ImportData, @<<PalmImportWaiter::Activate
 	int    SLAPI ExportData(const PalmPaneData & rParam);

Src/Include/Private/VERDATA.INC

@@ -1,14 +1,14 @@
 //
 // 	..\INCLUDE\PRIVATE\VERDATA.INC
-// 	2017-08-09T17:09:04
+// 	2017-08-10T19:11:29
 // 	Automaticaly generated file
 // 	Don't modify!
 //
 0x24, 0x00, 0x00, 0x00, 0x33, 0x30, 0x79, 0x61, 0x52, 0x42, 0x44, 0x33, 0x44, 0x4f, 0x57, 0x45, 0x68, 0x31, 0x52, 0x66, 0x56, 0x32, 0x70, 0x74, 0x74, 0x7a, 0x51, 0x4a, 0x50, 0x59, 0x7a, 0x44, 
-0x4a, 0x00, 0xe3, 0x58, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x56, 0xdb, 0x4b, 0x20, 0x4c, 0x5c, 0x5d, 0x89, 0x73, 0xc9, 0x03, 0x31, 0xcd, 0x84, 0xda, 0x76, 0x9c, 0x69, 
-0x2d, 0xbd, 0x6f, 0x66, 0x64, 0xb9, 0xd7, 0xc2, 0xec, 0xef, 0x71, 0x68, 0xa5, 0xfa, 0xe7, 0xf6, 0xbf, 0xec, 0x39, 0x1f, 0x4a, 0x95, 0xa4, 0x16, 0x12, 0x5a, 0x50, 0x0e, 0xdb, 0xc6, 0xc3, 0x37, 
-0x25, 0xa2, 0x0a, 0x62, 0xfe, 0x64, 0xe1, 0xe7, 0x1f, 0x66, 0xea, 0xb2, 0x75, 0x36, 0x3b, 0xe7, 0xad, 0xc1, 0xe2, 0x17, 0x1f, 0x1d, 0xaa, 0x8a, 0xd9, 0x0d, 0x41, 0x71, 0x82, 0x02, 0x7c, 0xa5, 
-0xa0, 0x24, 0xf9, 0x7d, 0xd7, 0x8b, 0xa4, 0xac, 0xb0, 0xa3, 0x0c, 0x7f, 0x91, 0xc5, 0xc2, 0x71, 0x9f, 0xb2, 0xc4, 0xbf, 0x97, 0x32, 0xe6, 0x04, 0x9d, 0xf7, 0xf9, 0x6b, 0x34, 0x1f, 0xfa, 0x42, 
-0xdc, 0xfa, 0xd4, 0x98, 0xaa, 0x5d, 0xa8, 0x56, 0x28, 0x44, 0xea, 0x10, 0xdb, 0xea, 0xd5, 0xa3, 0xf9, 0x5e, 0xf0, 0x60, 0x7e, 0x0b, 0x0a, 0x9d, 0x87, 0x28, 0x09, 0x79, 0x79, 0xb9, 0x83, 0xf1, 
-0xbf, 0xa2, 0x16, 0x7e, 0x93, 0x82, 0xf4, 0x74, 0x1a, 0xbb, 0xff, 0x24, 0xfa, 0x59, 0x75, 0xff, 0x6e, 0xd6, 0xd4, 0x85, 0x85, 0x20, 0xca, 0x5a, 0xe1, 0x05, 0xb5, 0x5a, 0x26, 0x9f, 0x5e, 0xd5, 
-0xf7, 0x9a, 0x48, 0xbf, 0x18, 0x0d, 0x8a, 0x70, 0x32, 0xa3, 0xc6, 0x2d, 0xd1, 0xe2, 0x5b, 0xd6, 0x06, 0xe0, 0xcb, 0x2f, 0xad, 0x2c, 0xcd, 0xde, 0xbd, 0x4c, 0x89, 0x35, 0xe2, 0x6d, 0x03, 0xe6
+0x4a, 0x00, 0x85, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x21, 0xb3, 0x60, 0x0c, 0xca, 0x1c, 0x56, 0xdb, 0x4b, 0x20, 0x4c, 0x5c, 0x5d, 0x89, 0x73, 0xc9, 0x03, 0x31, 0xc1, 0x84, 0xda, 0x76, 0x9c, 0x69, 
+0x77, 0xfe, 0x7a, 0xad, 0x6c, 0x61, 0xad, 0xa0, 0x34, 0xdc, 0x7b, 0x0a, 0x0b, 0x1c, 0x2c, 0xd1, 0x1c, 0x2b, 0x03, 0x3c, 0x8b, 0x77, 0xfa, 0x40, 0x1e, 0xf3, 0xc6, 0xa8, 0x1e, 0x81, 0x75, 0x65, 
+0xdd, 0x33, 0xa7, 0x30, 0xda, 0xf3, 0x1c, 0x4a, 0xdd, 0x4d, 0x8f, 0xae, 0x3c, 0xe2, 0x48, 0xde, 0x35, 0x2e, 0x74, 0xb6, 0xc6, 0xbf, 0x6c, 0x68, 0xc5, 0x1a, 0xfd, 0xb0, 0xe4, 0xe3, 0xce, 0x24, 
+0x74, 0xfe, 0x14, 0xb8, 0x68, 0x1a, 0xa3, 0x6b, 0x03, 0x31, 0x70, 0xd4, 0x78, 0xc0, 0xaf, 0x5a, 0x29, 0x75, 0xee, 0x4b, 0x31, 0xc3, 0x3a, 0xcf, 0xa4, 0x4a, 0xca, 0x8a, 0xa0, 0x74, 0x9f, 0x05, 
+0x4b, 0x4c, 0x41, 0xe2, 0x9d, 0x2f, 0x58, 0x09, 0x80, 0xe3, 0x73, 0x9b, 0x64, 0x37, 0xe0, 0x54, 0x67, 0x13, 0xb4, 0xf6, 0xf3, 0xf8, 0x13, 0x26, 0x6e, 0x31, 0x0b, 0xb4, 0x99, 0x50, 0x61, 0x82, 
+0x77, 0xb4, 0x9c, 0xbf, 0xe2, 0x2f, 0xa5, 0xfc, 0x80, 0xc5, 0x93, 0x39, 0x4c, 0x77, 0xaf, 0x64, 0x9f, 0x04, 0x94, 0x75, 0x1f, 0xdb, 0xff, 0xa7, 0x6f, 0x9f, 0x01, 0x83, 0xcf, 0x2a, 0x53, 0x31, 
+0x2c, 0xf9, 0x22, 0x16, 0x60, 0x3c, 0x8d, 0x9b, 0x05, 0x6a, 0x37, 0xe0, 0x40, 0xea, 0x78, 0x91, 0x17, 0x6a, 0x84, 0x66, 0x7a, 0x88, 0xa5, 0x39, 0xb1, 0x78, 0x78, 0xfb, 0x54, 0x60, 0xaa, 0x97

Src/Include/json.h

@@ -89,8 +89,17 @@ struct json_t {
 	};
 	json_t(int aType);
 	~json_t();
+	void   FASTCALL AssignAllocatedText(RcString * pRcs)
+	{
+		assert(pRcs);
+		if(pRcs) {
+			Text = pRcs->P_Text;
+			SAlloc::F(pRcs);
+		}
+	}
 	int    Type; // the type of node
-	char * P_Text; // The text stored by the node. It stores UTF-8 strings and is used exclusively by the json_t::tSTRING and JSON_NUMBER node types
+	//char * P_Text; // The text stored by the node. It stores UTF-8 strings and is used exclusively by the json_t::tSTRING and JSON_NUMBER node types
+	SString Text;
 	//
 	// FIFO queue data
 	//
@@ -218,7 +227,7 @@ enum json_error json_tree_to_string(json_t * root, char **text);
 // @param root The document's root node
 // @return  a json_error code describing how the operation went
 //
-enum json_error json_stream_output(FILE * file, json_t * root);
+enum json_error json_stream_output(/*FILE * file,*/json_t * root, SString & rBuf);
 //
 // Strips all JSON white spaces from the text string
 // @param text a char string holding a JSON document or document snippet
@@ -235,15 +244,15 @@ char *json_format_string(const char *text);
 // @param text an UTF8 char text string
 // @return an UTF-8 c-string holding the same text string but with escaped characters
 //
-char * json_escape(const char *text);
+// @v9.7.10 @obsolte char * json_escape(const char *text);
 //
 // Outputs a new UTF-8 c-string which has all escaped characters replaced by
 // their unescaped, UTF-8 encoded variants.
 //
 // @param test a UTF-8 c-string
 // @return a newly allocated UTF-8 c-string; free with free()
 //
-char * json_unescape(char *text);
+// @v9.7.10 @obsolte char * json_unescape(char *text);
 //
 // This function takes care of the tedious task of initializing any instance of json_parsing_info
 // @param jpi a pointer to a struct json_parsing_info instance
@@ -281,7 +290,7 @@ json_t *json_find_first_label(const json_t * object, const char *text_label);
 //
 // Helper
 //
-char   * json_get_value(const json_t *object, const char *text_label);
+const char * json_get_value(const json_t *object, const char *text_label);
 json_t * json_process(json_t *object);
 
 #ifdef __cplusplus

Src/OSF/CAIRO/SRC/1.14.2/cairo-scaled-font-subsets.c

@@ -1133,7 +1133,7 @@ cairo_int_status_t _cairo_scaled_font_subset_create_glyph_names(cairo_scaled_fon
 				snprintf(buf, sizeof(buf), "uni%04X", (int)utf16[0]);
 			_cairo_string_init_key(&key, buf);
 			entry = (cairo_string_entry_t *)_cairo_hash_table_lookup(names, &key.base);
-			if(entry != NULL)
+			if(entry)
 				snprintf(buf, sizeof(buf), "g%d", i);
 		}
 		else {

Src/OSF/CAIRO/SRC/1.14.2/cairo-xcb-screen.c

@@ -387,59 +387,43 @@ cairo_status_t _cairo_xcb_screen_store_linear_picture(cairo_xcb_screen_t * scree
 	return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_surface_t * _cairo_xcb_screen_lookup_linear_picture(cairo_xcb_screen_t * screen,
-    const cairo_linear_pattern_t * linear)
+cairo_surface_t * _cairo_xcb_screen_lookup_linear_picture(cairo_xcb_screen_t * screen, const cairo_linear_pattern_t * linear)
 {
 	cairo_surface_t * picture = NULL;
 	struct pattern_cache_entry tmpl;
-
 	struct pattern_cache_entry * entry;
-
 	assert(CAIRO_MUTEX_IS_LOCKED(screen->connection->device.mutex));
-
 	tmpl.key.hash = _cairo_linear_pattern_hash(_CAIRO_HASH_INIT_VALUE, linear);
 	_cairo_pattern_init_static_copy(&tmpl.pattern.base, &linear->base.base);
-
 	entry = _cairo_cache_lookup(&screen->linear_pattern_cache, &tmpl.key);
-	if(entry != NULL)
+	if(entry)
 		picture = cairo_surface_reference(entry->picture);
-
 	return picture;
 }
 
-cairo_status_t _cairo_xcb_screen_store_radial_picture(cairo_xcb_screen_t * screen,
-    const cairo_radial_pattern_t * radial,
-    cairo_surface_t * picture)
+cairo_status_t _cairo_xcb_screen_store_radial_picture(cairo_xcb_screen_t * screen, const cairo_radial_pattern_t * radial, cairo_surface_t * picture)
 {
 	struct pattern_cache_entry * entry;
-
 	cairo_status_t status;
-
 	assert(CAIRO_MUTEX_IS_LOCKED(screen->connection->device.mutex));
-
 	entry = _cairo_freelist_alloc(&screen->pattern_cache_entry_freelist);
 	if(unlikely(entry == NULL))
 		return _cairo_error(CAIRO_STATUS_NO_MEMORY);
-
 	entry->key.hash = _cairo_radial_pattern_hash(_CAIRO_HASH_INIT_VALUE, radial);
 	entry->key.size = 1;
-
 	status = _cairo_pattern_init_copy(&entry->pattern.base, &radial->base.base);
 	if(unlikely(status)) {
 		_cairo_freelist_free(&screen->pattern_cache_entry_freelist, entry);
 		return status;
 	}
-
 	entry->picture = cairo_surface_reference(picture);
 	entry->screen = screen;
-
 	status = _cairo_cache_insert(&screen->radial_pattern_cache, &entry->key);
 	if(unlikely(status)) {
 		cairo_surface_destroy(picture);
 		_cairo_freelist_free(&screen->pattern_cache_entry_freelist, entry);
 		return status;
 	}
-
 	return CAIRO_STATUS_SUCCESS;
 }
 
@@ -457,7 +441,7 @@ cairo_surface_t * _cairo_xcb_screen_lookup_radial_picture(cairo_xcb_screen_t * s
 	_cairo_pattern_init_static_copy(&tmpl.pattern.base, &radial->base.base);
 
 	entry = _cairo_cache_lookup(&screen->radial_pattern_cache, &tmpl.key);
-	if(entry != NULL)
+	if(entry)
 		picture = cairo_surface_reference(entry->picture);
 
 	return picture;