January 2008 - Wine-commits

Hans Leidekker : msvcrt: Implement _wsystem and forward system to it. Respect COMSPEC environment variable.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: 3debf28215fcf5d76e034dfc17354391512500a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3debf28215fcf5d76e034dfc1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 7 14:22:23 2008 +0100 msvcrt: Implement _wsystem and forward system to it. Respect COMSPEC environment variable. --- dlls/msvcrt/data.c | 4 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/process.c | 63 +++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index fa53b85..578130b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -229,7 +229,7 @@ char*** CDECL __p___initenv(void) { return &MSVCRT___initenv; } MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } /* INTERNAL: Create a wide string from an ascii string */ -static MSVCRT_wchar_t *wstrdupa(const char *str) +MSVCRT_wchar_t *msvcrt_wstrdupa(const char *str) { const size_t len = strlen(str) + 1 ; MSVCRT_wchar_t *wstr = MSVCRT_malloc(len* sizeof (MSVCRT_wchar_t)); @@ -249,7 +249,7 @@ void msvcrt_init_args(void) DWORD version; MSVCRT__acmdln = _strdup( GetCommandLineA() ); - MSVCRT__wcmdln = wstrdupa(MSVCRT__acmdln); + MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln); MSVCRT___argc = __wine_main_argc; MSVCRT___argv = __wine_main_argv; MSVCRT___wargv = __wine_main_wargv; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 5d4540f..59c42cb 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -125,6 +125,8 @@ extern MSVCRT_wchar_t **_wenviron; extern char ** msvcrt_SnapshotOfEnvironmentA(char **); extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); +MSVCRT_wchar_t *msvcrt_wstrdupa(const char *); + /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fffe883..b0fa5e9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -570,7 +570,7 @@ @ cdecl _wstat64(wstr ptr) MSVCRT__wstat64 @ cdecl _wstrdate(ptr) @ cdecl _wstrtime(ptr) -@ stub _wsystem #(wstr) +@ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) @ stub _wtmpnam #(ptr) @ cdecl _wtoi(wstr) ntdll._wtoi diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 14f8e9a..46481ef 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -269,6 +269,22 @@ static char* msvcrt_valisttos(const char* arg0, va_list alist, char delim) return ret; } +/* INTERNAL: retrieve COMSPEC environment variable */ +static MSVCRT_wchar_t *msvcrt_get_comspec(void) +{ + static const MSVCRT_wchar_t cmd[] = {'c','m','d',0}; + static const MSVCRT_wchar_t comspec[] = {'C','O','M','S','P','E','C',0}; + MSVCRT_wchar_t *ret; + unsigned int len; + + if (!(len = GetEnvironmentVariableW(comspec, NULL, 0))) len = sizeof(cmd)/sizeof(MSVCRT_wchar_t); + if ((ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) + { + if (!GetEnvironmentVariableW(comspec, ret, len)) strcpyW(ret, cmd); + } + return ret; +} + /********************************************************************* * _cwait (MSVCRT.@) */ @@ -822,19 +838,50 @@ int CDECL MSVCRT__pclose(MSVCRT_FILE* file) } /********************************************************************* + * _wsystem (MSVCRT.@) + * + * Unicode version of system + */ +int CDECL _wsystem(const MSVCRT_wchar_t* cmd) +{ + int res; + MSVCRT_wchar_t *comspec, *fullcmd; + unsigned int len; + static const MSVCRT_wchar_t flag[] = {' ','/','c',' ',0}; + + if (!(comspec = msvcrt_get_comspec())) return -1; + len = strlenW(comspec) + strlenW(flag) + strlenW(cmd) + 1; + + if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) + { + HeapFree(GetProcessHeap(), 0, comspec); + return -1; + } + strcpyW(fullcmd, comspec); + strcatW(fullcmd, flag); + strcatW(fullcmd, cmd); + + res = msvcrt_spawn_wide(MSVCRT__P_WAIT, comspec, fullcmd, NULL); + + HeapFree(GetProcessHeap(), 0, comspec); + HeapFree(GetProcessHeap(), 0, fullcmd); + return res; +} + +/********************************************************************* * system (MSVCRT.@) */ int CDECL MSVCRT_system(const char* cmd) { - char* cmdcopy; - int res; + int res = -1; + MSVCRT_wchar_t *cmdW; - /* Make a writable copy for CreateProcess */ - cmdcopy=_strdup(cmd); - /* FIXME: should probably launch cmd interpreter in COMSPEC */ - res=msvcrt_spawn(MSVCRT__P_WAIT, NULL, cmdcopy, NULL); - MSVCRT_free(cmdcopy); - return res; + if ((cmdW = msvcrt_wstrdupa(cmd))) + { + res = _wsystem(cmdW); + HeapFree(GetProcessHeap(), 0, cmdW); + } + return res; } /*********************************************************************

1 0

Alexander Dorofeyev : ddraw/tests: Add test for rendering vertices with zero rhw.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: d14ef91c92dcc60ad482465e0043441ec629f4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14ef91c92dcc60ad482465e0… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 6 20:09:08 2008 -0800 ddraw/tests: Add test for rendering vertices with zero rhw. --- dlls/ddraw/tests/visual.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index c9a3147..ce6ce9b 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -761,6 +761,46 @@ static void alpha_test(IDirect3DDevice7 *device) if(backbuffer) IDirectDrawSurface7_Release(backbuffer); } +static void rhw_zero_test(IDirect3DDevice7 *device) +{ +/* Test if it will render a quad correctly when vertex rhw = 0 */ + HRESULT hr; + DWORD color; + + struct { + float x, y, z; + float rhw; + DWORD diffuse; + } quad1[] = + { + {0, 100, 0, 0, 0xffffffff}, + {0, 0, 0, 0, 0xffffffff}, + {100, 100, 0, 0, 0xffffffff}, + {100, 0, 0, 0, 0xffffffff}, + }; + + /* Clear to black */ + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0, 0); + ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_BeginScene failed with %08x\n", hr); + + if (SUCCEEDED(hr)) { + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad1, 4, 0); + ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed, hr = %08x\n", hr); + } + + color = getPixelColor(device, 5, 5); + ok(color == 0xffffff, "Got color %08x, expected 00ffffff\n", color); + + color = getPixelColor(device, 105, 105); + ok(color == 0, "Got color %08x, expected 00000000\n", color); +} + START_TEST(visual) { HRESULT hr; @@ -806,6 +846,7 @@ START_TEST(visual) fog_test(Direct3DDevice); offscreen_test(Direct3DDevice); alpha_test(Direct3DDevice); + rhw_zero_test(Direct3DDevice); cleanup: releaseObjects();

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgW: Set paper size in printer dialog.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: a2e9b4bb0c07f3276bc68a195ebcf3fe109e9d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e9b4bb0c07f3276bc68a195… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 7 22:57:37 2008 +0100 comdlg32: PageSetupDlgW: Set paper size in printer dialog. --- dlls/comdlg32/printdlg.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 8439c31..95f4dac 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2701,9 +2701,10 @@ static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda) } } -static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda) +static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda, HWND hDlg) { DEVMODEW* dm; + DWORD sel; dm = GlobalLock(pda->pdlg.hDevMode); @@ -2715,6 +2716,11 @@ static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda) else dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); + + if(sel != CB_ERR) + dm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, sel, 0); + GlobalUnlock(pda->pdlg.hDevMode); } @@ -3002,7 +3008,7 @@ PRINTDLG_PS_WMCommandW( case psh3: { pda->pdlg.Flags = 0; pda->pdlg.hwndOwner = hDlg; - PRINTDLG_PS_UpdatePrintDlgW(pda); + PRINTDLG_PS_UpdatePrintDlgW(pda, hDlg); if (PrintDlgW(&(pda->pdlg))) PRINTDLG_PS_ChangePrinterW(hDlg,pda); return TRUE;

1 0

Andrew Talbot : gdiplus: Remove unneeded casts.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: 507daae427b408cf335a79a86b22e12d6fb643dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=507daae427b408cf335a79a86… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 7 22:13:19 2008 +0000 gdiplus: Remove unneeded casts. --- dlls/gdiplus/gdiplus.c | 7 +++---- dlls/gdiplus/graphicspath.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index e8499c6..fb38497 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -235,10 +235,9 @@ COLORREF ARGB2COLORREF(ARGB color) ARGB: aarrggbb FIXME:doesn't handle alpha channel */ - return (COLORREF) - ((color & 0x0000ff) << 16) + - (color & 0x00ff00) + - ((color & 0xff0000) >> 16); + return ((color & 0x0000ff) << 16) + + (color & 0x00ff00) + + ((color & 0xff0000) >> 16); } /* Like atan2, but puts angle in correct quadrant if dx is 0. */ diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ed71400..2a2d96c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -570,6 +570,6 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) if(path->pathdata.Count == 0) return Ok; - return GdipTransformMatrixPoints(matrix, (GpPointF*) path->pathdata.Points, + return GdipTransformMatrixPoints(matrix, path->pathdata.Points, path->pathdata.Count); }

1 0

Andrew Talbot : itss: Remove unneeded casts.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: f4e67137a5a65c8790ab6c3dd4fb35fab7d7dae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e67137a5a65c8790ab6c3dd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 8 07:29:19 2008 +0000 itss: Remove unneeded casts. --- dlls/itss/chm_lib.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index c41c423..6a9626f 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -739,7 +739,7 @@ struct chmFile *chm_openW(const WCHAR *filename) sremain = _CHM_ITSP_V1_LEN; sbufpos = sbuffer; if (_chm_fetch_bytes(newHandle, sbuffer, - (UInt64)itsfHeader.dir_offset, sremain) != sremain || + itsfHeader.dir_offset, sremain) != sremain || !_unmarshal_itsp_header(&sbufpos, &sremain, &itspHeader)) { chm_close(newHandle); @@ -1042,7 +1042,7 @@ int chm_resolve_object(struct chmFile *h, /* try to fetch the index page */ if (_chm_fetch_bytes(h, page_buf, - (UInt64)h->dir_offset + (UInt64)curPage*h->block_len, + h->dir_offset + (UInt64)curPage*h->block_len, h->block_len) != h->block_len) { HeapFree(GetProcessHeap(), 0, page_buf); @@ -1105,10 +1105,10 @@ static int _chm_get_cmpblock_bounds(struct chmFile *h, dummy = buffer; remain = 8; if (_chm_fetch_bytes(h, buffer, - (UInt64)h->data_offset - + (UInt64)h->rt_unit.start - + (UInt64)h->reset_table.table_offset - + (UInt64)block*8, + h->data_offset + + h->rt_unit.start + + h->reset_table.table_offset + + block*8, remain) != remain || !_unmarshal_uint64(&dummy, &remain, start)) return 0; @@ -1117,10 +1117,10 @@ static int _chm_get_cmpblock_bounds(struct chmFile *h, dummy = buffer; remain = 8; if (_chm_fetch_bytes(h, buffer, - (UInt64)h->data_offset - + (UInt64)h->rt_unit.start - + (UInt64)h->reset_table.table_offset - + (UInt64)block*8 + 8, + h->data_offset + + h->rt_unit.start + + h->reset_table.table_offset + + block*8 + 8, remain) != remain || !_unmarshal_int64(&dummy, &remain, len)) return 0; @@ -1133,10 +1133,10 @@ static int _chm_get_cmpblock_bounds(struct chmFile *h, dummy = buffer; remain = 8; if (_chm_fetch_bytes(h, buffer, - (UInt64)h->data_offset - + (UInt64)h->rt_unit.start - + (UInt64)h->reset_table.table_offset - + (UInt64)block*8, + h->data_offset + + h->rt_unit.start + + h->reset_table.table_offset + + block*8, remain) != remain || !_unmarshal_uint64(&dummy, &remain, start)) return 0; @@ -1339,7 +1339,7 @@ LONGINT64 chm_retrieve_object(struct chmFile *h, /* read data */ return _chm_fetch_bytes(h, buf, - (UInt64)h->data_offset + (UInt64)ui->start + (UInt64)addr, + h->data_offset + ui->start + addr, len); } @@ -1382,7 +1382,7 @@ int chm_enumerate(struct chmFile *h, Int32 curPage; /* buffer to hold whatever page we're looking at */ - UChar *page_buf = HeapAlloc(GetProcessHeap(), 0, (unsigned int)h->block_len); + UChar *page_buf = HeapAlloc(GetProcessHeap(), 0, h->block_len); struct chmPmglHeader header; UChar *end; UChar *cur; @@ -1403,7 +1403,7 @@ int chm_enumerate(struct chmFile *h, /* try to fetch the index page */ if (_chm_fetch_bytes(h, page_buf, - (UInt64)h->dir_offset + (UInt64)curPage*h->block_len, + h->dir_offset + (UInt64)curPage*h->block_len, h->block_len) != h->block_len) { HeapFree(GetProcessHeap(), 0, page_buf); @@ -1495,7 +1495,7 @@ int chm_enumerate_dir(struct chmFile *h, Int32 curPage; /* buffer to hold whatever page we're looking at */ - UChar *page_buf = HeapAlloc(GetProcessHeap(), 0, (unsigned int)h->block_len); + UChar *page_buf = HeapAlloc(GetProcessHeap(), 0, h->block_len); struct chmPmglHeader header; UChar *end; UChar *cur; @@ -1540,7 +1540,7 @@ int chm_enumerate_dir(struct chmFile *h, /* try to fetch the index page */ if (_chm_fetch_bytes(h, page_buf, - (UInt64)h->dir_offset + (UInt64)curPage*h->block_len, + h->dir_offset + (UInt64)curPage*h->block_len, h->block_len) != h->block_len) { HeapFree(GetProcessHeap(), 0, page_buf);

1 0

Jacek Caban : shdocvw: Fixed ref count leak.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: cf422ea53e060de79e1db79f6c06d072e309982d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf422ea53e060de79e1db79f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 8 00:52:38 2008 +0100 shdocvw: Fixed ref count leak. --- dlls/shdocvw/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index c8bfe2e..71c3ea5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -283,12 +283,14 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * if(FAILED(hres)) FIXME("SetClientSite failed: %08x\n", hres); - /* FIXME: Call SetAdvise */ - /* FIXME: Call Invoke(DISPID_READYSTATE) */ + IOleObject_Release(oleobj); }else { FIXME("Could not get IOleObject iface: %08x\n", hres); } + /* FIXME: Call SetAdvise */ + /* FIXME: Call Invoke(DISPID_READYSTATE) */ + PostMessageW(This->doc_host->hwnd, WB_WM_NAVIGATE2, 0, 0); return S_OK;

1 0

Jacek Caban : shdocvw: Set IE's IVer and Build registries.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: f85d896307ce3425535f83d89aa501c659ba5f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85d896307ce3425535f83d89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 8 00:52:57 2008 +0100 shdocvw: Set IE's IVer and Build registries. --- dlls/shdocvw/shdocvw.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 7fab0ac..7ed20d8 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -130,6 +130,8 @@ HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",,"http://www.goog [IE.Reg] +HKLM,"Software\Microsoft\Internet Explorer","Build",,"62900.2180" +HKLM,"Software\Microsoft\Internet Explorer","IVer",,"103" HKLM,"Software\Microsoft\Internet Explorer","Version",,"6.0.2900.2180"

1 0

Alexander Nicolaysen Sørnes : wordpad: Draw margin lines in print preview.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: fb5d0bfee115ad7e18af1f45d8f26e214f992554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5d0bfee115ad7e18af1f45d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jan 8 00:58:54 2008 +0100 wordpad: Draw margin lines in print preview. --- programs/wordpad/print.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 5888999..4f8f2e2 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -535,11 +535,31 @@ LRESULT print_preview(HWND hMainWnd) if(window.right != preview.window.right || window.bottom != preview.window.bottom) { - DeleteDC(preview.hdcSized), - preview.hdcSized = CreateCompatibleDC(hdc); - SelectObject(preview.hdcSized, hBitmapScaled); - - StretchBlt(preview.hdcSized, 0, 0, bmNewWidth, bmNewHeight, preview.hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + HPEN hPen; + int TopMargin = (int)((float)twips_to_pixels(fr.rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int BottomMargin = (int)((float)twips_to_pixels(fr.rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int LeftMargin = (int)((float)twips_to_pixels(fr.rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + int RightMargin = (int)((float)twips_to_pixels(fr.rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + + DeleteDC(preview.hdcSized); + preview.hdcSized = CreateCompatibleDC(hdc); + SelectObject(preview.hdcSized, hBitmapScaled); + + StretchBlt(preview.hdcSized, 0, 0, bmNewWidth, bmNewHeight, preview.hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + + /* Draw margin lines */ + hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); + SelectObject(preview.hdcSized, hPen); + + MoveToEx(preview.hdcSized, 0, TopMargin, NULL); + LineTo(preview.hdcSized, bmNewWidth, TopMargin); + MoveToEx(preview.hdcSized, 0, BottomMargin, NULL); + LineTo(preview.hdcSized, bmNewWidth, BottomMargin); + + MoveToEx(preview.hdcSized, LeftMargin, 0, NULL); + LineTo(preview.hdcSized, LeftMargin, bmNewHeight); + MoveToEx(preview.hdcSized, RightMargin, 0, NULL); + LineTo(preview.hdcSized, RightMargin, bmNewHeight); } window.top = barheight;

1 0

Dmitry Timoshkov : msvcrt: Rename _environ to avoid a conflict on Solaris.
by Alexandre Julliard 08 Jan '08

08 Jan '08

Module: wine Branch: master Commit: a88f03e22f0ff2700824b5fb81f7ef498100b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88f03e22f0ff2700824b5fb8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 8 12:20:30 2008 +0800 msvcrt: Rename _environ to avoid a conflict on Solaris. --- dlls/msvcrt/data.c | 10 +++++----- dlls/msvcrt/environ.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 994e19b..fa53b85 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -50,7 +50,7 @@ char **MSVCRT___argv; MSVCRT_wchar_t **MSVCRT___wargv; char *MSVCRT__acmdln; MSVCRT_wchar_t *MSVCRT__wcmdln; -char **_environ = 0; +char **MSVCRT__environ = 0; MSVCRT_wchar_t **_wenviron = 0; char **MSVCRT___initenv = 0; MSVCRT_wchar_t **MSVCRT___winitenv = 0; @@ -203,9 +203,9 @@ MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; } */ char*** CDECL __p__environ(void) { - if (!_environ) - _environ = msvcrt_SnapshotOfEnvironmentA(NULL); - return &_environ; + if (!MSVCRT__environ) + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(NULL); + return &MSVCRT__environ; } /********************************************************************* @@ -302,7 +302,7 @@ void msvcrt_free_args(void) /* FIXME: more things to free */ HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); - HeapFree(GetProcessHeap(), 0, _environ); + HeapFree(GetProcessHeap(), 0, MSVCRT__environ); HeapFree(GetProcessHeap(), 0, _wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 886d19f..44f201a 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -105,8 +105,8 @@ int CDECL _putenv(const char *str) if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; /* Update the __p__environ array only when already initialized */ - if (_environ) - _environ = msvcrt_SnapshotOfEnvironmentA(_environ); + if (MSVCRT__environ) + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); if (_wenviron) _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); @@ -151,8 +151,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str) if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; /* Update the __p__environ array only when already initialized */ - if (_environ) - _environ = msvcrt_SnapshotOfEnvironmentA(_environ); + if (MSVCRT__environ) + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); if (_wenviron) _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 204fe9c..5d4540f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -119,7 +119,7 @@ void msvcrt_set_errno(int); void _purecall(void); void _amsg_exit(int errnum); -extern char **_environ; +extern char **MSVCRT__environ; extern MSVCRT_wchar_t **_wenviron; extern char ** msvcrt_SnapshotOfEnvironmentA(char **); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9518fa3..fffe883 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -208,7 +208,7 @@ @ cdecl _ecvt(double long ptr ptr) @ cdecl _endthread () @ cdecl _endthreadex(long) -@ extern _environ +@ extern _environ MSVCRT__environ @ cdecl _eof(long) @ cdecl _errno() MSVCRT__errno @ cdecl _except_handler2(ptr ptr ptr ptr)

1 0

Zachary Goldberg : Further WWN 338 corrections
by Jeremy Newman 07 Jan '08

07 Jan '08

Module: website Branch: master Commit: 0d7ca2ecebc44a5c6c5416448f3258ee4b3f6e53 URL: http://source.winehq.org/git/website.git/?a=commit;h=0d7ca2ecebc44a5c6c5416… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Jan 7 17:39:59 2008 -0500 Further WWN 338 corrections Six videos were posted. Credit goes to Lei Zhang. --- wwn/wn20080106_338.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wwn/wn20080106_338.xml b/wwn/wn20080106_338.xml index 289d33e..d46daf1 100644 --- a/wwn/wn20080106_338.xml +++ b/wwn/wn20080106_338.xml @@ -225,7 +225,7 @@ one case, but that can be fixed in another step. > <topic>Wineconf</topic> <p> -Five videos from wineconf have finally made it from the editing studio the realm of the internet (youtube). I am not sure who actually put in the effort to make this possible, however Lei Zhang was the one to write into wine-devel to bring this to our attention so he gets the credit for now. The five videos: +Six videos from wineconf have finally made it from the editing studio the realm of the internet (youtube). Thanks to Lei Zhang for putting these videos together and making them available on the web. The six videos: </p> <quote> <p><pre>

1 0