December 2009 - Wine-Commits

Alexandre Julliard : kernel32: Handle the case where the 16-bit module is already loaded also for separated dlls .
by Alexandre Julliard Dec. 29, 2009

Dec. 29, 2009

Module: wine Branch: master Commit: a3e80956d1f7127341ff420e51afafef02493065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e80956d1f7127341ff420e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 16:19:04 2009 +0100 kernel32: Handle the case where the 16-bit module is already loaded also for separated dlls. --- dlls/kernel32/ne_module.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 8f22ccb..273eb9e 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -1119,16 +1119,6 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ FreeLibrary( mod32 ); owner_exists = 0; } - /* loading the 32-bit library can have the side effect of loading the module */ - /* if so, simply incr the ref count and return the module */ - if ((hModule = GetModuleHandle16( libname ))) - { - TRACE( "module %s already loaded by owner\n", libname ); - pModule = NE_GetPtr( hModule ); - if (pModule) pModule->count++; - FreeLibrary( mod32 ); - return hModule; - } } else { @@ -1137,6 +1127,16 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ return ERROR_FILE_NOT_FOUND; } } + /* loading the 32-bit library can have the side effect of loading the module */ + /* if so, simply incr the ref count and return the module */ + if (descr && (hModule = GetModuleHandle16( libname ))) + { + TRACE( "module %s already loaded by owner\n", libname ); + pModule = NE_GetPtr( hModule ); + if (pModule) pModule->count++; + FreeLibrary( mod32 ); + return hModule; + } } if (descr)

1 0

Alexandre Julliard : gdi32: Load the 32-bit gdi. exe module wrapper from the 32-bit side.
by Alexandre Julliard Dec. 29, 2009

Dec. 29, 2009

Module: wine Branch: master Commit: fadc2cda1c107d41dd59d8f8215780e31c691f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadc2cda1c107d41dd59d8f82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 16:27:26 2009 +0100 gdi32: Load the 32-bit gdi.exe module wrapper from the 32-bit side. Get rid of the empty gdi_main.c file. --- dlls/gdi.exe16/gdi.c | 11 +++++++++++ dlls/gdi32/Makefile.in | 1 - dlls/gdi32/gdi_main.c | 38 -------------------------------------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 9 +++++++-- 5 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index e62b711..59cec0f 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -428,6 +428,17 @@ static void free_segptr_bits( HBITMAP16 bmp ) } } + +/********************************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "gdi.exe" ); + return TRUE; +} + + /*********************************************************************** * SetBkColor (GDI.1) */ diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 16ea5b4..18dbdef 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -27,7 +27,6 @@ C_SRCS = \ enhmfdrv/objects.c \ font.c \ freetype.c \ - gdi_main.c \ gdiobj.c \ icm.c \ mapping.c \ diff --git a/dlls/gdi32/gdi_main.c b/dlls/gdi32/gdi_main.c deleted file mode 100644 index b757ac0..0000000 --- a/dlls/gdi32/gdi_main.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * GDI initialization code - * - * Copyright 2000 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 <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/winbase16.h" -#include "gdi_private.h" - -/*********************************************************************** - * GDI initialisation routine - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID lpvReserved) -{ - if (reason != DLL_PROCESS_ATTACH) return TRUE; - DisableThreadLibraryCalls(hinstDLL); - LoadLibrary16( "gdi.exe" ); - return GDI_Init(); -} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d5f9112..de00eb4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -438,7 +438,6 @@ extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDE extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */ -extern BOOL GDI_Init(void) DECLSPEC_HIDDEN; extern HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index d32450a..7d03792 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -565,16 +565,21 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) /*********************************************************************** - * GDI_Init + * DllMain * * GDI initialization. */ -BOOL GDI_Init(void) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { LOGFONTW default_gui_font; const struct DefaultFontInfo* deffonts; int i; + if (reason != DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls( inst ); + LoadLibraryA( "gdi.exe16" ); + WineEngInit(); /* create stock objects */

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.35
by Jeremy Newman Dec. 28, 2009

Dec. 28, 2009

Module: website Branch: master Commit: 5bb7d9283099b0acdbbc1238d6d8e6eccbcf92ff URL: http://source.winehq.org/git/website.git/?a=commit;h=5bb7d9283099b0acdbbc12… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Dec 18 21:01:38 2009 +0100 Polish translation for release 1.1.35 --- news/pl/2009121801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2009121801.xml b/news/pl/2009121801.xml new file mode 100644 index 0000000..269dfe5 --- /dev/null +++ b/news/pl/2009121801.xml @@ -0,0 +1,18 @@ +<news> +<date>Grudzień 18, 2009</date> +<title>Wydano Wine 1.1.35</title> +<body> + Wydanie rozwojowe Wine 1.1.35 jest już dostępne. + <a href="{$root}/announce/1.1.35">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla OLE transacted storage.</li> + <li>Lepsze sprawdzanie certyfikatów w bezpiecznych połączeniach.</li> + <li>Zwiększony postęp przy odseparowaniu 16-bitów.</li> + <li>Left 4 Dead 2 DRM jest teraz całkowicie wspierany.</li> + <li>Ulepszenia w wydajności MSI.</li> + <li>Poprawki we wsparciu 64-bit debuggera.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.35.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : winedump: Fix sym mode.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 1cee3235bcdc3fa3a6f02f57a257c3dbc79fc520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cee3235bcdc3fa3a6f02f57a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 26 16:21:23 2009 +0100 winedump: Fix sym mode. --- tools/winedump/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index d5f39b5..4186044 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -69,6 +69,7 @@ static void do_demangle (const char *arg) if (globals.mode != NONE) fatal("Only one mode can be specified\n"); globals.mode = DMGL; globals.do_code = 1; + globals.do_demangle = 1; }

1 0

Andrew Nguyen : wineboot: Generate the HKCU\Volatile Environment registry key.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 101d72f83cdc63e3755a4bc1fd5e1c144f0da8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101d72f83cdc63e3755a4bc1f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Dec 25 04:33:33 2009 -0600 wineboot: Generate the HKCU\Volatile Environment registry key. --- programs/wineboot/wineboot.c | 55 ++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 2 - 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 60a51b7..28c88a5 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -277,6 +277,59 @@ static void create_environment_registry_keys( void ) RegCloseKey( env_key ); } +static void create_volatile_environment_registry_key(void) +{ + static const WCHAR VolatileEnvW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR AppDataW[] = {'A','P','P','D','A','T','A',0}; + static const WCHAR ClientNameW[] = {'C','L','I','E','N','T','N','A','M','E',0}; + static const WCHAR HomeDriveW[] = {'H','O','M','E','D','R','I','V','E',0}; + static const WCHAR HomePathW[] = {'H','O','M','E','P','A','T','H',0}; + static const WCHAR HomeShareW[] = {'H','O','M','E','S','H','A','R','E',0}; + static const WCHAR LocalAppDataW[] = {'L','O','C','A','L','A','P','P','D','A','T','A',0}; + static const WCHAR LogonServerW[] = {'L','O','G','O','N','S','E','R','V','E','R',0}; + static const WCHAR SessionNameW[] = {'S','E','S','S','I','O','N','N','A','M','E',0}; + static const WCHAR ConsoleW[] = {'C','o','n','s','o','l','e',0}; + static const WCHAR EmptyW[] = {0}; + WCHAR path[MAX_PATH]; + WCHAR computername[MAX_COMPUTERNAME_LENGTH + 1 + 2] = {'\\','\\'}; + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; + HKEY hkey; + HRESULT hr; + + if (RegCreateKeyExW( HKEY_CURRENT_USER, VolatileEnvW, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &hkey, NULL )) + return; + + hr = SHGetFolderPathW( NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); + if (SUCCEEDED(hr)) + RegSetValueExW( hkey, AppDataW, 0, REG_SZ, (const BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + + RegSetValueExW( hkey, ClientNameW, 0, REG_SZ, (const BYTE *)ConsoleW, sizeof(ConsoleW) ); + + /* Write the profile path's drive letter and directory components into + * HOMEDRIVE and HOMEPATH respectively. */ + hr = SHGetFolderPathW( NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, path ); + if (SUCCEEDED(hr)) + { + RegSetValueExW( hkey, HomePathW, 0, REG_SZ, (const BYTE *)&path[2], (strlenW(path) + 1 - 2) * sizeof(WCHAR) ); + path[2] = '\0'; + RegSetValueExW( hkey, HomeDriveW, 0, REG_SZ, (const BYTE *)path, 3 * sizeof(WCHAR) ); + } + + RegSetValueExW( hkey, HomeShareW, 0, REG_SZ, (const BYTE *)EmptyW, sizeof(EmptyW) ); + + hr = SHGetFolderPathW( NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path ); + if (SUCCEEDED(hr)) + RegSetValueExW( hkey, LocalAppDataW, 0, REG_SZ, (const BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + + if (GetComputerNameW(&computername[2], &size)) + RegSetValueExW( hkey, LogonServerW, 0, REG_SZ, (const BYTE *)computername, (size + 1 + 2) * sizeof(WCHAR) ); + + RegSetValueExW( hkey, SessionNameW, 0, REG_SZ, (const BYTE *)ConsoleW, sizeof(ConsoleW) ); + + RegCloseKey( hkey ); +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -999,6 +1052,8 @@ int main( int argc, char *argv[] ) } if (init || update) update_wineprefix( update ); + create_volatile_environment_registry_key(); + ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE ); if (!init && !restart) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 59af25a..6cec46a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -453,9 +453,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" [Environment] -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"APPDATA",,"%16410%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"LOCALAPPDATA",,"%16412%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:"

1 0

Gerald Pfeifer : comctl32: Remove obsolete comment on RB_SETPALETTE from REBAR_WindowProc().
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 8b73b131de0bd8f16c985c60c4edf8e198c7995f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b73b131de0bd8f16c985c60c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Dec 28 04:07:52 2009 +0100 comctl32: Remove obsolete comment on RB_SETPALETTE from REBAR_WindowProc(). --- dlls/comctl32/rebar.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 2bb8b92..f2e736a 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3559,7 +3559,6 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case RB_SETCOLORSCHEME: */ /* case RB_SETPALETTE: */ -/* return REBAR_GetPalette (infoPtr, wParam, lParam); */ case RB_SETPARENT: return REBAR_SetParent (infoPtr, (HWND)wParam);

1 0

Vincent Povirk : gdiplus: Implement GdipGetImage*Resolution.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 1aea88cac18ca7c6f53b8a36c8543c28126907dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aea88cac18ca7c6f53b8a36c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 20:46:55 2009 -0500 gdiplus: Implement GdipGetImage*Resolution. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/image.c | 39 +++++++++++++++++++++++++++++---------- dlls/gdiplus/tests/image.c | 24 ++++++++++++------------ 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 7ce4bd5..9d05e0d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -219,6 +219,7 @@ struct GpImage{ UINT palette_count; UINT palette_size; ARGB *palette_entries; + REAL xres, yres; }; struct GpMetafile{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f7a8eaf..563e43a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1262,6 +1262,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.palette_count = 0; (*metafile)->image.palette_size = 0; (*metafile)->image.palette_entries = NULL; + (*metafile)->image.xres = (REAL)placeable->Inch; + (*metafile)->image.yres = (REAL)placeable->Inch; (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Top) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e37d028..763c17c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1172,6 +1172,20 @@ static void generate_halftone_palette(ARGB *entries, UINT count) } } +static GpStatus get_screen_resolution(REAL *xres, REAL *yres) +{ + HDC screendc = GetDC(0); + + if (!screendc) return GenericError; + + *xres = (REAL)GetDeviceCaps(screendc, LOGPIXELSX); + *yres = (REAL)GetDeviceCaps(screendc, LOGPIXELSY); + + ReleaseDC(0, screendc); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { @@ -1181,6 +1195,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, HDC hdc; BYTE *bits; int i; + REAL xres, yres; + GpStatus stat; TRACE("%d %d %d %d %p %p\n", width, height, stride, format, scan0, bitmap); @@ -1194,6 +1210,9 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if(scan0 && !stride) return InvalidParameter; + stat = get_screen_resolution(&xres, &yres); + if (stat != Ok) return stat; + row_size = (width * PIXELFORMATBPP(format)+7) / 8; dib_stride = (row_size + 3) & ~3; @@ -1243,6 +1262,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.palette_count = 0; (*bitmap)->image.palette_size = 0; (*bitmap)->image.palette_entries = NULL; + (*bitmap)->image.xres = xres; + (*bitmap)->image.yres = yres; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -1522,15 +1543,14 @@ GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) { - static int calls; - if(!image || !res) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *res = image->xres; - return NotImplemented; + TRACE("(%p) <-- %0.2f\n", image, *res); + + return Ok; } GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) @@ -1590,15 +1610,14 @@ GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res) { - static int calls; - if(!image || !res) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *res = image->yres; - return NotImplemented; + TRACE("(%p) <-- %0.2f\n", image, *res); + + return Ok; } GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4721a58..913ba1f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -843,11 +843,11 @@ static void test_loadwmf(void) todo_wine expectf(320.0, bounds.Height); stat = GdipGetImageHorizontalResolution(img, &res); - todo_wine expect(Ok, stat); + expect(Ok, stat); todo_wine expectf(1440.0, res); stat = GdipGetImageVerticalResolution(img, &res); - todo_wine expect(Ok, stat); + expect(Ok, stat); todo_wine expectf(1440.0, res); GdipDisposeImage(img); @@ -879,12 +879,12 @@ static void test_createfromwmf(void) todo_wine expectf(320.0, bounds.Height); stat = GdipGetImageHorizontalResolution(img, &res); - todo_wine expect(Ok, stat); - todo_wine expectf(1440.0, res); + expect(Ok, stat); + expectf(1440.0, res); stat = GdipGetImageVerticalResolution(img, &res); - todo_wine expect(Ok, stat); - todo_wine expectf(1440.0, res); + expect(Ok, stat); + expectf(1440.0, res); GdipDisposeImage(img); } @@ -929,23 +929,23 @@ static void test_resolution(void) ReleaseDC(0, screendc); stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &res); - todo_wine expect(Ok, stat); - todo_wine expectf((REAL)screenxres, res); + expect(Ok, stat); + expectf((REAL)screenxres, res); stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &res); - todo_wine expect(Ok, stat); - todo_wine expectf((REAL)screenyres, res); + expect(Ok, stat); + expectf((REAL)screenyres, res); /* test changing the resolution */ stat = GdipBitmapSetResolution(bitmap, screenxres*2.0, screenyres*3.0); todo_wine expect(Ok, stat); stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &res); - todo_wine expect(Ok, stat); + expect(Ok, stat); todo_wine expectf(screenxres*2.0, res); stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &res); - todo_wine expect(Ok, stat); + expect(Ok, stat); todo_wine expectf(screenyres*3.0, res); stat = GdipDisposeImage((GpImage*)bitmap);

1 0

Vincent Povirk : gdiplus: Implement GdipBitmapSetResolution.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 6bb300fa41176822f5ec6ce4e0842cf39d6239e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb300fa41176822f5ec6ce4e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 21:05:58 2009 -0500 gdiplus: Implement GdipBitmapSetResolution. --- dlls/gdiplus/image.c | 10 ++++++++-- dlls/gdiplus/tests/image.c | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 763c17c..78801fd 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -535,9 +535,15 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap* bitmap, REAL xdpi, REAL ydpi) { - FIXME("(%p, %.2f, %.2f)\n", bitmap, xdpi, ydpi); + TRACE("(%p, %.2f, %.2f)\n", bitmap, xdpi, ydpi); - return NotImplemented; + if (!bitmap || xdpi == 0.0 || ydpi == 0.0) + return InvalidParameter; + + bitmap->image.xres = xdpi; + bitmap->image.yres = ydpi; + + return Ok; } GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 913ba1f..e93b745 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -915,10 +915,10 @@ static void test_resolution(void) expect(InvalidParameter, stat); stat = GdipBitmapSetResolution(NULL, 96.0, 96.0); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipBitmapSetResolution(bitmap, 0.0, 0.0); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); /* defaults to screen resolution */ screendc = GetDC(0); @@ -938,15 +938,15 @@ static void test_resolution(void) /* test changing the resolution */ stat = GdipBitmapSetResolution(bitmap, screenxres*2.0, screenyres*3.0); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &res); expect(Ok, stat); - todo_wine expectf(screenxres*2.0, res); + expectf(screenxres*2.0, res); stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &res); expect(Ok, stat); - todo_wine expectf(screenyres*3.0, res); + expectf(screenyres*3.0, res); stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat);

1 0

Alexandre Julliard : wordpad: Use the main module instance instead of getting it from the window.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 55f024afe195659e257e4806e4737a7a0fa63c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f024afe195659e257e4806e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:10:23 2009 +0100 wordpad: Use the main module instance instead of getting it from the window. --- programs/wordpad/print.c | 6 +++--- programs/wordpad/wordpad.c | 37 ++++++++++++------------------------- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 0a1343f..dc18966 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -50,7 +50,7 @@ static LPWSTR get_print_file_filter(HWND hMainWnd) const WCHAR files_prn[] = {'*','.','P','R','N',0}; const WCHAR files_all[] = {'*','.','*','\0'}; LPWSTR p; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); p = wszPrintFilter; LoadStringW(hInstance, STRING_PRINTER_FILES_PRN, p, MAX_STRING_LEN); @@ -88,7 +88,7 @@ void registry_read_pagemargins(HKEY hKey) static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) { REBARBANDINFOW rb; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR text[MAX_STRING_LEN]; HWND hButton; @@ -846,7 +846,7 @@ LRESULT preview_command(HWND hWnd, WPARAM wParam) { HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); WCHAR name[MAX_STRING_LEN]; - HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE); + HINSTANCE hInst = GetModuleHandleW(0); if(preview.hdc2) { diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 86e1884..ed43ce5 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -85,7 +85,7 @@ static void DoLoadStrings(void) static const WCHAR files_txt[] = {'*','.','t','x','t','\0'}; static const WCHAR files_all[] = {'*','.','*','\0'}; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); LoadStringW(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); p += lstrlenW(p) + 1; @@ -683,8 +683,7 @@ static void set_bar_states(void) static void preview_exit(HWND hMainWnd) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HMENU hMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_MAINMENU)); + HMENU hMenu = LoadMenuW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDM_MAINMENU)); HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); set_bar_states(); @@ -701,7 +700,7 @@ static void preview_exit(HWND hMainWnd) static void set_fileformat(WPARAM format) { HICON hIcon; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); fileFormat = format; if(format & SF_TEXT) @@ -980,8 +979,7 @@ static void DialogOpenFile(void) static void dialog_about(void) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HICON icon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); + HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); ShellAboutW(hMainWnd, wszAppTitle, 0, icon); } @@ -1088,7 +1086,7 @@ static void dialog_viewproperties(void) PROPSHEETPAGEW psp[2]; PROPSHEETHEADERW psh; size_t i; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)&psp; psp[0].dwSize = sizeof(PROPSHEETPAGEW); @@ -1414,7 +1412,7 @@ static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPA { case WM_INITDIALOG: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_NEWFILE); @@ -1459,8 +1457,7 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, { case WM_INITDIALOG: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, - GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN); HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT); @@ -1752,7 +1749,7 @@ static int context_menu(LPARAM lParam) static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); HANDLE hDLL; TBADDBITMAP ab; int nStdBitmaps = 0; @@ -2018,7 +2015,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_NEW: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); int ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE), hWnd, newfile_proc); @@ -2334,25 +2331,15 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_DATETIME: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc); + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc); break; - } case ID_PARAFORMAT: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, - paraformat_proc); - } + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, paraformat_proc); break; case ID_TABSTOPS: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc); - } + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc); break; case ID_ABOUT:

1 0

Alexandre Julliard : ole2: Reimplement OleMetafilePictFromIconAndLabel16 on top of the 32-bit version .
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 91fde2494cc01d2ee91e0776901cd0f3294d5963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fde2494cc01d2ee91e07769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:11:24 2009 +0100 ole2: Reimplement OleMetafilePictFromIconAndLabel16 on top of the 32-bit version. --- dlls/ole2.dll16/ole2.c | 67 ++++++++++++++++++++------------------ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index ab04390..d3880c6 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define HICON_16(h32) (LOWORD(h32)) #define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) /****************************************************************************** * OleBuildVersion (OLE2.1) @@ -124,49 +123,53 @@ HRESULT WINAPI RevokeDragDrop16( * If no hIcon is given, we load the icon via lpszSourceFile and iIconIndex. * This code might be wrong at some places. */ -HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16( +HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( HICON16 hIcon, LPCOLESTR16 lpszLabel, LPCOLESTR16 lpszSourceFile, UINT16 iIconIndex ) { - METAFILEPICT16 *mf16; + METAFILEPICT *pict; + HGLOBAL hmf; HGLOBAL16 hmf16; - HMETAFILE hmf; - INT mfSize; - HDC hdc; - - if (!hIcon) { - if (lpszSourceFile) { - HINSTANCE16 hInstance = LoadLibrary16(lpszSourceFile); - - /* load the icon at index from lpszSourceFile */ - hIcon = HICON_16(LoadIconA(HINSTANCE_32(hInstance), (LPCSTR)(DWORD)iIconIndex)); - FreeLibrary16(hInstance); - } else - return 0; - } + LPWSTR label = NULL, source = NULL; + DWORD len; - FIXME("(%04x, '%s', '%s', %d): incorrect metrics, please try to correct them !\n", - hIcon, lpszLabel, lpszSourceFile, iIconIndex); + if (lpszLabel) + { + len = MultiByteToWideChar( CP_ACP, 0, lpszLabel, -1, NULL, 0 ); + label = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpszLabel, -1, label, len ); + } + if (lpszSourceFile) + { + len = MultiByteToWideChar( CP_ACP, 0, lpszSourceFile, -1, NULL, 0 ); + source = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpszSourceFile, -1, source, len ); + } + hmf = OleMetafilePictFromIconAndLabel( HICON_32(hIcon), label, source, iIconIndex ); + HeapFree( GetProcessHeap(), 0, label ); + HeapFree( GetProcessHeap(), 0, source ); - hdc = CreateMetaFileW(NULL); - DrawIcon(hdc, 0, 0, HICON_32(hIcon)); /* FIXME */ - TextOutA(hdc, 0, 0, lpszLabel, 1); /* FIXME */ - hmf = CloseMetaFile(hdc); + if (!hmf) return 0; + pict = GlobalLock( hmf ); hmf16 = GlobalAlloc16(0, sizeof(METAFILEPICT16)); - mf16 = GlobalLock16(hmf16); - mf16->mm = MM_ANISOTROPIC; - mf16->xExt = 20; /* FIXME: bogus */ - mf16->yExt = 20; /* ditto */ - mfSize = GetMetaFileBitsEx(hmf, 0, 0); - mf16->hMF = GlobalAlloc16(GMEM_MOVEABLE, mfSize); - if(mf16->hMF) + if (hmf16) { - GetMetaFileBitsEx(hmf, mfSize, GlobalLock16(mf16->hMF)); - GlobalUnlock16(mf16->hMF); + METAFILEPICT16 *pict16 = GlobalLock16( hmf16 ); + pict16->mm = pict->mm; + pict16->xExt = pict->xExt; + pict16->yExt = pict->yExt; + len = GetMetaFileBitsEx( pict->hMF, 0, 0 ); + pict16->hMF = GlobalAlloc16( GMEM_MOVEABLE, len ); + GetMetaFileBitsEx( pict->hMF, len, GlobalLock16( pict16->hMF) ); + GlobalUnlock16( pict16->hMF ); + GlobalUnlock16( hmf16 ); } + DeleteMetaFile( pict->hMF ); + GlobalUnlock( hmf ); + GlobalFree( hmf ); return hmf16; } diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 6f08851..308f77a 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -53,7 +53,7 @@ 53 stub OLEGETICONOFCLASS 54 pascal CreateILockBytesOnHGlobal(word word ptr) CreateILockBytesOnHGlobal16 55 stub GETHGLOBALFROMILOCKBYTES -56 pascal -ret16 OleMetaFilePictFromIconAndLabel(word str str word) OleMetaFilePictFromIconAndLabel16 +56 pascal -ret16 OleMetafilePictFromIconAndLabel(word str str word) OleMetafilePictFromIconAndLabel16 57 stub GETCLASSFILE 58 stub OLEDRAW 59 stub OLECREATEDEFAULTHANDLER

1 0