December 2012 - Wine-Commits

Jacek Caban : atl: Added locking to AtlModuleExtractCreateWndData.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: 8dc7a72a145ba8026c0745f21e8e275675e36e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc7a72a145ba8026c0745f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 27 15:19:26 2012 +0100 atl: Added locking to AtlModuleExtractCreateWndData. --- dlls/atl/atl_main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 41b33ce..5ef083e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -440,27 +440,32 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData /*********************************************************************** * AtlModuleExtractCreateWndData [ATL.@] * - * NOTE: I failed to find any good description of this function. - * Tests show that this function extracts one of _AtlCreateWndData + * NOTE: Tests show that this function extracts one of _AtlCreateWndData * records from the current thread from a list * */ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) { _AtlCreateWndData **ppData; + void *ret = NULL; TRACE("(%p)\n", pM); + EnterCriticalSection(&pM->m_csWindowCreate); + for(ppData = &pM->m_pCreateWndList; *ppData!=NULL; ppData = &(*ppData)->m_pNext) { if ((*ppData)->m_dwThreadID == GetCurrentThreadId()) { _AtlCreateWndData *pData = *ppData; *ppData = pData->m_pNext; - return pData->m_pThis; + ret = pData->m_pThis; + break; } } - return NULL; + + LeaveCriticalSection(&pM->m_csWindowCreate); + return ret; } /***********************************************************************

1 0

Chae Jong Bin : urlmon: Add stub for FlushUrlmonZonesCache.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: fee3d6703057220803f502256fe3e93f5f31d2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee3d6703057220803f502256… Author: Chae Jong Bin <chae(a)trunk.so> Date: Wed Dec 26 12:32:33 2012 +0000 urlmon: Add stub for FlushUrlmonZonesCache. --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 5be0b6a..069421f 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -105,3 +105,4 @@ 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState 445 stdcall @(long long) MapBrowserEmulationModeToUserAgent +455 stdcall @() FlushUrlmonZonesCache diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 17e9d14..a9c5a6d 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -1166,6 +1166,15 @@ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) } /*********************************************************************** + * FlushUrlmonZonesCache (URLMON.455) + * Undocumented, added in IE8 + */ +void WINAPI FlushUrlmonZonesCache(void) +{ + FIXME("stub\n"); +} + +/*********************************************************************** * RegisterMediaTypes * Added in IE3, registers known MIME-type strings. */

1 0

Andrew Eikum : winmm: Open WAVE_MAPPER devices in their own devices array.
by Alexandre Julliard Dec. 27, 2012

Dec. 27, 2012

Module: wine Branch: master Commit: b73da85dec6a814472e276ddcaeedd80f4fe2f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73da85dec6a814472e276ddc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 26 15:47:31 2012 -0600 winmm: Open WAVE_MAPPER devices in their own devices array. --- dlls/winmm/waveform.c | 387 +++++++++++++++++++++--------------------------- 1 files changed, 169 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b73da85dec6a814472e27…

1 0

Jacek Caban : atl100: Fixed a typo.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 1a111423dd432223d00e6e50cd72613143051ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a111423dd432223d00e6e50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:59 2012 +0100 atl100: Fixed a typo. --- dlls/atl100/tests/atl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index e7882fa..59268de 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -100,7 +100,7 @@ static void test_winmodule(void) ok(p == (void*)0xdead0001, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p); ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); - ok(!create_data[1].m_pNext+1, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); p = AtlWinModuleExtractCreateWndData(&winmod); ok(!p, "unexpected AtlWinModuleExtractCreateWndData result %p\n", p);

1 0

Piotr Caban : msvcrt: NULL terminate program arguments list in __getmainargs.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 6e485f13c011b8429a8b44afd53163ddb3c0bfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e485f13c011b8429a8b44afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 13:28:14 2012 +0100 msvcrt: NULL terminate program arguments list in __getmainargs. --- dlls/msvcrt/data.c | 16 ++++++++++------ dlls/msvcrt/tests/data.c | 2 ++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index a9505ed..b31e5f7 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -424,7 +424,7 @@ static int build_expanded_argv(int *argc, char **argv) len = strlen(data.cFileName)+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], path_len*sizeof(char)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(char)); } @@ -437,7 +437,7 @@ static int build_expanded_argv(int *argc, char **argv) if(!len) { len = strlen(__wine_main_argv[i])+1; if(argv) { - argv[args_no] = (char*)(argv+*argc)+size; + argv[args_no] = (char*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_argv[i], len*sizeof(char)); } args_no++; @@ -445,7 +445,9 @@ static int build_expanded_argv(int *argc, char **argv) } } - size += args_no*sizeof(char*); + if(argv) + argv[args_no] = NULL; + size += (args_no+1)*sizeof(char*); *argc = args_no; return size; } @@ -519,7 +521,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) len = strlenW(data.cFileName)+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], path_len*sizeof(MSVCRT_wchar_t)); memcpy(argv[args_no]+path_len, data.cFileName, len*sizeof(MSVCRT_wchar_t)); } @@ -532,7 +534,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) if(!len) { len = strlenW(__wine_main_wargv[i])+1; if(argv) { - argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc)+size; + argv[args_no] = (MSVCRT_wchar_t*)(argv+*argc+1)+size; memcpy(argv[args_no], __wine_main_wargv[i], len*sizeof(MSVCRT_wchar_t)); } args_no++; @@ -540,8 +542,10 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) } } + if(argv) + argv[args_no] = NULL; size *= sizeof(MSVCRT_wchar_t); - size += args_no*sizeof(MSVCRT_wchar_t*); + size += (args_no+1)*sizeof(MSVCRT_wchar_t*); *argc = args_no; return size; } diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index cdd65a7..e2adc34 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -146,6 +146,7 @@ static void test___getmainargs(void) ok(!strcmp(argv[2], filepath), "argv[2] = %s\n", argv[2]); sprintf(filepath, "%swine_test/*", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); + ok(!argv[4], "argv[4] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc(); @@ -172,6 +173,7 @@ static void test___getmainargs(void) sprintf(filepath, "%swine_test/test", tmppath); ok(!strcmp(argv[3], filepath), "argv[3] = %s\n", argv[3]); } + ok(!argv[5], "argv[5] != NULL\n"); if(p___p___argc && p___p___argv) { new_argc = *p___p___argc();

1 0

Piotr Caban : msvcrt: Added _strnicmp_l implementation.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: eaa1b7060375f819146cce127d401a2161db6ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa1b7060375f819146cce127… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 26 12:04:59 2012 +0100 msvcrt: Added _strnicmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 32 +++++++++++++++++++++++++------- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 64b4105..4838a14 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1341,7 +1341,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91147cf..0144e08 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1003,7 +1003,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index abde141..dd91d5e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -996,7 +996,7 @@ @ cdecl _strncoll(str str long) msvcrt._strncoll @ cdecl _strncoll_l(str str long ptr) msvcrt._strncoll_l @ cdecl _strnicmp(str str long) msvcrt._strnicmp -@ stub _strnicmp_l +@ cdecl _strnicmp_l(str str long ptr) msvcrt._strnicmp_l @ cdecl _strnicoll(str str long) msvcrt._strnicoll @ cdecl _strnicoll_l(str str long ptr) msvcrt._strnicoll_l @ cdecl _strnset(str long long) msvcrt._strnset diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3d15a21..29b459b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -936,8 +936,8 @@ @ cdecl _strlwr_s_l(ptr long ptr) @ cdecl _strncoll(str str long) MSVCRT_strncoll_l @ cdecl _strncoll_l(str str long ptr) MSVCRT_strncoll -@ cdecl _strnicmp(str str long) ntdll._strnicmp -# stub _strnicmp_l(str str long ptr) +@ cdecl _strnicmp(str str long) MSVCRT__strnicmp +@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l @ cdecl _strnicoll(str str long) MSVCRT__strnicoll @ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l @ cdecl _strnset(str long long) MSVCRT__strnset diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b457510..d9ec353 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1559,9 +1559,10 @@ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) } /********************************************************************* - * _stricmp_l (MSVCRT.@) + * _strnicmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, + MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; char c1, c2; @@ -1569,28 +1570,45 @@ int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t l if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) return MSVCRT__NLSCMPERROR; + if(!count) + return 0; + if(!locale) locinfo = get_locinfo(); else locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) - return strcasecmp(s1, s2); + return strncasecmp(s1, s2, count); do { c1 = MSVCRT__tolower_l(*s1++, locale); c2 = MSVCRT__tolower_l(*s2++, locale); - if(c1 != c2) - break; - }while(c1 && c1==c2); + }while(--count && c1 && c1==c2); return c1-c2; } /********************************************************************* + * _stricmp_l (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +{ + return MSVCRT__strnicmp_l(s1, s2, -1, locale); +} + +/********************************************************************* + * _strnicmp (MSVCRT.@) + */ +int __cdecl MSVCRT__strnicmp(const char *s1, const char *s2, MSVCRT_size_t count) +{ + return MSVCRT__strnicmp_l(s1, s2, count, NULL); +} + +/********************************************************************* * _stricmp (MSVCRT.@) */ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { - return MSVCRT__stricmp_l(s1, s2, NULL); + return MSVCRT__strnicmp_l(s1, s2, -1, NULL); }

1 0

Ričardas Barkauskas : comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 2c8ea6ebff21428dc407d85af3f516083d544bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8ea6ebff21428dc407d85af… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:07:17 2012 +0200 comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex. --- dlls/comctl32/propsheet.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c3db7e3..f2c55ab 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2561,16 +2561,11 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex) */ static LRESULT PROPSHEET_PageToIndex(HWND hwndDlg, HPROPSHEETPAGE hPage) { - int index; PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %p)\n", hwndDlg, hPage); - for (index = 0; index < psInfo->nPages; index++) - if (psInfo->proppage[index].hpage == hPage) - return index; - WARN("%p not found\n", hPage); - return -1; + return PROPSHEET_GetPageIndex(hPage, psInfo, -1); } /******************************************************************************

1 0

Ričardas Barkauskas : comctl32: Use index value if property sheet page isn't found.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 379d492b12b25e16b7c83872658042bf99d30c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379d492b12b25e16b7c838726… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:06:45 2012 +0200 comctl32: Use index value if property sheet page isn't found. --- dlls/comctl32/propsheet.c | 40 +++++++++++++------------------------- dlls/comctl32/tests/propsheet.c | 2 +- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b73c448..c3db7e3 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -168,7 +168,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, int index, int skipdir, HPROPSHEETPAGE hpage); -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo); +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo, int original_index); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); @@ -1998,9 +1998,8 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage); - /* hpage takes precedence over index */ - if (hpage != NULL) - index = PROPSHEET_GetPageIndex(hpage, psInfo); + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); if (index < 0 || index >= psInfo->nPages) { @@ -2331,13 +2330,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, if (!psInfo) { return FALSE; } - /* - * hpage takes precedence over index. - */ - if (hpage != 0) - { - index = PROPSHEET_GetPageIndex(hpage, psInfo); - } + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); /* Make sure that index is within range */ if (index < 0 || index >= psInfo->nPages) @@ -2652,26 +2646,20 @@ static BOOL PROPSHEET_RecalcPageSizes(HWND hwndDlg) * PROPSHEET_GetPageIndex * * Given a HPROPSHEETPAGE, returns the index of the corresponding page from - * the array of PropPageInfo. + * the array of PropPageInfo. If page is not found original index is used + * (page takes precedence over index). */ -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo) +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psInfo, int original_index) { - BOOL found = FALSE; - int index = 0; + int index; - TRACE("hpage %p\n", hpage); - while ((index < psInfo->nPages) && (found == FALSE)) - { - if (psInfo->proppage[index].hpage == hpage) - found = TRUE; - else - index++; - } + TRACE("page %p index %d\n", page, original_index); - if (found == FALSE) - index = -1; + for (index = 0; index < psInfo->nPages; index++) + if (psInfo->proppage[index].hpage == page) + return index; - return index; + return original_index; } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 992b60f..f235791 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -821,7 +821,7 @@ if (0) ok(r == 4, "got %d\n", r); /* select page that can't be created */ - ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0); + ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 1); ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0);

1 0

Ken Thomases : winemac.drv: Implement EnumDisplayMonitors.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 21c4fc3326eedeab996e7021235b58477227ec7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c4fc3326eedeab996e70212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:28 2012 -0600 winemac.drv: Implement EnumDisplayMonitors. --- dlls/winemac.drv/Makefile.in | 6 ++- dlls/winemac.drv/cocoa_display.m | 103 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 107 +++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 79 +++++++------------------- dlls/winemac.drv/macdrv_cocoa.h | 111 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 + 6 files changed, 352 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c4fc3326eedeab996e7…

1 0

Ken Thomases : makefiles: Allow use of Objective-C source files in modules.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 49dc686ae99a630460cfafcbfbbed8f43280610b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dc686ae99a630460cfafcbf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:24 2012 -0600 makefiles: Allow use of Objective-C source files in modules. --- Make.rules.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7c4a65c..38231a8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -2,6 +2,7 @@ # # Each individual makefile may define the following variables: # C_SRCS : C sources for the module +# OBJC_SRCS : Objective-C sources for the module # RC_SRCS : resource source files # EXTRA_SRCS : extra source files for make depend # EXTRA_OBJS : extra object files @@ -29,7 +30,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) @@ -47,6 +48,9 @@ filter: dummy .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< +.m.o: + $(CC) -c $(ALLCFLAGS) -o $@ $< + .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< @@ -137,7 +141,7 @@ winapi_check:: dummy # Rules for dependencies -DEPEND_SRCS = $(C_SRCS) $(RC_SRCS) $(MC_SRCS) \ +DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)

1 0