wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Henri Verbeet : wined3d: Use the FBO cache in context_apply_blit_state().
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 9982a46296910bfec288930455a19bf9224d27cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9982a46296910bfec28893045… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 5 18:22:34 2010 +0200 wined3d: Use the FBO cache in context_apply_blit_state(). --- dlls/wined3d/context.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9815ce3..ae4f754 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2003,9 +2003,7 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp surface_internal_preload(context->current_rt, SRGB_RGB); ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, context->current_rt); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL); LEAVE_GL(); } else

1 0

Alexandre Julliard : gdi32: Add a global function to retrieve the display driver.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: e27bc88693b2ac023af90f727daa75b1e2278ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27bc88693b2ac023af90f727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:50:30 2010 +0200 gdi32: Add a global function to retrieve the display driver. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/driver.c | 15 ++++++--------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27d491a..5f304a2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -760,7 +760,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); } - if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; + if (!funcs && !(funcs = DRIVER_get_display_driver())) return 0; if (!(dc = alloc_dc_ptr( funcs, OBJ_MEMDC ))) goto error; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f23cdc1..e6713ea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -214,18 +214,18 @@ static struct graphics_driver *create_driver( HMODULE module ) /********************************************************************** - * load_display_driver + * DRIVER_get_display_driver * * Special case for loading the display driver: get the name from the config file */ -static struct graphics_driver *load_display_driver(void) +const DC_FUNCTIONS *DRIVER_get_display_driver(void) { struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; - if (display_driver) return display_driver; /* already loaded */ + if (display_driver) return &display_driver->funcs; /* already loaded */ strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -259,7 +259,7 @@ static struct graphics_driver *load_display_driver(void) FreeLibrary( driver->module ); HeapFree( GetProcessHeap(), 0, driver ); } - return display_driver; + return &display_driver->funcs; } @@ -274,11 +274,8 @@ const DC_FUNCTIONS *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 )) - { - driver = load_display_driver(); - return &driver->funcs; - } + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return DRIVER_get_display_driver(); + if ((module = GetModuleHandleW( name ))) { if (display_driver && display_driver->module == module) return &display_driver->funcs; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a3ec954..766668b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -385,6 +385,7 @@ extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; /* driver.c */ +extern const DC_FUNCTIONS *DRIVER_get_display_driver(void) DECLSPEC_HIDDEN; extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Don' t store the display driver in the global list to avoid the need for locking .
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 8dc9e8786b13ac64fa953c1d2d7156fd470e1016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc9e8786b13ac64fa953c1d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:48:24 2010 +0200 gdi32: Don't store the display driver in the global list to avoid the need for locking. --- dlls/gdi32/driver.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb7af56..f23cdc1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,7 +209,6 @@ static struct graphics_driver *create_driver( HMODULE module ) } else memset( &driver->funcs, 0, sizeof(driver->funcs) ); - list_add_head( &drivers, &driver->entry ); return driver; } @@ -221,6 +220,7 @@ static struct graphics_driver *create_driver( HMODULE module ) */ static struct graphics_driver *load_display_driver(void) { + struct graphics_driver *driver; char buffer[MAX_PATH], libname[32], *name, *next; HMODULE module = 0; HKEY hkey; @@ -247,13 +247,18 @@ static struct graphics_driver *load_display_driver(void) name = next; } - if (!(display_driver = create_driver( module ))) + if (!(driver = create_driver( module ))) { MESSAGE( "Could not create graphics driver '%s'\n", buffer ); FreeLibrary( module ); ExitProcess(1); } - + if (InterlockedCompareExchangePointer( (void **)&display_driver, driver, NULL )) + { + /* somebody beat us to it */ + FreeLibrary( driver->module ); + HeapFree( GetProcessHeap(), 0, driver ); + } return display_driver; } @@ -264,47 +269,48 @@ static struct graphics_driver *load_display_driver(void) const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; - struct graphics_driver *driver; + struct graphics_driver *driver, *new_driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; - EnterCriticalSection( &driver_section ); - /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || - !strcmpiW( name, display1W )) + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) { driver = load_display_driver(); - LeaveCriticalSection( &driver_section ); return &driver->funcs; } - if ((module = GetModuleHandleW( name ))) { + if (display_driver && display_driver->module == module) return &display_driver->funcs; + EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { - if (driver->module == module) - { - LeaveCriticalSection( &driver_section ); - return &driver->funcs; - } + if (driver->module == module) goto done; } + LeaveCriticalSection( &driver_section ); } - if (!(module = LoadLibraryW( name ))) + if (!(module = LoadLibraryW( name ))) return NULL; + + if (!(new_driver = create_driver( module ))) { - LeaveCriticalSection( &driver_section ); + FreeLibrary( module ); return NULL; } - if (!(driver = create_driver( module ))) + /* check if someone else added it in the meantime */ + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { + if (driver->module != module) continue; FreeLibrary( module ); - LeaveCriticalSection( &driver_section ); - return NULL; + HeapFree( GetProcessHeap(), 0, new_driver ); + goto done; } - + driver = new_driver; + list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); +done: LeaveCriticalSection( &driver_section ); return &driver->funcs; }

1 0

Alexandre Julliard : gdi32: Don't bother freeing graphics drivers.
by Alexandre Julliard 06 May '10

06 May '10

Module: wine Branch: master Commit: 0e4f742f06f932680ad436b32dead5464d710fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4f742f06f932680ad436b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 13:37:32 2010 +0200 gdi32: Don't bother freeing graphics drivers. --- dlls/gdi32/dc.c | 6 ----- dlls/gdi32/driver.c | 56 +-------------------------------------------- dlls/gdi32/gdi_private.h | 2 - 3 files changed, 2 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 577c151..27d491a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -674,7 +674,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, error: if (dc) free_dc_ptr( dc ); - DRIVER_release_driver( funcs ); return 0; } @@ -759,7 +758,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) physDev = origDC->physDev; } release_dc_ptr( origDC ); - if (funcs) funcs = DRIVER_get_driver( funcs ); } if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; @@ -790,7 +788,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) error: if (dc) free_dc_ptr( dc ); - DRIVER_release_driver( funcs ); return 0; } @@ -800,7 +797,6 @@ error: */ BOOL WINAPI DeleteDC( HDC hdc ) { - const DC_FUNCTIONS *funcs = NULL; DC * dc; TRACE("%p\n", hdc ); @@ -838,13 +834,11 @@ BOOL WINAPI DeleteDC( HDC hdc ) SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); - funcs = dc->funcs; if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev); dc->physDev = NULL; } free_dc_ptr( dc ); - if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */ return TRUE; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 05c2513..bb7af56 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -42,7 +42,6 @@ struct graphics_driver { struct list entry; HMODULE module; /* module handle */ - unsigned int count; /* reference count */ DC_FUNCTIONS funcs; }; @@ -69,7 +68,6 @@ static struct graphics_driver *create_driver( HMODULE module ) if (!(driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver)))) return NULL; driver->module = module; - driver->count = 1; /* fill the function table */ if (module) @@ -227,11 +225,7 @@ static struct graphics_driver *load_display_driver(void) HMODULE module = 0; HKEY hkey; - if (display_driver) /* already loaded */ - { - display_driver->count++; - return display_driver; - } + if (display_driver) return display_driver; /* already loaded */ strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ @@ -260,7 +254,6 @@ static struct graphics_driver *load_display_driver(void) ExitProcess(1); } - display_driver->count++; /* we don't want to free it */ return display_driver; } @@ -278,7 +271,7 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) EnterCriticalSection( &driver_section ); /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) { driver = load_display_driver(); @@ -292,7 +285,6 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) { if (driver->module == module) { - driver->count++; LeaveCriticalSection( &driver_section ); return &driver->funcs; } @@ -318,50 +310,6 @@ const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) } -/********************************************************************** - * DRIVER_get_driver - * - * Get a new copy of an existing driver. - */ -const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) -{ - struct graphics_driver *driver; - - EnterCriticalSection( &driver_section ); - LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) - if (&driver->funcs == funcs) break; - if (&driver->entry == &drivers) ERR( "driver not found, trouble ahead\n" ); - driver->count++; - LeaveCriticalSection( &driver_section ); - return funcs; -} - - -/********************************************************************** - * DRIVER_release_driver - * - * Release a driver by decrementing ref count and freeing it if needed. - */ -void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) -{ - struct graphics_driver *driver; - - EnterCriticalSection( &driver_section ); - - LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) - { - if (&driver->funcs != funcs) continue; - if (--driver->count) break; - list_remove( &driver->entry ); - if (driver == display_driver) display_driver = NULL; - FreeLibrary( driver->module ); - HeapFree( GetProcessHeap(), 0, driver ); - break; - } - LeaveCriticalSection( &driver_section ); -} - - /***************************************************************************** * DRIVER_GetDriverName * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index de00eb4..a3ec954 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -386,8 +386,6 @@ extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, /* driver.c */ extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; -extern const DC_FUNCTIONS *DRIVER_get_driver( const DC_FUNCTIONS *funcs ) DECLSPEC_HIDDEN; -extern void DRIVER_release_driver( const DC_FUNCTIONS *funcs ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */

1 0

Alexander Nicolaysen Sørnes : objectManager: Add missing parameter to handle_anonymous_submission() call
by Alexander Nicolaysen Sørnes 06 May '10

06 May '10

Module: appdb Branch: master Commit: 951bb19e8ba3ec213bd6da65bcb0714627288661 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=951bb19e8ba3ec213bd6da65… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 6 17:41:31 2010 +0200 objectManager: Add missing parameter to handle_anonymous_submission() call --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index ed6c43e..1f250aa 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1505,7 +1505,7 @@ class ObjectManager $oObject->update(); } else { - $this->handle_anonymous_submission(); + $this->handle_anonymous_submission($aClean); $oObject->create(); }

1 0

Huw Davies : comctl32: Silence a few compiler warnings.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 1af17844301c4924dd8324cbf2f9c3c1ef0394b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af17844301c4924dd8324cbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 4 14:05:13 2010 +0100 comctl32: Silence a few compiler warnings. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index dc2dd12..2418950 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -614,7 +614,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO lctype = LOCALE_SABBREVMONTHNAME1; max_count = 12; break; - case FULLMONTH: + default: /* FULLMONTH */ fall = fld_mon; lctype = LOCALE_SMONTHNAME1; max_count = 12;

1 0

Huw Davies : gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 9bee50f6d9c4d4055752239af432664a57923403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bee50f6d9c4d4055752239af… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 5 14:59:07 2010 +0100 gdi32: Fix ExtTextOutA -> W forwarding when ETO_PDY is set. --- dlls/gdi32/font.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index eea53fd..c21036d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1586,13 +1586,29 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, if (lpDx) { unsigned int i = 0, j = 0; - lpDxW = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT)); + /* allocate enough for a ETO_PDY */ + lpDxW = HeapAlloc( GetProcessHeap(), 0, 2*wlen*sizeof(INT)); while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) { - lpDxW[j++] = lpDx[i] + lpDx[i+1]; + if(IsDBCSLeadByteEx(codepage, str[i])) + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2] + lpDx[(i + 1) * 2]; + lpDxW[j++] = lpDx[i * 2 + 1] + lpDx[(i + 1) * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i] + lpDx[i + 1]; i = i + 2; - } else { - lpDxW[j++] = lpDx[i]; + } + else + { + if(flags & ETO_PDY) + { + lpDxW[j++] = lpDx[i * 2]; + lpDxW[j++] = lpDx[i * 2 + 1]; + } + else + lpDxW[j++] = lpDx[i]; i = i + 1; } }

1 0

Sven Baars : comdlg32: Fix some alignment issues in the Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 6b21d0c66338f8c7416bcae40340ee9aef00f34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b21d0c66338f8c7416bcae40… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:15:54 2010 +0200 comdlg32: Fix some alignment issues in the Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index cd04bf8..dfd5d4e 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -139,7 +139,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effecten",1072,6,72,84,34,WS_GROUP CHECKBOX "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Onderstrepen", 1041, 10,94,60,10, BS_AUTOCHECKBOX LTEXT "&Kleur:", 1091 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0

Sven Baars : comctl32: Fix Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: fbd8722856e8565273b23eb59d791c5f7a83c548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd8722856e8565273b23eb59… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:06:00 2010 +0200 comctl32: Fix Dutch translation. --- dlls/comctl32/comctl_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc index c89403d..fe2bf7a 100644 --- a/dlls/comctl32/comctl_Nl.rc +++ b/dlls/comctl32/comctl_Nl.rc @@ -77,7 +77,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDM_TODAY "Vandaag:" - IDM_GOTODAY "Ga vandaag naar" + IDM_GOTODAY "Ga naar vandaag" } STRINGTABLE DISCARDABLE

1 0

Sven Baars : avifil32: Fix Dutch translation.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 2da433feb6d7a16f887bc5cef6649ba4316ef3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da433feb6d7a16f887bc5cef… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 14:56:53 2010 +0200 avifil32: Fix Dutch translation. --- dlls/avifil32/avifile_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc index b2546a0..29ddd17 100644 --- a/dlls/avifil32/avifile_Nl.rc +++ b/dlls/avifil32/avifile_Nl.rc @@ -33,7 +33,7 @@ BEGIN PUSHBUTTON "&Opties...",IDC_OPTIONS,170,17,50,14 AUTOCHECKBOX "&Interleave alle",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "Losse frames",-1,129,43,36,9 + LTEXT "frames",-1,129,43,36,9 LTEXT "Huidig formaat:",-1,3,56,73,9 LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
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 May 2010