September 2012 - Wine-commits

Jörg Höhle : mciseq: Remove superfluous NULL pointer check.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 5b3121b63265a34d36eabecca1ad0108f1be633a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3121b63265a34d36eabecca… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jul 19 09:15:15 2011 +0200 mciseq: Remove superfluous NULL pointer check. --- dlls/mciseq/mcimidi.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 2783c07..e0d8164 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -231,8 +231,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt) { DWORD ret = 0; - if (lpbyt == NULL || - mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { + if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { WARN("Error reading wmm=%p\n", wmm); ret = MCIERR_INVALID_FILE; } @@ -248,8 +247,7 @@ static DWORD MIDI_mciReadWord(WINE_MCIMIDI* wmm, LPWORD lpw) BYTE hibyte, lobyte; DWORD ret = MCIERR_INVALID_FILE; - if (lpw != NULL && - MIDI_mciReadByte(wmm, &hibyte) == 0 && + if (MIDI_mciReadByte(wmm, &hibyte) == 0 && MIDI_mciReadByte(wmm, &lobyte) == 0) { *lpw = ((WORD)hibyte << 8) + lobyte; ret = 0; @@ -265,8 +263,7 @@ static DWORD MIDI_mciReadLong(WINE_MCIMIDI* wmm, LPDWORD lpdw) WORD hiword, loword; DWORD ret = MCIERR_INVALID_FILE; - if (lpdw != NULL && - MIDI_mciReadWord(wmm, &hiword) == 0 && + if (MIDI_mciReadWord(wmm, &hiword) == 0 && MIDI_mciReadWord(wmm, &loword) == 0) { *lpdw = MAKELONG(loword, hiword); ret = 0; @@ -281,24 +278,17 @@ static WORD MIDI_mciReadVaryLen(WINE_MCIMIDI* wmm, LPDWORD lpdw) { BYTE byte; DWORD value = 0; - WORD ret = 0; + WORD len = 0; - if (lpdw == NULL) { - ret = MCIERR_INVALID_FILE; - } else { - do { - if (MIDI_mciReadByte(wmm, &byte) != 0) { - return 0; - } - value = (value << 7) + (byte & 0x7F); - ret++; - } while (byte & 0x80); - *lpdw = value; - /* - TRACE("val=%08X\n", value); - */ - } - return ret; + do { + if (MIDI_mciReadByte(wmm, &byte) != 0) { + return 0; + } + value = (value << 7) + (byte & 0x7F); + len++; + } while (byte & 0x80); + *lpdw = value; + return len; } /**************************************************************************

1 0

Jacek Caban : textstor.idl: Added TS_ST_CORRECTION declaration.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 556076dcbe3bde631e97ca619238b8f57fee1319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556076dcbe3bde631e97ca619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 14 14:53:14 2012 +0200 textstor.idl: Added TS_ST_CORRECTION declaration. --- include/textstor.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 25f7749..5928569 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -64,6 +64,8 @@ const WCHAR TS_CHAR_REPLACEMENT = 0xfffd; const DWORD TS_IAS_NOQUERY = 0x1; const DWORD TS_IAS_QUERYONLY = 0x2; +const DWORD TS_ST_CORRECTION = 0x1; + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Huw Davies : winspool: Skip scanner-only devices.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 2f3d13a49ded38b5905797881981494a61ad093c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3d13a49ded38b5905797881… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 14 13:40:10 2012 +0100 winspool: Skip scanner-only devices. --- dlls/winspool.drv/info.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 38266c9..7509a8e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -857,6 +857,20 @@ static WCHAR *get_cups_option( const char *name, int num_options, cups_option_t return ret; } +static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) +{ + WCHAR *type = get_cups_option( "printer-type", dest->num_options, dest->options ), *end; + cups_ptype_t ret = 0; + + if (type && *type) + { + ret = (cups_ptype_t)strtoulW( type, &end, 10 ); + if (*end) ret = 0; + } + HeapFree( GetProcessHeap(), 0, type ); + return ret; +} + static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -868,6 +882,7 @@ static BOOL CUPS_LoadPrinters(void) char loaderror[256]; WCHAR nameW[MAX_PATH]; HANDLE added_printer; + cups_ptype_t printer_type; cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); if (!cupshandle) { @@ -893,12 +908,20 @@ static BOOL CUPS_LoadPrinters(void) TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + printer_type = get_cups_printer_type( dests + i ); + + TRACE( "Printer %d: %s. printer_type %x\n", i, debugstr_w(nameW), printer_type ); + + if (printer_type & 0x2000000 /* CUPS_PRINTER_SCANNER */) + { + TRACE( "skipping scanner-only device\n" ); + continue; + } port = HeapAlloc(GetProcessHeap(), 0, sizeof(CUPS_Port) + lstrlenW(nameW) * sizeof(WCHAR)); lstrcpyW(port, CUPS_Port); lstrcatW(port, nameW); - TRACE("Printer %d: %s\n", i, debugstr_w(nameW)); if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters

1 0

Piotr Caban : msvcp90: Fixed _Getcat return type.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: fbd77651873793d6ba98f4d80f57c9dd68647296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd77651873793d6ba98f4d80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:43:25 2012 +0200 msvcp90: Fixed _Getcat return type. --- dlls/msvcp100/locale.c | 10 +++++----- dlls/msvcp90/locale.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index e1abed8..ccf6297 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -2935,7 +2935,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -2987,7 +2987,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6172,7 +6172,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6819,7 +6819,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6843,7 +6843,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ddf1424..5cca3e0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3046,7 +3046,7 @@ codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigne /* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -3098,7 +3098,7 @@ codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) /* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl codecvt_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6315,7 +6315,7 @@ num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_char__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6962,7 +6962,7 @@ num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc); @@ -6986,7 +6986,7 @@ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const loc /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ -unsigned int __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) +MSVCP_size_t __cdecl num_put_short__Getcat(const locale_facet **facet, const locale *loc) { TRACE("(%p %p)\n", facet, loc);

1 0

Piotr Caban : msvcp80: Added codecvt<wchar>::_Getcat implementation.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 9730744b859258e932ea94f6721db6756e630c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9730744b859258e932ea94f67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:43:43 2012 +0200 msvcp80: Added codecvt<wchar>::_Getcat implementation. --- dlls/msvcp80/msvcp80.c | 20 ++++++++++++++++++++ dlls/msvcp80/msvcp80.spec | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c index 7dcc104..d42614a 100644 --- a/dlls/msvcp80/msvcp80.c +++ b/dlls/msvcp80/msvcp80.c @@ -96,6 +96,8 @@ MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const stru MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*); MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*); MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*); +MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*); +MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*); MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*); MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*); MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*); @@ -115,6 +117,8 @@ static BOOL init_funcs(void) pctype_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); pcodecvt_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); + pcodecvt_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); + pcodecvt_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); pnumpunct_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); pnumpunct_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); pnumpunct_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z"); @@ -127,6 +131,8 @@ static BOOL init_funcs(void) pctype_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); pcodecvt_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); + pcodecvt_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); + pcodecvt_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); pnumpunct_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); pnumpunct_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)_W@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); pnumpunct_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z"); @@ -199,6 +205,20 @@ MSVCP_size_t __cdecl codecvt_char__Getcat(const struct locale_facet **facet) return pcodecvt_char__Getcat(facet, plocale_classic()); } +/* ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z */ +/* ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z */ +MSVCP_size_t __cdecl codecvt_wchar__Getcat(const struct locale_facet **facet) +{ + return pcodecvt_wchar__Getcat(facet, plocale_classic()); +} + +/* ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z */ +/* ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z */ +MSVCP_size_t __cdecl codecvt_short__Getcat(const struct locale_facet **facet) +{ + return pcodecvt_short__Getcat(facet, plocale_classic()); +} + /* ?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z */ /* ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z */ MSVCP_size_t __cdecl numpunct_char__Getcat(const struct locale_facet **facet) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 1df2a63..4790fa5 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2220,10 +2220,10 @@ @ cdecl -arch=win64 ?_Fpz_func(a)std@@YAAEA_JXZ() msvcp90.?_Fpz_func(a)std@@YAAEA_JXZ @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) codecvt_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) codecvt_char__Getcat -@ stub -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) codecvt_short__Getcat +@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) codecvt_short__Getcat +@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) codecvt_wchar__Getcat +@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) codecvt_wchar__Getcat @ cdecl -arch=win32 ?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) collate_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) collate_char__Getcat @ cdecl -arch=win32 ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) collate_short__Getcat

1 0

Piotr Caban : msvcp90: Remove unused thiscall functions.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: f8350fc15b8bebdd1f8af84ccbbba7d63618b5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8350fc15b8bebdd1f8af84cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:44:29 2012 +0200 msvcp90: Remove unused thiscall functions. --- dlls/msvcp90/exception.c | 24 ++++++++---------------- dlls/msvcp90/locale.c | 20 -------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 6aa3c0d..d684140 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -98,8 +98,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); -DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) -exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name) +static exception* MSVCP_exception_ctor(exception *this, const char **name) { TRACE("(%p %s)\n", this, *name); @@ -189,8 +188,7 @@ static const cxx_exception_type exception_cxx_type = { /* bad_alloc class data */ typedef exception bad_alloc; -DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_ctor, 8) -bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name) +static bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name) { TRACE("%p %s\n", this, *name); MSVCP_exception_ctor(this, name); @@ -273,8 +271,7 @@ typedef struct _logic_error { basic_string_char str; } logic_error; -DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8) -logic_error* __thiscall MSVCP_logic_error_ctor( +static logic_error* MSVCP_logic_error_ctor( logic_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -361,8 +358,7 @@ static const cxx_exception_type logic_error_cxx_type = { /* length_error class data */ typedef logic_error length_error; -DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor, 8) -length_error* __thiscall MSVCP_length_error_ctor( +static length_error* MSVCP_length_error_ctor( length_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -410,8 +406,7 @@ static const cxx_exception_type length_error_cxx_type = { /* out_of_range class data */ typedef logic_error out_of_range; -DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8) -out_of_range* __thiscall MSVCP_out_of_range_ctor( +static out_of_range* MSVCP_out_of_range_ctor( out_of_range *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -459,8 +454,7 @@ static const cxx_exception_type out_of_range_cxx_type = { /* invalid_argument class data */ typedef logic_error invalid_argument; -DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_ctor, 8) -invalid_argument* __thiscall MSVCP_invalid_argument_ctor( +static invalid_argument* MSVCP_invalid_argument_ctor( invalid_argument *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -511,8 +505,7 @@ typedef struct { basic_string_char str; } runtime_error; -DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8) -runtime_error* __thiscall MSVCP_runtime_error_ctor( +static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, const char **name) { TRACE("%p %s\n", this, *name); @@ -599,8 +592,7 @@ static const cxx_exception_type runtime_error_cxx_type = { /* failure class data */ typedef runtime_error failure; -DEFINE_THISCALL_WRAPPER(MSVCP_failure_ctor, 8) -failure* __thiscall MSVCP_failure_ctor( +static failure* MSVCP_failure_ctor( failure *this, const char **name) { TRACE("%p %s\n", this, *name); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5cca3e0..a2b37a7 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8356,26 +8356,6 @@ void __thiscall locale_dtor(locale *this) locale__Locimp_dtor(this->ptr); } -DEFINE_THISCALL_WRAPPER(locale_vector_dtor, 8) -locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags) -{ - TRACE("(%p %x)\n", this, flags); - if(flags & 2) { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)this-1; - - for(i=*ptr-1; i>=0; i--) - locale_dtor(this+i); - MSVCRT_operator_delete(ptr); - } else { - locale_dtor(this); - if(flags & 1) - MSVCRT_operator_delete(this); - } - - return this; -} - /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4locale(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(locale_operator_assign, 8)

1 0

Piotr Caban : msvcp100: Remove unused thiscall functions.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 2f01c45248f150a229723aeb44f96ff82ad76822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f01c45248f150a229723aeb4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 14 12:45:01 2012 +0200 msvcp100: Remove unused thiscall functions. --- dlls/msvcp100/exception.c | 24 +- dlls/msvcp100/ios.c |11199 ++++++++++++++------------------------------- dlls/msvcp100/locale.c | 691 +--- dlls/msvcp100/math.c | 12 - dlls/msvcp100/memory.c | 275 +-- dlls/msvcp100/msvcp.h | 52 +- dlls/msvcp100/string.c | 3474 +------------- 7 files changed, 3705 insertions(+), 12022 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f01c45248f150a229723…

1 0

Rico Schüller : d3dx9: Move transpose matrix into get_matrix().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8fb16c955bfdc0319ff6f0adfda44757c6bcc618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb16c955bfdc0319ff6f0adf… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:25 2012 +0200 d3dx9: Move transpose matrix into get_matrix(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a70128..6558a48 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -870,7 +870,7 @@ static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) } } -static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) +static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose) { UINT i, k; @@ -878,10 +878,12 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { for (k = 0; k < 4; ++k) { + FLOAT *tmp = transpose ? (FLOAT *)&matrix->u.m[k][i] : (FLOAT *)&matrix->u.m[i][k]; + if ((i < param->rows) && (k < param->columns)) - set_number((FLOAT *)&matrix->u.m[i][k], D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); + set_number(tmp, D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); else - matrix->u.m[i][k] = 0.0f; + *tmp = 0.0f; } } } @@ -2213,7 +2215,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DX switch (param->class) { case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_SCALAR: @@ -2292,7 +2294,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], FALSE); } return D3D_OK; @@ -2369,7 +2371,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], FALSE); } return D3D_OK; @@ -2427,7 +2429,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); @@ -2439,12 +2440,11 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { case D3DXPC_SCALAR: case D3DXPC_VECTOR: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_MATRIX_ROWS: - get_matrix(param, &m); - D3DXMatrixTranspose(matrix, &m); + get_matrix(param, matrix, TRUE); return D3D_OK; case D3DXPC_OBJECT: @@ -2521,10 +2521,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - D3DXMATRIX m; - - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(&matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], TRUE); } return D3D_OK; @@ -2593,7 +2590,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa if (matrix && param && count <= param->element_count) { UINT i; - D3DXMATRIX m; TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); @@ -2602,8 +2598,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], TRUE); } return D3D_OK;

1 0

Andrew Eikum : advapi32: Consolidate helper function.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: ac615a7e9ac3cf00e90f0fb5d30a1a7f4c2ec590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac615a7e9ac3cf00e90f0fb5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 13 15:54:37 2012 -0500 advapi32: Consolidate helper function. --- dlls/advapi32/advapi32_misc.h | 3 + dlls/advapi32/eventlog.c | 15 +---- dlls/advapi32/lsa.c | 1 - dlls/advapi32/security.c | 130 +++++++--------------------------------- dlls/advapi32/service.c | 4 +- 5 files changed, 31 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac615a7e9ac3cf00e90f0…

1 0

Andrew Eikum : advapi32: Implement CreateProcessAsUserA.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: eaf709fb19f0d376da41847be60299cdd35b04e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf709fb19f0d376da41847be… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 13 15:54:41 2012 -0500 advapi32: Implement CreateProcessAsUserA. --- dlls/advapi32/security.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 83558ae..8b60dd6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5091,11 +5091,46 @@ BOOL WINAPI CreateProcessAsUserA( LPSTARTUPINFOA lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) { - FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - stub\n", hToken, debugstr_a(lpApplicationName), + BOOL ret; + WCHAR *appW, *cmdlnW, *cwdW; + STARTUPINFOW sinfo; + + TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_a(lpApplicationName), debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); - return FALSE; + appW = SERV_dup(lpApplicationName); + cmdlnW = SERV_dup(lpCommandLine); + cwdW = SERV_dup(lpCurrentDirectory); + sinfo.cb = sizeof(sinfo); + sinfo.lpReserved = SERV_dup(lpStartupInfo->lpReserved); + sinfo.lpDesktop = SERV_dup(lpStartupInfo->lpDesktop); + sinfo.lpTitle = SERV_dup(lpStartupInfo->lpTitle); + sinfo.dwX = lpStartupInfo->dwX; + sinfo.dwY = lpStartupInfo->dwY; + sinfo.dwXSize = lpStartupInfo->dwXSize; + sinfo.dwYSize = lpStartupInfo->dwYSize; + sinfo.dwXCountChars = lpStartupInfo->dwXCountChars; + sinfo.dwYCountChars = lpStartupInfo->dwYCountChars; + sinfo.dwFillAttribute = lpStartupInfo->dwFillAttribute; + sinfo.dwFlags = lpStartupInfo->dwFlags; + sinfo.wShowWindow = lpStartupInfo->wShowWindow; + sinfo.cbReserved2 = lpStartupInfo->cbReserved2; + sinfo.lpReserved2 = lpStartupInfo->lpReserved2; + sinfo.hStdInput = lpStartupInfo->hStdInput; + sinfo.hStdOutput = lpStartupInfo->hStdOutput; + sinfo.hStdError = lpStartupInfo->hStdError; + ret = CreateProcessAsUserW(hToken, appW, cmdlnW, lpProcessAttributes, + lpThreadAttributes, bInheritHandles, dwCreationFlags, + lpEnvironment, cwdW, &sinfo, lpProcessInformation); + HeapFree(GetProcessHeap(), 0, appW); + HeapFree(GetProcessHeap(), 0, cmdlnW); + HeapFree(GetProcessHeap(), 0, cwdW); + HeapFree(GetProcessHeap(), 0, sinfo.lpReserved); + HeapFree(GetProcessHeap(), 0, sinfo.lpDesktop); + HeapFree(GetProcessHeap(), 0, sinfo.lpTitle); + + return ret; } BOOL WINAPI CreateProcessAsUserW(

1 0