November 2006 - Wine-Commits

Dmitry Timoshkov : winedump: Fix a copy/paste typo.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: d8725b8850371d21f2735f2f3a9f177987dc5537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8725b8850371d21f2735f2f3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Nov 26 16:04:33 2006 +0800 winedump: Fix a copy/paste typo. --- tools/winedump/lnk.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index f4669c1..78b2c45 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -454,11 +454,11 @@ static int dump_lnk_fd(int fd) return 0; } -int dump_lnk(const char *emf) +int dump_lnk(const char *lnk) { int fd; - fd = open(emf,O_RDONLY); + fd = open(lnk,O_RDONLY); if (fd<0) return -1; dump_lnk_fd(fd);

1 0

Dmitry Timoshkov : winedump: Make the implementation match the prototype.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 2d0ca5b2a97ffa4ffc01666d162c8acc1f1e82b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0ca5b2a97ffa4ffc01666d1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Nov 26 16:03:49 2006 +0800 winedump: Make the implementation match the prototype. --- tools/winedump/dump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 96457a0..fe86190 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -79,7 +79,7 @@ void dump_data( const unsigned char *ptr printf( "\n" ); } -const char *get_time_str(const unsigned long _t) +const char *get_time_str(unsigned long _t) { const time_t t = (const time_t)_t; const char *str = ctime(&t);

1 0

Dmitry Timoshkov : include: Add some structures a definitions required for the COFF library dumper.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: eea1b5e219c76da3948c66f6662dea1c26478e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea1b5e219c76da3948c66f66… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Nov 26 16:03:25 2006 +0800 include: Add some structures a definitions required for the COFF library dumper. --- include/winnt.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index fe83ff1..812ab80 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -22,6 +22,7 @@ #define _WINNT_ #include <basetsd.h> +#include <guiddef.h> #ifndef RC_INVOKED #include <ctype.h> @@ -604,6 +605,7 @@ typedef struct _SINGLE_LIST_ENTRY { #define HEAP_DISABLE_COALESCE_ON_FREE 0x00000080 #define HEAP_CREATE_ALIGN_16 0x00010000 #define HEAP_CREATE_ENABLE_TRACING 0x00020000 +#define HEAP_CREATE_ENABLE_EXECUTE 0x00040000 /* This flag allows it to create heaps shared by all processes under win95, FIXME: correct name */ @@ -2595,6 +2597,7 @@ typedef struct _IMAGE_IMPORT_BY_NAME { BYTE Name[1]; } IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME; +#include <pshpack8.h> /* Import thunk */ typedef struct _IMAGE_THUNK_DATA64 { union { @@ -2604,6 +2607,7 @@ typedef struct _IMAGE_THUNK_DATA64 { ULONGLONG AddressOfData; } u1; } IMAGE_THUNK_DATA64,*PIMAGE_THUNK_DATA64; +#include <poppack.h> typedef struct _IMAGE_THUNK_DATA32 { union { @@ -2886,6 +2890,52 @@ typedef struct _IMAGE_ARCHIVE_MEMBER_HEA #define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60 +typedef struct _IMPORT_OBJECT_HEADER +{ + WORD Sig1; + WORD Sig2; + WORD Version; + WORD Machine; + DWORD TimeDateStamp; + DWORD SizeOfData; + union + { + WORD Ordinal; + WORD Hint; + } DUMMYUNIONNAME; + WORD Type : 2; + WORD NameType : 3; + WORD Reserved : 11; +} IMPORT_OBJECT_HEADER; + +#define IMPORT_OBJECT_HDR_SIG2 0xffff + +typedef enum IMPORT_OBJECT_TYPE +{ + IMPORT_OBJECT_CODE = 0, + IMPORT_OBJECT_DATA = 1, + IMPORT_OBJECT_CONST = 2 +} IMPORT_OBJECT_TYPE; + +typedef enum IMPORT_OBJECT_NAME_TYPE +{ + IMPORT_OBJECT_ORDINAL = 0, + IMPORT_OBJECT_NAME = 1, + IMPORT_OBJECT_NAME_NO_PREFIX = 2, + IMPORT_OBJECT_NAME_UNDECORATE = 3 +} IMPORT_OBJECT_NAME_TYPE; + +typedef struct _ANON_OBJECT_HEADER +{ + WORD Sig1; + WORD Sig2; + WORD Version; + WORD Machine; + DWORD TimeDateStamp; + CLSID ClassID; + DWORD SizeOfData; +} ANON_OBJECT_HEADER; + /* * Resource directory stuff */

1 0

Alexander Nicolaysen Sørnes : oleview: Add Norwegian Bokmål translation.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 34f7bde859bd26b68779949cfaed1c1b28fbe61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f7bde859bd26b68779949cf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 26 14:50:11 2006 +0100 oleview: Add Norwegian Bokmål translation. --- programs/oleview/No.rc | 212 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 + 2 files changed, 213 insertions(+), 0 deletions(-) diff --git a/programs/oleview/No.rc b/programs/oleview/No.rc new file mode 100644 index 0000000..c904987 --- /dev/null +++ b/programs/oleview/No.rc @@ -0,0 +1,212 @@ +/* + * OleView (No.rc) + * Norwegian Bokm�l Language Support + * + * Copyright 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * 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 + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDM_MENU MENU +{ + POPUP "&Fil" + { + MENUITEM "&Bind til fil . . .", IDM_BIND + MENUITEM "&Vis TypeLib . . .", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Systemoppsett", IDM_SYSCONF + MENUITEM "Kj�&r registerredigerer", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Avslutt", IDM_EXIT + } + POPUP "&Objekt" + { + POPUP "&CoCreateInstance-flagg" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Vis &type-informasjon", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Opprett &instans", IDM_CREATEINST, GRAYED + MENUITEM "&Opprett instans p�", IDM_CREATEINSTON, GRAYED + MENUITEM "&Slipp instans", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Kopier C&LSID til utklippstavlen", IDM_COPYCLSID, GRAYED + MENUITEM "&Kopier &HTML-objektlapp til utklippstavlen", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Vis . . .", IDM_VIEW, GRAYED + } + POPUP "&Vis" + { + MENUITEM "&Ekspertmodus", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "Skjult&e komponentkategorier", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "Verk&t�ylinje", IDM_TOOLBAR,CHECKED + MENUITEM "&Statuslinje", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "Oppdate&r\tF5", IDM_REFRESH + } + POPUP "&Hjelp" + { + MENUITEM "&Om OleView", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&Fil" + { + MENUITEM "Lagre &som", IDM_SAVEAS + MENUITEM "&Lukk", IDM_CLOSE + } + POPUP "&Vis" + { + MENUITEM "Sorte&r etter type", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "Verk&t�ylinje", IDM_TOOLBAR + MENUITEM "&Statuslinje", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Klar" + IDS_ABOUT "OleView - objektviser for OLE/COM" + IDS_ABOUTVER "versjon 1.0" + IDS_TYPELIBTITLE "ITypeLib-viser" + IDS_OPEN "�pne" + + IDM_BIND, "Bind til fil via File Moniker" + IDM_TYPELIB, "�pne en TypeLib-fil og vis innholdet" + IDM_SYSCONF, "Endre innstillinger for distribuert COM for hele maskinen" + IDM_REGEDIT, "Kj�r registerredigering" + IDM_EXIT, "Avslutt programmet. Det sp�r om � lagre endringer" + IDM_CREATEINST, "Opprett en instans av det valgte objektet" + IDM_CREATEINSTON, "Opprett en instans av det valgte objektet p� en bestemt maskin" + IDM_RELEASEINST, "Slipp valgte objektinstans" + IDM_COPYCLSID, "Kopier det valgte elementets GUID til utklippstavlen" + IDM_VIEW, "�pne viseren for det valgte elementet" + IDM_FLAG_INSERV, "Bruk CLSCTX_INPROC_SERVER ved kall til CoGetClassObject" + IDM_FLAG_INHANDL, "Bruk CLSCTX_INPROC_HANDLER ved kall til CoGetClassObject" + IDM_FLAG_LOCSERV, "Bruk CLSCTX_LOCAL_SERVER ved kall til CoGetClassObject" + IDM_FLAG_REMSERV, "Bruk CLSCTX_REMOTE_SERVER ved kall til CoGetClassObject" + IDM_EXPERT, "Bytt mellom ekspert- og nybegynnermodus" + IDM_HIDDEN, "Sl� av/p� visningen av komponentkategorier som ikke er ment � vises" + IDM_TOOLBAR, "Sl� verkt�ylinjen av/p�" + IDM_STATUSBAR, "Vis eller skjul statuslinjen" + IDM_REFRESH, "Oppdater alle lister" + IDM_ABOUT, "Vis programinformasjon, versjonnummer og opphavsrett" + + IDM_SAVEAS, "Lagre som en �.IDL�- eller �.H�-fil" + IDM_CLOSE, "Lukk vindu" + IDM_GROUP, "Sorter typeinfo etter type" + + IDS_TREE_OC, "Objektklasser" + IDS_TREE_GBCC, "Sorter etter komponentkategori" + IDS_TREE_O1O, "OLE 1.0-objekter" + IDS_TREE_CLO, "COM bibliotekobjekter" + IDS_TREE_AO, "Alle objekter" + IDS_TREE_AID, "Program-ID'er" + IDS_TREE_TL, "Typebibliotek" + IDS_TL_VER, "ver." + IDS_TREE_I, "Grensesnitt" + + IDS_TAB_REG, "Register" + IDS_TAB_IMPL, "Implementering" + IDS_TAB_ACTIV, "Aktivering" + + IDS_CGCOFAIL, "CoGetClassObject feilet." + IDS_ERROR_UNKN, "Ukjent feil" + IDS_TRUE, "Sann" + IDS_FALSE, "Usann" + IDS_BYTES, "byte" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) feilet ($%x)" + IDS_INHERITINTERFACES, "Arvete grensesnitt" +} + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Koble til en annen maskin" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Maskinnavn:", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Avbryt", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Systemoppsett" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Systeminnstillinger", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "Sl� p� distribu&ert COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Sl� p� eksterne tilkoblinge&r (kun Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "Disse innstillingene endrer kun registerverdier.\nDe p�virker ikke Wines ytelse.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Avbryt", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG DISCARDABLE 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Standard grensesnittviser" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Grensesnitt", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Lukk", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&Vis typeinfo", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG DISCARDABLE 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Grensesnittvsier for IPersist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klassenavn:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Lukk", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG DISCARDABLE 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Grensesnittviser for IPersistStream" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Klassenavn:", IDIGNORE, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", IDIGNORE, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&Lukk", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index d49305a..a00ab6b 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -25,6 +25,7 @@ #include "En.rc" #include "Fr.rc" #include "Ko.rc" +#include "No.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Alexander Nicolaysen Sørnes : winecfg: Updated Norwegian Bokmål translation.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 6908df76dd21b736cb871ab5380930c427a62199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6908df76dd21b736cb871ab53… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 26 14:49:51 2006 +0100 winecfg: Updated Norwegian Bokmål translation. --- programs/winecfg/No.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index e07eed0..c6bb2b1 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -184,16 +184,16 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 + LTEXT "Element:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "Farge:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "St�rrelse:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "Skrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 - CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + CONTROL "Listevisning",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED @@ -285,3 +285,23 @@ BEGIN IDS_UNAVAILABLE_DRIVER "Fant driver i registeret som ikke er tilgjengelig.\n\nFjerne �%s� fra registeret?" IDS_WARNING "Advarsel" END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "Styrer bakgrunnen" + IDC_SYSPARAMS_BUTTON_TEXT "Styrer tekst" + IDC_SYSPARAMS_DESKTOP "Skrivebord" + IDC_SYSPARAMS_MENU "Menybakgrunn" + IDC_SYSPARAMS_MENU_TEXT "Menytekst" + IDC_SYSPARAMS_SCROLLBAR "Rullefelt" + IDC_SYSPARAMS_SELECTION "Bakgrunn for merking" + IDC_SYSPARAMS_SELECTION_TEXT "Merket tekst" + IDC_SYSPARAMS_TOOLTIP "Bakgrunn for verkt�ytips" + IDC_SYSPARAMS_TOOLTIP_TEXT "Tekst i verkt�ytips" + IDC_SYSPARAMS_WINDOW "Vindubakgrunn" + IDC_SYSPARAMS_WINDOW_TEXT "Vinduteksts" + IDC_SYSPARAMS_ACTIVE_TITLE "Aktiv tittellinje" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titteltekst" + IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv tittellinje" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titteltekst" +END

1 0

Kevin Koltzau : winex11.drv: Process browser and multimedia key events.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 44685c234faf7c435f6eb08921b9a5bb879e7f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44685c234faf7c435f6eb0892… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Nov 26 01:33:22 2006 -0500 winex11.drv: Process browser and multimedia key events. --- dlls/winex11.drv/keyboard.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index fd85b56..19d3684 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1076,6 +1076,45 @@ static const WORD nonchar_key_scan[256] 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ }; +static const WORD xfree86_vendor_key_vkey[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF00 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF08 */ + 0, VK_VOLUME_DOWN, VK_VOLUME_MUTE, VK_VOLUME_UP, /* 1008FF10 */ + VK_MEDIA_PLAY_PAUSE, VK_MEDIA_STOP, + VK_MEDIA_PREV_TRACK, VK_MEDIA_NEXT_TRACK, + 0, VK_LAUNCH_MAIL, 0, VK_BROWSER_SEARCH, /* 1008FF18 */ + 0, 0, 0, VK_BROWSER_HOME, + 0, 0, 0, 0, 0, 0, VK_BROWSER_BACK, VK_BROWSER_FORWARD, /* 1008FF20 */ + VK_BROWSER_STOP, VK_BROWSER_REFRESH, 0, 0, 0, 0, 0, 0, /* 1008FF28 */ + VK_BROWSER_FAVORITES, 0, VK_LAUNCH_MEDIA_SELECT, 0, /* 1008FF30 */ + 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF38 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF40 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF48 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF50 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF58 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF60 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF68 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF70 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF78 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF80 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF88 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF90 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FF98 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFA0 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFA8 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFB0 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFB8 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFC0 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFC8 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFD0 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFD8 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFE0 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFE8 */ + 0, 0, 0, 0, 0, 0, 0, 0, /* 1008FFF0 */ + 0, 0, 0, 0, 0, 0, 0, 0 /* 1008FFF8 */ +}; /* Returns the Windows virtual key code associated with the X event <e> */ /* x11 lock must be held */ @@ -1623,6 +1662,11 @@ void X11DRV_InitKeyboard(void) scan = nonchar_key_scan[keysym & 0xff]; /* set extended bit when necessary */ if (scan & 0x100) vkey |= 0x100; + } else if ((keysym >> 8) == 0x1008FF) { /* XFree86 vendor keys */ + vkey = xfree86_vendor_key_vkey[keysym & 0xff]; + /* All vendor keys are extended with a scan code of 0 per testing on WinXP */ + scan = 0x100; + vkey |= 0x100; } else if (keysym == 0x20) { /* Spacebar */ vkey = VK_SPACE; scan = 0x39; @@ -2486,6 +2530,11 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UIN ret = 1; goto found; } + else if ((keysym >> 8) == 0x1008FF) { + bufW[0] = 0; + ret = 0; + goto found; + } else { const char *ksname;

1 0

Kevin Koltzau : user32: Generate WM_APPCOMMAND messages for browser and multimedia keys.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 80db3ad8bb0e7bd6cffa20a59e121ac337b8300e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80db3ad8bb0e7bd6cffa20a59… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Nov 26 01:31:27 2006 -0500 user32: Generate WM_APPCOMMAND messages for browser and multimedia keys. --- dlls/user32/defwnd.c | 10 ++++++++++ dlls/user32/message.c | 34 +++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c07398f..9278ddd 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -711,6 +711,16 @@ static LRESULT DEFWND_DefWinProc( HWND h case WM_HELP: SendMessageW( GetParent(hwnd), msg, wParam, lParam ); break; + + case WM_APPCOMMAND: + { + HWND parent = GetParent(hwnd); + if(!parent) + HOOK_CallHooks(WH_SHELL, HSHELL_APPCOMMAND, wParam, lParam, TRUE); + else + SendMessageW( parent, msg, wParam, lParam ); + break; + } } return 0; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index df3dcd4..e6dacd3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1637,20 +1637,28 @@ static BOOL process_keyboard_message( MS if (remove) { - /* Handle F1 key by sending out WM_HELP message */ - if ((msg->message == WM_KEYUP) && - (msg->wParam == VK_F1) && - (msg->hwnd != GetDesktopWindow()) && - !MENU_IsMenuActive()) + if((msg->message == WM_KEYDOWN) && + (msg->hwnd != GetDesktopWindow())) { - HELPINFO hi; - hi.cbSize = sizeof(HELPINFO); - hi.iContextType = HELPINFO_WINDOW; - hi.iCtrlId = GetWindowLongPtrA( msg->hwnd, GWLP_ID ); - hi.hItemHandle = msg->hwnd; - hi.dwContextId = GetWindowContextHelpId( msg->hwnd ); - hi.MousePos = msg->pt; - SendMessageW( msg->hwnd, WM_HELP, 0, (LPARAM)&hi ); + /* Handle F1 key by sending out WM_HELP message */ + if(msg->wParam == VK_F1 && + !MENU_IsMenuActive()) + { + HELPINFO hi; + hi.cbSize = sizeof(HELPINFO); + hi.iContextType = HELPINFO_WINDOW; + hi.iCtrlId = GetWindowLongPtrA( msg->hwnd, GWLP_ID ); + hi.hItemHandle = msg->hwnd; + hi.dwContextId = GetWindowContextHelpId( msg->hwnd ); + hi.MousePos = msg->pt; + SendMessageW( msg->hwnd, WM_HELP, 0, (LPARAM)&hi ); + } + else if(msg->wParam >= VK_BROWSER_BACK && + msg->wParam <= VK_LAUNCH_APP2) + { + /* FIXME: Process keystate */ + SendMessageW(msg->hwnd, WM_APPCOMMAND, (WPARAM)msg->hwnd, MAKELPARAM(0, (FAPPCOMMAND_KEY | (msg->wParam - VK_BROWSER_BACK + 1)))); + } } }

1 0

Kevin Koltzau : winuser.h: Add some HSHELL and APPCOMMAND defines.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 00ad155a40930f7026c9c5d1d2abbcad19b66629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ad155a40930f7026c9c5d1d… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Nov 26 01:27:50 2006 -0500 winuser.h: Add some HSHELL and APPCOMMAND defines. --- include/winuser.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 41b99e9..7533312 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3742,6 +3742,88 @@ typedef struct tagTRACKMOUSEEVENT { #define HSHELL_WINDOWCREATED 1 #define HSHELL_WINDOWDESTROYED 2 #define HSHELL_ACTIVATESHELLWINDOW 3 +#define HSHELL_WINDOWACTIVATED 4 +#define HSHELL_GETMINRECT 5 +#define HSHELL_REDRAW 6 +#define HSHELL_TASKMAN 7 +#define HSHELL_LANGUAGE 8 +#define HSHELL_SYSMENU 9 +#define HSHELL_ENDTASK 10 +#define HSHELL_ACCESSIBILITYSTATE 11 +#define HSHELL_APPCOMMAND 12 +#define HSHELL_WINDOWREPLACED 13 +#define HSHELL_WINDOWREPLACING 14 + +#define HSHELL_HIGHBIT 0x8000 +#define HSHELL_FLASH (HSHELL_REDRAW|HSHELL_HIGHBIT) +#define HSHELL_RUDEAPPACTIVATED (HSHELL_WINDOWACTIVATED|HSHELL_HIGHBIT) + +/* App commands */ +#define APPCOMMAND_BROWSER_BACKWARD 1 +#define APPCOMMAND_BROWSER_FORWARD 2 +#define APPCOMMAND_BROWSER_REFRESH 3 +#define APPCOMMAND_BROWSER_STOP 4 +#define APPCOMMAND_BROWSER_SEARCH 5 +#define APPCOMMAND_BROWSER_FAVORITES 6 +#define APPCOMMAND_BROWSER_HOME 7 +#define APPCOMMAND_VOLUME_MUTE 8 +#define APPCOMMAND_VOLUME_DOWN 9 +#define APPCOMMAND_VOLUME_UP 10 +#define APPCOMMAND_MEDIA_NEXTTRACK 11 +#define APPCOMMAND_MEDIA_PREVIOUSTRACK 12 +#define APPCOMMAND_MEDIA_STOP 13 +#define APPCOMMAND_MEDIA_PLAY_PAUSE 14 +#define APPCOMMAND_LAUNCH_MAIL 15 +#define APPCOMMAND_LAUNCH_MEDIA_SELECT 16 +#define APPCOMMAND_LAUNCH_APP1 17 +#define APPCOMMAND_LAUNCH_APP2 18 +#define APPCOMMAND_BASS_DOWN 19 +#define APPCOMMAND_BASS_BOOST 20 +#define APPCOMMAND_BASS_UP 21 +#define APPCOMMAND_TREBLE_DOWN 22 +#define APPCOMMAND_TREBLE_UP 23 +#define APPCOMMAND_MICROPHONE_VOLUME_MUTE 24 +#define APPCOMMAND_MICROPHONE_VOLUME_DOWN 25 +#define APPCOMMAND_MICROPHONE_VOLUME_UP 26 +#define APPCOMMAND_HELP 27 +#define APPCOMMAND_FIND 28 +#define APPCOMMAND_NEW 29 +#define APPCOMMAND_OPEN 30 +#define APPCOMMAND_CLOSE 31 +#define APPCOMMAND_SAVE 32 +#define APPCOMMAND_PRINT 33 +#define APPCOMMAND_UNDO 34 +#define APPCOMMAND_REDO 35 +#define APPCOMMAND_COPY 36 +#define APPCOMMAND_CUT 37 +#define APPCOMMAND_PASTE 38 +#define APPCOMMAND_REPLY_TO_MAIL 39 +#define APPCOMMAND_FORWARD_MAIL 40 +#define APPCOMMAND_SEND_MAIL 41 +#define APPCOMMAND_SPELL_CHECK 42 +#define APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE 43 +#define APPCOMMAND_MIC_ON_OFF_TOGGLE 44 +#define APPCOMMAND_CORRECTION_LIST 45 +#define APPCOMMAND_MEDIA_PLAY 46 +#define APPCOMMAND_MEDIA_PAUSE 47 +#define APPCOMMAND_MEDIA_RECORD 48 +#define APPCOMMAND_MEDIA_FAST_FORWARD 49 +#define APPCOMMAND_MEDIA_REWIND 50 +#define APPCOMMAND_MEDIA_CHANNEL_UP 51 +#define APPCOMMAND_MEDIA_CHANNEL_DOWN 52 +#define APPCOMMAND_DELETE 53 +#define APPCOMMAND_DWM_FLIP3D 54 + +#define FAPPCOMMAND_MOUSE 0x8000 +#define FAPPCOMMAND_KEY 0 +#define FAPPCOMMAND_OEM 0x1000 +#define FAPPCOMMAND_MASK 0xF000 + +#define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK)) +#define GET_DEVICE_LPARAM(lParam) ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK)) +#define GET_MOUSEORKEY_LPARAM GET_DEVICE_LPARAM +#define GET_FLAGS_LPARAM(lParam) (LOWORD(lParam)) +#define GET_KEYSTATE_LPARAM(lParam) GET_FLAGS_LPARAM(lParam) /* Predefined Clipboard Formats */ #define CF_TEXT 1

1 0

Kevin Koltzau : winuser.h: Define browser and multimedia keys.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: baaefe97830cdc5999cdca7b288f0eb499448ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baaefe97830cdc5999cdca7b2… Author: Kevin Koltzau <kevin(a)plop.org> Date: Sun Nov 26 01:27:14 2006 -0500 winuser.h: Define browser and multimedia keys. --- dlls/user32/spy.c | 36 ++++++++++++++++++------------------ include/winuser.h | 22 +++++++++++++++++++++- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 6758bb2..d23d230 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1233,24 +1233,24 @@ static const char * const VK_KeyNames[SP "VK_RCONTROL", /* 0xA3 */ "VK_LMENU", /* 0xA4 */ "VK_RMENU", /* 0xA5 */ - NULL, /* 0xA6 */ - NULL, /* 0xA7 */ - NULL, /* 0xA8 */ - NULL, /* 0xA9 */ - NULL, /* 0xAA */ - NULL, /* 0xAB */ - NULL, /* 0xAC */ - NULL, /* 0xAD */ - NULL, /* 0xAE */ - NULL, /* 0xAF */ - NULL, /* 0xB0 */ - NULL, /* 0xB1 */ - NULL, /* 0xB2 */ - NULL, /* 0xB3 */ - NULL, /* 0xB4 */ - NULL, /* 0xB5 */ - NULL, /* 0xB6 */ - NULL, /* 0xB7 */ + "VK_BROWSER_BACK", /* 0xA6 */ + "VK_BROWSER_FORWARD", /* 0xA7 */ + "VK_BROWSER_REFRESH", /* 0xA8 */ + "VK_BROWSER_STOP", /* 0xA9 */ + "VK_BROWSER_SEARCH", /* 0xAA */ + "VK_BROWSER_FAVORITES", /* 0xAB */ + "VK_BROWSER_HOME", /* 0xAC */ + "VK_VOLUME_MUTE", /* 0xAD */ + "VK_VOLUME_DOWN", /* 0xAE */ + "VK_VOLUME_UP", /* 0xAF */ + "VK_MEDIA_NEXT_TRACK", /* 0xB0 */ + "VK_MEDIA_PREV_TRACK", /* 0xB1 */ + "VK_MEDIA_STOP", /* 0xB2 */ + "VK_MEDIA_PLAY_PAUSE", /* 0xB3 */ + "VK_LAUNCH_MAIL", /* 0xB4 */ + "VK_LAUNCH_MEDIA_SELECT", /* 0xB5 */ + "VK_LAUNCH_APP1", /* 0xB6 */ + "VK_LAUNCH_APP2", /* 0xB7 */ NULL, /* 0xB8 */ NULL, /* 0xB9 */ "VK_OEM_1", /* 0xBA */ diff --git a/include/winuser.h b/include/winuser.h index 8015ea2..41b99e9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3615,7 +3615,27 @@ typedef struct tagCOMPAREITEMSTRUCT #define VK_RCONTROL 0xA3 #define VK_LMENU 0xA4 #define VK_RMENU 0xA5 -/* 0xA6-0xB9 Unassigned */ + +#define VK_BROWSER_BACK 0xA6 +#define VK_BROWSER_FORWARD 0xA7 +#define VK_BROWSER_REFRESH 0xA8 +#define VK_BROWSER_STOP 0xA9 +#define VK_BROWSER_SEARCH 0xAA +#define VK_BROWSER_FAVORITES 0xAB +#define VK_BROWSER_HOME 0xAC +#define VK_VOLUME_MUTE 0xAD +#define VK_VOLUME_DOWN 0xAE +#define VK_VOLUME_UP 0xAF +#define VK_MEDIA_NEXT_TRACK 0xB0 +#define VK_MEDIA_PREV_TRACK 0xB1 +#define VK_MEDIA_STOP 0xB2 +#define VK_MEDIA_PLAY_PAUSE 0xB3 +#define VK_LAUNCH_MAIL 0xB4 +#define VK_LAUNCH_MEDIA_SELECT 0xB5 +#define VK_LAUNCH_APP1 0xB6 +#define VK_LAUNCH_APP2 0xB7 + +/* 0xB8-0xB9 Unassigned */ #define VK_OEM_1 0xBA #define VK_OEM_PLUS 0xBB #define VK_OEM_COMMA 0xBC

1 0

Dmitry Timoshkov : kernel32: Improve the PE loader test.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: f4b444249b89383f1c20927a6c14f5b6ff880b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b444249b89383f1c20927a6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Nov 25 02:44:10 2006 +0800 kernel32: Improve the PE loader test. --- dlls/kernel32/tests/loader.c | 83 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index d9aa13b..cd5b500 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -19,11 +19,14 @@ */ #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wine/test.h" +#define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) + static const struct { WORD e_magic; /* 00: MZ Header signature */ @@ -36,7 +39,7 @@ static const struct static IMAGE_NT_HEADERS nt_header = { - IMAGE_NT_SIGNATURE, + IMAGE_NT_SIGNATURE, /* Signature */ #ifdef __i386__ { IMAGE_FILE_MACHINE_I386, /* Machine */ #else @@ -120,6 +123,11 @@ START_TEST(loader) sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), ERROR_SUCCESS }, + { sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x1000, + 0x1f00, + 0x1000, + ERROR_SUCCESS + }, { sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x200, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), @@ -139,11 +147,19 @@ START_TEST(loader) sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, 0x200, ERROR_SUCCESS + }, + /* Mandatory are all fields up to SizeOfHeaders, everything else + * is really optional (at least that's true for XP). + */ + { FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x200, 0x200, + sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER) + 0x10, + sizeof(dos_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum) + sizeof(IMAGE_SECTION_HEADER), + ERROR_SUCCESS } }; static const char filler[0x1000]; int i; - DWORD dummy; + DWORD dummy, file_size, file_align; HANDLE hfile, hlib; SYSTEM_INFO si; char temp_path[MAX_PATH]; @@ -176,21 +192,50 @@ START_TEST(loader) nt_header.OptionalHeader.SectionAlignment = td[i].section_alignment; nt_header.OptionalHeader.FileAlignment = td[i].file_alignment; - nt_header.OptionalHeader.SizeOfImage =td[i].size_of_image; + nt_header.OptionalHeader.SizeOfImage = td[i].size_of_image; nt_header.OptionalHeader.SizeOfHeaders = td[i].size_of_headers; SetLastError(0xdeadbeef); - ok(WriteFile(hfile, &nt_header, sizeof(nt_header), &dummy, NULL), + ok(WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL), "WriteFile error %d\n", GetLastError()); - section.VirtualAddress = nt_header.OptionalHeader.SectionAlignment; - section.PointerToRawData = nt_header.OptionalHeader.FileAlignment; - SetLastError(0xdeadbeef); - ok(WriteFile(hfile, &section, sizeof(section), &dummy, NULL), - "WriteFile error %d\n", GetLastError()); + if (nt_header.FileHeader.SizeOfOptionalHeader) + { + assert(nt_header.FileHeader.SizeOfOptionalHeader <= sizeof(IMAGE_OPTIONAL_HEADER)); + + SetLastError(0xdeadbeef); + ok(WriteFile(hfile, &nt_header.OptionalHeader, nt_header.FileHeader.SizeOfOptionalHeader, &dummy, NULL), + "WriteFile error %d\n", GetLastError()); + } + + if (nt_header.OptionalHeader.SectionAlignment == si.dwPageSize) + { + section.VirtualAddress = nt_header.OptionalHeader.SectionAlignment; + section.PointerToRawData = nt_header.OptionalHeader.FileAlignment; + SetLastError(0xdeadbeef); + ok(WriteFile(hfile, &section, sizeof(section), &dummy, NULL), + "WriteFile error %d\n", GetLastError()); + file_size = GetFileSize(hfile, NULL); + + file_align = ALIGN_SIZE(file_size, nt_header.OptionalHeader.FileAlignment) - file_size; + SetLastError(0xdeadbeef); + ok(WriteFile(hfile, filler, file_align, &dummy, NULL), + "WriteFile error %d\n", GetLastError()); + } + else + { + section.VirtualAddress = nt_header.OptionalHeader.SizeOfHeaders; + section.PointerToRawData = nt_header.OptionalHeader.SizeOfHeaders; + SetLastError(0xdeadbeef); + ok(WriteFile(hfile, &section, sizeof(section), &dummy, NULL), + "WriteFile error %d\n", GetLastError()); + } + + /* section data */ SetLastError(0xdeadbeef); - ok(WriteFile(hfile, filler, sizeof(filler), &dummy, NULL), + ok(WriteFile(hfile, filler, 0x10, &dummy, NULL), "WriteFile error %d\n", GetLastError()); + CloseHandle(hfile); SetLastError(0xdeadbeef); @@ -207,7 +252,8 @@ START_TEST(loader) ok(info.BaseAddress == hlib, "%d: %p != %p\n", i, info.BaseAddress, hlib); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); - ok(info.RegionSize == 0x2000, "%d: %lx != 0x2000\n", i, info.RegionSize); + ok(info.RegionSize == ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize), "%d: got %lx != expected %x\n", + i, info.RegionSize, ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize)); ok(info.State == MEM_COMMIT, "%d: %x != MEM_COMMIT\n", i, info.State); if (nt_header.OptionalHeader.SectionAlignment != si.dwPageSize) ok(info.Protect == PAGE_EXECUTE_WRITECOPY, "%d: %x != PAGE_EXECUTE_WRITECOPY\n", i, info.Protect); @@ -221,7 +267,8 @@ START_TEST(loader) if (nt_header.OptionalHeader.SectionAlignment == si.dwPageSize || nt_header.OptionalHeader.SectionAlignment == nt_header.OptionalHeader.FileAlignment) { - ok(info.BaseAddress == (char *)hlib + 0x2000, "%d: %p != %p\n", i, info.BaseAddress, (char *)hlib + 0x2000); + ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize), "%d: %p != %p\n", + i, info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize)); todo_wine { ok(info.AllocationBase == 0, "%d: %p != 0\n", i, info.AllocationBase); } @@ -249,8 +296,20 @@ todo_wine { ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); } else + { + if (hlib) /* remove completely once Wine is fixed */ + { + todo_wine ok(!hlib, "%d: LoadLibrary should fail\n", i); + FreeLibrary(hlib); + DeleteFile(dll_name); + continue; + } + + ok(!hlib, "%d: LoadLibrary should fail\n", i); + ok(td[i].error == GetLastError(), "%d: expected error %d, got %d\n", i, td[i].error, GetLastError()); + } SetLastError(0xdeadbeef); ok(DeleteFile(dll_name), "DeleteFile error %d\n", GetLastError());

1 0