weiden(a)cvs.reactos.com wrote:
> CVSROOT: /CVS/ReactOS
> Module name: reactos
> Repository: ./
> Changes by: weiden(a)mok.osexperts.com 04/11/30 12:21:34
>
> Modified files:
> ./: Makefile
>
> Log message:
> don't build msi for now as it uses a 3rd party build utility until situation is cleared
>
It build on a windows box, right? It worked on my wifes XP here,
but it did build right?
Ducken behind the desk waiting for more flamers,
James
Wow!
To complete the port for msi.dll, I need LoadTypeLib, RegisterTypeLib and
ITypeLib_Release. So, is stdole32 a "32 bit" replacement for Wine typelib
oleaut32 functions? I see only CreateTypeLib2 in the file.
Thanks,
James
ps.
I can compile msi w/o those functions, ha! just comment them out. So here
is a patch and makefiles, just remove the "msi-" and go.
Steven Edwards wrote:
> Hi Sam,
> --- Sam Lauber <sam124(a)operamail.com> wrote:
>
>>I tried it with MS mktyplib (with Wine DLLs). Strangly, it produced
>>the exact same FIXMEs that the C program generated, but generated a
>>diffrent typelib. And more then two bytes differed. The two typelibs
>>are attached. I'll try it with InstallShield.
>
>
> Try this one
>
> http://www.volny.cz/xnavara/stdole32.c
>
> Thanks
> Steven
>
>
Only in /root/wine/wine/dlls/msi: .cvsignore
Only in /root/wine/wine/dlls/msi: CVS
Only in ./: Makefile
Only in ./: Makefile.ros-template
diff -u /root/wine/wine/dlls/msi/action.c ./action.c
--- /root/wine/wine/dlls/msi/action.c 2004-10-27 20:43:05.000000000 -0500
+++ ./action.c 2004-10-30 12:14:17.000000000 -0500
@@ -28,6 +28,7 @@
#include <stdarg.h>
#include <stdio.h>
+#include <fcntl.h>
#define COBJMACROS
@@ -39,7 +40,7 @@
#include "fdi.h"
#include "msi.h"
#include "msiquery.h"
-#include "msvcrt/fcntl.h"
+//#include "msvcrt/fcntl.h"
#include "objbase.h"
#include "objidl.h"
#include "msipriv.h"
@@ -3477,7 +3478,7 @@
continue;
}
- res = LoadTypeLib(package->files[index].TargetPath,&ptLib);
+// res = LoadTypeLib(package->files[index].TargetPath,&ptLib);
if (SUCCEEDED(res))
{
WCHAR help[MAX_PATH];
@@ -3488,7 +3489,7 @@
resolve_folder(package,helpid,help,FALSE,FALSE,NULL);
- res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help);
+// res = RegisterTypeLib(ptLib,package->files[index].TargetPath,help);
if (!SUCCEEDED(res))
ERR("Failed to register type library %s\n",
debugstr_w(package->files[index].TargetPath));
@@ -3503,8 +3504,9 @@
debugstr_w(package->files[index].TargetPath));
}
- if (ptLib)
- ITypeLib_Release(ptLib);
+ if (ptLib){
+ //ITypeLib_Release(ptLib);
+ }
}
else
ERR("Failed to load type library %s\n",
Only in ./: patch.diff
diff -u /root/wine/wine/dlls/msi/suminfo.c ./suminfo.c
--- /root/wine/wine/dlls/msi/suminfo.c 2004-10-18 13:20:12.000000000 -0500
+++ ./suminfo.c 2004-10-30 00:09:12.000000000 -0500
@@ -23,6 +23,8 @@
#define COBJMACROS
#define NONAMELESSUNION
+#define PRSPEC_PROPID (1)
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
# $Id: Makefile,v 1.12 2004/02/25 20:00:41 sedwards Exp $
PATH_TO_TOP = ../..
TARGET_TYPE = winedll
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk
# $Id: Makefile.ros-template
TARGET_NAME = msi
TARGET_OBJECTS = @C_SRCS@ @EXTRA_OBJS@
TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
TARGET_RC_BINARIES = @RC_BINARIES@
TARGET_CLEAN = *.tab.c *.tab.h
default: all
DEP_OBJECTS = $(TARGET_OBJECTS)
include $(TOOLS_PATH)/depend.mk
#
# Bison is requiered for building msi.dll. If MingW32 for windows,
# download bison from http://gnuwin32.sourceforge.net/
# Make sure bison.exe is placed in your command path for execution.
#
#
sql.tab.c sql.tab.h: sql.y
bison -p SQL_ -d ./sql.y -o sql.tab.c
cond.tab.c cond.tab.h: cond.y
bison -p COND_ -d ./cond.y -o cond.tab.c
Hi,
Just like to let you know that the latest cvs code does not compile out of the
box using mingw on a debian testing box.
$i586-mingw32msvc-cc --version
i586-mingw32msvc-cc (GCC) 3.4.2 (mingw-special)
The problem is some functions are re-declared in the string.h (line 169,
wchar_t() ) and stdio.h (line 269, putwc() )files. Also the loadlib.c test
file failed to compile since it was not including stdlib.h and could not find
the mbstowcs function.
This is the latest cvs code from 5:30'ish GMT.
Cheers,
Damian
output from cvs diff:
Index: apps/testsets/loadlib/loadlib.c
===================================================================
RCS file: /CVS/ReactOS/reactos/apps/testsets/loadlib/loadlib.c,v
retrieving revision 1.2
diff -r1.2 loadlib.c
26a27
> #include <stdlib.h>
Index: include/msvcrt/stdio.h
===================================================================
RCS file: /CVS/ReactOS/reactos/include/msvcrt/stdio.h,v
retrieving revision 1.8
diff -r1.8 stdio.h
269c269
< int putwc(wint_t wc, FILE* fileWrite);
---
> //int putwc(wint_t wc, FILE* fileWrite);
Index: include/msvcrt/string.h
===================================================================
RCS file: /CVS/ReactOS/reactos/include/msvcrt/string.h,v
retrieving revision 1.6
diff -r1.6 string.h
169c169
< wchar_t* wcsdup(const wchar_t* wsToDuplicate);
---
> //wchar_t* wcsdup(const wchar_t* wsToDuplicate);
Hay!!!!
greatlrd(a)cvs.reactos.com wrote:
> CVSROOT: /CVS/ReactOS
> Module name: reactos
> Repository: reactos/include/
> Changes by: greatlrd(a)mok.osexperts.com 04/11/28 16:15:24
>
> Added files:
> reactos/include/: dinput.h
>
> Log message:
> first port of wine directx support to reactos
I want to commit my port of msi.dll from wine!
8^)
James
PD: Humm, send me a contact mail and i will send you
the files ziped.
Best Regards,
Lucio Diaz
______________________________________________
Renovamos el Correo Yahoo!: ¡100 MB GRATIS!
Nuevos servicios, más seguridad
http://correo.yahoo.es
Could Someone with autorization to edit the
Reactos.com Web page look at my FAQ and Howto, to
decide if he/she likes it and what have to be changed
so it could be in the web page.
I think it is a improvement over the actual texts. The
texts i did are thought for everybody, even with
screenshots to guide the people with little
experience.
Thankyou,
Lucio Diaz.
______________________________________________
Renovamos el Correo Yahoo!: ¡100 MB GRATIS!
Nuevos servicios, más seguridad
http://correo.yahoo.es
>While attempting to guess the location isn't going to
>be successful
>100%
>of the time, it would probably be better then the 99%
>incorrect that
>you
>get with always defaulting to 1 set zone.
>Also, are there any other user-set preferences that
>come before the
>date/time page (How do you call the different parts
of >Setup?) that
>might help determining location?
It seems a pain in the @ss to code the whole thing,
taking in acount ALL the countries and their probable
timezones(countries with diferent timezone areas) for
something as easy to the user as to look at his watch
and set the time. I dont mind what standard (if GMT -8
or GMT 0) you chose, but i believe that making it more
elaborate does not worth today when many other things,
quite more important, are waiting to be implemented
(like Networking). I am sure that time will come for
those details.
______________________________________________
Renovamos el Correo Yahoo!: ¡100 MB GRATIS!
Nuevos servicios, más seguridad
http://correo.yahoo.es
Hi!
I have written a tool to configure the ReactOS source tree (customize
the build) It builds a GUI interface from an XML file which lists all
the possible options and how they are "realized" (in which file a value
has to be changed to make the build-system do what is wanted, i.e. set
KDBG in config to 1)
I would like to add the possibility of configuring things like
WHOLE_PAGE_ALLOCATIONS or TAG_STATISTICS_TRACKING (from ntoskrnl/mm/npool.c)
It would be good if such defines were moved into a file like
ntoskrnl/include/config.h which is then included by ntoskrnl.h and looks
like this:
/* Enable tracking of statistics about the tagged blocks in the pool */
#undef TAG_STATISTICS_TRACKING
/*
* Put each block in its own range of pages and position the block at the
* end of the range so any accesses beyond the end of block are to invalid
* memory locations.
*/
#undef WHOLE_PAGE_ALLOCATIONS
I don't want to make the tool edit the C files directly.
If anybody is against this please let me know, otherwise I will do it.
(Note: The tool is written in python and will thus not be allowed into
the reactos tree but I will provide it for whomever is interested)
Thanks,
blight
>The most intelligent solution is to stick to GMT 0.
>Best regards,
>Alex Ionescu
I agree, is both the easier and the most logic option
(also i live at GMT 0 ;)
______________________________________________
Renovamos el Correo Yahoo!: ¡100 MB GRATIS!
Nuevos servicios, más seguridad
http://correo.yahoo.es