April 2011 - Wine-commits - list.winehq.org

Francois Gouget : appwiz.cpl: Fix ellipsis usage in the button labels.
by Alexandre Julliard 28 Apr '11

28 Apr '11

1 0

Marcus Meissner : wnaspi32: Mark internal symbols as hidden.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: bd6729dd08ff0022f4e9c0ea187115ee1c0cb8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6729dd08ff0022f4e9c0ea1… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:27:42 2011 +0200 wnaspi32: Mark internal symbols as hidden. --- dlls/wnaspi32/winescsi.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wnaspi32/winescsi.h b/dlls/wnaspi32/winescsi.h index be1d5f6..9d542bd 100644 --- a/dlls/wnaspi32/winescsi.h +++ b/dlls/wnaspi32/winescsi.h @@ -57,30 +57,30 @@ struct sg_header /* Function prototypes from dlls/wnaspi32/aspi.c */ void -SCSI_Init(void); +SCSI_Init(void) DECLSPEC_HIDDEN; int -ASPI_GetNumControllers(void); +ASPI_GetNumControllers(void) DECLSPEC_HIDDEN; int -SCSI_OpenDevice( int h, int c, int t, int d ); +SCSI_OpenDevice( int h, int c, int t, int d ) DECLSPEC_HIDDEN; int -SCSI_LinuxSetTimeout( int fd, int timeout ); +SCSI_LinuxSetTimeout( int fd, int timeout ) DECLSPEC_HIDDEN; #ifdef linux BOOL SCSI_LinuxDeviceIo( int fd, struct sg_header * lpvInBuffer, DWORD cbInBuffer, struct sg_header * lpvOutBuffer, DWORD cbOutBuffer, - LPDWORD lpcbBytesReturned ); + LPDWORD lpcbBytesReturned ) DECLSPEC_HIDDEN; void -SCSI_Fix_CMD_LEN( int fd, int cmd, int len ); +SCSI_Fix_CMD_LEN( int fd, int cmd, int len ) DECLSPEC_HIDDEN; #endif DWORD -ASPI_GetHCforController( int controller ); +ASPI_GetHCforController( int controller ) DECLSPEC_HIDDEN; /*** This is where we throw some miscellaneous crap ***/

1 0

Marcus Meissner : d3dxof: Mark internal symbols as hidden.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 0bbba71c645737d38d97ea1a2e1ef06ff19d77b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbba71c645737d38d97ea1a2… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:28:49 2011 +0200 d3dxof: Mark internal symbols as hidden. --- dlls/d3dxof/d3dxof_private.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 1bd2a6d..fb5ae77 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -164,16 +164,16 @@ typedef struct { LONG ref; } IDirectXFileSaveObjectImpl; -HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj); -HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); +HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj) DECLSPEC_HIDDEN; -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size); -BOOL parse_template(parse_buffer * buf); -void dump_template(xtemplate* templates_array, xtemplate* ptemplate); -BOOL is_template_available(parse_buffer * buf); -BOOL parse_object(parse_buffer * buf); +BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; +BOOL parse_template(parse_buffer * buf) DECLSPEC_HIDDEN; +void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DECLSPEC_HIDDEN; +BOOL is_template_available(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer); +int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; #endif /* __D3DXOF_PRIVATE_INCLUDED__ */

1 0

Francois Gouget : shdocvw: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: c68cf7cbe0725ce538e2c6c5ffa82cf3f7588aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68cf7cbe0725ce538e2c6c5f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 28 11:55:50 2011 +0200 shdocvw: Fix ellipsis usage in the menu and button labels. --- dlls/shdocvw/shdocvw.rc | 8 ++++---- po/ar.po | 30 +++++++++++++++--------------- po/bg.po | 30 +++++++++++++++--------------- po/ca.po | 29 +++++++++++++++-------------- po/cs.po | 34 +++++++++++++++------------------- po/da.po | 32 ++++++++++++++------------------ po/de.po | 28 +++++++++++++++------------- po/el.po | 30 +++++++++++++++--------------- po/en.po | 30 +++++++++++++++--------------- po/en_US.po | 30 +++++++++++++++--------------- po/eo.po | 34 +++++++++++++++------------------- po/es.po | 30 ++++++++++++++++-------------- po/fa.po | 30 +++++++++++++++--------------- po/fi.po | 34 +++++++++++++++------------------- po/fr.po | 28 +++++++++++++++------------- po/he.po | 28 +++++++++++++++------------- po/hi.po | 30 +++++++++++++++--------------- po/hu.po | 34 +++++++++++++++------------------- po/it.po | 32 +++++++++++++++++++------------- po/ja.po | 28 +++++++++++++++------------- po/ko.po | 28 +++++++++++++++------------- po/lt.po | 28 +++++++++++++++------------- po/ml.po | 30 +++++++++++++++--------------- po/nb_NO.po | 32 ++++++++++++++------------------ po/nl.po | 28 +++++++++++++++------------- po/or.po | 30 +++++++++++++++--------------- po/pa.po | 30 +++++++++++++++--------------- po/pl.po | 32 +++++++++++++++++++------------- po/pt_BR.po | 32 +++++++++++++++++++------------- po/pt_PT.po | 28 ++++++++++++++-------------- po/rm.po | 30 +++++++++++++++--------------- po/ro.po | 27 ++++++++++++++------------- po/ru.po | 28 +++++++++++++++------------- po/sk.po | 30 +++++++++++++++--------------- po/sl.po | 32 +++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 30 ++++++++++++++++-------------- po/sr_RS(a)latin.po | 28 +++++++++++++++------------- po/sv.po | 28 +++++++++++++++------------- po/te.po | 30 +++++++++++++++--------------- po/th.po | 30 +++++++++++++++--------------- po/tr.po | 34 +++++++++++++++------------------- po/uk.po | 28 +++++++++++++++------------- po/wa.po | 30 +++++++++++++++--------------- po/wine.pot | 26 +++++++++++++------------- po/zh_CN.po | 28 ++++++++++++++-------------- po/zh_TW.po | 30 +++++++++++++++--------------- 46 files changed, 690 insertions(+), 666 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68cf7cbe0725ce538e2c…

1 0

Francois Gouget : msvfw32: Use constants instead of hard-coded numbers for the resources.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 1235c24803b85ce86da9908ec76bf375b5154baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1235c24803b85ce86da9908ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 28 11:29:07 2011 +0200 msvfw32: Use constants instead of hard-coded numbers for the resources. --- dlls/msvfw32/msvfw32_Da.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_De.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_En.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Es.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Fr.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_He.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Hu.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_It.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Ja.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Ko.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Lt.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Nl.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_No.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Pl.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Pt.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Ro.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Ru.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Si.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Sr.rc | 44 ++++++++++++++++++++++---------------------- dlls/msvfw32/msvfw32_Sv.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Tr.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Uk.rc | 22 +++++++++++----------- dlls/msvfw32/msvfw32_Zh.rc | 44 ++++++++++++++++++++++---------------------- 23 files changed, 275 insertions(+), 275 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1235c24803b85ce86da99…

1 0

Francois Gouget : msvcrt: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 4df46f69bf324b8b60392c29fb5ed94be963fab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df46f69bf324b8b60392c29f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 28 11:30:10 2011 +0200 msvcrt: Fix compilation on systems that don't support nameless unions. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 30613ca..c9ad136 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -884,7 +884,7 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) /* The MoleBox protection scheme expects msvcrt to use SetFilePointer only, * so a LARGE_INTEGER offset cannot be passed directly via SetFilePointerEx. */ ofs.QuadPart = offset; - if ((ofs.LowPart = SetFilePointer(hand, ofs.LowPart, &ofs.HighPart, whence)) != INVALID_SET_FILE_POINTER || + if ((ofs.u.LowPart = SetFilePointer(hand, ofs.u.LowPart, &ofs.u.HighPart, whence)) != INVALID_SET_FILE_POINTER || GetLastError() == ERROR_SUCCESS) { MSVCRT_fdesc[fd].wxflag &= ~(WX_ATEOF|WX_READEOF);

1 0

Francois Gouget : gameux: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 18ea0aef9c821f268665e1a2d22fb35d3a8ab839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ea0aef9c821f268665e1a2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 28 11:54:35 2011 +0200 gameux: Remove WINAPI on static functions where not needed. --- dlls/gameux/gameexplorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 965a0f0..8b57247 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -523,7 +523,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) * identifier will be generated automatically * and returned via this parameter */ -static HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, +static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, LPCWSTR sGameInstallDirectory, GAME_INSTALL_SCOPE installScope, GUID *pInstanceID)

1 0

Alexandre Julliard : atl: Specify the correct instance and cursor when registering a class.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 20e24bff70bc041ab41e7f6333ed54a20c8df178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e24bff70bc041ab41e7f633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 28 12:36:30 2011 +0200 atl: Specify the correct instance and cursor when registering a class. --- dlls/atl/atl_main.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 88795c9..8db4311 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -466,15 +466,19 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); + snprintf(wci->m_szAutoName, sizeof(wci->m_szAutoName), "ATL%08lx", (UINT_PTR)wci); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } atom = GetClassInfoExA(pm->m_hInst, wci->m_wc.lpszClassName, &wc); if (!atom) + { + wci->m_wc.hInstance = pm->m_hInst; + wci->m_wc.hCursor = LoadCursorA( wci->m_bSystemCursor ? NULL : pm->m_hInst, + wci->m_lpszCursorID ); atom = RegisterClassExA(&wci->m_wc); - + } wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; } @@ -518,15 +522,19 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - sprintfW(wci->m_szAutoName, szFormat, (UINT_PTR)wci); + snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } atom = GetClassInfoExW(pm->m_hInst, wci->m_wc.lpszClassName, &wc); if (!atom) + { + wci->m_wc.hInstance = pm->m_hInst; + wci->m_wc.hCursor = LoadCursorW( wci->m_bSystemCursor ? NULL : pm->m_hInst, + wci->m_lpszCursorID ); atom = RegisterClassExW(&wci->m_wc); - + } wci->pWndProc = wci->m_wc.lpfnWndProc; wci->m_atom = atom; }

1 0

Alexandre Julliard : winex11: Grab the mouse in the thread that owns the foreground window if possible.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 84f085fb91a17e2efe83de0642b757948f4e8a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f085fb91a17e2efe83de064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 28 13:07:05 2011 +0200 winex11: Grab the mouse in the thread that owns the foreground window if possible. --- dlls/winex11.drv/mouse.c | 99 +++++++++++++++++++++++++++++----------------- 1 files changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7f45a2a..96d93e5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -369,44 +369,18 @@ static HWND create_clipping_msg_window(void) } /*********************************************************************** - * clip_cursor_notify - * - * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. - */ -LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) -{ - struct x11drv_thread_data *data = x11drv_thread_data(); - - if (hwnd == GetDesktopWindow()) /* change the clip window stored in the desktop process */ - { - static HWND clip_hwnd; - - HWND prev = clip_hwnd; - clip_hwnd = new_clip_hwnd; - if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); - if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, 0, 0 ); - } - else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ - { - data->clip_hwnd = 0; - disable_xinput2(); - DestroyWindow( hwnd ); - } - return 0; -} - -/*********************************************************************** * grab_clipping_window * * Start a pointer grab on the clip window. */ static BOOL grab_clipping_window( const RECT *clip ) { - struct x11drv_thread_data *data = x11drv_init_thread_data(); - Window clip_window = init_clip_window(); + struct x11drv_thread_data *data = x11drv_thread_data(); + Window clip_window; HWND msg_hwnd = 0; - if (!clip_window) return TRUE; + if (!data) return FALSE; + if (!(clip_window = init_clip_window())) return TRUE; /* create a clip message window unless we are already clipping */ if (!data->clip_hwnd) @@ -475,6 +449,42 @@ void ungrab_clipping_window(void) } /*********************************************************************** + * clip_cursor_notify + * + * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. + */ +LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) +{ + struct x11drv_thread_data *data = x11drv_thread_data(); + + if (hwnd == GetDesktopWindow()) /* change the clip window stored in the desktop process */ + { + static HWND clip_hwnd; + + HWND prev = clip_hwnd; + clip_hwnd = new_clip_hwnd; + if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); + if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + } + else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ + { + data->clip_hwnd = 0; + disable_xinput2(); + DestroyWindow( hwnd ); + } + else if (hwnd == GetForegroundWindow()) /* request to clip */ + { + RECT clip; + + GetClipCursor( &clip ); + if (clip.left > virtual_screen_rect.left || clip.right < virtual_screen_rect.right || + clip.top > virtual_screen_rect.top || clip.bottom < virtual_screen_rect.bottom) + return grab_clipping_window( &clip ); + } + return 0; +} + +/*********************************************************************** * send_mouse_input * * Update the various window states on a mouse event. @@ -1191,16 +1201,31 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) */ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) { + if (!clip) + { + ungrab_clipping_window(); + return TRUE; + } + + if (X11DRV_get_win_data( GetDesktopWindow() )) return TRUE; /* don't clip in the desktop process */ + /* we are clipping if the clip rectangle is smaller than the screen */ - if (clip && (clip->left > virtual_screen_rect.left || - clip->right < virtual_screen_rect.right || - clip->top > virtual_screen_rect.top || - clip->bottom < virtual_screen_rect.bottom)) + if (grab_pointer && (clip->left > virtual_screen_rect.left || + clip->right < virtual_screen_rect.right || + clip->top > virtual_screen_rect.top || + clip->bottom < virtual_screen_rect.bottom)) { - if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) - return TRUE; /* don't clip in the desktop process */ + DWORD tid, pid; + HWND foreground = GetForegroundWindow(); - if (grab_pointer && grab_clipping_window( clip )) return TRUE; + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + } + else if (grab_clipping_window( clip )) return TRUE; } ungrab_clipping_window();

1 0

André Hentschel : winebuild: Use -mcpu option for the assembler.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: c44dead5f6f9c118ec4bbab058a9fa6bf9696e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44dead5f6f9c118ec4bbab05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 27 19:45:11 2011 +0200 winebuild: Use -mcpu option for the assembler. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 ++++--- tools/winebuild/utils.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 2429446..b64c9a0 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -361,5 +361,6 @@ extern char **lib_path; extern char *as_command; extern char *ld_command; extern char *nm_command; +extern char *cpu_option; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f6d39b0..55908d5 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -88,6 +88,7 @@ static int fake_module; char *as_command = NULL; char *ld_command = NULL; char *nm_command = NULL; +char *cpu_option = NULL; static int nb_res_files; static char **res_files; @@ -379,11 +380,11 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) lib_path[nb_lib_paths++] = xstrdup( optarg ); break; case 'm': - if (strcmp( optarg, "16" ) && strcmp( optarg, "32" ) && strcmp( optarg, "64" )) - fatal_error( "Invalid -m option '%s', expected -m16, -m32 or -m64\n", optarg ); if (!strcmp( optarg, "16" )) spec->type = SPEC_WIN16; else if (!strcmp( optarg, "32" )) force_pointer_size = 4; - else force_pointer_size = 8; + else if (!strcmp( optarg, "64" )) force_pointer_size = 8; + else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); + else fatal_error( "Invalid -m option '%s', expected -m16, -m32, -m64 or -mcpu\n", optarg ); break; case 'M': spec->main_module = xstrdup( optarg ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index ad637b6..931fc49 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -362,6 +362,8 @@ struct strarray *get_as_command(void) break; } } + + if (cpu_option) strarray_add_one( args, strmake("-mcpu=%s", cpu_option) ); return args; }

1 0