From: <th...@us...> - 2003-11-04 08:55:23
|
Update of /cvsroot/py2exe/py2exe/sandbox/source In directory sc8-pr-cvs1:/tmp/cvs-serv19669 Modified Files: run_w.c run_dll.c run.c Log Message: Whitespace cleanup. Index: run_w.c =================================================================== RCS file: /cvsroot/py2exe/py2exe/sandbox/source/run_w.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** run_w.c 6 Aug 2003 16:47:12 -0000 1.1 --- run_w.c 4 Nov 2003 08:55:19 -0000 1.2 *************** *** 27,52 **** void SystemError(int error, char *msg) { ! char Buffer[1024]; ! int n; ! ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! } else ! Buffer[0] = '\0'; ! n = lstrlen(Buffer); ! _snprintf(Buffer+n, sizeof(Buffer)-n, msg); ! MessageBox(GetFocus(), Buffer, NULL, MB_OK | MB_ICONSTOP); } --- 27,52 ---- void SystemError(int error, char *msg) { ! char Buffer[1024]; ! int n; ! ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! } else ! Buffer[0] = '\0'; ! n = lstrlen(Buffer); ! _snprintf(Buffer+n, sizeof(Buffer)-n, msg); ! MessageBox(GetFocus(), Buffer, NULL, MB_OK | MB_ICONSTOP); } *************** *** 58,65 **** LPSTR lpCmdLine, int nCmdShow) { ! int result; ! result = init(); ! if (result) ! return result; ! return start(__argc, __argv); } --- 58,65 ---- LPSTR lpCmdLine, int nCmdShow) { ! int result; ! result = init(); ! if (result) ! return result; ! return start(__argc, __argv); } Index: run_dll.c =================================================================== RCS file: /cvsroot/py2exe/py2exe/sandbox/source/run_dll.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** run_dll.c 6 Aug 2003 16:47:12 -0000 1.1 --- run_dll.c 4 Nov 2003 08:55:19 -0000 1.2 *************** *** 39,64 **** void SystemError(int error, char *msg) { ! char Buffer[1024]; ! int n; ! ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! } else ! Buffer[0] = '\0'; ! n = lstrlen(Buffer); ! _snprintf(Buffer+n, sizeof(Buffer)-n, msg); ! MessageBox(GetFocus(), Buffer, NULL, MB_OK | MB_ICONSTOP); } --- 39,64 ---- void SystemError(int error, char *msg) { ! char Buffer[1024]; ! int n; ! ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! } else ! Buffer[0] = '\0'; ! n = lstrlen(Buffer); ! _snprintf(Buffer+n, sizeof(Buffer)-n, msg); ! MessageBox(GetFocus(), Buffer, NULL, MB_OK | MB_ICONSTOP); } *************** *** 73,148 **** int load_pythoncom(void) { ! char dll_path[_MAX_PATH+_MAX_FNAME+1]; ! char *winver = ""; ! char major = 'x', minor = 'y'; #ifdef _DEBUG ! char *suffix = "_d"; #else ! char *suffix = ""; #endif ! PyObject *ob_winver = PySys_GetObject("winver"); ! if (PyString_Check(ob_winver)) ! winver = PyString_AsString(ob_winver); ! // works until Python 10! ! if (winver && strlen(winver)>=3) { ! major = winver[0]; ! minor = winver[2]; ! } ! // shouldn't do this twice ! assert(gPythoncom == NULL); ! snprintf(dll_path, sizeof(dll_path), "pythoncom%c%c%s.dll", major, minor, suffix); ! gPythoncom = GetModuleHandle(dll_path); ! if (gPythoncom == NULL) { ! // not already loaded - try and load from the current dir ! char *temp; ! GetModuleFileNameA(gInstance, dll_path, sizeof(dll_path)); ! temp = dll_path + strlen(dll_path); ! while (temp>dll_path && *temp != '\\') ! temp--; ! // and printf directly in the buffer. ! snprintf(temp, sizeof(dll_path)-strlen(temp), ! "pythoncom%c%c%s.dll", major, minor, suffix); ! gPythoncom = LoadLibraryEx( dll_path, // points to name of executable module ! NULL, // HANDLE hFile, // reserved, must be NULL ! LOAD_WITH_ALTERED_SEARCH_PATH // DWORD dwFlags // entry-point execution flag ! ); ! } ! Py_XDECREF(ob_winver); ! if (gPythoncom == NULL) ! // give up in disgust ! return -1; ! Pyc_DllCanUnloadNow = (__PROC__DllCanUnloadNow)GetProcAddress(gPythoncom, "DllCanUnloadNow"); ! Pyc_DllGetClassObject = (__PROC__DllGetClassObject)GetProcAddress(gPythoncom, "DllGetClassObject"); ! PyCom_CoUninitialize = (__PROC__PyCom_CoUninitialize)GetProcAddress(gPythoncom, "PyCom_CoUninitialize"); ! return 0; } int check_init() { ! if (!have_init) { ! PyObject *frozen; ! init_with_instance(gInstance); ! // a little DLL magic. Set sys.frozen='dll' ! frozen = PyString_FromString("dll"); ! if (frozen) { ! PySys_SetObject("frozen", frozen); ! Py_DECREF(frozen); ! } ! frozen = PyInt_FromLong((LONG)gInstance); ! if (frozen) { ! PySys_SetObject("frozendllhandle", frozen); ! Py_DECREF(frozen); ! } ! // Now run the generic script - this always returns in a DLL. ! run_script(); ! have_init = TRUE; ! } ! if (gPythoncom == NULL) ! load_pythoncom(); ! return gPythoncom != NULL; } --- 73,148 ---- int load_pythoncom(void) { ! char dll_path[_MAX_PATH+_MAX_FNAME+1]; ! char *winver = ""; ! char major = 'x', minor = 'y'; #ifdef _DEBUG ! char *suffix = "_d"; #else ! char *suffix = ""; #endif ! PyObject *ob_winver = PySys_GetObject("winver"); ! if (PyString_Check(ob_winver)) ! winver = PyString_AsString(ob_winver); ! // works until Python 10! ! if (winver && strlen(winver)>=3) { ! major = winver[0]; ! minor = winver[2]; ! } ! // shouldn't do this twice ! assert(gPythoncom == NULL); ! snprintf(dll_path, sizeof(dll_path), "pythoncom%c%c%s.dll", major, minor, suffix); ! gPythoncom = GetModuleHandle(dll_path); ! if (gPythoncom == NULL) { ! // not already loaded - try and load from the current dir ! char *temp; ! GetModuleFileNameA(gInstance, dll_path, sizeof(dll_path)); ! temp = dll_path + strlen(dll_path); ! while (temp>dll_path && *temp != '\\') ! temp--; ! // and printf directly in the buffer. ! snprintf(temp, sizeof(dll_path)-strlen(temp), ! "pythoncom%c%c%s.dll", major, minor, suffix); ! gPythoncom = LoadLibraryEx(dll_path, // points to name of executable module ! NULL, // HANDLE hFile, // reserved, must be NULL ! LOAD_WITH_ALTERED_SEARCH_PATH // DWORD dwFlags // entry-point execution flag ! ); ! } ! Py_XDECREF(ob_winver); ! if (gPythoncom == NULL) ! // give up in disgust ! return -1; ! Pyc_DllCanUnloadNow = (__PROC__DllCanUnloadNow)GetProcAddress(gPythoncom, "DllCanUnloadNow"); ! Pyc_DllGetClassObject = (__PROC__DllGetClassObject)GetProcAddress(gPythoncom, "DllGetClassObject"); ! PyCom_CoUninitialize = (__PROC__PyCom_CoUninitialize)GetProcAddress(gPythoncom, "PyCom_CoUninitialize"); ! return 0; } int check_init() { ! if (!have_init) { ! PyObject *frozen; ! init_with_instance(gInstance); ! // a little DLL magic. Set sys.frozen='dll' ! frozen = PyString_FromString("dll"); ! if (frozen) { ! PySys_SetObject("frozen", frozen); ! Py_DECREF(frozen); ! } ! frozen = PyInt_FromLong((LONG)gInstance); ! if (frozen) { ! PySys_SetObject("frozendllhandle", frozen); ! Py_DECREF(frozen); ! } ! // Now run the generic script - this always returns in a DLL. ! run_script(); ! have_init = TRUE; ! } ! if (gPythoncom == NULL) ! load_pythoncom(); ! return gPythoncom != NULL; } *************** *** 154,177 **** BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) { ! if ( dwReason == DLL_PROCESS_ATTACH) { ! gInstance = hInstance; ! } ! else if ( dwReason == DLL_PROCESS_DETACH ) { ! gInstance = 0; ! // not much else safe to do here ! } ! return TRUE; } HRESULT __stdcall DllCanUnloadNow(void) { ! HRESULT rc; ! check_init(); ! assert(Pyc_DllCanUnloadNow); ! if (!Pyc_DllCanUnloadNow) return E_UNEXPECTED; ! rc = Pyc_DllCanUnloadNow(); ! //if (rc == S_OK && PyCom_CoUninitialize) ! // PyCom_CoUninitialize(); ! return rc; } --- 154,177 ---- BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) { ! if ( dwReason == DLL_PROCESS_ATTACH) { ! gInstance = hInstance; ! } ! else if ( dwReason == DLL_PROCESS_DETACH ) { ! gInstance = 0; ! // not much else safe to do here ! } ! return TRUE; } HRESULT __stdcall DllCanUnloadNow(void) { ! HRESULT rc; ! check_init(); ! assert(Pyc_DllCanUnloadNow); ! if (!Pyc_DllCanUnloadNow) return E_UNEXPECTED; ! rc = Pyc_DllCanUnloadNow(); ! //if (rc == S_OK && PyCom_CoUninitialize) ! // PyCom_CoUninitialize(); ! return rc; } *************** *** 179,188 **** HRESULT __stdcall DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { ! HRESULT rc; ! check_init(); ! assert(Pyc_DllGetClassObject); ! if (!Pyc_DllGetClassObject) return E_UNEXPECTED; ! rc = Pyc_DllGetClassObject(rclsid, riid, ppv); ! return rc; } --- 179,188 ---- HRESULT __stdcall DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { ! HRESULT rc; ! check_init(); ! assert(Pyc_DllGetClassObject); ! if (!Pyc_DllGetClassObject) return E_UNEXPECTED; ! rc = Pyc_DllGetClassObject(rclsid, riid, ppv); ! return rc; } *************** *** 190,208 **** STDAPI DllRegisterServer() { ! int rc=0; ! check_init(); ! rc = PyRun_SimpleString("DllRegisterServer()\n"); ! if (rc != 0) ! PyErr_Print(); ! return rc==0 ? 0 : SELFREG_E_CLASS; } STDAPI DllUnregisterServer() { ! int rc=0; ! check_init(); ! rc = PyRun_SimpleString("DllUnregisterServer()\n"); ! if (rc != 0) ! PyErr_Print(); ! return rc==0 ? 0 : SELFREG_E_CLASS; } --- 190,208 ---- STDAPI DllRegisterServer() { ! int rc=0; ! check_init(); ! rc = PyRun_SimpleString("DllRegisterServer()\n"); ! if (rc != 0) ! PyErr_Print(); ! return rc==0 ? 0 : SELFREG_E_CLASS; } STDAPI DllUnregisterServer() { ! int rc=0; ! check_init(); ! rc = PyRun_SimpleString("DllUnregisterServer()\n"); ! if (rc != 0) ! PyErr_Print(); ! return rc==0 ? 0 : SELFREG_E_CLASS; } Index: run.c =================================================================== RCS file: /cvsroot/py2exe/py2exe/sandbox/source/run.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** run.c 31 Jul 2003 19:37:34 -0000 1.1 --- run.c 4 Nov 2003 08:55:19 -0000 1.2 *************** *** 27,50 **** void SystemError(int error, char *msg) { ! char Buffer[1024]; ! ! if (msg) ! fprintf(stderr, msg); ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! fprintf(stderr, Buffer); ! } } --- 27,50 ---- void SystemError(int error, char *msg) { ! char Buffer[1024]; ! ! if (msg) ! fprintf(stderr, msg); ! if (error) { ! LPVOID lpMsgBuf; ! FormatMessage( ! FORMAT_MESSAGE_ALLOCATE_BUFFER | ! FORMAT_MESSAGE_FROM_SYSTEM, ! NULL, ! error, ! MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ! (LPSTR)&lpMsgBuf, ! 0, ! NULL ! ); ! strncpy(Buffer, lpMsgBuf, sizeof(Buffer)); ! LocalFree(lpMsgBuf); ! fprintf(stderr, Buffer); ! } } *************** *** 54,61 **** int main (int argc, char **argv) { ! int result; ! result = init(); ! if (result) ! return result; ! return start(argc, argv); } --- 54,61 ---- int main (int argc, char **argv) { ! int result; ! result = init(); ! if (result) ! return result; ! return start(argc, argv); } |