wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Henri Verbeet : wined3d: Compare num_params against 1 in shader_glsl_map2gl ().
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: fb6547a3e121fe0b0511526247d6ebb538ffc19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6547a3e121fe0b051152624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:41:00 2009 +0200 wined3d: Compare num_params against 1 in shader_glsl_map2gl(). num_params includes the destination parameter, while we're only interested in source parameters. This doesn't cause problems for any of the instrctions currently handled by shader_glsl_map2gl() though, since they all happen to have at least 1 source parameter. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7b7a7b3..9953764 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1740,7 +1740,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(", instruction); - if (curOpcode->num_params > 0) { + if (curOpcode->num_params > 1) + { shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param); shader_addline(buffer, "%s", src_param.param_str); for (i = 2; i < curOpcode->num_params; ++i) {

1 0

Henri Verbeet : wined3d: Remove some code that doesn' t make a whole lot of sense.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: c697bdc3a15e8dad13c4cd58d52ce6891bc3e999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c697bdc3a15e8dad13c4cd58d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 10:40:59 2009 +0200 wined3d: Remove some code that doesn't make a whole lot of sense. The "instr" parameter to shader_glsl_gen_modifier() is actually a source parameter, so comparing against WINED3DSIO_TEXKILL is just silly. --- dlls/wined3d/glsl_shader.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae9aa7f..7b7a7b3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -941,9 +941,6 @@ static void shader_glsl_gen_modifier ( char *out_str) { out_str[0] = 0; - - if (instr == WINED3DSIO_TEXKILL) - return; switch (instr & WINED3DSP_SRCMOD_MASK) { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */

1 0

Nikolay Sivov : comctl32: Enable selection overwriting in IP Address control.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 4902dd9801a2e6068dec3b6aee44ceb0564a7135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4902dd9801a2e6068dec3b6ae… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 1 17:43:08 2009 -0400 comctl32: Enable selection overwriting in IP Address control. --- dlls/comctl32/ipaddress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index e5631a2..a90f6e9 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -508,7 +508,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return return_val; } else if (len == 3 && startsel==endsel && endsel==len) IPADDRESS_GotoNextField (infoPtr, index, POS_SELALL); - else if (len < 3) break; + else if (len < 3 || startsel != endsel) break; } else if(c == '.' || c == ' ') { if(len && startsel==endsel && startsel != 0) { IPADDRESS_GotoNextField(infoPtr, index, POS_SELALL);

1 0

Nikolay Sivov : user32: Implemented GetWindowRgnBox with some tests.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: a2b7aafdaea0fde68cfdee6650eff44a28b3b5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b7aafdaea0fde68cfdee665… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 03:53:00 2009 -0400 user32: Implemented GetWindowRgnBox with some tests. --- dlls/user32/tests/win.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 20 ++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 89eefcd..4aa3674 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -51,6 +51,7 @@ static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -5529,6 +5530,48 @@ static void test_handles( HWND full_hwnd ) #endif } +static void test_winregion(void) +{ + HWND hwnd; + RECT r; + int ret; + HRGN hrgn; + + if (!pGetWindowRgnBox) + { + win_skip("GetWindowRgnBox not supported\n"); + return; + } + + hwnd = CreateWindowExA(0, "static", NULL, WS_VISIBLE, 10, 10, 10, 10, NULL, 0, 0, NULL); + /* NULL prect */ + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + hrgn = CreateRectRgn(2, 3, 10, 15); + ok( hrgn != NULL, "Region creation failed\n"); + if (hrgn) + { + SetWindowRgn(hwnd, hrgn, FALSE); + + SetLastError(0xdeadbeef); + ret = pGetWindowRgnBox(hwnd, NULL); + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); + + r.left = r.top = r.right = r.bottom = 0; + ret = pGetWindowRgnBox(hwnd, &r); + ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); + ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, + "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, + r.right, r.bottom); + DeleteObject(hrgn); + } + DestroyWindow(hwnd); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -5539,6 +5582,7 @@ START_TEST(win) pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); + pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); if (!RegisterWindowClasses()) assert(0); @@ -5608,6 +5652,7 @@ START_TEST(win) test_SetForegroundWindow(hwndMain); test_shell_window(); test_handles( hwndMain ); + test_winregion(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8d55717..8efdf0a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -385,7 +385,7 @@ @ stdcall GetWindowPlacement(long ptr) @ stdcall GetWindowRect(long ptr) @ stdcall GetWindowRgn(long long) -# @ stub GetWindowRgnBox +@ stdcall GetWindowRgnBox(long ptr) @ stdcall GetWindowTextA(long ptr long) @ stdcall GetWindowTextLengthA(long) @ stdcall GetWindowTextLengthW(long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 42904d9..7f18da5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -155,6 +155,26 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) return nRet; } +/*********************************************************************** + * GetWindowRgnBox (USER32.@) + */ +int WINAPI GetWindowRgnBox( HWND hwnd, LPRECT prect ) +{ + int ret = ERROR; + HRGN hrgn; + + if (!prect) + return ERROR; + + if ((hrgn = CreateRectRgn(0, 0, 0, 0))) + { + if ((ret = GetWindowRgn( hwnd, hrgn )) != ERROR ) + ret = GetRgnBox( hrgn, prect ); + DeleteObject(hrgn); + } + + return ret; +} /*********************************************************************** * SetWindowRgn (USER32.@)

1 0

Jacek Caban : urlmon: Register CLSID_DeCompMimeFilter.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: eb32e9ec1a1da37a81c99ca162251ade3408abf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32e9ec1a1da37a81c99ca16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 00:16:31 2009 +0200 urlmon: Register CLSID_DeCompMimeFilter. --- dlls/urlmon/regsvr.c | 23 ++++++++++++----------- dlls/urlmon/urlmon.inf | 21 ++++++++++++++++++--- include/urlmon.idl | 1 + 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 2728ced..9561a23 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -513,10 +513,10 @@ static struct regsvr_interface const interface_list[] = { #define INF_SET_CLSID(clsid) \ do \ { \ - static CHAR name[] = "CLSID_" #clsid; \ + static CHAR name[] = #clsid; \ \ pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ + clsids[i++] = &clsid; \ } while (0) static HRESULT register_inf(BOOL doregister) @@ -525,19 +525,20 @@ static HRESULT register_inf(BOOL doregister) HMODULE hAdvpack; HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; - STRENTRYA pse[7]; - static CLSID const *clsids[34]; + STRENTRYA pse[8]; + static CLSID const *clsids[8]; unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - INF_SET_CLSID(CdlProtocol); - INF_SET_CLSID(FileProtocol); - INF_SET_CLSID(FtpProtocol); - INF_SET_CLSID(GopherProtocol); - INF_SET_CLSID(HttpProtocol); - INF_SET_CLSID(HttpSProtocol); - INF_SET_CLSID(MkProtocol); + INF_SET_CLSID(CLSID_CdlProtocol); + INF_SET_CLSID(CLSID_FileProtocol); + INF_SET_CLSID(CLSID_FtpProtocol); + INF_SET_CLSID(CLSID_GopherProtocol); + INF_SET_CLSID(CLSID_HttpProtocol); + INF_SET_CLSID(CLSID_HttpSProtocol); + INF_SET_CLSID(CLSID_MkProtocol); + INF_SET_CLSID(CLSID_DeCompMimeFilter); for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { pse[i].pszValue = heap_alloc(39); diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index efdf4ef..63d88c4 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -3,11 +3,19 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg [UnregisterDll] -DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg + + +[Classes.Reg] + +;; CLSID_DeCompMimeFilter +HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment" [Protocols.Reg] @@ -26,7 +34,12 @@ HKCR,"PROTOCOLS\Handler\http","CLSID",,"%CLSID_HttpProtocol%" HKCR,"PROTOCOLS\Handler\https",,,"https: Asynchronous Pluggable Protocol Handler" HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%" HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler" -HKCR,"PROTOCOLS\Handler\mk","CLSID",,"%CLSID_MkProtocol%" +HKCR,"PROTOCOLS\Filter\deflate",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\deflate","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\gzip",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\gzip","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\lzdhtml",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%" [ZoneMap.Reg] @@ -448,6 +461,8 @@ HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000 [Strings] +MODULE="urlmon.dll" + PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap" PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults" PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains" diff --git a/include/urlmon.idl b/include/urlmon.idl index 1244ca4..93bdd0f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1521,6 +1521,7 @@ cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") +cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);") cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);") cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")

1 0

Vincent Povirk : gdiplus: GdipDrawString: Handle either a width or height of 0 sanely.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 0879b767aef1d295083dcb448fcc63ef2c00364b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b767aef1d295083dcb448… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 1 14:08:12 2009 -0500 gdiplus: GdipDrawString: Handle either a width or height of 0 sanely. Based on Aric's recent patch. --- dlls/gdiplus/graphics.c | 27 ++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5d1cbd6..2a98ee5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2011,20 +2011,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ - rel_width = rel_height = 1.0; - nwidth = nheight = INT_MAX; + if (roundr(rect->Width) == 0) + { + rel_width = 1.0; + nwidth = INT_MAX; } - else{ + else + { rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) / rect->Width; + nwidth = roundr(rel_width * rect->Width); + } + + if (roundr(rect->Height) == 0) + { + rel_height = 1.0; + nheight = INT_MAX; + } + else + { rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) / rect->Height; - - nwidth = roundr(rel_width * rect->Width); nheight = roundr(rel_height * rect->Height); + } + + if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) + { + /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); SelectClipRgn(graphics->hdc, rgn); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8091a9a..7199151 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -935,6 +935,57 @@ static void test_textcontrast(void) ReleaseDC(0, hdc); } +static void test_GdipDrawString(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpFont *fnt = NULL; + RectF rect; + GpStringFormat *format; + GpBrush *brush; + LOGFONTA logfont; + HDC hdc = GetDC(0); + static const WCHAR string[] = {'T','e','s','t',0}; + + memset(&logfont,0,sizeof(logfont)); + strcpy(logfont.lfFaceName,"Arial"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateFontFromLogfontA(hdc, &logfont, &fnt); + if (status == FileNotFound) + { + skip("Arial not installed.\n"); + return; + } + expect(Ok, status); + + status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush); + expect(Ok, status); + + status = GdipCreateStringFormat(0,0,&format); + expect(Ok, status); + + rect.X = 0; + rect.Y = 0; + rect.Width = 0; + rect.Height = 12; + + status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush(brush); + GdipDeleteFont(fnt); + GdipDeleteStringFormat(format); + + ReleaseDC(0, hdc); +} + + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -954,6 +1005,7 @@ START_TEST(graphics) test_GdipDrawArcI(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipDrawString(); test_Get_Release_DC(); test_transformpoints(); test_get_set_clip();

1 0

Rob Shearman : include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 9993b0a079903368224b3f889075bdc773cfae28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9993b0a079903368224b3f889… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Apr 1 17:13:38 2009 +0100 include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h. --- include/ws2tcpip.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 8084170..fc9f258 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -92,6 +92,14 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT #endif +#ifndef USE_WS_PREFIX +# define NI_MAXHOST 1025 +# define NI_MAXSERV 32 +#else +# define WS_NI_MAXHOST 1025 +# define WS_NI_MAXSERV 32 +#endif + /* Possible Windows flags for getnameinfo() */ #ifndef USE_WS_PREFIX # define NI_NOFQDN 0x01

1 0

Alexandre Julliard : configure: Disable all 16-bit code on Cygwin.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 391fce6e53eb93cee4fbd889802d457c86cd829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fce6e53eb93cee4fbd8898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:52 2009 +0200 configure: Disable all 16-bit code on Cygwin. --- configure | 4 +--- configure.ac | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 5468a78..3e4d8d6 100755 --- a/configure +++ b/configure @@ -3883,7 +3883,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[3456789]86*) @@ -7503,8 +7503,6 @@ fi LIBEXT="dll" fi IMPLIBEXT="a" - WIN16_FILES="" - WIN16_INSTALL="" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} diff --git a/configure.ac b/configure.ac index e3d4b63..e6d9688 100644 --- a/configure.ac +++ b/configure.ac @@ -121,7 +121,7 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; - *-mingw32*) + *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} ;; i[[3456789]]86*) @@ -522,9 +522,6 @@ case $host_os in LIBEXT="dll" fi IMPLIBEXT="a" - dnl We can't build 16-bit NE dlls - WIN16_FILES="" - WIN16_INSTALL="" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no}

1 0

Alexandre Julliard : kernel32: Set argv[0] to the full path of the binary when starting from Unix.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: fc87182d191a2b3daabf260d1ad4b12b157e3cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87182d191a2b3daabf260d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:32 2009 +0200 kernel32: Set argv[0] to the full path of the binary when starting from Unix. --- dlls/kernel32/process.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 286f0ab..624d4de 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -599,6 +599,30 @@ static void set_library_wargv( char **argv ) /*********************************************************************** + * update_library_argv0 + * + * Update the argv[0] global variable with the binary we have found. + */ +static void update_library_argv0( const WCHAR *argv0 ) +{ + DWORD len = strlenW( argv0 ); + + if (len > strlenW( __wine_main_wargv[0] )) + { + __wine_main_wargv[0] = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + } + strcpyW( __wine_main_wargv[0], argv0 ); + + len = WideCharToMultiByte( CP_ACP, 0, argv0, -1, NULL, 0, NULL, NULL ); + if (len > strlen( __wine_main_argv[0] ) + 1) + { + __wine_main_argv[0] = RtlAllocateHeap( GetProcessHeap(), 0, len ); + } + WideCharToMultiByte( CP_ACP, 0, argv0, -1, __wine_main_argv[0], len, NULL, NULL ); +} + + +/*********************************************************************** * build_command_line * * Build the command line of a process from the argv array. @@ -1024,6 +1048,7 @@ void CDECL __wine_kernel_init(void) MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); ExitProcess( GetLastError() ); } + update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; boot_event = start_wineboot(); }

1 0

Alexandre Julliard : kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 7b7f35aee566021f7ec276fec15ee57262780b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7f35aee566021f7ec276fec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:00:33 2009 +0200 kernel32: Use __wine_main_environ by default, environ is broken on FreeBSD too. --- dlls/kernel32/process.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0dd7f67..286f0ab 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -58,9 +58,9 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ extern char **__wine_get_main_environment(void); -#define environ __wine_get_main_environment() #else -extern char **environ; +extern char **__wine_main_environ; +static char **__wine_get_main_environment(void) { return __wine_main_environ; } #endif typedef struct @@ -280,9 +280,10 @@ static BOOL build_initial_environment(void) char **e; WCHAR *p, *endptr; void *ptr; + char **env = __wine_get_main_environment(); /* Compute the total size of the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { if (is_special_env_var( *e )) continue; size += MultiByteToWideChar( CP_UNIXCP, 0, *e, -1, NULL, 0 ); @@ -299,7 +300,7 @@ static BOOL build_initial_environment(void) endptr = p + size / sizeof(WCHAR); /* And fill it with the Unix environment */ - for (e = environ; *e; e++) + for (e = env; *e; e++) { char *str = *e;

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 April 2009