wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Frédéric Delanoy : ntdll/tests: Constify a character string.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 1181c850dd268facc7f446980a8a6387efdc007c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1181c850dd268facc7f446980… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:29 2013 +0100 ntdll/tests: Constify a character string. --- dlls/ntdll/tests/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a97cf18..2ca1297 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1057,7 +1057,7 @@ static DWORD dpe_exception_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION static void test_dpe_exceptions(void) { - static char single_ret[] = {0xC3}; + static const BYTE single_ret[] = {0xC3}; struct dpe_exception_info info; NTSTATUS stat; BOOL has_hw_support;

1 0

Frédéric Delanoy : msi/tests: Constify some character strings.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 1d36b93f7e484d8e6bc15d6acdbad12af5ecd4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d36b93f7e484d8e6bc15d6ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 26 22:49:27 2013 +0100 msi/tests: Constify some character strings. --- dlls/msi/tests/action.c | 2 +- dlls/msi/tests/automation.c | 40 ++++++++++++++++++++-------------------- dlls/msi/tests/install.c | 6 +++--- dlls/msi/tests/msi.c | 2 +- dlls/msi/tests/package.c | 6 +++--- dlls/msi/tests/patch.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8386038..ee750b0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5547,7 +5547,7 @@ error: static void test_publish_components(void) { - static char keypath[] = + static const char keypath[] = "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; UINT r; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 550afc2..c7cc411 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -452,7 +452,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH]; ok(0, format, extra, string1, aString); \ /* exception checker */ -static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; +static const WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0}; #define ok_exception(hr, szDescription) \ if (hr == DISP_E_EXCEPTION) \ @@ -595,7 +595,7 @@ static void test_dispid(void) static void test_dispatch(void) { static WCHAR szOpenPackage[] = { 'O','p','e','n','P','a','c','k','a','g','e',0 }; - static WCHAR szOpenPackageException[] = {'O','p','e','n','P','a','c','k','a','g','e',',','P','a','c','k','a','g','e','P','a','t','h',',','O','p','t','i','o','n','s',0}; + static const WCHAR szOpenPackageException[] = {'O','p','e','n','P','a','c','k','a','g','e',',','P','a','c','k','a','g','e','P','a','t','h',',','O','p','t','i','o','n','s',0}; static WCHAR szProductState[] = { 'P','r','o','d','u','c','t','S','t','a','t','e',0 }; HRESULT hr; DISPID dispid; @@ -1688,11 +1688,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in static void test_Database(IDispatch *pDatabase, BOOL readonly) { - static WCHAR szSql[] = { 'S','E','L','E','C','T',' ','`','F','e','a','t','u','r','e','`',' ','F','R','O','M',' ','`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ','`','F','e','a','t','u','r','e','_','P','a','r','e','n','t','`','=','\'','O','n','e','\'',0 }; - static WCHAR szThree[] = { 'T','h','r','e','e',0 }; - static WCHAR szTwo[] = { 'T','w','o',0 }; - static WCHAR szStringDataField[] = { 'S','t','r','i','n','g','D','a','t','a',',','F','i','e','l','d',0 }; - static WCHAR szModifyModeRecord[] = { 'M','o','d','i','f','y',',','M','o','d','e',',','R','e','c','o','r','d',0 }; + static const WCHAR szSql[] = { 'S','E','L','E','C','T',' ','`','F','e','a','t','u','r','e','`',' ','F','R','O','M',' ','`','F','e','a','t','u','r','e','`',' ','W','H','E','R','E',' ','`','F','e','a','t','u','r','e','_','P','a','r','e','n','t','`','=','\'','O','n','e','\'',0 }; + static const WCHAR szThree[] = { 'T','h','r','e','e',0 }; + static const WCHAR szTwo[] = { 'T','w','o',0 }; + static const WCHAR szStringDataField[] = { 'S','t','r','i','n','g','D','a','t','a',',','F','i','e','l','d',0 }; + static const WCHAR szModifyModeRecord[] = { 'M','o','d','i','f','y',',','M','o','d','e',',','R','e','c','o','r','d',0 }; IDispatch *pView = NULL, *pSummaryInfo = NULL; HRESULT hr; @@ -1801,17 +1801,17 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) static void test_Session(IDispatch *pSession) { - static WCHAR szProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; - static WCHAR szOne[] = { 'O','n','e',0 }; - static WCHAR szOneStateFalse[] = { '!','O','n','e','>','0',0 }; - static WCHAR szOneStateTrue[] = { '!','O','n','e','=','-','1',0 }; - static WCHAR szOneActionFalse[] = { '$','O','n','e','=','-','1',0 }; - static WCHAR szOneActionTrue[] = { '$','O','n','e','>','0',0 }; - static WCHAR szCostInitialize[] = { 'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0 }; - static WCHAR szEmpty[] = { 0 }; - static WCHAR szEquals[] = { '=',0 }; - static WCHAR szPropertyName[] = { 'P','r','o','p','e','r','t','y',',','N','a','m','e',0 }; - static WCHAR szModeFlag[] = { 'M','o','d','e',',','F','l','a','g',0 }; + static const WCHAR szProductName[] = { 'P','r','o','d','u','c','t','N','a','m','e',0 }; + static const WCHAR szOne[] = { 'O','n','e',0 }; + static const WCHAR szOneStateFalse[] = { '!','O','n','e','>','0',0 }; + static const WCHAR szOneStateTrue[] = { '!','O','n','e','=','-','1',0 }; + static const WCHAR szOneActionFalse[] = { '$','O','n','e','=','-','1',0 }; + static const WCHAR szOneActionTrue[] = { '$','O','n','e','>','0',0 }; + static const WCHAR szCostInitialize[] = { 'C','o','s','t','I','n','i','t','i','a','l','i','z','e',0 }; + static const WCHAR szEmpty[] = { 0 }; + static const WCHAR szEquals[] = { '=',0 }; + static const WCHAR szPropertyName[] = { 'P','r','o','p','e','r','t','y',',','N','a','m','e',0 }; + static const WCHAR szModeFlag[] = { 'M','o','d','e',',','F','l','a','g',0 }; WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; @@ -2547,8 +2547,8 @@ static void test_Installer_InstallProduct(void) static void test_Installer(void) { - static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; - static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; + static const WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; + static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 24f87eb..45c6a5f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4806,7 +4806,7 @@ error: static void test_installed_prop(void) { - static char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; + static const char prodcode[] = "{7df88a48-996f-4ec8-a022-bf956f9b2cbb}"; UINT r; if (is_process_limited()) @@ -4959,8 +4959,8 @@ error: DeleteFileA(msifile); } -static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; -static char rename_ops[] = "PendingFileRenameOperations"; +static const char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; +static const char rename_ops[] = "PendingFileRenameOperations"; static void process_pending_renames(HKEY hkey) { diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 95fe97f..b65d131 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13752,7 +13752,7 @@ static void test_MsiSetExternalUI(void) static void test_lastusedsource(void) { - static char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}"; + static const char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}"; char value[MAX_PATH], path[MAX_PATH]; DWORD size; UINT r; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c527118..359c745 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2647,9 +2647,9 @@ static void test_component_states( UINT line, MSIHANDLE package, const char *com static void test_states(void) { - static char msifile2[] = "winetest2-package.msi"; - static char msifile3[] = "winetest3-package.msi"; - static char msifile4[] = "winetest4-package.msi"; + static const char msifile2[] = "winetest2-package.msi"; + static const char msifile3[] = "winetest3-package.msi"; + static const char msifile4[] = "winetest4-package.msi"; static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile3W[] = diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 3168c85..62a4b86 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -950,7 +950,7 @@ static void test_MsiOpenDatabase( void ) static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) { - static char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; + static const char fmt[] = "SELECT * FROM `%s` WHERE `Name` = '%s'"; char query[0x100]; UINT r; MSIHANDLE hview, hrec;

1 0

Bruno Jesus : ws2_32: Do not convert EAI_xxx return in case of success.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: fc5884c23296c0f121442d0832b0187074e95a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5884c23296c0f121442d083… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 26 17:57:05 2013 -0200 ws2_32: Do not convert EAI_xxx return in case of success. --- dlls/ws2_32/socket.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cafe103..39912bf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5365,6 +5365,8 @@ static int convert_aiflag_u2w(int unixflags) { static int convert_eai_u2w(int unixret) { int i; + if (!unixret) return 0; + for (i=0;ws_eai_map[i][0];i++) if (ws_eai_map[i][1] == unixret) return ws_eai_map[i][0];

1 0

Alexandre Julliard : msvcp: Don't assume that msvcrt is imported.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 263a1448f96816120011b5a5855929e24b7a4818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=263a1448f96816120011b5a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 23:43:03 2013 +0100 msvcp: Don't assume that msvcrt is imported. --- dlls/msvcp90/locale.c | 5 ++++- dlls/msvcp90/msvcp_main.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9b84b63..f9d8e1b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1410,8 +1410,11 @@ void __thiscall ctype_char__Tidy(ctype_char *this) /* ?classic_table@?$ctype@D@std@@KAPEBFXZ */ const short* __cdecl ctype_char_classic_table(void) { + ctype_char *ctype; + TRACE("()\n"); - return &((short*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_ctype"))[1]; + ctype = ctype_char_use_facet( locale_classic() ); + return ctype->ctype.table; } /* ??0?$ctype@D@std@@QAE@ABV_Locinfo@1@I@Z */ diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 848d5bb..489aacb 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,9 +60,14 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#define VERSION_STRING(ver) #ver +#define MSVCRT_NAME(ver) "msvcr" VERSION_STRING(ver) ".dll" + static void init_cxx_funcs(void) { - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); + + if (!hmod) FIXME( "%s not loaded\n", MSVCRT_NAME(_MSVCP_VER) ); if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ {

1 0

Alexandre Julliard : msvcp: Don't forward the mbtowc functions to msvcrt.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: db0a6fcaa5ef8529a66273bc7f43204de11a0cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0a6fcaa5ef8529a66273bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 12:22:52 2013 +0100 msvcp: Don't forward the mbtowc functions to msvcrt. --- dlls/msvcp71/msvcp71.spec | 14 +++--- dlls/msvcp90/locale.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 5acc18b..8e21fb7 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5157,13 +5157,13 @@ # extern _Xbig # extern _Zero @ stub __Wcrtomb_lk -@ cdecl btowc(long) msvcrt.btowc -@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen -@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs +@ cdecl btowc(long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) @ cdecl towctrans(long long) -@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb -@ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs -@ cdecl wctob(long) msvcrt.wctob +@ cdecl wcrtomb(ptr long ptr) +@ cdecl wcsrtombs(ptr ptr long ptr) +@ cdecl wctob(long) @ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 08cc893..9b84b63 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wchar.h" #include "wctype.h" #include "time.h" @@ -9487,6 +9488,107 @@ wint_t __cdecl towctrans(wint_t c, wctrans_t category) return towlower(c); } +/* btowc */ +wint_t __cdecl btowc(int c) +{ + wchar_t ret; + int state = 0; + char ch = c; + + if (c == EOF || _Mbrtowc( &ret, &ch, 1, &state, NULL ) != 1) return WEOF; + return ret; +} + +/* mbrlen */ +size_t __cdecl mbrlen(const char *str, size_t n, mbstate_t *state) +{ + static int local_state; + + if (!state) state = &local_state; + return _Mbrtowc( NULL, str, n, state, NULL ); +} + +/* mbrtowc */ +size_t __cdecl mbrtowc(wchar_t *dst, const char *str, size_t n, mbstate_t *state) +{ + static int local_state; + + if (!state) state = &local_state; + return _Mbrtowc( dst, str, n, state, NULL ); +} + +/* mbsrtowcs */ +size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *state) +{ + static int local_state; + size_t ret = 0; + wchar_t wc; + const char *src; + + if (!pstr) + { + *_errno() = EINVAL; + _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + } + src = *pstr; + if (!state) state = &local_state; + + while (!dst || n > ret) + { + int len = _Mbrtowc( &wc, src, 2, state, NULL ); + if (len < 0) return -1; + if (!len) break; + if (dst) dst[ret] = wc; + ret++; + if (!wc) break; + src += len; + } + return ret; +} + +/* wctob */ +int __cdecl wctob(wint_t wc) +{ + char ret[MB_LEN_MAX]; + + if (wc == WEOF || _Wcrtomb( ret, wc, NULL, NULL ) != -1) return EOF; + return ret[0]; +} + +/* wcrtomb */ +size_t __cdecl wcrtomb(char *dst, wchar_t wc, mbstate_t *state) +{ + return _Wcrtomb( dst, wc, state, NULL ); +} + +/* wcsrtombs */ +size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *state) +{ + const wchar_t *src; + char buffer[MB_LEN_MAX]; + size_t ret = 0; + + if (!pstr) + { + *_errno() = EINVAL; + _invalid_parameter( NULL, NULL, NULL, 0, 0 ); + } + src = *pstr; + + while (!dst || n > ret) + { + int len = _Wcrtomb( buffer, *src, state, NULL ); + if (len <= 0) return -1; + if (n < ret + len) break; + memcpy( dst + ret, buffer, len ); + ret += len; + if (!buffer[0]) break; + src++; + } + return ret; +} + + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@") DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@_W@std@@")

1 0

Alexandre Julliard : msvcp: Don't forward __uncaught_exception to msvcrt.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: b2d030a9caeaf14a058c876830c1104073ff9516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d030a9caeaf14a058c87683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 23:42:03 2013 +0100 msvcp: Don't forward __uncaught_exception to msvcrt. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/exception.c | 6 ++++++ dlls/msvcp90/msvcp90.spec | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 12463af..e949b98 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2795,7 +2795,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_underflow diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index d31f301..db0117d 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3615,7 +3615,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcp90.?uncaught_exception@std@@YA_NXZ @ cdecl -arch=arm ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ @ thiscall -arch=i386 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 40b959e..648be15 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4192,7 +4192,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcp90.?uncaught_exception@std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index af1b1a0..17e9602 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -4950,7 +4950,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcp90.?uncaught_exception@std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) msvcp90.?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 850b112..5acc18b 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5003,7 +5003,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 96bd8c57..1550cc6 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5610,7 +5610,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f0c17e3..dfd35d9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -493,6 +493,12 @@ void __cdecl _Xruntime_error(const char *str) throw_exception(EXCEPTION_RUNTIME_ERROR, str); } +/* ?uncaught_exception@std@@YA_NXZ */ +MSVCP_bool __cdecl MSVCP__uncaught_exception(void) +{ + return __uncaught_exception(); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 935b47a..8017819 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6367,7 +6367,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception@std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow

1 0

Alexandre Julliard : makedep: Generate rules for TrueType fonts in maintainer mode.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 64b21eee94fb52fd3b595f7bb77314112d783d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b21eee94fb52fd3b595f7bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 20:02:42 2013 +0100 makedep: Generate rules for TrueType fonts in maintainer mode. --- Make.rules.in | 7 ------- configure | 3 --- configure.ac | 1 - dlls/gdi32/tests/Makefile.in | 5 +++++ fonts/Makefile.in | 14 ++++++++++++++ tools/make_makefiles | 4 +++- tools/makedep.c | 13 +++++++++++++ 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 69abe7f..7e50787 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -28,13 +28,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -# Implicit rules - -@MAINTAINER_MODE@.SUFFIXES: .sfd .ttf - -.sfd.ttf: - $(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@ - # Rules for main module $(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) diff --git a/configure b/configure index ccd78d6..de73ca9 100755 --- a/configure +++ b/configure @@ -722,7 +722,6 @@ ICOTOOL CONVERT RSVG FONTFORGE -MAINTAINER_MODE PKG_CONFIG MSGFMT INSTALL_DATA @@ -5584,8 +5583,6 @@ fi if test "x$enable_maintainer_mode" != "xyes" then - MAINTAINER_MODE=\# - FONTFORGE="" RSVG="" CONVERT="" diff --git a/configure.ac b/configure.ac index 21de44a..e0455a2 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,6 @@ WINE_PATH_PKG_CONFIG if test "x$enable_maintainer_mode" != "xyes" then - AC_SUBST([MAINTAINER_MODE],[\#]) FONTFORGE="" RSVG="" CONVERT="" diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index dee2fa4..19b63a9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -17,6 +17,11 @@ C_SRCS = \ path.c \ pen.c +FONT_SRCS = \ + vertical.sfd \ + wine_test.sfd \ + wine_vdmx.sfd + RC_SRCS = resource.rc @MAKE_TEST_RULES@ diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 1354dc0..6650af5 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -1,3 +1,17 @@ +FONT_SRCS = \ + courier.sfd \ + fixedsys.sfd \ + fixedsys_jp.sfd \ + marlett.sfd \ + ms_sans_serif.sfd \ + small_fonts.sfd \ + small_fonts_jp.sfd \ + symbol.sfd \ + system.sfd \ + tahoma.sfd \ + tahomabd.sfd \ + wingding.sfd + BITMAP_FONTS = \ coue1255.fon \ coue1256.fon \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 9ebc476..ef26aaf 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -276,7 +276,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -408,6 +408,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { my %flags = get_makedep_flags( $file ); @@ -563,6 +564,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "BISON_SRCS" ); replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); + replace_makefile_variable( $file, "FONT_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); diff --git a/tools/makedep.c b/tools/makedep.c index 3b4ffcd..041ef2e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1498,6 +1498,18 @@ static struct strarray output_sources(void) output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); column += output( "%s:", obj ); } + else if (!strcmp( ext, "sfd" )) /* font file */ + { + char *fontforge = get_expanded_make_variable( "FONTFORGE" ); + if (fontforge && !src_dir) + { + output( "%s.ttf: %s\n", obj, source->filename ); + output( "\t%s -script %s/fonts/genttf.ff %s $@\n", + fontforge, top_src_dir ? top_src_dir : top_obj_dir, source->filename ); + } + free( fontforge ); + continue; /* no dependencies */ + } else if (!strcmp( ext, "svg" )) /* svg file */ { char *convert = get_expanded_make_variable( "CONVERT" ); @@ -1781,6 +1793,7 @@ static void update_makefile( const char *path ) "LEX_SRCS", "XTEMPLATE_SRCS", "SVG_SRCS", + "FONT_SRCS", "IN_SRCS", "MANPAGES", NULL

1 0

Alexandre Julliard : makedep: Generate rules for svg files in maintainer mode.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 2535a3b8f67c9c48d4311f31131c160d7374f4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2535a3b8f67c9c48d4311f311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:56:16 2013 +0100 makedep: Generate rules for svg files in maintainer mode. --- Make.rules.in | 8 +-- configure | 208 ++++++++++++++++++++++++++++--------------------------- configure.ac | 17 +++-- tools/makedep.c | 17 +++++ 4 files changed, 134 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2535a3b8f67c9c48d4311…

1 0

Alexandre Julliard : makedep: Manage generated source files explicitly instead of relying on name comparisons .
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 47c0f64fdd6caac10ac210e47d56c0238c5b01ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c0f64fdd6caac10ac210e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:27:59 2013 +0100 makedep: Manage generated source files explicitly instead of relying on name comparisons. --- configure | 9 +- configure.ac | 9 +- tools/makedep.c | 246 ++++++++++++++++++++++++++----------------------------- 3 files changed, 123 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47c0f64fdd6caac10ac21…

1 0

Alexandre Julliard : makedep: Allow overriding makefile variables through the MAKEFLAGS environment variable .
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: cab558b4bd0cad658dd14ec53fda076851a5e16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab558b4bd0cad658dd14ec53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:26:37 2013 +0100 makedep: Allow overriding makefile variables through the MAKEFLAGS environment variable. --- tools/makedep.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f347d90..2cb32b9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1838,6 +1838,29 @@ static void update_makefile( const char *path ) /******************************************************************* + * parse_makeflags + */ +static void parse_makeflags( const char *flags ) +{ + const char *p = flags; + char *var, *buffer = xmalloc( strlen(flags) + 1 ); + + while (*p) + { + while (isspace(*p)) p++; + var = buffer; + while (*p && !isspace(*p)) + { + if (*p == '\\' && p[1]) p++; + *var++ = *p++; + } + *var = 0; + if (var > buffer) set_make_variable( &cmdline_vars, buffer ); + } +} + + +/******************************************************************* * parse_option */ static int parse_option( const char *opt ) @@ -1893,9 +1916,12 @@ static int parse_option( const char *opt ) */ int main( int argc, char *argv[] ) { + const char *makeflags = getenv( "MAKEFLAGS" ); struct incl_file *pFile; int i, j; + if (makeflags) parse_makeflags( makeflags ); + i = 1; while (i < argc) {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
47
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 December 2013