June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32: Fix the HGLOBAL header size for 64-bit.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c6dffb6df8578733c69fb35fd8d9079e091b3880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dffb6df8578733c69fb35fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 20:53:46 2009 +0200 kernel32: Fix the HGLOBAL header size for 64-bit. --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c78c762..93cf545 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -320,7 +320,7 @@ BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, P * size = 8*k, where k=1,2,3,... alloc's exactly the given size. * The Minolta DiMAGE Image Viewer heavily relies on this, corrupting * the output jpeg's > 1 MB if not */ -#define HGLOBAL_STORAGE 8 /* sizeof(HGLOBAL)*2 */ +#define HGLOBAL_STORAGE (sizeof(HGLOBAL)*2) #include "pshpack1.h"

1 0

Michael Abbott : wined3d: Remove division from inner loop.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 2e119a2718ccb3cdf32277c5985bc2bb55c52a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e119a2718ccb3cdf32277c59… Author: Michael Abbott <michael(a)araneidae.co.uk> Date: Tue Jun 16 16:20:05 2009 +0100 wined3d: Remove division from inner loop. --- dlls/wined3d/surface.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eedc257..400a652 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2461,9 +2461,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { - /* The depth data is normalized, so needs to be scaled, the stencil data isn't. */ - WORD d15 = source[x] & 0xfffe; - DWORD d24 = d15 * 0x100 + (d15 * 0xff80 + 0x3fff80) / 0x7fff00; + /* The depth data is normalized, so needs to be scaled, + * the stencil data isn't. Scale depth data by + * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ + WORD d15 = source[x] >> 1; + DWORD d24 = (d15 << 9) + (d15 >> 6); dest[x] = (d24 << 8) | (source[x] & 0x1); } }

1 0

Stefan Doesinger : wined3d: Properly free srgb textures.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 7d5285acc12c5b5f52fdaababd9d4e2ab60b3a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5285acc12c5b5f52fdaabab… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Tue Jun 9 23:01:02 2009 -0700 wined3d: Properly free srgb textures. --- dlls/wined3d/basetexture.c | 22 ++++++++-------------- dlls/wined3d/surface.c | 2 ++ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index aeec963..547ed1e 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -53,19 +53,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DR void basetexture_cleanup(IWineD3DBaseTexture *iface) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - - TRACE("(%p) : textureName(%d)\n", This, This->baseTexture.textureName); - if (This->baseTexture.textureName != 0) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - TRACE("(%p) : Deleting texture %d\n", This, This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.srgbTextureName); - LEAVE_GL(); - } - + basetexture_unload(iface); resource_cleanup((IWineD3DResource *)iface); } @@ -78,8 +66,14 @@ void basetexture_unload(IWineD3DBaseTexture *iface) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); glDeleteTextures(1, &This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.srgbTextureName); This->baseTexture.textureName = 0; + LEAVE_GL(); + } + + if(This->baseTexture.srgbTextureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.srgbTextureName); This->baseTexture.srgbTextureName = 0; LEAVE_GL(); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 400a652..58893f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -892,6 +892,8 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { ENTER_GL(); glDeleteTextures(1, &This->glDescription.textureName); This->glDescription.textureName = 0; + glDeleteTextures(1, &This->glDescription.srgbTextureName); + This->glDescription.srgbTextureName = 0; LEAVE_GL(); } else { IWineD3DBaseTexture_Release(texture);

1 0

Paul Vriens : comdlg32/tests: Fix some typos.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 5d898e3ebeaba3bdd5b70201b832c82d79b6e351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d898e3ebeaba3bdd5b70201b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 17 13:27:16 2009 +0200 comdlg32/tests: Fix some typos. --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 6280c89..0cd1e63 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -241,7 +241,7 @@ static void test_create_view_window2(void) ofn.lStructSize = sizeof(ofn); ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = create_view_window2_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; ret = GetOpenFileNameA(&ofn); @@ -258,7 +258,7 @@ static void test_create_view_template(void) ofn.lStructSize = sizeof(ofn); ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC)template_hook; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE; ofn.hInstance = GetModuleHandleA(NULL); @@ -384,7 +384,7 @@ static void test_resize(void) int i; ofn.lpstrFile = filename; - ofn.nMaxFile = 1042; + ofn.nMaxFile = 1024; ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); ofn.lpTemplateName = "template_sz";

1 0

Huw Davies : tools/widl: Fix behaviour when both lcid and retval arguments are present.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: a6181cb3b27af542179af16dd15a05682a0982d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6181cb3b27af542179af16dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 17 14:37:24 2009 +0100 tools/widl: Fix behaviour when both lcid and retval arguments are present. --- tools/widl/write_msft.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7a709bc..5bbc95e 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1515,15 +1515,15 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) paramdata[2] = paramflags; typedata[3] += decoded_size << 16; - if(lcid_retval_count == 1) - typedata[4] |= 0x4000; - else if(lcid_retval_count == 2) - typedata[4] |= 0x8000; - i++; } } + if(lcid_retval_count == 1) + typedata[4] |= 0x4000; + else if(lcid_retval_count == 2) + typedata[4] |= 0x8000; + if(typeinfo->funcs_allocated == 0) { typeinfo->funcs_allocated = 10; typeinfo->func_indices = xmalloc(typeinfo->funcs_allocated * sizeof(int));

1 0

Huw Davies : oleaut32/tests: Add some tests for [lcid] parameters.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 4b0a6a18b2937b041feec92a2dc32a47a4d220e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0a6a18b2937b041feec92a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 17 14:37:52 2009 +0100 oleaut32/tests: Add some tests for [lcid] parameters. --- dlls/oleaut32/tests/tmarshal.c | 53 +++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 6 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2d23b48..ec23204 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -624,6 +624,24 @@ static HRESULT WINAPI Widget_CloneInterface( return S_OK; } +static HRESULT WINAPI Widget_put_prop_with_lcid( + IWidget* iface, LONG lcid, INT i) +{ + trace("put_prop_with_lcid(%08x, %x)\n", lcid, i); + ok(lcid == MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), "got lcid %08x\n", lcid); + ok(i == 0xcafe, "got %08x\n", i); + return S_OK; +} + +static HRESULT WINAPI Widget_get_prop_with_lcid( + IWidget* iface, LONG lcid, INT *i) +{ + trace("get_prop_with_lcid(%08x, %p)\n", lcid, i); + ok(lcid == MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), "got lcid %08x\n", lcid); + *i = lcid; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -651,7 +669,9 @@ static const struct IWidgetVtbl Widget_VTable = Widget_VarArg, Widget_StructArgs, Widget_Error, - Widget_CloneInterface + Widget_CloneInterface, + Widget_put_prop_with_lcid, + Widget_get_prop_with_lcid }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1328,6 +1348,37 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_STATE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_NOTACOLLECTION, "IDispatch_Invoke should have returned DISP_E_NOTACOLLECTION instead of 0x%08x\n", hr); + /* test propput with lcid */ + + /* the lcid passed to the function is the first lcid in the typelib header. + Since we don't explicitly set an lcid in the idl, it'll default to US English. */ + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = 0xcafe; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidNamed; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); +todo_wine + ok_ole_success(hr, ITypeInfo_Invoke); + VariantClear(&varresult); + + /* test propget with lcid */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + dispparams.rgdispidNamedArgs = NULL; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_WITH_LCID, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); +todo_wine +{ + ok_ole_success(hr, ITypeInfo_Invoke); + ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_I4(&varresult) == 0x409, "got %x\n", V_I4(&varresult)); +} + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 2b57ddd..ddf02b2 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -125,6 +125,12 @@ library TestTypelib [propget, id(DISPID_TM_CLONEINTERFACE)] HRESULT CloneInterface([out, retval] ISomethingFromDispatch **ppVal); + + [id(DISPID_TM_PROP_WITH_LCID), propput] + HRESULT prop_with_lcid([in,lcid] long lcid, [in] INT i); + + [id(DISPID_TM_PROP_WITH_LCID), propget] + HRESULT prop_with_lcid([in,lcid] long lcid, [out,retval] INT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 8fcf109..10c2828 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -34,5 +34,6 @@ #define DISPID_TM_CLONEINTERFACE 15 #define DISPID_TM_TESTDUAL 16 #define DISPID_TM_STRUCTARGS 17 +#define DISPID_TM_PROP_WITH_LCID 18 #define DISPID_NOA_BSTRRET 1

1 0

Yann Droneaud : wined3d: Improved ATI Radeon HD 4xxx detection.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: a203876cc796c550f892374181ffe71d4a950f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a203876cc796c550f89237418… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Jun 16 17:16:42 2009 +0200 wined3d: Improved ATI Radeon HD 4xxx detection. --- dlls/wined3d/directx.c | 42 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_gl.h | 13 ++++++++++++- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3354f7b..f96d101 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,16 +1272,43 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; case VENDOR_ATI: + /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx + * + * beware: renderer string do not match exact card model, + * eg HD 4800 is returned for multiple card, even for RV790 based one + */ if(WINE_D3D9_CAPABLE(gl_info)) { /* Radeon R7xx HD4800 - highend */ - if (strstr(gl_info->gl_renderer, "HD 4800") || - strstr(gl_info->gl_renderer, "HD 4830") || - strstr(gl_info->gl_renderer, "HD 4850") || - strstr(gl_info->gl_renderer, "HD 4870") || - strstr(gl_info->gl_renderer, "HD 4890")) + if (strstr(gl_info->gl_renderer, "HD 4800") || /* Radeon RV7xx HD48xx generic renderer string */ + strstr(gl_info->gl_renderer, "HD 4830") || /* Radeon RV770 */ + strstr(gl_info->gl_renderer, "HD 4850") || /* Radeon RV770 */ + strstr(gl_info->gl_renderer, "HD 4870") || /* Radeon RV770 */ + strstr(gl_info->gl_renderer, "HD 4890")) /* Radeon RV790 */ { gl_info->gl_card = CARD_ATI_RADEON_HD4800; - vidmem = 512; /* HD4800 cards use 512-1024MB */ + vidmem = 512; /* note: HD4890 cards use 1024MB */ + } + /* Radeon R740 HD4700 - midend */ + else if (strstr(gl_info->gl_renderer, "HD 4700") || /* Radeon RV770 */ + strstr(gl_info->gl_renderer, "HD 4770")) /* Radeon RV740 */ + { + gl_info->gl_card = CARD_ATI_RADEON_HD4700; + vidmem = 512; + } + /* Radeon R730 HD4600 - midend */ + else if (strstr(gl_info->gl_renderer, "HD 4600") || /* Radeon RV730 */ + strstr(gl_info->gl_renderer, "HD 4650") || /* Radeon RV730 */ + strstr(gl_info->gl_renderer, "HD 4670")) /* Radeon RV730 */ + { + gl_info->gl_card = CARD_ATI_RADEON_HD4600; + vidmem = 512; + } + /* Radeon R710 HD4500/HD4350 - lowend */ + else if (strstr(gl_info->gl_renderer, "HD 4350") || /* Radeon RV710 */ + strstr(gl_info->gl_renderer, "HD 4550")) /* Radeon RV710 */ + { + gl_info->gl_card = CARD_ATI_RADEON_HD4350; + vidmem = 256; } /* Radeon R6xx HD2900/HD3800 - highend */ else if (strstr(gl_info->gl_renderer, "HD 2900") || @@ -4023,6 +4050,9 @@ static const struct driver_version_information driver_version_table[] = { {VENDOR_ATI, CARD_ATI_RADEON_HD2300, "ATI Mobility Radeon HD 2300", 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD4350, "ATI Radeon HD 4350", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD4600, "ATI Radeon HD 4600 Series", 6, 14, 10, 6764 }, + {VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", 6, 14, 10, 6764 }, {VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", 6, 14, 10, 6764 }, /* TODO: Add information about legacy ATI hardware, Intel and other cards */ diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index aa59893..9f508a8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3326,7 +3326,18 @@ typedef enum _GL_Cards { CARD_ATI_RADEON_HD2600 = 0x9581, CARD_ATI_RADEON_HD2900 = 0x9400, CARD_ATI_RADEON_HD3200 = 0x9620, - CARD_ATI_RADEON_HD4800 = 0x944c, + CARD_ATI_RADEON_HD4350 = 0x954f, + CARD_ATI_RADEON_HD4550 = 0x9540, + CARD_ATI_RADEON_HD4600 = 0x9495, + CARD_ATI_RADEON_HD4650 = 0x9498, + CARD_ATI_RADEON_HD4670 = 0x9490, + CARD_ATI_RADEON_HD4700 = 0x944e, + CARD_ATI_RADEON_HD4770 = 0x94b3, + CARD_ATI_RADEON_HD4800 = 0x944c, /* picked one value between 9440,944c,9442,9460 */ + CARD_ATI_RADEON_HD4830 = 0x944c, + CARD_ATI_RADEON_HD4850 = 0x9442, + CARD_ATI_RADEON_HD4870 = 0x9440, + CARD_ATI_RADEON_HD4890 = 0x9460, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Austin English : wine.inf: Fix incorrect entry for hh.exe.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 51922e3fa7b7bfafb1242bfb4eac08479a93c390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51922e3fa7b7bfafb1242bfb4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 16 18:43:59 2009 -0500 wine.inf: Fix incorrect entry for hh.exe. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8fe4161..2ec05a5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -122,7 +122,7 @@ HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file,,2,"Compiled HTML Help File" -HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" +HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*"

1 0

Austin English : wine.inf: Add placeholder exe for wordpad.exe.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2deeb1c736fecf3a223e9fb3c9203957f82f52ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2deeb1c736fecf3a223e9fb3c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 16 18:52:47 2009 -0500 wine.inf: Add placeholder exe for wordpad.exe. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 2ec05a5..4d2999e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winspool.drv 11,,wintab32.dll 11,,winver.exe +11,,wordpad.exe 11,,ws2_32.dll 11,,wsock32.dll 12,,mountmgr.sys

1 0

Alexandre Julliard : winebuild: Implement a --large-address-aware flag.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: fec5f5cf1fc1e75b0280c6a6b5dc3f615fff0613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec5f5cf1fc1e75b0280c6a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 16:10:35 2009 +0200 winebuild: Implement a --large-address-aware flag. --- tools/winebuild/main.c | 80 ++++++++++++++++++++----------------- tools/winebuild/winebuild.man.in | 4 ++ 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 1074636..9419231 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -207,44 +207,45 @@ static void exit_on_signal( int sig ) static const char usage_str[] = "Usage: winebuild [OPTIONS] [FILES]\n\n" "Options:\n" -" --as-cmd=AS Command to use for assembling (default: as)\n" -" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" -" -d, --delay-lib=LIB Import the specified library in delayed mode\n" -" -D SYM Ignored for C flags compatibility\n" -" -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" -" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" -" --external-symbols Allow linking to external symbols\n" -" -f FLAGS Compiler flags (only -fPIC is supported)\n" -" -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" -" -h, --help Display this help message\n" -" -H, --heap=SIZE Set the heap size for a Win16 dll\n" -" -i, --ignore=SYM[,SYM] Ignore specified symbols when resolving imports\n" -" -I DIR Ignored for C flags compatibility\n" -" -k, --kill-at Kill stdcall decorations in generated .def files\n" -" -K, FLAGS Compiler flags (only -KPIC is supported)\n" -" --ld-cmd=LD Command to use for linking (default: ld)\n" -" -l, --library=LIB Import the specified library\n" -" -L, --library-path=DIR Look for imports libraries in DIR\n" -" -m32, -m64 Force building 32-bit resp. 64-bit code\n" -" -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" -" --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" -" --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" -" -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" -" -o, --output=NAME Set the output file name (default: stdout)\n" -" -r, --res=RSRC.RES Load resources from RSRC.RES\n" -" --save-temps Do not delete the generated intermediate files\n" -" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" -" -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" -" -v, --verbose Display the programs invoked\n" -" --version Print the version and exit\n" -" -w, --warnings Turn on warnings\n" +" --as-cmd=AS Command to use for assembling (default: as)\n" +" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" -d, --delay-lib=LIB Import the specified library in delayed mode\n" +" -D SYM Ignored for C flags compatibility\n" +" -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" +" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" +" --external-symbols Allow linking to external symbols\n" +" -f FLAGS Compiler flags (only -fPIC is supported)\n" +" -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" +" -h, --help Display this help message\n" +" -H, --heap=SIZE Set the heap size for a Win16 dll\n" +" -i, --ignore=SYM[,SYM] Ignore specified symbols when resolving imports\n" +" -I DIR Ignored for C flags compatibility\n" +" -k, --kill-at Kill stdcall decorations in generated .def files\n" +" -K, FLAGS Compiler flags (only -KPIC is supported)\n" +" --large-address-aware Support an address space larger than 2Gb\n" +" --ld-cmd=LD Command to use for linking (default: ld)\n" +" -l, --library=LIB Import the specified library\n" +" -L, --library-path=DIR Look for imports libraries in DIR\n" +" -m32, -m64 Force building 32-bit resp. 64-bit code\n" +" -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" +" --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" +" --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" +" -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" +" -o, --output=NAME Set the output file name (default: stdout)\n" +" -r, --res=RSRC.RES Load resources from RSRC.RES\n" +" --save-temps Do not delete the generated intermediate files\n" +" --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" +" -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" +" -v, --verbose Display the programs invoked\n" +" --version Print the version and exit\n" +" -w, --warnings Turn on warnings\n" "\nMode options:\n" -" --dll Build a .c file from a .spec or .def file\n" -" --def Build a .def file from a .spec file\n" -" --exe Build a .c file for an executable\n" -" --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" -" --resources Build a .o file for the resource files\n\n" +" --dll Build a .c file from a .spec or .def file\n" +" --def Build a .def file from a .spec file\n" +" --exe Build a .c file for an executable\n" +" --relay16 Build the 16-bit relay assembly routines\n" +" --relay32 Build the 32-bit relay assembly routines\n\n" +" --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -254,6 +255,7 @@ enum long_options_values LONG_OPT_EXE, LONG_OPT_ASCMD, LONG_OPT_EXTERNAL_SYMS, + LONG_OPT_LARGE_ADDRESS_AWARE, LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, @@ -274,6 +276,7 @@ static const struct option long_options[] = { "exe", 0, 0, LONG_OPT_EXE }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, + { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, @@ -451,6 +454,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_EXTERNAL_SYMS: link_ext_symbols = 1; break; + case LONG_OPT_LARGE_ADDRESS_AWARE: + spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; + break; case LONG_OPT_LDCMD: ld_command = xstrdup( optarg ); break; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 855bf4a..74728ce 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -137,6 +137,10 @@ generated .def file. Only meaningful in \fB--def\fR mode. .BI \-K\ flags Ignored for compatibility with the C compiler. .TP +.BI \--large-address-aware +Set a flag in the executable to notify the loader that this +application supports address spaces larger than 2 gigabytes. +.TP .BI \--ld-cmd= ld-command Specify the command to use to link the object files; the default is \fBld\fR.

1 0