May 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : wininet: INTERNET_InternetOpenUrlW is an internal helper .
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 8f75f51c3f7adae8d2578d69285d0076954a4644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f75f51c3f7adae8d2578d692… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 26 13:06:00 2008 +0900 wininet: INTERNET_InternetOpenUrlW is an internal helper. --- dlls/wininet/internet.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 856f302..d4734a4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -83,9 +83,6 @@ typedef struct CHAR response[MAX_REPLY_LEN]; } WITHREADERROR, *LPWITHREADERROR; -HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, - LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext); - static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES; static HMODULE WININET_hModule; @@ -2734,7 +2731,7 @@ BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwRese * RETURNS * handle of connection or NULL on failure */ -HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, +static HINTERNET INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { URL_COMPONENTSW urlComponents;

1 0

Eric Pouech : dbghelp: Fix for SymGetModuleInfo().
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 1f6974c1247939cc5102d9a9e4bafc89622fcfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6974c1247939cc5102d9a9e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 25 12:02:26 2008 +0200 dbghelp: Fix for SymGetModuleInfo(). --- dlls/dbghelp/module.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 64e821f..a53e6b5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -895,7 +895,12 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, IMAGEHLP_MODULE64 mi64; IMAGEHLP_MODULEW64 miw64; - if (sizeof(mi64) < ModuleInfo->SizeOfStruct) FIXME("Wrong size\n"); + if (sizeof(mi64) < ModuleInfo->SizeOfStruct) + { + SetLastError(ERROR_MOD_NOT_FOUND); /* NOTE: native returns this error */ + WARN("Wrong size %u\n", ModuleInfo->SizeOfStruct); + return FALSE; + } miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE;

1 0

Kirill K. Smirnov : mshtml: Fix copy/paste error.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 73bd6da20880c9f7d27cf585171b447e39d1e2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bd6da20880c9f7d27cf5851… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sun May 25 02:06:50 2008 +0400 mshtml: Fix copy/paste error. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c46f05e..6e1d092 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -963,7 +963,7 @@ static ULONG WINAPI WindowDispEx_Release(IDispatchEx *iface) { HTMLWindow *This = DISPEX_THIS(iface); - return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); + return IHTMLWindow2_Release(HTMLWINDOW2(This)); } static HRESULT WINAPI WindowDispEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo)

1 0

Gregor Münch : winhlp32: Update German translation.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 2b7debe01ba26994c4f90f3ff5e7ebfe0bfa789b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7debe01ba26994c4f90f3ff… Author: Gregor Münch <greg87(a)online.de> Date: Sat May 24 19:35:47 2008 +0000 winhlp32: Update German translation. --- programs/winhlp32/De.rc | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc index b9cdece..846ef9b 100644 --- a/programs/winhlp32/De.rc +++ b/programs/winhlp32/De.rc @@ -73,10 +73,33 @@ STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" STID_CONTENTS, "&Inhalt" STID_SEARCH, "&Suchen" STID_BACK, "&Zur�ck" -STID_HISTORY, "&Bisher" +STID_HISTORY, "&Chronik" STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." } + +CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +BEGIN +POPUP "" +BEGIN +MENUITEM "Anmerken...", MNID_CTXT_ANNOTATE +MENUITEM "Kopieren", MNID_CTXT_COPY +MENUITEM "Drucken...", MNID_CTXT_PRINT +POPUP "Schriftgr��e" +BEGIN +MENUITEM "Klein", MNID_CTXT_FONTS_SMALL +MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL +MENUITEM "Gro�", MNID_CTXT_FONTS_LARGE +END +POPUP "Hilfe immer sichtbar" +BEGIN +MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT +MENUITEM "Sichtbar", MNID_CTXT_HELP_VISIBLE +MENUITEM "Nicht sichtbar", MNID_CTXT_HELP_NONVISIBLE +END +MENUITEM "Systemfarben verwenden", MNID_CTXT_SYSTEM_COLORS +END +END

1 0

Alexandre Julliard : tests: Use the Wine import libraries when compiling with MinGW.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 83a21c68867beeb7380d23ef9003d885426d4ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a21c68867beeb7380d23ef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 26 19:26:20 2008 +0200 tests: Use the Wine import libraries when compiling with MinGW. --- dlls/Maketest.rules.in | 4 ++-- dlls/msvcrt/tests/Makefile.in | 3 ++- dlls/msvcrtd/tests/Makefile.in | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 6c70a23..5256900 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -33,12 +33,12 @@ all: $(TESTPROGRAM) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) # Rules for .exe main module $(MODULE): $(OBJS) $(RCOBJS) Makefile.in - $(CC) $(OBJS) $(RCOBJS) -o $@ $(ALL_LIBS) + $(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) # Rules for building test list diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 04ac448..74199e1 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -3,7 +3,8 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msvcrt.dll -IMPORTS = msvcrt kernel32 +APPMODE = -mno-cygwin +IMPORTS = kernel32 MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/.. diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in index 9045ee8..7f52bfa 100644 --- a/dlls/msvcrtd/tests/Makefile.in +++ b/dlls/msvcrtd/tests/Makefile.in @@ -3,7 +3,8 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msvcrtd.dll -IMPORTS = msvcrt kernel32 +APPMODE = -mno-cygwin +IMPORTS = kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@

1 0

Gregor Münch : shell32: Update German translation.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 13cb6a838c2fe9026dbb299e1bb9158aa39bca6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13cb6a838c2fe9026dbb299e1… Author: Gregor Münch <greg87(a)online.de> Date: Sat May 24 19:26:46 2008 +0000 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 57 +++++++++++++++++++++++++++++-------------- 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index f5e0291..f3b0dc1 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -56,12 +56,12 @@ BEGIN MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Einf�gen", FCIDM_SHVIEW_INSERT - MENUITEM "Einf�gen als Verweis", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Einf�gen als Verkn�pfung", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Neu" BEGIN MENUITEM "Neues Ver&zeichnis", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Neuer Ver&weis", FCIDM_SHVIEW_NEWLINK + MENUITEM "Neue Ver&kn�pfung", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -76,14 +76,14 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&�ffnen" FCIDM_SHVIEW_OPEN MENUITEM "E&rkunden", FCIDM_SHVIEW_EXPLORE - MENUITEM "&�ffnen", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Ausschneiden", FCIDM_SHVIEW_CUT MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY + MENUITEM "&Einf�gen", FCIDM_SHVIEW_INSERT MENUITEM SEPARATOR - MENUITEM "Erstelle Ver&weis", FCIDM_SHVIEW_CREATELINK + MENUITEM "Ver&kn�pfung erzeugen", FCIDM_SHVIEW_CREATELINK MENUITEM "&L�schen", FCIDM_SHVIEW_DELETE MENUITEM "&Umbenennen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -186,7 +186,7 @@ STRINGTABLE /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Arbeitsplatz" - IDS_RECYCLEBIN_FOLDER_NAME "M�ll" + IDS_RECYCLEBIN_FOLDER_NAME "Papierkorb" /* context menus */ IDS_VIEW_LARGE "&Gro�e Symbole" @@ -203,22 +203,21 @@ STRINGTABLE IDS_DELETEITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' l�schen m�chten?" IDS_DELETEMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Objekte l�schen m�chten?" IDS_DELETESELECTED_TEXT "Sind Sie sich sicher, dass Sie die ausgew�hlten Objekte l�schen m�chten?" - IDS_TRASHITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' in M�ll verschieben m�chten?" - IDS_TRASHFOLDER_TEXT "Sind Sie sich sicher, dass Sie '%1' und seinen Inhalt in den M�ll verschieben m�chten?" - IDS_TRASHMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Dateien in den M�ll verschieben m�chten?" - IDS_CANTTRASH_TEXT "Das Objekt '%1' kann nicht in den M�ll verschoben werden. M�chten Sie es stattdessen l�schen?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_TRASHITEM_TEXT "Sind Sie sich sicher, dass Sie '%1' in den Papierkorb verschieben m�chten?" + IDS_TRASHFOLDER_TEXT "Sind Sie sich sicher, dass Sie '%1' und seinen Inhalt in den Papierkorb verschieben m�chten?" + IDS_TRASHMULTIPLE_TEXT "Sind Sie sich sicher, dass Sie diese %1 Dateien in den Papierkorb verschieben m�chten?" + IDS_CANTTRASH_TEXT "Das Objekt '%1' kann nicht in den Papierkorb verschoben werden.\n\n M�chten Sie es stattdessen l�schen?" + IDS_OVERWRITEFILE_TEXT "Der Ordner enth�lt bereits eine Datei namens '%1'.\n\n Wollen Sie die Datei ersetzen?" IDS_OVERWRITEFILE_CAPTION "Best�tigung: Datei �berschreiben" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "Im Verzeichnis befindet sich bereits ein Ordner namens '%1'.\n\n"\ + "Wenn die Dateien im Zielordner die gleichen Namen haben, wie die im ausgew�hlten Ordner, werden sie ersetzt.\n\n\ + M�chten sie trotzdem fortfahren?" /* message box strings */ IDS_RESTART_TITLE "Neustarten" - IDS_RESTART_PROMPT "M�chten Sie, dass ein simulierter Windows Neustart durchgef�hrt wird ?" - IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "M�chten Sie die aktuelle Wine Sitzung beenden ?" + IDS_RESTART_PROMPT "M�chten Sie, dass ein simulierter Windows Neustart durchgef�hrt wird?" + IDS_SHUTDOWN_TITLE "Beenden" + IDS_SHUTDOWN_PROMPT "M�chten Sie die aktuelle Wine Sitzung beenden?" /* shell folder path default values */ IDS_PROGRAMS "Startmen�\\Programme" @@ -249,5 +248,25 @@ STRINGTABLE IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Neuer Ordner" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Wine License" +IDS_LICENSE, +"Wine ist freie Software; Sie d�rfen sie unter den Bedingungen \ +der GNU Lesser General Public License, welche von der \ +Free Software Foundation ver�ffentlicht wurde; weiter verteilen \ +und/oder modifizieren gem�� Version 2.1 der Lizenz, oder \ +(nach ihren Ermessen) jeder sp�teren Version.\n\n\ +Wine wird mit der Hoffnung verteilt das es sich als n�tzlich erweist. \ +Wine kommt aber OHNE JEGLICHE GARANTIE daher; sogar ohne einer \ +angedeuteten Garantie der MARKTG�NGIGKEIT oder der EIGNUNG F�R EINEN \ +BESTIMMTEN NUTZEN. Sehen Sie sich die GNU Lesser General Public License \ +an f�r mehr Details.\n\n\ +Sie sollten mit dieser Bibliothek auch eine Kopie der \ +GNU Lesser General Public License erhalten haben; wenn nicht schreiben \ +Sie der Free Software Foundation, \ +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." }

1 0

Alexandre Julliard : winedbg: Fix compile when poll() is not available.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 2e83ea49be48b66176508513871dcec11dfd589f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e83ea49be48b661765085138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 26 19:25:04 2008 +0200 winedbg: Fix compile when poll() is not available. --- programs/winedbg/gdbproxy.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index a47f9ca..2fbec04 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -111,7 +111,12 @@ struct gdb_context unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; -static struct be_process_io be_process_gdbproxy_io; +static struct be_process_io be_process_gdbproxy_io = +{ + NULL, /* we shouldn't use close_process() in gdbproxy */ + ReadProcessMemory, + WriteProcessMemory +}; /* =============================================== * * B A S I C M A N I P U L A T I O N S * @@ -2352,10 +2357,3 @@ int gdb_main(int argc, char* argv[]) #endif return -1; } - -static struct be_process_io be_process_gdbproxy_io = -{ - NULL, /* we shouldn't use close_process() in gdbproxy */ - ReadProcessMemory, - WriteProcessMemory -};

1 0

Alexandre Julliard : programs: Use the Wine import libraries when compiling with MinGW.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 0e3eda34254d8695798ac24257571f43c6632449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3eda34254d8695798ac2425… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 26 19:26:06 2008 +0200 programs: Use the Wine import libraries when compiling with MinGW. --- programs/Makeprog.rules.in | 2 +- programs/notepad/Makefile.in | 4 ++-- programs/regedit/Makefile.in | 4 ++-- programs/taskmgr/Makefile.in | 4 ++-- programs/wordpad/Makefile.in | 4 ++-- programs/xcopy/Makefile.in | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index f73498e..2beec51 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -31,7 +31,7 @@ $(BASEMODULE): $(WINEWRAPPER) # Rules for .exe main module $(MODULE): $(OBJS) $(RCOBJS) Makefile.in - $(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ $(LIBWINE) $(ALL_LIBS) + $(CC) $(APPMODE) $(OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(LIBWINE) $(ALL_LIBS) # Rules for testing diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 685a898..a44fe71 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = notepad.exe -APPMODE = -mwindows -IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 msvcrt advapi32 kernel32 +APPMODE = -mwindows -mno-cygwin +IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@ EXTRADEFS = -DNO_LIBWINE_PORT diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 2de20fb..9f872dc 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = regedit.exe -APPMODE = -mwindows -IMPORTS = msvcrt advapi32 kernel32 +APPMODE = -mwindows -mno-cygwin +IMPORTS = advapi32 kernel32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 82ecc96..153a598 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = taskmgr.exe -APPMODE = -mwindows -IMPORTS = psapi shell32 comctl32 msvcrt user32 gdi32 advapi32 kernel32 +APPMODE = -mwindows -mno-cygwin +IMPORTS = psapi shell32 comctl32 user32 gdi32 advapi32 kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT MODCFLAGS = @BUILTINFLAG@ diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index aa247f5..461da31 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wordpad.exe -APPMODE = -mwindows -IMPORTS = comdlg32 shell32 user32 gdi32 msvcrt advapi32 kernel32 comctl32 +APPMODE = -mwindows -mno-cygwin +IMPORTS = comdlg32 shell32 user32 gdi32 advapi32 kernel32 comctl32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRADEFS = -DNO_LIBWINE_PORT MODCFLAGS = @BUILTINFLAG@ diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index f1fe31b..18dd3ab 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -3,8 +3,8 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = xcopy.exe -APPMODE = -mconsole -municode -IMPORTS = shell32 user32 msvcrt kernel32 +APPMODE = -mconsole -municode -mno-cygwin +IMPORTS = shell32 user32 kernel32 EXTRADEFS = -DUNICODE EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@

1 0

Alexandre Julliard : libport: Move the sigsetjmp replacement to exception. h to make it available for Winelib too.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 10e795a091d1af473388d9dbc27c00feb0f25404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e795a091d1af473388d9dbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 26 19:23:43 2008 +0200 libport: Move the sigsetjmp replacement to exception.h to make it available for Winelib too. --- configure | 63 ---------------------------------------------- configure.ac | 11 -------- include/config.h.in | 3 -- include/wine/exception.h | 6 ++++ include/wine/port.h | 7 ----- libs/port/Makefile.in | 1 - libs/port/sigsetjmp.c | 36 -------------------------- 7 files changed, 6 insertions(+), 121 deletions(-) diff --git a/configure b/configure index 2cccc91..a0ba584 100755 --- a/configure +++ b/configure @@ -14450,69 +14450,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 -echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } -if test "${ac_cv_c_sigsetjmp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <setjmp.h> -int -main () -{ -sigjmp_buf buf; - sigsetjmp( buf, 1 ); - siglongjmp( buf, 1 ); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_c_sigsetjmp="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_sigsetjmp="no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_sigsetjmp" >&5 -echo "${ECHO_T}$ac_cv_c_sigsetjmp" >&6; } -if test "$ac_cv_c_sigsetjmp" = "yes" -then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SIGSETJMP 1 -_ACEOF - -fi - { echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 echo $ECHO_N "checking for pthread_rwlock_t... $ECHO_C" >&6; } if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then diff --git a/configure.ac b/configure.ac index 59dc996..8bbb9d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1049,17 +1049,6 @@ then AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) fi -dnl **** Check for sigsetjmp **** -AC_CACHE_CHECK([for sigsetjmp], ac_cv_c_sigsetjmp, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]], [[sigjmp_buf buf; - sigsetjmp( buf, 1 ); - siglongjmp( buf, 1 );]])],[ac_cv_c_sigsetjmp="yes"],[ac_cv_c_sigsetjmp="no"]) - ) -if test "$ac_cv_c_sigsetjmp" = "yes" -then - AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have the sigsetjmp (and siglongjmp) function]) -fi - dnl **** Check for pthread_rwlock_t **** AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE #include <pthread.h>]) diff --git a/include/config.h.in b/include/config.h.in index d956790..9833b23 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -615,9 +615,6 @@ /* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if you have the sigsetjmp (and siglongjmp) function */ -#undef HAVE_SIGSETJMP - /* Define to 1 if the system has the type `sigset_t'. */ #undef HAVE_SIGSET_T diff --git a/include/wine/exception.h b/include/wine/exception.h index 590479c..d716bf0 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -82,6 +82,12 @@ #define __attribute__(x) /* nothing */ #endif +#if defined(__MINGW32__) || defined(__CYGWIN__) +#define sigjmp_buf jmp_buf +#define sigsetjmp(buf,sigs) setjmp(buf) +#define siglongjmp(buf,val) longjmp(buf,val) +#endif + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ diff --git a/include/wine/port.h b/include/wine/port.h index 01ee835..4f58de8 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -323,13 +323,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ -#ifndef HAVE_SIGSETJMP -# include <setjmp.h> -typedef jmp_buf sigjmp_buf; -int sigsetjmp( sigjmp_buf buf, int savesigs ); -void siglongjmp( sigjmp_buf buf, int val ); -#endif /* HAVE_SIGSETJMP */ - #ifndef HAVE_STATVFS int statvfs( const char *path, struct statvfs *buf ); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 1c25bf2..1d048d0 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -23,7 +23,6 @@ C_SRCS = \ pread.c \ pwrite.c \ readlink.c \ - sigsetjmp.c \ spawn.c \ statvfs.c \ strcasecmp.c \ diff --git a/libs/port/sigsetjmp.c b/libs/port/sigsetjmp.c deleted file mode 100644 index 466270f..0000000 --- a/libs/port/sigsetjmp.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * sigsetjmp/siglongjmp functions - * - * Copyright 2003 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef HAVE_SIGSETJMP - -int sigsetjmp( sigjmp_buf buf, int savesigs ) -{ - return setjmp( buf ); -} - -void siglongjmp( sigjmp_buf buf, int val ) -{ - longjmp( buf, val ); -} - -#endif /* HAVE_SIGSETJMP */

1 0

Francois Gouget : kernel32/tests: Get the tests running again on Win95.
by Alexandre Julliard 26 May '08

26 May '08

Module: wine Branch: master Commit: 2321017707335354791f1364e271f2c895d32068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2321017707335354791f1364e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 25 13:51:21 2008 +0200 kernel32/tests: Get the tests running again on Win95. --- dlls/kernel32/tests/sync.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7c9967d..8d7191f 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -26,6 +26,9 @@ #include "wine/test.h" +static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*,BOOL,LPCSTR); +static HANDLE (WINAPI *pOpenWaitableTimerA)(DWORD,BOOL,LPCSTR); + static void test_signalandwait(void) { DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); @@ -376,32 +379,38 @@ static void test_waitable_timer(void) { HANDLE handle, handle2; + if (!pCreateWaitableTimerA || !pOpenWaitableTimerA) + { + skip("{Create,Open}WaitableTimerA() is not available\n"); + return; + } + /* test case sensitivity */ SetLastError(0xdeadbeef); - handle = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); + handle = pCreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); ok(handle != NULL, "CreateWaitableTimer failed with error %u\n", GetLastError()); ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - handle2 = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); + handle2 = pCreateWaitableTimerA(NULL, FALSE, __FILE__ ": Test WaitableTimer"); ok( handle2 != NULL, "CreateWaitableTimer failed with error %d\n", GetLastError()); ok( GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); CloseHandle( handle2 ); SetLastError(0xdeadbeef); - handle2 = CreateWaitableTimerA(NULL, FALSE, __FILE__ ": TEST WAITABLETIMER"); + handle2 = pCreateWaitableTimerA(NULL, FALSE, __FILE__ ": TEST WAITABLETIMER"); ok( handle2 != NULL, "CreateWaitableTimer failed with error %d\n", GetLastError()); ok( GetLastError() == 0, "wrong error %u\n", GetLastError()); CloseHandle( handle2 ); SetLastError(0xdeadbeef); - handle2 = OpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": Test WaitableTimer"); + handle2 = pOpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": Test WaitableTimer"); ok( handle2 != NULL, "OpenWaitableTimer failed with error %d\n", GetLastError()); CloseHandle( handle2 ); SetLastError(0xdeadbeef); - handle2 = OpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": TEST WAITABLETIMER"); + handle2 = pOpenWaitableTimerA( TIMER_ALL_ACCESS, FALSE, __FILE__ ": TEST WAITABLETIMER"); ok( !handle2, "OpenWaitableTimer succeeded\n"); ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); @@ -519,6 +528,10 @@ static void test_iocp_callback(void) START_TEST(sync) { + HMODULE hdll = GetModuleHandle("kernel32"); + pCreateWaitableTimerA = (void*)GetProcAddress(hdll, "CreateWaitableTimerA"); + pOpenWaitableTimerA = (void*)GetProcAddress(hdll, "OpenWaitableTimerA"); + test_signalandwait(); test_mutex(); test_slist();

1 0