wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Alexandre Julliard : shell32: Use Shell_GetImageLists to retrieve image lists instead of using a global variable .
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: e330a128d54613d2f7322cc3da2c8a5fea866992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e330a128d54613d2f7322cc3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 2 11:56:11 2014 +0100 shell32: Use Shell_GetImageLists to retrieve image lists instead of using a global variable. --- dlls/shell32/folders.c | 7 ++++--- dlls/shell32/iconcache.c | 2 ++ dlls/shell32/shell32_main.c | 14 ++++++++------ dlls/shell32/shell32_main.h | 2 -- dlls/shell32/shlview.c | 6 ++++-- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 4848644..34e5142 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -354,17 +354,18 @@ static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR psz { IExtractIconWImpl *This = impl_from_IExtractIconW(iface); int index; + HIMAGELIST big_icons, small_icons; FIXME("(%p) (file=%s index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), (signed)nIconIndex, phiconLarge, phiconSmall, nIconSize); index = SIC_GetIconIndex(pszFile, nIconIndex, 0); - + Shell_GetImageLists( &big_icons, &small_icons ); if (phiconLarge) - *phiconLarge = ImageList_GetIcon(ShellBigIconList, index, ILD_TRANSPARENT); + *phiconLarge = ImageList_GetIcon(big_icons, index, ILD_TRANSPARENT); if (phiconSmall) - *phiconSmall = ImageList_GetIcon(ShellSmallIconList, index, ILD_TRANSPARENT); + *phiconSmall = ImageList_GetIcon(small_icons, index, ILD_TRANSPARENT); return S_OK; } diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 3d54508..b294908 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,6 +61,8 @@ typedef struct static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; +static HIMAGELIST ShellSmallIconList; +static HIMAGELIST ShellBigIconList; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 9ac715c..091c6e1 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -425,6 +425,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, HRESULT hr = S_OK; BOOL IconNotYetLoaded=TRUE; UINT uGilFlags = 0; + HIMAGELIST big_icons, small_icons; TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, @@ -563,6 +564,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } /* ### icons ###*/ + + Shell_GetImageLists( &big_icons, &small_icons ); + if (flags & SHGFI_OPENICON) uGilFlags |= GIL_OPENICON; @@ -707,9 +711,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (ret && (flags & SHGFI_SYSICONINDEX)) { if (flags & SHGFI_SMALLICON) - ret = (DWORD_PTR) ShellSmallIconList; + ret = (DWORD_PTR)small_icons; else - ret = (DWORD_PTR) ShellBigIconList; + ret = (DWORD_PTR)big_icons; } } @@ -717,9 +721,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded) { if (flags & SHGFI_SMALLICON) - psfi->hIcon = ImageList_GetIcon( ShellSmallIconList, psfi->iIcon, ILD_NORMAL); + psfi->hIcon = ImageList_GetIcon( small_icons, psfi->iIcon, ILD_NORMAL); else - psfi->hIcon = ImageList_GetIcon( ShellBigIconList, psfi->iIcon, ILD_NORMAL); + psfi->hIcon = ImageList_GetIcon( big_icons, psfi->iIcon, ILD_NORMAL); } if (flags & ~SHGFI_KNOWN_FLAGS) @@ -1248,8 +1252,6 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) * */ HINSTANCE shell32_hInstance = 0; -HIMAGELIST ShellSmallIconList = 0; -HIMAGELIST ShellBigIconList = 0; /************************************************************************* diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 776e3df..e7765eb 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -42,8 +42,6 @@ */ extern HMODULE huser32 DECLSPEC_HIDDEN; extern HINSTANCE shell32_hInstance DECLSPEC_HIDDEN; -extern HIMAGELIST ShellSmallIconList DECLSPEC_HIDDEN; -extern HIMAGELIST ShellBigIconList DECLSPEC_HIDDEN; /* Iconcache */ #define INVALID_INDEX -1 diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c937cce..8520986 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -406,6 +406,7 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) static void ShellView_InitList(IShellViewImpl *This) { IShellDetails *details = NULL; + HIMAGELIST big_icons, small_icons; LVCOLUMNW lvColumn; SHELLDETAILS sd; WCHAR nameW[50]; @@ -414,9 +415,10 @@ static void ShellView_InitList(IShellViewImpl *This) TRACE("(%p)\n", This); + Shell_GetImageLists( &big_icons, &small_icons ); SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); - SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)small_icons); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)big_icons); lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; lvColumn.pszText = nameW;

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 5f4ccc016f6cca6f2357daa955aa70e59406e108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4ccc016f6cca6f2357daa95… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 2 02:16:51 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/lnk.c | 40 +++++++++++++--------------------------- tools/winedump/main.c | 2 +- tools/winedump/pe.c | 6 +++--- tools/winedump/search.c | 24 ++++++++++++------------ tools/winedump/symbol.c | 3 +-- tools/winedump/winedump.h | 4 ++-- 6 files changed, 32 insertions(+), 47 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 5f496bc..b0f6580 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -188,14 +188,14 @@ static const lnk_string* fetch_string(int unicode) } -static int dump_pidl(void) +static void dump_pidl(void) { const lnk_string *pidl; int i, n = 0, sz = 0; pidl = fetch_string(FALSE); if (!pidl) - return -1; + return; printf("PIDL\n"); printf("----\n\n"); @@ -219,18 +219,16 @@ static int dump_pidl(void) printf("\n"); } printf("\n"); - - return 0; } -static int dump_string(const char *what, int unicode) +static void dump_string(const char *what, int unicode) { const lnk_string *data; unsigned sz; data = fetch_string(unicode); if (!data) - return -1; + return; printf("%s : ", what); sz = data->size; if (unicode) @@ -238,18 +236,16 @@ static int dump_string(const char *what, int unicode) else while (sz) printf("%c", data->str.a[data->size - sz--]); printf("\n"); - - return 0; } -static int dump_location(void) +static void dump_location(void) { const LOCATION_INFO *loc; const char *p; loc = fetch_block(); if (!loc) - return -1; + return; p = (const char*)loc; printf("Location\n"); @@ -297,8 +293,6 @@ static int dump_location(void) printf("(\"%s\")", &p[loc->dwFinalPathOfs]); printf("\n"); printf("\n"); - - return 0; } static const unsigned char table_dec85[0x80] = { @@ -338,7 +332,7 @@ static BOOL base85_to_guid( const char *str, LPGUID guid ) return TRUE; } -static int dump_special_folder_block(const DATABLOCK_HEADER* bhdr) +static void dump_special_folder_block(const DATABLOCK_HEADER* bhdr) { const EXP_SPECIAL_FOLDER *sfb = (const EXP_SPECIAL_FOLDER*)bhdr; printf("Special folder block\n"); @@ -346,10 +340,9 @@ static int dump_special_folder_block(const DATABLOCK_HEADER* bhdr) printf("folder = 0x%04x\n", sfb->idSpecialFolder); printf("offset = %d\n", sfb->cbOffset); printf("\n"); - return 0; } -static int dump_sz_block(const DATABLOCK_HEADER* bhdr, const char* label) +static void dump_sz_block(const DATABLOCK_HEADER* bhdr, const char* label) { const LINK_SZ_BLOCK *szp = (const LINK_SZ_BLOCK*)bhdr; printf("String block\n"); @@ -357,10 +350,9 @@ static int dump_sz_block(const DATABLOCK_HEADER* bhdr, const char* label) printf("magic = %x\n", szp->magic); printf("%s = %s\n", label, szp->bufA); printf("\n"); - return 0; } -static int dump_darwin_id(const DATABLOCK_HEADER* bhdr) +static void dump_darwin_id(const DATABLOCK_HEADER* bhdr) { const LINK_SZ_BLOCK *szp = (const LINK_SZ_BLOCK*)bhdr; char comp_str[40]; @@ -399,8 +391,6 @@ static int dump_darwin_id(const DATABLOCK_HEADER* bhdr) printf(" component: %s\n", comp_str ); printf(" feature: %s\n", feat_str); printf("\n"); - - return 0; } static void dump_property_storage_value(const LINK_PROPERTYSTORAGE_VALUE *lnk_value_hdr, @@ -445,7 +435,7 @@ static void dump_property_storage_value(const LINK_PROPERTYSTORAGE_VALUE *lnk_va printf(" missing terminator!\n"); } -static int dump_property_storage(const DATABLOCK_HEADER* bhdr) +static void dump_property_storage(const DATABLOCK_HEADER* bhdr) { int data_size; const LINK_PROPERTYSTORAGE_GUID *lnk_guid_hdr; @@ -468,8 +458,8 @@ static int dump_property_storage(const DATABLOCK_HEADER* bhdr) if (lnk_guid_hdr->size > data_size || lnk_guid_hdr->size < sizeof(*lnk_guid_hdr)) { - printf("size: %d (invald)\n", lnk_guid_hdr->size); - return 1; + printf("size: %d (invalid)\n", lnk_guid_hdr->size); + return; } if (lnk_guid_hdr->magic != 0x53505331) @@ -488,11 +478,9 @@ static int dump_property_storage(const DATABLOCK_HEADER* bhdr) printf("missing terminator!\n"); printf("\n"); - - return 0; } -static BOOL dump_raw_block(const DATABLOCK_HEADER* bhdr) +static void dump_raw_block(const DATABLOCK_HEADER* bhdr) { int data_size; @@ -529,8 +517,6 @@ static BOOL dump_raw_block(const DATABLOCK_HEADER* bhdr) } } printf("\n"); - - return TRUE; } static const GUID CLSID_ShellLink = {0x00021401L, 0, 0, {0xC0,0,0,0,0,0,0,0x46}}; diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 018f94b..9b076e1 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -433,7 +433,7 @@ int main (int argc, char *argv[]) output_header_preamble (); output_c_preamble (); - while (!dll_next_symbol (&symbol)) + while (dll_next_symbol (&symbol)) { count++; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 0ca82f5..607f56f 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1665,13 +1665,13 @@ BOOL dll_open (const char *dll_name) * * Get next exported symbol from dll */ -int dll_next_symbol (parsed_symbol * sym) +BOOL dll_next_symbol (parsed_symbol * sym) { if (!dll_current_symbol || !dll_current_symbol->symbol) - return 1; + return FALSE; assert (dll_symbols); sym->symbol = strdup (dll_current_symbol->symbol); sym->ordinal = dll_current_symbol->ordinal; dll_current_symbol++; - return 0; + return TRUE; } diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 8d18131..7b3a98f 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -26,7 +26,7 @@ static char *grep_buff = NULL; static char *fgrep_buff = NULL; -static int symbol_from_prototype (parsed_symbol *sym, const char *prototype); +static BOOL symbol_from_prototype (parsed_symbol *sym, const char *prototype); static const char *get_type (parsed_symbol *sym, const char *proto, int arg); @@ -133,7 +133,7 @@ int symbol_search (parsed_symbol *sym) if (VERBOSE) printf ("Prototype '%s' looks OK, processing\n", grep_buff); - if (!symbol_from_prototype (sym, grep_buff)) + if (symbol_from_prototype (sym, grep_buff)) { pclose (f_grep); pclose (grep); @@ -161,14 +161,14 @@ int symbol_search (parsed_symbol *sym) * * Convert a C prototype into a symbol */ -static int symbol_from_prototype (parsed_symbol *sym, const char *proto) +static BOOL symbol_from_prototype (parsed_symbol *sym, const char *proto) { const char *iter; BOOL found; proto = get_type (sym, proto, -1); /* Get return type */ if (!proto) - return -1; + return FALSE; iter = str_match (proto, sym->symbol, &found); @@ -178,7 +178,7 @@ static int symbol_from_prototype (parsed_symbol *sym, const char *proto) /* Calling Convention */ iter = strchr (iter, ' '); if (!iter) - return -1; + return FALSE; call = str_substring (proto, iter); @@ -190,7 +190,7 @@ static int symbol_from_prototype (parsed_symbol *sym, const char *proto) iter = str_match (iter, sym->symbol, &found); if (!found) - return -1; + return FALSE; if (VERBOSE) printf ("Using %s calling convention\n", @@ -204,33 +204,33 @@ static int symbol_from_prototype (parsed_symbol *sym, const char *proto) /* Now should be the arguments */ if (*proto++ != '(') - return -1; + return FALSE; for (; *proto == ' '; proto++); if (!strncmp (proto, "void", 4)) - return 0; + return TRUE; do { /* Process next argument */ str_match (proto, "...", &sym->varargs); if (sym->varargs) - return 0; + return TRUE; if (!(proto = get_type (sym, proto, sym->argc))) - return -1; + return FALSE; sym->argc++; if (*proto == ',') proto++; else if (*proto != ')') - return -1; + return FALSE; } while (*proto != ')'); - return 0; + return TRUE; } diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index 4dccb45..8511654 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -89,11 +89,10 @@ static const char * const known_longs[] = "WCHAR", "BOOL", "bool", "INT16", "WORD", "DWORD", NULL }; -int symbol_init(parsed_symbol* sym, const char* name) +void symbol_init(parsed_symbol* sym, const char* name) { memset(sym, 0, sizeof(parsed_symbol)); sym->symbol = strdup(name); - return 0; } /******************************************************************* diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 45243cf..ea7fc87 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -159,10 +159,10 @@ void dump_file(const char* name); /* DLL functions */ BOOL dll_open (const char *dll_name); -int dll_next_symbol (parsed_symbol * sym); +BOOL dll_next_symbol (parsed_symbol * sym); /* Symbol functions */ -int symbol_init(parsed_symbol* symbol, const char* name); +void symbol_init(parsed_symbol* symbol, const char* name); int symbol_demangle (parsed_symbol *symbol);

1 0

Michael Stefaniuc : dmusic/tests: Change the way of detecting a workable dmusic.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 393135c3c71748c078a930424ac4d0b4098bb4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393135c3c71748c078a930424… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 2 01:50:47 2014 +0100 dmusic/tests: Change the way of detecting a workable dmusic. --- dlls/dmusic/tests/dmusic.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index ced2336..3e67c56 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -323,10 +323,15 @@ static void test_COM_dmcoll(void) static BOOL missing_dmusic(void) { IDirectMusic8 *dm; - HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&dm); + HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, + (void**)&dm); - return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE); + if (hr == S_OK && dm) + { + IDirectMusic_Release(dm); + return FALSE; + } + return TRUE; } START_TEST(dmusic)

1 0

Frédéric Delanoy : wintrust/tests: Constify some character strings.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: bf1a43e6205cf1a044624795443dcfa2d5406112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1a43e6205cf1a0446247954… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 2 00:51:34 2014 +0100 wintrust/tests: Constify some character strings. --- dlls/wintrust/tests/crypt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 7f2fe76..4d9061b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -489,7 +489,7 @@ static void test_CryptCATCDF_params(void) static void test_CryptCATAdminAddRemoveCatalog(void) { static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; - static CHAR basename[] = "winetest.cat"; + static const char basename[] = "winetest.cat"; HCATADMIN hcatadmin; HCATINFO hcatinfo; CATALOG_INFO info; @@ -645,7 +645,7 @@ cleanup: DeleteFileA(tmpfile); } -static void test_catalog_properties(CHAR *catfile, int attributes, int members) +static void test_catalog_properties(const char *catfile, int attributes, int members) { static const GUID subject = {0xde351a42,0x8e59,0x11d0,{0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee}}; @@ -738,8 +738,8 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) static void test_create_catalog_file(void) { - static CHAR catfileA[] = "winetest.cat"; - static CHAR cdffileA[] = "winetest.cdf"; + static const char catfileA[] = "winetest.cat"; + static const char cdffileA[] = "winetest.cdf"; static WCHAR cdffileW[] = {'w','i','n','e','t','e','s','t','.','c','d','f',0}; CRYPTCATCDF *catcdf; CRYPTCATATTRIBUTE *catattr; @@ -879,8 +879,8 @@ static void create_cdf_file(const CHAR *filename, const CHAR *contents) static void test_cdf_parsing(void) { - static CHAR catfileA[] = "tempfile.cat"; - static CHAR cdffileA[] = "tempfile.cdf"; + static const char catfileA[] = "tempfile.cat"; + static const char cdffileA[] = "tempfile.cdf"; static WCHAR cdffileW[] = {'t','e','m','p','f','i','l','e','.','c','d','f',0}; CHAR cdf_contents[4096]; CRYPTCATCDF *catcdf; @@ -1203,7 +1203,7 @@ static IMAGE_NT_HEADERS nt_header = static void test_sip(void) { - static WCHAR nameW[] = {'t','e','s','t','.','e','x','e',0}; + static const WCHAR nameW[] = {'t','e','s','t','.','e','x','e',0}; SIP_SUBJECTINFO info; DWORD index, encoding, size; HANDLE file;

1 0

Frédéric Delanoy : winspool.drv/tests: Constify some character strings.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 86f3f622896319d40596972612543546ca6ae0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f3f622896319d4059697261… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 2 00:51:33 2014 +0100 winspool.drv/tests: Constify some character strings. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 602e6e2..7a6878a 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -56,8 +56,8 @@ static CHAR version_dll[] = "version.dll"; static CHAR winetest[] = "winetest"; static CHAR xcv_localport[] = ",XcvMonitor Local Port"; -static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; +static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; +static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static WCHAR emptyW[] = {0}; static WCHAR portname_com1W[] = {'C','O','M','1',':',0};

1 0

André Hentschel : gdi32: Fix a comment.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 4573aecf5b610eb58c0da4ea7397492344dd5da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4573aecf5b610eb58c0da4ea7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 2 00:35:57 2014 +0100 gdi32: Fix a comment. --- dlls/gdi32/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 31703fe..4529562 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -160,7 +160,7 @@ done: /*********************************************************************** - * __wine_set_display_driver_module (GDI32.@) + * __wine_set_display_driver (GDI32.@) */ void CDECL __wine_set_display_driver( HMODULE module ) {

1 0

Alexandre Julliard : makefiles: Determine module type based on the defined variables, and add some sanity checks.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 45104d9cb6a27b339418c06a92bc07fef6f88665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45104d9cb6a27b339418c06a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:56:22 2014 +0100 makefiles: Determine module type based on the defined variables, and add some sanity checks. --- tools/make_makefiles | 61 ++++++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2dc621a..4a0949e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -269,7 +269,7 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var} || $var; next; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -302,9 +302,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"installbin"} = 1 if $bin_install{$1}; } - if (defined $make{"=flags"} && defined $make{"=rules"} && - ($make{"=rules"} eq "MAKE_DLL_RULES" || - $make{"=rules"} eq "MAKE_PROG_RULES")) + if (defined $make{"=flags"} && defined $make{"MODULE"}) { die "Custom install-lib rule not allowed in $file" if defined ${$make{"=flags"}}{"install-lib"}; die "Custom install-dev rule not allowed in $file" if defined ${$make{"=flags"}}{"install-dev"}; @@ -486,56 +484,67 @@ sub update_makefiles(@) foreach my $file (sort @_) { my %make = %{$makefiles{$file}}; - next unless defined $make{"=rules"}; - my $rules = $make{"=rules"}; my $args = ""; my $is_win16 = $make{"MODULE"} && ($make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}}); my $flag_args = defined $make{"=flags"} ? ",[" . join(",",sort keys %{$make{"=flags"}}) ."]" : ""; - if ($rules eq "MAKE_DLL_RULES") + if (defined($make{"TESTDLL"})) # test { + die "TESTDLL should not be defined in $file" unless $file =~ /\/tests\/Makefile$/; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; + } + elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib + { + die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; + die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; + push @lines, "WINE_CONFIG_LIB($name$flag_args)\n"; + } + elsif (defined($make{"MODULE"}) && defined($make{"APPMODE"})) # program + { + die "APPMODE should not be defined in $file" unless $file =~ /^programs\//; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; if ($name =~ /\./) { die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name; } else { - die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe"; } - my $implib = $make{"IMPORTLIB"} || ""; $args .= "," if $is_win16 || defined $make{"=flags"}; $args .= "enable_win16" if $is_win16; - $args .= $flag_args; - $args .= ",[$implib]" if $implib && $implib ne $name; - push @lines, "WINE_CONFIG_DLL($name$args)\n"; + push @lines, "WINE_CONFIG_PROGRAM($name$args$flag_args)\n"; } - elsif ($rules eq "MAKE_PROG_RULES") + elsif (defined($make{"MODULE"})) # dll { - (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; + die "APPMODE should be defined in $file" if $file =~ /^programs\//; + die "MODULE should not be defined in $file" unless $file =~ /^dlls\//; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; if ($name =~ /\./) { die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name; } else { - die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe"; + die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll"; } + my $implib = $make{"IMPORTLIB"} || ""; $args .= "," if $is_win16 || defined $make{"=flags"}; $args .= "enable_win16" if $is_win16; - push @lines, "WINE_CONFIG_PROGRAM($name$args$flag_args)\n"; - } - elsif ($rules eq "MAKE_TEST_RULES") - { - (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; - push @lines, "WINE_CONFIG_TEST($dir$flag_args)\n"; - } - elsif ($rules eq "MAKE_IMPLIB_RULES") - { - (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; - push @lines, "WINE_CONFIG_LIB($name$flag_args)\n"; + $args .= $flag_args; + $args .= ",[$implib]" if $implib && $implib ne $name; + push @lines, "WINE_CONFIG_DLL($name$args)\n"; } elsif ($file =~ /^tools.*\/Makefile$/) { + die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; + die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; (my $name = $file) =~ s/^(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_TOOL($name$flag_args)\n"; }

1 0

Alexandre Julliard : makefiles: Automatically output appropriate target flags.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: b1928795974788c4beacff5fbd5c05b80127140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1928795974788c4beacff5fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:38:30 2014 +0100 makefiles: Automatically output appropriate target flags. --- Make.rules.in | 2 +- Make.vars.in | 4 ++-- dlls/display.drv16/Makefile.in | 1 - dlls/gdi.exe16/Makefile.in | 1 - dlls/krnl386.exe16/Makefile.in | 1 - dlls/mouse.drv16/Makefile.in | 1 - dlls/ole2nls.dll16/Makefile.in | 1 - dlls/shell.dll16/Makefile.in | 1 - dlls/user.exe16/Makefile.in | 1 - tools/makedep.c | 30 +++++++++++++++++++++--------- 10 files changed, 24 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1928795974788c4beacf…

1 0

Alexandre Julliard : makefiles: Automatically add dll flags where necessary .
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: e9afeb2a5066d18867e9f37fb9611b772cd5a7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9afeb2a5066d18867e9f37fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:33:06 2014 +0100 makefiles: Automatically add dll flags where necessary. --- Make.rules.in | 2 +- Make.vars.in | 1 + configure | 12 +++--------- configure.ac | 12 +++--------- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 - libs/wpp/Makefile.in | 1 - tools/makedep.c | 2 ++ 8 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 8d2c0cf..f400109 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -12,7 +12,7 @@ # First some useful definitions DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) diff --git a/Make.vars.in b/Make.vars.in index bc19456..d4b346a 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -39,6 +39,7 @@ LN_S = @LN_S@ MKDIR_P = @MKDIR_P@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ +DLLFLAGS = @DLLFLAGS@ PRELINK = @PRELINK@ FONTFORGE = @FONTFORGE@ RSVG = @RSVG@ diff --git a/configure b/configure index c0eff26..ad6a0dc 100755 --- a/configure +++ b/configure @@ -16530,24 +16530,18 @@ ac_config_commands="$ac_config_commands include/stamp-h" $as_echo_n "creating Makefile rules..." >&6 -MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS -" +MAKE_IMPLIB_RULES="" -MAKE_DLL_RULES=" -DLLFLAGS = $DLLFLAGS -" +MAKE_DLL_RULES="" -MAKE_PROG_RULES=" -DLLFLAGS = $DLLFLAGS -" +MAKE_PROG_RULES="" MAKE_TEST_RULES=" -DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine " diff --git a/configure.ac b/configure.ac index 801527d..89c50c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2593,23 +2593,17 @@ AS_ECHO_N("creating Makefile rules...") >&AS_MESSAGE_FD dnl Import library rules -AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_IMPLIB_RULES,"") dnl Dll and program rules -AC_SUBST(MAKE_DLL_RULES," -DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_DLL_RULES,"") -AC_SUBST(MAKE_PROG_RULES," -DLLFLAGS = $DLLFLAGS -") +AC_SUBST(MAKE_PROG_RULES,"") dnl Test rules AC_SUBST(MAKE_TEST_RULES," -DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine ") diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f59862c..31d6773 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ STATICLIB = libwine_port.a C_SRCS = \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d087bc7..5286e85 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@ EXTRADEFS = -DWINE_UNICODE_API="" \ -DBINDIR='"$(bindir)"' \ diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 668c137..4855d98 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -1,4 +1,3 @@ -DLLFLAGS = @DLLFLAGS@ STATICLIB = libwpp.a C_SRCS = \ diff --git a/tools/makedep.c b/tools/makedep.c index c84cc59..3b6b84a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1376,6 +1376,7 @@ static struct strarray output_sources(void) struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; + struct strarray dllflags = get_expanded_make_var_array( "DLLFLAGS" ); struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); @@ -1578,6 +1579,7 @@ static struct strarray output_sources(void) output( "%s.o: %s\n", obj, sourcedep ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); + if (module || staticlib || testdll) output_filenames( dllflags ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); if (crosstarget && need_cross)

1 0

Alexandre Julliard : makefiles: Generate cross-compile rules automatically when supported.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 1cd2786f926eb8904c7d5601519269f9d75c6943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd2786f926eb8904c7d56015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 21:27:22 2014 +0100 makefiles: Generate cross-compile rules automatically when supported. --- configure | 11 --------- configure.ac | 11 --------- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- tools/makedep.c | 53 ++++++++++++-------------------------------- 11 files changed, 23 insertions(+), 68 deletions(-) diff --git a/configure b/configure index 71ff42b..c0eff26 100755 --- a/configure +++ b/configure @@ -16533,11 +16533,6 @@ $as_echo_n "creating Makefile rules..." >&6 MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS " -if test -n "$CROSSTARGET" -then - as_fn_append MAKE_IMPLIB_RULES "MAKEDEPFLAGS = -xo -xcross.o -" -fi MAKE_DLL_RULES=" @@ -16556,12 +16551,6 @@ DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine " -if test -n "$CROSSTARGET" -then - as_fn_append MAKE_TEST_RULES " -MAKEDEPFLAGS = -xo -xcross.o -" -fi wine_fn_append_rule " diff --git a/configure.ac b/configure.ac index bbae5b0..801527d 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,11 +2595,6 @@ dnl Import library rules AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS ") -if test -n "$CROSSTARGET" -then - AS_VAR_APPEND([MAKE_IMPLIB_RULES],"MAKEDEPFLAGS = -xo -xcross.o -") -fi dnl Dll and program rules @@ -2617,12 +2612,6 @@ AC_SUBST(MAKE_TEST_RULES," DLLFLAGS = $DLLFLAGS RUNTESTFLAGS = -q -P wine ") -if test -n "$CROSSTARGET" -then - AS_VAR_APPEND([MAKE_TEST_RULES]," -MAKEDEPFLAGS = -xo -xcross.o -") -fi dnl Main makefile diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index 221f19a..a5b27d5 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libadsiid.a +MODULE = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index dbd9b02..aa46a26 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxerr8.a +MODULE = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index c85f648..57edb14 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxerr9.a +MODULE = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 261e0d0..a47a51f 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libdxguid.a +MODULE = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 473cbdd..3ac7c56 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libstrmbase.a +MODULE = libstrmbase.a C_SRCS = \ audio.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 3ed9247..744682e 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libstrmiids.a +MODULE = libstrmiids.a C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index 904c354..bc35e69 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libuuid.a +MODULE = libuuid.a C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 99cd65f..23dca02 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -STATICLIB = libwinecrt0.a +MODULE = libwinecrt0.a C_SRCS = \ delay_load.c \ diff --git a/tools/makedep.c b/tools/makedep.c index fba15ed..c84cc59 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -93,7 +93,6 @@ struct strarray static const struct strarray empty_strarray; static struct strarray include_args; -static struct strarray object_extensions; static struct strarray make_vars; static struct strarray cmdline_vars; @@ -475,9 +474,6 @@ static void init_paths(void) if (top_src_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_src_dir )); else if (top_obj_dir) strarray_insert( &include_args, 0, strmake( "-I%s/include", top_obj_dir )); - - /* set the default extension list for object files */ - if (!object_extensions.count) strarray_add( &object_extensions, "o" ); } @@ -1391,6 +1387,7 @@ static struct strarray output_sources(void) char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; + if (module && strendswith( module, ".a" )) staticlib = module; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1573,29 +1570,17 @@ static struct strarray output_sources(void) } else { + int need_cross = testdll || (source->flags & FLAG_C_IMPLIB) || (module && staticlib); + if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); - for (i = 0; i < object_extensions.count; i++) - { - output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); - if (strstr( object_extensions.str[i], "cross" )) - { - strarray_add( &crossobj_files, strmake( "%s.%s", obj, object_extensions.str[i] )); - output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( includes ); - output_filename( "$(ALLCROSSCFLAGS)" ); - output( "\n" ); - } - else - { - strarray_add( &object_files, strmake( "%s.%s", obj, object_extensions.str[i] )); - output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( includes ); - output_filename( "$(ALLCFLAGS)" ); - output( "\n" ); - } - } - if (crosstarget && (source->flags & FLAG_C_IMPLIB)) + strarray_add( &object_files, strmake( "%s.o", obj )); + output( "%s.o: %s\n", obj, sourcedep ); + output( "\t$(CC) -c -o $@ %s", source->filename ); + output_filenames( includes ); + output_filename( "$(ALLCFLAGS)" ); + output( "\n" ); + if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); @@ -1613,9 +1598,8 @@ static struct strarray output_sources(void) } if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED)) strarray_add( &c2man_files, source->filename ); - for (i = 0; i < object_extensions.count; i++) - output( "%s.%s ", obj, object_extensions.str[i] ); - if (source->flags & FLAG_C_IMPLIB) output( "%s.cross.o", obj ); + output( "%s.o", obj ); + if (crosstarget && need_cross) output( " %s.cross.o", obj ); output( ":" ); } free( obj ); @@ -1660,7 +1644,7 @@ static struct strarray output_sources(void) output( "\n" ); } - if (module) + if (module && !staticlib) { int is_win16 = strendswith( module, "16" ); char *importlib = get_expanded_make_variable( "IMPORTLIB" ); @@ -1802,7 +1786,7 @@ static struct strarray output_sources(void) output( "\t$(AR) $(ARFLAGS) $@" ); output_filenames( object_files ); output( "\n\t$(RANLIB) $@\n" ); - if (crosstarget && object_extensions.count > 1) + if (crosstarget && module) { char *name = replace_extension( staticlib, ".a", ".cross.a" ); @@ -2076,12 +2060,6 @@ static void update_makefile( const char *path ) top_obj_dir = get_expanded_make_variable( "top_builddir" ); parent_dir = get_expanded_make_variable( "PARENTSRC" ); - object_extensions = empty_strarray; - value = get_expanded_make_var_array( "MAKEDEPFLAGS" ); - for (i = 0; i < value.count; i++) - if (!strncmp( value.str[i], "-x", 2 )) - strarray_add( &object_extensions, value.str[i] + 2 ); - include_args = empty_strarray; value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) @@ -2181,8 +2159,7 @@ static int parse_option( const char *opt ) else Separator = NULL; break; case 'x': - if (opt[2]) strarray_add( &object_extensions, xstrdup( opt + 2 )); - break; + break; /* ignored */ default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1);

1 0

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 January 2014