wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Piotr Caban : advapi32: Don' t terminate service when its last thread has exited.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8ebf0a72c941e07563853f9e60fdecf86dcc6a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebf0a72c941e07563853f9e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 22 14:25:54 2012 +0200 advapi32: Don't terminate service when its last thread has exited. --- dlls/advapi32/service.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1f585dc..07b9e4b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -547,7 +547,6 @@ static BOOL service_run_main_thread(void) { services[wait_services[ret]]->thread = 0; CloseHandle( wait_handles[ret] ); - if (n == 5) return TRUE; /* it was the last running thread */ } else return FALSE; }

1 0

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

22 Oct '12

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 22 Oct '12

22 Oct '12

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 22 Oct '12

22 Oct '12

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 22 Oct '12

22 Oct '12

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

Alexandre Julliard : explorer: Remove support for the old-style X11 desktop configuration key.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 78b86e34464a30d57d342b0beb3aede740b06b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b86e34464a30d57d342b0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:37:00 2012 +0200 explorer: Remove support for the old-style X11 desktop configuration key. --- programs/explorer/desktop.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 84f6fa3..c646f2d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -255,7 +255,6 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; HWND hwnd, msg_hwnd; @@ -288,27 +287,6 @@ void manage_desktop( WCHAR *arg ) { if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - else /* check for the X11 driver key for backwards compatibility (to be removed) */ - { - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; - static const WCHAR x11_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'X','1','1',' ','D','r','i','v','e','r',0}; - HKEY hkey; - WCHAR buffer[64]; - DWORD size = sizeof(buffer); - - width = height = 0; - /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (!RegOpenKeyW( HKEY_CURRENT_USER, x11_keyW, &hkey )) - { - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) - { - name = defaultW; - if (!parse_size( buffer, &width, &height )) width = height = 0; - } - RegCloseKey( hkey ); - } - } if (name && width && height) xwin = create_desktop( name, width, height );

1 0

Alexandre Julliard : winex11: Remove some remainders of the ddraw HAL support.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 900b5f4b793daca9b8ba2934d6783bdf79a59f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=900b5f4b793daca9b8ba2934d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 14:36:31 2012 +0200 winex11: Remove some remainders of the ddraw HAL support. --- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/settings.c | 5 ----- include/d3dhal.h | 3 --- 3 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index a27b052..f03dd4d 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -311,8 +311,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d { switch (*(const INT *)in_data) { - case DCICOMMAND: - return DD_HAL_VERSION; case X11DRV_ESCAPE: return TRUE; } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 9512c64..035b0da 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -35,11 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); -/* - * The DDHALMODEINFO type is used to hold all the mode information. - * This is done because the array of DDHALMODEINFO structures must be - * created for use by DirectDraw anyway. - */ static struct x11drv_mode_info *dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; diff --git a/include/d3dhal.h b/include/d3dhal.h index 6c68d4a..9d43313 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,9 +47,6 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; -/* this is to allow keeping the bulk of our OpenGL code out of x11drv */ -#define D3DDD_WINE_OPENGL_DEVICE 0x00008000 - typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps;

1 0

Akihiro Sagawa : cmd: Properly handle multibyte characters in batch files.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 8daef1649b242e26236df9c9cb1810750113bed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daef1649b242e26236df9c9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 20 01:02:24 2012 +0900 cmd: Properly handle multibyte characters in batch files. --- programs/cmd/batch.c | 58 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index bacb6cd..02d1fcf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -234,31 +234,53 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) { DWORD charsRead; BOOL status; - LARGE_INTEGER filepos; DWORD i; /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ if (!WCMD_is_console_handle(h)) { - /* Save current file position */ - filepos.QuadPart = 0; - SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); - } + LARGE_INTEGER filepos; + char *bufA; + UINT cp; + const char *p; + + cp = GetConsoleCP(); + bufA = HeapAlloc(GetProcessHeap(), 0, noChars); + if (!bufA) return NULL; + + /* Save current file position */ + filepos.QuadPart = 0; + SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); + + status = ReadFile(h, bufA, noChars, &charsRead, NULL); + if (!status || charsRead == 0) { + HeapFree(GetProcessHeap(), 0, bufA); + return NULL; + } - status = WCMD_ReadFile(h, buf, noChars, &charsRead); - if (!status || charsRead == 0) return NULL; + /* Find first EOL */ + for (p = bufA; p < (bufA + charsRead); p = CharNextExA(cp, p, 0)) { + if (*p == '\n' || *p == '\r') + break; + } - /* Find first EOL */ - for (i = 0; i < charsRead; i++) { - if (buf[i] == '\n' || buf[i] == '\r') - break; - } + /* Sets file pointer to the start of the next line, if any */ + filepos.QuadPart += p - bufA + 1 + (*p == '\r' ? 1 : 0); + SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); - if (!WCMD_is_console_handle(h) && i != charsRead) { - /* Sets file pointer to the start of the next line, if any */ - filepos.QuadPart += i + 1 + (buf[i] == '\r' ? 1 : 0); - SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); + i = MultiByteToWideChar(cp, 0, bufA, p - bufA, buf, noChars); + HeapFree(GetProcessHeap(), 0, bufA); + } + else { + status = WCMD_ReadFile(h, buf, noChars, &charsRead); + if (!status || charsRead == 0) return NULL; + + /* Find first EOL */ + for (i = 0; i < charsRead; i++) { + if (buf[i] == '\n' || buf[i] == '\r') + break; + } } /* Truncate at EOL (or end of buffer) */

1 0

Francois Gouget : Assorted spelling tweaks and fixes.
by Alexandre Julliard 22 Oct '12

22 Oct '12

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 22 Oct '12

22 Oct '12

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

← Newer
1
...
27
28
29
30
31
32
33
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012