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

Roderick Colenbrander : winex11.drv: Import ConvertPixelFormatWGLtoGLX from opengl32.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 496161453cb96b12d0536a25bbe918f940404a56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=496161453cb96b12d0536a2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 27 23:10:32 2006 +0200 winex11.drv: Import ConvertPixelFormatWGLtoGLX from opengl32. --- dlls/winex11.drv/opengl.c | 94 ++++++++++++++++++++++++++++++--------------- 1 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2fb2011..fb0062d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -173,41 +173,69 @@ sym_not_found: return FALSE; } -static BOOL get_fbconfig_from_main_visual(int *fmt_id, int *fmt_index) +/* GLX can advertise dozens of different pixelformats including offscreen and onscreen ones. + * In our WGL implementation we only support a subset of these formats namely the format of + * Wine's main visual and offscreen formats (if they are available). + * This function converts a WGL format to its corresponding GLX one. It returns the index (zero-based) + * into the GLX FB config table and it returns the number of supported WGL formats in fmt_count. + */ +static BOOL ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, int *fmt_index, int *fmt_count) { + int res = FALSE; + int i = 0; + GLXFBConfig* cfgs = NULL; int nCfgs = 0; int tmp_fmt_id = 0; int tmp_vis_id = 0; - int i = 0; - GLXFBConfig* cfgs = NULL; + int nFormats = 1; /* Start at 1 as we allways have a main visual */ + VisualID visualid = 0; - /* Retrieve the visualid from our main visual */ - VisualID visualid = XVisualIDFromVisual(visual); + /* Request to look up the format of the main visual when iPixelFormat = 1 */ + if(iPixelFormat == 1) visualid = XVisualIDFromVisual(visual); - cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), NULL, &nCfgs); + /* 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 + * bas 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 (glError: %d)\n", pglGetError()); + ERR("glXChooseFBConfig returns NULL\n"); if(cfgs != NULL) XFree(cfgs); return FALSE; } - /* Walk through all FB configurations to retrieve the FB configuration matching our visual */ + /* Find the requested offscreen format and count the number of offscreen formats */ for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(gdi_display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - pglXGetFBConfigAttrib(gdi_display, cfgs[i], GLX_VISUAL_ID, &tmp_vis_id); - if(tmp_vis_id == visualid) { - *fmt_id = tmp_fmt_id; - *fmt_index = i + 1; /* Use a one based index, iPixelFormat uses that too */ - TRACE("Found FBCONFIG_ID 0x%x at index %d for VISUAL_ID 0x%x\n", *fmt_id, *fmt_index, tmp_vis_id); - if(cfgs != NULL) XFree(cfgs); - return TRUE; + 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(iPixelFormat == 1 && visualid == tmp_vis_id) { + *fmt_index = i; + TRACE("Found FBCONFIG_ID 0x%x at index %d for VISUAL_ID 0x%x\n", tmp_fmt_id, *fmt_index, tmp_vis_id); + res = TRUE; + } + /* We found an offscreen rendering format :) */ + else if(tmp_vis_id == 0) { + nFormats++; + TRACE("Checking offscreen format FBCONFIG_ID 0x%x at index %d\n", tmp_fmt_id, i); + + if(iPixelFormat == nFormats) { + *fmt_index = i; + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, iPixelFormat, i); + res = TRUE; + } } } - - ERR("Can't find a matching FBCONFIG_ID for VISUAL_ID 0x%lx!\n", visualid); + *fmt_count = nFormats; + TRACE("Number of offscreen formats: %d; returning index: %d\n", *fmt_count, *fmt_index); if(cfgs != NULL) XFree(cfgs); - return FALSE; + + if(res == FALSE && iPixelFormat == 1) + ERR("Can't find a matching FBCONFIG_ID for VISUAL_ID 0x%lx!\n", visualid); + + return res; } /** @@ -220,7 +248,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV GLXFBConfig* cfgs = NULL; int ret = 0; int nCfgs = 0; - int fmt_id = 0; + int value = 0; int fmt_index = 0; if (!has_opengl()) { @@ -248,7 +276,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* In case an fbconfig was found, check if it matches to the requirements of the ppfd */ - if(!get_fbconfig_from_main_visual(&fmt_id, &fmt_index)) { + if(!ConvertPixelFormatWGLtoGLX(gdi_display, 1 /* main visual */, &fmt_index, &value)) { ERR("Can't find a matching FBCONFIG_ID for VISUAL_ID 0x%lx!\n", visual->visualid); } else { int dwFlags = 0; @@ -256,7 +284,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV int value = 0; /* Pixel type */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_RENDER_TYPE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_RENDER_TYPE, &value); if (value & GLX_RGBA_BIT) iPixelType = PFD_TYPE_RGBA; else @@ -267,7 +295,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Doublebuffer */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DOUBLEBUFFER, &value); if (value) dwFlags |= PFD_DOUBLEBUFFER; if (!(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE)) { if ((ppfd->dwFlags & PFD_DOUBLEBUFFER) != (dwFlags & PFD_DOUBLEBUFFER)) { goto choose_exit; @@ -275,7 +303,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Stereo */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STEREO, &value); if (value) dwFlags |= PFD_STEREO; if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) { if ((ppfd->dwFlags & PFD_STEREO) != (dwFlags & PFD_STEREO)) { goto choose_exit; @@ -283,25 +311,25 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Alpha bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_ALPHA_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_ALPHA_SIZE, &value); if (ppfd->iPixelType==PFD_TYPE_RGBA && ppfd->cAlphaBits && !value) { goto choose_exit; } /* Depth bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_DEPTH_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_DEPTH_SIZE, &value); if (ppfd->cDepthBits && !value) { goto choose_exit; } /* Stencil bits */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_STENCIL_SIZE, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_STENCIL_SIZE, &value); if (ppfd->cStencilBits && !value) { goto choose_exit; } /* Aux buffers */ - pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index - 1], GLX_AUX_BUFFERS, &value); + pglXGetFBConfigAttrib(gdi_display, cfgs[fmt_index], GLX_AUX_BUFFERS, &value); if (ppfd->cAuxBuffers && !value) { goto choose_exit; } @@ -337,6 +365,7 @@ int X11DRV_DescribePixelFormat(X11DRV_PD GLXFBConfig cur; int nCfgs = 0; int ret = 0; + int fmt_index = 0; if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); @@ -382,13 +411,13 @@ int X11DRV_DescribePixelFormat(X11DRV_PD } /* Retrieve the index in the FBConfig table corresponding to the visual ID from the main visual */ - if(!get_fbconfig_from_main_visual(&value, &iPixelFormat)) { + if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &value)) { ERR("Can't find a valid pixel format index from the main visual, expect problems!\n"); return 0; } ret = nCfgs; - cur = cfgs[iPixelFormat - 1]; + cur = cfgs[fmt_index]; memset(ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); @@ -508,8 +537,9 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC GLXFBConfig cur_cfg; int value; int gl_test = 0; + int fmt_index = 0; - if(!get_fbconfig_from_main_visual(&value, &iPixelFormat)) { + if(!ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, &fmt_index, &value)) { ERR("Can't find a valid pixel format index from the main visual, expect problems!\n"); return TRUE; /* Return true because the SetPixelFormat stuff itself passed */ } @@ -531,7 +561,7 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC TRACE(" - HEIGHT as %d\n", tmp); */ cfgs_fmt = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &nCfgs_fmt); - cur_cfg = cfgs_fmt[iPixelFormat - 1]; + cur_cfg = cfgs_fmt[fmt_index]; gl_test = pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n");

1 0

Brian Chang : riched20: EM_EXSETSEL fixes and conformance tests.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 1f2eb859ac23a0e7b9275061919aa3361d967668 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f2eb859ac23a0e7b927506… Author: Brian Chang <brianch(a)seas.ucla.edu> Date: Sun Aug 27 11:26:34 2006 -0500 riched20: EM_EXSETSEL fixes and conformance tests. --- dlls/riched20/editor.c | 25 +++++++++++++++++--- dlls/riched20/tests/editor.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a61ee03..fa43e1f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1602,13 +1602,30 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } case EM_EXSETSEL: { - CHARRANGE *pRange = (CHARRANGE *)lParam; - TRACE("EM_EXSETSEL (%ld,%ld)\n", pRange->cpMin, pRange->cpMax); + int start, end; + CHARRANGE range = *(CHARRANGE *)lParam; + + TRACE("EM_EXSETSEL (%ld,%ld)\n", range.cpMin, range.cpMax); + + /* if cpMin < 0, then selection is deselected and caret moved to end of + * the current selection */ + if (range.cpMin < 0) + { + ME_GetSelection(editor, &start, &end); + range.cpMin = end; + range.cpMax = end; + } + else if (range.cpMax > ME_GetTextLength(editor) +1) + { + range.cpMax = ME_GetTextLength(editor) + 1; + } + ME_InvalidateSelection(editor); - ME_SetSelection(editor, pRange->cpMin, pRange->cpMax); + ME_SetSelection(editor, range.cpMin, range.cpMax); ME_InvalidateSelection(editor); ME_SendSelChange(editor); - return 0; + + return range.cpMax; } case EM_SHOWSCROLLBAR: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9d3df13..5e34b92 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1316,6 +1316,57 @@ static void test_EM_GETMODIFY(void) DestroyWindow(hwndRichEdit); } +static void test_EM_EXSETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + long result; + CHARRANGE cr; + int start,end; + + /* sending some text to the window */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "testing selection"); + /* 01234567890123456*/ + /* 10 */ + + /* EM_EXSETSEL returns (cr.cpMax < strlen+1 ? cr.cpMax:strlen+1 if cpMin is positive */ + cr.cpMin = 0; + cr.cpMax = 100; + result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + ok(result == 18, "EM_EXSETSEL: expected: 18 actual: %ld\n", result); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); + + /* FIXME: EM_GETSEL needs to return proper ending value */ + todo_wine + { + ok(start == 0 && end == 18, "EM_EXSETSEL: expected (0,18) actual:(%d,%d)\n", start,end); + } + + cr.cpMin = 5; + cr.cpMax = 10; + result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + ok(result == 10, "EM_EXSETSEL: expected: 10 actual: %ld\n", result); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); + ok(start == 5 && end == 10, "EM_EXSETSEL: expected (5,10) actual:(%d,%d)\n", start,end); + + cr.cpMin = 15; + cr.cpMax = 17; + result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + ok(result == 17, "EM_EXSETSEL: expected: 17 actual: %ld\n", result); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); + ok(start == 15 && end == 17, "EM_EXSETSEL: expected (15,17) actual:(%d,%d)\n", start,end); + + /* bug 4462 - the following values get used in FileZilla */ + /* when min < 0, selection is deselected and caret is moved to end of last selection */ + cr.cpMin = -3; + cr.cpMax = 0; + result = SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + ok(result == 17, "EM_EXSETSEL: expected: 17 actual: %ld\n", result); + SendMessage(hwndRichEdit, EM_GETSEL, (WPARAM) &start, (LPARAM) &end); + ok(start == 17 && end == 17, "EM_EXSETSEL: expected (17,17) actual:(%d,%d)\n", start,end); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1341,6 +1392,7 @@ START_TEST( editor ) test_EM_GETLIMITTEXT(); test_WM_SETFONT(); test_EM_GETMODIFY(); + test_EM_EXSETSEL(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Alexandre Julliard : tools: Get rid of the winapi makefile, it' s not used anyway.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 6ba5d2e1052b35613cbd2a6d4c7b15e2ec61ddd2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ba5d2e1052b35613cbd2a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 17:29:38 2006 +0200 tools: Get rid of the winapi makefile, it's not used anyway. --- configure | 3 +-- configure.ac | 1 - tools/Makefile.in | 6 +++--- tools/winapi/Makefile.in | 22 ---------------------- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 tools/winapi/Makefile.in Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6ba5d2e1052b35613cb…

1 0

Alexandre Julliard : makefiles: Only run test and documentation targets in directories that need them.
by Alexandre Julliard 28 Aug '06

28 Aug '06

1 0

Alexandre Julliard : make_makefiles: Generate the tests list in programs/ winetest/Makefile.in.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 27959bebd7d60aa44814f927f6c6ec7ce056eae0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27959bebd7d60aa44814f92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:58:31 2006 +0200 make_makefiles: Generate the tests list in programs/winetest/Makefile.in. --- programs/winetest/Makefile.in | 74 +++++++++++++++++++++-------------------- tools/make_makefiles | 30 +++++++++++++++++ 2 files changed, 67 insertions(+), 37 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 924ebbd..753e275 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -18,6 +18,10 @@ RC_SRCS = \ RC_BINSRC = winetest.rc RC_BINARIES = wine.ico +(a)MAKE_PROG_RULES@ + +# List of test executables (auto-generated by make_makefiles) + TESTBINS = \ advapi32_test.exe$(DLLEXT) \ advpack_test.exe$(DLLEXT) \ @@ -72,43 +76,10 @@ TESTBINS = \ winspool.drv_test.exe$(DLLEXT) \ ws2_32_test.exe$(DLLEXT) -(a)MAKE_PROG_RULES@ - -# Special rules - -tests.rc: maketest Makefile.in - $(SRCDIR)/maketest $(TOPSRCDIR) $(TESTBINS) > $@ || ( $(RM) $@ && exit 1 ) - -winetest.res: tests.rc $(TESTBINS) - -clean:: - $(RM) tests.rc dist.res winetest-dist winetest-dist.exe $(TESTBINS) - -depend: tests.rc - -# Rules for building distributable executable - -.PHONY: dist - -dist: winetest-dist.exe$(DLLEXT) winetest-dist$(EXEEXT) - -winetest-dist.exe.so: $(OBJS) dist.res Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) - -winetest-dist: $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - -winetest-dist.exe: $(OBJS) dist.res.o Makefile.in - $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ $(DELAYIMPORTS:%=-l%) $(ALL_LIBS) - -dist.res: winetest.rc tests.rc build.id build.nfo tests.url $(TESTBINS) $(RC_BINARIES) - -# Rules for stripping the test executables - -advpack_test.exe$(DLLEXT): $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) - cp $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) $@ && $(STRIP) $@ advapi32_test.exe$(DLLEXT): $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) cp $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +advpack_test.exe$(DLLEXT): $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) + cp $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) $@ && $(STRIP) $@ cabinet_test.exe$(DLLEXT): $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) cp $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) $@ && $(STRIP) $@ comcat_test.exe$(DLLEXT): $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT) @@ -199,10 +170,10 @@ usp10_test.exe$(DLLEXT): $(DLLDIR)/usp10 cp $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) $@ && $(STRIP) $@ uxtheme_test.exe$(DLLEXT): $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) cp $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) $@ && $(STRIP) $@ -wininet_test.exe$(DLLEXT): $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) - cp $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) $@ && $(STRIP) $@ version_test.exe$(DLLEXT): $(DLLDIR)/version/tests/version_test.exe$(DLLEXT) cp $(DLLDIR)/version/tests/version_test.exe$(DLLEXT) $@ && $(STRIP) $@ +wininet_test.exe$(DLLEXT): $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) + cp $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) $@ && $(STRIP) $@ winmm_test.exe$(DLLEXT): $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) cp $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) $@ && $(STRIP) $@ winspool.drv_test.exe$(DLLEXT): $(DLLDIR)/winspool.drv/tests/winspool.drv_test.exe$(DLLEXT) @@ -210,4 +181,33 @@ winspool.drv_test.exe$(DLLEXT): $(DLLDIR ws2_32_test.exe$(DLLEXT): $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) cp $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +# Special rules + +tests.rc: maketest Makefile.in + $(SRCDIR)/maketest $(TOPSRCDIR) $(TESTBINS) > $@ || ( $(RM) $@ && exit 1 ) + +winetest.res: tests.rc $(TESTBINS) + +clean:: + $(RM) tests.rc dist.res winetest-dist winetest-dist.exe $(TESTBINS) + +depend: tests.rc + +# Rules for building distributable executable + +.PHONY: dist + +dist: winetest-dist.exe$(DLLEXT) winetest-dist$(EXEEXT) + +winetest-dist.exe.so: $(OBJS) dist.res Makefile.in + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + +winetest-dist: $(WINEWRAPPER) + $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ + +winetest-dist.exe: $(OBJS) dist.res.o Makefile.in + $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ $(DELAYIMPORTS:%=-l%) $(ALL_LIBS) + +dist.res: winetest.rc tests.rc build.id build.nfo tests.url $(TESTBINS) $(RC_BINARIES) + ### Dependencies: diff --git a/tools/make_makefiles b/tools/make_makefiles index 83411bb..4a2d78e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -93,6 +93,36 @@ replace_in_file( "configure.ac", '^AC_CO ################################################################ +# update the tests list in programs/winetest/Makefile.in + +my %modules = ( "kernel" => "kernel32", "gdi" => "gdi32", "user" => "user32" ); +my %tests; +my @lines = ( "TESTBINS =" ); + +foreach my $file (sort grep /^dlls\/.*\/tests\/Makefile/, @makefiles) +{ + if ($file =~ /^dlls\/(.*)\/tests\/Makefile/) + { + my $dir = $1; + my $mod = $modules{$dir} || $dir; + $tests{$mod} = $dir; + push @lines, " \\\n\t${mod}_test.exe\$(DLLEXT)"; + } +} +push @lines, "\n\n"; + +foreach my $test (sort keys %tests) +{ + my $dir = $tests{$test}; + push @lines, "${test}_test.exe\$(DLLEXT): \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT)\n"; + push @lines, "\tcp \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT) \$\@ && \$(STRIP) \$\@\n"; +} +push @lines, "\n# Special rules\n"; + +replace_in_file( "programs/winetest/Makefile.in", '^TESTBINS\s*=', '^# Special rules', @lines ); + + +################################################################ # update dlls/Makefile.in my @dll_makefiles = grep /^dlls\//, @makefiles;

1 0

Alexandre Julliard : tools: Added make_makefiles tool that updates the list in configure. ac and runs make_dlls and make_progs.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 34618113f4e5f97bc7e5dab6b46e297944aad01a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34618113f4e5f97bc7e5dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:57:10 2006 +0200 tools: Added make_makefiles tool that updates the list in configure.ac and runs make_dlls and make_progs. --- dlls/make_dlls | 37 ++--------------- programs/make_progs | 33 +--------------- tools/make_makefiles | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 63 deletions(-) create mode 100755 tools/make_makefiles diff --git a/dlls/make_dlls b/dlls/make_dlls index 339e28c..4046193 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -62,9 +62,10 @@ sub update_file($) # if we are inside the dlls dir, go up one level if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); } -my $makefiles = `find dlls -name Makefile.in -print`; +my @args = @ARGV; +if (!@args) { @args = split /\s/, `find dlls -name Makefile.in -print`; } -foreach my $i (split(/\s/,$makefiles)) +foreach my $i (@args) { if ($i =~ /dlls\/(.*)\/tests\/Makefile.in/) { @@ -72,7 +73,7 @@ foreach my $i (split(/\s/,$makefiles)) next; } - open MAKE,$i; + open MAKE, $i or die "cannot open $i\n"; my $module = undef; my $dir = $i; @@ -365,8 +366,6 @@ check test:: \$(BUILDSUBDIRS:%=%/__test_ crosstest:: \$(BUILDSUBDIRS:%=%/__crosstest__) -checklink:: \$(BUILDSUBDIRS:%=%/__checklink__) - ### Dependencies: EOF @@ -409,31 +408,3 @@ print GITIGNORE join("\n", sort @ignores close GITIGNORE; update_file("dlls/.gitignore"); - -################################################################ -# configure.ac file - -open OLD_CONFIG, "configure.ac" or die "cannot open configure.ac"; -open NEW_CONFIG, ">configure.ac.new" or die "cannot create configure.ac.new"; - -while (<OLD_CONFIG>) -{ - print NEW_CONFIG $_; - last if /^dlls\/Makefile/; -} - -foreach my $dir (sort (values %directories, values %staticlib_dirs, values %testdirs)) -{ - print NEW_CONFIG "dlls/$dir/Makefile\n"; -} - -my $skip=1; -while (<OLD_CONFIG>) -{ - $skip = 0 unless /^dlls\//; - print NEW_CONFIG $_ unless $skip; -} - -close OLD_CONFIG; -close NEW_CONFIG; -update_file("configure.ac"); diff --git a/programs/make_progs b/programs/make_progs index 01788d4..10edb18 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -71,9 +71,10 @@ sub update_file($) # if we are inside the programs dir, go up one level if (! -f "configure.ac" && -f "../configure.ac") { chdir(".."); } -my $makefiles = `find programs -name Makefile.in -print`; +my @args = @ARGV; +if (!@args) { @args = split /\s/, `find programs -name Makefile.in -print`; } -foreach my $i (split(/\s/,$makefiles)) +foreach my $i (@args) { my $module; @@ -225,31 +226,3 @@ print GITIGNORE join("\n", sort @ignores close GITIGNORE; update_file("programs/.gitignore"); - -################################################################ -# configure.ac file - -open OLD_CONFIG, "configure.ac" or die "cannot open configure.ac"; -open NEW_CONFIG, ">configure.ac.new" or die "cannot create configure.ac.new"; - -while (<OLD_CONFIG>) -{ - print NEW_CONFIG $_; - last if /^programs\/Makefile/; -} - -foreach my $dir (sort values %directories) -{ - print NEW_CONFIG "programs/$dir/Makefile\n"; -} - -my $skip=1; -while (<OLD_CONFIG>) -{ - $skip = 0 unless /^programs\//; - print NEW_CONFIG $_ unless $skip; -} - -close OLD_CONFIG; -close NEW_CONFIG; -update_file("configure.ac"); diff --git a/tools/make_makefiles b/tools/make_makefiles new file mode 100755 index 0000000..83411bb --- /dev/null +++ b/tools/make_makefiles @@ -0,0 +1,106 @@ +#!/usr/bin/perl -w +# +# Build the auto-generated parts of the Wine makefiles. +# +# Copyright 2006 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# + +# update a file if changed +sub update_file($) +{ + my $file = shift; + my $ret = system "cmp $file $file.new >/dev/null"; + if (!$ret) + { + unlink "$file.new"; + print "$file is unchanged\n"; + } + else + { + rename "$file.new", "$file"; + print "$file updated\n"; + } + return $ret; +} + +# replace some lines in a file between two markers +sub replace_in_file($$$@) +{ + my $file = shift; + my $start = shift; + my $end = shift; + + open OLD_FILE, "$file" or die "cannot open $file"; + open NEW_FILE, ">$file.new" or die "cannot create $file.new"; + + while (<OLD_FILE>) + { + last if /$start/; + print NEW_FILE $_; + } + + print NEW_FILE @_; + + if (defined($end)) + { + my $skip=1; + while (<OLD_FILE>) + { + print NEW_FILE $_ unless $skip; + $skip = 0 if /$end/; + } + } + + close OLD_FILE; + close NEW_FILE; + return update_file($file); +} + +my (@makefiles, @makerules); + +if (-d ".git") +{ + @makefiles = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Makefile.in \\*/Makefile.in`; + @makerules = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Make\\*rules.in \\*/Make\\*rules.in`; +} +else +{ + @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`); + @makerules = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Make\\*.rules.in -print`); +} + + +################################################################ +# update the makefile list in configure.ac + +replace_in_file( "configure.ac", '^AC_CONFIG_FILES$', '\]$$', + "AC_CONFIG_FILES([\n", + join ("\n", (sort @makerules), (sort @makefiles) ), "])\n" ); + + +################################################################ +# update dlls/Makefile.in + +my @dll_makefiles = grep /^dlls\//, @makefiles; +system "dlls/make_dlls", @dll_makefiles; + + +################################################################ +# update programs/Makefile.in + +my @prog_makefiles = grep /^programs\//, @makefiles; +system "programs/make_progs", @prog_makefiles;

1 0

Mike McCormack : msi: Fix writing of long strings to the database.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 5f832b27310228f8db1bdafa7e01f99c6b4c60b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f832b27310228f8db1bdaf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 28 16:51:41 2006 +0900 msi: Fix writing of long strings to the database. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 24 +++++++++++++++++------- dlls/msi/table.c | 25 +++++++++++++++++++------ dlls/msi/tests/db.c | 2 -- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1c5a894..abaa347 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -328,7 +328,7 @@ extern string_table *msi_init_stringtabl extern VOID msi_destroy_stringtable( string_table *st ); extern UINT msi_string_count( string_table *st ); extern UINT msi_id_refcount( string_table *st, UINT i ); -extern UINT msi_string_totalsize( string_table *st, UINT *last ); +extern UINT msi_string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ); extern UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( string_table *st, UINT id ); extern UINT msi_string_get_codepage( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 3155c12..db10ae5 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -435,13 +435,17 @@ UINT msi_id_refcount( string_table *st, return st->strings[i].refcount; } -UINT msi_string_totalsize( string_table *st, UINT *total ) +UINT msi_string_totalsize( string_table *st, UINT *datasize, UINT *poolsize ) { - UINT size = 0, i, len; + UINT i, len, max, holesize; if( st->strings[0].str || st->strings[0].refcount ) ERR("oops. element 0 has a string\n"); - *total = 0; + + *poolsize = 4; + *datasize = 0; + max = 1; + holesize = 0; for( i=1; i<st->maxcount; i++ ) { if( st->strings[i].str ) @@ -451,12 +455,18 @@ UINT msi_string_totalsize( string_table st->strings[i].str, -1, NULL, 0, NULL, NULL); if( len ) len--; - size += len; - *total = (i+1); + (*datasize) += len; + if (len>0xffff) + (*poolsize) += 4; + max = i + 1; + (*poolsize) += holesize + 4; + holesize = 0; } + else + holesize += 4; } - TRACE("%u/%u strings %u bytes codepage %x\n", *total, st->maxcount, size, st->codepage ); - return size; + TRACE("data %u pool %u codepage %x\n", *datasize, *poolsize, st->codepage ); + return max; } UINT msi_string_get_codepage( string_table *st ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 57cd4df..fb468bc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -765,7 +765,7 @@ end: static UINT save_string_table( MSIDATABASE *db ) { - UINT i, count, datasize, poolsize, sz, used, r, codepage; + UINT i, count, datasize = 0, poolsize = 0, sz, used, r, codepage, n; UINT ret = ERROR_FUNCTION_FAILED; static const WCHAR szStringData[] = { '_','S','t','r','i','n','g','D','a','t','a',0 }; @@ -777,8 +777,9 @@ static UINT save_string_table( MSIDATABA TRACE("\n"); /* construct the new table in memory first */ - datasize = msi_string_totalsize( db->strings, &count ); - poolsize = (count + 1)*2*sizeof(USHORT); + count = msi_string_totalsize( db->strings, &datasize, &poolsize ); + + TRACE("%u %u %u\n", count, datasize, poolsize ); pool = msi_alloc( poolsize ); if( ! pool ) @@ -797,6 +798,7 @@ static UINT save_string_table( MSIDATABA codepage = msi_string_get_codepage( db->strings ); pool[0]=codepage&0xffff; pool[1]=(codepage>>16); + n = 1; for( i=1; i<count; i++ ) { sz = datasize - used; @@ -808,9 +810,20 @@ static UINT save_string_table( MSIDATABA } if( sz && (sz < (datasize - used ) ) ) sz--; - TRACE("adding %u bytes %s\n", sz, debugstr_a(data+used) ); - pool[ i*2 ] = sz; - pool[ i*2 + 1 ] = msi_id_refcount( db->strings, i ); + + pool[ n*2 + 1 ] = msi_id_refcount( db->strings, i ); + if (sz < 0x10000) + { + pool[ n*2 ] = sz; + n++; + } + else + { + pool[ n*2 ] = 0; + pool[ n*2 + 2 ] = sz&0xffff; + pool[ n*2 + 3 ] = (sz>>16); + n += 2; + } used += sz; if( used > datasize ) { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6da7666..781c6a5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -940,9 +940,7 @@ static void test_longstrings(void) r = MsiRecordGetString(hrec, 2, NULL, &len); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); - todo_wine { ok(len == STRING_LENGTH, "string length wrong\n"); - } MsiCloseHandle(hrec); MsiCloseHandle(hdb);

1 0

Alexandre Julliard : kernel: Get rid of useless trace.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 49d82c5a4dedb9c920f80cea4d12f93e9f4efd44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49d82c5a4dedb9c920f80ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 11:50:26 2006 +0200 kernel: Get rid of useless trace. --- dlls/kernel/cpu.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index eaeac6e..40aedcd 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -461,7 +461,6 @@ #ifdef linux if (sscanf( value, "%lf", &cmz ) == 1) { /* SYSTEMINFO doesn't have a slot for cpu speed, so store in a global */ cpuHz = cmz * 1000 * 1000; - TRACE("CPU speed read as %lld\n", cpuHz); } continue; }

1 0

H. Verbeet : d3d8: Use proper handles for pixel shaders.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 9a4ce31737e706aa7a6bb8ea58b1a321dde1dc32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a4ce31737e706aa7a6bb8e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Aug 27 22:07:13 2006 +0200 d3d8: Use proper handles for pixel shaders. --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 47 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index b3af102..b32033f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -560,6 +560,7 @@ typedef struct IDirect3DPixelShader8Impl const IDirect3DPixelShader8Vtbl *lpVtbl; LONG ref; + shader_handle *handle; /* The device, to be replaced by an IDirect3DDeviceImpl */ IWineD3DPixelShader *wineD3DPixelShader; } IDirect3DPixelShader8Impl; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6997df7..0950f72 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1262,6 +1262,8 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DPixelShader8Impl *object; HRESULT hrc = D3D_OK; + TRACE("(%p) : pFunction(%p), ppShader(%p)\n", This, pFunction, ppShader); + if (NULL == ppShader) { TRACE("(%p) Invalid call\n", This); return D3DERR_INVALIDCALL; @@ -1280,20 +1282,37 @@ static HRESULT WINAPI IDirect3DDevice8Im HeapFree(GetProcessHeap(), 0 , object); *ppShader = 0; } else { - *ppShader = (DWORD)object; + shader_handle *handle = alloc_shader_handle(This); + if (!handle) { + ERR("Failed to allocate shader handle\n"); + IDirect3DVertexShader8_Release((IUnknown *)object); + hrc = E_OUTOFMEMORY; + } else { + object->handle = handle; + *handle = object; + *ppShader = (handle - This->shader_handles) + VS_HIGHESTFIXEDFXF + 1; + } } } - TRACE("(%p) : returning %p\n", This, (void *)*ppShader); + TRACE("(%p) : returning %p (handle %#lx)\n", This, object, *ppShader); return hrc; } static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)pShader; - TRACE("(%p) Relay\n", This); + IDirect3DPixelShader8Impl *shader = NULL; + TRACE("(%p) : pShader %#lx\n", This, pShader); + + if (pShader > VS_HIGHESTFIXEDFXF && This->allocated_shader_handles > pShader - (VS_HIGHESTFIXEDFXF + 1)) { + shader = This->shader_handles[pShader - (VS_HIGHESTFIXEDFXF + 1)]; + } else if (pShader) { + ERR("Trying to set an invalid handle.\n"); + } + + TRACE("(%p) : Setting shader %p\n", This, shader); return IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); } @@ -1310,23 +1329,31 @@ static HRESULT WINAPI IDirect3DDevice8Im hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); if (D3D_OK == hrc && NULL != object) { - hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); - IWineD3DPixelShader_Release(object); + IDirect3DPixelShader8Impl *d3d8_shader; + hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)&d3d8_shader); + IWineD3DPixelShader_Release(object); + *ppShader = (d3d8_shader->handle - This->shader_handles) + (VS_HIGHESTFIXEDFXF + 1); } else { *ppShader = (DWORD)NULL; } - TRACE("(%p) : returning %p\n", This, (void *)*ppShader); + TRACE("(%p) : returning %#lx\n", This, *ppShader); return hrc; } static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)pShader; - TRACE("(%p) Relay\n", This); - if (NULL != shader) { + TRACE("(%p) : pShader %#lx\n", This, pShader); + + if (pShader <= VS_HIGHESTFIXEDFXF || This->allocated_shader_handles <= pShader - (VS_HIGHESTFIXEDFXF + 1)) { + ERR("(%p) : Trying to delete an invalid handle\n", This); + return D3DERR_INVALIDCALL; + } else { + shader_handle *handle = &This->shader_handles[pShader - (VS_HIGHESTFIXEDFXF + 1)]; + IDirect3DPixelShader8Impl *shader = *handle; while(IUnknown_Release((IUnknown *)shader)); + free_shader_handle(This, handle); } return D3D_OK;

1 0

Mike McCormack : msi: Fix MsiRecordGetString for a null buffer and non-zero buffer length.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: b9d6ec3b875ff463ae09495ad64ffc11007fad03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9d6ec3b875ff463ae09495… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Aug 28 16:51:11 2006 +0900 msi: Fix MsiRecordGetString for a null buffer and non-zero buffer length. --- dlls/msi/record.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 159fc0b..6c9a567 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -307,7 +307,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec NULL, 0 , NULL, NULL); WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, szValue, *pcchValue, NULL, NULL); - if( *pcchValue && len>*pcchValue ) + if( szValue && *pcchValue && len>*pcchValue ) szValue[*pcchValue-1] = 0; if( len ) len--; @@ -321,7 +321,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec break; } - if( *pcchValue <= len ) + if( szValue && *pcchValue <= len ) ret = ERROR_MORE_DATA; *pcchValue = len; @@ -383,13 +383,13 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec break; case MSIFIELD_NULL: len = 1; - if( *pcchValue > 0 ) + if( szValue && *pcchValue > 0 ) szValue[0] = 0; default: break; } - if( *pcchValue <= len ) + if( szValue && *pcchValue <= len ) ret = ERROR_MORE_DATA; *pcchValue = len;

1 0