October 2006 - Wine-commits

Alexandre Julliard : wined3d: Fix a memory leak (spotted by Eric Pouech).
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 00ddebfafaf6b90ee6093dfbbbaa53542a282aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ddebfafaf6b90ee6093dfbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 14:41:25 2006 +0200 wined3d: Fix a memory leak (spotted by Eric Pouech). --- dlls/wined3d/directx.c | 10 ++++++---- include/wine/wined3d_gl.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e34f4cc..2ef2fd7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -73,7 +73,7 @@ DWORD minMipLookup[WINED3DTEXF_ANISOTROP * function query some info from GL */ static WineD3D_Context* WineD3D_CreateFakeGLContext(void) { - static WineD3D_Context ctx = { NULL, NULL, NULL, 0, 0 }; + static WineD3D_Context ctx; WineD3D_Context* ret = NULL; if (glXGetCurrentContext() == NULL) { @@ -84,6 +84,7 @@ static WineD3D_Context* WineD3D_CreateFa Visual* visual; BOOL failed = FALSE; int num; + XVisualInfo *visInfo; XWindowAttributes win_attr; TRACE_(d3d_caps)("Creating Fake GL Context\n"); @@ -102,8 +103,8 @@ static WineD3D_Context* WineD3D_CreateFa visual = DefaultVisual(ctx.display, DefaultScreen(ctx.display)); } template.visualid = XVisualIDFromVisual(visual); - ctx.visInfo = XGetVisualInfo(ctx.display, VisualIDMask, &template, &num); - if (ctx.visInfo == NULL) { + visInfo = XGetVisualInfo(ctx.display, VisualIDMask, &template, &num); + if (visInfo == NULL) { LEAVE_GL(); WARN_(d3d_caps)("Error creating visual info for capabilities initialization\n"); failed = TRUE; @@ -111,7 +112,8 @@ static WineD3D_Context* WineD3D_CreateFa /* Create a GL context */ if (!failed) { - ctx.glCtx = glXCreateContext(ctx.display, ctx.visInfo, NULL, GL_TRUE); + ctx.glCtx = glXCreateContext(ctx.display, visInfo, NULL, GL_TRUE); + XFree( visInfo ); if (ctx.glCtx == NULL) { LEAVE_GL(); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1cc6409..8f29816 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1797,7 +1797,6 @@ #undef USE_GL_FUNC typedef struct _WineD3D_GLContext { GLXContext glCtx; - XVisualInfo* visInfo; Display* display; Drawable drawable; LONG ref;

1 0

Kirill K Smirnov : winhelp: Properly implement context help and JumpContext macro.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 8e0bc11f7266714319a46af171ab517b032f9c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0bc11f7266714319a46af17… Author: Kirill K Smirnov <Kirill.K.Smirnov(a)star.math.spbu.ru> Date: Thu Oct 26 13:21:44 2006 +0400 winhelp: Properly implement context help and JumpContext macro. --- programs/winhelp/hlpfile.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ programs/winhelp/hlpfile.h | 9 ++++++++ programs/winhelp/macro.c | 10 +++++++- programs/winhelp/winhelp.c | 15 +++++++++++++ programs/winhelp/winhelp.h | 1 + 5 files changed, 83 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 04e5645..e95dfdf 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -84,6 +84,7 @@ static BOOL HLPFILE_UncompressLZ77_Phra static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE*); static BOOL HLPFILE_Uncompress_Topic(HLPFILE*); static BOOL HLPFILE_GetContext(HLPFILE*); +static BOOL HLPFILE_GetMap(HLPFILE*); static BOOL HLPFILE_AddPage(HLPFILE*, BYTE*, BYTE*, unsigned); static BOOL HLPFILE_AddParagraph(HLPFILE*, BYTE *, BYTE*, unsigned*); static void HLPFILE_Uncompress2(const BYTE*, const BYTE*, BYTE*, const BYTE*); @@ -174,6 +175,28 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE /*********************************************************************** * + * HLPFILE_PageByMap + */ +HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap) +{ + int i; + + if (!hlpfile) return 0; + + WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lMap); + + for (i = 0; i < hlpfile->wMapLen; i++) + { + if (hlpfile->Map[i].lMap == lMap) + return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset); + } + + WINE_ERR("Page of Map %x not found in file %s\n", lMap, hlpfile->lpszPath); + return NULL; +} + +/*********************************************************************** + * * HLPFILE_Contents */ HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile) @@ -237,6 +260,8 @@ HLPFILE *HLPFILE_ReadHlpFile(LPCSTR lpsz hlpfile->first_macro = NULL; hlpfile->wContextLen = 0; hlpfile->Context = NULL; + hlpfile->wMapLen = 0; + hlpfile->Map = NULL; hlpfile->contents_start = 0xFFFFFFFF; hlpfile->prev = NULL; hlpfile->next = first_hlpfile; @@ -347,6 +372,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFIL ref = GET_UINT(buf, 0xc); } while (ref != 0xffffffff); + HLPFILE_GetMap(hlpfile); return HLPFILE_GetContext(hlpfile); } @@ -1902,6 +1928,29 @@ static BOOL HLPFILE_GetContext(HLPFILE * return TRUE; } +/*********************************************************************** + * + * HLPFILE_GetMap + */ +static BOOL HLPFILE_GetMap(HLPFILE *hlpfile) +{ + BYTE *cbuf, *cend; + unsigned entries, i; + + if (!HLPFILE_FindSubFile("|CTXOMAP", &cbuf, &cend)) {WINE_WARN("no map section\n"); return FALSE;} + + entries = GET_USHORT(cbuf, 9); + hlpfile->Map = HeapAlloc(GetProcessHeap(), 0, entries * sizeof(HLPFILE_MAP)); + if (!hlpfile->Map) return FALSE; + hlpfile->wMapLen = entries; + for (i = 0; i < entries; i++) + { + hlpfile->Map[i].lMap = GET_UINT(cbuf+11,i*8); + hlpfile->Map[i].offset = GET_UINT(cbuf+11,i*8+4); + } + return TRUE; +} + /****************************************************************** * HLPFILE_DeleteLink * @@ -2006,6 +2055,7 @@ void HLPFILE_FreeHlpFile(HLPFILE* hlpfil if (hlpfile->numWindows) HeapFree(GetProcessHeap(), 0, hlpfile->windows); HeapFree(GetProcessHeap(), 0, hlpfile->Context); + HeapFree(GetProcessHeap(), 0, hlpfile->Map); HeapFree(GetProcessHeap(), 0, hlpfile->lpszTitle); HeapFree(GetProcessHeap(), 0, hlpfile->lpszCopyright); HeapFree(GetProcessHeap(), 0, hlpfile); diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 2f3ffed..4d62cdd 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -110,6 +110,12 @@ typedef struct typedef struct { + LONG lMap; + unsigned long offset; +} HLPFILE_MAP; + +typedef struct +{ LOGFONT LogFont; HFONT hFont; COLORREF color; @@ -124,6 +130,8 @@ typedef struct tagHlpFileFile HLPFILE_MACRO* first_macro; unsigned wContextLen; HLPFILE_CONTEXT* Context; + unsigned wMapLen; + HLPFILE_MAP* Map; unsigned long contents_start; struct tagHlpFileFile* prev; @@ -148,6 +156,7 @@ typedef struct tagHlpFileFile HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath); HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile); HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash); +HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap); HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset); LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeLink(HLPFILE_LINK* link); diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 663a24c..712ff18 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -680,8 +680,14 @@ void CALLBACK MACRO_JumpContents(LPCSTR void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context) { - WINE_FIXME("(\"%s\", \"%s\", %d)semi-stub\n", lpszPath, lpszWindow, context); - return MACRO_JumpContents(lpszPath, lpszWindow); + HLPFILE* hlpfile; + + WINE_TRACE("(\"%s\", \"%s\", %d)", lpszPath, lpszWindow, context); + hlpfile = WINHELP_LookupHelpFile(lpszPath); + /* Some madness: what user calls 'context', hlpfile calls 'map' */ + WINHELP_CreateHelpWindowByMap(hlpfile, context, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 4e9a717..1bf476f 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -362,6 +362,7 @@ static LRESULT WINHELP_HandleCommand(HW /* case HELP_CONTEXTMENU: */ case HELP_FINDER: /* in fact, should be the topic dialog box */ + WINE_FIXME("HELP_FINDER: stub\n"); if (ptr) { MACRO_JumpHash(ptr, "main", 0); @@ -587,6 +588,20 @@ BOOL WINHELP_CreateHelpWindowByHash(HLPF /*********************************************************************** * + * WINHELP_CreateHelpWindowByMap + */ +BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, + HLPFILE_WINDOWINFO* wi, int nCmdShow) +{ + HLPFILE_PAGE* page = NULL; + + page = HLPFILE_PageByMap(hlpfile, lMap); + if (page) page->file->wRefCount++; + return WINHELP_CreateHelpWindow(page, wi, nCmdShow); +} + +/*********************************************************************** + * * WINHELP_MainWndProc */ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 7b10019..ce14352 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -172,6 +172,7 @@ extern WINHELP_GLOBALS Globals; extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); +BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE*, HLPFILE_WINDOWINFO*, int); INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);

1 0

Andrew Talbot : crypt32: Cast-qual warnings fix.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: b6c325bfc073aa6a3e9266196079a5179b3df637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c325bfc073aa6a3e9266196… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Oct 25 20:38:54 2006 +0100 crypt32: Cast-qual warnings fix. --- dlls/crypt32/oid.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 5a1155c..4ab8a90 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -253,8 +253,11 @@ BOOL WINAPI CryptInstallOIDFunctionAddre func->encoding = dwEncodingType; if (HIWORD(rgFuncEntry[i].pszOID)) { - func->entry.pszOID = (LPSTR)((LPBYTE)func + sizeof(*func)); - strcpy((LPSTR)func->entry.pszOID, rgFuncEntry[i].pszOID); + LPSTR oid; + + oid = (LPSTR)((LPBYTE)func + sizeof(*func)); + strcpy(oid, rgFuncEntry[i].pszOID); + func->entry.pszOID = oid; } else func->entry.pszOID = rgFuncEntry[i].pszOID;

1 0

Pierre d'Herbemont : quartzdrv: Add the quartz (Mac OS X) video driver to the build system.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 08884514baa8837fb073245c2042857c98104f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08884514baa8837fb073245c2… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Tue Oct 24 15:26:33 2006 +0200 quartzdrv: Add the quartz (Mac OS X) video driver to the build system. --- Makefile.in | 2 + configure | 15 ++++++++- configure.ac | 8 +++++ dlls/Makefile.in | 4 ++- dlls/make_dlls | 3 +- dlls/winequartz.drv/Makefile.in | 13 ++++++++ dlls/winequartz.drv/quartzdrv_main.c | 49 +++++++++++++++++++++++++++++++ dlls/winequartz.drv/winequartz.drv.spec | 1 + include/config.h.in | 3 ++ 9 files changed, 94 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08884514baa8837fb0732…

1 0

Kovács András : wined3d: Implement D3DSIO_MOVA in ARB backend.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: da6c01bea003ab57e1df2a6eb967a99803da6c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6c01bea003ab57e1df2a6eb… Author: Kovács András <andras(a)csevego.net> Date: Wed Oct 25 04:32:12 2006 +0200 wined3d: Implement D3DSIO_MOVA in ARB backend. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d57706b..abc9c5c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -896,7 +896,7 @@ void vshader_hw_map2gl(SHADER_OPCODE_ARG char tmpLine[256]; unsigned int i; - if (curOpcode->opcode == WINED3DSIO_MOV && dst_regtype == WINED3DSPR_ADDR) + if ((curOpcode->opcode == WINED3DSIO_MOV && dst_regtype == WINED3DSPR_ADDR) || curOpcode->opcode == WINED3DSIO_MOVA) strcpy(tmpLine, "ARL"); else strcpy(tmpLine, curOpcode->glname); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 1b84c00..d7fcc96 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -477,6 +477,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader /* Arithmetic */ {WINED3DSIO_NOP, "nop", "NOP", 0, 0, vshader_nop, vshader_hw_map2gl, NULL, 0, 0}, {WINED3DSIO_MOV, "mov", "MOV", 1, 2, vshader_mov, vshader_hw_map2gl, shader_glsl_mov, 0, 0}, + {WINED3DSIO_MOVA, "mova", NULL, 1, 2, vshader_mova, vshader_hw_map2gl, shader_glsl_mov, WINED3DVS_VERSION(2,0), -1}, {WINED3DSIO_ADD, "add", "ADD", 1, 3, vshader_add, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, {WINED3DSIO_SUB, "sub", "SUB", 1, 3, vshader_sub, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, {WINED3DSIO_MAD, "mad", "MAD", 1, 4, vshader_mad, vshader_hw_map2gl, shader_glsl_mad, 0, 0}, @@ -550,7 +551,6 @@ CONST SHADER_OPCODE IWineD3DVertexShader {WINED3DSIO_ENDLOOP, "endloop", NULL, 0, 0, vshader_endloop, NULL, shader_glsl_end, WINED3DVS_VERSION(2,0), -1}, {WINED3DSIO_LABEL, "label", NULL, 0, 1, vshader_label, NULL, shader_glsl_label, WINED3DVS_VERSION(2,0), -1}, - {WINED3DSIO_MOVA, "mova", GLNAME_REQUIRE_GLSL, 1, 2, vshader_mova, NULL, shader_glsl_mov, 0, 0}, {WINED3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 1, 3, vshader_setp, NULL, NULL, 0, 0}, {WINED3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 1, 2, vshader_texldl, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, 0, NULL, NULL, 0, 0}

1 0

Alexandre Julliard : winedump: Avoid some dead code.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 01ee1418d6b989dcb69f4ae85c2ae17f45b27d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ee1418d6b989dcb69f4ae85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 14:19:32 2006 +0200 winedump: Avoid some dead code. --- tools/winedump/dump.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 56c1df7..96457a0 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -248,16 +248,12 @@ #endif effective_sig = check_headers(); - if (effective_sig == SIG_UNKNOWN) - { - printf("Can't get a recognized file signature, aborting\n"); - ret = 0; - } - else if (wanted_sig == SIG_UNKNOWN || wanted_sig == effective_sig) + if (wanted_sig == SIG_UNKNOWN || wanted_sig == effective_sig) { switch (effective_sig) { case SIG_UNKNOWN: /* shouldn't happen... */ + printf("Can't get a recognized file signature, aborting\n"); ret = 0; break; case SIG_PE: case SIG_NE:

1 0

Alexandre Julliard : wine_release: Display renames as such in the diff stat .
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: tools Branch: master Commit: bcd4380c8a4bf9de121526bc6b5a20f6f5950297 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bcd4380c8a4bf9de121526bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 25 22:45:40 2006 +0200 wine_release: Display renames as such in the diff stat. --- wine_release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index 5d2fde7..78441ca 100755 --- a/wine_release +++ b/wine_release @@ -71,7 +71,7 @@ do nroff -man $f | ../bin/man2html --pgsize=100000 | ../html2template -o $templates_dir/en/docs/$name.template done -git diff --stat wine-$oldver wine-$version >../ds$version.txt +git diff -M --stat wine-$oldver wine-$version >../ds$version.txt make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI

1 0

Kevin Krammer : winebrowser: Support for Portland Initiative scripts.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 9635e9415aa0cbf5c1b59c6f149ab6092d22f697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9635e9415aa0cbf5c1b59c6f1… Author: Kevin Krammer <kevin.krammer(a)gmx.at> Date: Thu Oct 26 19:00:04 2006 +0200 winebrowser: Support for Portland Initiative scripts. --- programs/winebrowser/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 165b54e..7bea32c 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -74,7 +74,7 @@ static int launch_app( char *candidates, static int open_http_url( const char *url ) { static const char *defaultbrowsers = - "firefox,konqueror,mozilla,netscape,galeon,opera,dillo"; + "xdg-open,firefox,konqueror,mozilla,netscape,galeon,opera,dillo"; char browsers[256]; DWORD length, type; @@ -106,7 +106,7 @@ static int open_http_url( const char *ur static int open_mailto_url( const char *url ) { static const char *defaultmailers = - "mozilla-thunderbird,thunderbird,evolution"; + "xdg-email,mozilla-thunderbird,thunderbird,evolution"; char mailers[256]; DWORD length, type;

1 0

Duane Clark : msvcrt: Fix fread on large buffers in ascii mode.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: b4c1c67ea46ec49eb0a89ab039749d56986fec82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c1c67ea46ec49eb0a89ab03… Author: Duane Clark <fpga(a)pacbell.net> Date: Thu Oct 26 16:28:11 2006 -0700 msvcrt: Fix fread on large buffers in ascii mode. --- dlls/msvcrt/file.c | 3 ++- dlls/msvcrt/tests/file.c | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 146e0f3..1956a7c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2550,8 +2550,9 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p } pread += i; rcnt -= i; + ptr = (char *)ptr+i; /* expose feof condition in the flags - * MFC tests file->_flag for feof, and doesn't not call feof()) + * MFC tests file->_flag for feof, and doesn't call feof()) */ if ( MSVCRT_fdesc[file->_file].wxflag & WX_ATEOF) file->_flag |= MSVCRT__IOEOF; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d269765..bd4bd5f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -139,20 +139,20 @@ static void test_readmode( BOOL ascii_mo static const char outbuffer[] = "0,1,2,3,4,5,6,7,8,9\r\n\r\nA,B,C,D,E\r\nX,Y,Z"; static const char padbuffer[] = "ghjghjghjghj"; static const char nlbuffer[] = "\r\n"; - char buffer[MSVCRT_BUFSIZ+256]; + char buffer[2*MSVCRT_BUFSIZ+256], *optr; int fd; FILE *file; - int i, j, fp, ao, *ip, pl; + int i, j, m, fp, ao, *ip, pl; long l; fd = open ("fdopen.tst", O_WRONLY | O_CREAT | O_BINARY, _S_IREAD |_S_IWRITE); /* an internal buffer of MSVCRT_BUFSIZ is maintained, so make a file big * enough to test operations that cross the buffer boundary */ - j = (MSVCRT_BUFSIZ-4)/strlen(padbuffer); + j = (2*MSVCRT_BUFSIZ-4)/strlen(padbuffer); for (i=0; i<j; i++) write (fd, padbuffer, strlen(padbuffer)); - j = (MSVCRT_BUFSIZ-4)%strlen(padbuffer); + j = (2*MSVCRT_BUFSIZ-4)%strlen(padbuffer); for (i=0; i<j; i++) write (fd, &padbuffer[i], 1); write (fd, nlbuffer, strlen(nlbuffer)); @@ -173,9 +173,9 @@ static void test_readmode( BOOL ascii_mo /* first is a test of fgets, ftell, fseek */ ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,2*MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); l = ftell(file); - pl = MSVCRT_BUFSIZ-2; + pl = 2*MSVCRT_BUFSIZ-2; ok(l == pl,"padding line ftell got %ld should be %d in %s\n", l, pl, IOMODE); ok(lstrlenA(buffer) == pl+ao,"padding line fgets got size %d should be %d in %s\n", lstrlenA(buffer), pl+ao, IOMODE); @@ -209,10 +209,20 @@ static void test_readmode( BOOL ascii_mo ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); ok(fgets(buffer,MSVCRT_BUFSIZ-6,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); j=strlen(outbuffer); - i=fread(buffer,1,256,file); - ok(i==j+6+ao*4,"fread failed, expected %d got %d in %s\n", j+6+ao*4, i, IOMODE); + i=fread(buffer,1,MSVCRT_BUFSIZ+strlen(outbuffer),file); + ok(i==MSVCRT_BUFSIZ+j,"fread failed, expected %d got %d in %s\n", MSVCRT_BUFSIZ+j, i, IOMODE); l = ftell(file); - ok(l == pl+j+1,"ftell after fread got %ld should be %d in %s\n", l, pl+j+1, IOMODE); + ok(l == pl+j-(ao*4)-5,"ftell after fread got %ld should be %d in %s\n", l, pl+j-(ao*4)-5, IOMODE); + for (m=0; m<3; m++) + ok(buffer[m]==padbuffer[m+(MSVCRT_BUFSIZ-4)%strlen(padbuffer)],"expected %c got %c\n", padbuffer[m], buffer[m]); + m+=MSVCRT_BUFSIZ+2+ao; + optr = (char *)outbuffer; + for (; m<i; m++) { + ok(buffer[m]==*optr,"char %d expected %c got %c in %s\n", m, *optr, buffer[m], IOMODE); + optr++; + if (ao && (*optr == '\r')) + optr++; + } /* fread should return the requested number of bytes if available */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); @@ -235,7 +245,7 @@ static void test_readmode( BOOL ascii_mo /* test some additional functions */ rewind(file); ok(ftell(file) == 0,"Did not start at beginning of file in %s\n", IOMODE); - ok(fgets(buffer,MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); + ok(fgets(buffer,2*MSVCRT_BUFSIZ+256,file) !=0,"padding line fgets failed unexpected in %s\n", IOMODE); i = _getw(file); ip = (int *)outbuffer; ok(i == *ip,"_getw failed, expected %08x got %08x in %s\n", *ip, i, IOMODE);

1 0

Roderick Colenbrander : wgl: Move part of wglGetProcAddress to gdi32.
by Alexandre Julliard 27 Oct '06

27 Oct '06

Module: wine Branch: master Commit: 88ad69f9bdf60a5ad0f0f9db9da43a41f78cd1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ad69f9bdf60a5ad0f0f9db9… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Oct 26 23:11:07 2006 +0200 wgl: Move part of wglGetProcAddress to gdi32. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/opengl.c | 25 ++++++++++++++++++++++ dlls/opengl32/wgl.c | 42 ++++++++++-------------------------- dlls/winex11.drv/opengl.c | 38 ++++++++++++++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 1 - 7 files changed, 65 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 5b959e7..a751c72 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -198,6 +198,7 @@ #define GET_FUNC(name) driver->funcs.p## /* OpenGL32 */ GET_FUNC(wglCreateContext); GET_FUNC(wglDeleteContext); + GET_FUNC(wglGetProcAddress); GET_FUNC(wglMakeCurrent); GET_FUNC(wglShareLists); GET_FUNC(wglUseFontBitmapsA); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index cf08bdf..cea9a5c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -502,6 +502,7 @@ # @ stdcall wglDeleteContext(long) @ stdcall wglGetCurrentContext() @ stdcall wglGetCurrentDC() +@ stdcall -private wglGetProcAddress(str) @ stdcall wglMakeCurrent(long long) @ stdcall wglShareLists(long long) @ stdcall wglUseFontBitmapsA(long long long long) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 725ed8c..d173151 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -186,6 +186,7 @@ typedef struct tagDC_FUNCS /* OpenGL32 */ HGLRC (*pwglCreateContext)(PHYSDEV); BOOL (*pwglDeleteContext)(HGLRC); + PROC (*pwglGetProcAddress)(LPCSTR); BOOL (*pwglMakeCurrent)(PHYSDEV, HGLRC); BOOL (*pwglShareLists)(HGLRC hglrc1, HGLRC hglrc2); BOOL (*pwglUseFontBitmapsA)(PHYSDEV, DWORD, DWORD, DWORD); diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 6d97025..2be485e 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -221,3 +221,28 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, GDI_ReleaseObj( hdc); return ret; } + +/*********************************************************************** + * Internal wglGetProcAddress for retrieving WGL extensions + */ +PROC WINAPI wglGetProcAddress(LPCSTR func) +{ + PROC ret = NULL; + DC * dc = NULL; + + if(!func) + return NULL; + + TRACE("func: '%p'\n", func); + + /* Retrieve the global hDC to get access to the driver. */ + dc = OPENGL_GetDefaultDC(); + if (!dc) return FALSE; + + if (!dc->funcs->pwglGetProcAddress) FIXME(" :stub\n"); + else ret = dc->funcs->pwglGetProcAddress(func); + + GDI_ReleaseObj(default_hdc); + + return ret; +} diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3a4f549..5912adf 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -79,8 +79,6 @@ static Display *default_display; /* dis static HMODULE opengl32_handle; -static void* (*p_glXGetProcAddressARB)(const GLubyte *); - static char internal_gl_disabled_extensions[512]; static char* internal_gl_extensions = NULL; @@ -193,11 +191,6 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp return local_func; } - if (p_glXGetProcAddressARB == NULL) { - ERR("Warning : dynamic GL extension loading not supported by native GL library.\n"); - return NULL; - } - /* After that, search in the thunks to find the real name of the extension */ ext.name = lpszProc; ext_ret = (const OpenGL_extension *) bsearch(&ext, extension_registry, @@ -205,13 +198,11 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp /* If nothing was found, we are looking for a WGL extension */ if (ext_ret == NULL) { + WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); return wine_wgl.p_wglGetProcAddress(lpszProc); } else { /* We are looking for an OpenGL extension */ - const char *glx_name = ext_ret->glx_name ? ext_ret->glx_name : ext_ret->name; - ENTER_GL(); - local_func = p_glXGetProcAddressARB( (const GLubyte*)glx_name); - LEAVE_GL(); - + local_func = wine_wgl.p_wglGetProcAddress(ext_ret->name); + /* After that, look at the extensions defined in the Linux OpenGL library */ if (local_func == NULL) { char buf[256]; @@ -224,15 +215,15 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp OpenGL drivers (moreover, it is only useful for old 1.0 apps that query the glBindTextureEXT extension). */ - memcpy(buf, glx_name, strlen(glx_name) - 3); - buf[strlen(glx_name) - 3] = '\0'; + memcpy(buf, ext_ret->name, strlen(ext_ret->name) - 3); + buf[strlen(ext_ret->name) - 3] = '\0'; TRACE(" extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); ret = GetProcAddress(opengl32_handle, buf); if (ret != NULL) { - TRACE(" found function in main OpenGL library (%p) !\n", ret); + TRACE(" found function in main OpenGL library (%p) !\n", ret); } else { - WARN("Did not find function %s (%s) in your OpenGL library !\n", lpszProc, glx_name); + WARN("Did not find function %s (%s) in your OpenGL library !\n", lpszProc, ext_ret->name); } return ret; @@ -598,24 +589,23 @@ static BOOL process_attach(void) XVisualInfo *vis = NULL; Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" ); HMODULE mod = GetModuleHandleA( "winex11.drv" ); - void *opengl_handle; + HMODULE mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); DWORD size = sizeof(internal_gl_disabled_extensions); HKEY hkey = 0; - if (!root || !mod) + if (!root || !mod || !mod_gdi32) { - ERR("X11DRV not loaded. Cannot create default context.\n"); + ERR("X11DRV or GDI32 not loaded. Cannot create default context.\n"); return FALSE; } wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); - /* Load WGL function pointers from winex11.drv */ - wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); + wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); /* Interal WGL function */ - wine_wgl.p_wglGetIntegerv = (void *)GetProcAddress(mod, "wglGetIntegerv"); + wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); hdc = GetDC(0); default_display = get_display( hdc ); @@ -651,14 +641,6 @@ static BOOL process_attach(void) XFree(vis); LEAVE_GL(); - opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0); - if (opengl_handle != NULL) { - p_glXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); - wine_dlclose(opengl_handle, NULL, 0); - if (p_glXGetProcAddressARB == NULL) - TRACE("could not find glXGetProcAddressARB in libGL.\n"); - } - internal_gl_disabled_extensions[0] = 0; if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\OpenGL", &hkey)) { if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size)) { diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bdd08c4..046c57b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1299,19 +1299,24 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps if (padding < 0) padding = 0; - TRACE("('%s'):%*s", lpszProc, padding, " "); - for (i = 0; i < WineGLExtensionListSize; ++i) { - ext = WineGLExtensionList[i]; - for (j = 0; ext->extEntryPoints[j].funcName; ++j) { - if (strcmp(ext->extEntryPoints[j].funcName, lpszProc) == 0) { - TRACE("(%p) - WineGL\n", ext->extEntryPoints[j].funcAddress); - return ext->extEntryPoints[j].funcAddress; + /* Check the table of WGL extensions to see if we need to return a WGL extension + * or a function pointer to a native OpenGL function. */ + if(strncmp(lpszProc, "wgl", 3) != 0) { + return pglXGetProcAddressARB((GLubyte*)lpszProc); + } else { + TRACE("('%s'):%*s", lpszProc, padding, " "); + for (i = 0; i < WineGLExtensionListSize; ++i) { + ext = WineGLExtensionList[i]; + for (j = 0; ext->extEntryPoints[j].funcName; ++j) { + if (strcmp(ext->extEntryPoints[j].funcName, lpszProc) == 0) { + TRACE("(%p) - WineGL\n", ext->extEntryPoints[j].funcAddress); + return ext->extEntryPoints[j].funcAddress; + } } } } ERR("(%s) - not found\n", lpszProc); - return NULL; } @@ -2457,6 +2462,15 @@ static BOOL register_extension(const Win return TRUE; } +static const WineGLExtension WGL_internal_functions = +{ + "", + { + { "wglGetIntegerv", X11DRV_wglGetIntegerv }, + } +}; + + static const WineGLExtension WGL_ARB_extensions_string = { "WGL_ARB_extensions_string", @@ -2536,6 +2550,9 @@ static void X11DRV_WineGL_LoadExtensions { WineGLInfo.wglExtensions[0] = 0; + /* Load Wine internal functions */ + register_extension(&WGL_internal_functions); + /* ARB Extensions */ register_extension(&WGL_ARB_extensions_string); @@ -2795,11 +2812,6 @@ BOOL WINAPI X11DRV_wglUseFontBitmapsW(HD return FALSE; } -/* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -void X11DRV_wglGetIntegerv(int pname, int* params) { - ERR_(opengl)("No OpenGL support compiled in.\n"); -} - XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) { return NULL; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index a0fef44..56c2c1a 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -133,7 +133,6 @@ # XIM # OpenGL @ cdecl wglCreateContext(long) X11DRV_wglCreateContext @ cdecl wglDeleteContext(long) X11DRV_wglDeleteContext -@ cdecl wglGetIntegerv(long ptr) X11DRV_wglGetIntegerv @ cdecl wglGetProcAddress(ptr) X11DRV_wglGetProcAddress @ cdecl wglMakeCurrent(long long) X11DRV_wglMakeCurrent @ cdecl wglShareLists(long long) X11DRV_wglShareLists

1 0