August 2010 - Wine-commits - list.winehq.org

Anders Jonsson : README: Update Swedish translation.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: d43c40aa8b8661de6c84de32d0efe27dfc81037e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43c40aa8b8661de6c84de32d… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sun Aug 1 12:15:47 2010 +0200 README: Update Swedish translation. --- documentation/README.sv | 59 ++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 38 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index 7fea59d..bb12f7c 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -1,13 +1,13 @@ 1. INLEDNING Wine �r ett program som g�r det m�jligt att k�ra Windows-program -(inkluderat DOS, Windows 3.x och Win32) i Unix. Det best�r av en +(inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det best�r av en programstartare som startar och k�r Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hj�lp av deras Unix- eller X11-motsvarigheter. Biblioteket kan ocks� anv�ndas -till att porta Win32-kod till vanliga Unix-program. +till att porta Windows-kod till vanliga Unix-program. -Wine �r fri programvara, utgett under villk�ren i GNU LGPL; se +Wine �r fri programvara, utgett under villkoren i GNU LGPL; se filen LICENSE f�r detaljer. 2. KOM IG�NG @@ -39,12 +39,12 @@ st Information f�r Linux �ven om Linux 2.2.x antagligen fortfarande fungerar, och Linux 2.0.x kanske fungerar (tidiga 2.0.x-versioner uppvisade tr�drelaterade problem), s� �r - det b�st att ha en nuvarande kernel som 2.4.x eller 2.6.x. + det b�st att ha en aktuell kernel som 2.4.x eller 2.6.x. Information f�r FreeBSD Wine kommer i regel inte fungera p� FreeBSD-versioner �ldre �n 6.3 eller 7.0. FreeBSD 6.3 kan uppdateras for att st�dja Wine. Se - <http://wiki.freebsd.org/Wine> f�r mer information. + http://wiki.freebsd.org/Wine f�r mer information. Information f�r Solaris Wine m�ste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -72,7 +72,7 @@ Grundl Du m�ste givetvis ocks� ha "make" (mest troligt "GNU make"). - Det �r ocks� n�dv�ndigt att ha flex 2.5 eller senare samt bison. + Det �r ocks� n�dv�ndigt att ha flex 2.5.33 eller senare samt bison. Valfria st�dbibliotek: configure-skriptet visar varningar n�r valfria bibliotek inte hittats. @@ -80,15 +80,16 @@ Valfria st vilka paket du b�r installera. P� 64 bit-system m�ste du s�kerst�lla att 32 bit-versionerna av - ovann�mnda bibliotek installerats; se - http://wiki.winehq.org/WineOn64bit f�r n�rmare detaljer. + ovann�mnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit + f�r n�rmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad + 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 f�r + detaljer. 4. KOMPILERING K�r f�ljande kommandon f�r att bygga Wine om du inte anv�nder wineinstall: ./configure -make depend make Detta bygger programmet "wine" och diverse st�dbibliotek/programfiler. @@ -98,18 +99,6 @@ Windows-k K�r './configure --help' f�r att se inst�llningar och val vid kompilering. -G�r f�ljande f�r att uppgradera till en ny utg�va med hj�lp av en -uppdateringsfil: -G� in i utg�vans rotkatalog och k�r kommandot "make clean". -D�refter uppdaterar du utg�van med - - bunzip -c uppdateringsfil | patch -p1 - -d�r "uppdateringsfil" �r namnet p� uppdateringsfilen (n�got i stil med -wine-1.0.x.diff.bz2). D�refter kan du k�ra "./configure" och -"make depend && make". - - 5. INSTALLATION N�r Wine �r byggt kan du k�ra "make install" f�r att installera det; @@ -136,13 +125,11 @@ Exempel: f wine ~/.wine/drive_c/windows/notepad.exe (anv�ndning av Unix-filv�gar) - wine notepad.exe /parameter1 -parameter2 parameter3 - (k�ra program med parametrar) + wine notepad.exe readme.txt (k�ra program med parametrar) -Wine �r inte �nnu f�rdigutvecklat, s� det �r m�jligt att �tskilliga program -kraschar. I s� fall �ppnas Wines fels�kare, d�r du kan unders�ka och fixa -problemet. L�s delen "debugging" i Wines utvecklarmanual f�r mer information -om hur detta kan g�ras. +Wine �r inte perfekt, s� det �r m�jligt att vissa program kraschar. +I s� fall f�r du en kraschlogg som du b�r bifoga till din rapport d� du +rapporterar ett fel. 7. MER INFORMATION @@ -153,29 +140,25 @@ Internet: Mycket information om Wine finns samlat p Fr�gor: Fr�gor och svar om Wine finns samlade p� http://www.winehq.org/FAQ -Usenet: Du kan diskutera problem med Wine och f� hj�lp p� - comp.emulators.ms-windows.wine. - Fel: Rapportera fel till Wines Bugzilla p� http://bugs.winehq.org S�k i Bugzilla-databasen f�r att se om problemet redan finns - rapporterat innan du s�nder en felrapport. Du kan ocks� rapportera - fel till comp.emulators.ms-windows.wine. + rapporterat innan du s�nder en felrapport. IRC: Hj�lp finns tillg�nglig online p� kanalen #WineHQ p� irc.freenode.net. -GIT: Wines nuvarande utvecklingsversion finns tillg�nglig genom GIT. +Git: Wines nuvarande utvecklingsversion finns tillg�nglig genom Git. G� till http://www.winehq.org/git f�r mer information. E-postlistor: - Det finns flera e-postlistor f�r Wine-utvecklare; se - http://www.winehq.org/forums f�r mer information. + Det finns flera e-postlistor f�r Wine-anv�ndare och -utvecklare; se + http://www.winehq.org/forums f�r mer information. -Wiki: Wines Wiki finns p� http://wiki.winehq.org +Wiki: Wines Wiki finns p� http://wiki.winehq.org Om du l�gger till n�got eller fixar ett fel, �r det bra om du s�nder -en patch (i 'diff -u'-format) till listan wine-patches(a)winehq.org f�r -inkludering i n�sta utg�va av Wine. +en patch (f�rslagsvis med git-format-patch) till listan wine-patches(a)winehq.org +f�r inkludering i n�sta utg�va av Wine. -- Originalet till denna fil skrevs av

1 0

André Hentschel : winecfg: Sync German keyboard shortcuts.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: c6f1b6ba96df4f4bb065f80d746cdc56cbac0056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f1b6ba96df4f4bb065f80d7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 1 16:26:36 2010 +0200 winecfg: Sync German keyboard shortcuts. --- programs/winecfg/De.rc | 54 ++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 961124d..639435e 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -72,20 +72,20 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 - CONTROL "DirectX-Anwendungen können Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "DirectX-Anwendungen können &Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Erlaube dem Fenstermanager die &Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "&Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Desktop-Größe:",IDC_DESKTOP_SIZE,15,70,54,8,WS_DISABLED + LTEXT "Desktop-&Größe:",IDC_DESKTOP_SIZE,15,70,54,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,119,70,8,8,WS_DISABLED EDITTEXT IDC_DESKTOP_WIDTH,74,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,127,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Unterstützung für Vertex Shader: ",IDC_STATIC,15,106,80,32 + LTEXT "Unterstützung für &Vertex Shader: ",IDC_STATIC,15,106,80,32 COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Pixel Shader aktivieren (wenn von Hardware unterstützt)", IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 + CONTROL "&Pixel Shader aktivieren (wenn von Hardware unterstützt)", IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 GROUPBOX " Bildschi&rmauflösung ",IDC_STATIC,8,151,244,63 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 @@ -101,10 +101,10 @@ BEGIN GROUPBOX " DLL Überschreibung ",IDC_STATIC,8,4,244,210 LTEXT "DLLs (Dynamic Link Libraries) können einzeln eingestellt werden, entweder Builtin (gestellt durch Wine) oder Native (von Windows oder durch die Anwendung gestellt)." , IDC_STATIC,15,17,228,32 - LTEXT "Neue Überschreibung für:",IDC_STATIC,16,58,100,8 + LTEXT "&Neue Überschreibung für:",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "&Hinzufügen ",IDC_DLLS_ADDDLL, 164,68,82,13 - LTEXT "Bestehende Überschreibungen:",IDC_STATIC,16,86,100,8 + LTEXT "Bestehende Über&schreibungen:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,112,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Bearbeiten",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "&Entfernen",IDC_DLLS_REMOVEDLL,164,114,82,14 @@ -139,7 +139,7 @@ IDD_DRIVECFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Laufwerkszuordnung ",IDC_STATIC,8,4,244,195 + GROUPBOX " Laufwerksz&uordnung ",IDC_STATIC,8,4,244,195 LTEXT "Fehler beim Verbinden mit dem Mountmanager. Die Laufwerkskonfiguration kann nicht bearbeitet werden.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,190,76 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 @@ -165,7 +165,7 @@ BEGIN LTEXT "S&eriennr:",IDC_STATIC_SERIAL,15,183,41,12 EDITTEXT IDC_EDIT_SERIAL,60,180,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "Zeige Dot-Dateien an",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 + CONTROL "Zeige D&ot-Dateien an",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 END IDD_AUDIOCFG DIALOG 0, 0, 260, 220 @@ -176,13 +176,13 @@ BEGIN LTEXT "Wählen Sie einen Sound-Treiber durch ankreuzen des gewünschten Treibers. Ist kein Treiber ausgewählt, wird der Sound deaktiviert. Die Auswahl mehrerer Treiber ist nicht empfohlen. Ein Treiber kann durch Rechtsklicken konfiguriert werden.",IDC_STATIC,15,15,227,35 CONTROL "Geräte",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,105 PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "Einstellungen",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 + PUSHBUTTON "&Einstellungen",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,170,244,45 - LTEXT "Hardware-Beschleunigung: ", IDC_STATIC,15,180,90,10 + LTEXT "&Hardware-Beschleunigung: ", IDC_STATIC,15,180,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,105,178,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Abtastrate:",IDC_STATIC,15,197,70,8 + LTEXT "&Abtastrate:",IDC_STATIC,15,197,70,8 COMBOBOX IDC_DSOUND_RATES,90,195,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Bits pro Abtastung:",IDC_STATIC,137,197,80,8 + LTEXT "&Bits pro Abtastung:",IDC_STATIC,137,197,80,8 COMBOBOX IDC_DSOUND_BITS,220,195,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -191,27 +191,27 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Darstellung ",IDC_STATIC,8,4,244,106 - LTEXT "Motiv:",IDC_STATIC,15,16,130,8 + LTEXT "&Motiv:",IDC_STATIC,15,16,130,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Motiv installieren...",IDC_THEME_INSTALL,152,23,93,14 - LTEXT "Farbe:",IDC_THEME_COLORTEXT,15,40,112,8 + PUSHBUTTON "Motiv &installieren...",IDC_THEME_INSTALL,152,23,93,14 + LTEXT "&Farbe:",IDC_THEME_COLORTEXT,15,40,112,8 COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Größe:",IDC_THEME_SIZETEXT,135,40,110,8 + LTEXT "&Größe:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Element:",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 "Farbe:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "F&arbe:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Größe:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "G&röße:",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 "Schrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " Shell-Ordner ",IDC_STATIC,8,114,244,100 + PUSHBUTTON "&Schrift",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + GROUPBOX " Shell-&Ordner ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Verknüpfe:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "&Verknüpfe:",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 - PUSHBUTTON "Wählen",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "&Wählen",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE @@ -220,8 +220,8 @@ BEGIN IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Laufwerke" IDS_CHOOSE_PATH "Bitte wählen Sie das Ziel-Unix-Verzeichnis." - IDS_HIDE_ADVANCED "Verstecke Erweitert" - IDS_SHOW_ADVANCED "Zeige Erweitert" + IDS_HIDE_ADVANCED "nicht &Erweitert" + IDS_SHOW_ADVANCED "&Erweitert" IDS_NOTHEME "(Kein Motiv)" IDS_TAB_GRAPHICS "Grafik" IDS_TAB_DESKTOP_INTEGRATION "Desktop-Integration"

1 0

Stefan Dösinger : wined3d: Add double to float conversion casts in device.c.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: fc5eeebe1a788ea192f4c57d3f2c6a962e94e0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5eeebe1a788ea192f4c57d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 30 06:44:49 2010 +0200 wined3d: Add double to float conversion casts in device.c. --- dlls/wined3d/device.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f18b477..2f73c0b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2611,7 +2611,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLight(IWineD3DDevice *iface, DWORD I { object->exponent = 128.0f; } - object->cutoff = pLight->Phi*90/M_PI; + object->cutoff = (float) (pLight->Phi*90/M_PI); /* FIXME: Range */ break; @@ -2814,10 +2814,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetClipPlane(IWineD3DDevice *iface, DWO return WINED3DERR_INVALIDCALL; } - pPlane[0] = This->stateBlock->clipplane[Index][0]; - pPlane[1] = This->stateBlock->clipplane[Index][1]; - pPlane[2] = This->stateBlock->clipplane[Index][2]; - pPlane[3] = This->stateBlock->clipplane[Index][3]; + pPlane[0] = (float) This->stateBlock->clipplane[Index][0]; + pPlane[1] = (float) This->stateBlock->clipplane[Index][1]; + pPlane[2] = (float) This->stateBlock->clipplane[Index][2]; + pPlane[3] = (float) This->stateBlock->clipplane[Index][3]; return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Fix another DWORD to WORD conversion warning.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 4d45a791b652ef46c0b19d11f746b1c6cdd5e714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d45a791b652ef46c0b19d11f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 16:27:02 2010 +0200 wined3d: Fix another DWORD to WORD conversion warning. --- dlls/wined3d/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 3fd8be9..1366ef1 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -74,7 +74,7 @@ static ULONG WINAPI IWineD3DPaletteImpl_Release(IWineD3DPalette *iface) { } /* Not called from the vtable */ -static DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) +static WORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { switch (dwFlags & SIZE_BITS) { case WINEDDPCAPS_1BIT: return 2;

1 0

Stefan Dösinger : wined3d: Replace pow with powf in surface_base.c.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 4431f6c11dd8dc9c2e07f670e6dd4e6282cde9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4431f6c11dd8dc9c2e07f670e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 17:30:17 2010 +0200 wined3d: Replace pow with powf in surface_base.c. --- dlls/wined3d/surface_base.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 2bd0e37..6f7408d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -46,18 +46,18 @@ static inline unsigned short float_32_to_16(const float *in) if(isnan(*in)) return 0x7C01; if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00); - if(tmp < pow(2, 10)) { + if(tmp < powf(2, 10)) { do { tmp = tmp * 2.0f; exp--; - }while(tmp < pow(2, 10)); - } else if(tmp >= pow(2, 11)) { + }while(tmp < powf(2, 10)); + } else if(tmp >= powf(2, 11)) { do { tmp /= 2.0f; exp++; - }while(tmp >= pow(2, 11)); + }while(tmp >= powf(2, 11)); } mantissa = (unsigned int) tmp;

1 0

Stefan Dösinger : wined3d: MSVC fixes in state.c.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 515eb3d7c4e57590e4978dd3466d4497f98be22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=515eb3d7c4e57590e4978dd34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 19:07:19 2010 +0200 wined3d: MSVC fixes in state.c. --- dlls/wined3d/state.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f35091..d052696 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1459,7 +1459,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { GLfloat scaleFactor; - float h = stateblock->viewport.Height; + DWORD h = stateblock->viewport.Height; if (pointSize.f < gl_info->limits.pointsize_min) { @@ -1487,7 +1487,7 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } else { scaleFactor = 1.0f; } - scaleFactor = pow(h * scaleFactor, 2); + scaleFactor = powf(h * scaleFactor, 2); att[0] = A.f / scaleFactor; att[1] = B.f / scaleFactor; @@ -3600,7 +3600,7 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w IWineD3DDeviceImpl *device = stateblock->device; BOOL use_pshader = use_ps(stateblock); BOOL use_vshader = use_vs(stateblock); - int i; + unsigned int i; if (use_pshader) { if(!context->last_was_pshader) {

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add Favorites menu to IE.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: 8156323404017353d3114879896a70f1873e65a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8156323404017353d31148798… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 29 12:04:46 2010 +0200 shdocvw: Add Favorites menu to IE. --- dlls/shdocvw/En.rc | 5 +++ dlls/shdocvw/ie.c | 10 +----- dlls/shdocvw/iexplore.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/resource.h | 2 + dlls/shdocvw/shdocvw.h | 1 + 5 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 749c849..0c70851 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -50,6 +50,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Properties...", ID_BROWSE_PROPERTIES } + POPUP "&Favorites" + { + MENUITEM "&Add to Favorites..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Help" { MENUITEM "&About Internet Explorer...", ID_BROWSE_ABOUT diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 43afd31..2a048e3 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -430,19 +430,11 @@ static HRESULT WINAPI InternetExplorer_put_MenuBar(IWebBrowser2 *iface, VARIANT_ TRACE("(%p)->(%x)\n", This, Value); - if((menu = GetMenu(This->frame_hwnd))) - DestroyMenu(menu); - - menu = NULL; - if(Value) - menu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); + menu = This->menu; if(!SetMenu(This->frame_hwnd, menu)) - { - DestroyMenu(menu); return HRESULT_FROM_WIN32(GetLastError()); - } return S_OK; } diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 2f15987..f22dcd5 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -34,6 +34,9 @@ #include "shdocvw.h" #include "mshtmcid.h" #include "shellapi.h" +#include "winreg.h" +#include "shlwapi.h" +#include "intshcut.h" #include "wine/debug.h" @@ -75,6 +78,87 @@ void adjust_ie_docobj_rect(HWND frame, RECT* rc) } } +static HMENU get_fav_menu(HMENU menu) +{ + return GetSubMenu(menu, 1); +} + +static void add_fav_to_menu(HMENU menu, LPWSTR title) +{ + MENUITEMINFOW item; + + item.cbSize = sizeof(item); + item.fMask = MIIM_FTYPE | MIIM_STRING; + item.fType = MFT_STRING; + item.dwTypeData = title; + InsertMenuItemW(menu, GetMenuItemCount(menu), TRUE, &item); +} + +static void add_favs_to_menu(HMENU menu, LPCWSTR dir) +{ + WCHAR path[MAX_PATH*2]; + const WCHAR urlext[] = {'*','.','u','r','l',0}; + WCHAR* filename; + HANDLE findhandle; + WIN32_FIND_DATAW finddata; + IUniformResourceLocatorW* urlobj; + IPersistFile* urlfile; + HRESULT res; + + lstrcpyW(path, dir); + PathAppendW(path, urlext); + + findhandle = FindFirstFileW(path, &finddata); + + if(findhandle == INVALID_HANDLE_VALUE) + return; + + res = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER, &IID_IUniformResourceLocatorW, (PVOID*)&urlobj); + + if(SUCCEEDED(res)) + res = IUnknown_QueryInterface(urlobj, &IID_IPersistFile, (PVOID*)&urlfile); + + if(SUCCEEDED(res)) + { + filename = path + lstrlenW(path) - lstrlenW(urlext); + + do + { + WCHAR* fileext; + lstrcpyW(filename, finddata.cFileName); + + if(FAILED(IPersistFile_Load(urlfile, path, 0))) + continue; + + fileext = filename + lstrlenW(filename) - lstrlenW(urlext) + 1; + *fileext = 0; + add_fav_to_menu(menu, filename); + } while(FindNextFileW(findhandle, &finddata)); + } + + if(urlfile) + IPersistFile_Release(urlfile); + + if(urlobj) + IUnknown_Release(urlobj); + + FindClose(findhandle); +} + +static HMENU create_ie_menu(void) +{ + HMENU menu = LoadMenuW(shdocvw_hinstance, MAKEINTRESOURCEW(IDR_BROWSE_MAIN_MENU)); + WCHAR path[MAX_PATH]; + + if(SHGetFolderPathW(NULL, CSIDL_COMMON_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) + add_favs_to_menu(get_fav_menu(menu), path); + + if(SHGetFolderPathW(NULL, CSIDL_FAVORITES, NULL, SHGFP_TYPE_CURRENT, path) == S_OK) + add_favs_to_menu(get_fav_menu(menu), path); + + return menu; +} + static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static InternetExplorer* This; @@ -167,6 +251,8 @@ static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) InternetExplorer* This = (InternetExplorer*)lpcs->lpCreateParams; SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); + This->menu = create_ie_menu(); + This->status_hwnd = CreateStatusWindowW(CCS_NODIVIDER|WS_CHILD|WS_VISIBLE, NULL, hwnd, IDC_BROWSE_STATUSBAR); SendMessageW(This->status_hwnd, SB_SIMPLE, TRUE, 0); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 91e9a11..5e7f45d 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -37,3 +37,5 @@ #define ID_BROWSE_PRINT_PREVIEW 277 #define ID_BROWSE_PROPERTIES 262 #define ID_BROWSE_ABOUT 336 + +#define ID_BROWSE_ADDFAV 1200 diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d20e834..d45f559 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -190,6 +190,7 @@ struct InternetExplorer { HWND frame_hwnd; HWND status_hwnd; + HMENU menu; DocHost doc_host; };

1 0

Alexander Nicolaysen Sørnes : shdocvw: Allow navigating to Favorites in IE.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: a91bb52c6980a05720f1bb9ea60b153bff2a0955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91bb52c6980a05720f1bb9ea… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 29 12:12:54 2010 +0200 shdocvw: Allow navigating to Favorites in IE. --- dlls/shdocvw/iexplore.c | 74 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/shdocvw/resource.h | 3 ++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index f22dcd5..bef25ab 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -83,15 +83,55 @@ static HMENU get_fav_menu(HMENU menu) return GetSubMenu(menu, 1); } -static void add_fav_to_menu(HMENU menu, LPWSTR title) +static LPCWSTR get_fav_url_from_id(HMENU menu, UINT id) { MENUITEMINFOW item; item.cbSize = sizeof(item); - item.fMask = MIIM_FTYPE | MIIM_STRING; + item.fMask = MIIM_DATA; + + if(!GetMenuItemInfoW(menu, id, FALSE, &item)) + return NULL; + + return (LPWSTR)item.dwItemData; +} + +static void free_fav_menu_data(HMENU menu) +{ + LPCWSTR url; + int i; + + for(i = 0; (url = get_fav_url_from_id(menu, ID_BROWSE_GOTOFAV_FIRST + i)); i++) + heap_free((LPWSTR)url); +} + +static void add_fav_to_menu(HMENU menu, LPWSTR title, LPCWSTR url) +{ + MENUITEMINFOW item; + /* Subtract the number of standard elements in the Favorites menu */ + INT favcount = GetMenuItemCount(menu) - 2; + LPWSTR urlbuf; + + if(favcount > (ID_BROWSE_GOTOFAV_MAX - ID_BROWSE_GOTOFAV_FIRST)) + { + FIXME("Add support for more than %d Favorites\n", favcount); + return; + } + + urlbuf = heap_alloc((lstrlenW(url) + 1) * sizeof(WCHAR)); + + if(!urlbuf) + return; + + lstrcpyW(urlbuf, url); + + item.cbSize = sizeof(item); + item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA | MIIM_ID; item.fType = MFT_STRING; item.dwTypeData = title; - InsertMenuItemW(menu, GetMenuItemCount(menu), TRUE, &item); + item.wID = ID_BROWSE_GOTOFAV_FIRST + favcount; + item.dwItemData = (ULONG_PTR)urlbuf; + InsertMenuItemW(menu, favcount + 2, TRUE, &item); } static void add_favs_to_menu(HMENU menu, LPCWSTR dir) @@ -125,14 +165,20 @@ static void add_favs_to_menu(HMENU menu, LPCWSTR dir) do { WCHAR* fileext; + WCHAR* url = NULL; lstrcpyW(filename, finddata.cFileName); if(FAILED(IPersistFile_Load(urlfile, path, 0))) continue; + urlobj->lpVtbl->GetURL(urlobj, &url); + + if(!url) + continue; + fileext = filename + lstrlenW(filename) - lstrlenW(urlext) + 1; *fileext = 0; - add_fav_to_menu(menu, filename); + add_fav_to_menu(menu, filename, url); } while(FindNextFileW(findhandle, &finddata)); } @@ -159,6 +205,18 @@ static HMENU create_ie_menu(void) return menu; } +static void ie_navigate(InternetExplorer* This, LPCWSTR url) +{ + VARIANT variant; + + V_VT(&variant) = VT_BSTR; + V_BSTR(&variant) = SysAllocString(url); + + IWebBrowser2_Navigate2(WEBBROWSER2(This), &variant, NULL, NULL, NULL, NULL); + + SysFreeString(V_BSTR(&variant)); +} + static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static InternetExplorer* This; @@ -310,6 +368,7 @@ static LRESULT iewnd_OnDestroy(InternetExplorer *This) { TRACE("%p\n", This); + free_fav_menu_data(get_fav_menu(This->menu)); This->frame_hwnd = NULL; PostQuitMessage(0); /* FIXME */ @@ -343,6 +402,13 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT break; default: + if(LOWORD(wparam) >= ID_BROWSE_GOTOFAV_FIRST && LOWORD(wparam) <= ID_BROWSE_GOTOFAV_MAX) + { + LPCWSTR url = get_fav_url_from_id(get_fav_menu(This->menu), LOWORD(wparam)); + + if(url) + ie_navigate(This, url); + } return DefWindowProcW(hwnd, msg, wparam, lparam); } return 0; diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 5e7f45d..898703c 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -39,3 +39,6 @@ #define ID_BROWSE_ABOUT 336 #define ID_BROWSE_ADDFAV 1200 + +#define ID_BROWSE_GOTOFAV_FIRST 2000 +#define ID_BROWSE_GOTOFAV_MAX 65000

1 0

Andrew Eikum : regedit: Add regedit test suite.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: f3c6c62bcfe247887ac849cd584c4a86682cefeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c6c62bcfe247887ac849cd5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 30 16:02:34 2010 -0500 regedit: Add regedit test suite. --- configure | 1 + configure.ac | 1 + programs/regedit/tests/Makefile.in | 11 ++ programs/regedit/tests/regedit.c | 289 ++++++++++++++++++++++++++++++++++++ 4 files changed, 302 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3c6c62bcfe247887ac84…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetDomain.
by Alexandre Julliard 02 Aug '10

02 Aug '10

Module: wine Branch: master Commit: aef9b15ca1fbe48781d29404cac38ccb2ac62106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef9b15ca1fbe48781d29404c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Jul 16 11:46:35 2010 -0400 urlmon: Implemented IUri_GetDomain. --- dlls/urlmon/tests/uri.c | 186 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 37 +++++++-- 2 files changed, 121 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aef9b15ca1fbe48781d29…

1 0