June 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_iostream<char> implementation.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: de5cf35cb78404ca4e4fd16e9667a07a4008c9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5cf35cb78404ca4e4fd16e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:22:13 2012 +0200 msvcp90: Added basic_iostream<char> implementation. --- dlls/msvcp90/ios.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 22 +++++++---- dlls/msvcp90/msvcp90.spec | 22 +++++----- 3 files changed, 117 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de5cf35cb78404ca4e4fd…

1 0

Piotr Caban : msvcp90: Added basic_filebuf<char> implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 9f9a4a18d1fecadba589e7b7cf7f601e08ea8503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9a4a18d1fecadba589e7b7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:06 2012 +0200 msvcp90: Added basic_filebuf<char> implementation. --- dlls/msvcp90/ios.c | 576 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/locale.c | 17 +-- dlls/msvcp90/msvcp90.h | 26 ++ dlls/msvcp90/msvcp90.spec | 102 ++++---- 4 files changed, 653 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9a4a18d1fecadba589e…

1 0

Piotr Caban : msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 8d39c7d8899d224174bee692934ab34eada9b69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d39c7d8899d224174bee6929… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:27 2012 +0200 msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro. --- dlls/msvcp90/exception.c | 18 +++++++++--------- dlls/msvcp90/ios.c | 30 +++++++++++++++--------------- dlls/msvcp90/locale.c | 32 ++++++++++++++++---------------- dlls/msvcp90/msvcp90.h | 18 +++++++++++++++--- 4 files changed, 55 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d39c7d8899d224174bee…

1 0

Piotr Caban : msvcp90: Added basic_ifstream<char> implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 5b0548cc3ee525b59ac79c7a7f92ab6073ca24fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0548cc3ee525b59ac79c7a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:50 2012 +0200 msvcp90: Added basic_ifstream<char> implementation. --- dlls/msvcp90/ios.c | 221 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 255 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b0548cc3ee525b59ac79…

1 0

Piotr Caban : msvcp90: Added basic_istream<char>::getline(basic_string<char >) implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 0db98a30b99bcfc6135a4608d7bb34f61af375d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db98a30b99bcfc6135a4608d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:09 2012 +0200 msvcp90: Added basic_istream<char>::getline(basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 ++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f4c216..97edacf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4630,6 +4630,39 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * return NULL; } +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str_delim( + basic_istream_char *istream, basic_string_char *str, char delim) +{ + IOSB_iostate state = IOSTATE_failbit; + int c; + + TRACE("(%p %p %c)\n", istream, str, delim); + + if(basic_istream_char_sentry_create(istream, TRUE)) { + MSVCP_basic_string_char_clear(str); + + for(c = basic_istream_char_get(istream); c!=delim && c!=EOF; + c = basic_istream_char_get(istream)) { + state = IOSTATE_goodbit; + MSVCP_basic_string_char_append_ch(str, c); + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); + return istream; +} + +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str( + basic_istream_char *istream, basic_string_char *str) +{ + return basic_istream_char_getline_str_delim(istream, str, '\n'); +} + /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor, 8) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index ba5b0a7..5ca938c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -247,6 +247,8 @@ basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); +void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 03e6c1a..0a6b24a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -386,10 +386,10 @@ @ stub -arch=win64 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ stub -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z -@ stub -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win64 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)G@Z

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 034de95550be8518fce566041a225434ed3ef26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=034de95550be8518fce566041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:30 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 262 ++++++++++++------------ dlls/msvcp70/msvcp70.spec | 374 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 406 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 462 +++++++++++++++++++++--------------------- 4 files changed, 752 insertions(+), 752 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=034de95550be8518fce56…

1 0

Huw Davies : winspool: Update the ppd file of an already installed printer in the first call to OpenPrinter .
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 28ef1af6d0435211e243bc4b22856fa8fc579d52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ef1af6d0435211e243bc4b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 12 09:42:49 2012 +0100 winspool: Update the ppd file of an already installed printer in the first call to OpenPrinter. --- dlls/winspool.drv/info.c | 201 +++++++++++++++++++++++++++++++--------------- 1 files changed, 137 insertions(+), 64 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a5ccf49..ed470bb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -450,6 +450,62 @@ static inline DWORD set_reg_DWORD( HKEY hkey, const WCHAR *keyname, const DWORD return RegSetValueExW( hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value) ); } +/****************************************************************** + * get_opened_printer + * Get the pointer to the opened printer referred by the handle + */ +static opened_printer_t *get_opened_printer(HANDLE hprn) +{ + UINT_PTR idx = (UINT_PTR)hprn; + opened_printer_t *ret = NULL; + + EnterCriticalSection(&printer_handles_cs); + + if ((idx > 0) && (idx <= nb_printer_handles)) { + ret = printer_handles[idx - 1]; + } + LeaveCriticalSection(&printer_handles_cs); + return ret; +} + +/****************************************************************** + * get_opened_printer_name + * Get the pointer to the opened printer name referred by the handle + */ +static LPCWSTR get_opened_printer_name(HANDLE hprn) +{ + opened_printer_t *printer = get_opened_printer(hprn); + if(!printer) return NULL; + return printer->name; +} + +static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) +{ + HKEY printers; + DWORD err; + + *key = NULL; + err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); + if (err) return err; + + err = RegOpenKeyW( printers, name, key ); + if (err) err = ERROR_INVALID_PRINTER_NAME; + RegCloseKey( printers ); + return err; +} + +/****************************************************************** + * WINSPOOL_GetOpenedPrinterRegKey + * + */ +static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) +{ + LPCWSTR name = get_opened_printer_name(hPrinter); + + if(!name) return ERROR_INVALID_HANDLE; + return open_printer_reg_key( name, phkey ); +} + static void WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { char qbuf[200]; @@ -476,13 +532,13 @@ WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { } } -static BOOL add_printer_driver(WCHAR *name, WCHAR *ppd) +static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) { DRIVER_INFO_3W di3; ZeroMemory(&di3, sizeof(DRIVER_INFO_3W)); di3.cVersion = 3; - di3.pName = name; + di3.pName = (WCHAR*)name; di3.pEnvironment = envname_x86W; di3.pDriverPath = driver_nt; di3.pDataFile = ppd; @@ -831,7 +887,61 @@ static BOOL CUPS_LoadPrinters(void) RegCloseKey(hkeyPrinters); return TRUE; } + +static char *get_cups_name( HANDLE printer ) +{ + WCHAR *port; + DWORD err, needed, type; + char *ret = NULL; + HKEY key; + + err = WINSPOOL_GetOpenedPrinterRegKey( printer, &key ); + if (err) return NULL; + err = RegQueryValueExW( key, PortW, 0, &type, NULL, &needed ); + if (err || needed <= sizeof( CUPS_Port )) goto end; + port = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!port) goto end; + RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); + if (!memcmp( port, CUPS_Port, sizeof(CUPS_Port) - sizeof(WCHAR) )) + { + WCHAR *name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if(ret) WideCharToMultiByte( CP_UNIXCP, 0, name, -1, ret, needed, NULL, NULL ); + } + HeapFree( GetProcessHeap(), 0, port ); +end: + RegCloseKey( key ); + return ret; +} +#endif + +static BOOL update_driver( HANDLE printer ) +{ + BOOL ret = FALSE; +#ifdef SONAME_LIBCUPS + const WCHAR *name = get_opened_printer_name( printer ); + WCHAR *ppd_dir, *ppd; + char *cups_name; + + if (!name) return FALSE; + cups_name = get_cups_name( printer ); + if (!cups_name) return FALSE; + + ppd_dir = get_ppd_dir(); + ppd = get_ppd_filename( ppd_dir, name ); + if (get_cups_ppd( cups_name, ppd )) + { + TRACE( "updating driver %s\n", debugstr_w( name ) ); + ret = add_printer_driver( name, ppd ); + unlink_ppd( ppd ); + } + HeapFree( GetProcessHeap(), 0, ppd_dir ); + HeapFree( GetProcessHeap(), 0, ppd ); + HeapFree( GetProcessHeap(), 0, cups_name ); #endif + return ret; +} static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) { @@ -1243,62 +1353,6 @@ end: return (HANDLE)handle; } -/****************************************************************** - * get_opened_printer - * Get the pointer to the opened printer referred by the handle - */ -static opened_printer_t *get_opened_printer(HANDLE hprn) -{ - UINT_PTR idx = (UINT_PTR)hprn; - opened_printer_t *ret = NULL; - - EnterCriticalSection(&printer_handles_cs); - - if ((idx > 0) && (idx <= nb_printer_handles)) { - ret = printer_handles[idx - 1]; - } - LeaveCriticalSection(&printer_handles_cs); - return ret; -} - -/****************************************************************** - * get_opened_printer_name - * Get the pointer to the opened printer name referred by the handle - */ -static LPCWSTR get_opened_printer_name(HANDLE hprn) -{ - opened_printer_t *printer = get_opened_printer(hprn); - if(!printer) return NULL; - return printer->name; -} - -static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) -{ - HKEY printers; - DWORD err; - - *key = NULL; - err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); - if (err) return err; - - err = RegOpenKeyW( printers, name, key ); - if (err) err = ERROR_INVALID_PRINTER_NAME; - RegCloseKey( printers ); - return err; -} - -/****************************************************************** - * WINSPOOL_GetOpenedPrinterRegKey - * - */ -static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) -{ - LPCWSTR name = get_opened_printer_name(hPrinter); - - if(!name) return ERROR_INVALID_HANDLE; - return open_printer_reg_key( name, phkey ); -} - static void old_printer_check( BOOL delete_phase ) { PRINTER_INFO_5W* pi; @@ -1348,6 +1402,7 @@ static void old_printer_check( BOOL delete_phase ) static const WCHAR winspool_mutex_name[] = {'_','_','W','I','N','E','_','W','I','N','S','P','O','O','L','_', 'M','U','T','E','X','_','_','\0'}; +static HANDLE init_mutex; void WINSPOOL_LoadSystemPrinters(void) { @@ -1355,19 +1410,18 @@ void WINSPOOL_LoadSystemPrinters(void) DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; - HANDLE mutex; /* FIXME: The init code should be moved to spoolsv.exe */ - mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); - if (!mutex) + init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); + if (!init_mutex) { ERR( "Failed to create mutex\n" ); return; } if (GetLastError() == ERROR_ALREADY_EXISTS) { - WaitForSingleObject( mutex, INFINITE ); - ReleaseMutex( mutex ); + WaitForSingleObject( init_mutex, INFINITE ); + ReleaseMutex( init_mutex ); TRACE( "Init already done\n" ); return; } @@ -1403,7 +1457,7 @@ void WINSPOOL_LoadSystemPrinters(void) old_printer_check( TRUE ); - ReleaseMutex( mutex ); + ReleaseMutex( init_mutex ); return; } @@ -2277,6 +2331,25 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + + WaitForSingleObject( init_mutex, INFINITE ); + if (*phPrinter) + { + HKEY key; + DWORD deleting = 0, size = sizeof( deleting ), type; + DWORD status; + WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ); + RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); + status = get_dword_from_reg( key, StatusW ); + if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) + { + update_driver( *phPrinter ); + set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + } + RegCloseKey( key ); + } + ReleaseMutex( init_mutex ); + TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); return (*phPrinter != 0); }

1 0

Aric Stewart : usp10: Do not use custom indic ShapeCharGlyphProp when shaping Indic numeric scripts .
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 3447b716a6e3bef5a6158de6c4b267d07cdf9422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447b716a6e3bef5a6158de6c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 12 08:22:40 2012 -0500 usp10: Do not use custom indic ShapeCharGlyphProp when shaping Indic numeric scripts. --- dlls/usp10/shape.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 36f6854..cb5adcc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -415,25 +415,25 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, NULL}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, NULL}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, NULL}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, NULL}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, NULL}, {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL},

1 0

Aric Stewart : usp10: In ShapeCharGlyphProp_BaseIndic set justification to SCRIPT_JUSTIFY_NONE for glyphs with no characters .
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 9ea4543d12adecb749ceba9e150413844fbe0011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea4543d12adecb749ceba9e1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 12 08:22:50 2012 -0500 usp10: In ShapeCharGlyphProp_BaseIndic set justification to SCRIPT_JUSTIFY_NONE for glyphs with no characters. --- dlls/usp10/shape.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cb5adcc..c654b07 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2991,7 +2991,10 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL } if (char_count == 0) + { + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; continue; + } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ {

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexShader9Impl.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: df9c6aa3ec1ca4239dc7e458f129efe921894ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9c6aa3ec1ca4239dc7e458f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:46 2012 +0200 d3d9: Get rid of IDirect3DVertexShader9Impl. --- dlls/d3d9/d3d9_private.h | 24 +++++++++--------------- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/shader.c | 43 +++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f386eb5..d1d177d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -272,23 +272,17 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9( IDirect3DVertexDeclaration9 *iface) DECLSPEC_HIDDEN; -/* ---------------------- */ -/* IDirect3DVertexShader9 */ -/* ---------------------- */ +struct d3d9_vertexshader +{ + IDirect3DVertexShader9 IDirect3DVertexShader9_iface; + LONG refcount; + struct wined3d_shader *wined3d_shader; + IDirect3DDevice9Ex *parent_device; +}; -/***************************************************************************** - * IDirect3DVertexShader implementation structure - */ -typedef struct IDirect3DVertexShader9Impl { - IDirect3DVertexShader9 IDirect3DVertexShader9_iface; - LONG ref; - struct wined3d_shader *wined3d_shader; - IDirect3DDevice9Ex *parentDevice; -} IDirect3DVertexShader9Impl; - -HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, +HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; +struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 80349cd..2e5eb3d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2240,7 +2240,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, const DWORD *byte_code, IDirect3DVertexShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *object; + struct d3d9_vertexshader *object; HRESULT hr; TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); @@ -2269,7 +2269,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 *shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); + struct d3d9_vertexshader *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2285,7 +2285,7 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *shader_impl; + struct d3d9_vertexshader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index b4d8a3d..7020d15 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -22,39 +22,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +static inline struct d3d9_vertexshader *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, IDirect3DVertexShader9_iface); + return CONTAINING_RECORD(iface, struct d3d9_vertexshader, IDirect3DVertexShader9_iface); } -static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object) +static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DVertexShader9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DVertexShader9_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); if (refcount == 1) { - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + IDirect3DDevice9Ex_AddRef(shader->parent_device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -65,14 +65,14 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { - IDirect3DDevice9Ex *device = shader->parentDevice; + IDirect3DDevice9Ex *device = shader->parent_device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -87,11 +87,11 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, IDirect3DDevice9 **device) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)shader->parentDevice; + *device = (IDirect3DDevice9 *)shader->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -99,10 +99,9 @@ static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, return D3D_OK; } -static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface, - void *data, UINT *data_size) +static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface, void *data, UINT *data_size) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); @@ -135,11 +134,11 @@ static const struct wined3d_parent_ops d3d9_vertexshader_wined3d_parent_ops = d3d9_vertexshader_wined3d_object_destroyed, }; -HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, struct d3d9_device *device, const DWORD *byte_code) +HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *device, const DWORD *byte_code) { HRESULT hr; - shader->ref = 1; + shader->refcount = 1; shader->IDirect3DVertexShader9_iface.lpVtbl = &d3d9_vertexshader_vtbl; wined3d_mutex_lock(); @@ -152,13 +151,13 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, struct d3d9_device return hr; } - shader->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + shader->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(shader->parent_device); return D3D_OK; } -IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { if (!iface) return NULL;

1 0