Skip to content

Commit

Permalink
Revision 34 Version 12
Browse files Browse the repository at this point in the history
Remove a bug from Rev 34, and fix printing for One Note for Windows
  • Loading branch information
M2000Interpreter committed Aug 3, 2023
1 parent 7b6acc2 commit 6fda929
Show file tree
Hide file tree
Showing 11 changed files with 634 additions and 628 deletions.
Binary file modified M2000.TLB
Binary file not shown.
1,054 changes: 527 additions & 527 deletions M2000.VBR

Large diffs are not rendered by default.

Binary file modified M2000.exp
Binary file not shown.
Binary file modified M2000.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion M2000.vbp
Expand Up @@ -150,7 +150,7 @@ HelpContextID="0"
CompatibleMode="0"
CompatibleEXE32="m2000.exe"
MajorVer=12
MinorVer=33
MinorVer=34
RevisionVer=0
AutoIncrementVer=0
ServerSupportFiles=1
Expand Down
6 changes: 3 additions & 3 deletions M2000.vbw
Expand Up @@ -10,12 +10,12 @@ Module6 = 52, 52, 900, 549,
databaseX = 26, 26, 874, 523,
Module3 = 0, 0, 848, 497,
gpp1 = 69, 19, 917, 516,
AnyPrinter = 0, 0, 848, 497, C
AnyPrinter = 0, 0, 848, 497,
Module5 = 104, 104, 952, 601,
Module2 = 114, 26, 1108, 523,
PicHandler = 78, 78, 926, 575,
Module4 = 234, 234, 1082, 731,
cDIBSection = 0, 0, 848, 497,
cDIBSection = 0, 0, 848, 497, Z
clsProfiler = 52, 52, 900, 549, C
coder = 26, 27, 874, 523, C
counter = 0, 0, 848, 497,
Expand Down Expand Up @@ -51,7 +51,7 @@ Group = 0, 0, 848, 497,
stdCallFunction = 0, 0, 848, 497,
mdlIDispatch = 109, 62, 957, 559,
PropReference = 26, 26, 874, 523,
Module1 = 72, 215, 920, 712, Z
Module1 = 72, 215, 920, 712,
MyPopUp = 208, 208, 1056, 705, C, 260, 260, 900, 835, C
Module7 = 0, 0, 848, 497,
cJpeg = 0, 0, 848, 497,
Expand Down
2 changes: 1 addition & 1 deletion Mod_Text.bas
Expand Up @@ -98,7 +98,7 @@ Public TestShowBypass As Boolean, TestShowSubLast As String
Public feedback$, FeedbackExec$, feednow$ ' for about$
Global Const VerMajor = 12
Global Const VerMinor = 0
Global Const Revision = 33
Global Const Revision = 34
Private Const doc = "Document"
Public UserCodePage As Long, DefCodePage As Long
Public cLine As String ' it was public in form1
Expand Down
182 changes: 93 additions & 89 deletions cDIBSection.cls

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions gpp1.bas
Expand Up @@ -190,8 +190,8 @@ End Sub
Exit Function
End If

If UBound(adevmode) <> nSize + 6000 Then
ReDim adevmode(1 To nSize + 6000) As Byte
If UBound(adevmode) <> nSize + 20000 Then
ReDim adevmode(1 To nSize + 20000) As Byte

nSize = DocumentProperties(NULLPTR, hPrinter, szPrinterName, adevmode(1), ByVal NULLPTR, DM_OUT_BUFFER)

Expand Down Expand Up @@ -292,8 +292,8 @@ Function ChangeOrientation(f As Object, szPrinterName As String, adevmode() As B
ChangeOrientation = False
Exit Function
End If
If UBound(adevmode) <> nSize + 6000 Then
ReDim adevmode(1 To nSize + 6000) As Byte
If UBound(adevmode) <> nSize + 20000 Then
ReDim adevmode(1 To nSize + 20000) As Byte

nSize = DocumentProperties(NULLPTR, hPrinter, szPrinterName, adevmode(1), ByVal NULLPTR, DM_OUT_BUFFER)

Expand Down
2 changes: 1 addition & 1 deletion mArray.cls
Expand Up @@ -1854,7 +1854,7 @@ If Not GroupRef Is Nothing Then
Dim usehandler As mHandler
Set usehandler = GroupRef
If usehandler.t1 = 1 Then
usehandler.objref.Index = Abs(curitem + 6000)
usehandler.objref.Index = Abs(curitem + 100)
usehandler.objref.Done = True
Set usehandler.objref.ValueObj = item
Exit Property
Expand Down
6 changes: 4 additions & 2 deletions readme.txt
@@ -1,7 +1,9 @@
M2000 Interpreter and Environment

Version 12 Revision 33 active-X
Expand buffer for printer data an additional 6000 bytes, because some printers DevMode size is bigger than the calculated one from DocumentProperties() function from winspool.drv.
Version 12 Revision 34 active-X
1. Remove a bug from rev 33, so now eertree module run as expected.
2. Now print to One Note for Windows 10 works. I found the need for placing a document name to printer, which some other printers not needed - like "Microsoft Print to PDF" which works with empty document name. So now M2000 insert a dummy documen name "M2000 printing" and we get the printout.


George Karras, Kallithea Attikis, Greece.
fotodigitallab@gmail.com
Expand Down

0 comments on commit 6fda929

Please sign in to comment.