August 2007 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : comdlg32: printdlg: Fix number display in PrintDlgW().
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 225c33fe7047251be4edb33f428cdf118a4832ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=225c33fe7047251be4edb33f4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 24 23:26:53 2007 +0200 comdlg32: printdlg: Fix number display in PrintDlgW(). --- dlls/comdlg32/printdlg.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5301646..714f09c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2413,21 +2413,19 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) { } static void _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) { - static const WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; - static const WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; - static const WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; - lstrcpyW(strout, UNDEF); + static const char mm_fmt[] = "%.2f mm"; + static const char in_fmt[] = "%.2f in"; + char buf[20]; if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { - wsprintfW(strout,mm_fmt,(size*1.0)/100.0); - return; - } - if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { - wsprintfW(strout,in_fmt,(size*1.0)/1000.0); - return; + sprintf(buf, mm_fmt, (size * 1.0) / 100.0); + } else if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { + sprintf(buf, in_fmt, (size * 1.0) / 1000.0); + } else { + pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; + sprintf(buf, mm_fmt, (size * 1.0) / 100.0); } - pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - wsprintfW(strout,mm_fmt,(size*1.0)/100.0); - return; + + MultiByteToWideChar(CP_ACP, 0, buf, -1, strout, 20); } static DWORD

1 0

Paul Vriens : oleaut32/tests: Skip VarCat and VarAnd tests a bit better if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 99ebe8b428a18692781955036c68829dd8d9b816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ebe8b428a18692781955036… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 20 16:58:59 2007 +0200 oleaut32/tests: Skip VarCat and VarAnd tests a bit better if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index e55ecf4..5ec765b 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5140,6 +5140,10 @@ static void test_VarCat(void) SKIPTESTS(leftvt); + /* Check if we need/have support for I8 and/or UI8 */ + if ((leftvt == VT_I8 || leftvt == VT_UI8) && !HAVE_OLEAUT32_I8) + continue; + for (rightvt = 0; rightvt <= VT_BSTR_BLOB; rightvt++) { @@ -5154,9 +5158,7 @@ static void test_VarCat(void) continue; /* Check if we need/have support for I8 and/or UI8 */ - if ((leftvt == VT_I8 || leftvt == VT_UI8 || - rightvt == VT_I8 || rightvt == VT_UI8) && - !HAVE_OLEAUT32_I8) + if ((rightvt == VT_I8 || rightvt == VT_UI8) && !HAVE_OLEAUT32_I8) continue; if (leftvt == VT_NULL && rightvt == VT_NULL) @@ -5465,15 +5467,17 @@ static void test_VarAnd(void) { SKIPTESTAND(leftvt); + /* Check if we need/have support for I8 and/or UI8 */ + if ((leftvt == VT_I8 || leftvt == VT_UI8) && !HAVE_OLEAUT32_I8) + continue; + for (rightvt = 0; rightvt <= VT_BSTR_BLOB; rightvt++) { BOOL bFail = FALSE; SKIPTESTAND(rightvt); /* Check if we need/have support for I8 and/or UI8 */ - if ((leftvt == VT_I8 || leftvt == VT_UI8 || - rightvt == VT_I8 || rightvt == VT_UI8) && - !HAVE_OLEAUT32_I8) + if ((rightvt == VT_I8 || rightvt == VT_UI8) && !HAVE_OLEAUT32_I8) continue; memset(&left, 0, sizeof(left));

1 0

Paul Vriens : oleaut32/tests: Skip VarImp tests if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 71dc8187c377f0e6348209b8ca14cdcd95242475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71dc8187c377f0e6348209b8c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 20 16:52:22 2007 +0200 oleaut32/tests: Skip VarImp tests if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 216 ++++++++++++++++++++++++++--------------- 1 files changed, 139 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71dc8187c377f0e634820…

1 0

Paul Vriens : oleaut32/tests: Skip VarIdiv tests if there is no I8 and/ or UI8 support.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: a41c22804ea01c51a838c1945abdd583c7c6458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41c22804ea01c51a838c1945… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Aug 20 16:33:19 2007 +0200 oleaut32/tests: Skip VarIdiv tests if there is no I8 and/or UI8 support. --- dlls/oleaut32/tests/vartest.c | 210 ++++++++++++++++++++++++++-------------- 1 files changed, 136 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a41c22804ea01c51a838c…

1 0

Roderick Colenbrander : opengl32: Don't use 64bit gl types.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 0dde222bc574f3c0ea31cd63e5896dd5bb1056b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dde222bc574f3c0ea31cd63e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 20 18:04:40 2007 +0200 opengl32: Don't use 64bit gl types. --- dlls/opengl32/make_opengl | 2 ++ dlls/opengl32/opengl_ext.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index aff30fb..381b1a9 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -328,6 +328,8 @@ while (my $line = <TYPES>) { } # This is to override the 'void' -> '*' bogus conversion $pseudo_to_opengl{"void"} = "void"; +$pseudo_to_opengl{"Int64EXT"} = "INT64"; +$pseudo_to_opengl{"UInt64EXT"} = "UINT64"; # # Then, create the list of all OpenGL functions using the 'gl.spec' diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index fc638f7..fc870ee 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -3001,8 +3001,8 @@ static void WINAPI wine_glGetProgramivNV( GLuint id, GLenum pname, GLint* params LEAVE_GL(); } -static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, GLint64EXT* params ) { - void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, GLint64EXT* ) = extension_funcs[368]; +static void WINAPI wine_glGetQueryObjecti64vEXT( GLuint id, GLenum pname, INT64* params ) { + void (*func_glGetQueryObjecti64vEXT)( GLuint, GLenum, INT64* ) = extension_funcs[368]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjecti64vEXT( id, pname, params ); @@ -3025,8 +3025,8 @@ static void WINAPI wine_glGetQueryObjectivARB( GLuint id, GLenum pname, GLint* p LEAVE_GL(); } -static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, GLuint64EXT* params ) { - void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, GLuint64EXT* ) = extension_funcs[371]; +static void WINAPI wine_glGetQueryObjectui64vEXT( GLuint id, GLenum pname, UINT64* params ) { + void (*func_glGetQueryObjectui64vEXT)( GLuint, GLenum, UINT64* ) = extension_funcs[371]; TRACE("(%d, %d, %p)\n", id, pname, params ); ENTER_GL(); func_glGetQueryObjectui64vEXT( id, pname, params );

1 0

Roderick Colenbrander : wgl: Cleanup pixelformat initialization code.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 22eea683ff82b7da054b815ca178589aa881e155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eea683ff82b7da054b815ca… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 20 15:48:11 2007 +0200 wgl: Cleanup pixelformat initialization code. --- dlls/winex11.drv/opengl.c | 133 ++++++++++++++------------------------------- 1 files changed, 41 insertions(+), 92 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 455b3d0..98ecedb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -833,22 +833,18 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) return render_type; } -static BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, GLXFBConfig *fbconfig, int *fmt_id) +static BOOL init_formats(Display *display, int screen, Visual *visual) { - GLXFBConfig* cfgs = NULL; - int i; - int nCfgs; - int tmp_fmt_id; - int tmp_vis_id; - VisualID visualid; - - if(!display || !visual) { - ERR("Invalid display or visual\n"); - return FALSE; - } - visualid = XVisualIDFromVisual(visual); + int fmt_id, tmp_vis_id, tmp_fmt_id, nCfgs, i; + GLXFBConfig* cfgs; + GLXFBConfig fbconfig = NULL; + VisualID visualid = XVisualIDFromVisual(visual); + int nOffscreenFormats = 0; - /* Get a list of all available framebuffer configurations */ + /* As mentioned in various parts of the code only the format of the main visual can be used for onscreen rendering. + * Next to this format there are also so called offscreen rendering formats (used for pbuffers) which can be supported + * because they don't need a visual. Below we use glXGetFBConfigs instead of glXChooseFBConfig to enumerate the fb configurations + * because this call lists both types of formats instead of only onscreen ones. */ cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL\n"); @@ -856,93 +852,46 @@ static BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, GLXFBCo return FALSE; } - /* Find the requested offscreen format and count the number of offscreen formats */ + /* Count the number of offscreen formats to determine the size for our pixelformat list */ for(i=0; i<nCfgs; i++) { pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - /* We are looking up the GLX index of our main visual and have found it :) */ - if(visualid == tmp_vis_id) { - TRACE("Found FBCONFIG_ID 0x%x at index %d for VISUAL_ID 0x%x\n", tmp_fmt_id, i, tmp_vis_id); - *fbconfig = cfgs[i]; - *fmt_id = tmp_fmt_id; - XFree(cfgs); - return TRUE; + /* We have found Wine's main visual */ + if(tmp_vis_id == visualid) { + pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); + fbconfig = cfgs[i]; } - } - ERR("No fbconfig found for Wine's main visual (0x%lx), expect problems!\n", visualid); - XFree(cfgs); - return FALSE; -} - -static BOOL init_formats(Display *display, int screen, Visual *visual) -{ - int fmt_id, tmp_vis_id, tmp_fmt_id, nCfgs, i; - GLXFBConfig* cfgs; - GLXFBConfig fbconfig; - int nOffscreenFormats = 0; - - /* Locate the fbconfig correspondig to our main visual */ - if(!get_fbconfig_from_visualid(display, visual, &fbconfig, &fmt_id)) { - ERR("Can't get the FBCONFIG_ID for the main visual, expect problems!\n"); - return FALSE; + /* We have found an offscreen rendering format :) */ + if(tmp_vis_id == 0) { + nOffscreenFormats++; + } } + TRACE("Number of offscreen formats: %d\n", nOffscreenFormats); - /* As mentioned in various parts of the code only the format of the main visual can be used for onscreen rendering. - * Next to this format there are also so called offscreen rendering formats (used for pbuffers) which can be supported - * because they don't need a visual. Below we use glXGetFBConfigs instead of glXChooseFBConfig to enumerate the fb configurations - * because this call lists both types of formats instead of only onscreen ones. */ - cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); - if (NULL == cfgs || 0 == nCfgs) { - WARN("glXChooseFBConfig returns NULL\n"); - if(cfgs != NULL) XFree(cfgs); + /* Allocate memory for all the offscreen pixelformats and the format of Wine's main visual */ + WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (1+nOffscreenFormats)*sizeof(WineGLPixelFormat)); + WineGLPixelFormatList[0].iPixelFormat = 1; + WineGLPixelFormatList[0].fbconfig = fbconfig; + WineGLPixelFormatList[0].fmt_id = fmt_id; + WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); + WineGLPixelFormatList[0].offscreenOnly = FALSE; + WineGLPixelFormatListSize = 1; - /* We only have the single format of Wine's main visual */ - WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineGLPixelFormat)); - WineGLPixelFormatList[0].iPixelFormat = 1; - WineGLPixelFormatList[0].fbconfig = fbconfig; - WineGLPixelFormatList[0].fmt_id = fmt_id; - WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); - WineGLPixelFormatList[0].offscreenOnly = FALSE; - WineGLPixelFormatListSize = 1; - } - else { - /* Count the number of offscreen formats to determine the size for our pixelformat list */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); + /* Fill the list with offscreen formats */ + for(i=0; i<nCfgs; i++) { + pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); + pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - /* We have found an offscreen rendering format :) */ - if(tmp_vis_id == 0) { - nOffscreenFormats++; - } - } - TRACE("Number of offscreen formats: %d\n", nOffscreenFormats); - - /* Allocate memory for all the offscreen pixelformats and the format of Wine's main visual */ - WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (1+nOffscreenFormats)*sizeof(WineGLPixelFormat)); - WineGLPixelFormatList[0].iPixelFormat = 1; - WineGLPixelFormatList[0].fbconfig = fbconfig; - WineGLPixelFormatList[0].fmt_id = fmt_id; - WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); - WineGLPixelFormatList[0].offscreenOnly = FALSE; - WineGLPixelFormatListSize = 1; - - /* Fill the list with offscreen formats */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - - /* We have found an offscreen rendering format :) */ - if(tmp_vis_id == 0) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ - WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; - WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; - WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); - WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; - WineGLPixelFormatListSize++; - } + /* We have found an offscreen rendering format :) */ + if(tmp_vis_id == 0) { + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ + WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; + WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); + WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; + WineGLPixelFormatListSize++; } }

1 0

Roderick Colenbrander : wgl: Fix a typo in the trace code.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: d5c0888bbae1d65c8b3ac3f88981175908424ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c0888bbae1d65c8b3ac3f88… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 19 10:55:09 2007 +0200 wgl: Fix a typo in the trace code. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5eed1ed..455b3d0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1230,7 +1230,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEVICE *physDev, } else { ret = bestFormat+1; /* the return value should be a 1-based index */ - TRACE("Successfully found a matching mode, returning index: %d %x\n", ret, WineGLPixelFormatList[bestFormat-1].fmt_id); + TRACE("Successfully found a matching mode, returning index: %d %x\n", ret, WineGLPixelFormatList[bestFormat].fmt_id); } wine_tsx11_unlock();

1 0

H. Verbeet : wined3d: UBYTE4 data shouldn't be normalized.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 3c609c11e714fc3fb9f80bfbdce23ce6b6f3688c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c609c11e714fc3fb9f80bfbd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 20 01:10:22 2007 +0200 wined3d: UBYTE4 data shouldn't be normalized. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e6766a2..0d4f1e2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -761,7 +761,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVerte break; case WINED3DDECLTYPE_UBYTE4: - GL_EXTCALL(glVertexAttrib4NubvARB(instancedData[j], ptr)); + GL_EXTCALL(glVertexAttrib4ubvARB(instancedData[j], ptr)); break; case WINED3DDECLTYPE_UBYTE4N: case WINED3DDECLTYPE_D3DCOLOR:

1 0

Alex Villacís Lasso : user32: Fix change-drive in Win3.1-style file open dialog.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 89939b5a2b21a37caaaccd77292f74b2aced4790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89939b5a2b21a37caaaccd772… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Aug 19 17:39:35 2007 -0500 user32: Fix change-drive in Win3.1-style file open dialog. --- dlls/user32/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index b43acf0..9607dcc 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1736,6 +1736,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, { WCHAR *p, *p2; p = spec; + if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; if ((p2 = strrchrW( p, '/' ))) p = p2; if (p != spec)

1 0

Alex Villacís Lasso : user32: Fix crash while dir-navigating in Win3.1-style file open dialog.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 4d99a8182de060c4bc0fa4c5d9a048981769e50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d99a8182de060c4bc0fa4c5d… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Aug 19 17:41:21 2007 -0500 user32: Fix crash while dir-navigating in Win3.1-style file open dialog. --- dlls/user32/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index fbcb5f1..b43acf0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1677,7 +1677,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len, item = SendMessageW(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 ); if (item == LB_ERR) return FALSE; - size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); + size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, item, 0 ); if (size == LB_ERR) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+1) * sizeof(WCHAR) ))) return FALSE;

1 0