July 2006 - Wine-commits - list.winehq.org

Jason Green : wined3d: Fix for vertex shaders.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 6a97f2202e91fed286ff6ca254926e5f57ca17c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a97f2202e91fed286ff6ca… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jul 17 01:41:53 2006 -0400 wined3d: Fix for vertex shaders. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/drawprim.c | 13 +++++++++++-- dlls/wined3d/vertexshader.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 6 +++++- 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4eb8494..b18666e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -339,7 +339,7 @@ static void vshader_program_add_param(SH IWineD3DVertexShaderImpl* This = (IWineD3DVertexShaderImpl*) arg->shader; /* oPos, oFog and oPts in D3D */ - static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", "result.pointsize" }; + static const char* hwrastout_reg_names[] = { "result.position", "TMP_FOG", "result.pointsize" }; DWORD reg = param & D3DSP_REGNUM_MASK; DWORD regtype = shader_get_regtype(param); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b3823c2..7595bc9 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -343,6 +343,9 @@ HRESULT shader_get_registers_used( else if (D3DSPR_INPUT == regtype && !pshader) reg_maps->attributes[reg] = 1; + + else if (D3DSPR_RASTOUT == regtype && reg == 1) + reg_maps->fog = 1; } } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1a1d01e..4939969 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -327,8 +327,17 @@ static void primitiveInitState( } This->last_was_rhw = FALSE; - /* Restore fogging */ - if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != D3DFOG_NONE) { + /* Setup fogging */ + if (useVS && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->usesFog) { + /* In D3D vertex shader return the 'final' fog value, while in OpenGL it is the 'input' fog value. + * The code below 'disables' the OpenGL postprocessing by setting the formula to '1'. */ + glFogi(GL_FOG_MODE, GL_LINEAR); + glFogf(GL_FOG_START, 1.0f); + glFogf(GL_FOG_END, 0.0f); + + } else if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] + && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != D3DFOG_NONE) { + if(GL_SUPPORT(EXT_FOG_COORD)) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)\n"); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0262079..54b8520 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -712,6 +712,12 @@ #endif if (This->baseShader.hex_version >= D3DVS_VERSION(3,0)) vshader_glsl_output_unpack(&buffer, This->semantics_out); + /* Clamp the fog from 0 to 1 if it's used */ + if (reg_maps->fog) { + This->usesFog = 1; + shader_addline(&buffer, "gl_FogFragCoord = clamp(gl_FogFragCoord, 0.0, 1.0);\n"); + } + shader_addline(&buffer, "}\n\0"); TRACE("Compiling shader object %u\n", shader_obj); @@ -735,9 +741,18 @@ #endif /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer); + if (reg_maps->fog) { + This->usesFog = 1; + shader_addline(&buffer, "TEMP TMP_FOG;\n"); + } + /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, &buffer, reg_maps, pFunction); + /* Make sure the fog value is positive - values above 1.0 are ignored */ + if (reg_maps->fog) + shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); + shader_addline(&buffer, "END\n\0"); /* TODO: change to resource.glObjectHandle or something like that */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c1ce763..03ce7d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1314,6 +1314,9 @@ typedef struct shader_reg_maps { /* Whether or not a loop is used in this shader */ char loop; + /* Whether or not this shader uses fog */ + char fog; + } shader_reg_maps; #define SHADER_PGMSIZE 65535 @@ -1608,7 +1611,8 @@ typedef struct IWineD3DVertexShaderImpl IUnknown *parent; IWineD3DDeviceImpl *wineD3DDevice; - DWORD usage; + char usesFog; + DWORD usage; /* Vertex shader input and output semantics */ semantic semantics_in [MAX_ATTRIBS];

1 0

Duane Clark : notepad: Make notepad print something reasonable.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: a60ee9c43fa810908f06a673cfea1c49a23501ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a60ee9c43fa810908f06a67… Author: Duane Clark <fpga(a)pacbell.net> Date: Sun Jul 16 16:20:30 2006 -0700 notepad: Make notepad print something reasonable. --- programs/notepad/dialog.c | 83 +++++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 34 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 4125326..a78b75b 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -30,6 +30,9 @@ #include <commdlg.h> #include "main.h" #include "dialog.h" +#define SPACES_IN_TAB 8 +#define PRINT_LEN_MAX 120 + static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); @@ -375,10 +378,12 @@ VOID DIALOG_FilePrint(VOID) HFONT font, old_font=0; DWORD size; LPWSTR pTemp; - static const WCHAR times_new_romanW[] = { 'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0 }; + WCHAR cTemp[PRINT_LEN_MAX]; + static const WCHAR print_fontW[] = { 'C','o','u','r','i','e','r',0 }; + static const WCHAR letterM[] = { 'M',0 }; /* Get a small font and print some header info on each page */ - hdrFont.lfHeight = 100; + hdrFont.lfHeight = -35; hdrFont.lfWidth = 0; hdrFont.lfEscapement = 0; hdrFont.lfOrientation = 0; @@ -391,7 +396,7 @@ VOID DIALOG_FilePrint(VOID) hdrFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; hdrFont.lfQuality = PROOF_QUALITY; hdrFont.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN; - lstrcpy(hdrFont.lfFaceName, times_new_romanW); + lstrcpy(hdrFont.lfFaceName, print_fontW); font = CreateFontIndirect(&hdrFont); @@ -404,13 +409,12 @@ VOID DIALOG_FilePrint(VOID) printer.hInstance = Globals.hInstance; /* Set some default flags */ - printer.Flags = PD_RETURNDC; + printer.Flags = PD_RETURNDC | PD_NOSELECTION; printer.nFromPage = 0; printer.nMinPage = 1; /* we really need to calculate number of pages to set nMaxPage and nToPage */ printer.nToPage = 0; printer.nMaxPage = -1; - /* Let commdlg manage copy settings */ printer.nCopies = (WORD)PD_USEDEVMODECOPIES; @@ -445,21 +449,25 @@ VOID DIALOG_FilePrint(VOID) size = GetWindowText(Globals.hEdit, pTemp, size); border = 150; + old_font = SelectObject(printer.hDC, Globals.hFont); + GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); for (copycount=1; copycount <= printer.nCopies; copycount++) { i = 0; pagecount = 1; do { - static const WCHAR letterM[] = { 'M',0 }; - - if (pagecount >= printer.nFromPage && - /* ((printer.Flags & PD_PAGENUMS) == 0 || pagecount <= printer.nToPage))*/ - pagecount <= printer.nToPage) - dopage = 1; + if (printer.Flags & PD_PAGENUMS) { + /* a specific range of pages is selected, so + * skip pages that are not to be printed + */ + if (pagecount > printer.nToPage) + break; + else if (pagecount >= printer.nFromPage) + dopage = 1; + else + dopage = 0; + } else - dopage = 0; - - old_font = SelectObject(printer.hDC, font); - GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); + dopage = 1; if (dopage) { if (StartPage(printer.hDC) <= 0) { @@ -469,40 +477,47 @@ VOID DIALOG_FilePrint(VOID) return; } /* Write a rectangle and header at the top of each page */ + SelectObject(printer.hDC, font); Rectangle(printer.hDC, border, border, cWidthPels-border, border+szMetric.cy*2); - /* I don't know what's up with this TextOut command. This comes out - kind of mangled. - */ TextOut(printer.hDC, border*2, border+szMetric.cy/2, Globals.szFileTitle, lstrlen(Globals.szFileTitle)); } + SelectObject(printer.hDC, Globals.hFont); /* The starting point for the main text */ - xLeft = border*2; + xLeft = border; yTop = border+szMetric.cy*4; - SelectObject(printer.hDC, old_font); - GetTextExtentPoint32(printer.hDC, letterM, 1, &szMetric); - - /* Since outputting strings is giving me problems, output the main - text one character at a time. - */ do { - if (pTemp[i] == '\n') { - xLeft = border*2; - yTop += szMetric.cy; + int k=0, m; + /* find the end of the line */ + while (i < size && pTemp[i] != '\n' && pTemp[i] != '\r') { + if (pTemp[i] == '\t') { + /* replace tabs with spaces */ + for (m=0; m<SPACES_IN_TAB; m++) { + if (k < PRINT_LEN_MAX) + cTemp[k++] = ' '; + } + } + else if (k < PRINT_LEN_MAX) + cTemp[k++] = pTemp[i]; + i++; } - else if (pTemp[i] != '\r') { - if (dopage) - TextOut(printer.hDC, xLeft, yTop, &pTemp[i], 1); - xLeft += szMetric.cx; + if (dopage) + TextOut(printer.hDC, xLeft, yTop, cTemp, k); + /* find the next line */ + while (i < size && (pTemp[i] == '\n' || pTemp[i] == '\r')) { + if (pTemp[i] == '\n') + yTop += szMetric.cy; + i++; } - } while (i++<size && yTop<(cHeightPels-border*2)); - + } while (i<size && yTop<(cHeightPels-border*2)); + if (dopage) EndPage(printer.hDC); pagecount++; } while (i<size); } + SelectObject(printer.hDC, old_font); EndDoc(printer.hDC); DeleteDC(printer.hDC);

1 0

Duane Clark : notepad: Change notepad printing font.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: d51faa74db3bf1b2d5fb547460baefeda2e4faf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d51faa74db3bf1b2d5fb547… Author: Duane Clark <fpga(a)pacbell.net> Date: Sun Jul 16 13:49:06 2006 -0700 notepad: Change notepad printing font. --- programs/notepad/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index d4ba472..139d617 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -58,11 +58,11 @@ static VOID NOTEPAD_InitFont(void) LOGFONT *lf = &Globals.lfFont; static const WCHAR systemW[] = { 'S','y','s','t','e','m',0 }; - lf->lfHeight = -10; + lf->lfHeight = -40; lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; - lf->lfWeight = FW_BOLD; + lf->lfWeight = FW_REGULAR; lf->lfItalic = FALSE; lf->lfUnderline = FALSE; lf->lfStrikeOut = FALSE;

1 0

Robert Shearman : dbghelp: Don' t access a negative section index in elf_map_section.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: f57ddeb9dbfbe6cafe7b21b35283b933596a9c7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f57ddeb9dbfbe6cafe7b21b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 12:11:15 2006 +0100 dbghelp: Don't access a negative section index in elf_map_section. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 11ddfb8..a509848 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -143,7 +143,7 @@ static const char* elf_map_section(struc unsigned pgsz = getpagesize(); unsigned ofst, size; - if (sidx >= fmap->elfhdr.e_shnum || + if (sidx < 0 || sidx >= fmap->elfhdr.e_shnum || fmap->sect[sidx].shdr.sh_type == SHT_NOBITS) return NO_MAP; /* align required information on page size (we assume pagesize is a power of 2) */

1 0

Stefan Dösinger : wined3d: Break out the frame buffer readback of LockRect, implement palettized readback.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: ecbb53a723da9de26da42037c20f1522f34c7fd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecbb53a723da9de26da4203… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 12:39:44 2006 +0200 wined3d: Break out the frame buffer readback of LockRect, implement palettized readback. --- dlls/wined3d/surface.c | 201 +++++++++++++++++++++++++++++------------------- 1 files changed, 120 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ecbb53a723da9de26da…

1 0

Jacek Caban : mshtml: Wrap Heap* functions by inline functions.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 22cf1c9e4de3b5c00358ff2f82282fe1c7ae43a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22cf1c9e4de3b5c00358ff2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 23:21:36 2006 +0200 mshtml: Wrap Heap* functions by inline functions. --- dlls/mshtml/main.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 17 +++++++++++++++++ dlls/mshtml/protocol.c | 34 +++++++++++++++++----------------- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index d4c4bf7..1bb34de 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -100,7 +100,7 @@ static ULONG WINAPI ClassFactory_Release TRACE("(%p) ref = %lu\n", This, ref); if(!ref) { - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This); UNLOCK_MODULE(); } @@ -136,7 +136,7 @@ static const IClassFactoryVtbl HTMLClass static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc fnCreateInstance) { - ClassFactory *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactory)); + ClassFactory *ret = mshtml_alloc(sizeof(ClassFactory)); HRESULT hres; ret->lpVtbl = &HTMLClassFactoryVtbl; @@ -147,7 +147,7 @@ static HRESULT ClassFactory_Create(REFII if(SUCCEEDED(hres)) { LOCK_MODULE(); }else { - HeapFree(GetProcessHeap(), 0, ret); + mshtml_free(ret); *ppv = NULL; } return hres; @@ -314,7 +314,7 @@ static HRESULT register_server(BOOL do_r INF_SET_ID(LIBID_MSHTML); for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + pse[i].pszValue = mshtml_alloc(39); sprintf(pse[i].pszValue, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], @@ -330,7 +330,7 @@ static HRESULT register_server(BOOL do_r hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + mshtml_free(pse[i].pszValue); return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 43f3003..2542836 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -338,4 +338,21 @@ extern LONG module_ref; #define LOCK_MODULE() InterlockedIncrement(&module_ref) #define UNLOCK_MODULE() InterlockedDecrement(&module_ref) +/* memory allocation functions */ + +static inline void *mshtml_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *mshtml_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline BOOL mshtml_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + extern HINSTANCE hInst; diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 7a9190d..6717500 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -195,8 +195,8 @@ static ULONG WINAPI AboutProtocol_Releas TRACE("(%p) ref=%lx\n", iface, ref); if(!ref) { - HeapFree(GetProcessHeap(), 0, This->data); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This->data); + mshtml_free(This); UNLOCK_MODULE(); } @@ -241,7 +241,7 @@ static HRESULT WINAPI AboutProtocol_Star This->data_len = sizeof(html_begin)+sizeof(html_end)-sizeof(WCHAR) + (text ? strlenW(text)*sizeof(WCHAR) : 0); - This->data = HeapAlloc(GetProcessHeap(), 0, This->data_len); + This->data = mshtml_alloc(This->data_len); memcpy(This->data, html_begin, sizeof(html_begin)); if(text) @@ -369,7 +369,7 @@ static HRESULT WINAPI AboutProtocolFacto TRACE("(%p)->(%p %s %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppv); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(AboutProtocol)); + ret = mshtml_alloc(sizeof(AboutProtocol)); ret->lpInternetProtocolVtbl = &AboutProtocolVtbl; ret->ref = 0; @@ -391,7 +391,7 @@ static HRESULT WINAPI AboutProtocolFacto if(SUCCEEDED(hres)) LOCK_MODULE(); else - HeapFree(GetProcessHeap(), 0, ret); + mshtml_free(ret); return hres; } @@ -540,8 +540,8 @@ static ULONG WINAPI ResProtocol_Release( TRACE("(%p) ref=%lx\n", iface, ref); if(!ref) { - HeapFree(GetProcessHeap(), 0, This->data); - HeapFree(GetProcessHeap(), 0, This); + mshtml_free(This->data); + mshtml_free(This); UNLOCK_MODULE(); } @@ -571,11 +571,11 @@ static HRESULT WINAPI ResProtocol_Start( ReleaseBindInfo(&bindinfo); len = strlenW(szUrl)+16; - url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + url = mshtml_alloc(len*sizeof(WCHAR)); hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0); if(FAILED(hres)) { WARN("CoInternetParseUrl failed: %08lx\n", hres); - HeapFree(GetProcessHeap(), 0, url); + mshtml_free(url); IInternetProtocolSink_ReportResult(pOIProtSink, hres, 0, NULL); return hres; } @@ -583,7 +583,7 @@ static HRESULT WINAPI ResProtocol_Start( if(len < sizeof(wszRes)/sizeof(wszRes[0]) || memcmp(url, wszRes, sizeof(wszRes))) { WARN("Wrong protocol of url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); - HeapFree(GetProcessHeap(), 0, url); + mshtml_free(url); return MK_E_SYNTAX; } @@ -591,7 +591,7 @@ static HRESULT WINAPI ResProtocol_Start( if(!(url_file = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); - HeapFree(GetProcessHeap(), 0, url); + mshtml_free(url); return MK_E_SYNTAX; } @@ -607,24 +607,24 @@ static HRESULT WINAPI ResProtocol_Start( if(!src) { WARN("Could not find resource\n"); IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - HeapFree(GetProcessHeap(), 0, url); + mshtml_free(url); return HRESULT_FROM_WIN32(GetLastError()); } if(This->data) { WARN("data already loaded\n"); - HeapFree(GetProcessHeap(), 0, This->data); + mshtml_free(This->data); } This->data_len = SizeofResource(hdll, src); - This->data = HeapAlloc(GetProcessHeap(), 0, This->data_len); + This->data = mshtml_alloc(This->data_len); memcpy(This->data, LoadResource(hdll, src), This->data_len); This->cur = 0; FreeLibrary(hdll); hres = FindMimeFromData(NULL, url_file, NULL, 0, NULL, 0, &mime, 0); - HeapFree(GetProcessHeap(), 0, url); + mshtml_free(url); if(SUCCEEDED(hres)) { IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); CoTaskMemFree(mime); @@ -752,7 +752,7 @@ static HRESULT WINAPI ResProtocolFactory TRACE("(%p)->(%p %s %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppv); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ResProtocol)); + ret = mshtml_alloc(sizeof(ResProtocol)); ret->lpInternetProtocolVtbl = &ResProtocolVtbl; ret->ref = 0; ret->data = NULL; @@ -773,7 +773,7 @@ static HRESULT WINAPI ResProtocolFactory if(SUCCEEDED(hres)) LOCK_MODULE(); else - HeapFree(GetProcessHeap(), 0, ret); + mshtml_free(ret); return hres; }

1 0

Robert Shearman : ntdll: Fix a return code from RtlVerifyVersionInfo and change the FIXME to a TRACE now that all of the tests pass .
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 4a95b6ae0a3f72513b2a307da7cc967fcd62c29a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a95b6ae0a3f72513b2a307… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 12:12:36 2006 +0100 ntdll: Fix a return code from RtlVerifyVersionInfo and change the FIXME to a TRACE now that all of the tests pass. --- dlls/kernel/tests/version.c | 6 +++--- dlls/ntdll/version.c | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c index d02069c..c4ac6ea 100644 --- a/dlls/kernel/tests/version.c +++ b/dlls/kernel/tests/version.c @@ -59,7 +59,7 @@ START_TEST(version) VER_MINORVERSION/* | VER_PLATFORMID | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR | VER_SUITENAME | VER_PRODUCT_TYPE */, pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); /* tests special handling of VER_SUITENAME */ @@ -155,7 +155,7 @@ START_TEST(version) info.dwMajorVersion++; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -167,7 +167,7 @@ START_TEST(version) info.dwBuildNumber++; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 340ae8b..81127f8 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -581,7 +581,7 @@ static inline NTSTATUS version_compare_v if (left > right) return STATUS_REVISION_MISMATCH; break; default: - return STATUS_INVALID_PARAMETER; + return STATUS_REVISION_MISMATCH; } return STATUS_SUCCESS; } @@ -595,15 +595,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co RTL_OSVERSIONINFOEXW ver; NTSTATUS status; - FIXME("(%p,%lu,%llx): Not all cases correctly implemented yet\n", - info, dwTypeMask, dwlConditionMask); - - /* FIXME: - - Check the following special case on Windows (various versions): - o lp->wSuiteMask == 0 and ver.wSuiteMask != 0 and VER_AND/VER_OR - o lp->dwOSVersionInfoSize != sizeof(OSVERSIONINFOEXW) - - MSDN talks about some tests being impossible. Check what really happens. - */ + TRACE("(%p,0x%lx,0x%llx)\n", info, dwTypeMask, dwlConditionMask); ver.dwOSVersionInfoSize = sizeof(ver); if ((status = RtlGetVersion( &ver )) != STATUS_SUCCESS) return status;

1 0

Robert Shearman : dbghelp: Avoid accessing a negative string index when parsing stabs entries with an empty string .
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: f9053b91bfbf906d85533f2f943dfbe7b460d5f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9053b91bfbf906d85533f2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 12:10:04 2006 +0100 dbghelp: Avoid accessing a negative string index when parsing stabs entries with an empty string. --- dlls/dbghelp/stabs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e75b150..dd9a70c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1213,7 +1213,7 @@ BOOL stabs_parse(struct module* module, WARN("Bad stabs string %p\n", ptr); continue; } - if (ptr[strlen(ptr) - 1] == '\\') + if (*ptr != '\0' && (ptr[strlen(ptr) - 1] == '\\')) { /* * Indicates continuation. Append this to the buffer, and go onto the

1 0

Robert Shearman : kernel: Fix an incorrect version test.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 1aabfabf65b601b2e65fbcf8aae7f22bc3164571 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1aabfabf65b601b2e65fbcf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 12:11:44 2006 +0100 kernel: Fix an incorrect version test. --- dlls/kernel/tests/version.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c index 96999e5..d02069c 100644 --- a/dlls/kernel/tests/version.c +++ b/dlls/kernel/tests/version.c @@ -163,7 +163,6 @@ START_TEST(version) ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); - /* shows that build number fits into the hierarchy after major version, but before minor version */ GetVersionEx((OSVERSIONINFO *)&info); info.dwBuildNumber++; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -179,7 +178,6 @@ START_TEST(version) GetVersionEx((OSVERSIONINFO *)&info); info.dwOSVersionInfoSize = 0; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); }

1 0

Robert Shearman : ntdll: Fix RtlVerifyVersionInfo handling of major, minor and service pack versions, which are tested in a hierarchical manner .
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: a3ca06be2ff43853e7bb1baf9869f12547779e74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3ca06be2ff43853e7bb1ba… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 17 12:11:04 2006 +0100 ntdll: Fix RtlVerifyVersionInfo handling of major, minor and service pack versions, which are tested in a hierarchical manner. Add some new tests for the different condition values. --- dlls/kernel/tests/version.c | 43 ++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/version.c | 24 +++++++++++++----------- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/kernel/tests/version.c b/dlls/kernel/tests/version.c index 73ba665..96999e5 100644 --- a/dlls/kernel/tests/version.c +++ b/dlls/kernel/tests/version.c @@ -81,21 +81,21 @@ START_TEST(version) ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); info.dwMinorVersion = 0; info.wServicePackMajor = 10; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); info.wServicePackMajor = 0; info.wServicePackMinor = 10; ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); - todo_wine ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); GetVersionEx((OSVERSIONINFO *)&info); info.wServicePackMinor++; @@ -104,6 +104,37 @@ START_TEST(version) ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor--; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER)); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor--; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor++; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS)); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor++; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_LESS_EQUAL)); + ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + + GetVersionEx((OSVERSIONINFO *)&info); + info.wServicePackMajor--; + ret = pVerifyVersionInfoA(&info, VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, + pVerSetConditionMask(0, VER_MINORVERSION, VER_EQUAL)); + ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); + /* test the failure hierarchy for the four version fields */ GetVersionEx((OSVERSIONINFO *)&info); @@ -132,6 +163,7 @@ START_TEST(version) ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + /* shows that build number fits into the hierarchy after major version, but before minor version */ GetVersionEx((OSVERSIONINFO *)&info); info.dwBuildNumber++; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, @@ -147,6 +179,7 @@ START_TEST(version) GetVersionEx((OSVERSIONINFO *)&info); info.dwOSVersionInfoSize = 0; ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR | VER_SERVICEPACKMINOR, - pVerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL)); - ok(ret, "VerifyVersionInfoA failed with error %ld\n", GetLastError()); + pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL)); + todo_wine ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), + "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %ld\n", GetLastError()); } diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index a5b9d45..340ae8b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -646,6 +646,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co if(dwTypeMask & (VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR|VER_SERVICEPACKMINOR)) { unsigned char condition = 0; + BOOLEAN do_next_check = TRUE; if(dwTypeMask & VER_MAJORVERSION) condition = dwlConditionMask >> 1*3 & 0x07; @@ -659,27 +660,28 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co if(dwTypeMask & VER_MAJORVERSION) { status = version_compare_values(ver.dwMajorVersion, info->dwMajorVersion, condition); - if (status != STATUS_SUCCESS) - return status; + do_next_check = (ver.dwMajorVersion == info->dwMajorVersion) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(dwTypeMask & VER_MINORVERSION) + if((dwTypeMask & VER_MINORVERSION) && do_next_check) { status = version_compare_values(ver.dwMinorVersion, info->dwMinorVersion, condition); - if (status != STATUS_SUCCESS) - return status; + do_next_check = (ver.dwMinorVersion == info->dwMinorVersion) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(dwTypeMask & VER_SERVICEPACKMAJOR) + if((dwTypeMask & VER_SERVICEPACKMAJOR) && do_next_check) { status = version_compare_values(ver.wServicePackMajor, info->wServicePackMajor, condition); - if (status != STATUS_SUCCESS) - return status; + do_next_check = (ver.wServicePackMajor == info->wServicePackMajor) && + ((condition != VER_EQUAL) || (status == STATUS_SUCCESS)); } - if(dwTypeMask & VER_SERVICEPACKMINOR) + if((dwTypeMask & VER_SERVICEPACKMINOR) && do_next_check) { status = version_compare_values(ver.wServicePackMinor, info->wServicePackMinor, condition); - if (status != STATUS_SUCCESS) - return status; } + + if (status != STATUS_SUCCESS) + return status; } return STATUS_SUCCESS;

1 0