October 2012 - Wine-Commits

Piotr Caban : advapi32: Return from StartServiceCtrlDispatcher when service status is changed to stopped .
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: a936b58b8b76b56c3a0755cfdfef427b2f427030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a936b58b8b76b56c3a0755cfd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:37 2012 +0200 advapi32: Return from StartServiceCtrlDispatcher when service status is changed to stopped. --- dlls/advapi32/service.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 2ec6d8e..1f585dc 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -86,6 +86,7 @@ static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; static service_data **services; static unsigned int nb_services; static HANDLE service_event; +static HANDLE stop_event; extern HANDLE CDECL __wine_make_process_system(void); @@ -465,11 +466,13 @@ static BOOL service_run_main_thread(void) UINT wait_services[MAXIMUM_WAIT_OBJECTS]; service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); /* FIXME: service_control_dispatcher should be merged into the main thread */ wait_handles[0] = __wine_make_process_system(); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, NULL, 0, NULL ); wait_handles[2] = service_event; + wait_handles[3] = stop_event; TRACE("Starting %d services running as process %d\n", nb_services, GetCurrentProcessId()); @@ -478,7 +481,7 @@ static BOOL service_run_main_thread(void) for (;;) { EnterCriticalSection( &service_cs ); - for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + for (i = 0, n = 4; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) { if (!services[i]->thread) continue; wait_services[n] = i; @@ -536,11 +539,15 @@ static BOOL service_run_main_thread(void) { continue; /* rebuild the list */ } + else if (ret == 3) + { + return TRUE; + } else if (ret < n) { services[wait_services[ret]]->thread = 0; CloseHandle( wait_handles[ret] ); - if (n == 4) return TRUE; /* it was the last running thread */ + if (n == 5) return TRUE; /* it was the last running thread */ } else return FALSE; } @@ -727,8 +734,10 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) return FALSE; } - if (lpStatus->dwCurrentState == SERVICE_STOPPED) + if (lpStatus->dwCurrentState == SERVICE_STOPPED) { + SetEvent(stop_event); CloseServiceHandle((SC_HANDLE)hService); + } return TRUE; }

1 0

Piotr Caban : advapi32: Validate arguments in StartServiceCtrlDispatcher.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 6027fe2dafa89456d9f000d8c4b0a879737ed2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027fe2dafa89456d9f000d8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:13 2012 +0200 advapi32: Validate arguments in StartServiceCtrlDispatcher. --- dlls/advapi32/service.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 49d56d1..2ec6d8e 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -565,6 +565,12 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++) @@ -610,6 +616,12 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) return FALSE; } while (servent[nb_services].lpServiceName) nb_services++; + if (!nb_services) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + services = HeapAlloc( GetProcessHeap(), 0, nb_services * sizeof(*services) ); for (i = 0; i < nb_services; i++)

1 0

Alexandre Julliard : user32: Retrieve the graphics driver module from gdi32 .
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: e17cdb266d6333428bef8e9a86d0b96cada0dda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17cdb266d6333428bef8e9a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 15:06:59 2012 +0200 user32: Retrieve the graphics driver module from gdi32. --- dlls/user32/driver.c | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 20837d0..00564b6 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -25,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" +#include "wine/gdi_driver.h" #include "user_private.h" @@ -36,38 +37,18 @@ static DWORD driver_load_error; /* load the graphics driver */ static const USER_DRIVER *load_driver(void) { - char buffer[MAX_PATH], libname[32], *name, *next; - HKEY hkey; + static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + HDC hdc; void *ptr; HMODULE graphics_driver; USER_DRIVER *driver, *prev; - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Graphics", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((graphics_driver = LoadLibraryA( libname )) != 0) break; - name = next; - } - - if (!graphics_driver) - driver_load_error = GetLastError(); - driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = null_driver; + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + + graphics_driver = __wine_get_driver_module( hdc ); if (graphics_driver) { #define GET_USER_FUNC(name) \ @@ -129,15 +110,18 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(WindowPosChanged); #undef GET_USER_FUNC } + else driver_load_error = GetLastError(); prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) { /* another thread beat us to it */ HeapFree( GetProcessHeap(), 0, driver ); - FreeLibrary( graphics_driver ); driver = prev; } + else LdrAddRefDll( 0, graphics_driver ); + + DeleteDC( hdc ); return driver; } @@ -334,7 +318,7 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) switch (driver_load_error) { case ERROR_MOD_NOT_FOUND: - MESSAGE( "The X11 driver is missing. Check your build!\n" ); + MESSAGE( "The graphics driver is missing. Check your build!\n" ); break; case ERROR_DLL_INIT_FAILED: MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );

1 0

Alexandre Julliard : gdi32: Export a function to retrieve the module handle of the graphics driver for a DC .
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 5c1a752d613a681b54120718e033d3166f4122a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1a752d613a681b54120718e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 15:05:54 2012 +0200 gdi32: Export a function to retrieve the module handle of the graphics driver for a DC. --- dlls/gdi32/dc.c | 5 ++++- dlls/gdi32/driver.c | 42 +++++++++++++++++++++++++++++++++++++----- dlls/gdi32/gdi32.spec | 3 +++ dlls/gdi32/gdi_private.h | 4 ++-- include/wine/gdi_driver.h | 1 + 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index be9b016..7d70bf4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -81,6 +81,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->nulldrv.funcs = &null_driver; dc->physDev = &dc->nulldrv; + dc->module = gdi32_module; dc->thread = GetCurrentThreadId(); dc->refcount = 1; dc->wndExtX = 1; @@ -568,6 +569,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; + HMODULE module; WCHAR buf[300]; GDI_CheckNotLock(); @@ -582,7 +584,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, strcpyW(buf, driver); } - if (!(funcs = DRIVER_load_driver( buf ))) + if (!(funcs = DRIVER_load_driver( buf, &module ))) { ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; @@ -590,6 +592,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; + dc->module = module; dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); TRACE("(driver=%s, device=%s, output=%s): returning %p\n", diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 9c5ddb8..ca21d4d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -48,6 +48,7 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static DWORD display_driver_load_error; const struct gdi_dc_funcs *font_driver = NULL; @@ -92,14 +93,18 @@ static struct graphics_driver *create_driver( HMODULE module ) * * Special case for loading the display driver: get the name from the config file */ -static const struct gdi_dc_funcs *get_display_driver(void) +static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) { struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; - if (display_driver) return display_driver->funcs; /* already loaded */ + if (display_driver) + { + *module_ret = display_driver->module; + return display_driver->funcs; /* already loaded */ + } strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -121,6 +126,8 @@ static const struct gdi_dc_funcs *get_display_driver(void) name = next; } + if (!module) display_driver_load_error = GetLastError(); + if (!(driver = create_driver( module ))) { MESSAGE( "Could not create graphics driver '%s'\n", buffer ); @@ -140,7 +147,7 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * DRIVER_load_driver */ -const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) +const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret ) { HMODULE module; struct graphics_driver *driver, *new_driver; @@ -148,11 +155,16 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) + return get_display_driver( module_ret ); if ((module = GetModuleHandleW( name ))) { - if (display_driver && display_driver->module == module) return display_driver->funcs; + if (display_driver && display_driver->module == module) + { + *module_ret = module; + return display_driver->funcs; + } EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { @@ -182,11 +194,31 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); done: + *module_ret = driver->module; LeaveCriticalSection( &driver_section ); return driver->funcs; } +/*********************************************************************** + * __wine_get_driver_module (GDI32.@) + */ +HMODULE CDECL __wine_get_driver_module( HDC hdc ) +{ + DC *dc; + HMODULE ret = 0; + + if ((dc = get_dc_ptr( hdc ))) + { + ret = dc->module; + release_dc_ptr( dc ); + if (!ret) SetLastError( display_driver_load_error ); + } + else SetLastError( ERROR_INVALID_HANDLE ); + return ret; +} + + static INT nulldrv_AbortDoc( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index cdc7b4b..80b1b68 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -513,5 +513,8 @@ @ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) +# Graphics drivers +@ cdecl __wine_get_driver_module(long) + # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 70589b9..806ca35 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -71,7 +71,7 @@ typedef struct tagDC struct tagDC *saved_dc; DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ - + HMODULE module; /* module handle of the graphics driver */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ @@ -272,7 +272,7 @@ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs path_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *font_driver DECLSPEC_HIDDEN; -extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index e942ed9..3d4e6c5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -275,6 +275,7 @@ WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, const RECT *device_rect, struct window_surface *surface ); +extern HMODULE CDECL __wine_get_driver_module( HDC hdc ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Francois Gouget : Assorted spelling tweaks and fixes.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: ed9e74558023f2edeb934e667cbbbb87954ffebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9e74558023f2edeb934e667… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 12:20:23 2012 +0200 Assorted spelling tweaks and fixes. --- dlls/kernel32/tests/file.c | 2 +- dlls/wininet/urlcache.c | 2 +- programs/cmd/builtins.c | 8 ++++---- programs/cmd/tests/test_builtins.cmd | 6 +++--- programs/cmd/tests/test_cmdline.cmd | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5e607fe..92876e4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3354,7 +3354,7 @@ static void test_OpenFileById(void) ret2 = GetTempPathA(sizeof(tempPath), tempPath); ok(ret2, "OpenFileById: GetTempPath failed, got error %u.\n", GetLastError()); - /* ensure the existance of a file in the temp folder */ + /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 004c6be..8fb62de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2456,7 +2456,7 @@ static int dword_cmp(const void *p1, const void *p2) * * PARAMETERS * cache_path [I] Which volume to free up from, or NULL if you don't care. - * size [I] How many percents of the cache should be free. + * size [I] Percentage of the cache that should be free. * filter [I] Which entries can't be deleted (CacheEntryType) * * RETURNS diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8ae9eb2..279e80d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -478,10 +478,10 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app * Syntax on command line is * ... /a | /b filename /a /b {[ + filename /a /b]} [dest /a /b] * Where first /a or /b sets 'mode in operation' until another is found - * once another is found, it applies to the file preceeding the /a or /b + * once another is found, it applies to the file preceding the /a or /b * In addition each filename can contain wildcards - * To make matters worse, the + may be in the same parameter (ie no whitespace) - * or with whitespace separating it + * To make matters worse, the + may be in the same parameter (i.e. no + * whitespace) or with whitespace separating it * * ASCII mode on read == read and stop at first EOF * ASCII mode on write == append EOF to destination @@ -944,7 +944,7 @@ void WCMD_copy(WCHAR * args) { } } - /* Exit out of the routine, freeing any remaing allocated memory */ + /* Exit out of the routine, freeing any remaining allocated memory */ exitreturn: thiscopy = sourcelist; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3d01151..fff067c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1743,7 +1743,7 @@ if errorlevel 1 echo Incorrect errorlevel call :CheckExist file1 cd .. -rem Simple single file copy, destination supplied as non existant directory +rem Simple single file copy, destination supplied as nonexistent directory copy file1 dir2\ >nul 2>&1 if not errorlevel 1 echo Incorrect errorlevel call :CheckNotExist dir2 dir2\file1 @@ -1767,7 +1767,7 @@ if errorlevel 1 echo Incorrect errorlevel call :CheckExist file1 file2 file3 cd .. -rem Simple wildcarded file copy, destination supplied as non existant directory +rem Simple wildcarded file copy, destination supplied as nonexistent directory copy file? dir2\ >nul 2>&1 if not errorlevel 1 echo Incorrect errorlevel call :CheckNotExist dir2 dir2\file1 dir2\file2 dir2\file3 @@ -1923,7 +1923,7 @@ rem All 2 have eof's, plus an extra = 6 + 12 + eof copy /b file1_plus_eof + file3_plus_eof file123_mixed_copy6 /a >nul 2>&1 call :CheckFileSize file123_mixed_copy6 19 -rem One file has EOF, but doesnt get an extra one, ie 6 +rem One file has EOF, but doesn't get an extra one, i.e. 6 copy /b file1_plus_eof file123_mixed_copy7 /a >nul 2>&1 call :CheckFileSize file123_mixed_copy7 6 diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 0442a38..e563341 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -53,7 +53,7 @@ rem - Try cmd.exe /k as well cmd.exe /k "copy file1 file2 >nul && exit" echo No prompts or I would not get here2 -rem Non existing variable expansion is as per command line, i.e. left as-is +rem Nonexistent variable expansion is as per command line, i.e. left as-is cmd.exe /c echo %%hello1%% cmd.exe /c echo %%hello2 cmd.exe /c echo %%hello3^:h=t%% diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 6931755..4e6305a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2393,7 +2393,7 @@ int wmain (int argc, WCHAR *argvW[]) } else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ { - /* Do not step to next paramater, instead carry on parsing this one */ + /* Do not step to next parameter, instead carry on parsing this one */ argPos+=2; } @@ -2413,7 +2413,7 @@ int wmain (int argc, WCHAR *argvW[]) int len; WCHAR *q1 = NULL,*q2 = NULL,*p; - /* Handle very edge case error scenarion, "cmd.exe /c" ie when there are no + /* Handle very edge case error scenario, "cmd.exe /c" ie when there are no * parameters after the /C or /K by pretending there was a single space */ if (argPos == NULL) argPos = (WCHAR *)spaceW; @@ -2468,7 +2468,7 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); /* Finally, we only stay in new mode IF the first parameter is quoted and - is a valid executable, ie must exist, otherwise drop back to old mode */ + is a valid executable, i.e. must exist, otherwise drop back to old mode */ if (!opt_s) { WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE, TRUE); WCHAR pathext[MAXSTRING];

1 0

Nikolay Sivov : dwrite: Implement FindFamilyName() for system font collection.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 2793d8196b92bf0492b930cdc5bfb6f2542ce7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2793d8196b92bf0492b930cdc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 00:31:11 2012 -0400 dwrite: Implement FindFamilyName() for system font collection. --- dlls/dwrite/font.c | 18 ++++++++++++++++-- dlls/dwrite/tests/font.c | 3 +-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 689a330..ff4a345 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -690,8 +690,22 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(name), index, exists); - return E_NOTIMPL; + UINT32 i; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(name), index, exists); + + for (i = 0; i < This->count; i++) + if (!strcmpW(This->families[i], name)) + { + *index = i; + *exists = TRUE; + return S_OK; + } + + *index = (UINT32)-1; + *exists = FALSE; + + return S_OK; } static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9dc59e0..07d3e7d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -536,7 +536,6 @@ static void test_system_fontcollection(void) i = IDWriteFontCollection_GetFontFamilyCount(collection); ok(i, "got %u\n", i); -todo_wine { ret = FALSE; i = (UINT32)-1; hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret); @@ -550,7 +549,7 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(!ret, "got %d\n", ret); ok(i == (UINT32)-1, "got %u\n", i); -} + IDWriteFontCollection_Release(collection); }

1 0

Nikolay Sivov : dwrite: Add all installed font families to system font collection.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: f0f1735495d79c474f50c0303718b719a4febe2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f1735495d79c474f50c0303… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 21 00:24:35 2012 -0400 dwrite: Add all installed font families to system font collection. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 57 +++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/main.c | 8 ++++- dlls/dwrite/tests/font.c | 34 ++++++++++++++++++++++++- 4 files changed, 94 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3135ade..4cb0e3b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,10 +68,10 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +extern HRESULT create_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d5346c9..689a330 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -130,6 +130,10 @@ typedef struct struct dwrite_fontcollection { IDWriteFontCollection IDWriteFontCollection_iface; LONG ref; + + WCHAR **families; + UINT32 count; + int alloc; }; struct dwrite_fontfamily { @@ -657,7 +661,14 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + int i; + + for (i = 0; i < This->count; i++) + heap_free(This->families[i]); + heap_free(This->families); heap_free(This); + } return ref; } @@ -665,8 +676,8 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->count; } static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) @@ -700,9 +711,35 @@ static const IDWriteFontCollectionVtbl fontcollectionvtbl = { dwritefontcollection_GetFontFromFontFace }; -HRESULT create_fontcollection(IDWriteFontCollection **collection) +static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection, const WCHAR *family) +{ + /* check for duplicate family name */ + if (collection->count && !strcmpW(collection->families[collection->count-1], family)) return S_OK; + + /* double array length */ + if (collection->count == collection->alloc) + { + collection->alloc *= 2; + collection->families = heap_realloc(collection->families, collection->alloc*sizeof(WCHAR*)); + } + + collection->families[collection->count++] = heap_strdupW(family); + TRACE("family name %s\n", debugstr_w(family)); + + return S_OK; +} + +static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm, DWORD type, LPARAM lParam) +{ + struct dwrite_fontcollection *collection = (struct dwrite_fontcollection*)lParam; + return add_family_syscollection(collection, lf->lfFaceName) == S_OK; +} + +HRESULT create_system_fontcollection(IDWriteFontCollection **collection) { struct dwrite_fontcollection *This; + LOGFONTW lf; + HDC hdc; *collection = NULL; @@ -712,6 +749,20 @@ HRESULT create_fontcollection(IDWriteFontCollection **collection) This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; This->ref = 1; + This->alloc = 50; + This->count = 0; + This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + + TRACE("building system font collection:\n"); + + hdc = CreateCompatibleDC(0); + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfFaceName[0] = 0; + EnumFontFamiliesExW(hdc, &lf, enum_font_families, (LPARAM)This, 0); + DeleteDC(hdc); + *collection = &This->IDWriteFontCollection_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5f69723..4605008 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -384,8 +384,12 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, IDWriteFontCollection **collection, BOOL check_for_updates) { - FIXME("(%p %d): semi-stub\n", collection, check_for_updates); - return create_fontcollection(collection); + TRACE("(%p %d)\n", collection, check_for_updates); + + if (check_for_updates) + FIXME("checking for system font updates not implemented\n"); + + return create_system_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 594ccea..9dc59e0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -41,11 +41,11 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) static IDWriteFactory *factory; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR blahW[] = {'B','l','a','h','!',0}; static void test_CreateFontFromLOGFONT(void) { static const WCHAR tahomaspW[] = {'T','a','h','o','m','a',' ',0}; - static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -523,6 +523,37 @@ todo_wine IDWriteGdiInterop_Release(interop); } +static void test_system_fontcollection(void) +{ + IDWriteFontCollection *collection; + HRESULT hr; + UINT32 i; + BOOL ret; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + i = IDWriteFontCollection_GetFontFamilyCount(collection); + ok(i, "got %u\n", i); + +todo_wine { + ret = FALSE; + i = (UINT32)-1; + hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret, "got %d\n", ret); + ok(i != (UINT32)-1, "got %u\n", i); + + ret = TRUE; + i = 0; + hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!ret, "got %d\n", ret); + ok(i == (UINT32)-1, "got %u\n", i); +} + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { HRESULT hr; @@ -541,6 +572,7 @@ START_TEST(font) test_GetFamilyNames(); test_CreateFontFace(); test_GetMetrics(); + test_system_fontcollection(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Added a stub for IDWriteFontCollection.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: be699372c2150d1d2dd3b8496cf370981ceb6581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be699372c2150d1d2dd3b8496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 21:43:01 2012 -0400 dwrite: Added a stub for IDWriteFontCollection. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 103 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9e63da0..3135ade 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -68,6 +68,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT create_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 90131b8..bb3e8a6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -127,6 +127,11 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') +struct dwrite_fontcollection { + IDWriteFontCollection IDWriteFontCollection_iface; + LONG ref; +}; + struct dwrite_fontfamily { IDWriteFontFamily IDWriteFontFamily_iface; LONG ref; @@ -166,6 +171,11 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily(IDWriteFontF return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily_iface); } +static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection(IDWriteFontCollection *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection_iface); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -614,6 +624,99 @@ static const IDWriteFontFamilyVtbl fontfamilyvtbl = { dwritefontfamily_GetMatchingFonts }; +static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection *iface, REFIID riid, void **obj) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDWriteFontCollection)) + { + *obj = iface; + IDWriteFontCollection_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollection *iface) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p): stub\n", This); + return 0; +} + +static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%u %p): stub\n", This, index, family); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_w(name), index, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + FIXME("(%p)->(%p %p): stub\n", This, face, font); + return E_NOTIMPL; +} + +static const IDWriteFontCollectionVtbl fontcollectionvtbl = { + dwritefontcollection_QueryInterface, + dwritefontcollection_AddRef, + dwritefontcollection_Release, + dwritefontcollection_GetFontFamilyCount, + dwritefontcollection_GetFontFamily, + dwritefontcollection_FindFamilyName, + dwritefontcollection_GetFontFromFontFace +}; + +HRESULT create_fontcollection(IDWriteFontCollection **collection) +{ + struct dwrite_fontcollection *This; + + *collection = NULL; + + This = heap_alloc(sizeof(struct dwrite_fontcollection)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; + This->ref = 1; + + *collection = &This->IDWriteFontCollection_iface; + + return S_OK; +} + static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 75445e8..29552c6 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -384,8 +384,8 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface) static HRESULT WINAPI dwritefactory_GetSystemFontCollection(IDWriteFactory *iface, IDWriteFontCollection **collection, BOOL check_for_updates) { - FIXME("(%p %d): stub\n", collection, check_for_updates); - return E_NOTIMPL; + FIXME("(%p %d): semi-stub\n", collection, check_for_updates); + return create_fontcollection(collection); } static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *iface,

1 0

Nikolay Sivov : dwrite: Store text string in layout object.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 11d94a11b604633d08adbc37afe63c9cc7be59a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d94a11b604633d08adbc37a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 20 17:02:25 2012 -0400 dwrite: Store text string in layout object. --- dlls/dwrite/dwrite_private.h | 18 ++++++++++++++++-- dlls/dwrite/layout.c | 8 +++++++- dlls/dwrite/main.c | 4 ++-- dlls/dwrite/tests/layout.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d5890bb..9e63da0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -38,7 +38,7 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } -static inline LPWSTR heap_strdupW(LPCWSTR str) +static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL; @@ -53,10 +53,24 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) +{ + WCHAR *ret = NULL; + + if (len) + { + ret = heap_alloc((len+1)*sizeof(WCHAR)); + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } + + return ret; +} + extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 64f3c0d..577a261 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textlayout { IDWriteTextLayout IDWriteTextLayout_iface; LONG ref; + + WCHAR *str; }; struct dwrite_textformat { @@ -97,7 +99,10 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->str); heap_free(This); + } return S_OK; } @@ -646,7 +651,7 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; -HRESULT create_textlayout(IDWriteTextLayout **layout) +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; @@ -657,6 +662,7 @@ HRESULT create_textlayout(IDWriteTextLayout **layout) This->IDWriteTextLayout_iface.lpVtbl = &dwritetextlayoutvtbl; This->ref = 1; + This->str = heap_strdupnW(str, len); *layout = &This->IDWriteTextLayout_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 20aed56..75445e8 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -506,7 +506,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHA FIXME("(%s %u %p %f %f %p): stub\n", debugstr_w(string), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; - return create_textlayout(layout); + return create_textlayout(string, len, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory *iface, WCHAR const* string, @@ -517,7 +517,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory pixels_per_dip, transform, use_gdi_natural, layout); if (!format) return E_INVALIDARG; - return create_textlayout(layout); + return create_textlayout(string, len, layout); } static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6e2c718..ab29c06 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -27,6 +27,16 @@ static IDWriteFactory *factory; +static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; + +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static void test_CreateTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -52,7 +62,9 @@ static void test_CreateTextLayout(void) static void test_CreateGdiCompatibleTextLayout(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteTextLayout *layout; + IDWriteTextFormat *format; HRESULT hr; hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, NULL, 0, NULL, 0.0, 0.0, 0.0, NULL, FALSE, &layout); @@ -69,6 +81,30 @@ static void test_CreateGdiCompatibleTextLayout(void) hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, NULL, 1000.0, 1000.0, 1.0, NULL, FALSE, &layout); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* create with text format */ + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(format, 1); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(format, 1); + EXPECT_REF(layout, 1); + + IDWriteTextLayout_AddRef(layout); + EXPECT_REF(format, 1); + EXPECT_REF(layout, 2); + IDWriteTextLayout_Release(layout); + IDWriteTextLayout_Release(layout); + + /* zero length string is okay */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); } START_TEST(layout)

1 0

Jacek Caban : mshtml: Fixed attribute object caching logic.
by Alexandre Julliard Oct. 22, 2012

Oct. 22, 2012

Module: wine Branch: master Commit: 8b04ab10b9dc36fe5f8b1a74eb7866b465d5cd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b04ab10b9dc36fe5f8b1a74e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 11:59:10 2012 +0200 mshtml: Fixed attribute object caching logic. --- dlls/mshtml/htmlelem.c | 21 +++++++++++---------- dlls/mshtml/tests/jstest.html | 10 ++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d11ebbc..753bbcb 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2254,7 +2254,6 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - pos++; hres = HTMLDOMAttribute_Create(This->elem, id, attr); if(FAILED(hres)) return hres; @@ -2596,20 +2595,22 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI switch(flags) { case DISPATCH_PROPERTYGET: { HTMLDOMAttribute *iter; + DWORD pos; - id = id-MSHTML_DISPID_CUSTOM_MIN+1; + pos = id-MSHTML_DISPID_CUSTOM_MIN; LIST_FOR_EACH_ENTRY(iter, &This->attrs, HTMLDOMAttribute, entry) { - if(!(--id)) - break; + if(!pos) { + IHTMLDOMAttribute_AddRef(&iter->IHTMLDOMAttribute_iface); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&iter->IHTMLDOMAttribute_iface; + return S_OK; + } + pos--; } - if(id) - return E_INVALIDARG; - IHTMLDOMAttribute_AddRef(&iter->IHTMLDOMAttribute_iface); - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = (IDispatch*)&iter->IHTMLDOMAttribute_iface; - return S_OK; + WARN("invalid arg\n"); + return E_INVALIDARG; } default: diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 70478e4..7fa9565 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -113,7 +113,16 @@ function test_setAttribute() { input.setAttribute("checked", ""); ok(input.checked === false, "input.checked = " + input.checked); +} + +function test_attribute_collection() { + var div, attr; + + document.body.innerHTML = '<div id="divid" class="test"></div>'; + div = document.getElementById("divid"); + attr = div.attributes["dir"]; + ok(attr === div.attributes["dir"], "attr !== div.attributes['dir']"); } function test_getter_call() { @@ -166,6 +175,7 @@ function runTests() { test_remove_style_attribute(); test_getter_call(); test_setAttribute(); + test_attribute_collection(); test_override_functions(); var r = window.execScript("globalVar = true;");

1 0