Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
371 changes: 219 additions & 152 deletions .github/workflows/main.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Pythonwin/Win32uiHostGlue.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// be in synch! Use a version number to check this.
#define WIN32UIHOSTGLUE_VERSION 3

#include "pywintypes.h"
#include "PyWinTypes.h"

class Win32uiHostGlue : public CObject {
public:
Expand Down
2 changes: 1 addition & 1 deletion Pythonwin/dllmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "stdafx.h"
#include "afxdllx.h"

#include "win32uiHostGlue.h"
#include "Win32uiHostGlue.h"

static HWND GetConsoleHwnd(void);

Expand Down
4 changes: 2 additions & 2 deletions Pythonwin/doc/EmbeddingWin32ui.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ <H3>Subclass a Win32uiHostGlue class </H3>
<P>You must instantiate a Win32uiHostGlue class. This class is used as a glue between win32ui.pyd and the host .exe, and is defined in Win32uiHostGlue.h </P>
<P>Currently, this consists of about 5 methods that must be called by your application. The principle is that the Application must hook certain handlers, and delegate them to the HostGlue class. This will ensure the appropriate Win32ui internals are called. </P>
<H2>Embedding win32ui Architecture </H2>
<H3>win32uihostglue.h</H3>
<P>The win32uihostglue.h module defines a class which makes interfacing fairly simple. This Win32uiHostGlue class is used as a glue between win32ui.pyd and the host .exe. In the most simple case, you need to instantiate one of the classes, and at certain key points in your CWinApp derived class, call the appropriate methods. You may choose to provide your own glue class derived from Win32uiHostGlue in certain cases. </P>
<H3>Win32uiHostGlue.h</H3>
<P>The Win32uiHostGlue.h module defines a class which makes interfacing fairly simple. This Win32uiHostGlue class is used as a glue between win32ui.pyd and the host .exe. In the most simple case, you need to instantiate one of the classes, and at certain key points in your CWinApp derived class, call the appropriate methods. You may choose to provide your own glue class derived from Win32uiHostGlue in certain cases. </P>
<P>Below is an example class, which overrides the "SetStatusText" method, so that status information displays in the applications status bar (this is only necessary if your application has a "non standard" status bar - normally you could omit this.). </P>
<PRE>GameApp NEAR theApp; // My existing CWinApp derived class.
// HostGlue class.
Expand Down
2 changes: 1 addition & 1 deletion Pythonwin/pythonwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "stdafxpw.h"
#include "pythonwin.h"
#include "win32uiHostGlue.h"
#include "Win32uiHostGlue.h"

#ifdef _DEBUG
#undef THIS_FILE
Expand Down
2 changes: 1 addition & 1 deletion Pythonwin/pywin/test/test_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def setUp(self):
# install w symlink. This works only when cwd is set to the dir of
# python.exe / exec_prefix.

# XXX Pythonwin.exe / win32uihostglue.h could be improved to search
# XXX Pythonwin.exe / Win32uiHostGlue.h could be improved to search
# the Python DLL itself via registry when local / relative search fails.

pydll = f"Python{sys.version_info.major}{sys.version_info.minor}.dll" # same for 32bit
Expand Down
4 changes: 2 additions & 2 deletions Pythonwin/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ programmers who forget to use the new names. */
#include "pythonrun.h"
#include "import.h" // Python: for dynamicattach routines.

#include "pywintypes.h"
#include "PyWinTypes.h"
// don't need all of these for all, but it can't hurt (and keep the speed up!)

#include "win32ui.h"
Expand All @@ -48,6 +48,6 @@ programmers who forget to use the new names. */

#include "win32assoc.h"
#include "win32cmd.h"
#include "win32app.h"
#include "Win32app.h"

// --- EOF --- //
2 changes: 1 addition & 1 deletion Pythonwin/stdafxdde.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// The Pythonwin stuff
#include "oleauto.h"
#include "pywintypes.h"
#include "PyWinTypes.h"
#include "win32ui.h"
#include "win32assoc.h"

Expand Down
2 changes: 1 addition & 1 deletion Pythonwin/stdafxole.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

// don't need all of these for all, but it can't hurt (and keep the speed up!)

#include "pywintypes.h"
#include "PyWinTypes.h"
#include "win32ui.h"
#include "win32assoc.h"
#include "win32cmd.h"
Expand Down
4 changes: 2 additions & 2 deletions Pythonwin/win32oleDlgInsert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "win32dlg.h"
#include "win32oleDlgs.h"
#include "pythoncom.h"
#include "pywintypes.h"
#include "PythonCOM.h"
#include "PyWinTypes.h"
// @doc

// XXX - is this actually used?????????
Expand Down
4 changes: 2 additions & 2 deletions Pythonwin/win32uimodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ generates Windows .hlp files.
*/
#include "stdafx.h"
#include <commdlg.h>
#include "win32uiHostGlue.h"
#include "Win32uiHostGlue.h"
#include "win32win.h"
#include "win32control.h"
#include "win32doc.h"
Expand Down Expand Up @@ -705,7 +705,7 @@ PyObject *Python_do_callback(PyObject *themeth, PyObject *thearglst)
return result;
}

// Copied from PyRecord.cpp, should move into pywintypes.h
// Copied from PyRecord.cpp, should move into PyWinTypes.h
// Unicode versions of '_Concat' etc have different sigs. Make them the
// same here...
void PyWinCoreString_Concat(register PyObject **pv, register PyObject *w)
Expand Down
4 changes: 2 additions & 2 deletions Pythonwin/win32uioledoc.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "stdafxole.h"
#include "win32app.h"
#include "Win32app.h"
#include "win32uioledoc.h"
#include "win32template.h"
#include "pywintypes.h"
#include "PyWinTypes.h"
//
// OLE Document Object
//
Expand Down
13 changes: 13 additions & 0 deletions build_mingw.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env pwsh
if (-not $IsLinux) {
Write-Error "Linux required: use MSYS2 on Windows for native MinGW builds"
exit 1
}

$Env:CC = 'x86_64-w64-mingw32-gcc'
$Env:CXX = 'x86_64-w64-mingw32-g++'
$Env:AR = 'x86_64-w64-mingw32-ar'
$Env:RANLIB = 'x86_64-w64-mingw32-ranlib'
$Env:LDSHARED = 'x86_64-w64-mingw32-gcc -shared'

uv pip install . --force-reinstall
2 changes: 1 addition & 1 deletion com/win32com/src/oleargs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static PyObject *PyVariant_Type;
// new array (old behaviour)
#define BYREF_ARRAY_USE_EXISTING_ARRAY

// Need to put this in pywintypes.h with rest of compatibility macros
// Need to put this in PyWinTypes.h with rest of compatibility macros
#define PYWIN_BUFFER_CHECK(obj) (PyBytes_Check(obj) || PyByteArray_Check(obj) || PyMemoryView_Check(obj))

// A little helper just for this file
Expand Down
2 changes: 1 addition & 1 deletion com/win32comext/adsi/src/PyADSIUtil.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @doc
#include "Python.h"
#include "pyerrors.h" // for PyErr_Warn in 2.5...
#include "Windows.h"
#include "windows.h"
#include "PyWinTypes.h"
#include "PythonCOM.h"
#include "PyADSIUtil.h"
Expand Down
2 changes: 1 addition & 1 deletion com/win32comext/adsi/src/adsilib.i
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* ADSI SWIG Support */

%{
#include "pyadsiutil.h"
#include "PyADSIUtil.h"

extern PyObject *OleSetADSIError(HRESULT hr, IUnknown *pUnk, REFIID iid);
%}
Expand Down
4 changes: 2 additions & 2 deletions com/win32comext/directsound/src/PyDSBCAPS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ PyTypeObject PyDSBCAPSType = {
// application not using DirectSound. In this situation, the
// application's normal buffers are muted, but the sticky focus
// buffers are still audible. This is useful for nongame
// applications, such as movie playback (DirectShow™), when the
// applications, such as movie playback (DirectShow�), when the
// user wants to hear the soundtrack while typing in Microsoft
// Word or Microsoft® Excel, for example. However, if the user
// Word or Microsoft� Excel, for example. However, if the user
// switches to another DirectSound application, all sound
// buffers, both normal and sticky focus, in the previous
// application are muted.
Expand Down
4 changes: 2 additions & 2 deletions com/win32comext/directsound/src/PyDSBUFFERDESC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ PyTypeObject PyDSBUFFERDESCType = {
// IDirectSound::CreateSoundBuffer call. With this flag set, an application using DirectSound can continue to play
// its sticky focus buffers if the user switches to another application not using DirectSound. In this situation,
// the application's normal buffers are muted, but the sticky focus buffers are still audible. This is useful for
// nongame applications, such as movie playback (DirectShow™), when the user wants to hear the soundtrack while
// typing in Microsoft Word or Microsoft® Excel, for example. However, if the user switches to another DirectSound
// nongame applications, such as movie playback (DirectShow�), when the user wants to hear the soundtrack while
// typing in Microsoft Word or Microsoft� Excel, for example. However, if the user switches to another DirectSound
// application, all sound buffers, both normal and sticky focus, in the previous application are muted.
// @flag DSBCAPS_GLOBALFOCUS|The buffer is a global sound buffer. With this flag set, an application using
// DirectSound can continue to play its buffers if the user switches focus to another application, even if the new
Expand Down
2 changes: 1 addition & 1 deletion isapi/src/PyExtensionObjects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

// #define PY_SSIZE_T_CLEAN // defined by isapi\src\StdAfx.h
#include "stdafx.h"
#include "pywintypes.h"
#include "PyWinTypes.h"
#include "Utils.h"
#include "PyExtensionObjects.h"
#include "PythonEng.h"
Expand Down
4 changes: 2 additions & 2 deletions isapi/src/PyFilterObjects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

// #define PY_SSIZE_T_CLEAN // defined by isapi\src\StdAfx.h
#include "stdafx.h"
#include "pywintypes.h"
#include "PyWinTypes.h"
#include "Utils.h"
#include "pyFilterObjects.h"
#include "PyFilterObjects.h"

// @doc

Expand Down
4 changes: 2 additions & 2 deletions isapi/src/PythonEng.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "stdafx.h"
#include "Utils.h"
#include "PythonEng.h"
#include "pyExtensionObjects.h"
#include "pyFilterObjects.h"
#include "PyExtensionObjects.h"
#include "PyFilterObjects.h"
#include "pyISAPI_messages.h"

extern HINSTANCE g_hInstance;
Expand Down
4 changes: 2 additions & 2 deletions isapi/src/pyISAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#include "stdafx.h"
#include "pyISAPI.h"
#include "pyExtensionObjects.h"
#include "pyFilterObjects.h"
#include "PyExtensionObjects.h"
#include "PyFilterObjects.h"

static const char *name_ext_factory = "__ExtensionFactory__";
static const char *name_ext_init = "GetExtensionVersion";
Expand Down
Loading
Loading